diff --git a/ghost/admin/app/components/gh-publishmenu-draft.js b/ghost/admin/app/components/gh-publishmenu-draft.js index 363e374dea..c35f44ee3b 100644 --- a/ghost/admin/app/components/gh-publishmenu-draft.js +++ b/ghost/admin/app/components/gh-publishmenu-draft.js @@ -33,7 +33,7 @@ export default class GhPublishMenuDraftComponent extends Component { } get showEmailOnlyInput() { - return this.feature.emailOnlyPosts && this.args.post.isPost; + return this.args.post.isPost; } constructor() { diff --git a/ghost/admin/app/components/gh-publishmenu.js b/ghost/admin/app/components/gh-publishmenu.js index 0b17eccab1..6a88abd4ba 100644 --- a/ghost/admin/app/components/gh-publishmenu.js +++ b/ghost/admin/app/components/gh-publishmenu.js @@ -103,11 +103,9 @@ export default Component.extend({ let buttonText; if (postState === 'draft') { - let publishText = this.feature.emailOnlyPosts ? 'Publish & send' : 'Publish'; - switch (distributionAction) { case 'publish_send': - buttonText = (saveType === 'publish') ? publishText : 'Schedule'; + buttonText = (saveType === 'publish') ? 'Publish & send' : 'Schedule'; break; case 'publish': buttonText = (saveType === 'publish') ? 'Publish' : 'Schedule'; diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js index 9c1ae28915..145e96cff3 100644 --- a/ghost/admin/app/services/feature.js +++ b/ghost/admin/app/services/feature.js @@ -56,7 +56,6 @@ export default Service.extend({ multipleProducts: feature('multipleProducts'), offers: feature('offers', {developer: true}), oauthLogin: feature('oauthLogin', {developer: true}), - emailOnlyPosts: feature('emailOnlyPosts', {developer: true}), customThemeSettings: feature('customThemeSettings', {developer: true}), membersActivity: feature('membersActivity', {developer: true}), diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index 17869e91f2..92baecafaf 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -261,19 +261,6 @@ -