only stopping propagation if the remoteable was the target

ebertech · Apr 4, 2012 · 66490b7 · 66490b7
1 parent 35d690c
commit 66490b7
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/lib/assets/javascripts/remoteable.js b/lib/assets/javascripts/remoteable.js
@@ -127,23 +127,26 @@
                     });
 
                     self.on("ajax:complete.remoteable", function(event, jqXHR, textStatus) {
-                        event.stopPropagation();
-                        event.preventDefault();
-                        self.data("remoteable").currentRequest = null;
-                        var ct = jqXHR.getResponseHeader("content-type") || "";
-                        if(ct.indexOf('html') > -1) {
-                            var returned = $(jqXHR.responseText);
-							if(self.data("replace-self")) {
-								self.replaceWith(returned);
-							} else {
-                            	self.html(returned);								
-                            	self.trigger("refreshed.remoteable", [self.data("src")]);
-							}
-                        }
-                        if(ct.indexOf('json') > -1) {
-                            var url = $.parseJSON(jqXHR.responseText).redirect_to;
-                            self.remoteable("update", {url: url});
-                        }
+						if(event.target == self[0]){
+							event.stopPropagation();
+	                        event.preventDefault();
+	                        self.data("remoteable").currentRequest = null;
+	                        var ct = jqXHR.getResponseHeader("content-type") || "";
+	                        if(ct.indexOf('html') > -1) {
+	                            var returned = $(jqXHR.responseText);
+								if(self.data("replace-self")) {
+									self.replaceWith(returned);
+								} else {
+	                            	self.html(returned);								
+	                            	self.trigger("refreshed.remoteable", [self.data("src")]);
+								}
+	                        }
+	                        if(ct.indexOf('json') > -1) {
+	                            var url = $.parseJSON(jqXHR.responseText).redirect_to;
+	                            self.remoteable("update", {url: url});
+	                        }
+						}
+
                     });
 
                 }