| Index: gm/rebaseline_server/static/live-loader.js
|
| diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/live-loader.js
|
| similarity index 98%
|
| copy from gm/rebaseline_server/static/loader.js
|
| copy to gm/rebaseline_server/static/live-loader.js
|
| index 19bc2378a0cbfd16b30d98bdf6a46151568aa8b4..cd88fa9d61b66694b6b4ce78f1e27d94938fdc7c 100644
|
| --- a/gm/rebaseline_server/static/loader.js
|
| +++ b/gm/rebaseline_server/static/live-loader.js
|
| @@ -127,7 +127,8 @@ Loader.controller(
|
| $scope.readyToDisplay = false;
|
| $scope.constants = constants;
|
| $scope.windowTitle = "Loading GM Results...";
|
| - $scope.resultsToLoad = $location.search().resultsToLoad;
|
| + $scope.actualsDir = $location.search().actualsDir;
|
| + $scope.expectationsDir = $location.search().expectationsDir;
|
| $scope.loadingMessage = "please wait...";
|
|
|
| /**
|
| @@ -135,7 +136,10 @@ Loader.controller(
|
| * Once the dictionary is loaded, unhide the page elements so they can
|
| * render the data.
|
| */
|
| - $http.get($scope.resultsToLoad).success(
|
| + var liveQueryUrl =
|
| + "/live-results/actualsDir=" + encodeURIComponent($scope.actualsDir) +
|
| + "&expectationsDir=" + encodeURIComponent($scope.expectationsDir);
|
| + $http.get(liveQueryUrl).success(
|
| function(data, status, header, config) {
|
| var dataHeader = data[constants.KEY__ROOT__HEADER];
|
| if (dataHeader[constants.KEY__HEADER__SCHEMA_VERSION] !=
|
| @@ -247,7 +251,8 @@ Loader.controller(
|
| // Set up mapping for URL parameters.
|
| // parameter name -> copier object to load/save parameter value
|
| $scope.queryParameters.map = {
|
| - 'resultsToLoad': $scope.queryParameters.copiers.simple,
|
| + 'actualsDir': $scope.queryParameters.copiers.simple,
|
| + 'expectationsDir': $scope.queryParameters.copiers.simple,
|
| 'displayLimitPending': $scope.queryParameters.copiers.simple,
|
| 'showThumbnailsPending': $scope.queryParameters.copiers.simple,
|
| 'mergeIdenticalRowsPending': $scope.queryParameters.copiers.simple,
|
| @@ -282,7 +287,7 @@ Loader.controller(
|
| var baseUrl = imageSet[baseUrlKey];
|
| if ((baseUrl.substring(0, 1) != '/') &&
|
| (baseUrl.indexOf('://') == -1)) {
|
| - imageSet[baseUrlKey] = $scope.resultsToLoad + '/../' + baseUrl;
|
| + imageSet[baseUrlKey] = '/' + baseUrl;
|
| }
|
| }
|
| );
|
|
|