-
Notifications
You must be signed in to change notification settings - Fork 90
History history in javascript #21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
calvinmetcalf
wants to merge
11
commits into
mlevans:master
Choose a base branch
from
calvinmetcalf:history-noncoffee
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
92755c4
hash js changed
7af1f62
typo in hash
71ec593
added tests
4322c87
added package.json
590ac5c
correct v numbers
e78d4a4
now supports tests
8d13cb0
added tests for now stuff
919ad67
deal with colins
891d30d
deal with colins...correctly
869de0d
fixed colin issue
058fd08
weirdness when no view is set
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,152 +1,223 @@ | ||
| (function(window) { | ||
| var HAS_HASHCHANGE = (function() { | ||
| var doc_mode = window.documentMode; | ||
| return ('onhashchange' in window) && | ||
| (doc_mode === undefined || doc_mode > 7); | ||
| })(); | ||
|
|
||
| L.Hash = function(map) { | ||
| this.onHashChange = L.Util.bind(this.onHashChange, this); | ||
|
|
||
| if (map) { | ||
| this.init(map); | ||
| } | ||
| }; | ||
|
|
||
| L.Hash.prototype = { | ||
| map: null, | ||
| lastHash: null, | ||
|
|
||
| parseHash: function(hash) { | ||
| if(hash.indexOf('#') === 0) { | ||
| hash = hash.substr(1); | ||
| } | ||
| var args = hash.split("/"); | ||
| if (args.length == 3) { | ||
| var zoom = parseInt(args[0], 10), | ||
| lat = parseFloat(args[1]), | ||
| lon = parseFloat(args[2]); | ||
| if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) { | ||
| return false; | ||
| } else { | ||
| return { | ||
| center: new L.LatLng(lat, lon), | ||
| zoom: zoom | ||
| }; | ||
| } | ||
| } else { | ||
| return false; | ||
| } | ||
| }, | ||
|
|
||
| formatHash: function(map) { | ||
| var center = map.getCenter(), | ||
| zoom = map.getZoom(), | ||
| precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); | ||
|
|
||
| return "#" + [zoom, | ||
| center.lat.toFixed(precision), | ||
| center.lng.toFixed(precision) | ||
| ].join("/"); | ||
| }, | ||
|
|
||
| init: function(map) { | ||
| this.map = map; | ||
|
|
||
| this.map.on("moveend", this.onMapMove, this); | ||
|
|
||
| // reset the hash | ||
| this.lastHash = null; | ||
| this.onHashChange(); | ||
|
|
||
| if (!this.isListening) { | ||
| this.startListening(); | ||
| } | ||
| }, | ||
|
|
||
| remove: function() { | ||
| this.map = null; | ||
| if (this.isListening) { | ||
| this.stopListening(); | ||
| } | ||
| }, | ||
|
|
||
| onMapMove: function(map) { | ||
| // bail if we're moving the map (updating from a hash), | ||
| // or if the map is not yet loaded | ||
|
|
||
| if (this.movingMap || !this.map._loaded) { | ||
| return false; | ||
| } | ||
|
|
||
| var hash = this.formatHash(this.map); | ||
| if (this.lastHash != hash) { | ||
| location.replace(hash); | ||
| this.lastHash = hash; | ||
| } | ||
| }, | ||
|
|
||
| movingMap: false, | ||
| update: function() { | ||
| var hash = location.hash; | ||
| if (hash === this.lastHash) { | ||
| return; | ||
| } | ||
| var parsed = this.parseHash(hash); | ||
| if (parsed) { | ||
| this.movingMap = true; | ||
|
|
||
| this.map.setView(parsed.center, parsed.zoom); | ||
|
|
||
| this.movingMap = false; | ||
| } else { | ||
| this.onMapMove(this.map); | ||
| } | ||
| }, | ||
|
|
||
| // defer hash change updates every 100ms | ||
| changeDefer: 100, | ||
| changeTimeout: null, | ||
| onHashChange: function() { | ||
| // throttle calls to update() so that they only happen every | ||
| // `changeDefer` ms | ||
| if (!this.changeTimeout) { | ||
| var that = this; | ||
| this.changeTimeout = setTimeout(function() { | ||
| that.update(); | ||
| that.changeTimeout = null; | ||
| }, this.changeDefer); | ||
| } | ||
| }, | ||
|
|
||
| isListening: false, | ||
| hashChangeInterval: null, | ||
| startListening: function() { | ||
| if (HAS_HASHCHANGE) { | ||
| L.DomEvent.addListener(window, "hashchange", this.onHashChange); | ||
| } else { | ||
| clearInterval(this.hashChangeInterval); | ||
| this.hashChangeInterval = setInterval(this.onHashChange, 50); | ||
| } | ||
| this.isListening = true; | ||
| }, | ||
|
|
||
| stopListening: function() { | ||
| if (HAS_HASHCHANGE) { | ||
| L.DomEvent.removeListener(window, "hashchange", this.onHashChange); | ||
| } else { | ||
| clearInterval(this.hashChangeInterval); | ||
| } | ||
| this.isListening = false; | ||
| } | ||
| }; | ||
| L.hash = function(map) { | ||
| return new L.Hash(map); | ||
| }; | ||
| L.Map.prototype.addHash = function() { | ||
| this._hash = L.hash(this); | ||
| }; | ||
| L.Map.prototype.removeHash = function() { | ||
| this._hash.remove(); | ||
| }; | ||
| })(window); | ||
| (function() { | ||
|
|
||
| L.Hash = L.Class.extend({ | ||
| initialize: function(map, options) { | ||
| this.map = map; | ||
| this.options = options || {}; | ||
| if (!this.options.path) { | ||
| if (this.options.lc) { | ||
| this.options.path = '{base}/{z}/{lat}/{lng}'; | ||
| } else { | ||
| this.options.path = '{z}/{lat}/{lng}'; | ||
| } | ||
| } | ||
| if (this.options.lc && !this.options.formatBase) { | ||
| this.options.formatBase = [ | ||
| /[\s\:A-Z]/g, function(match) { | ||
| if (match.match(/\s/)) { | ||
| return "_"; | ||
| } else if (match.match(/\:/)) { | ||
| return ""; | ||
| } | ||
| if (match.match(/[A-Z]/)) { | ||
| return match.toLowerCase(); | ||
| } | ||
| } | ||
| ]; | ||
| }if (location.hash) { | ||
| this.updateFromState(this.parseHash(location.hash)); | ||
| } | ||
| if (this.map._loaded) { | ||
| return this.startListning(); | ||
| } else { | ||
| return this.map.on("load", this.startListning,this); | ||
| } | ||
| }, | ||
| startListning: function() { | ||
| var onHashChange, | ||
| _this = this; | ||
| if (location.hash) { | ||
| this.updateFromState(this.parseHash(location.hash)); | ||
| } | ||
| if (history.pushState) { | ||
| if (!location.hash) { | ||
| history.replaceState.apply(history, this.formatState()); | ||
| } | ||
| window.onpopstate = function(event) { | ||
|
|
||
| if (event.state) { | ||
| return _this.updateFromState(event.state); | ||
| } | ||
| }; | ||
| this.map.on("moveend", function() { | ||
| var pstate; | ||
| pstate = _this.formatState(); | ||
| if (location.hash !== pstate[2] && !_this.moving) { | ||
| return history.pushState.apply(history, pstate); | ||
| } | ||
| }); | ||
| } else { | ||
| if (!location.hash) { | ||
| location.hash = this.formatState()[2]; | ||
| } | ||
| onHashChange = function() { | ||
|
|
||
| var pstate; | ||
| pstate = _this.formatState(); | ||
| if (location.hash !== pstate[2] && !_this.moving) { | ||
| return location.hash = pstate[2]; | ||
| } | ||
| }; | ||
| this.map.on("moveend", onHashChange); | ||
| if (('onhashchange' in window) && (window.documentMode === void 0 || window.documentMode > 7)) { | ||
| window.onhashchange = function() { | ||
| if (location.hash) { | ||
|
|
||
| return _this.updateFromState(_this.parseHash(location.hash)); | ||
| } | ||
| }; | ||
| } else { | ||
| this.hashChangeInterval = setInterval(onHashChange, 50); | ||
| } | ||
| } | ||
| return this.map.on("baselayerchange", function(e) { | ||
| var pstate, _ref; | ||
| _this.base = (_ref = _this.options.lc._layers[e.layer._leaflet_id].name).replace.apply(_ref, _this.options.formatBase); | ||
| pstate = _this.formatState(); | ||
| if (history.pushState) { | ||
| if (location.hash !== pstate[2] && !_this.moving) { | ||
| return history.pushState.apply(history, pstate); | ||
| } | ||
| } else { | ||
| if (location.hash !== pstate[2] && !_this.moving) { | ||
| return location.hash = pstate[2]; | ||
| } | ||
| } | ||
| }); | ||
| }, | ||
| parseHash: function(hash) { | ||
|
|
||
| var args, lat, latIndex, lngIndex, lon, out, path, zIndex, zoom; | ||
| path = this.options.path.split("/"); | ||
| zIndex = path.indexOf("{z}"); | ||
| latIndex = path.indexOf("{lat}"); | ||
| lngIndex = path.indexOf("{lng}"); | ||
| if (hash.indexOf("#") === 0) { | ||
| hash = hash.substr(1); | ||
| } | ||
| args = hash.split("/"); | ||
|
|
||
| if (args.length > 2) { | ||
| zoom = parseInt(args[zIndex], 10); | ||
| lat = parseFloat(args[latIndex]); | ||
| lon = parseFloat(args[lngIndex]); | ||
| if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) { | ||
| return false; | ||
| } else { | ||
| out = { | ||
| center: new L.LatLng(lat, lon), | ||
| zoom: zoom | ||
| }; | ||
| if (args.length > 3) { | ||
| out.base = args[path.indexOf("{base}")]; | ||
| return out; | ||
| } else { | ||
| return out; | ||
| } | ||
| } | ||
| } else { | ||
|
|
||
| return false; | ||
| } | ||
| }, | ||
| updateFromState: function(state) { | ||
| if (this.moving || !state) { | ||
| return; | ||
| } | ||
| this.moving = true; | ||
| this.map.setView(state.center, state.zoom); | ||
| if (state.base) { | ||
| this.setBase(state.base); | ||
| } | ||
| this.moving = false; | ||
| return true; | ||
| }, | ||
| formatState: function() { | ||
| var center, precision, state, template, zoom; | ||
| center = this.map.getCenter(); | ||
| zoom = this.map.getZoom(); | ||
| precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); | ||
| state = { | ||
| center: center, | ||
| zoom: zoom | ||
| }; | ||
| template = { | ||
| lat: center.lat.toFixed(precision), | ||
| lng: center.lng.toFixed(precision), | ||
| z: zoom | ||
| }; | ||
| if (this.options.path.indexOf("{base}") > -1) { | ||
| state.base = this.getBase(); | ||
| template.base = state.base; | ||
| } | ||
| return [state, "a", '#' + L.Util.template(this.options.path, template)]; | ||
| }, | ||
| setBase: function(base) { | ||
| var i, inputs, len, _ref; | ||
| this.base = base; | ||
| inputs = this.options.lc._form.getElementsByTagName('input'); | ||
| len = inputs.length; | ||
| i = 0; | ||
| while (i < len) { | ||
| if (inputs[i].name === 'leaflet-base-layers' && (_ref = this.options.lc._layers[inputs[i].layerId].name).replace.apply(_ref, this.options.formatBase) === base) { | ||
| inputs[i].checked = true; | ||
| this.options.lc._onInputClick(); | ||
| return true; | ||
| } | ||
| i++; | ||
| } | ||
| }, | ||
| getBase: function() { | ||
| var i, inputs, len, _ref; | ||
| if (this.base) { | ||
| return this.base; | ||
| } | ||
| inputs = this.options.lc._form.getElementsByTagName('input'); | ||
| len = inputs.length; | ||
| i = 0; | ||
| while (i < len) { | ||
| if (inputs[i].name === 'leaflet-base-layers' && inputs[i].checked) { | ||
| this.base = (_ref = this.options.lc._layers[inputs[i].layerId].name).replace.apply(_ref, this.options.formatBase); | ||
| return this.base; | ||
| } | ||
| } | ||
| return false; | ||
| }, | ||
| remove: function() { | ||
| this.map.off("moveend"); | ||
| if (window.onpopstate) { | ||
| window.onpopstate = null; | ||
| } | ||
| location.hash = ""; | ||
| return clearInterval(this.hashChangeInterval); | ||
| } | ||
| }); | ||
|
|
||
| L.hash = function(map, options) { | ||
| return new L.Hash(map, options); | ||
| }; | ||
|
|
||
| L.Map.include({ | ||
| addHash: function(options) { | ||
|
|
||
| this._hash = L.hash(this, options); | ||
|
|
||
| return this; | ||
| }, | ||
| removeHash: function() { | ||
| this._hash.remove(); | ||
| return this; | ||
| } | ||
| }); | ||
|
|
||
| }).call(this); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing
i++;