Fixed hide() exception and onShow firing onresize

fixes #9, fixes #10
staaky · Oct 5, 2015 · ed13a8a · ed13a8a
1 parent c4ac45b
commit ed13a8a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "strip",
   "description": "A Less Intrusive Responsive Lightbox",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "homepage": "http://stripjs.com",
   "keywords": [
     "lightbox",

diff --git a/dist/css/strip.css b/dist/css/strip.css
@@ -1,5 +1,5 @@
 /*!
- * Strip - A Less Intrusive Responsive Lightbox - v1.6.1
+ * Strip - A Less Intrusive Responsive Lightbox - v1.6.2
  * (c) 2014-2015 Nick Stakenburg
  *
  * http://www.stripjs.com

diff --git a/dist/js/strip.pkgd.js b/dist/js/strip.pkgd.js
@@ -1,5 +1,5 @@
 /*!
- * Strip - A Less Intrusive Responsive Lightbox - v1.6.1
+ * Strip - A Less Intrusive Responsive Lightbox - v1.6.2
  * (c) 2014-2015 Nick Stakenburg
  *
  * http://www.stripjs.com
@@ -25,7 +25,7 @@
 }(this, function($) {
 
 var Strip = {
-  version: '1.6.1'
+  version: '1.6.2'
 };
 
 Strip.Skins = {
@@ -1489,6 +1489,12 @@ $.extend(Page.prototype, {
       // store duration on resize and use it for the other animations
       var z = this.getOrientation() == 'horizontal' ? 'width' : 'height';
 
+      // onShow callback
+      var onShow = this.view && this.view.options.onShow;
+      if ($.type(onShow) == 'function') {
+        onShow.call(Strip);
+      }
+
       var duration = Window.resize(this[z], function() {
         if (--fx < 1) next_shown_and_resized();
       }, duration);
@@ -1955,12 +1961,6 @@ var Window = {
     if (wh > 0) {
       this.visible = true;
       this.startObservingResize();
-
-      // onShow callback
-      var onShow = this.view && this.view.options.onShow;
-      if ($.type(onShow) == 'function') {
-        onShow.call(Strip);
-      }
     }
 
     var fromZ = Window.element['outer' + Z](),
@@ -2208,6 +2208,8 @@ var Window = {
   },
 
   hide: function(callback) {
+    if (!this.view) return;
+
     var hideQueue = this.queues.hide;
     hideQueue.queue([]); // clear queue
 

diff --git a/dist/js/strip.pkgd.min.js b/dist/js/strip.pkgd.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@staaky/strip",
   "title": "Strip",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "A Less Intrusive Responsive Lightbox",
   "homepage": "http://stripjs.com",
   "author": {

diff --git a/src/js/page.js b/src/js/page.js
@@ -364,6 +364,12 @@ $.extend(Page.prototype, {
       // store duration on resize and use it for the other animations
       var z = this.getOrientation() == 'horizontal' ? 'width' : 'height';
 
+      // onShow callback
+      var onShow = this.view && this.view.options.onShow;
+      if ($.type(onShow) == 'function') {
+        onShow.call(Strip);
+      }
+
       var duration = Window.resize(this[z], function() {
         if (--fx < 1) next_shown_and_resized();
       }, duration);

diff --git a/src/js/window.js b/src/js/window.js
@@ -145,12 +145,6 @@ var Window = {
     if (wh > 0) {
       this.visible = true;
       this.startObservingResize();
-
-      // onShow callback
-      var onShow = this.view && this.view.options.onShow;
-      if ($.type(onShow) == 'function') {
-        onShow.call(Strip);
-      }
     }
 
     var fromZ = Window.element['outer' + Z](),
@@ -398,6 +392,8 @@ var Window = {
   },
 
   hide: function(callback) {
+    if (!this.view) return;
+
     var hideQueue = this.queues.hide;
     hideQueue.queue([]); // clear queue