Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update origin-web-common to 0.0.31, origin-web-catalog to 0.0.19 #1658

Merged
merged 2 commits into from
Jun 7, 2017
Merged

Update origin-web-common to 0.0.31, origin-web-catalog to 0.0.19 #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
461e223
Update origin-web-common to 0.0.31, origin-web-catalog to 0.0.19
jeff-phillips-18 Jun 6, 2017
2f29f12
Removing HTMLService and linkify filter as they're now in common
rhamilto May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ <h1>JavaScript Required</h1>
<script src="bower_components/file-saver/FileSaver.js"></script>
<script src="bower_components/hopscotch/dist/js/hopscotch.js"></script>
<script src="bower_components/origin-web-common/dist/origin-web-common.js"></script>
<script src="bower_components/tv4/tv4.js"></script>
<script src="bower_components/objectpath/lib/ObjectPath.js"></script>
<script src="bower_components/angular-schema-form/dist/schema-form.js"></script>
<script src="bower_components/angular-schema-form/dist/bootstrap-decorator.js"></script>
<script src="bower_components/angular-schema-form-bootstrap/bootstrap-decorator.min.js"></script>
<script src="bower_components/origin-web-catalog/dist/vendor-bundle.js"></script>
<script src="bower_components/origin-web-catalog/dist/origin-web-catalogs.js"></script>
<!-- endbower -->
Expand Down Expand Up @@ -198,7 +203,6 @@ <h1>JavaScript Required</h1>
<script src="scripts/services/catalog.js"></script>
<script src="scripts/services/modals.js"></script>
<script src="scripts/services/cliHelp.js"></script>
<script src="scripts/services/html.js"></script>
<script src="scripts/services/environment.js"></script>
<script src="scripts/services/keyValueEditorProvider.js"></script>
<script src="scripts/services/keyValueEditorUtils.js"></script>
Expand Down
9 changes: 0 additions & 9 deletions app/scripts/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,15 +436,6 @@ angular
.constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL"))
.constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL"))
.constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides"))
// Sometimes we need to know the css breakpoints, make sure to update this
// if they ever change!
.constant("BREAKPOINTS", {
screenXsMin: 480, // screen-xs
screenSmMin: 768, // screen-sm
screenMdMin: 992, // screen-md
screenLgMin: 1200, // screen-lg
screenXlgMin: 1600 // screen-xlg
})
// A (very) basic regex to determine if a URL is an absolute URL, enough to
// warn the user the Git URL probably won't work. This should only be used
// as a sanity test and shouldn't block submitting the form. Rely on the API
Expand Down
12 changes: 0 additions & 12 deletions app/scripts/filters/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,18 +495,6 @@ angular.module('openshiftConsole')
.filter('encodeURIComponent', function() {
return window.encodeURIComponent;
})
// Usage: <span ng-bind-html="text | linkify : '_blank'"></span>
//
// Prefer this to the AngularJS `linky` filter since it only matches http and
// https URLs. We've had issues with incorretly matching email addresses.
//
// https://github.com/openshift/origin-web-console/issues/315
// See also HTMLService.linkify
.filter('linkify', function(HTMLService) {
return function(text, target, alreadyEscaped) {
return HTMLService.linkify(text, target, alreadyEscaped);
};
})
.filter('enableTechPreviewFeature', function(Constants) {
return function(feature) {
return _.get(Constants, ['ENABLE_TECH_PREVIEW_FEATURE', feature], false);
Expand Down
60 changes: 0 additions & 60 deletions app/scripts/services/html.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"angular-moment": "1.0.0",
"angular-utf8-base64": "0.0.5",
"file-saver": "1.3.3",
"origin-web-common": "0.0.30",
"origin-web-catalog": "0.0.18"
"origin-web-common": "0.0.31",
"origin-web-catalog": "0.0.19"
},
"devDependencies": {
"angular-mocks": "1.5.11",
Expand Down
25 changes: 2 additions & 23 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,13 +1268,7 @@ redirectTo:"/project/:project/browse/rc/:rc"
}).otherwise({
redirectTo:"/"
});
} ]).constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL")).constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL")).constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides")).constant("BREAKPOINTS", {
screenXsMin:480,
screenSmMin:768,
screenMdMin:992,
screenLgMin:1200,
screenXlgMin:1600
}).constant("SOURCE_URL_PATTERN", /^[a-z][a-z0-9+.-@]*:(\/\/)?[0-9a-z_-]+/i).constant("RELATIVE_PATH_PATTERN", /^(?!\/)(?!\.\.(\/|$))(?!.*\/\.\.(\/|$)).*$/).constant("IS_IOS", /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream).constant("IS_SAFARI", /Version\/[\d\.]+.*Safari/.test(navigator.userAgent)).constant("amTimeAgoConfig", {
} ]).constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL")).constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL")).constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides")).constant("SOURCE_URL_PATTERN", /^[a-z][a-z0-9+.-@]*:(\/\/)?[0-9a-z_-]+/i).constant("RELATIVE_PATH_PATTERN", /^(?!\/)(?!\.\.(\/|$))(?!.*\/\.\.(\/|$)).*$/).constant("IS_IOS", /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream).constant("IS_SAFARI", /Version\/[\d\.]+.*Safari/.test(navigator.userAgent)).constant("amTimeAgoConfig", {
titleFormat:"LLL"
}).config([ "kubernetesContainerSocketProvider", function(a) {
a.WebSocketFactory = "ContainerWebSocket";
Expand Down Expand Up @@ -3766,17 +3760,6 @@ return d += " -n " + a.metadata.namespace;
return {
getLogsCommand:c
};
} ]), angular.module("openshiftConsole").factory("HTMLService", [ "BREAKPOINTS", function(a) {
return {
getBreakpoint:function() {
return window.innerWidth < a.screenXsMin ? "xxs" :window.innerWidth < a.screenSmMin ? "xs" :window.innerWidth < a.screenMdMin ? "sm" :window.innerWidth < a.screenLgMin ? "md" :"lg";
},
linkify:function(a, b, c) {
return a ? (c || (a = _.escape(a)), a.replace(/https?:\/\/[A-Za-z0-9._%+-]+\S*[^\s.;,(){}<>"\u201d\u2019]/gm, function(a) {
return b ? '<a href="' + a + '" target="' + b + '">' + a + "</a>" :'<a href="' + a + '">' + a + "</a>";
})) :a;
}
};
} ]), angular.module("openshiftConsole").factory("EnvironmentService", [ "$filter", "keyValueEditorUtils", function(a, b) {
var c = function(a) {
return _.get(a, "spec.template.spec.containers", []);
Expand Down Expand Up @@ -14485,11 +14468,7 @@ return Math.abs(a);
};
}).filter("encodeURIComponent", function() {
return window.encodeURIComponent;
}).filter("linkify", [ "HTMLService", function(a) {
return function(b, c, d) {
return a.linkify(b, c, d);
};
} ]).filter("enableTechPreviewFeature", [ "Constants", function(a) {
}).filter("enableTechPreviewFeature", [ "Constants", function(a) {
return function(b) {
return _.get(a, [ "ENABLE_TECH_PREVIEW_FEATURE", b ], !1);
};
Expand Down
Loading