You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2015/06/10 22:52:10 UTC
mesos git commit: Make a bunch of JSONP callback URLs in mesos UI
protocol-relative.
Repository: mesos
Updated Branches:
refs/heads/master 263a85992 -> f55dc9818
Make a bunch of JSONP callback URLs in mesos UI protocol-relative.
Review: https://reviews.apache.org/r/35270
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f55dc981
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f55dc981
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f55dc981
Branch: refs/heads/master
Commit: f55dc981889ac45775bb4bb023695e8a0ed9799d
Parents: 263a859
Author: Oliver Nicholas <bi...@wonlove.net>
Authored: Wed Jun 10 13:51:46 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Jun 10 13:51:46 2015 -0700
----------------------------------------------------------------------
src/webui/master/static/js/controllers.js | 12 ++++++------
src/webui/master/static/js/services.js | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f55dc981/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index 9384694..3445028 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -14,7 +14,7 @@
// Invokes the pailer for the specified host and path using the
// specified window_title.
function pailer(host, path, window_title) {
- var url = 'http://' + host + '/files/read.json?path=' + path;
+ var url = '//' + host + '/files/read.json?path=' + path;
var pailer =
window.open('/static/pailer.html', url, 'width=580px, height=700px');
@@ -421,7 +421,7 @@
$top.start(host, $scope);
}
- $http.jsonp('http://' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
+ $http.jsonp('//' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
.success(function (response) {
$scope.state = response;
@@ -499,7 +499,7 @@
$top.start(host, $scope);
}
- $http.jsonp('http://' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
+ $http.jsonp('//' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
.success(function (response) {
$scope.state = response;
@@ -572,7 +572,7 @@
$top.start(host, $scope);
}
- $http.jsonp('http://' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
+ $http.jsonp('//' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
.success(function (response) {
$scope.state = response;
@@ -677,7 +677,7 @@
// Request slave details to get access to the route executor's "directory"
// to navigate directly to the executor's sandbox.
- $http.jsonp('http://' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
+ $http.jsonp('//' + host + '/' + id + '/state.json?jsonp=JSON_CALLBACK')
.success(function(response) {
function matchFramework(framework) {
@@ -747,7 +747,7 @@
var hostname = $scope.slaves[$routeParams.slave_id].hostname;
var id = pid.substring(0, pid.indexOf('@'));
var host = hostname + ":" + pid.substring(pid.lastIndexOf(':') + 1);
- var url = 'http://' + host + '/files/browse.json?jsonp=JSON_CALLBACK';
+ var url = '//' + host + '/files/browse.json?jsonp=JSON_CALLBACK';
$scope.slave_host = host;
http://git-wip-us.apache.org/repos/asf/mesos/blob/f55dc981/src/webui/master/static/js/services.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/services.js b/src/webui/master/static/js/services.js
index 8403aad..2cd9d7d 100644
--- a/src/webui/master/static/js/services.js
+++ b/src/webui/master/static/js/services.js
@@ -271,7 +271,7 @@
return;
}
- this.endpoint = 'http://' + host + '/monitor/statistics.json?jsonp=JSON_CALLBACK';
+ this.endpoint = '//' + host + '/monitor/statistics.json?jsonp=JSON_CALLBACK';
this.scope = scope;
// Initial poll is immediate.