Extract ModalManagerState from ModalManager (#2162)

js/src/forum/ForumApplication.js

@@ -180,8 +180,7 @@ export default class ForumApplication extends Application {
     if (payload.loggedIn) {
       window.location.reload();
     } else {
-      const modal = new SignUpModal(payload);
-      this.modal.show(modal);
+      this.modal.show(SignUpModal, payload);
     }
   }
 }

js/src/forum/components/HeaderSecondary.js

@@ -77,7 +77,7 @@ export default class HeaderSecondary extends Component {
           Button.component({
             children: app.translator.trans('core.forum.header.sign_up_link'),
             className: 'Button Button--link',
-            onclick: () => app.modal.show(new SignUpModal()),
+            onclick: () => app.modal.show(SignUpModal),
           }),
           10
         );
@@ -88,7 +88,7 @@ export default class HeaderSecondary extends Component {
         Button.component({
           children: app.translator.trans('core.forum.header.log_in_link'),
           className: 'Button Button--link',
-          onclick: () => app.modal.show(new LogInModal()),
+          onclick: () => app.modal.show(LogInModal),
         }),
         0
       );

js/src/forum/components/IndexPage.js

@@ -282,7 +282,7 @@ export default class IndexPage extends Page {
     } else {
       deferred.reject();
 
-      app.modal.show(new LogInModal());
+      app.modal.show(LogInModal);
     }
 
     return deferred.promise;

js/src/forum/components/LogInModal.js

@@ -142,7 +142,7 @@ export default class LogInModal extends Modal {
     const email = this.identification();
     const props = email.indexOf('@') !== -1 ? { email } : undefined;
 
-    app.modal.show(new ForgotPasswordModal(props));
+    app.modal.show(ForgotPasswordModal, props);
   }
 
   /**
@@ -156,7 +156,7 @@ export default class LogInModal extends Modal {
     const identification = this.identification();
     props[identification.indexOf('@') !== -1 ? 'email' : 'username'] = identification;
 
-    app.modal.show(new SignUpModal(props));
+    app.modal.show(SignUpModal, props);
   }
 
   onready() {

js/src/forum/components/SettingsPage.js

@@ -79,7 +79,7 @@ export default class SettingsPage extends UserPage {
       Button.component({
         children: app.translator.trans('core.forum.settings.change_password_button'),
         className: 'Button',
-        onclick: () => app.modal.show(new ChangePasswordModal()),
+        onclick: () => app.modal.show(ChangePasswordModal),
       })
     );
 
@@ -88,7 +88,7 @@ export default class SettingsPage extends UserPage {
       Button.component({
         children: app.translator.trans('core.forum.settings.change_email_button'),
         className: 'Button',
-        onclick: () => app.modal.show(new ChangeEmailModal()),
+        onclick: () => app.modal.show(ChangeEmailModal),
       })
     );
 

js/src/forum/components/SignUpModal.js

@@ -145,7 +145,7 @@ export default class SignUpModal extends Modal {
       password: this.password(),
     };
 
-    app.modal.show(new LogInModal(props));
+    app.modal.show(LogInModal, props);
   }
 
   onready() {

js/src/forum/utils/DiscussionControls.js

@@ -188,7 +188,7 @@ export default {
     } else {
       deferred.reject();
 
-      app.modal.show(new LogInModal());
+      app.modal.show(LogInModal);
     }
 
     return deferred.promise;
@@ -239,11 +239,9 @@ export default {
    * @return {Promise}
    */
   renameAction() {
-    return app.modal.show(
-      new RenameDiscussionModal({
-        currentTitle: this.title(),
-        discussion: this,
-      })
-    );
+    return app.modal.show(RenameDiscussionModal, {
+      currentTitle: this.title(),
+      discussion: this,
+    });
   },
 };

js/src/forum/utils/UserControls.js

@@ -145,6 +145,6 @@ export default {
    * @param {User} user
    */
   editAction(user) {
-    app.modal.show(new EditUserModal({ user }));
+    app.modal.show(EditUserModal, { user });
   },
 };