To fix #3. (#21)

* To fix #3. clearWatch when the element is detached from DOM. * Fix stuffs. * Update geo-location.html * Update geo-location.html
ebidel · Aug 7, 2016 · 9eee56a · 9eee56a
1 parent 46664c1
commit 9eee56a
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/geo-location.html b/geo-location.html
@@ -142,17 +142,29 @@
        *   @param {Number} detail.longitude Longitude of the current position.
        */
 
+      detached: function () {
+        this._clearWatch(watch_);
+      },
+
+      /**
+       * Stop updating latitude/longitude as the device changes position.
+       * @param {Number} watch watch ID value.
+       */
+      _clearWatch: function (watch) {
+        if (watch !== null) {
+            navigator.geolocation.clearWatch(watch);
+            watch_ = null;   
+        }
+      },
+
       clear: function () {
         this._setPosition(null);
         this._setLatitude(null);
         this._setLongitude(null);
       },
 
       fetch: function () {
-        if (watch_) {
-          navigator.geolocation.clearWatch(watch_);
-          watch_ = null;
-        }
+        this._clearWatch(watch_);
 
         if (this.idle) {
           return;
@@ -168,8 +180,7 @@
 
         if (this.watchPos) {
           watch_ = navigator.geolocation.watchPosition(success, error, options);
-        }
-        else {
+        } else {
           navigator.geolocation.getCurrentPosition(success, error, options);
         }
       },