work on rails3 driver dom events

ttilley · Feb 27, 2010 · 5620cc6 · 5620cc6
1 parent 245e52f
commit 5620cc6
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 7 deletions.
diff --git a/rails/ujs.js → rails/_util/ujs.js b/rails/ujs.js → rails/_util/ujs.js
@@ -1,4 +1,5 @@
-dojo.require('plugd.trigger');
+dojo.provide('rails._util.ujs');
+dojo.require('rails._util.xhrDomEvents');
 dojo.require('dojo.NodeList-traverse');
 
 // main handlers:
@@ -40,24 +41,25 @@ dojo.require('dojo.NodeList-traverse');
             method = el.attr('method') || 'post';
             url = el.attr('action');
             params = dojo.formToObject(el);
-			hasBody = true;
+            hasBody = true;
         }
         else {
             method = el.attr('data-method') || 'get';
             url = el.attr('data-url') || el.attr('href');
             params = {};
-			hasBody = false;
+            hasBody = false;
         }
 
         if (!dojo.trigger(el, 'ajax:before')) {
             return false;
         }
 
         dojo.xhr(method, {
-			url: url,
-			handleAs: 'javascript',
-			content: params
-		}, hasBody);
+            url: url,
+            handleAs: 'javascript',
+            content: params,
+            domEvents: el
+        }, hasBody);
 
         dojo.trigger(el, 'ajax:after');
     };

diff --git a/rails/_util/xhrDomEvents.js b/rails/_util/xhrDomEvents.js
@@ -0,0 +1,63 @@
+dojo.provide('rails._util.xhrDomEvents');
+dojo.require('rails._util.xhrReadyState');
+dojo.require('plugd.trigger');
+
+(function(){
+    var _xhr = dojo.xhr;
+
+    var _xhrDomEventHandler = function(element, customEvent){
+        var handler = dojo.hitch(element, dojo.trigger, element, customEvent);
+        return function(xhr){
+            handler({request: xhr});
+        }
+    };
+
+    var _xhrDomEventsFor = function(element){
+        return {
+            onLoading: _xhrDomEventHandler(element, 'ajax:loading'),
+            onLoaded: _xhrDomEventHandler(element, 'ajax:loaded'),
+            onInteractive: _xhrDomEventHandler(element, 'ajax:interactive'),
+            onComplete: _xhrDomEventHandler(element, 'ajax:complete')
+        }
+    };
+
+    dojo.xhr = function(method, args, hasBody){
+        if (args && args.domEvents) {
+            var element = args.domEvents;
+            delete args.domEvents;
+
+            var readyStateCallbacks = _xhrDomEventsFor(element);
+            if (args.readyStateCallbacks) {
+                var overWrite = args.readyStateCallbacks;
+                dojo.mixin(readyStateCallbacks, overWrite);
+            }
+            args.readyStateCallbacks = readyStateCallbacks;
+
+            var dfd;
+
+            // TODO: find a way to return a sane deferred before xhr is even
+            // called...
+            // if (!dojo.trigger(element, 'ajax:before')) {
+            //   dfd = new dojo.Deferred();
+            //   dfd.cancel();
+            //   return dfd;
+            // }
+
+            dfd = _xhr(method, args, hasBody);
+
+            var ajaxSuccess = _xhrDomEventHandler(element, 'ajax:success');
+            var ajaxFailure = _xhrDomEventHandler(element, 'ajax:failure');
+
+            dfd.addCallbacks(function(dfd){
+                ajaxSuccess(dfd.ioArgs.xhr);
+            }, function(dfd){
+                ajaxFailure(dfd.ioArgs.xhr);
+            });
+
+            // dojo.trigger(element, 'ajax:after');
+
+            return dfd;
+        }
+    };
+
+})();
diff --git a/rails/_util/xhrReadyState.js b/rails/_util/xhrReadyState.js
@@ -0,0 +1,29 @@
+dojo.provide('rails._util.xhrReadyState');
+
+(function(){
+    var _xhrObj = dojo._xhrObj;
+    var _readyStates = ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+    var _readyStateHandler = function(callbacks, readyState){
+        var state = _readyStates[readyState];
+        var callback = callbacks['on' + state];
+        if (callback && dojo.isFunction(callback)) {
+            callback(this);
+        }
+    }
+
+    dojo._xhrObj = function(args){
+        var http = _xhrObj();
+        if (callbacks = args.readyStateCallbacks) {
+            delete args.readyStateCallbacks;
+            try {
+                http.onreadystatechange = dojo.hitch(http, _readyStateHandler, callbacks);
+            } 
+            catch (e) {
+                console.error("Unable to setup ready state handler:");
+                console.error(e);
+            }
+        }
+        return http;
+    }
+})();