Bug fix sachinchoolur#9

huleg · Aug 4, 2016 · 6230e89 · 6230e89
1 parent 481dcf8
commit 6230e89
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "lightgallery.js",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Full featured lightbox gallery. Zero dependencies",
   "main": [
       "dist/js/lightgallery.min.js",

diff --git a/dist/img/loading.gif b/dist/img/loading.gif
diff --git a/dist/img/video-play.png b/dist/img/video-play.png
diff --git a/dist/img/vimeo-play.png b/dist/img/vimeo-play.png
diff --git a/dist/img/youtube-play.png b/dist/img/youtube-play.png
diff --git a/dist/js/lightgallery.js b/dist/js/lightgallery.js
@@ -1,5 +1,5 @@
 /**!
- * lightgallery.js | 0.0.1 | August 2nd 2016
+ * lightgallery.js | 0.0.2 | August 4th 2016
  * http://sachinchoolur.github.io/lightGallery/
  * Copyright (c) 2016 Sachin N; 
  * @license Apache 2.0 
@@ -576,7 +576,7 @@
         }
 
         // Store the current scroll top value to scroll back after closing the gallery..
-        this.prevScrollTop = document.body.scrollTop;
+        this.prevScrollTop = document.documentElement.scrollTop || document.body.scrollTop;
     };
 
     // For fixed height gallery
@@ -1327,7 +1327,7 @@
                     if (!_lgUtils2.default.hasClass(_this.outer, 'lg-zoomed') && !_this.lgBusy) {
                         e.preventDefault();
                         _this.manageSwipeClass();
-                        startCoords = e.originalEvent.targetTouches[0].pageX;
+                        startCoords = e.targetTouches[0].pageX;
                     }
                 });
             }
@@ -1337,7 +1337,7 @@
                 _lgUtils2.default.on(_this.___slide[j], 'touchmove.lg', function (e) {
                     if (!_lgUtils2.default.hasClass(_this.outer, 'lg-zoomed')) {
                         e.preventDefault();
-                        endCoords = e.originalEvent.targetTouches[0].pageX;
+                        endCoords = e.targetTouches[0].pageX;
                         _this.touchMove(startCoords, endCoords);
                         isMoved = true;
                     }
@@ -1507,6 +1507,7 @@
         }
 
         document.body.scrollTop = _this.prevScrollTop;
+        document.documentElement.scrollTop = _this.prevScrollTop;
 
         /**
          * if d is false or undefined destroy will only close the gallery

diff --git a/dist/js/lightgallery.min.js b/dist/js/lightgallery.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lightgallery.js",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Full featured lightbox gallery. Zero dependencies",
   "keywords": [
     "gallery",
@@ -55,7 +55,7 @@
     "build-debug": "browserify src/js/lightgallery.js -s Lightgallery -t [babelify] -p [bannerify --file .banner ] -o dist/js/lightgallery.js",
     "build-min": "uglifyjs dist/js/lightgallery.js --comments '/!/' -m screw_ie8=true -c screw_ie8=true,unused=false -o dist/js/lightgallery.min.js",
     "watch": "watchify src/js/lightgallery.js -s Lightgallery -t [babelify] -o dist/js/lightgallery.js -v",
-    "dev": "watchify src/js/lightgallery.js -s Lightgallery -t [babelify] -o ../../lightgallery.js/lightgallery/js/lightgallery.js -v",
+    "dev": "watchify src/js/lightgallery.js -s Lightgallery -t [babelify] -o ../lg/lightgallery.js/lightgallery/js/lightgallery.js -v",
     "css": "cleancss -o dist/css/lightgallery.min.css dist/css/lightgallery.css && cleancss -o dist/css/lg-fb-comment-box.min.css dist/css/lg-fb-comment-box.css && cleancss -o dist/css/lg-transitions.min.css dist/css/lg-transitions.css",
     "copyfiles": "copyfiles -u 1 ./src/fonts/** dist && copyfiles -u 1 ./src/img/** dist && copyfiles -u 1 ./src/css/** dist",
     "lint": "jshint src",

diff --git a/src/js/lightgallery.js b/src/js/lightgallery.js
@@ -380,7 +380,7 @@ Plugin.prototype.structure = function() {
     }
 
     // Store the current scroll top value to scroll back after closing the gallery..
-    this.prevScrollTop = document.body.scrollTop;
+    this.prevScrollTop = (document.documentElement.scrollTop || document.body.scrollTop)
 
 };
 
@@ -1141,7 +1141,7 @@ Plugin.prototype.enableSwipe = function() {
                 if (!utils.hasClass(_this.outer, 'lg-zoomed') && !_this.lgBusy) {
                     e.preventDefault();
                     _this.manageSwipeClass();
-                    startCoords = e.originalEvent.targetTouches[0].pageX;
+                    startCoords = e.targetTouches[0].pageX;
                 }
             });
         }
@@ -1151,7 +1151,7 @@ Plugin.prototype.enableSwipe = function() {
             utils.on(_this.___slide[j], 'touchmove.lg', function(e) {
                 if (!utils.hasClass(_this.outer, 'lg-zoomed')) {
                     e.preventDefault();
-                    endCoords = e.originalEvent.targetTouches[0].pageX;
+                    endCoords = e.targetTouches[0].pageX;
                     _this.touchMove(startCoords, endCoords);
                     isMoved = true;
                 }
@@ -1329,6 +1329,7 @@ Plugin.prototype.destroy = function(d) {
     }
 
     document.body.scrollTop = _this.prevScrollTop;
+    document.documentElement.scrollTop = _this.prevScrollTop;
 
     /**
      * if d is false or undefined destroy will only close the gallery