Cleaned up unused code in <GhTagSettingsForm>

no issue - the tag screen is now separate from the index so the code needed for handling switches between main/meta panes and scroll resets is not used and no longer needed - tidies up indentation in the template
TryGhost · Jan 10, 2020 · b61f3f1 · b61f3f1
1 parent 708509d
commit b61f3f1
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 86 deletions.
diff --git a/app/components/gh-tag-settings-form.js b/app/components/gh-tag-settings-form.js
@@ -1,4 +1,3 @@
-/* global key */
 import Component from '@ember/component';
 import Ember from 'ember';
 import {computed} from '@ember/object';
@@ -12,8 +11,7 @@ export default Component.extend({
     config: service(),
 
     tag: null,
-
-    isViewingSubview: false,
+    scratchTag: null,
 
     // Allowed actions
     setProperty: () => {},
@@ -98,30 +96,6 @@ export default Component.extend({
 
         clearCoverImage() {
             this.setProperty('featureImage', '');
-        },
-
-        openMeta() {
-            this.set('isViewingSubview', true);
-        },
-
-        closeMeta() {
-            this.set('isViewingSubview', false);
         }
-    },
-
-    reset() {
-        this.set('isViewingSubview', false);
-        if (this.$()) {
-            this.$('.settings-menu-pane').scrollTop(0);
-        }
-    },
-
-    focusIn() {
-        key.setScope('tag-settings-form');
-    },
-
-    focusOut() {
-        key.setScope('default');
     }
-
 });
diff --git a/app/templates/components/gh-tag-settings-form.hbs b/app/templates/components/gh-tag-settings-form.hbs
@@ -2,86 +2,91 @@
 <div class="pa5 pt4 br4 shadow-1 bg-grouped-table mt2 flex flex-column flex-row-ns items-start justify-between gh-tag-basic-settings-form">
     <div class="order-1 flex flex-column items-start mr5 w-100 w-50-m w-two-thirds-l">
         {{#gh-form-group errors=this.tag.errors hasValidated=this.tag.hasValidated property="name"}}
-        <label for="tag-name">Name</label>
-        {{gh-text-input
-                    id="tag-name"
-                    name="name"
-                    value=this.scratchTag.name
-                    tabindex="1"
-                    focus-out=(action 'setProperty' 'name' this.scratchTag.name)}}
-        <p class="description">Start with # to create internal tags. <a
-                href="https://ghost.org/docs/concepts/tags/#internal-tag" target="_blank" rel="noreferrer">Learn
-                more</a></p>
-        <GhErrorMessage @errors={{this.tag.errors}} @property="name" />
+            <label for="tag-name">Name</label>
+            {{gh-text-input
+                id="tag-name"
+                name="name"
+                value=this.scratchTag.name
+                tabindex="1"
+                focus-out=(action 'setProperty' 'name' this.scratchTag.name)
+            }}
+            <p class="description">
+                Start with # to create internal tags
+                <a href="https://ghost.org/docs/concepts/tags/#internal-tag" target="_blank" rel="noreferrer">Learn more</a>
+            </p>
+            <GhErrorMessage @errors={{this.tag.errors}} @property="name" />
         {{/gh-form-group}}
 
         {{#gh-form-group errors=this.tag.errors hasValidated=this.tag.hasValidated property="slug"}}
-        <label for="tag-slug">Slug</label>
-        {{gh-text-input
-                    value=this.scratchTag.slug
-                    id="tag-slug"
-                    name="slug"
-                    tabindex="2"
-                    focus-out=(action 'setProperty' 'slug' this.scratchTag.slug)}}
-        {{gh-url-preview prefix="tag" slug=this.scratchTag.slug tagName="p" classNames="description"}}
-        <GhErrorMessage @errors={{this.activeTag.errors}} @property="slug" />
+            <label for="tag-slug">Slug</label>
+            {{gh-text-input
+                value=this.scratchTag.slug
+                id="tag-slug"
+                name="slug"
+                tabindex="2"
+                focus-out=(action 'setProperty' 'slug' this.scratchTag.slug)
+            }}
+            {{gh-url-preview prefix="tag" slug=this.scratchTag.slug tagName="p" classNames="description"}}
+            <GhErrorMessage @errors={{this.activeTag.errors}} @property="slug" />
         {{/gh-form-group}}
 
         {{#gh-form-group errors=this.tag.errors hasValidated=this.tag.hasValidated property="description"}}
-        <label for="tag-description">Description</label>
-        {{gh-textarea
-                    id="tag-description"
-                    name="description"
-                    class="gh-tag-details-textarea"
-                    tabindex="3"
-                    value=this.scratchTag.description
-                    focus-out=(action 'setProperty' 'description' this.scratchTag.description)
-                }}
-        <GhErrorMessage @errors={{this.tag.errors}} @property="description" />
-        <p>Maximum: <b>500</b> characters. You’ve used {{gh-count-down-characters this.scratchTag.description 500}}</p>
+            <label for="tag-description">Description</label>
+            {{gh-textarea
+                id="tag-description"
+                name="description"
+                class="gh-tag-details-textarea"
+                tabindex="3"
+                value=this.scratchTag.description
+                focus-out=(action 'setProperty' 'description' this.scratchTag.description)
+            }}
+            <GhErrorMessage @errors={{this.tag.errors}} @property="description" />
+            <p>Maximum: <b>500</b> characters. You’ve used {{gh-count-down-characters this.scratchTag.description 500}}</p>
         {{/gh-form-group}}
     </div>
     <div class="order-0 mb6 mb0-ns order-2-ns w-100 w-50-m w-third-l">
         <label for="tag-image">Tag image</label>
         {{gh-image-uploader-with-preview
-                                image=this.tag.featureImage
-                                text="Upload tag image"
-                                class="gh-tag-image-uploader"
-                                allowUnsplash=true
-                                update=(action "setCoverImage")
-                                remove=(action "clearCoverImage")}}
+            image=this.tag.featureImage
+            text="Upload tag image"
+            class="gh-tag-image-uploader"
+            allowUnsplash=true
+            update=(action "setCoverImage")
+            remove=(action "clearCoverImage")
+        }}
     </div>
 </div>
 
 <h4 class="midlightgrey f-small fw5 ttu mt15">Meta data</h4>
 <div class="pa5 pt4 br4 shadow-1 bg-grouped-table mt2 flex flex-column flex-row-ns items-start justify-between">
     <div class="flex flex-column items-start mr5 w-100 w-50-m w-two-thirds-l">
         {{#gh-form-group errors=this.tag.errors hasValidated=this.tag.hasValidated property="metaTitle"}}
-        <label for="meta-title">Meta Title</label>
-        {{gh-text-input
-                    id="meta-title"
-                    name="metaTitle"
-                    placeholder=this.scratchTag.name
-                    tabindex="4"
-                    value=this.scratchTag.metaTitle
-                    focus-out=(action "setProperty" "metaTitle" this.scratchTag.metaTitle)}}
-        <GhErrorMessage @errors={{this.tag.errors}} @property="metaTitle" />
-        <p>Recommended: <b>70</b> characters. You’ve used {{gh-count-down-characters this.scratchTag.metaTitle 70}}</p>
+            <label for="meta-title">Meta Title</label>
+            {{gh-text-input
+                id="meta-title"
+                name="metaTitle"
+                placeholder=this.scratchTag.name
+                tabindex="4"
+                value=this.scratchTag.metaTitle
+                focus-out=(action "setProperty" "metaTitle" this.scratchTag.metaTitle)
+            }}
+            <GhErrorMessage @errors={{this.tag.errors}} @property="metaTitle" />
+            <p>Recommended: <b>70</b> characters. You’ve used {{gh-count-down-characters this.scratchTag.metaTitle 70}}</p>
         {{/gh-form-group}}
 
         {{#gh-form-group errors=this.tag.errors hasValidated=this.tag.hasValidated property="metaDescription"}}
-        <label for="meta-description">Meta Description</label>
-        {{gh-textarea
-                    id="meta-description"
-                    name="metaDescription"
-                    class="gh-tag-details-textarea"
-                    placeholder=this.scratchTag.description
-                    tabindex="5"
-                    value=this.scratchTag.metaDescription
-                    focus-out=(action "setProperty" "metaDescription" this.scratchTag.metaDescription)
-                }}
-        <GhErrorMessage @errors={{this.tag.errors}} @property="metaDescription" />
-        <p>Recommended: <b>156</b> characters. You’ve used {{gh-count-down-characters this.scratchTag.metaDescription 156}}</p>
+            <label for="meta-description">Meta Description</label>
+            {{gh-textarea
+                id="meta-description"
+                name="metaDescription"
+                class="gh-tag-details-textarea"
+                placeholder=this.scratchTag.description
+                tabindex="5"
+                value=this.scratchTag.metaDescription
+                focus-out=(action "setProperty" "metaDescription" this.scratchTag.metaDescription)
+            }}
+            <GhErrorMessage @errors={{this.tag.errors}} @property="metaDescription" />
+            <p>Recommended: <b>156</b> characters. You’ve used {{gh-count-down-characters this.scratchTag.metaDescription 156}}</p>
         {{/gh-form-group}}
     </div>
     <div class="w-100 w-50-m w-third-l">