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

Fix history handling for workspaces, issue with M36

Browse Source 
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

Review URL: https://codereview.chromium.org/363003004
This commit is contained in:
jcgregorio 2014-07-07 06:56:44 -07:00 committed by Commit bot
parent 8119e6a85d
commit 3ef0453299
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
experimental/webtry/res/js/webtry.js
View File

@ -11,7 +11,7 @@
* namespace. If workspaceName is the empty string then we know we aren't
* running on a workspace page.
*
* If we are on a workspace page we also look for a 'history'
* If we are on a workspace page we also look for a 'history_'
* variable in the global namespace which contains the list of tries
* that are included in this workspace. That variable is used to
* populate the history list.
@ -286,9 +286,9 @@
}
// Add the images to the history if we are on a workspace page.
if (tryHistory && history) {
for (var i=0; i<history.length; i++) {
addToHistory(history[i].hash, '/i/'+history[i].hash+'.png');
if (tryHistory && history_) {
for (var i=0; i<history_.length; i++) {
addToHistory(history_[i].hash, '/i/'+history_[i].hash+'.png');
}
}
}
@ -297,7 +297,7 @@
if (document.readyState != "loading") {
onLoad();
} else {
this.addEventListener('DOMContentLoaded', onLoad);
this.addEventListener('load', onLoad);
}
})();

3
experimental/webtry/templates/workspace.html
View File

@ -19,7 +19,8 @@
</section>
<script type='text/javascript'>
var history = {{.Tries}};
var history_ = {{.Tries}};
console.log(history_);
</script>
<script type='text/javascript'>
// Set the workspace name so run.js also updates the history.