From de210c1e72812ee5904d3334ee67990c8f54ce32 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sat, 23 Oct 2010 19:02:54 +0000
Subject: [PATCH] Solved WW-3508 - added disable property to sx:submit

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1026662 13f79535-47bb-0310-9956-ffa450edef68
---
 plugins/dojo/src/main/resources/template/ajax/submit.ftl  | 8 +++++++-
 .../apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java  | 3 +++
 .../apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt    | 1 +
 .../apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt    | 1 +
 .../apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt    | 3 ++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/dojo/src/main/resources/template/ajax/submit.ftl b/plugins/dojo/src/main/resources/template/ajax/submit.ftl
index 15ba2d290..4a4b3ea11 100644
--- a/plugins/dojo/src/main/resources/template/ajax/submit.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/submit.ftl
@@ -50,6 +50,9 @@
   <#if parameters.label?if_exists != "">
      value="${parameters.label?html}"<#rt/>
   </#if>
+  <#if parameters.disabled?default(false)>
+    disabled="disabled"<#rt/>
+  </#if>
  />
 <#else>
   <#if parameters.type?exists && parameters.type=="image">
@@ -66,6 +69,9 @@
     <#if parameters.nameValue?if_exists != "">
      value="${parameters.nameValue?html}"<#rt/>
     </#if>
+    <#if parameters.disabled?default(false)>
+     disabled="disabled"<#rt/>
+    </#if>
     <#if parameters.value?if_exists != "">
      value="${parameters.value?html}"<#rt/>
     </#if>
@@ -96,4 +102,4 @@
 </#if>
 <#if parameters.pushId>
 <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("${parameters.id?html}");</script>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
index e94144917..c677520e3 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
@@ -36,6 +36,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
 
         tag.setId("a");
         tag.setHref("b");
+        tag.setDisabled("true");
         tag.setLoadingText("c");
         tag.setErrorText("d");
         tag.setListenTopics("e");
@@ -70,6 +71,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setPageContext(pageContext);
 
         tag.setId("a");
+        tag.setDisabled("true");
         tag.setTheme("ajax");
         tag.setHref("b");
         tag.setLoadingText("c");
@@ -100,6 +102,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setPageContext(pageContext);
 
         tag.setId("a");
+        tag.setDisabled("true");
         tag.setTheme("ajax");
         tag.setHref("b");
         tag.setLoadingText("c");
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
index 4d66c0ce3..5686308ca 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
@@ -3,6 +3,7 @@
   dojoType="struts:Bind"
   events="onclick"
   value="Submit"
+  disabled="disabled"
   validate="true"
   ajaxAfterValidation="true"
   id="a"
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
index 6f571188c..e312a5d81 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
@@ -17,5 +17,6 @@
   indicator="l"
   scriptSeparation="true"
   value="i"
+  disabled="disabled"
   />
   <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
\ No newline at end of file
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
index 2f372efff..b3e9069a0 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
@@ -5,6 +5,7 @@
   alt="i"
   src="j"
   value="Submit"
+  disabled="disabled"
   validate="true"
   ajaxAfterValidation="false"
   id="a"
@@ -21,4 +22,4 @@
   indicator="l"
   scriptSeparation="true"
   />
-  <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
\ No newline at end of file
+  <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>