diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-20 12:38:35 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-20 12:38:35 -0400 |
| commit | 4d41eaa24d04fe61233c024ece899731aaf9f1e8 (patch) | |
| tree | 96fa5d076084c4bc35513873f6714345f0a4d481 /public/assets/javascripts/ui | |
| parent | 8aede8cb98669537213eb267e8602dc3e8266c97 (diff) | |
better wall colors
Diffstat (limited to 'public/assets/javascripts/ui')
| -rw-r--r-- | public/assets/javascripts/ui/SiteRouter.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorToolbar.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/site/LayoutsModal.js | 5 |
3 files changed, 7 insertions, 2 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/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" } }) |