Author: tmjee
Date: Wed Apr 26 07:16:55 2006
New Revision: 397200
URL: http://svn.apache.org/viewcvs?rev=397200&view=rev
Log:
optiontransferselect and updownselect now works again :-)
Modified:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js
incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
Modified:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js
(original)
+++
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js
Wed Apr 26 07:16:55 2006
@@ -20,17 +20,20 @@
function compile(ptn) {
if (ptn != undefined) {
- if (ptn == '' || !window.RegExp) {
+ if (ptn == '' || !window.RegExp) {
return function(val) { return val == ptn; }
} else {
var reg = new RegExp(ptn);
- return function (val) { return reg.test(val); }
+ return function (val) {
+ if (val == '') { // ignore empty option added by template
+ return true;
+ }
+ return reg.test(val); }
}
}
return function(val) { return false; }
}
-
function moveOptions(objSourceElement, objTargetElement, toSort, chooseFunc) {
var aryTempSourceOptions = new Array();
var aryTempTargetOptions = new Array();
@@ -109,4 +112,52 @@
}
}
return false;
+}
+
+function moveOptionUp(objTargetElement, type, ptn) {
+ var test = compile(ptn);
+ for (i=0; i<objTargetElement.length; i++) {
+ if (objTargetElement[i].selected) {
+ var v;
+ if (i != 0 && !objTargetElement[i-1].selected) {
+ if (type == 'key') {
+ v = objTargetElement[i-1].value
+ }
+ else {
+ v = objTargetElement[i-1].text;
+ }
+ if (!test(v)) {
+ swapOptions(objTargetElement,i,i-1);
+ }
+ }
+ }
+ }
+}
+
+function moveOptionDown(objTargetElement, type, ptn) {
+ var test = compile(ptn);
+ for (i=(objTargetElement.length-1); i>= 0; i--) {
+ if (objTargetElement[i].selected) {
+ var v;
+ if ((i != (objTargetElement.length-1)) &&
!objTargetElement[i+1].selected) {
+ if (type == 'key') {
+ v = objTargetElement[i].value
+ }
+ else {
+ v = objTargetElement[i].text;
+ }
+ if (!test(v)) {
+ swapOptions(objTargetElement,i,i+1);
+ }
+ }
+ }
+ }
+}
+
+function swapOptions(objTargetElement, first, second) {
+ var opt = objTargetElement.options;
+ var temp = new Option(opt[first].text, opt[first].value,
opt[first].defaultSelected, opt[first].selected);
+ var temp2= new Option(opt[second].text, opt[second].value,
opt[second].defaultSelected, opt[second].selected);
+ opt[first] = temp2;
+ opt[second] = temp;
}
Modified:
incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
(original)
+++ incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
Wed Apr 26 07:16:55 2006
@@ -14,11 +14,11 @@
dojo.event.connect(containingForm, "onsubmit",
function(evt) {
var selectObj =
document.getElementById("${selectObjectId}");
- selectAllOptions(selectObj);
- selectUnselectMatchingOptions(selectObj, null,
"unselect", false, "key");
<#if
parameters.optiontransferselectIds.get(selectObjectId)?exists>
<#assign selectTagHeaderKey =
parameters.optiontransferselectIds.get(selectObjectId)/>
-
selectUnselectMatchingOptions(selectObj, "${selectTagHeaderKey}", "unselect",
false, "key");
+ selectAllOptionsExceptSome(selectObj,
"key", "${selectTagHeaderKey}");
+ <#else>
+ selectAllOptionsExceptSome(selectObj,
"key", "");
</#if>
});
</#list>
@@ -30,11 +30,11 @@
dojo.event.connect(containingForm, "onsubmit",
function(evt) {
var selectObj =
document.getElementById("${selectObjId}");
- selectAllOptions(selectObj);
- selectUnselectMatchingOptions(selectObj, null,
"unselect", false, "key");
<#if
parameters.optiontransferselectDoubleIds.get(selectObjId)?exists>
<#assign selectTagHeaderKey =
parameters.optiontransferselectDoubleIds.get(selectObjId)/>
-
selectUnselectMatchingOptions(selectObj, "${selectTagHeaderKey}", "unselect",
false, "key");
+ selectAllOptionsExceptSome(selectObj,
"key", "${selectTagHeaderKey}");
+ <#else>
+ selectAllOptionsExceptSome(selectObj,
"key", "");
</#if>
});
</#list>
@@ -52,11 +52,11 @@
dojo.event.connect(containingForm, "onsubmit",
function(evt) {
var updownselectObj =
document.getElementById("${tmpId}");
- selectAllOptions(updownselectObj);
- selectUnselectMatchingOptions(updownselectObj,
null, "unselect", false, "key");
<#if
parameters.updownselectIds.get(tmpId)?exists>
<#assign tmpHeaderKey =
parameters.updownselectIds.get(tmpId) />
-
selectUnselectMatchingOptions(updownselectObj, "${tmpHeaderKey}", "unselect",
false, "key");
+
selectAllOptionsExceptSome(updownselectObj, "key", "${tmpHeaderKey}");
+ <#else>
+
selectAllOptionsExceptSome(updownselectObj, "key", "");
</#if>
});
</#list>
Modified:
incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl
(original)
+++
incubator/webwork2/action/src/main/resources/template/simple/updownselect.ftl
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<#if !stack.findValue("#optiontransferselect_js_included")?exists><#t/>
- <script language="javascript" src="<@saf.url
value="/struts/optiontransferselect/optiontransferselect.js" encode='false'
/>"></script>
+ <script language="javascript" src="<@saf.url
value="/struts/optiontransferselect.js" encode='false' />"></script>
<#assign temporaryVariable =
stack.setValue("#optiontransferselect_js_included", "true") /><#t/>
</#if><#t/>
<table>
@@ -10,17 +10,17 @@
<#if parameters.allowMoveUp?default(true)><#t/>
<#assign defMoveUpLabel="${parameters.moveUpLabel?default('^')}" /><#t/>
<#if parameters.headerKey?exists><#t/>
- <input type="button" value="${defMoveUpLabel}"
onclick="moveOptionUp(document.getElementById('${parameters.id}'),
'${parameters.headerKey}');" />
+ <input type="button" value="${defMoveUpLabel}"
onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key',
'${parameters.headerKey}');" />
<#else><#t/>
- <input type="button" value="${defMoveUpLabel}"
onclick="moveOptionUp(document.getElementById('${parameters.id}'));" />
+ <input type="button" value="${defMoveUpLabel}"
onclick="moveOptionUp(document.getElementById('${parameters.id}'), 'key', '');"
/>
</#if><#t/>
</#if><#t/>
<#if parameters.allowMoveDown?default(true)><#t/>
<#assign defMoveDownLabel="${parameters.moveDownLabel?default('v')}"
/><#t/>
<#if parameters.headerKey?exists><#t/>
- <input type="button" value="${defMoveDownLabel}"
onclick="moveOptionDown(document.getElementById('${parameters.id}'),
'${parameters.headerKey}');" />
+ <input type="button" value="${defMoveDownLabel}"
onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key',
'${parameters.headerKey}');" />
<#else><#t/>
- <input type="button" value="${defMoveDownLabel}"
onclick="moveOptionDown(document.getElementById('${parameters.id}'));" />
+ <input type="button" value="${defMoveDownLabel}"
onclick="moveOptionDown(document.getElementById('${parameters.id}'), 'key',
'');" />
</#if><#t/>
</#if><#t/>
<#if parameters.allowSelectAll?default(true)><#t/>
@@ -28,7 +28,7 @@
<#if parameters.headerKey?exists><#t/>
<input type="button" value="${defSelectAllLabel}"
onclick="selectAllOptionsExceptSome(document.getElementById('${parameters.id}'),
'key', '${parameters.headerKey}');" />
<#else><#t/>
- <input type="button" value="${defSelectAllLabel}"
onclick="selectAllOptions(document.getElementById('${parameters.id}'));"
/>
+ <input type="button" value="${defSelectAllLabel}"
onclick="selectAllOptions(document.getElementById('${parameters.id}'), 'key',
'');" />
</#if><#t/>
</#if><#t/>
</td></tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
Wed Apr 26 07:16:55 2006
@@ -2,15 +2,15 @@
<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return
validateForm_myAction();" action="myAction" method="POST" enctype="myEncType"
title="mytitle">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
- <td> <script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+ <td> <script language="javascript"
src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myUpDownSelectTag" size="5" id="myAction_myUpDownSelectTag"
multiple="multiple">
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myAction_myUpDownSelectTag'));"
/>
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myAction_myUpDownSelectTag'));"
/>
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myAction_myUpDownSelectTag'));"
/>
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myAction_myUpDownSelectTag'),
'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myAction_myUpDownSelectTag'),
'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myAction_myUpDownSelectTag'),
'key', '');" />
</td></tr>
</table>
</td>
@@ -25,8 +25,7 @@
dojo.event.connect(containingForm, "onsubmit",
function(evt) {
var updownselectObj =
document.getElementById("myAction_myUpDownSelectTag");
- selectAllOptions(updownselectObj);
- selectUnselectMatchingOptions(updownselectObj,
null, "unselect", false, "key");
+ selectAllOptionsExceptSome(updownselectObj,
"key", "");
});
</script>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
Wed Apr 26 07:16:55 2006
@@ -1,15 +1,15 @@
<form namespace="" id="myAction" name="myForm" onsubmit="submitMe(); return
true;" action="myAction" method="POST" enctype="myEncType" title="mytitle">
<table class="wwFormTable"> <tr>
<td class="tdLabel"></td>
- <td> <script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+ <td> <script language="javascript"
src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myUpDownSelectTag" size="5" id="myAction_myUpDownSelectTag"
multiple="multiple">
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myAction_myUpDownSelectTag'));"
/>
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myAction_myUpDownSelectTag'));"
/>
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myAction_myUpDownSelectTag'));"
/>
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myAction_myUpDownSelectTag'),
'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myAction_myUpDownSelectTag'),
'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myAction_myUpDownSelectTag'),
'key', '');" />
</td></tr>
</table>
</td>
@@ -24,8 +24,7 @@
dojo.event.connect(containingForm, "onsubmit",
function(evt) {
var updownselectObj =
document.getElementById("myAction_myUpDownSelectTag");
- selectAllOptions(updownselectObj);
- selectUnselectMatchingOptions(updownselectObj,
null, "unselect", false, "key");
+ selectAllOptionsExceptSome(updownselectObj,
"key", "");
});
</script>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,9 +10,9 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'));" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,9 +10,9 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="Move Up"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'));" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="Move Up"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,9 +10,9 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="Move Down"
onclick="moveOptionDown(document.getElementById('myId'));" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="Move Down"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -9,9 +9,9 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'));" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -11,8 +11,8 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), '-1');" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), '-1');" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '-1');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '-1');" />
<input type="button" value="*"
onclick="selectAllOptionsExceptSome(document.getElementById('myId'), 'key',
'-1');" />
</td></tr>
</table>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,8 +10,8 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), '-1');" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), '-1');" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '-1');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '-1');" />
<input type="button" value="*"
onclick="selectAllOptionsExceptSome(document.getElementById('myId'), 'key',
'-1');" />
</td></tr>
</table>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,9 +10,9 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'));" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,8 +10,8 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'));" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,8 +10,8 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'));" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,8 +10,8 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="*"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
Modified:
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt?rev=397200&r1=397199&r2=397200&view=diff
==============================================================================
---
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
(original)
+++
incubator/webwork2/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
Wed Apr 26 07:16:55 2006
@@ -1,5 +1,5 @@
<tr> <td class="tdLabel"></td> <td>
-<script language="javascript"
src="/struts/optiontransferselect/optiontransferselect.js"></script>
+<script language="javascript" src="/struts/optiontransferselect.js"></script>
<table>
<tr><td>
<select name="myName" size="5" id="myId" multiple="multiple">
@@ -10,9 +10,9 @@
<option value="germany" selected="selected">Germany</option>
</select></td></tr>
<tr><td>
- <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'));" />
- <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'));" />
- <input type="button" value="Select All"
onclick="selectAllOptions(document.getElementById('myId'));" />
+ <input type="button" value="^"
onclick="moveOptionUp(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="v"
onclick="moveOptionDown(document.getElementById('myId'), 'key', '');" />
+ <input type="button" value="Select All"
onclick="selectAllOptions(document.getElementById('myId'), 'key', '');" />
</td></tr>
</table>
</td> </tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
