[FIXED JENKINS-44797] Switch to adjuncts. (#17)

jenkinsci · Oct 19, 2017 · 3d59069 · 3d59069
1 parent 60da2ee
commit 3d59069
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 98 deletions.
diff --git a/src/main/java/hudson/plugins/favorite/assets/Asset.java b/src/main/java/hudson/plugins/favorite/assets/Asset.java
diff --git a/src/main/java/hudson/plugins/favorite/user/FavoriteUserProperty.java b/src/main/java/hudson/plugins/favorite/user/FavoriteUserProperty.java
@@ -8,7 +8,6 @@
 import hudson.model.Descriptor;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
-import hudson.plugins.favorite.assets.Asset;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -151,7 +150,4 @@ private void removeFavoritesWhichDoNotExist() {
         }
     }
 
-    public Class getAssetClass() {
-        return Asset.class;
-    }
 }
diff --git a/src/main/resources/hudson/plugins/favorite/assets.css b/src/main/resources/hudson/plugins/favorite/assets.css
@@ -0,0 +1,42 @@
+/** ICONS **/
+
+.icon-fav-active,
+.icon-fav-inactive {
+  display:block;
+  border:0px;
+  background-repeat: no-repeat;
+}
+.icon-fav-active {
+  background-image: url(../../../../../images/48x48/star-gold.png);
+}
+.icon-fav-inactive {
+  background-image: url(../../../../../images/48x48/star.png);
+}
+
+
+/** SIZES **/
+
+.icon-fav-inactive.icon-sm,
+.icon-fav-active.icon-sm {
+  width:16px;
+  height:16px;
+  background-size: 15px 15px;
+}
+.icon-fav-inactive.icon-md,
+.icon-fav-active.icon-md {
+  width:24px;
+  height:24px;
+  background-size: 23px 23px;
+}
+.icon-fav-inactive.icon-lg,
+.icon-fav-active.icon-lg {
+  width:32px;
+  height:32px;
+  background-size: 31px 31px;
+}
+.icon-fav-inactive.icon-xlg,
+.icon-fav-active.icon-xlg {
+  width:48px;
+  height:48px;
+  background-size: 47px 47px;
+}
diff --git a/src/main/resources/hudson/plugins/favorite/assets.js b/src/main/resources/hudson/plugins/favorite/assets.js
@@ -0,0 +1,22 @@
+function toggleFavorite(job, a) {
+  new Ajax.Request(rootURL + "/plugin/favorite/toggleFavorite?job=" + job, {method: 'POST'});
+  var favIcon = document.getElementById("fav_" + job);
+  if (favIcon.classList.contains("icon-fav-inactive")) {
+    favIcon.classList.add("icon-fav-active");
+    favIcon.classList.remove("icon-fav-inactive");
+    hoverNotification("Favorite added", a.parentNode);
+    window.dispatchEvent(new CustomEvent('favorite-plugin-icon-change', {
+      transition: "active-to-inactive",
+      job: job
+    }));
+  } else {
+    favIcon.classList.add("icon-fav-inactive");
+    favIcon.classList.remove("icon-fav-active");
+    hoverNotification("Favorite deleted", a.parentNode);
+    window.dispatchEvent(new CustomEvent('favorite-plugin-icon-change', {
+      transition: "inactive-to-active",
+      job: job
+    }));
+  }
+  return false;
+}
diff --git a/src/main/resources/hudson/plugins/favorite/assets/css.jelly b/src/main/resources/hudson/plugins/favorite/assets/css.jelly
diff --git a/src/main/resources/hudson/plugins/favorite/assets/javascript.jelly b/src/main/resources/hudson/plugins/favorite/assets/javascript.jelly
diff --git a/src/main/resources/hudson/plugins/favorite/assets/javascript.properties b/src/main/resources/hudson/plugins/favorite/assets/javascript.properties
diff --git a/src/main/resources/hudson/plugins/favorite/assets/javascript_de.properties b/src/main/resources/hudson/plugins/favorite/assets/javascript_de.properties
diff --git a/src/main/resources/hudson/plugins/favorite/assets/javascript_fr.properties b/src/main/resources/hudson/plugins/favorite/assets/javascript_fr.properties
diff --git a/src/main/resources/hudson/plugins/favorite/assets/javascript_ja.properties b/src/main/resources/hudson/plugins/favorite/assets/javascript_ja.properties
diff --git a/src/main/resources/hudson/plugins/favorite/column/FavoriteColumn/columnHeader.jelly b/src/main/resources/hudson/plugins/favorite/column/FavoriteColumn/columnHeader.jelly
@@ -1,7 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-    <st:include page="/hudson/plugins/favorite/assets/css.jelly" />
-    <st:include page="/hudson/plugins/favorite/assets/javascript.jelly" />
+    <st:adjunct includes="hudson.plugins.favorite.assets"/>
     <j:if test="${it.isLoggedIn()}">
         <th>${%Fav}</th>
     </j:if>

diff --git a/src/main/resources/hudson/plugins/favorite/user/FavoriteUserProperty/config.jelly b/src/main/resources/hudson/plugins/favorite/user/FavoriteUserProperty/config.jelly
@@ -1,8 +1,7 @@
 <?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:include page="/hudson/plugins/favorite/assets/css.jelly" class="${instance.assetClass}" />
-  <st:include page="/hudson/plugins/favorite/assets/javascript.jelly" class="${instance.assetClass}" />
+  <st:adjunct includes="hudson.plugins.favorite.assets"/>
   <f:block>
     <table id="favorites">
       <j:forEach var="favorite" items="${instance.favorites}">