CLOUDINARY-134: Fixed Magento 2.3.1 issue on wysiwyg from GH issue #29

cloudinary · Jul 3, 2019 · ae26cfd · ae26cfd
1 parent c01391f
commit ae26cfd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/Model/Configuration.php b/Model/Configuration.php
@@ -199,7 +199,7 @@ public function getCdnSubdomainStatus()
      */
     public function getUserPlatform()
     {
-        return sprintf(self::USER_PLATFORM_TEMPLATE, '1.9.0', '2.0.0');
+        return sprintf(self::USER_PLATFORM_TEMPLATE, '1.9.1', '2.0.0');
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.9.0",
+    "version": "1.9.1",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.9.0">
+  <module name="Cloudinary_Cloudinary" setup_version="1.9.1">
       <sequence>
           <module name="Magento_ProductVideo"/>
       </sequence>

diff --git a/marketplace.composer.json b/marketplace.composer.json
@@ -1,7 +1,7 @@
 {
   "name": "cloudinary/cloudinary",
   "type": "magento2-module",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Cloudinary Magento 2 Integration.",
   "license": "MIT",
   "require": {

diff --git a/view/adminhtml/layout/cms_wysiwyg_images_index.xml b/view/adminhtml/layout/cms_wysiwyg_images_index.xml
@@ -3,7 +3,11 @@
     <referenceContainer name="root">
         <block class="Cloudinary\Cloudinary\Block\Adminhtml\Cms\Wysiwyg\Images\Content" name="wysiwyg_images.content" template="Cloudinary_Cloudinary::browser/content.phtml">
             <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree" name="wysiwyg_images.tree" template="Magento_Cms::browser/tree.phtml"/>
-            <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml"/>
+            <block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml">
+                <arguments>
+                    <argument name="image_upload_config_data" xsi:type="object">Magento\Backend\Block\DataProviders\ImageUploadConfig</argument>
+                </arguments>
+            </block>
         </block>
     </referenceContainer>
 </layout>
diff --git a/view/adminhtml/web/js/cloudinary-media-library-modal.js b/view/adminhtml/web/js/cloudinary-media-library-modal.js
@@ -53,6 +53,7 @@ define([
                 this.cloudinary_ml = window.cloudinary_ml[this.options.cldMLid] = cloudinary.createMediaLibrary(
                     this.options.cloudinaryMLoptions, {
                         insertHandler: function(data) {
+                            $('body').first().css('overflow', 'initial');
                             return widget.cloudinaryInsertHandler(data);
                         }
                     }