mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 16:36:47 +02:00
Code Issues Releases Wiki Activity

common: use 'extend' with modal manager oninit, run clear method when fade out completes

Browse Source
This commit is contained in:
David Sevilla Martin
2020-03-11 18:58:29 -04:00
parent d29b5c7262
commit 58ccb8415a
4 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/dist/admin.js.map vendored
View File

File diff suppressed because one or more lines are too long

34
js/dist/forum.js vendored
View File

@@ -17463,7 +17463,9 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _babel_runtime_helpers_esm_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/esm/inheritsLoose */ "./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js");
/* harmony import */ var micromodal__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! micromodal */ "./node_modules/micromodal/dist/micromodal.es.js");
/* harmony import */ var _Component__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../Component */ "./src/common/Component.ts");
/* harmony import */ var _Modal__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Modal */ "./src/common/components/Modal.tsx");
/* harmony import */ var _extend__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../extend */ "./src/common/extend.ts");
/* harmony import */ var _Modal__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Modal */ "./src/common/components/Modal.tsx");
@@ -17518,15 +17520,18 @@ var ModalManager = /*#__PURE__*/function (_Component) {
var _component$tag,
_this2 = this;
if (!(component instanceof _Modal__WEBPACK_IMPORTED_MODULE_3__["default"]) && !(((_component$tag = component.tag) === null || _component$tag === void 0 ? void 0 : _component$tag.prototype) instanceof _Modal__WEBPACK_IMPORTED_MODULE_3__["default"])) {
if (!(component instanceof _Modal__WEBPACK_IMPORTED_MODULE_4__["default"]) && !(((_component$tag = component.tag) === null || _component$tag === void 0 ? void 0 : _component$tag.prototype) instanceof _Modal__WEBPACK_IMPORTED_MODULE_4__["default"])) {
throw new Error('The ModalManager component can only show Modal components');
}
clearTimeout(this.hideTimeout);
this.showing = true;
this.modal = component.tag || component.constructor;
this.modalProps = component.props || component.attrs || {};
this.modalProps.oninit = this.onModalInit.bind(this); // if (app.current) app.current.retain = true;
this.modalProps = component.props || component.attrs || {}; // Store the vnode state in app.modal.component
Object(_extend__WEBPACK_IMPORTED_MODULE_3__["extend"])(this.modalProps, 'oninit', function (v, vnode) {
return _this2.component = vnode.state;
}); // if (app.current) app.current.retain = true;
m.redraw();
@@ -17537,12 +17542,13 @@ var ModalManager = /*#__PURE__*/function (_Component) {
micromodal__WEBPACK_IMPORTED_MODULE_1__["default"].show('Modal', {
awaitCloseAnimation: true,
onClose: function onClose() {
$('.modal-backdrop').fadeOut(200, function () {
this.remove();
var backdrop = $('.modal-backdrop');
backdrop.fadeOut(200, function () {
backdrop.remove();
_this2.clear();
});
_this2.showing = false;
_this2.clear();
}
});
this.onready();
@@ -17594,14 +17600,6 @@ var ModalManager = /*#__PURE__*/function (_Component) {
if (this.component) {
this.component.onready();
}
}
/**
* Set component in ModalManager to current vnode state - a Modal instance
*/
;
_proto.onModalInit = function onModalInit(vnode) {
this.component = vnode.state;
};
return ModalManager;
@@ -25135,7 +25133,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _UserPage__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./UserPage */ "./src/forum/components/UserPage.tsx");
/* harmony import */ var _NotificationGrid__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./NotificationGrid */ "./src/forum/components/NotificationGrid.tsx");
/* harmony import */ var _ChangePasswordModal__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./ChangePasswordModal */ "./src/forum/components/ChangePasswordModal.tsx");
/* harmony import */ var _ChangeEmailModal__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./ChangeEmailModal */ "./src/forum/components/ChangeEmailModal.tsx");
/* harmony import */ var _ChangeEmailModal__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./ChangeEmailModal */ "./src/forum/components/ChangeEmailModal.tsx");
@@ -25210,7 +25208,7 @@ var SettingsPage = /*#__PURE__*/function (_UserPage) {
children: app.translator.trans('core.forum.settings.change_email_button'),
className: 'Button',
onclick: function onclick() {
return app.modal.show(new _ChangeEmailModal__WEBPACK_IMPORTED_MODULE_10__["default"]());
return app.modal.show(new _ChangeEmailModal__WEBPACK_IMPORTED_MODULE_9__["default"]());
}
}));
return items;

2
js/dist/forum.js.map vendored
View File

File diff suppressed because one or more lines are too long

21
js/src/common/components/ModalManager.tsx
View File

@@ -1,6 +1,7 @@
import MicroModal from 'micromodal';
import Component, { ComponentProps } from '../Component';
import { extend } from '../extend';
import Modal from './Modal';
/**
@@ -45,7 +46,8 @@ export default class ModalManager extends Component {
this.modal = component.tag || component.constructor;
this.modalProps = component.props || component.attrs || {};
this.modalProps.oninit = this.onModalInit.bind(this);
// Store the vnode state in app.modal.component
extend(this.modalProps, 'oninit', (v, vnode) => (this.component = vnode.state));
// if (app.current) app.current.retain = true;
@@ -60,13 +62,15 @@ export default class ModalManager extends Component {
MicroModal.show('Modal', {
awaitCloseAnimation: true,
onClose: () => {
$('.modal-backdrop').fadeOut(200, function(this: Element) {
this.remove();
const backdrop = $('.modal-backdrop');
backdrop.fadeOut(200, () => {
backdrop.remove();
this.clear();
});
this.showing = false;
this.clear();
},
});
@@ -118,11 +122,4 @@ export default class ModalManager extends Component {
this.component.onready();
}
}
/**
* Set component in ModalManager to current vnode state - a Modal instance
*/
protected onModalInit(vnode) {
this.component = vnode.state;
}
}