if weather or icofont icons loaded externally use them

CHANGELOG.md

@@ -8,7 +8,7 @@
  - Fix colour-picker touch support (upstream fix)
  - Fix slight transparency issue on select dropdown
  - Small changes to colour-picker styling
-
+ - Allow use of wi and icofont icon families (only if loaded externally vi ui_template)
 
 ### 2.2.0: Milestone Release
 

dist/dashboard.appcache

@@ -17,4 +17,4 @@ fonts/fontawesome-webfont.woff2
 NETWORK:
 *
 
-# hash: 6b2f5a904c3bf4a69926e8fe512b3c83a7367a8244ae507a58abfbedd9ce6779
+# hash: 05e3eb73ef90b98ed73dc8a192579a1a00b110ce447e37d64f6ef8b6e9d0e1e5

src/components/ui-icon/ui-icon.html

@@ -1,3 +1,5 @@
 <ng-md-icon ng-if="iconType==='angular-material'" icon="{{icon}}"></ng-md-icon>
 <div ng-if="iconType==='fa'" style="font-size:1.17em; display:inline-block; margin:auto;"><i class="fa fa-fw" ng-class="icon"></i></div>
+<div ng-if="iconType==='wi'" style="font-size:1.17em; display:inline-block; margin:auto;"><i class="wi wi-fw" ng-class="icon"></i></div>
+<div ng-if="iconType==='icofont'" style="font-size:1.17em; display:inline-block; margin:auto;"><i class="icofont icofont-fw" ng-class="icon"></i></div>
 <img ng-if="iconType==='image'" ng-src="{{url}}" style="width:24px; display:block; margin:auto;"></img>

src/components/ui-icon/ui-icon.js

@@ -3,6 +3,8 @@ angular.module('ui').directive('uiIcon',
     function () {
         var url = /^https?:\/\//i;
         var fa = /^fa-/i;
+        var wi = /^wi-/i;
+        var ic = /^icofont-/i;
         return {
             restrict: 'E',
             templateUrl: 'components/ui-icon/ui-icon.html',
@@ -17,10 +19,14 @@ angular.module('ui').directive('uiIcon',
                         scope.url = newValue;
                     } else if (fa.test(newValue)) {
                         scope.iconType = 'fa';
+                    } else if (wi.test(newValue)) {
+                        scope.iconType = 'wi';
+                    } else if (ic.test(newValue)) {
+                        scope.iconType = 'icofont';
                     } else {
                         scope.iconType = 'angular-material';
                     }
                 });
             }
         };
-    });
+    });