From a7938cf54e79f3137541073a82450ad8da688c70 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Wed, 11 Jan 2017 22:28:29 -0500 Subject: [PATCH] new travis.yml; last used file per-platform --- doc/.travis.yml | 9 +++++++++ javatari.js | 2 +- src/platform/vcs.js | 1 + src/ui.js | 5 +++-- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 doc/.travis.yml diff --git a/doc/.travis.yml b/doc/.travis.yml new file mode 100644 index 00000000..4a43ddb2 --- /dev/null +++ b/doc/.travis.yml @@ -0,0 +1,9 @@ +# Handle git submodules yourself +git: + submodules: false +# Use sed to replace the SSH URL with the public URL, then initialize submodules +before_install: + - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules + - git submodule update --init --recursive +language: node_js + - "6.5.0" diff --git a/javatari.js b/javatari.js index 97052f91..4cd5b798 160000 --- a/javatari.js +++ b/javatari.js @@ -1 +1 @@ -Subproject commit 97052f9149bf756ce69591e005762dadea8527a6 +Subproject commit 4cd5b798f534336d09a80e8a1fa962959f401359 diff --git a/src/platform/vcs.js b/src/platform/vcs.js index 2d93a93d..e6a9e1a5 100644 --- a/src/platform/vcs.js +++ b/src/platform/vcs.js @@ -69,6 +69,7 @@ var VCSPlatform = function() { this.pause = function() { Javatari.room.console.pause(); } this.resume = function() { Javatari.room.console.go(); } this.step = function() { Javatari.room.console.debugSingleStepCPUClock(); } + this.stepBack = function() { Javatari.room.console.debugStepBackInstruction(); } this.runEval = function(evalfunc) { Javatari.room.console.debugEval(evalfunc); } this.setupDebug = function(callback) { diff --git a/src/ui.js b/src/ui.js index eaa96bc3..0b33d01f 100644 --- a/src/ui.js +++ b/src/ui.js @@ -73,8 +73,8 @@ function getCurrentPresetTitle() { } function setLastPreset(id) { - localStorage.setItem("__lastid", id); localStorage.setItem("__lastplatform", platform_id); + localStorage.setItem("__lastid_"+platform_id, id); } function updatePreset(current_preset_id, text) { @@ -906,7 +906,8 @@ try { updateSelector(); } else { // try to load last file - var lastid = localStorage.getItem("__lastid"); + var lastid = localStorage.getItem("__lastid_"+platform_id) || localStorage.getItem("__lastid"); + localStorage.removeItem("__lastid"); gotoPresetNamed(lastid || PRESETS[0].id); } }