From c40ac5abe6719d277049b41ad8c5b10b7c1958a7 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 15 May 2017 16:10:07 -0400
Subject: [PATCH] FIX: resize events for ace were not triggered correctly

---
 .../javascripts/admin/components/ace-editor.js.es6     | 10 +++++++++-
 .../controllers/admin-customize-themes-edit.js.es6     |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index 67d084e21ed..372a32b33a1 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -37,6 +37,9 @@ export default Ember.Component.extend({
       // xxx: don't run during qunit tests
       this.appEvents.off('ace:resize', this, this.resize);
     }
+
+    $(window).off('ace:resize');
+
   }.on('willDestroyElement'),
 
   resize() {
@@ -67,9 +70,14 @@ export default Ember.Component.extend({
 
         this.$().data('editor', editor);
         this._editor = editor;
+
+        $(window).off('ace:resize').on('ace:resize', ()=>{
+          this.appEvents.trigger('ace:resize');
+        });
+
         if (this.appEvents) {
           // xxx: don't run during qunit tests
-          this.appEvents.on('ace:resize', self, self.resize);
+          this.appEvents.on('ace:resize', ()=>this.resize());
         }
 
         if (this.get("autofocus")) {
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
index 6ef86fc31b7..fb91322edff 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
@@ -150,6 +150,9 @@ export default Ember.Controller.extend({
 
     toggleMaximize: function() {
       this.toggleProperty('maximized');
+      Em.run.next(()=>{
+        this.appEvents.trigger('ace:resize');
+      });
     }
   }