Add needClose to be able to close modal after current animation. Fix #…

…169
nyroDev · Oct 15, 2014 · 3864084 · 3864084
1 parent 0d162ed
commit 3864084
Showing 1 changed file with 30 additions and 19 deletions.
diff --git a/js/jquery.nyroModal.js b/js/jquery.nyroModal.js
@@ -121,6 +121,7 @@ jQuery(function($, undefined) {
 			_loading: false,	// Indicates if the loading is shown
 			_animated: false,	// Indicates if the modal is currently animated
 			_transition: false,	//Indicates if the modal is in transition
+			_needClose: false, // Indicates if the modal should close after current animation
 			_nmOpener: undefined,	// nmObj of the modal that opened the current one in non stacking mode
 			_nbContentLoading: 0,	// Counter for contentLoading call
 			_scripts: '',	// Scripts tags to be included
@@ -236,30 +237,38 @@ jQuery(function($, undefined) {
 			// Internal function for closing a nyroModal
 			// Will call 'close' callback filter
 			_close: function() {
-				this.getInternal()._removeStack(this.opener);
+				if (!this._animated) {
-				this._opened = false;
+					this.getInternal()._removeStack(this.opener);
-				this._open = false;
+					this._opened = false;
-				this._callFilters('close');
+					this._open = false;
+					this._callFilters('close');
+					return true;
+				} else {
+					this._needClose = true;
+				}
+				return false;
 			},
 			// Public function for closing a nyroModal
 			close: function() {
-				this._close();
+				if (this._close()) {
-				this._callFilters('beforeClose');
+					this._needClose = false;
-				var self = this;
+					this._callFilters('beforeClose');
-				this._unreposition();
+					var self = this;
-				self._callAnim('hideCont', function() {
+					this._unreposition();
-					self._callAnim('hideLoad', function() {
+					self._callAnim('hideCont', function() {
-						self._callAnim('hideBg', function() {
+						self._callAnim('hideLoad', function() {
-							self._callFilters('afterClose');
+							self._callAnim('hideBg', function() {
-							self.elts.cont.remove();
+								self._callFilters('afterClose');
-							self.elts.hidden.remove();
+								self.elts.cont.remove();
-							self.elts.load.remove();
+								self.elts.hidden.remove();
-							self.elts.bg.remove();
+								self.elts.load.remove();
-							self.elts.all.remove();
+								self.elts.bg.remove();
-							self.elts.cont = self.elts.hidden = self.elts.load = self.elts.bg = self.elts.all = undefined;
+								self.elts.all.remove();
+								self.elts.cont = self.elts.hidden = self.elts.load = self.elts.bg = self.elts.all = undefined;
+							});
 						});
 					});
-				});
+				}
 			},
 
 			// Public function for destroying a nyroModal instance, only for non open modal
@@ -443,6 +452,8 @@ jQuery(function($, undefined) {
 							this._animated = false;
 							this._callFilters('after'+ucfirst(fct));
 							clb();
+							if (this._needClose)
+								setTimeout($.proxy(function() {this.close();}, this), 50);
 						}, this));
 				}
 			},