diff options
| author |  epoger <epoger@google.com> | 2014-07-03 10:50:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-03 10:50:30 -0700 |
| commit | 46e51e10ae9a061456a5135a9973755f0b64547c (patch) | |
| tree | 45db29dbb1c8d331d8f608e83c862c9f2d22d587 /gm/rebaseline_server/static | |
| parent | c197c8a47eb9cf09b389f4dd5d235510feec18cb (diff) | |
rebaseline_server: if urlSchemaVersion is not specified, assume current
Modification to https://codereview.chromium.org/368933002/ ('rebaseline_server: add urlSchemaVersion parameter')
Means we don't need https://codereview.chromium.org/367173002/ ('add urlSchemaVersion to rebaseline_server link on buildbot console page')
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com
TBR=borenet
Author: epoger@google.com
Review URL: https://codereview.chromium.org/364253003
Diffstat (limited to 'gm/rebaseline_server/static')
| -rw-r--r-- | gm/rebaseline_server/static/constants.js | 7 | ||||
| -rw-r--r-- | gm/rebaseline_server/static/loader.js | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/gm/rebaseline_server/static/constants.js b/gm/rebaseline_server/static/constants.js index 55751d1e21..900bac59c4 100644 --- a/gm/rebaseline_server/static/constants.js +++ b/gm/rebaseline_server/static/constants.js @@ -73,13 +73,10 @@ module.constant('constants', (function() { KEY__EDITS__MODIFICATIONS: 'modifications', KEY__EDITS__OLD_RESULTS_HASH: 'oldResultsHash', KEY__EDITS__OLD_RESULTS_TYPE: 'oldResultsType', - URL_KEY__SCHEMA_VERSION: 'urlSchemaVersion', - URL_VALUE__SCHEMA_VERSION__CURRENT: 0, - // always interpret as then-current schema version; - // used for toplevel links on index page - URL_VALUE__SCHEMA_VERSION__ALWAYS_CURRENT: 'current', // These are just used on the client side, no need to sync with server code. KEY__IMAGEPAIRS__ROWSPAN: 'rowspan', + URL_KEY__SCHEMA_VERSION: 'urlSchemaVersion', + URL_VALUE__SCHEMA_VERSION__CURRENT: 0, } })()) diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js index dbded05f25..8df00e3567 100644 --- a/gm/rebaseline_server/static/loader.js +++ b/gm/rebaseline_server/static/loader.js @@ -427,14 +427,12 @@ Loader.controller( $scope.queryParameters.load = function() { var nameValuePairs = $location.search(); - var urlSchemaVersion = nameValuePairs[constants.URL_KEY__SCHEMA_VERSION]; - if (!urlSchemaVersion) { - $scope.urlSchemaVersionLoaded = 0; - } else if (urlSchemaVersion == constants.URL_VALUE__SCHEMA_VERSION__ALWAYS_CURRENT) { - $scope.urlSchemaVersionLoaded = constants.URL_VALUE__SCHEMA_VERSION__CURRENT; - } else { - $scope.urlSchemaVersionLoaded = urlSchemaVersion; + // If urlSchemaVersion is not specified, we assume the current version. + var urlSchemaVersion = constants.URL_VALUE__SCHEMA_VERSION__CURRENT; + if (constants.URL_KEY__SCHEMA_VERSION in nameValuePairs) { + urlSchemaVersion = nameValuePairs[constants.URL_KEY__SCHEMA_VERSION]; } + $scope.urlSchemaVersionLoaded = urlSchemaVersion; angular.forEach($scope.queryParameters.map, function(copier, paramName) { |