Fixing merge conflicts.

wet-boew · Jul 24, 2012 · 387e9e4 · 387e9e4
2 parents 74f1ad1 + 5835a2b
commit 387e9e4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/build/js/css/pe-ap-min.css b/build/js/css/pe-ap-min.css
diff --git a/src/js/pe-ap.js b/src/js/pe-ap.js
@@ -435,15 +435,17 @@
 		 * @return {void}
 		 */
 		_execute : function (fn_obj, elm) {
-			var exec = (typeof fn_obj._exec !== "undefined") ? fn_obj._exec : fn_obj.exec;
-			if (typeof fn_obj.depends !== "undefined") {
-				pe.add.js(fn_obj.depends, function () {
+			if (fn_obj !== undefined) {
+				var exec = (typeof fn_obj._exec !== "undefined") ? fn_obj._exec : fn_obj.exec;
+				if (typeof fn_obj.depends !== "undefined") {
+					pe.add.js(fn_obj.depends, function () {
+						exec(elm);
+					});
+				//delete fn_obj.depends;
+				} else {
+					// execute function since it has no depends and we can safely execute
 					exec(elm);
-				});
-			//delete fn_obj.depends;
-			} else {
-				// execute function since it has no depends and we can safely execute
-				exec(elm);
+				}
 			}
 			return;
 		},