AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rebaseline_server: image URLs are relative to JSON file's location

Browse Source 
BUG=skia:1455, skia:2230
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/205273002

git-svn-id: http://skia.googlecode.com/svn/trunk@13874 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-03-20 15:27:34 +00:00
parent 130dc91b93
commit b42105a4a2
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gm/rebaseline_server/static/loader.js
View File

@ -164,6 +164,20 @@ Loader.controller(
// If any defaults were overridden in the URL, get them now.
$scope.queryParameters.load();
// Any image URLs which are relative should be relative to the JSON
// file's source directory; absolute URLs should be left alone.
var baseUrlKey = constants.KEY__IMAGESETS__FIELD__BASE_URL;
angular.forEach(
$scope.imageSets,
function(imageSet) {
var baseUrl = imageSet[baseUrlKey];
if ((baseUrl.substring(0, 1) != '/') &&
(baseUrl.indexOf('://') == -1)) {
imageSet[baseUrlKey] = $scope.resultsToLoad + '/../' + baseUrl;
}
}
);
$scope.updateResults();
$scope.loadingMessage = "";
$scope.windowTitle = "Current GM Results";