myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r481793 - /myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Date Sun, 03 Dec 2006 16:26:37 GMT
Author: bommel
Date: Sun Dec  3 08:26:35 2006
New Revision: 481793

URL: http://svn.apache.org/viewvc?view=rev&rev=481793
Log:
(TOBAGO-206) Default-Button conflicts with Datepicker

Modified:
    myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js

Modified: myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?view=diff&rev=481793&r1=481792&r2=481793
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
(original)
+++ myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Sun Dec  3 08:26:35 2006
@@ -361,10 +361,12 @@
     Tobago.Transport.request(function() {
       var req = Tobago.Transport.requests.shift(); // remove this from queue
       LOG.debug("request removed :" + req.toString());
+      var oldAction = Tobago.action.value;
       Tobago.action.value = actionId;
       Tobago.onSubmit();
 //      LOG.debug("submit form with action: " + Tobago.action.value);
       Tobago.form.submit();
+      Tobago.action.value = oldAction;
     }, true);
   },
 
@@ -1624,7 +1626,7 @@
         Tobago.Transport.requestComplete();
         onComplete(transport, json);
       };
-
+      var oldAction = Tobago.action.value;
       Tobago.action.value = actionId;
       var url = Tobago.form.action;
       requestOptions.parameters = "affectedAjaxComponent=" + ajaxComponentId 
@@ -1634,6 +1636,7 @@
       Tobago.Transport.request(function() {
         new Ajax.Updater(container, url, requestOptions);
       });
+      Tobago.action.value = oldAction;
     } else {
       LOG.info("No Ajax transport found! Doing full page reload.");
       Tobago.submitAction(actionId);



Mime
View raw message