Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

UX: Remove hidden from the #discourse-modal when the modal is shown

Browse source
This commit is contained in:
Robin Ward 2017-07-27 17:14:41 -04:00
parent 1b1fd64639
commit c3b7419a08
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/components/d-modal.js.es6
View file

@ -2,7 +2,7 @@ import { on } from "ember-addons/ember-computed-decorators";
export default Ember.Component.extend({ export default Ember.Component.extend({
elementId: 'discourse-modal', elementId: 'discourse-modal',
classNameBindings: [':modal', ':hidden', 'modalClass'], classNameBindings: [':modal', 'modalClass'],
attributeBindings: ['data-keyboard'], attributeBindings: ['data-keyboard'],
// We handle ESC ourselves // We handle ESC ourselves
@ -17,6 +17,7 @@ export default Ember.Component.extend({
}); });
this.appEvents.on('modal:body-shown', data => { this.appEvents.on('modal:body-shown', data => {
this.$().removeClass('hidden');
if (data.title) { if (data.title) {
this.set('title', I18n.t(data.title)); this.set('title', I18n.t(data.title));
} else if (data.rawTitle) { } else if (data.rawTitle) {

2
app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
View file

@ -1,6 +1,6 @@
export default Ember.Component.extend({ export default Ember.Component.extend({
didInsertElement() { didInsertElement() {
this._super(); this._super();
$('#discourse-modal').modal('hide'); $('#discourse-modal').modal('hide').addClass('hidden');
} }
}); });

2
app/assets/javascripts/discourse/templates/modal.hbs
View file

@ -1,4 +1,4 @@
{{#d-modal modalClass=modalClass title=title}} {{#d-modal modalClass=modalClass title=title class="hidden"}}
<div class="modal-outer-container"> <div class="modal-outer-container">
<div class="modal-middle-container"> <div class="modal-middle-container">
<div class="modal-inner-container"> <div class="modal-inner-container">

2
app/assets/stylesheets/common/base/modal.scss
View file

@ -126,7 +126,7 @@
} }
&.hidden { &.hidden {
display: none; display: none;
} }