Refactor Ajax features and add ajax setting in nmObj

nyroDev · Oct 21, 2012 · 1ff1040 · ADmad · Jan 1, 2013 · 1ff1040
1 parent 2a1e1af
commit 1ff1040
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/js/jquery.nyroModal.filters.form.js b/js/jquery.nyroModal.filters.form.js
@@ -25,13 +25,12 @@ jQuery(function($, undefined) {
 			},
 			load: function(nm) {
 				var data = {};
-				$.map(nm.opener.serializeArray(), function(d){
+				$.map(nm.opener.serializeArray(), function(d) {
 					data[d.name] = d.value;
 				});
 				if (nm.store.form.sel)
 					data[nm.selIndicator] = nm.store.form.sel.substring(1);
-
+				$.ajax($.extend(true, { type : 'get', dataType : 'text' }, nm.ajax || {}, {
-				var ajax = $.extend(true, { type : 'get', dataType : 'text' }, nm.ajax || {}, {
 					url: nm.store.form.url,
 					data: data,
 					type: nm.opener.attr('method') ? nm.opener.attr('method') : undefined,
@@ -41,9 +40,7 @@ jQuery(function($, undefined) {
 					error: function(jqXHR) {
 						nm._error(jqXHR);
 					}
-				});
+				}));
-
-				$.ajax(ajax);
 			},
 			destroy: function(nm) {
 				nm.opener.off('submit.nyroModal');

diff --git a/js/jquery.nyroModal.filters.link.js b/js/jquery.nyroModal.filters.link.js
@@ -24,17 +24,16 @@ jQuery(function($, undefined) {
 				});
 			},
 			load: function(nm) {
-				var ajax = $.extend(true, {}, nm.ajax || {}, {
+				$.ajax($.extend(true, {}, nm.ajax || {}, {
-						url: nm.store.link.url,
+					url: nm.store.link.url,
-						data: nm.store.link.sel ? [{name: nm.selIndicator, value: nm.store.link.sel.substring(1)}] : undefined,
+					data: nm.store.link.sel ? [{name: nm.selIndicator, value: nm.store.link.sel.substring(1)}] : undefined,
-						success: function(data) {
+					success: function(data) {
-							nm._setCont(data, nm.store.link.sel);
+						nm._setCont(data, nm.store.link.sel);
-						},
+					},
-						error: function(jqXHR) {
+					error: function(jqXHR) {
-							nm._error(jqXHR);
+						nm._error(jqXHR);
-						}
+					}
-					});
+				}));
-				$.ajax(ajax);
 			},
 			destroy: function(nm) {
 				nm.opener.off('click.nyroModal');

diff --git a/js/jquery.nyroModal.js b/js/jquery.nyroModal.js
@@ -38,6 +38,9 @@ jQuery(function($, undefined) {
 			// Specific confirguation for DOM filter
 			domCopy: false, // Indicates if DOM element should be copied or moved
 
+			// Specific confirguation for link and form filters
+			ajax: {}, // Ajax options to be used in link and form filter
+
 			// Specific confirguation for image filter
 			imageRegex: '[^\.]\.(jpg|jpeg|png|tiff|gif|bmp)\s*$',	// Regex used to detect image link