Clean up markdown help toggle

no issue

The markdown help link was removed from the sidebar so the only link to toggle the markdown help modal is now the markdown editor yet we we still had a more general implementation with a confusing pass-through of closure actions.

- move the markdown modal toggle and display into the `{{gh-markdown-editor}}` component

ghost/admin/app/components/gh-markdown-editor.js

@@ -44,6 +44,7 @@ export default Component.extend(ShortcutsMixin, {
     mobiledoc: null,
     options: null,
     placeholder: '',
+    showMarkdownHelp: false,
     uploadedImageUrls: null,
 
     // Closure actions
@@ -52,7 +53,6 @@ export default Component.extend(ShortcutsMixin, {
     onImageFilesSelected() {},
     onPreviewToggle() {},
     onSplitScreenToggle() {},
-    showMarkdownHelp() {},
 
     // Internal attributes
     markdown: null,
@@ -132,7 +132,7 @@ export default Component.extend(ShortcutsMixin, {
                 {
                     name: 'guide',
                     action: () => {
-                        this.showMarkdownHelp();
+                        this.send('toggleMarkdownHelp');
                     },
                     className: 'fa fa-question-circle',
                     title: 'Markdown Guide'
@@ -605,6 +605,10 @@ export default Component.extend(ShortcutsMixin, {
             this._toggleHemingway();
         },
 
+        toggleMarkdownHelp() {
+            this.toggleProperty('showMarkdownHelp');
+        },
+
         // put the toolbar/statusbar elements back so that SimpleMDE doesn't throw
         // errors when it tries to remove them
         destroyEditor() {

ghost/admin/app/components/gh-nav-menu.js

@@ -78,11 +78,5 @@ export default Component.extend({
         iconUrl += `?t=${(new Date()).valueOf()}`;
 
         this.set('iconStyle', htmlSafe(`background-image: url(${iconUrl})`));
-    },
-
-    actions: {
-        showMarkdownHelp() {
-            this.sendAction('showMarkdownHelp');
-        }
     }
 });

ghost/admin/app/controllers/application.js

@@ -20,7 +20,6 @@ export default Controller.extend({
     }),
 
     topNotificationCount: 0,
-    showMarkdownHelpModal: false,
 
     actions: {
         topNotificationChange(count) {

ghost/admin/app/routes/application.js

@@ -205,10 +205,6 @@ export default Route.extend(ApplicationRouteMixin, ShortcutsRoute, {
             }
         },
 
-        toggleMarkdownHelpModal() {
-            this.get('controller').toggleProperty('showMarkdownHelpModal');
-        },
-
         // noop default for unhandled save (used from shortcuts)
         save: K,
 

ghost/admin/app/templates/application.hbs

@@ -5,10 +5,7 @@
 
     <div class="gh-viewport {{if ui.autoNav 'gh-autonav'}} {{if ui.showSettingsMenu 'settings-menu-expanded'}} {{if ui.showMobileMenu 'mobile-menu-expanded'}}">
         {{#if showNavMenu}}
-            {{gh-nav-menu
+            {{gh-nav-menu open=ui.autoNavOpen}}
-                open=ui.autoNavOpen
-                icon=settings.settledIcon
-                showMarkdownHelp="toggleMarkdownHelpModal"}}
         {{/if}}
 
         {{#gh-main onMouseEnter=(action "closeAutoNav" target=ui) data-notification-count=topNotificationCount}}
@@ -24,10 +21,4 @@
     </div>{{!gh-viewport}}
 {{/gh-app}}
 
-{{#if showMarkdownHelpModal}}
-    {{gh-fullscreen-modal "markdown-help"
-                          close=(route-action "toggleMarkdownHelpModal")
-                          modifier="wide"}}
-{{/if}}
-
 {{ember-load-remover}}

ghost/admin/app/templates/components/gh-markdown-editor.hbs

@@ -23,3 +23,9 @@
         insert=(action "insertUnsplashPhoto")
         close=(action "toggleUnsplash")}}
 {{/if}}
+
+{{#if showMarkdownHelp}}
+    {{gh-fullscreen-modal "markdown-help"
+        close=(action "toggleMarkdownHelp")
+        modifier="wide"}}
+{{/if}}

ghost/admin/app/templates/editor/edit.hbs

@@ -47,7 +47,6 @@
         onPreviewToggle=(action editor.togglePreview)
         onSplitScreenToggle=(action editor.toggleSplitScreen)
         onImageFilesSelected=(action editor.uploadImages)
-        showMarkdownHelp=(route-action "toggleMarkdownHelpModal")
         imageMimeTypes=editor.imageMimeTypes
         as |markdown|
     }}