Repository: struts Updated Branches: refs/heads/support-2-3 38e8f86a7 -> 8bbfb461c
WW-4365 Fixes issue with evaluating doubleHeaderValue and doubleHeaderKey Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8bbfb461 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8bbfb461 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8bbfb461 Branch: refs/heads/support-2-3 Commit: 8bbfb461c48bc89a286c847064c80fa78f90279f Parents: 38e8f86 Author: Lukasz Lenart <[email protected]> Authored: Mon Nov 30 08:12:44 2015 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Mon Nov 30 08:12:44 2015 +0100 ---------------------------------------------------------------------- core/src/main/resources/template/simple/doubleselect.ftl | 9 +++------ .../org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt | 2 +- .../org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt | 2 +- .../org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt | 2 +- .../org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/8bbfb461/core/src/main/resources/template/simple/doubleselect.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/simple/doubleselect.ftl b/core/src/main/resources/template/simple/doubleselect.ftl index 313eb16..ede40cb 100644 --- a/core/src/main/resources/template/simple/doubleselect.ftl +++ b/core/src/main/resources/template/simple/doubleselect.ftl @@ -76,7 +76,7 @@ <#assign itemCount = startCount/> var ${parameters.id}Group = new Array(${parameters.listSize} + ${startCount}); for (i = 0; i < (${parameters.listSize} + ${startCount}); i++) - ${parameters.id}Group[i] = new Array(); + ${parameters.id}Group[i] = []; <@s.iterator value="parameters.list"> <#if parameters.listKey??> @@ -91,7 +91,7 @@ </#if> <#assign doubleItemCount = 0/> <#if parameters.doubleHeaderKey?? && parameters.doubleHeaderValue??> - ${parameters.id}Group[${itemCount}][${doubleItemCount}] = new Option("${doubleHeaderValue?js_string}", "${doubleHeaderKey?js_string}"); + ${parameters.id}Group[${itemCount}][${doubleItemCount}] = new Option("${parameters.doubleHeaderValue?js_string}", "${parameters.doubleHeaderKey?js_string}"); <#assign doubleItemCount = doubleItemCount + 1/> </#if> <#if parameters.doubleEmptyOption??> @@ -172,10 +172,7 @@ ${parameters.id}Temp.options[i] = new Option(${parameters.id}Group[x][i].text, ${parameters.id}Group[x][i].value); <#if parameters.doubleNameValue??> <#if parameters.doubleMultiple??> - for (j = 0; j < ${parameters.doubleNameValue}. - length; - j++ - ) + for (j = 0; j < ${parameters.doubleNameValue}.length; j++) { if (${parameters.id}Temp.options[i].value == ${parameters.doubleNameValue?js_string}[j]) { ${parameters.id}Temp.options[i].selected = true; http://git-wip-us.apache.org/repos/asf/struts/blob/8bbfb461/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt index e536c56..286f58c 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt @@ -11,7 +11,7 @@ <script type="text/javascript"> var fooGroup = new Array(2 + 0); for (i = 0; i < (2 + 0); i++) - fooGroup[i] = new Array(); + fooGroup[i] = []; fooGroup[0][0] = new Option("Antwerp", "AN"); fooGroup[0][1] = new Option("Gent", "GN"); http://git-wip-us.apache.org/repos/asf/struts/blob/8bbfb461/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt index 87fa10d..d9690ff 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt @@ -11,7 +11,7 @@ <script type="text/javascript"> var fooGroup = new Array(2 + 0); for (i = 0; i < (2 + 0); i++) - fooGroup[i] = new Array(); + fooGroup[i] = []; fooGroup[0][0] = new Option("Antwerp", "AN"); fooGroup[0][1] = new Option("Gent", "GN"); http://git-wip-us.apache.org/repos/asf/struts/blob/8bbfb461/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt index 69f0923..cb96892 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt @@ -11,7 +11,7 @@ <script type="text/javascript"> var foo_barGroup = new Array(2 + 0); for (i = 0; i < (2 + 0); i++) - foo_barGroup[i] = new Array(); + foo_barGroup[i] = []; foo_barGroup[0][0] = new Option("Antwerp", "AN"); foo_barGroup[0][1] = new Option("Gent", "GN"); http://git-wip-us.apache.org/repos/asf/struts/blob/8bbfb461/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt index 74cde90..81bf3ba 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt @@ -11,7 +11,7 @@ <script type="text/javascript"> var fooGroup = new Array(2 + 0); for (i = 0; i < (2 + 0); i++) - fooGroup[i] = new Array(); + fooGroup[i] = []; fooGroup[0][0] = new Option("Antwerp", "AN"); fooGroup[0][1] = new Option("Gent", "GN");
