[Jifty-commit] r1275 - in jifty/trunk: share/web/static/js

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Tue Jun 13 16:49:06 2006
New Revision: 1275

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/share/web/static/js/bps_util.js
   jifty/trunk/share/web/static/js/jifty.js

Log:
 r13878 at zoq-fot-pik:  chmrr | 2006-06-13 16:48:42 -0400
  * Actually remove buttons when we replace them with links


Modified: jifty/trunk/share/web/static/js/bps_util.js
==============================================================================
--- jifty/trunk/share/web/static/js/bps_util.js	(original)
+++ jifty/trunk/share/web/static/js/bps_util.js	Tue Jun 13 16:49:06 2006
@@ -43,11 +43,14 @@
     var e = $(input);
     if (e) {
         var link = document.createElement("a");
-        link.setAttribute("href","javascript:$('"+e.id+"').click()");
+        link.setAttribute("href","#");
+        link.setAttribute("onclick",e.getAttribute("onclick"));
+        link.setAttribute("name",e.getAttribute("name"));
+        link['virtualform'] = Form.Element.getForm(e);
         link.appendChild(document.createTextNode(e.getAttribute("value")));
 
-        Element.hide(e);
         e.parentNode.insertBefore(link, e.nextSibling);
+        e.parentNode.removeChild(e);
         return true;
     }
     return false;

Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js	(original)
+++ jifty/trunk/share/web/static/js/jifty.js	Tue Jun 13 16:49:06 2006
@@ -189,8 +189,10 @@
 
     disable_input_fields: function() {
 	var disable = function() {
-	    arguments[0].blur();
-	    arguments[0].disabled = true;
+            try {
+                arguments[0].blur();
+                arguments[0].disabled = true;
+            } catch( e ) {}
 	};
 	this.fields().each(disable);
 	this.buttons().each(disable);
@@ -302,8 +304,13 @@
 
     buttonArguments: function(element) {
         element = $(element);
-        if (!element || (element.nodeName != 'INPUT') || (element.getAttribute("type") != "submit"))
+        if (!element)
             return $H();
+
+        if (((element.nodeName != 'INPUT') || (element.getAttribute("type") != "submit"))
+         && ((element.nodeName != 'A')     || (! element.getAttribute("name"))))
+            return $H();
+
         var extras = $H();
 
         // Split other arguments out, if we're on a button
@@ -336,7 +343,7 @@
             e.setAttribute("type", "hidden");
             e.setAttribute("name", keys[i]);
             e.setAttribute("value", args[keys[i]]);
-            e['virtualform'] = element.form;
+            e['virtualform'] = Form.Element.getForm(element);
             extras.push(e);
         }
         return extras;