diff --git a/core/built/assets/ghost.min-c115f798d99b712736e35bb28baf3ee1.js b/core/built/assets/ghost.min-4afc9844644b2b1c1f0461f106592e9c.js similarity index 99% rename from core/built/assets/ghost.min-c115f798d99b712736e35bb28baf3ee1.js rename to core/built/assets/ghost.min-4afc9844644b2b1c1f0461f106592e9c.js index 39485399ec..19e629f870 100644 --- a/core/built/assets/ghost.min-c115f798d99b712736e35bb28baf3ee1.js +++ b/core/built/assets/ghost.min-4afc9844644b2b1c1f0461f106592e9c.js @@ -99,7 +99,7 @@ const t=Ember.HTMLBars.template({id:"UTF+FkW9",block:'{"symbols":[],"statements" var n=Ember._setComponentTemplate(t,Ember.Component.extend({billing:Ember.inject.service(),visibilityClass:Ember.computed("billing.billingWindowOpen",(function(){return this.billing.get("billingWindowOpen")?"gh-billing":"gh-billing closed"})),didInsertElement(){this._super(...arguments),this._setupShortcuts()},willDestroyElement(){this._super(...arguments),this._removeShortcuts()},_setupShortcuts(){Ember.run((function(){document.activeElement.blur()})),this._previousKeymasterScope=key.getScope(),key("enter","modal",(()=>{this.send("confirm")})),key.setScope("modal")},_removeShortcuts(){key.unbind("enter","modal"),key.setScope(this._previousKeymasterScope)}})) e.default=n})),define("ghost-admin/components/gh-billing-update-button",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 const t=Ember.HTMLBars.template({id:"RL9hrh9E",block:'{"symbols":[],"statements":[[6,[37,1],[[32,0,["showUpgradeButton"]]],null,[["default"],[{"statements":[[2," "],[11,"button"],[24,0,"gh-btn gh-btn-green"],[4,[38,0],[[32,0],"openBilling"],null],[12],[10,"span"],[12],[2,"Upgrade"],[13],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["action","if"]}',meta:{moduleName:"ghost-admin/components/gh-billing-update-button.hbs"}}) -var n=Ember._setComponentTemplate(t,Ember.Component.extend({router:Ember.inject.service(),config:Ember.inject.service(),ghostPaths:Ember.inject.service(),ajax:Ember.inject.service(),billing:Ember.inject.service(),subscription:null,showUpgradeButton:Ember.computed.reads("billing.subscription.isActiveTrial"),actions:{openBilling(){this.billing.openBillingWindow(this.router.currentURL,"/billing/plans")}}})) +var n=Ember._setComponentTemplate(t,Ember.Component.extend({router:Ember.inject.service(),config:Ember.inject.service(),ghostPaths:Ember.inject.service(),ajax:Ember.inject.service(),billing:Ember.inject.service(),subscription:null,showUpgradeButton:Ember.computed.reads("billing.subscription.isActiveTrial"),actions:{openBilling(){this.billing.openBillingWindow(this.router.currentURL,"/pro/billing/plans")}}})) e.default=n})),define("ghost-admin/components/gh-blog-url",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 const t=Ember.HTMLBars.template({id:"VAFqYKJu",block:'{"symbols":[],"statements":[[2,[32,0,["config","blogUrl"]]]],"hasEval":false,"upvars":[]}',meta:{moduleName:"ghost-admin/components/gh-blog-url.hbs"}}) var n=Ember._setComponentTemplate(t,Ember.Component.extend({config:Ember.inject.service(),tagName:""})) @@ -1685,7 +1685,7 @@ e.default=s})),define("ghost-admin/modifiers/autofocus",["exports","ember-modifi var n=(0,t.modifier)((e=>e.focus())) e.default=n})),define("ghost-admin/modifiers/did-insert",["exports","@ember/render-modifiers/modifiers/did-insert"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ghost-admin/modifiers/did-update",["exports","@ember/render-modifiers/modifiers/did-update"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ghost-admin/modifiers/in-viewport",["exports","ember-in-viewport/modifiers/in-viewport"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ghost-admin/modifiers/style",["exports","ember-style-modifier/modifiers/style"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ghost-admin/modifiers/will-destroy",["exports","@ember/render-modifiers/modifiers/will-destroy"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ghost-admin/router",["exports","ghost-admin/config/environment","ghost-admin/utils/ghost-paths"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 const s=Ember.Router.extend({location:t.default.locationType,rootURL:(0,n.default)().adminRoot}) -s.map((function(){this.route("home",{path:"/"}),this.route("setup",(function(){this.route("one"),this.route("two"),this.route("three")})),this.route("signin"),this.route("signout"),this.route("signup",{path:"/signup/:token"}),this.route("reset",{path:"/reset/:token"}),this.route("about"),this.route("site"),this.route("billing",(function(){this.route("billing-sub",{path:"/*sub"})})),this.route("posts"),this.route("pages"),this.route("editor",(function(){this.route("new",{path:":type"}),this.route("edit",{path:":type/:post_id"})})),this.route("staff",(function(){this.route("user",{path:":user_slug"})})),this.route("tags"),this.route("tag.new",{path:"/tags/new"}),this.route("tag",{path:"/tags/:tag_slug"}),this.route("settings.general",{path:"/settings/general"}),this.route("settings.labs",{path:"/settings/labs"}),this.route("settings.labs.members",{path:"/settings/labs/members"}),this.route("settings.code-injection",{path:"/settings/code-injection"}),this.route("settings.design",{path:"/settings/design"},(function(){this.route("uploadtheme")})),this.route("settings.integrations",{path:"/settings/integrations"},(function(){this.route("new")})),this.route("settings.integration",{path:"/settings/integrations/:integration_id"},(function(){this.route("webhooks.new",{path:"webhooks/new"}),this.route("webhooks.edit",{path:"webhooks/:webhook_id"})})),this.route("settings.integrations.slack",{path:"/settings/integrations/slack"}),this.route("settings.integrations.amp",{path:"/settings/integrations/amp"}),this.route("settings.integrations.firstpromoter",{path:"/settings/integrations/firstpromoter"}),this.route("settings.integrations.unsplash",{path:"/settings/integrations/unsplash"}),this.route("settings.integrations.zapier",{path:"/settings/integrations/zapier"}),this.route("members",(function(){this.route("import")})),this.route("member.new",{path:"/members/new"}) +s.map((function(){this.route("home",{path:"/"}),this.route("setup",(function(){this.route("one"),this.route("two"),this.route("three")})),this.route("signin"),this.route("signout"),this.route("signup",{path:"/signup/:token"}),this.route("reset",{path:"/reset/:token"}),this.route("about"),this.route("site"),this.route("pro",(function(){this.route("pro-sub",{path:"/*sub"})})),this.route("posts"),this.route("pages"),this.route("editor",(function(){this.route("new",{path:":type"}),this.route("edit",{path:":type/:post_id"})})),this.route("staff",(function(){this.route("user",{path:":user_slug"})})),this.route("tags"),this.route("tag.new",{path:"/tags/new"}),this.route("tag",{path:"/tags/:tag_slug"}),this.route("settings.general",{path:"/settings/general"}),this.route("settings.labs",{path:"/settings/labs"}),this.route("settings.labs.members",{path:"/settings/labs/members"}),this.route("settings.code-injection",{path:"/settings/code-injection"}),this.route("settings.design",{path:"/settings/design"},(function(){this.route("uploadtheme")})),this.route("settings.integrations",{path:"/settings/integrations"},(function(){this.route("new")})),this.route("settings.integration",{path:"/settings/integrations/:integration_id"},(function(){this.route("webhooks.new",{path:"webhooks/new"}),this.route("webhooks.edit",{path:"webhooks/:webhook_id"})})),this.route("settings.integrations.slack",{path:"/settings/integrations/slack"}),this.route("settings.integrations.amp",{path:"/settings/integrations/amp"}),this.route("settings.integrations.firstpromoter",{path:"/settings/integrations/firstpromoter"}),this.route("settings.integrations.unsplash",{path:"/settings/integrations/unsplash"}),this.route("settings.integrations.zapier",{path:"/settings/integrations/zapier"}),this.route("members",(function(){this.route("import")})),this.route("member.new",{path:"/members/new"}) this.route("member",{path:"/members/:member_id"}),this.route("error404",{path:"/*path"})})) var a=s e.default=a})),define("ghost-admin/routes/about",["exports","ghost-admin/routes/authenticated"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 @@ -1703,11 +1703,6 @@ return this.replaceWith("error404",a)}return(!(0,o.isVersionMismatchError)(e)||( e?e.send("authorizationFailed"):Ember.run.scheduleOnce("routerTransitions",this,"send","authorizationFailed")}}) e.default=d})),define("ghost-admin/routes/authenticated",["exports","ember-simple-auth/mixins/authenticated-route-mixin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 var n=Ember.Route.extend(t.default,{authenticationRoute:"signin"}) -e.default=n})),define("ghost-admin/routes/billing",["exports","ghost-admin/routes/authenticated"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 -var n=t.default.extend({billing:Ember.inject.service(),session:Ember.inject.service(),ui:Ember.inject.service(),queryParams:{action:{refreshModel:!0}},beforeModel(e){return this._super(...arguments),this.session.user.then((t=>{if(!t.isOwner)return this.transitionTo("home") -this.billing.set("previousTransition",e)}))},model(e){e.action&&this.billing.set("action",e.action),this.billing.setBillingWindowOpen(!0)},activate(){this.ui.set("showTour",!1)},deactivate(){this.ui.set("showTour",!0)},actions:{willTransition(e){let t=!1 -if(e){let n="string"==typeof e.to?e.to:e.intent?e.intent.url:"" -null!=n&&n.includes("/billing")&&(t=!0)}this.billing.setBillingWindowOpen(t)}},buildRouteInfoMetadata:()=>({titleToken:"Billing"})}) e.default=n})),define("ghost-admin/routes/editor",["exports","jquery","ghost-admin/routes/authenticated","ghost-admin/mixins/shortcuts-route","ghost-admin/utils/ctrl-or-cmd"],(function(e,t,n,s,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 let r={} r[`${a.default}+shift+p`]="publish",r[`${a.default}+p`]="preview" @@ -1760,6 +1755,11 @@ case"published":t="published" break case"scheduled":t="scheduled"}return{status:t}},_filterString:e=>Object.keys(e).map((t=>{let n=e[t] if(!Ember.isBlank(n))return`${t}:${e[t]}`})).compact().join("+")}) +e.default=n})),define("ghost-admin/routes/pro",["exports","ghost-admin/routes/authenticated"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 +var n=t.default.extend({billing:Ember.inject.service(),ui:Ember.inject.service(),queryParams:{action:{refreshModel:!0}},beforeModel(e){return this._super(...arguments),this.session.user.then((t=>{if(!t.isOwner)return this.transitionTo("home") +this.billing.set("previousTransition",e)}))},model(e){e.action&&this.billing.set("action",e.action),this.billing.setBillingWindowOpen(!0)},activate(){this.ui.set("showTour",!1)},deactivate(){this.ui.set("showTour",!0)},actions:{willTransition(e){let t=!1 +if(e){let n="string"==typeof e.to?e.to:e.intent?e.intent.url:"" +null!=n&&n.includes("/pro")&&(t=!0)}this.billing.setBillingWindowOpen(t)}},buildRouteInfoMetadata:()=>({titleToken:"Ghost(Pro)"})}) e.default=n})),define("ghost-admin/routes/reset",["exports","ghost-admin/mixins/unauthenticated-route-mixin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 var n=Ember.Route.extend(t.default,{notifications:Ember.inject.service(),session:Ember.inject.service(),beforeModel(){this.get("session.isAuthenticated")&&this.notifications.showAlert("You can't reset your password while you're signed in.",{type:"warn",delayed:!0,key:"password.reset.signed-in"}),this._super(...arguments)},setupController(e,t){e.token=t.token},deactivate(){this._super(...arguments),this.controller.clearData()},buildRouteInfoMetadata:()=>({bodyClasses:["unauthenticated-route"]})}) e.default=n})),define("ghost-admin/routes/settings/code-injection",["exports","ghost-admin/routes/authenticated","ghost-admin/mixins/current-user-settings"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 @@ -1934,11 +1934,11 @@ e&&(Ember.isArray(e)||(e=[e]),n.errors=e.map((function(e){return"string"==typeof k.reopen({contentType:"application/json; charset=UTF-8"}) var x=k e.default=x})),define("ghost-admin/services/billing",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 -var t=Ember.Service.extend({router:Ember.inject.service(),config:Ember.inject.service(),ghostPaths:Ember.inject.service(),billingRouteRoot:"#/billing",billingWindowOpen:!1,subscription:null,previousRoute:null,init(){this._super(...arguments),this.config.get("billingUrl")&&window.addEventListener("message",(e=>{e&&e.data&&e.data.route&&this.handleRouteChangeInIframe(e.data.route)}))},handleRouteChangeInIframe(e){if(this.get("billingWindowOpen")){let t=this.get("billingRouteRoot") +var t=Ember.Service.extend({router:Ember.inject.service(),config:Ember.inject.service(),ghostPaths:Ember.inject.service(),billingRouteRoot:"#/pro",billingWindowOpen:!1,subscription:null,previousRoute:null,init(){this._super(...arguments),this.config.get("billingUrl")&&window.addEventListener("message",(e=>{e&&e.data&&e.data.route&&this.handleRouteChangeInIframe(e.data.route)}))},handleRouteChangeInIframe(e){if(this.get("billingWindowOpen")){let t=this.get("billingRouteRoot") "/"!==e&&(t+=e),window.location.hash!==t&&window.history.replaceState(window.history.state,"",t)}},getIframeURL(){let e=this.config.get("billingUrl") if(window.location.hash&&window.location.hash.includes(this.get("billingRouteRoot"))){let t=window.location.hash.replace(this.get("billingRouteRoot"),"") t&&(e+=t)}return e},setBillingWindowOpen(e){let t=this.getBillingIframe() -t&&e&&t.contentWindow.location.replace(this.getIframeURL()),this.set("billingWindowOpen",e)},openBillingWindow(e,t){this.set("previousRoute",e),window.location.hash=t||"/billing",this.router.transitionTo(t||"/billing")},closeBillingWindow(){this.set("billingWindowOpen",!1) +t&&e&&t.contentWindow.location.replace(this.getIframeURL()),this.set("billingWindowOpen",e)},openBillingWindow(e,t){this.set("previousRoute",e),window.location.hash=t||"/pro",this.router.transitionTo(t||"/pro")},closeBillingWindow(){this.set("billingWindowOpen",!1) let e=this.get("previousRoute")||"/" this.router.transitionTo(e)},getBillingIframe:()=>document.getElementById("billing-frame")}) e.default=t})),define("ghost-admin/services/clock",["exports","ghost-admin/config/environment","moment"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0 diff --git a/core/server/web/admin/views/default-prod.html b/core/server/web/admin/views/default-prod.html index bac5bf916c..febd7a1e33 100644 --- a/core/server/web/admin/views/default-prod.html +++ b/core/server/web/admin/views/default-prod.html @@ -53,7 +53,7 @@ - + diff --git a/core/server/web/admin/views/default.html b/core/server/web/admin/views/default.html index bac5bf916c..febd7a1e33 100644 --- a/core/server/web/admin/views/default.html +++ b/core/server/web/admin/views/default.html @@ -53,7 +53,7 @@ - + diff --git a/package.json b/package.json index da937799f6..877153f599 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "3.42.3", + "version": "3.42.4", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org",