You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2007/01/18 09:27:31 UTC
svn commit: r497346 -
/myfaces/tobago/trunk/theme/standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Author: lofwyr
Date: Thu Jan 18 00:27:30 2007
New Revision: 497346
URL: http://svn.apache.org/viewvc?view=rev&rev=497346
Log:
fixing merge conflict
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=497346&r1=497345&r2=497346
==============================================================================
--- 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 Thu Jan 18 00:27:30 2007
@@ -407,33 +407,22 @@
*/
submitAction: function(actionId, target) {
Tobago.Transport.request(function() {
-<<<<<<< .mine
if (!this.isSubmit) {
this.isSubmit = true;
var req = Tobago.Transport.requests.shift(); // remove this from queue
LOG.debug("request removed :" + req.toString());
var oldAction = Tobago.action.value;
+ var oldTarget = Tobago.form.target;
Tobago.action.value = actionId;
+ if (target) {
+ Tobago.form.target = target;
+ }
Tobago.onSubmit();
// LOG.debug("submit form with action: " + Tobago.action.value);
Tobago.form.submit();
Tobago.action.value = oldAction;
Tobago.onBeforeUnload();
}
-=======
- var req = Tobago.Transport.requests.shift(); // remove this from queue
- LOG.debug("request removed :" + req.toString());
- var oldAction = Tobago.action.value;
- var oldTarget = Tobago.form.target;
- Tobago.action.value = actionId;
- if (target) {
- Tobago.form.target = target;
- }
- Tobago.onSubmit();
-// LOG.debug("submit form with action: " + Tobago.action.value);
- Tobago.form.submit();
- Tobago.action.value = oldAction;
->>>>>>> .r497208
if (target) {
Tobago.form.target = oldTarget;
}