Merge branch 'master' into data-disable

Conflicts:
	test/public/test/data-disable.js

Author: lucasmazza

Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gem 'sinatra', '~> 1.0'
 gem 'shotgun', :group => :reloadable
 gem 'thin', :group => :reloadable
+gem 'rake'

Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     daemons (1.1.0)
     eventmachine (0.12.10)
     rack (1.2.1)
+    rake (10.1.1)
     shotgun (0.8)
       rack (>= 1.0)
     sinatra (1.1.2)
@@ -19,6 +20,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
   shotgun
   sinatra (~> 1.0)
   thin

README.md

@@ -15,7 +15,7 @@ Full [documentation is on the wiki][wiki], including the [list of published Ajax
 Requirements
 ------------
 
-- [jQuery 1.7.x or higher][jquery];
+- [jQuery 1.8.x or higher and less than 2.0][jquery];
 - HTML5 doctype (optional).
 
 If you don't use HTML5, adding "data" attributes to your HTML4 or XHTML pages might make them fail [W3C markup validation][validator]. However, this shouldn't create any issues for web browsers or other user agents.

src/rails.js

@@ -129,7 +129,11 @@
             if (settings.dataType === undefined) {
               xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
             }
-            return rails.fire(element, 'ajax:beforeSend', [xhr, settings]);
+            if (rails.fire(element, 'ajax:beforeSend', [xhr, settings])) {
+              element.trigger('ajax:send', xhr);
+            } else {
+              return false;
+            }
           },
           success: function(data, status, xhr) {
             element.trigger('ajax:success', [data, status, xhr]);
@@ -154,9 +158,7 @@
         // Only pass url to `ajax` options if not blank
         if (url) { options.url = url; }
 
-        var jqxhr = rails.ajax(options);
-        element.trigger('ajax:send', jqxhr);
-        return jqxhr;
+        return rails.ajax(options);
       } else {
         return false;
       }
@@ -387,7 +389,7 @@
       button.closest('form').data('ujs:submit-button', data);
     });
 
-    $document.delegate(rails.formSubmitSelector, 'ajax:beforeSend.rails', function(event) {
+    $document.delegate(rails.formSubmitSelector, 'ajax:send.rails', function(event) {
       if (this == event.target) rails.disableFormElements($(this));
     });
 

test/public/test/call-remote-callbacks.js

@@ -9,6 +9,7 @@ module('call-remote-callbacks', {
   teardown: function() {
     $(document).undelegate('form[data-remote]', 'ajax:beforeSend');
     $(document).undelegate('form[data-remote]', 'ajax:before');
+    $(document).undelegate('form[data-remote]', 'ajax:send');
     $(document).undelegate('form[data-remote]', 'ajax:complete');
     $(document).undelegate('form[data-remote]', 'ajax:success');
     $(document).unbind('ajaxStop');
@@ -97,6 +98,9 @@ asyncTest('stopping the "ajax:beforeSend" event aborts the request', 1, function
       ok(true, 'aborting request in ajax:beforeSend');
       return false;
     });
+    form.unbind('ajax:send').bind('ajax:send', function() {
+      ok(false, 'ajax:send should not run');
+    });
     form.unbind('ajax:complete').bind('ajax:complete', function() {
       ok(false, 'ajax:complete should not run');
     });
@@ -315,6 +319,9 @@ asyncTest('"ajax:beforeSend" can be observed and stopped with event delegation',
   });
 
   submit(function(form) {
+    form.unbind('ajax:send').bind('ajax:send', function() {
+      ok(false, 'ajax:send should not run');
+    });
     form.unbind('ajax:complete').bind('ajax:complete', function() {
       ok(false, 'ajax:complete should not run');
     });
@@ -324,12 +331,15 @@ asyncTest('"ajax:beforeSend" can be observed and stopped with event delegation',
   });
 });
 
-asyncTest('"ajax:beforeSend", "ajax:success" and "ajax:complete" are triggered', 8, function() {
+asyncTest('"ajax:beforeSend", "ajax:send", "ajax:success" and "ajax:complete" are triggered', 9, function() {
   submit(function(form) {
     form.bind('ajax:beforeSend', function(e, xhr, settings) {
       ok(xhr.setRequestHeader, 'first argument to "ajax:beforeSend" should be an XHR object');
       equal(settings.url, '/echo', 'second argument to "ajax:beforeSend" should be a settings object');
     });
+    form.bind('ajax:send', function(e, xhr) {
+      ok(xhr.abort, 'first argument to "ajax:send" should be an XHR object');
+    });
     form.bind('ajax:success', function(e, data, status, xhr) {
       ok(data.REQUEST_METHOD, 'first argument to ajax:success should be a data object');
       equal(status, 'success', 'second argument to ajax:success should be a status string');
@@ -342,10 +352,11 @@ asyncTest('"ajax:beforeSend", "ajax:success" and "ajax:complete" are triggered',
   });
 });
 
-asyncTest('"ajax:beforeSend", "ajax:error" and "ajax:complete" are triggered on error', 6, function() {
+asyncTest('"ajax:beforeSend", "ajax:send", "ajax:error" and "ajax:complete" are triggered on error', 7, function() {
   submit(function(form) {
     form.attr('action', '/error');
     form.bind('ajax:beforeSend', function(arg) { ok(true, 'ajax:beforeSend') });
+    form.bind('ajax:send', function(arg) { ok(true, 'ajax:send') });
     form.bind('ajax:error', function(e, xhr, status, error) {
       ok(xhr.getResponseHeader, 'first argument to "ajax:error" should be an XHR object');
       equal(status, 'error', 'second argument to ajax:error should be a status string');
@@ -358,11 +369,14 @@ asyncTest('"ajax:beforeSend", "ajax:error" and "ajax:complete" are triggered on
 });
 
 // IF THIS TEST IS FAILING, TRY INCREASING THE TIMEOUT AT THE BOTTOM TO > 100
-asyncTest('binding to ajax callbacks via .delegate() triggers handlers properly', 3, function() {
+asyncTest('binding to ajax callbacks via .delegate() triggers handlers properly', 4, function() {
   $(document)
     .delegate('form[data-remote]', 'ajax:beforeSend', function() {
       ok(true, 'ajax:beforeSend handler is triggered');
     })
+    .delegate('form[data-remote]', 'ajax:send', function() {
+      ok(true, 'ajax:send handler is triggered');
+    })
     .delegate('form[data-remote]', 'ajax:complete', function() {
       ok(true, 'ajax:complete handler is triggered');
     })

test/public/test/data-disable.js

@@ -141,7 +141,7 @@ asyncTest('a[data-remote][data-disable] disables and re-enables', 6, function()
   App.checkEnabledState(link, 'Click me');
 
   link
-    .bind('ajax:beforeSend', function() {
+    .bind('ajax:send', function() {
       App.checkDisabledState(link, 'Click me');
     })
     .bind('ajax:complete', function() {
@@ -195,7 +195,7 @@ asyncTest('a[data-remote][data-disable] re-enables when `ajax:error` event is tr
   App.checkEnabledState(link, 'Click me');
 
   link
-    .bind('ajax:beforeSend', function() {
+    .bind('ajax:send', function() {
       App.checkDisabledState(link, 'Click me');
     })
     .trigger('click');

test/server.rb

@@ -1,7 +1,7 @@
 require 'sinatra'
 require 'json'
 
-JQUERY_VERSIONS = %w[ 1.7 1.7.1 1.7.2 1.8.0 1.8.1 1.8.2 1.8.3 1.9.0 1.9.1 1.10.0 1.10.1 ].freeze
+JQUERY_VERSIONS = %w[ 1.8.0 1.8.1 1.8.2 1.8.3 1.9.0 1.9.1 1.10.0 1.10.1 1.10.2 1.11.0 ].freeze
 
 use Rack::Static, :urls => ["/src"], :root => File.expand_path('..', settings.root)
 
@@ -48,7 +48,7 @@ def jquery_versions
 end
 
 get '/' do
-  params[:version] ||= '1.10.1'
+  params[:version] ||= '1.11.0'
   params[:cdn] ||= 'jquery'
   erb :index
 end

test/views/layout.erb

@@ -5,11 +5,18 @@
     <link href="/vendor/qunit.css" media="screen" rel="stylesheet" type="text/css" media="screen, projection" />
     <style>
       #jquery-cdn, #jquery-version {
-        color: #8699A4; text-align: right; font-family: sans-serif; line-height: 1;
-        margin-top: -1.8em; padding: 0 2em .8em 0;
+        padding: 0 2em .8em 0;
+        text-align: right;
+        font-family: sans-serif;
+        line-height: 1;
+        color: #8699A4;
+        background-color: #0d3349;
+      }
+
+      #jquery-cdn a, #jquery-version a {
+        color: white;
+        text-decoration: underline;
       }
-      #jquery-cdn { margin-right: 550px; }
-      #jquery-cdn a, #jquery-version a { color: white; text-decoration: underline; }
     </style>
 
     <%= script_tag jquery_src %>