Minot updates

jacob-xie · Aug 13, 2013 · 0f36893 · 0f36893
1 parent 4c2a31a
commit 0f36893
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/source/jquery.fancybox.js b/source/jquery.fancybox.js
@@ -363,12 +363,16 @@
 		cancel: function () {
 			var coming = F.coming;
 
-			if (!coming || false === F.trigger('onCancel')) {
+			if (false === F.trigger('onCancel')) {
 				return;
 			}
 
 			F.hideLoading();
 
+			if (!coming) {
+				return;
+			}
+
 			if (F.ajaxLoad) {
 				F.ajaxLoad.abort();
 			}
@@ -743,24 +747,22 @@
 		trigger: function (event, o) {
 			var ret, obj = o || F.coming || F.current;
 
-			if (!obj) {
-				return;
-			}
-
-			if ($.isFunction( obj[event] )) {
-				ret = obj[event].apply(obj, Array.prototype.slice.call(arguments, 1));
-			}
+			if (obj) {
+				if ($.isFunction( obj[event] )) {
+					ret = obj[event].apply(obj, Array.prototype.slice.call(arguments, 1));
+				}
 
-			if (ret === false) {
-				return false;
-			}
+				if (ret === false) {
+					return false;
+				}
 
-			if (obj.helpers) {
-				$.each(obj.helpers, function (helper, opts) {
-					if (opts && F.helpers[helper] && $.isFunction(F.helpers[helper][event])) {
-						F.helpers[helper][event]($.extend(true, {}, F.helpers[helper].defaults, opts), obj);
-					}
-				});
+				if (obj.helpers) {
+					$.each(obj.helpers, function (helper, opts) {
+						if (opts && F.helpers[helper] && $.isFunction(F.helpers[helper][event])) {
+							F.helpers[helper][event]($.extend(true, {}, F.helpers[helper].defaults, opts), obj);
+						}
+					});
+				}
 			}
 
 			D.trigger(event);

diff --git a/source/jquery.fancybox.pack.js b/source/jquery.fancybox.pack.js