From 61c6c8c5c1ea050214d995cb981bb1bb01895bf6 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 29 Nov 2014 10:18:18 -0500 Subject: [PATCH] added empty canvas helper message --- LiveSiteUpdatesNotes.txt | 6 ++++ app/assets/javascripts/src/Metamaps.JIT.js | 2 ++ app/assets/javascripts/src/Metamaps.js | 3 ++ buildpackswithphantom.txt | 2 -- public/famous/main.js | 41 ++++++++++++++++++++-- 5 files changed, 49 insertions(+), 5 deletions(-) delete mode 100644 buildpackswithphantom.txt diff --git a/LiveSiteUpdatesNotes.txt b/LiveSiteUpdatesNotes.txt index ad2ae9dd..ea00eb2a 100644 --- a/LiveSiteUpdatesNotes.txt +++ b/LiveSiteUpdatesNotes.txt @@ -1,3 +1,9 @@ +make sure that devise key is correct + + +make sure that AWS bucket is set to the metamaps-production bucket + + make sure that root individuals have same 'joinedwithcode' as 'code' User.all.each do |u| diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js index 6099fd0f..f27bbb02 100644 --- a/app/assets/javascripts/src/Metamaps.JIT.js +++ b/app/assets/javascripts/src/Metamaps.JIT.js @@ -112,8 +112,10 @@ Metamaps.JIT = { }); if (self.vizData.length == 0) { + Metamaps.Famous.viz.showInstructions(); Metamaps.Visualize.loadLater = true; } + else Metamaps.Famous.viz.hideInstructions(); Metamaps.Visualize.render(); }, // prepareVizData diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 4c9f6ade..a16c8fae 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -4023,6 +4023,9 @@ Metamaps.Topic = { return; } + // hide the 'double-click to add a topic' message + Metamaps.Famous.viz.hideInstructions(); + $(document).trigger(Metamaps.Map.events.editedByActiveMapper); var metacode = Metamaps.Metacodes.get(Metamaps.Create.newTopic.metacode); diff --git a/buildpackswithphantom.txt b/buildpackswithphantom.txt deleted file mode 100644 index 47d4c0e8..00000000 --- a/buildpackswithphantom.txt +++ /dev/null @@ -1,2 +0,0 @@ -https://github.com/heroku/heroku-buildpack-ruby.git -https://github.com/stomita/heroku-buildpack-phantomjs.git \ No newline at end of file diff --git a/public/famous/main.js b/public/famous/main.js index 2e3d04aa..cf49a098 100644 --- a/public/famous/main.js +++ b/public/famous/main.js @@ -27,11 +27,34 @@ Metamaps.Famous.build = function () { // INFOVIS f.viz = {}; + + var instructions = { + addTopic: "Double-click to
add a topic!", + tabKey: "Use Tab & Shift+Tab to select a metacode", + enterKey: "Press Enter to add the topic" + }; + f.viz.surf = new Surface({ size: [undefined, undefined], classes: [], properties: { - display: 'none' + display: "none", + zIndex: "1" + } + }); + + var instrShowing = false; + f.viz.instrSurf = new Surface({ + content: instructions.addTopic, + size: [220, 80], + classes: ["doubleClickSurf"], + properties: { + fontFamily: "'din-regular', helvetica, sans-serif", + fontSize: "32px", + display: "none", + textAlign: "center", + color: "#999999", + zIndex: "0" } }); var prepare = function () { @@ -62,8 +85,20 @@ Metamaps.Famous.build = function () { } ); }; - f.mainContext.add(f.viz.mod).add(f.viz.surf); - + f.viz.isInstrShowing = function() { + return instrShowing; + } + f.viz.showInstructions = function() { + instrShowing = true; + f.viz.instrSurf.setProperties({ "display":"block" }); + }; + f.viz.hideInstructions = function() { + instrShowing = false; + f.viz.instrSurf.setProperties({ "display":"none" }); + }; + var vizMod = f.mainContext.add(f.viz.mod); + vizMod.add(f.viz.surf); + vizMod.add(f.viz.instrSurf); // CONTENT / OTHER PAGES f.yield = {};