Browse code

bump(github.com/openshift/origin-web-console): eb5c33657e1133bb1b5579405446cdad191ce3d6

OpenShift Bot authored on 2016/12/19 23:09:04
Showing 1 changed files
... ...
@@ -5386,7 +5386,15 @@ return d += " -n " + a.metadata.namespace;
5386 5386
 return {
5387 5387
 getLogsCommand:c
5388 5388
 };
5389
-} ]), angular.module("openshiftConsole").controller("ProjectsController", [ "$scope", "$filter", "$location", "$route", "$timeout", "AlertMessageService", "AuthService", "DataService", "KeywordService", "Logger", "ProjectsService", function(a, b, c, d, e, f, g, h, i, j, k) {
5389
+} ]), angular.module("openshiftConsole").factory("HTMLService", function() {
5390
+return {
5391
+linkify:function(a, b, c) {
5392
+return a ? (c || (a = _.escape(a)), a.replace(/https?:\/\/[A-Za-z0-9._%+-]+\S*[^\s.;,(){}<>"\u201d\u2019]/gm, function(a) {
5393
+return b ? '<a href="' + a + '" target="' + b + '">' + a + "</a>" :'<a href="' + a + '">' + a + "</a>";
5394
+})) :a;
5395
+}
5396
+};
5397
+}), angular.module("openshiftConsole").controller("ProjectsController", [ "$scope", "$filter", "$location", "$route", "$timeout", "AlertMessageService", "AuthService", "DataService", "KeywordService", "Logger", "ProjectsService", function(a, b, c, d, e, f, g, h, i, j, k) {
5390 5398
 var l, m, n = [], o = [];
5391 5399
 a.alerts = a.alerts || {}, a.loading = !0, a.showGetStarted = !1, a.canCreate = void 0, a.search = {
5392 5400
 text:""
... ...
@@ -12839,15 +12847,11 @@ a.destroy();
12839 12839
 });
12840 12840
 }
12841 12841
 };
12842
-} ]), angular.module("openshiftConsole").directive("logViewer", [ "$sce", "$timeout", "$window", "$filter", "AuthService", "APIService", "APIDiscovery", "DataService", "ModalsService", "logLinks", "BREAKPOINTS", function(a, b, c, d, e, f, g, h, i, j, k) {
12843
-var l = $(window), m = function(a) {
12844
-return a.replace(/https?:\/\/[A-Za-z0-9._%+-]+\S*[^\s.;,(){}<>"\u201d\u2019]/gm, function(a) {
12845
-return '<a href="' + a + '" target="_blank">' + a + "</a>";
12846
-});
12847
-}, n = $('<tr class="log-line"><td class="log-line-number"></td><td class="log-line-text"></td></tr>').get(0), o = function(a, b) {
12842
+} ]), angular.module("openshiftConsole").directive("logViewer", [ "$sce", "$timeout", "$window", "$filter", "AuthService", "APIService", "APIDiscovery", "DataService", "HTMLService", "ModalsService", "logLinks", "BREAKPOINTS", function(a, b, c, d, e, f, g, h, i, j, k, l) {
12843
+var m = $(window), n = $('<tr class="log-line"><td class="log-line-number"></td><td class="log-line-text"></td></tr>').get(0), o = function(a, b) {
12848 12844
 var c = n.cloneNode(!0);
12849 12845
 c.firstChild.setAttribute("data-line-number", a);
12850
-var d = ansi_up.escape_for_html(b), e = ansi_up.ansi_to_html(d), f = m(e);
12846
+var d = ansi_up.escape_for_html(b), e = ansi_up.ansi_to_html(d), f = i.linkify(e, "_blank", !0);
12851 12847
 return c.lastChild.innerHTML = f, c;
12852 12848
 };
12853 12849
 return {
... ...
@@ -12868,15 +12872,15 @@ empty:"=?",
12868 12868
 run:"=?"
12869 12869
 },
12870 12870
 controller:[ "$scope", function(i) {
12871
-var m, n, p, q, r, s = document.documentElement;
12871
+var j, n, p, q, r, s = document.documentElement;
12872 12872
 i.logViewerID = _.uniqueId("log-viewer"), i.empty = !0;
12873 12873
 var t, u;
12874 12874
 "ReplicationController" === i.object.kind ? (t = "deploymentconfigs/log", u = d("annotation")(i.object, "deploymentConfig")) :(t = f.kindToResource(i.object.kind) + "/log", u = i.object.metadata.name);
12875 12875
 var v = function() {
12876
-q = window.innerWidth < k.screenSmMin && !i.fixedHeight ? null :n;
12876
+q = window.innerWidth < l.screenSmMin && !i.fixedHeight ? null :n;
12877 12877
 }, w = function() {
12878 12878
 i.$apply(function() {
12879
-var a = m.getBoundingClientRect();
12879
+var a = j.getBoundingClientRect();
12880 12880
 i.fixedHeight ? i.showScrollLinks = a && a.height > i.fixedHeight :i.showScrollLinks = a && (a.top < 0 || a.bottom > s.clientHeight);
12881 12881
 });
12882 12882
 }, x = !1, y = function() {
... ...
@@ -12884,9 +12888,9 @@ x ? x = !1 :i.$evalAsync(function() {
12884 12884
 i.autoScrollActive = !1;
12885 12885
 });
12886 12886
 }, z = function() {
12887
-p.off("scroll", y), l.off("scroll", y), window.innerWidth <= k.screenSmMin && !i.fixedHeight ? l.on("scroll", y) :p.on("scroll", y);
12887
+p.off("scroll", y), m.off("scroll", y), window.innerWidth <= l.screenSmMin && !i.fixedHeight ? m.on("scroll", y) :p.on("scroll", y);
12888 12888
 }, A = function() {
12889
-i.fixedHeight || (window.innerWidth < k.screenSmMin && !i.fixedHeight ? r.removeClass("target-logger-node").affix({
12889
+i.fixedHeight || (window.innerWidth < l.screenSmMin && !i.fixedHeight ? r.removeClass("target-logger-node").affix({
12890 12890
 target:window,
12891 12891
 offset:{
12892 12892
 top:i.followAffixTop || 0,
... ...
@@ -12910,17 +12914,17 @@ i.chromeless || i.fixedHeight || (e -= 35), a ? b.animate({
12910 12910
 }, C = _.debounce(function() {
12911 12911
 B(!0), v(), z(), w(), A(), y();
12912 12912
 }, 100);
12913
-l.on("resize", C);
12913
+m.on("resize", C);
12914 12914
 var D, E = function() {
12915
-x = !0, j.scrollBottom(q);
12915
+x = !0, k.scrollBottom(q);
12916 12916
 }, F = function() {
12917 12917
 i.autoScrollActive = !i.autoScrollActive, i.autoScrollActive && E();
12918 12918
 }, G = document.createDocumentFragment(), H = _.debounce(function() {
12919
-m.appendChild(G), G = document.createDocumentFragment(), i.autoScrollActive && E(), i.showScrollLinks || w();
12919
+j.appendChild(G), G = document.createDocumentFragment(), i.autoScrollActive && E(), i.showScrollLinks || w();
12920 12920
 }, 100, {
12921 12921
 maxWait:300
12922 12922
 }), I = function(a) {
12923
-D && (D.stop(), D = null), a || (H.cancel(), m && (m.innerHTML = ""), G = document.createDocumentFragment());
12923
+D && (D.stop(), D = null), a || (H.cancel(), j && (j.innerHTML = ""), G = document.createDocumentFragment());
12924 12924
 }, J = function() {
12925 12925
 if (I(), i.run) {
12926 12926
 angular.extend(i, {
... ...
@@ -12969,7 +12973,7 @@ kibanaAuthUrl:a.trustAsResourceUrl(URI(b).segment("auth").segment("token").norma
12969 12969
 access_token:e.UserStore().getToken()
12970 12970
 }), i.$watchGroup([ "context.project.metadata.name", "options.container", "name" ], function() {
12971 12971
 angular.extend(i, {
12972
-kibanaArchiveUrl:a.trustAsResourceUrl(j.archiveUri({
12972
+kibanaArchiveUrl:a.trustAsResourceUrl(k.archiveUri({
12973 12973
 namespace:i.context.project.metadata.name,
12974 12974
 namespaceUid:i.context.project.metadata.uid,
12975 12975
 podname:u,
... ...
@@ -12981,7 +12985,7 @@ backlink:URI.encode(c.location.href)
12981 12981
 }), this.cacheScrollableNode = function(a) {
12982 12982
 n = a, p = $(n);
12983 12983
 }, this.cacheLogNode = function(a) {
12984
-m = a;
12984
+j = a;
12985 12985
 }, this.cacheAffixable = function(a) {
12986 12986
 r = $(a);
12987 12987
 }, this.start = function() {
... ...
@@ -12992,16 +12996,16 @@ loading:!0,
12992 12992
 autoScroll:!1,
12993 12993
 state:!1,
12994 12994
 onScrollBottom:function() {
12995
-j.scrollBottom(q);
12995
+k.scrollBottom(q);
12996 12996
 },
12997 12997
 onScrollTop:function() {
12998
-i.autoScrollActive = !1, j.scrollTop(q);
12998
+i.autoScrollActive = !1, k.scrollTop(q);
12999 12999
 },
13000 13000
 toggleAutoScroll:F,
13001
-goChromeless:j.chromelessLink,
13001
+goChromeless:k.chromelessLink,
13002 13002
 restartLogs:J
13003 13003
 }), i.$on("$destroy", function() {
13004
-I(), l.off("resize", C), l.off("scroll", y), p.off("scroll", y);
13004
+I(), m.off("resize", C), m.off("scroll", y), p.off("scroll", y);
13005 13005
 }), "deploymentconfigs/logs" !== t || u ? void i.$watchGroup([ "name", "options.container", "run" ], J) :(i.state = "empty", void (i.emptyStateMessage = "Logs are not available for this replication controller because it was not generated from a deployment configuration."));
13006 13006
 } ],
13007 13007
 require:"logViewer",
... ...
@@ -13016,7 +13020,7 @@ type:"text/plain;charset=utf-8"
13016 13016
 saveAs(e, d);
13017 13017
 };
13018 13018
 a.canSave = !!new Blob(), a.saveLog = function() {
13019
-return a.largeLog ? void i.confirmSaveLog(a.object).then(f) :void f();
13019
+return a.largeLog ? void j.confirmSaveLog(a.object).then(f) :void f();
13020 13020
 };
13021 13021
 }
13022 13022
 };
... ...
@@ -15745,7 +15749,11 @@ return d.replace(f, "<mark>$&</mark>");
15745 15745
 };
15746 15746
 } ]).filter("encodeURIComponent", function() {
15747 15747
 return window.encodeURIComponent;
15748
-}), angular.module("openshiftConsole").filter("camelToLower", function() {
15748
+}).filter("linkify", [ "HTMLService", function(a) {
15749
+return function(b, c, d) {
15750
+return a.linkify(b, c, d);
15751
+};
15752
+} ]), angular.module("openshiftConsole").filter("camelToLower", function() {
15749 15753
 return function(a) {
15750 15754
 return a ? _.startCase(a).toLowerCase() :a;
15751 15755
 };
... ...
@@ -15975,7 +15983,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
15975 15975
   $templateCache.put('views/_cannot-create-project.html',
15976 15976
     "<span ng-if=\"!newProjectMessage\">A cluster admin can create a project for you by running the command\n" +
15977 15977
     "<code>oadm new-project &lt;projectname&gt; --admin={{user.metadata.name || '&lt;YourUsername&gt;'}}</code></span>\n" +
15978
-    "<span ng-if=\"newProjectMessage\" ng-bind-html=\"newProjectMessage | linky : '_blank'\" class=\"projects-instructions-link\"></span>"
15978
+    "<span ng-if=\"newProjectMessage\" ng-bind-html=\"newProjectMessage | linkify : '_blank'\" class=\"projects-instructions-link\"></span>"
15979 15979
   );
15980 15980
 
15981 15981
 
... ...
@@ -17231,7 +17239,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
17231 17231
     "<span ng-switch-when=\"Image change\">\n" +
17232 17232
     "{{trigger.message}} for {{trigger.imageChangeBuild.fromRef.name}}\n" +
17233 17233
     "</span>\n" +
17234
-    "<span ng-switch-default ng-bind-html=\"trigger.message | linky : '_blank'\"></span>\n" +
17234
+    "<span ng-switch-default ng-bind-html=\"trigger.message | linkify : '_blank'\"></span>\n" +
17235 17235
     "</div>\n" +
17236 17236
     "</div>\n" +
17237 17237
     "</dd>\n" +
... ...
@@ -20968,7 +20976,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
20968 20968
     "</div>\n" +
20969 20969
     "<div class=\"alert alert-info template-message\" ng-if=\"templateMessage.length\">\n" +
20970 20970
     "<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
20971
-    "<div class=\"resource-description\" ng-bind-html=\"templateMessage | linky : '_blank'\"></div>\n" +
20971
+    "<div class=\"resource-description\" ng-bind-html=\"templateMessage | linkify : '_blank'\"></div>\n" +
20972 20972
     "</div>\n" +
20973 20973
     "<div class=\"row\" ng-controller=\"TasksController\">\n" +
20974 20974
     "<div ng-if=\"!pendingTasks(tasks()).length && erroredTasks(tasks()).length\" class=\"col-md-12\">\n" +
... ...
@@ -23248,7 +23256,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
23248 23248
 
23249 23249
   $templateCache.put('views/directives/osc-image-summary.html',
23250 23250
     "<h1>{{ name || (resource | displayName) }}</h1>\n" +
23251
-    "<div class=\"resource-description\" ng-bind-html=\"resource | description | linky : '_blank'\"></div>\n" +
23251
+    "<div class=\"resource-description\" ng-bind-html=\"resource | description | linkify : '_blank'\"></div>\n" +
23252 23252
     "<div class=\"resource-metadata\">\n" +
23253 23253
     "<div ng-show=\"resource | annotation:'provider'\">Provider: {{ resource | annotation:'provider' }}</div>\n" +
23254 23254
     "<div ng-show=\"resource.metadata.namespace && resource.metadata.namespace !=='openshift'\">Namespace: {{ resource.metadata.namespace }}</div>\n" +