From a61602ba2a76fa23c816454a8bd5e24c12d6899c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 20 Jun 2014 18:15:41 -0400 Subject: layouts toolbar toggles working --- .../javascripts/ui/builder/BuilderToolbar.js | 23 +++++++++++++++++----- .../assets/javascripts/ui/editor/EditorToolbar.js | 8 ++++---- 2 files changed, 22 insertions(+), 9 deletions(-) (limited to 'public/assets/javascripts/ui') diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js index 4ca2e6c..df98ab0 100644 --- a/public/assets/javascripts/ui/builder/BuilderToolbar.js +++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js @@ -6,7 +6,7 @@ var BuilderToolbar = View.extend({ "click [data-role='toggle-map-view']": 'toggleMap', "click [data-role='toggle-layout-settings']": 'toggleSettings', "click [data-role='undo']": 'undo', - "click [data-role='draw-mode']": 'draw', + "click [data-role='create-mode']": 'create', "click [data-role='resize-mode']": 'resize', "click [data-role='move-mode']": 'move', "click [data-role='destroy-mode']": 'destroy', @@ -14,6 +14,7 @@ var BuilderToolbar = View.extend({ initialize: function(opt){ this.parent = opt.parent + map.ui.permissions.toggle() }, toggleMap: function(){ @@ -27,16 +28,28 @@ var BuilderToolbar = View.extend({ undo: function(){ }, - draw: function(){ + create: function(e){ + var state = map.ui.permissions.toggle("create") + $(".inuse").removeClass("inuse") + $(e.currentTarget).toggleClass("inuse", state) }, - resize: function(){ + resize: function(e){ + var state = map.ui.permissions.toggle("resize") + $(".inuse").removeClass("inuse") + $(e.currentTarget).toggleClass("inuse", state) }, - move: function(){ + move: function(e){ + var state = map.ui.permissions.toggle("move") + $(".inuse").removeClass("inuse") + $(e.currentTarget).toggleClass("inuse", state) }, - destroy: function(){ + destroy: function(e){ + var state = map.ui.permissions.toggle("destroy") + $(".inuse").removeClass("inuse") + $(e.currentTarget).toggleClass("inuse", state) }, }) diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index d5d3c4e..c3589db 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -31,19 +31,19 @@ var EditorToolbar = View.extend({ this.parent.mediaUpload.show() }, - resizeMedia: function(){ + resizeMedia: function(e){ var state = editor.permissions.toggle("resize") $(".inuse").removeClass("inuse") - $("[data-role='resize-media']").toggleClass("inuse", state) + $(e.currentTarget).toggleClass("inuse", state) if (state) { Scenery.resize.hide() } }, - destroyMedia: function(){ + destroyMedia: function(e){ var state = editor.permissions.toggle("destroy") $(".inuse").removeClass("inuse") - $("[data-role='destroy-media']").toggleClass("inuse", state) + $(e.currentTarget).toggleClass("inuse", state) $("body").toggleClass("destroyActive", state) }, -- cgit v1.2.3-70-g09d2