added empty canvas helper message

This commit is contained in:
Connor Turland 2014-11-29 10:18:18 -05:00
parent cb3db06406
commit 61c6c8c5c1
5 changed files with 49 additions and 5 deletions

View file

@ -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|

View file

@ -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

View file

@ -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);

View file

@ -1,2 +0,0 @@
https://github.com/heroku/heroku-buildpack-ruby.git
https://github.com/stomita/heroku-buildpack-phantomjs.git

View file

@ -27,11 +27,34 @@ Metamaps.Famous.build = function () {
// INFOVIS
f.viz = {};
var instructions = {
addTopic: "Double-click to<br>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 = {};