update hash

Author: Calvin Metcalf

src/leaflet-hash.js

@@ -15,58 +15,62 @@
         this.options.formatBase = [
           /[\sA-Z]/g, function(match) {
             if (match.match(/\s/)) {
-              return "_ ";
+              return "_";
+            } else if (match.match(/\:/)) {
+                return "";
             }
             if (match.match(/[A-Z]/)) {
               return match.toLowerCase();
             }
           }
         ];
       }
-      if (this.map._loaded) {
+      if (this.map._loaded || location.hash) {
         return this.startListning();
       } else {
-        return this.map.on("load", this.startListning);
+        return this.map.on("load", this.startListning,this);
       }
     },
     startListning: function() {
-      var onHashChange,
-        _this = this;
+      var onHashChange,phash;
       if (location.hash) {
-        this.updateFromState(this.parseHash(location.hash));
+        phash = this.parseHash(location.hash);
+        if(phash){
+        this.updateFromState(phash);
+        }
       }
       if (history.pushState) {
         if (!location.hash) {
           history.replaceState.apply(history, this.formatState());
         }
         window.onpopstate = function(event) {
           if (event.state) {
-            return _this.updateFromState(event.state);
+            return this.updateFromState(event.state);
           }
         };
         this.map.on("moveend", function() {
           var pstate;
-          pstate = _this.formatState();
-          if (location.hash !== pstate[2] && !_this.moving) {
+          pstate = this.formatState();
+          if (location.hash !== pstate[2] && !this.moving) {
             return history.pushState.apply(history, pstate);
           }
-        });
+        },this);
       } else {
         if (!location.hash) {
           location.hash = this.formatState()[2];
         }
         onHashChange = function() {
           var pstate;
-          pstate = _this.formatState();
-          if (location.hash !== pstate[2] && !_this.moving) {
+          pstate = this.formatState();
+          if (location.hash !== pstate[2] && !this.moving) {
             return location.hash = pstate[2];
           }
         };
-        this.map.on("moveend", onHashChange);
+        this.map.on("moveend", onHashChange, this);
         if (('onhashchange' in window) && (window.documentMode === void 0 || window.documentMode > 7)) {
           window.onhashchange = function() {
             if (location.hash) {
-              return _this.updateFromState(_this.parseHash(location.hash));
+              return this.updateFromState(this.parseHash(location.hash));
             }
           };
         } else {
@@ -75,25 +79,28 @@
       }
       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();
+        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) {
+          if (location.hash !== pstate[2] && !this.moving) {
             return history.pushState.apply(history, pstate);
           }
         } else {
-          if (location.hash !== pstate[2] && !_this.moving) {
+          if (location.hash !== pstate[2] && !this.moving) {
             return location.hash = pstate[2];
           }
         }
-      });
+      }, this);
     },
     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(zIndex === -1 || latIndex === -1 || lngIndex === -1){
+          return;
+      }
       if (hash.indexOf("#") === 0) {
         hash = hash.substr(1);
       }
@@ -214,4 +221,4 @@
     }
   });
 
-}).call(this);
+}).call(this);