From de072a889b0aca5648c8a38d60c6f5bf01919241 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Sun, 31 Dec 2006 19:26:44 +0000
Subject: [PATCH] Applied against the wrong ComboBox.js WW-1583

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491470 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/struts2/static/dojo/src/widget/ComboBox.js     | 4 ----
 .../org/apache/struts2/static/dojo/struts/widget/ComboBox.js  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
index f063d5f95..ac4056553 100644
--- a/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
+++ b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
@@ -144,10 +144,6 @@ dojo.widget.ComboBoxDataProvider = function(/*Array*/ dataPairs, /*Number*/ limi
 			searchStr = searchStr.toLowerCase();
 		}
 		for(var x=0; x<this.data.length; x++){
-            if(!this.data[x]) {
-                //needed for IE
-                continue;
-            }
 			if((!ignoreLimit)&&(ret.length >= this.searchLimit)){
 				break;
 			}
diff --git a/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
index 42c0459e7..8b0674496 100644
--- a/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
+++ b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
@@ -96,6 +96,10 @@ struts.widget.ComboBoxDataProvider = function(/*Array*/ dataPairs, /*Number*/ li
       searchStr = searchStr.toLowerCase();
     }
     for(var x=0; x<this.data.length; x++){
+      if(!this.data[x]) {
+        //needed for IE
+        continue;
+      }
       if((!ignoreLimit)&&(ret.length >= this.searchLimit)){
         break;
       }