diff --git a/README.md b/README.md index f1d6141..332a1fc 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,11 @@ Template `dialog-layouts/delete.hbs`: ```hbs

Confirm Deletion

- {{yield}} + {{#if templateName}} +
{{partial templateName}}
+ {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context class="dialog-body"}} + {{/if}}
diff --git a/addon/components/dialog-body.js b/addon/components/dialog-body.js new file mode 100644 index 0000000..62051cd --- /dev/null +++ b/addon/components/dialog-body.js @@ -0,0 +1,3 @@ +import Ember from "ember"; + +export default Ember.Component.extend(); diff --git a/addon/services/dialog.js b/addon/services/dialog.js index a8f3d4b..c9452f5 100644 --- a/addon/services/dialog.js +++ b/addon/services/dialog.js @@ -61,12 +61,11 @@ export default Ember.Service.extend(Ember.Evented, { * @param {module:ember-dialog/components/presenter} presenter */ remove(presenter) { + if (this.get('isDestroyed')) return; var id = presenter.get("presenterId") || guidFor(presenter); var dialogs = this.get("dialogs").filter((item) => { return item.id !== id; }); - - //filter would return Array not EmberArray? this.set("dialogs", Ember.A(dialogs)); }, @@ -261,7 +260,7 @@ export default Ember.Service.extend(Ember.Evented, { */ show(layout, template, context, options = {}, componentName = DEFAULT_COMPONENT_NAME) { - /* Generate presenterId from (layoutName + templateName) or provided id + /* Generate presenterId from (layoutName + templateName) or provided id to make sure the dialog won't open multiple times */ var presenterId = options.id || ""; if(typeof layout === "string" && typeof template === "string"){ @@ -291,9 +290,12 @@ export default Ember.Service.extend(Ember.Evented, { } if (Ember.typeOf(template) === "object") { + // The template will be included into the presenter's body as + // dialog-body component options = Ember.merge(options, { template: template }); } else { - options = Ember.merge(options, { template: getOwner(this).lookup(["template", template].join(":")) }); + // The template will be included into the presenter's body as partial + options = Ember.merge(options, { templateName: template }); } presenter = presenter.reopen(options); diff --git a/app/components/dialog-body.js b/app/components/dialog-body.js new file mode 100644 index 0000000..1401b9e --- /dev/null +++ b/app/components/dialog-body.js @@ -0,0 +1 @@ +export { default } from 'ember-dialog/components/dialog-body'; diff --git a/app/templates/layouts/alert.hbs b/app/templates/layouts/alert.hbs index cc0d43c..2e62a97 100644 --- a/app/templates/layouts/alert.hbs +++ b/app/templates/layouts/alert.hbs @@ -6,7 +6,11 @@
{{title}}
-
{{yield}}
+ {{#if templateName}} +
{{partial templateName}}
+ {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context class="dialog-body"}} + {{/if}}
diff --git a/app/templates/layouts/blank.hbs b/app/templates/layouts/blank.hbs index 8a01f7d..481dc61 100644 --- a/app/templates/layouts/blank.hbs +++ b/app/templates/layouts/blank.hbs @@ -1,5 +1,9 @@
- {{yield}} -
+ {{#if templateName}} +
{{partial templateName}}
+ {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context class="dialog-body"}} + {{/if}} +
diff --git a/app/templates/layouts/confirm.hbs b/app/templates/layouts/confirm.hbs index 9eec46d..15494b6 100644 --- a/app/templates/layouts/confirm.hbs +++ b/app/templates/layouts/confirm.hbs @@ -3,10 +3,14 @@
-
{{ title }}
+
{{title}}
-
{{yield}}
+ {{#if templateName}} +
{{partial templateName}}
+ {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context class="dialog-body"}} + {{/if}}
diff --git a/bower.json b/bower.json index 8d63eeb..9c8b39c 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-dialog", "dependencies": { - "ember": "2.9.1", + "ember": "v2.10.0", "ember-cli-shims": "^0.1.3" }, "devDependencies": { diff --git a/package.json b/package.json index dffa791..f6ea64e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.2.0", "codacy-coverage": "^2.0.0", - "ember-cli": "2.9.1", + "ember-cli": "2.10.0", "ember-cli-app-version": "^2.0.0", "ember-cli-blanket": "0.9.9", "ember-cli-content-security-policy": "0.5.0", diff --git a/tests/dummy/app/components/presenter-animate-css.js b/tests/dummy/app/components/presenter-animate-css.js index 7cac025..26e0565 100644 --- a/tests/dummy/app/components/presenter-animate-css.js +++ b/tests/dummy/app/components/presenter-animate-css.js @@ -18,7 +18,7 @@ export default Presenter.extend({ Ember.run.later(this, "_decline", this.get("delay")); }, - willInsertElement() { + didRender() { this.$(".dialog-content").addClass("animated"); return this._super(...arguments); }, diff --git a/tests/dummy/app/components/presenter-animated.js b/tests/dummy/app/components/presenter-animated.js index 4100a53..508c328 100644 --- a/tests/dummy/app/components/presenter-animated.js +++ b/tests/dummy/app/components/presenter-animated.js @@ -17,7 +17,7 @@ export default Presenter.extend({ Ember.run.later(this, "_decline", this.get("delay")); }, - willInsertElement() { + didRender() { this.$(".ember-dialog-dialog").addClass("animation"); return this._super(...arguments); }, diff --git a/tests/dummy/app/templates/cookbook/creating-notices/partials/notice.hbs b/tests/dummy/app/templates/cookbook/creating-notices/partials/notice.hbs index ed16baf..a1d8a0d 100644 --- a/tests/dummy/app/templates/cookbook/creating-notices/partials/notice.hbs +++ b/tests/dummy/app/templates/cookbook/creating-notices/partials/notice.hbs @@ -1,6 +1,10 @@
- {{yield}} + {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}}
Close
diff --git a/tests/dummy/app/templates/cookbook/showing-server-errors/partials/top-error.hbs b/tests/dummy/app/templates/cookbook/showing-server-errors/partials/top-error.hbs index ed8570d..65b3c13 100644 --- a/tests/dummy/app/templates/cookbook/showing-server-errors/partials/top-error.hbs +++ b/tests/dummy/app/templates/cookbook/showing-server-errors/partials/top-error.hbs @@ -1,3 +1,9 @@
-
{{yield}}
+
+ {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}} +
diff --git a/tests/dummy/app/templates/examples/dialog/information.hbs b/tests/dummy/app/templates/examples/dialog/information.hbs index e8c1f9b..1fd42c1 100644 --- a/tests/dummy/app/templates/examples/dialog/information.hbs +++ b/tests/dummy/app/templates/examples/dialog/information.hbs @@ -17,6 +17,12 @@
X
-
{{yield}}
+
+ {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}} +
diff --git a/tests/dummy/app/templates/tutorial/creating-dialog-templates/partials/template-1.hbs b/tests/dummy/app/templates/tutorial/creating-dialog-templates/partials/template-1.hbs index 5caf858..620040e 100644 --- a/tests/dummy/app/templates/tutorial/creating-dialog-templates/partials/template-1.hbs +++ b/tests/dummy/app/templates/tutorial/creating-dialog-templates/partials/template-1.hbs @@ -1,6 +1,12 @@
-
{{yield}}
+
+ {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}} +
Close
diff --git a/tests/dummy/public/examples/cookbook/creating-notices/layout-1.handlebars b/tests/dummy/public/examples/cookbook/creating-notices/layout-1.handlebars index ae9e599..35f3d24 100644 --- a/tests/dummy/public/examples/cookbook/creating-notices/layout-1.handlebars +++ b/tests/dummy/public/examples/cookbook/creating-notices/layout-1.handlebars @@ -1,3 +1,9 @@
-
{{yield}}
+
+ {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}} +
diff --git a/tests/dummy/public/examples/cookbook/showing-server-errors/top-error.handlebars b/tests/dummy/public/examples/cookbook/showing-server-errors/top-error.handlebars index ed8570d..65b3c13 100644 --- a/tests/dummy/public/examples/cookbook/showing-server-errors/top-error.handlebars +++ b/tests/dummy/public/examples/cookbook/showing-server-errors/top-error.handlebars @@ -1,3 +1,9 @@
-
{{yield}}
+
+ {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}} +
diff --git a/tests/dummy/public/examples/tutorial/creating-dialog-templates/template-1.handlebars b/tests/dummy/public/examples/tutorial/creating-dialog-templates/template-1.handlebars index 9cfe63b..cd81fa2 100644 --- a/tests/dummy/public/examples/tutorial/creating-dialog-templates/template-1.handlebars +++ b/tests/dummy/public/examples/tutorial/creating-dialog-templates/template-1.handlebars @@ -1,6 +1,12 @@
-
{{yield}}
+
+ {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}} +
Close
diff --git a/tests/dummy/public/examples/tutorial/presenter-and-manager/layout-1.handlebars b/tests/dummy/public/examples/tutorial/presenter-and-manager/layout-1.handlebars index e3ad923..03de428 100644 --- a/tests/dummy/public/examples/tutorial/presenter-and-manager/layout-1.handlebars +++ b/tests/dummy/public/examples/tutorial/presenter-and-manager/layout-1.handlebars @@ -4,6 +4,12 @@
X
-
{{yield}}
+
+ {{#if templateName}} + {{partial templateName}} + {{else}} + {{component "dialog-body" layout=template contextObject=contextObject context=context}} + {{/if}} +