Merge pull request #1049 from magento-engcom/2.1-develop-prs

Public Pull Requests: 
#9333
#9332

Author: Oleksii Korshenko

lib/web/legacy-build.min.js

@@ -14,7 +14,7 @@ define([
     "jquery/jstree/jquery.jstree",
     "mage/mage"
 ], function($, tinyMCEm, prompt, confirm, alert){
-    
+
     MediabrowserUtility = {
         windowId: 'modal_dialog_message',
         getMaxZIndex: function() {
@@ -31,12 +31,14 @@ define([
         },
         openDialog: function(url, width, height, title, options) {
             var windowId = this.windowId,
-                content = '<div class="popup-window magento-message" "id="' + windowId + '"></div>',
+                content = '<div class="popup-window magento-message" id="' + windowId + '"></div>',
                 self = this;
 
             if (this.modal) {
                 this.modal.html($(content).html());
-                this.modal.modal('option', 'closed', options.closed);
+                if (options && typeof options.closed !== 'undefined') {
+                    this.modal.modal('option', 'closed', options.closed);
+                }
             } else {
                 this.modal = $(content).modal($.extend({
                     title:  title || 'Insert File...',

lib/web/mage/adminhtml/browser.js

@@ -332,12 +332,12 @@ var Base64 = {
         var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
         var i = 0;
 
+        input = Base64._utf8_encode(input);
+
         if( typeof window.btoa === "function" ){
             return window.btoa(input);
         }
 
-        input = Base64._utf8_encode(input);
-
         while (i < input.length) {
 
             chr1 = input.charCodeAt(i++);
@@ -370,7 +370,7 @@ var Base64 = {
         var i = 0;
 
         if( typeof window.atob === "function" ){
-            return window.atob(input);
+            return Base64._utf8_decode(window.atob(input));
         }
 
         input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
@@ -395,8 +395,8 @@ var Base64 = {
                 output = output + String.fromCharCode(chr3);
             }
         }
-        output = Base64._utf8_decode(output);
-        return output;
+
+        return Base64._utf8_decode(output);
     },
 
     mageEncode: function(input){