From aada925b21afe2936eba54547b19f1aaca889004 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 14 Nov 2016 12:57:01 -0500
Subject: [PATCH] Start converting modal views to components

---
 .../discourse/components/d-modal-body.js.es6  | 29 +++++++++++++++++++
 .../discourse/routes/unknown.js.es6           |  3 +-
 .../templates/modal/edit-topic-auto-close.hbs |  4 +--
 .../discourse/templates/modal/raw-email.hbs   |  4 +--
 .../templates/{ => modal}/rename-tag.hbs      |  4 +--
 .../discourse/templates/modal/split-topic.hbs |  5 ++--
 .../templates/modal/upload-customization.hbs  |  4 +--
 .../discourse/templates/unknown.hbs           |  3 ++
 .../views/edit-topic-auto-close.js.es6        |  7 -----
 .../javascripts/discourse/views/modal.js.es6  |  4 +++
 .../javascripts/discourse/views/raw-email.es6 | 11 -------
 .../discourse/views/rename-tag.js.es6         |  5 ----
 .../discourse/views/split-topic.js.es6        |  7 -----
 .../discourse/views/unknown.js.es6            |  9 ------
 .../views/upload-customization.js.es6         |  6 ----
 15 files changed, 48 insertions(+), 57 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/components/d-modal-body.js.es6
 rename app/assets/javascripts/discourse/templates/{ => modal}/rename-tag.hbs (83%)
 create mode 100644 app/assets/javascripts/discourse/templates/unknown.hbs
 delete mode 100644 app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6
 delete mode 100644 app/assets/javascripts/discourse/views/raw-email.es6
 delete mode 100644 app/assets/javascripts/discourse/views/rename-tag.js.es6
 delete mode 100644 app/assets/javascripts/discourse/views/split-topic.js.es6
 delete mode 100644 app/assets/javascripts/discourse/views/unknown.js.es6
 delete mode 100644 app/assets/javascripts/discourse/views/upload-customization.js.es6

diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
new file mode 100644
index 00000000000..0753cf4fef7
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -0,0 +1,29 @@
+export default Ember.Component.extend({
+  classNames: ['modal-body'],
+
+  didInsertElement() {
+    this._super();
+    $('#modal-alert').hide();
+    $('#discourse-modal').modal('show');
+    Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender);
+  },
+
+  _afterFirstRender() {
+    if (!this.site.mobileView && this.get('autoFocus') !== 'false') {
+      this.$('input:first').focus();
+    }
+
+    const maxHeight = this.get('maxHeight');
+    if (maxHeight) {
+      const maxHeightFloat = parseFloat(maxHeight) / 100.0;
+      if (maxHeightFloat > 0) {
+        const viewPortHeight = $(window).height();
+        this.$().css("max-height", Math.floor(maxHeightFloat * viewPortHeight) + "px");
+      }
+    }
+
+    this.appEvents.trigger('modal:body-shown', {
+      title: this.get('title')
+    });
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/unknown.js.es6 b/app/assets/javascripts/discourse/routes/unknown.js.es6
index 7e01606f3be..40c8a301395 100644
--- a/app/assets/javascripts/discourse/routes/unknown.js.es6
+++ b/app/assets/javascripts/discourse/routes/unknown.js.es6
@@ -1,6 +1,7 @@
 import { ajax } from 'discourse/lib/ajax';
+
 export default Discourse.Route.extend({
-  model: function() {
+  model() {
     return ajax("/404-body", { dataType: 'html' });
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs
index cc1f423cc0e..d5dcb92fa69 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-auto-close.hbs
@@ -1,5 +1,5 @@
 <form>
-  <div class="modal-body">
+  {{#d-modal-body title="topic.auto_close_title" autoFocus="false"}}
     {{auto-close-form autoCloseTime=model.auto_close_time
                       autoCloseValid=auto_close_valid
                       autoCloseBasedOnLastPost=model.details.auto_close_based_on_last_post
@@ -10,7 +10,7 @@
         {{willCloseI18n}}
       </div>
     {{/if}}
-  </div>
+  {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button class="btn-primary" disabled=disable_submit label="topic.auto_close_save" action="saveAutoClose"}}
     <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
index ad9f7ec508c..12667d0143a 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
@@ -1,7 +1,7 @@
-<div class="modal-body">
+{{#d-modal-body title="raw_email.title" maxHeight="80%"}}
   {{#if rawEmail}}
     {{textarea value=rawEmail class="raw-email-textarea"}}
   {{else}}
     {{i18n 'raw_email.not_available'}}
   {{/if}}
-</div>
+{{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/rename-tag.hbs b/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
similarity index 83%
rename from app/assets/javascripts/discourse/templates/rename-tag.hbs
rename to app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
index 0d69f7f65dd..e54a61551ad 100644
--- a/app/assets/javascripts/discourse/templates/rename-tag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
@@ -1,9 +1,9 @@
-<div class="modal-body">
+{{#d-modal-body title="tagging.rename_tag"}}
   <label>
     <p>{{i18n "tagging.rename_instructions"}}</p>
     {{input value=buffered.id maxlength=siteSettings.max_tag_length}}
   </label>
-</div>
+{{/d-modal-body}}
 
 <div class="modal-footer">
   {{d-button class="btn-primary"
diff --git a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
index fe80f88174a..b18a2d793b2 100644
--- a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
@@ -1,4 +1,4 @@
-<div id='move-selected' class="modal-body">
+{{#d-modal-body id="move-selected" title="topic.split_topic.title"}}
   {{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}
 
   <form>
@@ -8,8 +8,7 @@
     <label>{{i18n 'categories.category'}}</label>
     {{category-chooser value=categoryId}}
   </form>
-
-</div>
+{{/d-modal-body}}
 
 <div class="modal-footer">
   {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToNewTopic"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs
index db8cf3de279..42af272a286 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs
@@ -1,7 +1,7 @@
 <form>
-  <div class='modal-body'>
+  {{#d-modal-body title="admin.customize.import_title"}}
     {{json-file-uploader value=customizationFile extension=".dcstyle.json"}}
-  </div>
+  {{/d-modal-body}}
   <div class="modal-footer">
     {{d-button class='btn-primary' action='createCustomization' type='submit' disabled=notReady icon="plus" label='admin.customize.import'}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/unknown.hbs b/app/assets/javascripts/discourse/templates/unknown.hbs
new file mode 100644
index 00000000000..0e9e6b96258
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/unknown.hbs
@@ -0,0 +1,3 @@
+<div class='container'>
+  {{{model}}}
+</div>
diff --git a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6 b/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6
deleted file mode 100644
index 6265d41b809..00000000000
--- a/app/assets/javascripts/discourse/views/edit-topic-auto-close.js.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: "modal/edit-topic-auto-close",
-  title: I18n.t("topic.auto_close_title"),
-  focusInput: false
-});
diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/views/modal.js.es6
index 07f2bbeb148..fb9869db205 100644
--- a/app/assets/javascripts/discourse/views/modal.js.es6
+++ b/app/assets/javascripts/discourse/views/modal.js.es6
@@ -16,6 +16,10 @@ export default Ember.View.extend({
         Em.run.next(() => $('.modal-header a.close').click());
       }
     });
+
+    this.appEvents.on('modal:body-shown', data => {
+      this.set('controller.title', I18n.t(data.title));
+    });
   },
 
   @on("willDestroyElement")
diff --git a/app/assets/javascripts/discourse/views/raw-email.es6 b/app/assets/javascripts/discourse/views/raw-email.es6
deleted file mode 100644
index 6e96af1626e..00000000000
--- a/app/assets/javascripts/discourse/views/raw-email.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'modal/raw-email',
-  title: I18n.t('raw_email.title'),
-
-  resizeModal: function(){
-    const viewPortHeight = $(window).height();
-    this.$(".modal-body").css("max-height", Math.floor(0.8 * viewPortHeight) + "px");
-  }.on("didInsertElement")
-});
diff --git a/app/assets/javascripts/discourse/views/rename-tag.js.es6 b/app/assets/javascripts/discourse/views/rename-tag.js.es6
deleted file mode 100644
index 68a0b12c5cb..00000000000
--- a/app/assets/javascripts/discourse/views/rename-tag.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-import ModalBodyView from 'discourse/views/modal-body';
-
-export default ModalBodyView.extend({
-  title: I18n.t("tagging.rename_tag")
-});
diff --git a/app/assets/javascripts/discourse/views/split-topic.js.es6 b/app/assets/javascripts/discourse/views/split-topic.js.es6
deleted file mode 100644
index 9291495adc8..00000000000
--- a/app/assets/javascripts/discourse/views/split-topic.js.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend(SelectedPostsCount, {
-  templateName: 'modal/split-topic',
-  title: I18n.t('topic.split_topic.title')
-});
diff --git a/app/assets/javascripts/discourse/views/unknown.js.es6 b/app/assets/javascripts/discourse/views/unknown.js.es6
deleted file mode 100644
index 3060ed93066..00000000000
--- a/app/assets/javascripts/discourse/views/unknown.js.es6
+++ /dev/null
@@ -1,9 +0,0 @@
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
-
-export default Ember.View.extend(bufferedRender({
-  classNameBindings: [':container'],
-
-  buildBuffer(buffer) {
-    buffer.push(this.get('controller.model'));
-  }
-}));
diff --git a/app/assets/javascripts/discourse/views/upload-customization.js.es6 b/app/assets/javascripts/discourse/views/upload-customization.js.es6
deleted file mode 100644
index c6e336157c2..00000000000
--- a/app/assets/javascripts/discourse/views/upload-customization.js.es6
+++ /dev/null
@@ -1,6 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'modal/upload-customization',
-  title: I18n.t('admin.customize.import_title')
-});