TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 20:03:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4720 from jaswilli/modal-error

Browse Source 
Use an explicit action name in action helper
This commit is contained in:
Hannah Wolfe 2014-12-27 19:13:53 +00:00
commit e9f2b2a44a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghost/admin/components/gh-modal-dialog.js
View File

@ -29,7 +29,8 @@ var ModalDialog = Ember.Component.extend({
confirm: function (type) { confirm: function (type) {
this.sendAction('confirm' + type); this.sendAction('confirm' + type);
this.close(); this.close();
} },
noBubble: Ember.K
}, },
klass: Ember.computed('type', 'style', function () { klass: Ember.computed('type', 'style', function () {

2
ghost/admin/templates/components/gh-modal-dialog.hbs
View File

@ -1,6 +1,6 @@
<div class="modal-container js-modal-container" {{action "closeModal"}}> <div class="modal-container js-modal-container" {{action "closeModal"}}>
<article {{bind-attr class="klass :js-modal"}}> <article {{bind-attr class="klass :js-modal"}}>
<section class="modal-content" {{action bubbles=false preventDefault=false}}> <section class="modal-content" {{action "noBubble" bubbles=false preventDefault=false}}>
{{#if title}}<header class="modal-header"><h1>{{title}}</h1></header>{{/if}} {{#if title}}<header class="modal-header"><h1>{{title}}</h1></header>{{/if}}
{{#if showClose}}<a class="close" href="" title="Close" {{action "closeModal"}}><span class="hidden">Close</span></a>{{/if}} {{#if showClose}}<a class="close" href="" title="Close" {{action "closeModal"}}><span class="hidden">Close</span></a>{{/if}}
<section class="modal-body"> <section class="modal-body">