Merged changes

2018-12-10 18:08:43 -06:00
parent 7f07004d5f 99958f7f86
commit d867888b75
8 changed files with 185 additions and 76 deletions
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -981,10 +981,7 @@ class ComponentManager {
      if(!iframe) {
        return;
      }
-      var width = data.width;
-      var height = data.height;
-      iframe.width = width;
-      iframe.height = height;
+
      setSize(iframe, data);

      // On Firefox, resizing a component iframe does not seem to have an effect with editor-stack extensions.