diff options
Diffstat (limited to 'public/assets/javascripts/ui')
6 files changed, 15 insertions, 5 deletions
diff --git a/public/assets/javascripts/ui/SiteRouter.js b/public/assets/javascripts/ui/SiteRouter.js index f0c5530..dae2131 100644 --- a/public/assets/javascripts/ui/SiteRouter.js +++ b/public/assets/javascripts/ui/SiteRouter.js @@ -12,6 +12,7 @@ var SiteRouter = Router.extend({ "click [data-role='edit-document-modal']": 'editDocument', "click [data-role='delete-document-modal']": 'destroyDocument', "click [data-role='show-layouts-modal']": 'layoutPicker', + "click [data-role='show-projects-modal']": 'projectPicker', }, routes: { @@ -61,7 +62,6 @@ var SiteRouter = Router.extend({ this.layoutsModal.load() }, - projectPicker: function(e){ e && e.preventDefault() window.history.pushState(null, document.title, "/project") diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js index 76218fe..f966ab6 100644 --- a/public/assets/javascripts/ui/editor/EditorToolbar.js +++ b/public/assets/javascripts/ui/editor/EditorToolbar.js @@ -7,9 +7,9 @@ var EditorToolbar = View.extend({ "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='toggle-wallpaper-panel']": 'toggleWallpaper', "click [data-role='toggle-light-control']": 'toggleLightControl', - "click [data-role='delete-media']": 'deleteMedia', "click [data-role='edit-wall-text']": 'editWallText', }, diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index d4969c1..b87ac83 100644 --- a/public/assets/javascripts/ui/editor/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js @@ -29,6 +29,7 @@ var EditorView = View.extend({ ready: function(data){ $("#map").hide() + this.settings.load(data) }, @@ -37,6 +38,5 @@ var EditorView = View.extend({ this.ready(data) } - }) diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js index 30287a5..b7fea07 100644 --- a/public/assets/javascripts/ui/editor/MediaUpload.js +++ b/public/assets/javascripts/ui/editor/MediaUpload.js @@ -60,6 +60,8 @@ var MediaUpload = View.extend({ handleFileSelect: function(e) { e.stopPropagation(); e.preventDefault(); + + this.parent.mediaViewer.deleteArmed(false) var files = e.dataTransfer ? e.dataTransfer.files : e.target.files; diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index 05e666b..2535f1b 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -35,7 +35,7 @@ var MediaViewer = ModalView.extend({ hide: function(){ this.__super__.hide.call(this) - this.deleteArmed(null, false) + this.deleteArmed(false) this.parent.mediaUpload.hide() }, @@ -72,7 +72,10 @@ var MediaViewer = ModalView.extend({ deleteIsArmed: false, deleteArmed: function(e, state){ - if (typeof state != "boolean") { + if (typeof e == "boolean") { + state = e + } + else if (typeof state != "boolean") { state = ! this.deleteIsArmed } this.deleteIsArmed = state diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js index 47fa193..46ed634 100644 --- a/public/assets/javascripts/ui/site/LayoutsModal.js +++ b/public/assets/javascripts/ui/site/LayoutsModal.js @@ -52,6 +52,11 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({ // actually do window.location.pathname = "/project/" + $layout.data("slug") + }, + + newProject: function(e){ + e && e.preventDefault() + window.location.pathname = "/project/new" } }) |