Permalink
Browse files

Merge branch 'whitespace' of https://github.com/FND/jquery-ujs into F…

…ND-whitespace

Conflicts:
	src/rails.js
  • Loading branch information...
2 parents cb54ae2 + 490f24b commit f38dba19da023b223d50aa2bd71b8a10e85421f9 @JangoSteve JangoSteve committed Nov 25, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/rails.js
View
@@ -52,8 +52,8 @@
// Link elements bound by jquery-ujs
linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]',
- // Select elements bound by jquery-ujs
- inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
+ // Select elements bound by jquery-ujs
+ inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
// Form elements bound by jquery-ujs
formSubmitSelector: 'form',
@@ -307,7 +307,7 @@
}
});
- $(document).delegate(rails.inputChangeSelector, 'change.rails', function(e) {
+ $(document).delegate(rails.inputChangeSelector, 'change.rails', function(e) {
var link = $(this);
if (!rails.allowAction(link)) return rails.stopEverything(e);
@@ -365,4 +365,4 @@
if (this == event.target) rails.enableFormElements($(this));
});
-})( jQuery );
+})( jQuery );

0 comments on commit f38dba1

Please sign in to comment.