hobo_jquery 1.4.0.pre6 → 1.4.0.pre7

data/VERSION

@@ -1 +1 @@
-1.4.0.pre6
+1.4.0.pre7

data/taglibs/hobo_jquery.dryml

@@ -8,11 +8,10 @@ hobo_jquery
 %>
 <def tag="page-scripts">
   <do param="default">
- <% attributes.reverse_merge!(:data_rapid_page_data => {
-                               'form_auth_token' => { 'name' => request_forgery_protection_token, 'value' => form_authenticity_token},
-                               'hobo_parts' => part_contexts_storage_uncoded}.to_json,
-                              :style => "display: none;") %>
-    <%= tag("span", deunderscore_attributes(attributes)) %>
+ <% attrs = deunderscore_attributes(attributes).reverse_merge( 'form_auth_token' => { 'name' => request_forgery_protection_token, 'value' => form_authenticity_token},
+                               'hobo_parts' => part_contexts_storage_uncoded
+                              ) %>
+    <%= tag("span", "data-rapid-page-data" => attrs.to_json, :style => "display: none;") %>
   </do>
 </def>
 

data/vendor/assets/javascripts/hobo-jquery/hjq-a.js

@@ -9,14 +9,9 @@
             var that = $(this);
             var options = that.data('rapid').a.ajax_attrs;
             if(!options.message) options.message="Loading...";
-            var roptions = that.hjq('buildRequest', {
-                type: 'GET',
-                attrs: options
-            });
-            if(options.push_state) {
-                window.History.pushState(null, options.new_title || null, that.attr('href'));
-            };
-            $.ajax(that.attr('href'), roptions);
+            var hobo_options = {type: 'GET', attrs: options};
+            var roptions = that.hjq('buildRequestData', hobo_options);
+            that.hjq("changeLocationAjax", that.attr('href'), roptions, hobo_options);
             return false;
         }
     };

data/vendor/assets/javascripts/hobo-jquery/hjq-form.js

@@ -19,17 +19,24 @@
 
             if(form.attr('enctype') == 'multipart/form-data') {
                 if(form.ajaxSubmit) {
-                    var roptions= form.hjq('buildRequest', $.extend(options, {preamble: '<textarea>', postamble: '</textarea>', content_type: 'text/html'}));
+                    options = $.extend(options, {preamble: '<textarea>', postamble: '</textarea>', content_type: 'text/html'});
+                    var roptions = form.hjq('buildRequestData', options);
 
                     if(!roptions) return false;
                     roptions.iframe = true;
+
+                    roptions = form.hjq('buildRequestCallbacks', roptions, options)
+
+                    if(options.attrs.push_state) {
+                      alert("push_state not supported on multipart forms");
+                    }
                     form.ajaxSubmit(roptions);
                 } else {
                     alert("malsup's jquery form plugin required to do ajax submissions of multipart forms");
                 }
 
             } else {
-                var roptions= form.hjq('buildRequest', options);
+                var roptions= form.hjq('buildRequestData', options);
                 if(!roptions) return false;
 
                 // make sure we don't serialize any nested formlets
@@ -39,10 +46,7 @@
 
                 roptions.data = $.param(roptions.data) + "&" + data;
 
-                if (options.attrs.push_state) {
-                    window.History.pushState(null, options.attrs.new_title || null, form[0].action+"?"+data);
-                }
-                $.ajax(form[0].action, roptions);
+                form.hjq("changeLocationAjax", form[0].action+"?"+data, roptions, options);
             }
 
             // prevent bubbling

data/vendor/assets/javascripts/hobo-jquery/hjq-spinner.js

@@ -54,14 +54,14 @@
                 });
             }
             if(!clone) return this;
-            clone.hide('fast');
+            clone.remove();
             return this;
         },
     };
 
     var defaultOptions = function() {
         if(default_options) return default_options;
-        page_options = this.hjq('pageData');
+        var page_options = this.hjq('pageData');
         default_options = {};
         default_options['spinner-next-to'] = page_options['spinner-next-to'];
         default_options['spinner-at'] = page_options['spinner-at'];
@@ -71,6 +71,7 @@
             at: "left top"
         };
         default_options['message'] = page_options['message'];
+        return default_options;
     };
 
     $.fn.hjq_spinner = function( method ) {

data/vendor/assets/javascripts/hobo-jquery/hjq.js

@@ -8,7 +8,23 @@
 
     var methods = {
 
-        init : function() {
+        /* call only once per document. */
+        initOnce: function() {
+          if(typeof History === 'object') {  // History.js installed
+            $(window).on("statechange", function() {
+              var state = History.getState();
+              if(state.data.length==3) {
+                var form = $(state.data[0]);
+                var roptions = form.hjq('buildRequestCallbacks', state.data[1], state.data[2]);
+                $.ajax(state.url, roptions);
+              }
+            })
+          }
+          return true;
+        },
+
+        /* call for every new fragment */
+        init: function() {
             var top = this;
             this.find("[data-rapid-page-data]").each(function() {
                 page_data = $(this).data('rapid-page-data');
@@ -152,6 +168,23 @@
 	    return function() { return eval(script); };
 	},
 
+
+        /* returns a jQuery selector for an element. One option would
+           be to use something like
+           http://stackoverflow.com/questions/2206958/best-way-to-reference-an-element-with-jquery
+           However, if the DOM changes due to Ajax this isn't
+           necessarily stable. So instead we give the element a unique
+           ID if it doesn't already have one.
+        */
+
+        getPath: function() {
+          if(!this.attr("id")) {
+            this.attr("id", Math.random().toString().replace("0.", "id"))
+          }
+          return "#"+this.attr("id");
+        },
+
+
             /* Build an options object suitable for sending to
              * jQuery.ajax.  (Note that the before & confirm callbacks
              * are called from this function, and the spinner is shown)
@@ -159,6 +192,12 @@
              * The returned object will include a 'data' value
              * populated with a hash.
              *
+             * This function has now been split into two parts to
+             * better support push_state.  buildRequestData is the
+             * first part, which builds everything except the
+             * callbacks (but it does execute the before callbacks).
+             * buildRequestCallbacks builds the remaining callbacks.
+             *
              * Options:
              *  type: POST, GET
              *  attrs: a hash containing the standard Hobo ajax attributes & callbacks
@@ -171,10 +210,13 @@
              *
             */
         buildRequest: function(o) {
+          return methods.buildRequestCallbacks.call(this, methods.buildRequestData.call(this, o), o);
+        },
+
+        buildRequestData: function(o) {
             var that = this;
             if (!o.attrs) o.attrs = {};
-            if (!o.extra_callbacks) o.extra_callbacks = {};
-            var options = {};
+            var result = {};
 
             if(o.attrs.before) {
                 if(!methods.createFunction.call(that, o.attrs.before).call(this)) {
@@ -194,15 +236,15 @@
                 }
             }
 
-            options.context = this;
-            options.type = o.type || 'GET';
-            options.data = {"render_options[preamble]": o.preamble || '',
+            result.context = this;
+            result.type = o.type || 'GET';
+            result.data = {"render_options[preamble]": o.preamble || '',
                             "render_options[contexts_function]": 'hjq.ajax.updatePartContexts'
                            };
-            if(o.postamble) options.data["render_options[postamble]"] = o.postamble;
-            if(o.content_type) options.data["render_options[content_type]"] = o.content_type;
-            if(o.attrs.errors_ok) options.data["render_options[errors_ok]"] = 1;
-            options.dataType = 'script';
+            if(o.postamble) result.data["render_options[postamble]"] = o.postamble;
+            if(o.content_type) result.data["render_options[content_type]"] = o.content_type;
+            if(o.attrs.errors_ok) result.data["render_options[errors_ok]"] = 1;
+            result.dataType = 'script';
             o.spec = jQuery.extend({'function': 'hjq.ajax.update', preamble: ''}, o.spec);
 
             var part_data = {};
@@ -214,11 +256,19 @@
             var ids=methods.getUpdateIds.call(this, o.attrs);
             for(var i=0; i<ids.length; i++) {
                 if(part_data) $("#"+ids[i]).data('hjq-ajax', part_data);
-                options.data["render["+i+"][part_context]"] = page_data.hobo_parts[ids[i]];
-                options.data["render["+i+"][id]"] = ids[i];
-                options.data["render["+i+"][function]"] = o['function'] || 'hjq.ajax.update';
+                result.data["render["+i+"][part_context]"] = page_data.hobo_parts[ids[i]];
+                result.data["render["+i+"][id]"] = ids[i];
+                result.data["render["+i+"][function]"] = o['function'] || 'hjq.ajax.update';
             }
 
+            return result;
+        },
+
+        buildRequestCallbacks: function(result, o) {
+            var that = this;
+            if (!o.attrs) o.attrs = {};
+            if (!o.extra_callbacks) o.extra_callbacks = {};
+
             this.hjq_spinner(o.attrs, "Saving...");
 
             var success_dfd = jQuery.Deferred();
@@ -232,7 +282,7 @@
                 if(that.parents("body").length==0) $(document).trigger('rapid:ajax:success', [that]);
                 else  that.trigger('rapid:ajax:success', [that]);
             });
-            options.success = success_dfd.resolve;
+            result.success = success_dfd.resolve;
 
             var error_dfd = jQuery.Deferred();
             if(o.attrs.error) error_dfd.done(methods.createFunction.call(that, o.attrs.error));
@@ -241,7 +291,7 @@
                 if(that.parents("body").length==0) $(document).trigger('rapid:ajax:error', [that]);
                 else  that.trigger('rapid:ajax:error', [that]);
             });
-            options.error = error_dfd.resolve;
+            result.error = error_dfd.resolve;
 
             var complete_dfd = jQuery.Deferred();
             if(o.attrs.complete) complete_dfd.done(methods.createFunction.call(that, o.attrs.complete));
@@ -252,11 +302,29 @@
                 that.hjq_spinner('remove');
                 if(o.attrs.refocus_form) that.find(":input[type!=hidden]:first").focus();
             });
-            options.complete = complete_dfd.resolve;
+            result.complete = complete_dfd.resolve;
 
-            jQuery.extend(options, o.extra_options);
+            jQuery.extend(result, o.extra_options);
+
+            return result;
+        },
 
-            return options;
+        /*
+           this: element to receive callbacks
+           url: new location
+           ajax_options: output from buildRequestData
+           hobo_options: input to buildRequestData, buildRequestCallbacks
+           */
+        changeLocationAjax: function (url, ajax_options, hobo_options) {
+          if (hobo_options.attrs.push_state && typeof History==='object') {
+            // if the history plugin is installed, it will fire the
+            // changestate event immediately, which is where we
+            // actually execute the ajax
+            window.History.pushState([this.getPath(), ajax_options, hobo_options], hobo_options.attrs.new_title || null, url);
+          } else {
+            ajax_options = this.hjq('buildRequestCallbacks', ajax_options, hobo_options);
+            $.ajax(url, ajax_options);
+          }
         },
 
         // given ajax_attrs (update, updates and/or ajax), return DOM id's.
@@ -293,7 +361,7 @@
         if ( methods[method] ) {
             return methods[method].apply( this, Array.prototype.slice.call( arguments, 1 ));
         } else if ( typeof method === 'object' || ! method ) {
-            return methods.init.apply( this, arguments );
+            return methods.initOnce.apply( this, arguments ) && methods.init.apply( this, arguments );
         } else {
             $.error( 'Method ' +  method + ' does not exist on hjq' );
         }

data/vendor/assets/javascripts/jquery.getPath.js

@@ -0,0 +1,26 @@
+// from Blixt @ http://stackoverflow.com/questions/2206958/best-way-to-reference-an-element-with-jquery
+
+jQuery.fn.getPath = function () {
+    if (this.length != 1) throw 'Requires one element.';
+
+    if (this.attr("id")) return "#"+this.attr("id");
+
+    var path, node = this;
+    while (node.length) {
+        var realNode = node[0], name = realNode.localName;
+        if (!name) break;
+        name = name.toLowerCase();
+
+        var parent = node.parent();
+
+        var siblings = parent.children(name);
+        if (siblings.length > 1) {
+            name += ':eq(' + siblings.index(realNode) + ')';
+        }
+
+        path = name + (path ? '>' + path : '');
+        node = parent;
+    }
+
+    return path;
+};

metadata

@@ -2,7 +2,7 @@
 name: hobo_jquery
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.4.0.pre6
+  version: 1.4.0.pre7
 platform: ruby
 authors: 
 - Bryan Larsen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jquery-rails
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre6
+        version: 1.4.0.pre7
   type: :runtime
   version_requirements: *id002
 description: JQuery support for Hobo
@@ -69,6 +69,7 @@ files:
 - vendor/assets/javascripts/hobo-jquery/hjq.js
 - vendor/assets/javascripts/hobo_jquery.js
 - vendor/assets/javascripts/jquery.form.js
+- vendor/assets/javascripts/jquery.getPath.js
 - vendor/assets/stylesheets/hobo_jquery.css
 homepage: http://hobocentral.net
 licenses: []
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: JQuery support for Hobo