MAGETWO-52993: [Github] Media Uploader Issues #2958

- Changed clicking logic. Moved logic to correct place.

Author: Hayder Sharhan

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php

@@ -39,7 +39,7 @@ public function execute()
             $targetPath = $this->getStorage()->getSession()->getCurrentPath();
             $result = $this->getStorage()->uploadFile($targetPath, $this->getRequest()->getParam('type'));
         } catch (\Exception $e) {
-            $result = ['error' => true, 'message' => $e->getMessage()];
+            $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();

app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml

@@ -71,8 +71,14 @@ require([
             var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
             $(progressSelector).css('width', '100%');
             if (data.result && !data.result.hasOwnProperty('errorcode')) {
+                $("#content_header").children(".message").remove();
                 $(progressSelector).removeClass('upload-progress').addClass('upload-success');
             } else {
+                var tempErrorMessage = document.createElement("div");
+                tempErrorMessage.className = "message message-warning warning";
+                tempErrorMessage.innerHTML = data.result.error;
+
+                $("#content_header").append(tempErrorMessage);
                 $(progressSelector).removeClass('upload-progress').addClass('upload-failure');
             }
         },

lib/web/mage/loader.js

@@ -178,7 +178,7 @@ define([
                 .addClass(this.options.loadingClass)
                 .attr({
                     'aria-busy': true
-                });
+                })
 
             if (settings && settings.showLoader) {
                 var ctx = this._getJqueryObj(settings.loaderContext);
@@ -201,18 +201,6 @@ define([
             if (settings && settings.showLoader) {
                 this._getJqueryObj(settings.loaderContext).trigger('processStop');
             }
-
-            if (jqxhr.responseJSON && jqxhr.responseJSON.error) {
-                var tempErrorMessage = document.createElement("div");
-                tempErrorMessage.className = "message message-warning warning";
-                tempErrorMessage.innerHTML = JSON.parse(jqxhr.responseText).message;
-
-                tempErrorMessage.addEventListener("click", function () {
-                    tempErrorMessage.remove();
-                }, false);
-
-                document.querySelector("#content_header").appendChild(tempErrorMessage);
-            }
         }
 
     });

lib/web/mage/loader_old.js

@@ -197,18 +197,6 @@
             if (settings && settings.showLoader && !settings.dontHide) {
                 this._getJqueryObj(settings.loaderContext).trigger('processStop');
             }
-
-            if (jqxhr.responseJSON && jqxhr.responseJSON.error) {
-                var tempErrorMessage = document.createElement("div");
-                tempErrorMessage.className = "message message-warning warning";
-                tempErrorMessage.innerHTML = JSON.parse(jqxhr.responseText).message;
-
-                tempErrorMessage.addEventListener("click", function () {
-                    tempErrorMessage.remove();
-                }, false);
-
-                document.querySelector("#content_header").appendChild(tempErrorMessage);
-            }
         }
     });