Item13460: JQICON fails to render FontAwesome icons

Thanks to MichaelDaum for the fix.
foswiki · Jun 16, 2015 · 52de18f · 52de18f
1 parent 6231fce
commit 52de18f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/JQueryPlugin/data/System/JQueryPlugin.txt b/JQueryPlugin/data/System/JQueryPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1430403240" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1434468639" format="1.1" version="1"}%
 ---+!! %TOPIC%
 <!--
    * Set SHORTDESCRIPTION = jQuery <nop>JavaScript library for Foswiki
@@ -122,6 +122,7 @@ reduce bandwidth and speed up interactive performance.
 ---++ Plugin Info
 |  Maintainer(s): | Michael Daum |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  16 Jun 2015: | (6.13) - Item13460: JQICON fails to render !FontAwesome icons. |
 |  30 Apr 2015: | (6.11) - Item13389: datepicker initializaiton problem; datepicker z-index problem; pushy tooltips not hidden when typing into an input field; error in jquery.foswiki api getPubUrlPath |
 |  23 Feb 2015: | (6.10) - Item13272: upgraded superfish and hoverintent, deprecated subpersubs |
 |  12 Jan 2015: | (6.01) - Item13205: added jquery-1.11.2 and jquery-2.1.3 |

diff --git a/JQueryPlugin/data/System/VarJQICON.txt b/JQueryPlugin/data/System/VarJQICON.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1422977767" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1434468639" format="1.1" version="1"}%
 %META:TOPICPARENT{name="JQueryPlugin"}%
 #VarJQICON
 ---+++ JQICON{"name" ...} -- render an image 
@@ -25,13 +25,13 @@
                  <li> =$iconTitle=: title attribute-value; if the =title= parameter to JQICON is set, this expands to =title='...'= </li> \
                 </ul> | =&lt;img src='$iconPath' class='$iconClass' $iconAlt$iconTitle/>= |
    * Example for famfamfam icons:<verbatim class="tml">
-JQICON{"tick" alt="alternative content" title="this is a tick icon"}%
-JQICON{"cross"}%
-JQICON{"disk"}%
-JQICON{"star"}%
-JQICON{"lightbulb"}%
-JQICON{"camera"}%
-JQICON{"date"}%
+%JQICON{"tick" alt="alternative content" title="this is a tick icon"}%
+%JQICON{"cross"}%
+%JQICON{"disk"}%
+%JQICON{"star"}%
+%JQICON{"lightbulb"}%
+%JQICON{"camera"}%
+%JQICON{"date"}%
      </verbatim> Produces:
      %JQICON{"tick" alt="alternative content" title="this is a tick icon"}% 
      %JQICON{"cross"}% 

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
@@ -24,8 +24,8 @@ BEGIN {
     }
 }
 
-our $VERSION           = '6.12';
-our $RELEASE           = '30 Apr 2015';
+our $VERSION           = '6.13';
+our $RELEASE           = '16 Jun 2015';
 our $SHORTDESCRIPTION  = 'jQuery <nop>JavaScript library for Foswiki';
 our $NO_PREFS_IN_TOPIC = 1;
 
@@ -368,12 +368,13 @@ sub handleJQueryIcon {
         $iconFormat = '<i class=\'$iconClass\' $iconStyle $iconTitle></i>';
         $iconPath   = '';
         $iconClass  = "foswikiIcon jqIcon fa $iconName";
+        createPlugin("fontawesome");
     }
 
     # default img based
     else {
         $iconFormat =
-'<img src=\'$iconPath\' class=\'$iconClass\' $iconStyle $iconAlt$iconTitle/>'
+'<img src=\'$iconPath\' class=\'$iconClass $iconName\' $iconStyle $iconAlt$iconTitle/>'
           unless $iconFormat;
         $iconPath =
           Foswiki::Plugins::JQueryPlugin::Plugins::getIconUrlPath($iconName);