aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/rebaseline_server/static
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-17 18:06:13 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-17 18:06:13 +0000
commit50ad8e4d8efcd04f8a2c34cc32f6fecb3985a1a4 (patch)
tree7f4926f04db3d56907fc4a028f32faf4c13de37d /gm/rebaseline_server/static
parent588be5370664f8d41050dc66ea38538b22e4c881 (diff)
rebaseline_server: return rebaseline results faster, and reload UI page automatically after
Old way: Wait until server has loaded the updated results before telling the user the rebaseline was successful, and trust the user to reload the page before submitting more baselines. New way: Make server load the updated results in a separate thread, and automatically reload the page so that the user can submit more baselines if she wants to. (SkipBuildbotRuns) NOTRY=True NOTREECHECKS=True R=bsalomon@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/117453002 git-svn-id: http://skia.googlecode.com/svn/trunk@12717 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/rebaseline_server/static')
-rw-r--r--gm/rebaseline_server/static/loader.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js
index fa74ed8eff..3339cad4a9 100644
--- a/gm/rebaseline_server/static/loader.js
+++ b/gm/rebaseline_server/static/loader.js
@@ -55,7 +55,7 @@ Loader.controller(
function(data, status, header, config) {
if (data.header.resultsStillLoading) {
$scope.loadingMessage =
- "Server is still loading initial results; will retry at " +
+ "Server is still loading results; will retry at " +
$scope.localTimeString(data.header.timeNextUpdateAvailable);
$timeout(
function(){location.reload();},
@@ -508,9 +508,13 @@ Loader.controller(
alert("New baselines submitted successfully!\n\n" +
"You still need to commit the updated expectations files on " +
"the server side to the Skia repo.\n\n" +
- "Also: in order to see the complete updated data, or to submit " +
- "more baselines, you will need to reload your client.");
- $scope.submitPending = false;
+ "When you click OK, your web UI will reload; after that " +
+ "completes, you will see the updated data (once the server has " +
+ "finished loading the update results into memory!) and you can " +
+ "submit more baselines if you want.");
+ // I don't know why, but if I just call reload() here it doesn't work.
+ // Making a timer call it fixes the problem.
+ $timeout(function(){location.reload();}, 1);
}).error(function(data, status, headers, config) {
alert("There was an error submitting your baselines.\n\n" +
"Please see server-side log for details.");