Merge in master

janfaracik · Dec 3, 2022 · 0da81bd · 0da81bd
1 parent ace2138
commit 0da81bd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/core/src/main/java/jenkins/Symbols.java b/core/src/main/java/jenkins/Symbols.java
@@ -50,12 +50,13 @@ public HttpResponse doIndex(StaplerRequest request) {
 
         String title = Objects.toString(request.getParameter("title"), "");
         String tooltip = Objects.toString(request.getParameter("tooltip"), "");
+        String htmlTooltip = Objects.toString(request.getParameter("html-tooltip"), "");
         String classes = Objects.toString(request.getParameter("classes"), "");
         String pluginName = extractPluginNameFromIconSrc(symbol);
         String id = Objects.toString(request.getParameter("id"), "");
 
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("symbol", IconSet.getSymbol(symbol, title, tooltip, classes, pluginName, id));
+        jsonObject.put("symbol", IconSet.getSymbol(symbol, title, tooltip, tooltip, classes, pluginName, id));
 
         return HttpResponses.okJSON(jsonObject);
     }

diff --git a/core/src/main/resources/lib/layout/command-palette.jelly b/core/src/main/resources/lib/layout/command-palette.jelly
@@ -44,6 +44,4 @@ THE SOFTWARE.
       </div>
     </div>
   </dialog>
-
-  <script src="${resURL}/jsbundles/command-palette.js" type="text/javascript" />
 </j:jelly>
diff --git a/war/src/main/js/app.js b/war/src/main/js/app.js
@@ -1,5 +1,7 @@
+import CommandPalette from "@/components/command-palette";
 import Notifications from "@/components/notifications";
 import Tooltips from "@/components/tooltips";
 
+CommandPalette.init();
 Notifications.init();
 Tooltips.init();
diff --git a/...onents/command-palette/command-palette.js → ...in/js/components/command-palette/index.js b/...onents/command-palette/command-palette.js → ...in/js/components/command-palette/index.js
@@ -5,7 +5,7 @@ import debounce from "lodash/debounce";
 
 const datasources = [JenkinsSearchSource];
 
-window.addEventListener("load", () => {
+function init() {
   const i18n = document.getElementById("command-palette-i18n");
   const headerCommandPaletteButton = document.getElementById(
     "button-open-command-palette"
@@ -201,4 +201,6 @@ window.addEventListener("load", () => {
       }
     }
   }
-});
+};
+
+export default { init };