Merge branch 'master' into JENKINS-74883

jenkinsci · Nov 21, 2024 · 8fc20f7 · 8fc20f7
2 parents 2f0d14b + dc84be9
commit 8fc20f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/blueocean-web/src/main/resources/io/jenkins/blueocean/BlueOceanUI/index.jelly b/blueocean-web/src/main/resources/io/jenkins/blueocean/BlueOceanUI/index.jelly
@@ -62,17 +62,13 @@
         </head>
 
         <body>
-            <div id="loadbar">
+            <div id="loadbar" data-is-development-mode="${it.developmentMode}">
                 <div class="font-loader-text">
                     loading
                     <h1>BlueOcean</h1>
                 </div>
             </div>
-            <script>
-                window.isDevelopmentMode = ${it.developmentMode};
-                function lb(c,t){setTimeout(function(){document.getElementById('loadbar').classList.add(c)},t)}
-                lb('go',10);lb('long',1000);lb('longer',6000);
-            </script>
+            <st:adjunct includes="io.jenkins.blueocean.BlueOceanUI.loadbar"/>
             <!-- App root -->
             <div id="root" class="container-fluid">
                 <noscript>

diff --git a/blueocean-web/src/main/resources/io/jenkins/blueocean/BlueOceanUI/loadbar.js b/blueocean-web/src/main/resources/io/jenkins/blueocean/BlueOceanUI/loadbar.js
@@ -0,0 +1,9 @@
+window.isDevelopmentMode = document.getElementById('loadbar').dataset.isDevelopmentMode === 'true';
+function lb(c, t) {
+  setTimeout(function () {
+    document.getElementById('loadbar').classList.add(c);
+  }, t);
+}
+lb('go', 10);
+lb('long', 1000);
+lb('longer', 6000);