Change version to v2.0.0

Add comment for all element in nmObject Add modal parameter in nmObject Add showCloseButton parameter in nmObject Add selIndicator parameter Update embedly Regex
arunpjohny · Dec 30, 2010 · ca9a448 · ca9a448
1 parent 74f24f4
commit ca9a448
Show file tree

Hide file tree

Showing 14 changed files with 165 additions and 79 deletions.
diff --git a/js/jquery.nyroModal-ie6.js b/js/jquery.nyroModal-ie6.js
@@ -1,6 +1,6 @@
 /*
- * nyroModal v2.alpha
- * for IE6
+ * nyroModal v2.0.0
+ * For IE6
  *
  */
 jQuery(function($, undefined) {

diff --git a/js/jquery.nyroModal.anims.fade.js b/js/jquery.nyroModal.anims.fade.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Fade animations
  * 

diff --git a/js/jquery.nyroModal.filters.dom.js b/js/jquery.nyroModal.filters.dom.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Dom filter
  * 

diff --git a/js/jquery.nyroModal.filters.embedly.js b/js/jquery.nyroModal.filters.embedly.js
diff --git a/js/jquery.nyroModal.filters.form.js b/js/jquery.nyroModal.filters.form.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Form filter
  * 
@@ -24,9 +24,12 @@ jQuery(function($, undefined) {
 				});
 			},
 			load: function(nm) {
+				var data = nm.opener.serializeArray();
+				if (nm.store.form.sel)
+					data.push({name: nm.selIndicator, value: nm.store.form.sel});
 				$.ajax({
 					url: nm.store.form.url,
-					data: nm.opener.serializeArray(),
+					data: data,
 					type: nm.opener.attr('method') ? nm.opener.attr('method') : 'get',
 					success: function(data) {
 						nm._setCont(data, nm.store.form.sel);

diff --git a/js/jquery.nyroModal.filters.formFile.js b/js/jquery.nyroModal.filters.formFile.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Form file filter
  * 
@@ -32,7 +32,19 @@ jQuery(function($, undefined) {
 				});
 			},
 			initElts: function(nm) {
-				function rmIframe() {
+				var inputSel;
+				if (nm.store.form.sel)
+					inputSel = $('<input />', {
+						'type': 'hidden',
+						name: nm.selIndicator,
+						value: nm.store.form.sel
+					}).appendTo(nm.opener);
+				function rmFormFileElts() {
+					if (inputSel) {
+						inputSel.remove();
+						inputSel = undefined;
+						delete(inputSel);
+					}
 					nm.store.formFileIframe.attr('src', 'about:blank').remove();
 					nm.store.formFileIframe = undefined;
 					delete(nm.store.formFileIframe);
@@ -46,7 +58,7 @@ jQuery(function($, undefined) {
 									.unbind('load error')
 									.contents().find('body').not('script[src]');
 							if (content && content.html() && content.html().length) {
-								rmIframe();
+								rmFormFileElts();
 								nm._setCont(content.html(), nm.store.form.sel);
 							} else {
 								// Not totally ready, try it in a few secs
@@ -58,11 +70,11 @@ jQuery(function($, undefined) {
 												.contents().find('body').not('script[src]');
 										if (content && content.html() && content.html().length) {
 											nm._setCont(content.html(), nm.store.form.sel);
-											rmIframe();
+											rmFormFileElts();
 										} else if (nbTry < 5) {
 											setTimeout(fct, 25);
 										} else {
-											rmIframe();
+											rmFormFileElts();
 											nm._error();
 										}
 									};

diff --git a/js/jquery.nyroModal.filters.gallery.js b/js/jquery.nyroModal.filters.gallery.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Gallery filter
  * 

diff --git a/js/jquery.nyroModal.filters.iframe.js b/js/jquery.nyroModal.filters.iframe.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Iframe filter
  * 

diff --git a/js/jquery.nyroModal.filters.iframeForm.js b/js/jquery.nyroModal.filters.iframeForm.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Iframe form filter
  * 

diff --git a/js/jquery.nyroModal.filters.image.js b/js/jquery.nyroModal.filters.image.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Image filter
  * 

diff --git a/js/jquery.nyroModal.filters.link.js b/js/jquery.nyroModal.filters.link.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Link filter
  * 
@@ -26,6 +26,7 @@ jQuery(function($, undefined) {
 			load: function(nm) {
 				$.ajax({
 					url: nm.store.link.url,
+					data: nm.store.link.sel ? {nm.selIndicator: nm.store.link.sel} : undefined,
 					success: function(data) {
 						nm._setCont(data, nm.store.link.sel);
 					},

diff --git a/js/jquery.nyroModal.filters.swf.js b/js/jquery.nyroModal.filters.swf.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * SWF filter
  * 

diff --git a/js/jquery.nyroModal.filters.title.js b/js/jquery.nyroModal.filters.title.js
@@ -1,5 +1,5 @@
 /*
- * nyroModal v2.alpha
+ * nyroModal v2.0.0
  * 
  * Title filter
  *