Merge pull request #213 from spadgett/logos

Add SVG icons

dist/origin-web-common-ui.js

@@ -1538,6 +1538,50 @@ angular.module('openshiftCommonUI')
 ;'use strict';
 
 angular.module('openshiftCommonUI')
+  // Returns an image URL for an icon class if available. Some icons we have
+  // color SVG images for. Depends on window.OPENSHIFT_CONSTANTS.LOGOS and
+  // window.OPENSHIFT_CONSTANTS.LOGO_BASE_URL, which is set by origin-web-console
+  // (or an extension).
+  .filter('imageForIconClass', function(isAbsoluteURLFilter) {
+    return function(iconClass) {
+      if (!iconClass) {
+        return '';
+      }
+
+      var logoImage = _.get(window, ['OPENSHIFT_CONSTANTS', 'LOGOS', iconClass]);
+      if (!logoImage) {
+        return '';
+      }
+
+      // Make sure the logo base has a trailing slash.
+      var logoBaseUrl = _.get(window, 'OPENSHIFT_CONSTANTS.LOGO_BASE_URL');
+      if (!logoBaseUrl || isAbsoluteURLFilter(logoImage)) {
+        return logoImage;
+      }
+
+      if (!logoBaseUrl.endsWith('/')) {
+        logoBaseUrl += '/';
+      }
+
+      return logoBaseUrl + logoImage;
+    };
+  });
+;'use strict';
+
+angular.module('openshiftCommonUI')
+  .filter('isAbsoluteURL', function() {
+    return function(url) {
+      if (!url) {
+        return false;
+      }
+      var uri = new URI(url);
+      var protocol = uri.protocol();
+      return uri.is('absolute') && (protocol === 'http' || protocol === 'https');
+    };
+  });
+;'use strict';
+
+angular.module('openshiftCommonUI')
 // Usage: <span ng-bind-html="text | linkify : '_blank'"></span>
 //
 // Prefer this to the AngularJS `linky` filter since it only matches http and

dist/origin-web-common.js

@@ -1748,6 +1748,50 @@ angular.module('openshiftCommonUI')
 ;'use strict';
 
 angular.module('openshiftCommonUI')
+  // Returns an image URL for an icon class if available. Some icons we have
+  // color SVG images for. Depends on window.OPENSHIFT_CONSTANTS.LOGOS and
+  // window.OPENSHIFT_CONSTANTS.LOGO_BASE_URL, which is set by origin-web-console
+  // (or an extension).
+  .filter('imageForIconClass', ["isAbsoluteURLFilter", function(isAbsoluteURLFilter) {
+    return function(iconClass) {
+      if (!iconClass) {
+        return '';
+      }
+
+      var logoImage = _.get(window, ['OPENSHIFT_CONSTANTS', 'LOGOS', iconClass]);
+      if (!logoImage) {
+        return '';
+      }
+
+      // Make sure the logo base has a trailing slash.
+      var logoBaseUrl = _.get(window, 'OPENSHIFT_CONSTANTS.LOGO_BASE_URL');
+      if (!logoBaseUrl || isAbsoluteURLFilter(logoImage)) {
+        return logoImage;
+      }
+
+      if (!logoBaseUrl.endsWith('/')) {
+        logoBaseUrl += '/';
+      }
+
+      return logoBaseUrl + logoImage;
+    };
+  }]);
+;'use strict';
+
+angular.module('openshiftCommonUI')
+  .filter('isAbsoluteURL', function() {
+    return function(url) {
+      if (!url) {
+        return false;
+      }
+      var uri = new URI(url);
+      var protocol = uri.protocol();
+      return uri.is('absolute') && (protocol === 'http' || protocol === 'https');
+    };
+  });
+;'use strict';
+
+angular.module('openshiftCommonUI')
 // Usage: <span ng-bind-html="text | linkify : '_blank'"></span>
 //
 // Prefer this to the AngularJS `linky` filter since it only matches http and

dist/origin-web-common.min.js

@@ -780,7 +780,21 @@ return _.isRegExp(keyword) ? keyword.source :_.escapeRegExp(keyword);
 }).join("|"), result = "", lastIndex = 0, flags = caseSensitive ? "g" :"ig", regex = new RegExp(source, flags); null !== (match = regex.exec(str)); ) lastIndex < match.index && (result += _.escape(str.substring(lastIndex, match.index))), result += "<mark>" + _.escape(match[0]) + "</mark>", lastIndex = regex.lastIndex;
 return lastIndex < str.length && (result += _.escape(str.substring(lastIndex))), result;
 };
-} ]), angular.module("openshiftCommonUI").filter("linkify", [ "HTMLService", function(HTMLService) {
+} ]), angular.module("openshiftCommonUI").filter("imageForIconClass", [ "isAbsoluteURLFilter", function(isAbsoluteURLFilter) {
+return function(iconClass) {
+if (!iconClass) return "";
+var logoImage = _.get(window, [ "OPENSHIFT_CONSTANTS", "LOGOS", iconClass ]);
+if (!logoImage) return "";
+var logoBaseUrl = _.get(window, "OPENSHIFT_CONSTANTS.LOGO_BASE_URL");
+return !logoBaseUrl || isAbsoluteURLFilter(logoImage) ? logoImage :(logoBaseUrl.endsWith("/") || (logoBaseUrl += "/"), logoBaseUrl + logoImage);
+};
+} ]), angular.module("openshiftCommonUI").filter("isAbsoluteURL", function() {
+return function(url) {
+if (!url) return !1;
+var uri = new URI(url), protocol = uri.protocol();
+return uri.is("absolute") && ("http" === protocol || "https" === protocol);
+};
+}), angular.module("openshiftCommonUI").filter("linkify", [ "HTMLService", function(HTMLService) {
 return function(text, target, alreadyEscaped) {
 return HTMLService.linkify(text, target, alreadyEscaped);
 };

src/filters/imageForIconClass.js

+'use strict';
+
+angular.module('openshiftCommonUI')
+  // Returns an image URL for an icon class if available. Some icons we have
+  // color SVG images for. Depends on window.OPENSHIFT_CONSTANTS.LOGOS and
+  // window.OPENSHIFT_CONSTANTS.LOGO_BASE_URL, which is set by origin-web-console
+  // (or an extension).
+  .filter('imageForIconClass', function(isAbsoluteURLFilter) {
+    return function(iconClass) {
+      if (!iconClass) {
+        return '';
+      }
+
+      var logoImage = _.get(window, ['OPENSHIFT_CONSTANTS', 'LOGOS', iconClass]);
+      if (!logoImage) {
+        return '';
+      }
+
+      // Make sure the logo base has a trailing slash.
+      var logoBaseUrl = _.get(window, 'OPENSHIFT_CONSTANTS.LOGO_BASE_URL');
+      if (!logoBaseUrl || isAbsoluteURLFilter(logoImage)) {
+        return logoImage;
+      }
+
+      if (!logoBaseUrl.endsWith('/')) {
+        logoBaseUrl += '/';
+      }
+
+      return logoBaseUrl + logoImage;
+    };
+  });

src/filters/isAbsoluteURL.js

+'use strict';
+
+angular.module('openshiftCommonUI')
+  .filter('isAbsoluteURL', function() {
+    return function(url) {
+      if (!url) {
+        return false;
+      }
+      var uri = new URI(url);
+      var protocol = uri.protocol();
+      return uri.is('absolute') && (protocol === 'http' || protocol === 'https');
+    };
+  });