#982 load Fontawesome 4 only if it's really needed

TheCoder4eu · Aug 11, 2018 · 8092623 · 8092623
1 parent 0c6f661
commit 8092623
Show file tree

Hide file tree

Showing 13 changed files with 211 additions and 78 deletions.
diff --git a/src/main/java/net/bootsfaces/component/button/Button.java b/src/main/java/net/bootsfaces/component/button/Button.java
@@ -18,17 +18,16 @@
 
 package net.bootsfaces.component.button;
 
+import javax.el.ValueExpression;
+import javax.faces.component.FacesComponent;
+import javax.faces.component.html.HtmlOutcomeTargetButton;
 import javax.faces.context.FacesContext;
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.ComponentSystemEvent;
 import javax.faces.event.ListenerFor;
 import javax.faces.event.ListenersFor;
 import javax.faces.event.PostAddToViewEvent;
 
-import javax.el.ValueExpression;
-import javax.faces.component.FacesComponent;
-import javax.faces.component.html.HtmlOutcomeTargetButton;
-
 import net.bootsfaces.C;
 import net.bootsfaces.listeners.AddResourcesListener;
 import net.bootsfaces.render.IHasTooltip;
@@ -360,6 +359,7 @@ public String getIconAwesome() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconAwesome(String _iconAwesome) {
+		AddResourcesListener.setNeedsFontsAwesome(this);
 		getStateHelper().put(PropertyKeys.iconAwesome, _iconAwesome);
 	}
 
@@ -376,6 +376,9 @@ public boolean isIconBrand() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconBrand(boolean _iconBrand) {
+		if (_iconBrand) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconBrand, _iconBrand);
 	}
 
@@ -424,6 +427,9 @@ public boolean isIconLight() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconLight(boolean _iconLight) {
+		if (_iconLight) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconLight, _iconLight);
 	}
 
@@ -456,6 +462,9 @@ public boolean isIconRegular() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconRegular(boolean _iconRegular) {
+		if (_iconRegular) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconRegular, _iconRegular);
 	}
 
@@ -504,6 +513,9 @@ public boolean isIconSolid() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconSolid(boolean _iconSolid) {
+		if (_iconSolid) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconSolid, _iconSolid);
 	}
 

diff --git a/src/main/java/net/bootsfaces/component/commandButton/CommandButton.java b/src/main/java/net/bootsfaces/component/commandButton/CommandButton.java
@@ -147,38 +147,38 @@ public Map<String, String> getJQueryEventParameterListsForAjax() {
 	}
 
 	public void setIconAwesome(String _iconAwesome) {
-		AddResourcesListener.setNeedsFontsAwesome();
+		AddResourcesListener.setNeedsFontsAwesome(this);
 		super.setIconAwesome(_iconAwesome);
 	}
 
 	@Override
 	public void setIconBrand(boolean _iconBrand) {
 		if (_iconBrand) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconBrand(_iconBrand);
 	}
 
 	@Override
 	public void setIconRegular(boolean _iconRegular) {
 		if (_iconRegular) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconRegular(_iconRegular);
 	}
 
 	@Override
 	public void setIconLight(boolean _iconLight) {
 		if (_iconLight) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconLight(_iconLight);
 	}
 
 	@Override
 	public void setIconSolid(boolean _iconSolid) {
 		if (_iconSolid) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconSolid(_iconSolid);
 	}

diff --git a/src/main/java/net/bootsfaces/component/commandLink/CommandLink.java b/src/main/java/net/bootsfaces/component/commandLink/CommandLink.java
@@ -377,6 +377,7 @@ public String getIconAwesome() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconAwesome(String _iconAwesome) {
+		AddResourcesListener.setNeedsFontsAwesome(this);
 		getStateHelper().put(PropertyKeys.iconAwesome, _iconAwesome);
 	}
 
@@ -393,6 +394,9 @@ public boolean isIconBrand() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconBrand(boolean _iconBrand) {
+		if (_iconBrand) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconBrand, _iconBrand);
 	}
 
@@ -441,6 +445,9 @@ public boolean isIconLight() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconLight(boolean _iconLight) {
+		if (_iconLight) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconLight, _iconLight);
 	}
 
@@ -473,6 +480,9 @@ public boolean isIconRegular() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconRegular(boolean _iconRegular) {
+		if (_iconRegular) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconRegular, _iconRegular);
 	}
 
@@ -521,6 +531,9 @@ public boolean isIconSolid() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconSolid(boolean _iconSolid) {
+		if (_iconSolid) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconSolid, _iconSolid);
 	}
 

diff --git a/src/main/java/net/bootsfaces/component/dateTimePicker/DateTimePicker.java b/src/main/java/net/bootsfaces/component/dateTimePicker/DateTimePicker.java
@@ -208,38 +208,38 @@ public boolean isDisabled() {
 	}
 
 	public void setIconAwesome(String _iconAwesome) {
-		AddResourcesListener.setNeedsFontsAwesome();
+		AddResourcesListener.setNeedsFontsAwesome(this);
 		super.setIconAwesome(_iconAwesome);
 	}
 
 	@Override
 	public void setIconBrand(boolean _iconBrand) {
 		if (_iconBrand) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconBrand(_iconBrand);
 	}
 
 	@Override
 	public void setIconRegular(boolean _iconRegular) {
 		if (_iconRegular) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconRegular(_iconRegular);
 	}
 
 	@Override
 	public void setIconLight(boolean _iconLight) {
 		if (_iconLight) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconLight(_iconLight);
 	}
 
 	@Override
 	public void setIconSolid(boolean _iconSolid) {
 		if (_iconSolid) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconSolid(_iconSolid);
 	}

diff --git a/src/main/java/net/bootsfaces/component/dropButton/DropButton.java b/src/main/java/net/bootsfaces/component/dropButton/DropButton.java
@@ -297,6 +297,7 @@ public String getIconAwesome() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconAwesome(String _iconAwesome) {
+		AddResourcesListener.setNeedsFontsAwesome(this);
 		getStateHelper().put(PropertyKeys.iconAwesome, _iconAwesome);
 	}
 
@@ -313,6 +314,9 @@ public boolean isIconBrand() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconBrand(boolean _iconBrand) {
+		if (_iconBrand) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconBrand, _iconBrand);
 	}
 
@@ -361,6 +365,9 @@ public boolean isIconLight() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconLight(boolean _iconLight) {
+		if (_iconLight) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconLight, _iconLight);
 	}
 
@@ -393,6 +400,9 @@ public boolean isIconRegular() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconRegular(boolean _iconRegular) {
+		if (_iconRegular) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconRegular, _iconRegular);
 	}
 
@@ -441,6 +451,9 @@ public boolean isIconSolid() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setIconSolid(boolean _iconSolid) {
+		if (_iconSolid) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.iconSolid, _iconSolid);
 	}
 

diff --git a/src/main/java/net/bootsfaces/component/dropMenu/DropMenu.java b/src/main/java/net/bootsfaces/component/dropMenu/DropMenu.java
@@ -77,38 +77,38 @@ public String getFamily() {
 	}
 
 	public void setIconAwesome(String _iconAwesome) {
-		AddResourcesListener.setNeedsFontsAwesome();
+		AddResourcesListener.setNeedsFontsAwesome(this);
 		super.setIconAwesome(_iconAwesome);
 	}
 
 	@Override
 	public void setIconBrand(boolean _iconBrand) {
 		if (_iconBrand) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconBrand(_iconBrand);
 	}
 
 	@Override
 	public void setIconRegular(boolean _iconRegular) {
 		if (_iconRegular) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconRegular(_iconRegular);
 	}
 
 	@Override
 	public void setIconLight(boolean _iconLight) {
 		if (_iconLight) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconLight(_iconLight);
 	}
 
 	@Override
 	public void setIconSolid(boolean _iconSolid) {
 		if (_iconSolid) {
-			AddResourcesListener.setFontAwesomeVersion(5);
+			AddResourcesListener.setFontAwesomeVersion(5, this);
 		}
 		super.setIconSolid(_iconSolid);
 	}

diff --git a/src/main/java/net/bootsfaces/component/iconAwesome/IconAwesome.java b/src/main/java/net/bootsfaces/component/iconAwesome/IconAwesome.java
@@ -18,14 +18,7 @@
 
 package net.bootsfaces.component.iconAwesome;
 
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.ListenersFor;
-import javax.faces.event.PostAddToViewEvent;
-
 import javax.faces.component.FacesComponent;
-import javax.faces.context.FacesContext;
 import javax.faces.event.ListenerFor;
 import javax.faces.event.ListenersFor;
 import javax.faces.event.PostAddToViewEvent;
@@ -45,15 +38,6 @@ public class IconAwesome extends Icon {
 
 	public static final String DEFAULT_RENDERER = "net.bootsfaces.component.iconAwesome.IconAwesome";
 
-	public void processEvent(ComponentSystemEvent event) throws AbortProcessingException {
-		if (isAutoUpdate()) {
-			if (FacesContext.getCurrentInstance().isPostback()) {
-				FacesContext.getCurrentInstance().getPartialViewContext().getRenderIds().add(getClientId());
-			}
-			super.processEvent(event);
-		}
-	}
-
 	protected enum PropertyKeys {
 		ajax, autoUpdate, brand, colLg, colMd, colSm, colXs, delay, display, fixedWidth, hidden, inverse, largeScreen, light, mediumScreen, offset, offsetLg, offsetMd, offsetSm, offsetXs, onclick, oncomplete, onerror, onsuccess, process, pulse, regular, smallScreen, solid, span, style, styleClass, tinyScreen, tooltip, tooltipContainer, tooltipDelay, tooltipDelayHide, tooltipDelayShow, tooltipPosition, update, value, visible;
 		String toString;
@@ -69,6 +53,10 @@ public String toString() {
 			return ((this.toString != null) ? this.toString : super.toString());
 		}
 	}
+
+	public IconAwesome() {
+		AddResourcesListener.setNeedsFontsAwesome(this);
+	}
 
 	/**
 	 * Whether the Button submits the form with AJAX. <P>
@@ -115,6 +103,9 @@ public boolean isBrand() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setBrand(boolean _brand) {
+		if (_brand) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.brand, _brand);
 	}
 
@@ -291,6 +282,9 @@ public boolean isLight() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setLight(boolean _light) {
+		if (_light) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.light, _light);
 	}
 
@@ -499,6 +493,9 @@ public boolean isRegular() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setRegular(boolean _regular) {
+		if (_regular) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.regular, _regular);
 	}
 
@@ -531,6 +528,9 @@ public boolean isSolid() {
 	 * Usually this method is called internally by the JSF engine.
 	 */
 	public void setSolid(boolean _solid) {
+		if (_solid) {
+			AddResourcesListener.setFontAwesomeVersion(5, this);
+		}
 		getStateHelper().put(PropertyKeys.solid, _solid);
 	}