Bump origin-web-common to 0.0.8, origin-web-catalog to 0.0.4

Author: spadgett

app/index.html

@@ -316,7 +316,6 @@ <h1>JavaScript Required</h1>
         <script src="scripts/directives/actionChip.js"></script>
         <script src="scripts/directives/templateopt.js"></script>
         <script src="scripts/directives/tasks.js"></script>
-        <script src="scripts/directives/truncate.js"></script>
         <script src="scripts/directives/catalog.js"></script>
         <script src="scripts/directives/catalog/categoryContent.js"></script>
         <script src="scripts/directives/catalog/catalogImage.js"></script>

app/scripts/directives/truncate.js

@@ -348,41 +348,6 @@ angular.module('openshiftConsole')
           .replace(/^./, function(str){ return str.toUpperCase(); });
     };
   })
-  .filter('parseJSON', function() {
-    return function(json) {
-      // return original value if its null or undefined
-      if (!json) {
-        return null;
-      }
-
-      // return the parsed obj if its valid
-      try {
-        var jsonObj = JSON.parse(json);
-        if (typeof jsonObj === "object") {
-          return jsonObj;
-        }
-        else {
-          return null;
-        }
-      }
-      catch (e) {
-        // it wasn't valid json
-        return null;
-      }
-    };
-  })
-  .filter('prettifyJSON', function(parseJSONFilter) {
-    return function(json) {
-      var jsonObj = parseJSONFilter(json);
-      if (jsonObj) {
-        return JSON.stringify(jsonObj, null, 4);
-      }
-      else {
-        // it wasn't a json object, return the original value
-        return json;
-      }
-    };
-  })
   // Resource is either a resource object, or a name.  If resource is a name, kind and namespace must be specified
   // Note that builds and deployments can only have their URL built correctly (including their config in the URL)
   // if resource is an object
@@ -415,18 +380,6 @@ angular.module('openshiftConsole')
       return array.join(separator);
     };
   })
-  .filter('generateName', function() {
-    return function(prefix, length) {
-      if (!prefix) {
-        prefix = "";
-      }
-      if (!length) {
-        length = 5;
-      }
-      var randomString = Math.round((Math.pow(36, length + 1) - Math.random() * Math.pow(36, length))).toString(36).slice(1);
-      return prefix + randomString;
-    };
-  })
   .filter('accessModes', function() {
     return function(value, format) {
       if (!value) {
@@ -454,36 +407,6 @@ angular.module('openshiftConsole')
       return _.uniq(accessModes);
     };
   })
-  .filter('truncate', function() {
-    return function(str, charLimit, useWordBoundary, newlineLimit) {
-      if (!str) {
-        return str;
-      }
-
-      var truncated = str;
-
-      if (charLimit) {
-        truncated = truncated.substring(0, charLimit);
-      }
-
-      if (newlineLimit) {
-        var nthNewline = str.split("\n", newlineLimit).join("\n").length;
-        truncated = truncated.substring(0, nthNewline);
-      }
-
-      if (useWordBoundary !== false) {
-        // Find the last word break, but don't look more than 10 characters back.
-        // Make sure we show at least the first 5 characters.
-        var startIndex = Math.max(4, charLimit - 10);
-        var lastSpace = truncated.lastIndexOf(/\s/, startIndex);
-        if (lastSpace !== -1) {
-          truncated = truncated.substring(0, lastSpace);
-        }
-      }
-
-      return truncated;
-    };
-  })
   .filter('middleEllipses', function() {
     /* Adapted from https://github.com/jviotti/angular-middle-ellipses
      * Usage:  {{ 'MyVeryLongString' | middleEllipses:5:' ... ' }}

app/scripts/filters/util.js

@@ -1285,11 +1285,6 @@ pre.clipped {
   }
 }
 
-.pretty-json {
-  font-family: @font-family-monospace;
-  white-space: pre-wrap;
-}
-
 .info-popover, .warnings-popover {
   cursor: help;
   vertical-align: middle;
@@ -1314,13 +1309,3 @@ copy-to-clipboard .input-group.limit-width {
     width: 100%;
   }
 }
-
-// Within truncation directive controls spacing between content and toggle link
-.truncation-block {
-  margin-right: 10px;
-}
-
-.truncation-collapse-link {
-  margin-left: 10px;
-  white-space: nowrap;
-}

app/styles/_core.less

@@ -47,8 +47,8 @@
     "angular-utf8-base64": "0.0.5",
     "file-saver": "1.3.3",
     "bootstrap-switch": "3.3.3",
-    "origin-web-common": "0.0.7",
-    "origin-web-catalog": "0.0.3"
+    "origin-web-common": "0.0.8",
+    "origin-web-catalog": "0.0.4"
   },
   "devDependencies": {
     "angular-mocks": "1.5.11",

app/views/directives/truncate-long-text.html

@@ -11188,28 +11188,7 @@ return {
 restrict:"E",
 templateUrl:"views/_tasks.html"
 };
-}), angular.module("openshiftConsole").directive("truncateLongText", [ "truncateFilter", function(a) {
-return {
-restrict:"E",
-scope:{
-content:"=",
-limit:"=",
-newlineLimit:"=",
-useWordBoundary:"=",
-expandable:"=",
-keywords:"=highlightKeywords",
-prettifyJson:"="
-},
-templateUrl:"views/directives/truncate-long-text.html",
-link:function(b) {
-b.toggles = {
-expanded:!1
-}, b.$watch("content", function(c) {
-c ? (b.truncatedContent = a(c, b.limit, b.useWordBoundary, b.newlineLimit), b.truncated = b.truncatedContent.length !== c.length) :(b.truncatedContent = null, b.truncated = !1);
-});
-}
-};
-} ]), angular.module("openshiftConsole").directive("catalog", [ "CatalogService", "Constants", "KeywordService", "Logger", function(a, b, c, d) {
+}), angular.module("openshiftConsole").directive("catalog", [ "CatalogService", "Constants", "KeywordService", "Logger", function(a, b, c, d) {
 return {
 restrict:"E",
 scope:{
@@ -14916,22 +14895,7 @@ return a.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/\b([A-Z]+)([A-Z])([a-z])/,
 return a.toUpperCase();
 });
 };
-}).filter("parseJSON", function() {
-return function(a) {
-if (!a) return null;
-try {
-var b = JSON.parse(a);
-return "object" == typeof b ? b :null;
-} catch (c) {
-return null;
-}
-};
-}).filter("prettifyJSON", [ "parseJSONFilter", function(a) {
-return function(b) {
-var c = a(b);
-return c ? JSON.stringify(c, null, 4) :b;
-};
-} ]).filter("navigateResourceURL", [ "Navigate", function(a) {
+}).filter("navigateResourceURL", [ "Navigate", function(a) {
 return function(b, c, d, e) {
 return a.resourceURL(b, c, d, null, {
 apiVersion:e
@@ -14954,12 +14918,6 @@ return a.yamlURL(b, c);
 return function(a, b) {
 return b || (b = ","), a.join(b);
 };
-}).filter("generateName", function() {
-return function(a, b) {
-a || (a = ""), b || (b = 5);
-var c = Math.round(Math.pow(36, b + 1) - Math.random() * Math.pow(36, b)).toString(36).slice(1);
-return a + c;
-};
 }).filter("accessModes", function() {
 return function(a, b) {
 if (!a) return a;
@@ -14985,20 +14943,6 @@ d = a;
 c.push(d);
 }), _.uniq(c);
 };
-}).filter("truncate", function() {
-return function(a, b, c, d) {
-if (!a) return a;
-var e = a;
-if (b && (e = e.substring(0, b)), d) {
-var f = a.split("\n", d).join("\n").length;
-e = e.substring(0, f);
-}
-if (c !== !1) {
-var g = Math.max(4, b - 10), h = e.lastIndexOf(/\s/, g);
-h !== -1 && (e = e.substring(0, h));
-}
-return e;
-};
 }).filter("middleEllipses", function() {
 return function(a, b, c) {
 if (b < 3) return a;

bower.json

@@ -8919,29 +8919,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
   );
 
 
-  $templateCache.put('views/directives/truncate-long-text.html',
-    "<span ng-if=\"!truncated\" ng-bind-html=\"content | highlightKeywords : keywords\" class=\"truncated-content\"></span>\n" +
-    "<span ng-if=\"truncated\">\n" +
-    "<span ng-if=\"!toggles.expanded\">\n" +
-    "<span ng-attr-title=\"{{content}}\" class=\"truncation-block\">\n" +
-    "<span ng-bind-html=\"truncatedContent | highlightKeywords : keywords\" class=\"truncated-content\"></span>&hellip;\n" +
-    "</span>\n" +
-    "<a ng-if=\"expandable\" href=\"\" ng-click=\"toggles.expanded = true\" class=\"nowrap\">See All</a>\n" +
-    "</span>\n" +
-    "<span ng-if=\"toggles.expanded\">\n" +
-    "<div ng-if=\"prettifyJson\" class=\"well\">\n" +
-    "<span class=\"pull-right\" style=\"margin-top: -10px\"><a href=\"\" ng-click=\"toggles.expanded = false\" class=\"truncation-collapse-link\">Collapse</a></span>\n" +
-    "<span ng-bind-html=\"content | prettifyJSON | highlightKeywords : keywords\" class=\"pretty-json truncated-content\"></span>\n" +
-    "</div>\n" +
-    "<span ng-if=\"!prettifyJson\">\n" +
-    "<span class=\"pull-right\"><a href=\"\" ng-click=\"toggles.expanded = false\" class=\"truncation-collapse-link\">Collapse</a></span>\n" +
-    "<span ng-bind-html=\"content | highlightKeywords : keywords\" class=\"truncated-content\"></span>\n" +
-    "</span>\n" +
-    "</span>\n" +
-    "</span>"
-  );
-
-
   $templateCache.put('views/edit/autoscaler.html',
     "<default-header class=\"top-header\"></default-header>\n" +
     "<div class=\"wrap no-sidebar\">\n" +