diff options
Diffstat (limited to 'public/assets/javascripts/ui')
4 files changed, 26 insertions, 13 deletions
diff --git a/public/assets/javascripts/ui/SiteRouter.js b/public/assets/javascripts/ui/SiteRouter.js index dae2131..3a6b589 100644 --- a/public/assets/javascripts/ui/SiteRouter.js +++ b/public/assets/javascripts/ui/SiteRouter.js @@ -10,7 +10,7 @@ var SiteRouter = Router.extend({ "click [data-role='edit-profile-modal']": 'editProfile', "click [data-role='new-document-modal']": 'newDocument', "click [data-role='edit-document-modal']": 'editDocument', - "click [data-role='delete-document-modal']": 'destroyDocument', + "click [data-role='destroy-document-modal']": 'destroyDocument', "click [data-role='show-layouts-modal']": 'layoutPicker', "click [data-role='show-projects-modal']": 'projectPicker', }, diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js index 42d4306..4ca2e6c 100644 --- a/public/assets/javascripts/ui/builder/BuilderToolbar.js +++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js @@ -6,10 +6,10 @@ 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']": 'draw', - "click [data-role='resize']": 'resize', - "click [data-role='move']": 'move', - "click [data-role='delete']": 'delete', + "click [data-role='draw-mode']": 'draw', + "click [data-role='resize-mode']": 'resize', + "click [data-role='move-mode']": 'move', + "click [data-role='destroy-mode']": 'destroy', }, initialize: function(opt){ @@ -36,7 +36,7 @@ var BuilderToolbar = View.extend({ move: function(){ }, - delete: function(){ + destroy: function(){ }, }) diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js index 58a37b8..b9f4560 100644 --- a/public/assets/javascripts/ui/editor/EditorSettings.js +++ b/public/assets/javascripts/ui/editor/EditorSettings.js @@ -30,7 +30,7 @@ var EditorSettings = FormView.extend({ data.rooms && Rooms.deserialize(data.rooms) data.startPosition && scene.camera.move(data.startPosition) - + if (! data.isNew) { console.log(data) @@ -39,7 +39,6 @@ var EditorSettings = FormView.extend({ this.$description.val( data.description ) data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop('checked', "checked") - console.log(data.media) data.media && Scenery.deserialize(data.media) } }, diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index f966ab6..5382187 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -6,8 +6,8 @@ var EditorToolbar = View.extend({ "click [data-role='toggle-map-view']": 'toggleMap', "click [data-role='toggle-project-settings']": 'toggleSettings', "click [data-role='open-media-viewer']": 'openMediaViewer', - "click [data-role='resize-media']": 'resize', - "click [data-role='delete-media']": 'deleteMedia', + "click [data-role='resize-media']": 'resizeMedia', + "click [data-role='destroy-media']": 'destroyMedia', "click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper', "click [data-role='toggle-light-control']": 'toggleLightControl', "click [data-role='edit-wall-text']": 'editWallText', @@ -32,10 +32,19 @@ var EditorToolbar = View.extend({ }, resizeMedia: function(){ + var state = editor.permissions.toggle("resize") + $(".inuse").removeClass("inuse") + $("[data-role='resize-media']").toggleClass("inuse", state) + if (state) { + Scenery.resize.hide() + } }, - deleteMedia: function(){ - $("body").toggleClass("deleteActive", isActive); + destroyMedia: function(){ + var state = editor.permissions.toggle("destroy") + $(".inuse").removeClass("inuse") + $("[data-role='destroy-media']").toggleClass("inuse", state) + $("body").toggleClass("destroyActive", state) }, toggleWallpaper: function(){ @@ -51,4 +60,9 @@ var EditorToolbar = View.extend({ }) -// $(".icon-close").removeClass("icon-close") +var editor = new function(){ + this.permissions = new Permissions({ + 'resize': false, + 'destroy': false, + }) +}
\ No newline at end of file |