[Jifty-commit] r5169 - in jifty/branches/jquery: share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage share/web/static/js

[Jifty commits]

Author: hlb
Date: Tue Feb 26 07:50:25 2008
New Revision: 5169

Modified:
   jifty/branches/jquery/lib/Jifty/Plugin/SinglePage.pm
   jifty/branches/jquery/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js
   jifty/branches/jquery/share/web/static/js/jifty.js

Log:
move _sp_submit_form into SinglePage plugin


Modified: jifty/branches/jquery/lib/Jifty/Plugin/SinglePage.pm
==============================================================================
--- jifty/branches/jquery/lib/Jifty/Plugin/SinglePage.pm	(original)
+++ jifty/branches/jquery/lib/Jifty/Plugin/SinglePage.pm	Tue Feb 26 07:50:25 2008
@@ -72,7 +72,7 @@
         elsif (exists $args->{submit} && !$args->{onclick}) {
 	    if ($args->{_form} && $args->{_form}{submit_to}) {
 		my $to = $args->{_form}{submit_to};
-		$self->_push_onclick($args, { beforeclick => qq{return _sp_submit_form(this, event, "$to");} });
+		$self->_push_onclick($args, { beforeclick => qq{return SPA._sp_submit_form(this, event, "$to");} });
 	    }
 	    else {
 		$self->_push_onclick($args, { refresh_self => 1, submit => $args->{submit} });

Modified: jifty/branches/jquery/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js
==============================================================================
--- jifty/branches/jquery/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js	(original)
+++ jifty/branches/jquery/share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/spa.js	Tue Feb 26 07:50:25 2008
@@ -17,6 +17,50 @@
                     Jifty.update(historyStorage.get(newLocation), "");
                 }
             }
+        },
+        _sp_submit_form: function(elt, event, submit_to) {
+            if(event.ctrlKey||event.metaKey||event.altKey||event.shiftKey) return true;
+
+            var form = Jifty.Form.Element.getForm(elt);
+            var elements = Jifty.Form.getElements(form);
+
+            // Three things need to get merged -- hidden defaults, defaults
+            // from buttons, and form values.  Hence, we build up three lists
+            // and then merge them.
+            var hiddens = {};
+            var buttons = {};
+            var inputs = {};
+            for (var i = 0; i < elements.length; i++) {
+                var e = elements[i];
+                var parsed = e.getAttribute("name").match(/^J:V-region-__page\.(.*)/);
+                var extras = Jifty.Form.Element.buttonArguments(e);
+
+                var extras_key_length = 0;
+                $.each(extras, function() { extras_key_length++ });
+
+                if (extras_key_length > 1) {
+                    // Button with values
+                    $.each(extras, function(k, v) {
+                        if (k == 'extend') return;
+                        parsed = k.match(/^J:V-region-__page\.(.*)/);
+                        if ((parsed != null) && (parsed.length == 2)) {
+                            buttons[ parsed[1] ] = v;
+                        } else if (v.length > 0) {
+                            input[ k ] = v;
+                        }
+                    });
+                } else if ((parsed != null) && (parsed.length == 2)) {
+                    // Hidden default
+                    hiddens[ parsed[1] ] = $(e).val();
+                } else if (e.name.length > 0) {
+                    // Straight up values
+                    inputs[ e.name ] = $(e).val();
+                }
+            }
+
+            var args = $.extend({}, hiddens, buttons, inputs);
+
+            return Jifty.update( {'continuation':{},'actions':null,'fragments':[{'mode':'Replace','args':args,'region':'__page','path': submit_to}]}, elt );
         }
     };
 

Modified: jifty/branches/jquery/share/web/static/js/jifty.js
==============================================================================
--- jifty/branches/jquery/share/web/static/js/jifty.js	(original)
+++ jifty/branches/jquery/share/web/static/js/jifty.js	Tue Feb 26 07:50:25 2008
@@ -1577,51 +1577,6 @@
     }
 }
 
-function _sp_submit_form(elt, event, submit_to) {
-    if(event.ctrlKey||event.metaKey||event.altKey||event.shiftKey) return true;
-
-    var form = Jifty.Form.Element.getForm(elt);
-    var elements = Jifty.Form.getElements(form);
-
-    // Three things need to get merged -- hidden defaults, defaults
-    // from buttons, and form values.  Hence, we build up three lists
-    // and then merge them.
-    var hiddens = {};
-    var buttons = {};
-    var inputs = {};
-    for (var i = 0; i < elements.length; i++) {
-        var e = elements[i];
-        var parsed = e.getAttribute("name").match(/^J:V-region-__page\.(.*)/);
-        var extras = Jifty.Form.Element.buttonArguments(e);
-
-        var extras_key_length = 0;
-        jQuery.each(extras, function() { extras_key_length++ });
-
-        if (extras_key_length > 1) {
-            // Button with values
-            jQuery.each(extras, function(k, v) {
-                if (k == 'extend') return;
-                parsed = k.match(/^J:V-region-__page\.(.*)/);
-                if ((parsed != null) && (parsed.length == 2)) {
-                    buttons[ parsed[1] ] = v;
-                } else if (v.length > 0) {
-                    input[ k ] = v;
-                }
-            });
-        } else if ((parsed != null) && (parsed.length == 2)) {
-            // Hidden default
-            hiddens[ parsed[1] ] = jQuery(e).val();
-        } else if (e.name.length > 0) {
-            // Straight up values
-            inputs[ e.name ] = jQuery(e).val();
-        }
-    }
-
-    var args = jQuery.extend({}, hiddens, buttons, inputs);
-
-    return Jifty.update( {'continuation':{},'actions':null,'fragments':[{'mode':'Replace','args':args,'region':'__page','path': submit_to}]}, elt );
-}
-
 /*
  * Jifty.Effect Usage:
  *