Merge pull request #4523 from Gargol/issue-4516

Adds ctrl/cmd+s shortcut to whole application with a noop default

ghost/admin/mixins/shortcuts-route.js

@@ -74,11 +74,6 @@ var ShortcutsRoute = Ember.Mixin.create({
 
     activate: function () {
         this._super();
-
-        if (!this.shortcuts) {
-            return;
-        }
-
         this.registerShortcuts();
     },
 

ghost/admin/routes/application.js

@@ -1,7 +1,16 @@
 /* global key */
 import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
+import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
 
-var ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, ShortcutsRoute, {
+var ApplicationRoute,
+    shortcuts = {};
+
+shortcuts.esc = {action: 'closePopups', scope: 'all'};
+shortcuts.enter = {action: 'confirmModal', scope: 'modal'};
+shortcuts[ctrlOrCmd + '+s'] = {action: 'save', scope: 'all'};
+
+ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, ShortcutsRoute, {
+    shortcuts: shortcuts,
 
     afterModel: function (model, transition) {
         if (this.get('session').isAuthenticated) {
@@ -9,11 +18,6 @@ var ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, Shor
         }
     },
 
-    shortcuts: {
-        esc: {action: 'closePopups', scope: 'all'},
-        enter: {action: 'confirmModal', scope: 'modal'}
-    },
-
     title: function (tokens) {
         return tokens.join(' - ') + ' - ' + this.get('config.blogTitle');
     },
@@ -155,7 +159,10 @@ var ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, Shor
                     errorObj.el.addClass('input-error');
                 }
             });
-        }
+        },
+
+        // noop default for unhandled save (used from shortcuts)
+        save: Ember.K
     }
 });
 

ghost/admin/routes/settings/code-injection.js

@@ -2,15 +2,8 @@ import AuthenticatedRoute from 'ghost/routes/authenticated';
 import loadingIndicator from 'ghost/mixins/loading-indicator';
 import CurrentUserSettings from 'ghost/mixins/current-user-settings';
 import styleBody from 'ghost/mixins/style-body';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
 
-var shortcuts = {},
+var SettingsCodeInjectionRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, CurrentUserSettings, {
-    SettingsCodeInjectionRoute;
-
-shortcuts[ctrlOrCmd + '+s'] = {action: 'save'};
-
-SettingsCodeInjectionRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, CurrentUserSettings, ShortcutsRoute, {
     classNames: ['settings-view-code'],
 
     beforeModel: function () {
@@ -25,8 +18,6 @@ SettingsCodeInjectionRoute = AuthenticatedRoute.extend(styleBody, loadingIndicat
         });
     },
 
-    shortcuts: shortcuts,
-
     actions: {
         save: function () {
             this.get('controller').send('save');

ghost/admin/routes/settings/general.js

@@ -2,15 +2,8 @@ import AuthenticatedRoute from 'ghost/routes/authenticated';
 import loadingIndicator from 'ghost/mixins/loading-indicator';
 import CurrentUserSettings from 'ghost/mixins/current-user-settings';
 import styleBody from 'ghost/mixins/style-body';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
 
-var shortcuts = {},
+var SettingsGeneralRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, CurrentUserSettings, {
-    SettingsGeneralRoute;
-
-shortcuts[ctrlOrCmd + '+s'] = {action: 'save'};
-
-SettingsGeneralRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, CurrentUserSettings, ShortcutsRoute, {
     titleToken: 'General',
 
     classNames: ['settings-view-general'],
@@ -27,8 +20,6 @@ SettingsGeneralRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, Cu
         });
     },
 
-    shortcuts: shortcuts,
-
     actions: {
         save: function () {
             this.get('controller').send('save');

ghost/admin/routes/settings/users/user.js

@@ -1,14 +1,7 @@
 import AuthenticatedRoute from 'ghost/routes/authenticated';
 import styleBody from 'ghost/mixins/style-body';
-import ShortcutsRoute from 'ghost/mixins/shortcuts-route';
-import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
 
-var shortcuts = {},
+var SettingsUserRoute = AuthenticatedRoute.extend(styleBody, {
-    SettingsUserRoute;
-
-shortcuts[ctrlOrCmd + '+s'] = {action: 'save'};
-
-SettingsUserRoute = AuthenticatedRoute.extend(styleBody, ShortcutsRoute, {
     titleToken: 'User',
 
     classNames: ['settings-view-user'],
@@ -55,8 +48,6 @@ SettingsUserRoute = AuthenticatedRoute.extend(styleBody, ShortcutsRoute, {
         this._super();
     },
 
-    shortcuts: shortcuts,
-
     actions: {
         save: function () {
             this.get('controller').send('save');

ghost/admin/utils/editor-shortcuts.js

@@ -3,7 +3,6 @@ import ctrlOrCmd from 'ghost/utils/ctrl-or-cmd';
 var shortcuts = {};
 
 // General editor shortcuts
-shortcuts[ctrlOrCmd + '+s'] = 'save';
 shortcuts[ctrlOrCmd + '+alt+p'] = 'publish';
 shortcuts['alt+shift+z'] = 'toggleZenMode';