summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-13 11:21:59 -0400
committerJules Laplace <jules@okfoc.us>2014-10-13 11:21:59 -0400
commit7907f0afe0ccd2230f6895949ab1ba97732dc2ce (patch)
treedfb7efae4a9b4b6016d8be9a0b03d23644b3da34 /public/assets/javascripts/ui
parent6177755e842ca3028833bc98ba0e97e6874b27fb (diff)
parentf73f5c517d08581d8d1c687a42e9ef9e5598662a (diff)
merge
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/editor/EditorToolbar.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 8a707ec..0b1da0b 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -4,6 +4,7 @@ var EditorToolbar = View.extend({
events: {
"mousedown": 'stopPropagation',
+ "click [data-role='undo']": 'undo',
"click [data-role='toggle-map-view']": 'toggleMap',
"click [data-role='toggle-project-settings']": 'toggleSettings',
"click [data-role='open-media-viewer']": 'openMediaViewer',
@@ -18,6 +19,17 @@ var EditorToolbar = View.extend({
this.parent = opt.parent
},
+ undo: function(e){
+ if (e.shiftKey) {
+ var canRedo = UndoStack.redo()
+ console.log("can redo", canRedo)
+ }
+ else {
+ var canUndo = UndoStack.undo()
+ console.log("can undo", canUndo)
+ }
+ },
+
toggleMap: function(){
var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
this.resetControls()