From 0427b1449bbd8e5d0119e549154b3c24b515e197 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Fri, 27 Jul 2012 08:25:19 +0900
Subject: [PATCH] refactored

---
 .../main/resources/lib/form/combobox.jelly    |  3 ++-
 .../resources/lib/form/combobox/combobox.js   | 25 +++++++++++++++++++
 .../main/webapp/scripts/hudson-behavior.js    | 25 -------------------
 3 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 core/src/main/resources/lib/form/combobox/combobox.js

diff --git a/core/src/main/resources/lib/form/combobox.jelly b/core/src/main/resources/lib/form/combobox.jelly
index 46ec0bfa2a..0f9973cda6 100644
--- a/core/src/main/resources/lib/form/combobox.jelly
+++ b/core/src/main/resources/lib/form/combobox.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <!-- Tomcat doesn't like us using the attribute called 'class' -->
-<?jelly escape-by-default='true'?>
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
     Editable drop-down combo box that supports the data binding and AJAX updates.
@@ -43,6 +43,7 @@ THE SOFTWARE.
     <script type="text/javascript" src="${request.contextPath}/scripts/utilities.js"/>
     <script type="text/javascript" src="${request.contextPath}/scripts/combobox.js"/>
   </st:once>
+  <st:adjunct includes="lib.form.combobox.combobox"/>
 
   <f:prepareDatabinding/>
   ${descriptor.calcFillSettings(field,attrs)} <!-- this figures out the 'fillUrl' and 'fillDependsOn' attribute -->
diff --git a/core/src/main/resources/lib/form/combobox/combobox.js b/core/src/main/resources/lib/form/combobox/combobox.js
new file mode 100644
index 0000000000..50acde5149
--- /dev/null
+++ b/core/src/main/resources/lib/form/combobox/combobox.js
@@ -0,0 +1,25 @@
+Behaviour.register({
+    "INPUT.combobox2" : function(e) {
+        var items = [];
+
+        var c = new ComboBox(e,function(value) {
+            var candidates = [];
+            for (var i=0; i<items.length; i++) {
+                if (items[i].indexOf(value)==0) {
+                    candidates.push(items[i]);
+                    if (candidates.length>20)   break;
+                }
+            }
+            return candidates;
+        }, {});
+
+        refillOnChange(e,function(params) {
+            new Ajax.Request(e.getAttribute("fillUrl"),{
+                parameters: params,
+                onSuccess : function(rsp) {
+                    items = eval('('+rsp.responseText+')');
+                }
+            });
+        });
+    }
+});
\ No newline at end of file
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 76ec44cd80..cc814d5885 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1070,31 +1070,6 @@ var jenkinsRules = {
         updateDropDownList();
     },
 
-    // combobox.jelly
-    "INPUT.combobox2" : function(e) {
-        var items = [];
-
-        var c = new ComboBox(e,function(value) {
-            var candidates = [];
-            for (var i=0; i<items.length; i++) {
-                if (items[i].indexOf(value)==0) {
-                    candidates.push(items[i]);
-                    if (candidates.length>20)   break;
-                }
-            } 
-            return candidates;
-        }, {});
-
-        refillOnChange(e,function(params) {
-            new Ajax.Request(e.getAttribute("fillUrl"),{
-                parameters: params,
-                onSuccess : function(rsp) {
-                    items = eval('('+rsp.responseText+')');
-                }
-            });
-        });
-    },
-
     "A.showDetails" : function(e) {
         e.onclick = function() {
             this.style.display = 'none';
-- 
GitLab