refactor per review comments

Author: Nazar65

app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js

@@ -80,61 +80,84 @@ define([
                 tree = this.element,
                 lastExistentFolderEl,
                 pathId,
-                encodedPath,
 
-                /**
-                 * Recursively open folders specified in path array.
-                 */
-                recursiveOpen = function () {
-                    var folderEl = $('[data-id="' + path.pop() + '"]');
+            /**
+             * Recursively open folders specified in path array.
+             */
+            recursiveOpen = function () {
+                var folderEl = $('[data-id="' + path.pop() + '"]');
 
-                    // if folder doesn't exist, select the last opened folder
-                    if (!folderEl.length) {
-                        tree.jstree('select_node', lastExistentFolderEl);
+                // if folder doesn't exist, select the last opened folder
+                if (!folderEl.length) {
+                    tree.jstree('select_node', lastExistentFolderEl);
 
-                        return;
-                    }
+                    return;
+                }
 
-                    lastExistentFolderEl = folderEl;
+                lastExistentFolderEl = folderEl;
 
-                    if (path.length) {
-                        tree.jstree('open_node', folderEl, recursiveOpen);
+                if (path.length) {
+                    tree.jstree('open_node', folderEl, recursiveOpen);
+                } else {
+                    tree.jstree('open_node', folderEl, function () {
+                        tree.jstree('select_node', folderEl);
+                    });
+                }
+            },
+
+            /**
+             * Encode path value
+             *
+             * @param {String} val
+             */
+            _encodePathId = function (val) {
+                return Base64.encode(val)
+                    .replace(/\+/g, ':')
+                    .replace(/\//g, '_')
+                    .replace(/=/g, '-');
+            },
+
+            /**
+             * Decode path value
+             *
+             * @param {String} val
+             */
+            _decodePathId = function (val) {
+                return Base64.decode(val)
+                    .replace(/\:/g, '+')
+                    .replace(/\_/g, '/')
+                    .replace(/-/g, '=');
+            },
+
+            /**
+             * Get currentPath decode it returns new path array
+             */
+            _parseCurrentPath = function () {
+                var paths = [],
+                    decodedPath = _decodePathId(window.MediabrowserUtility.pathId.replace(/--|,,/, '==')).split('/');
+
+                $.each(decodedPath, function (i, val) {
+                    var isLastElement = i === decodedPath.length - 1;
+
+                    if (isLastElement) {
+                        paths[i] = window.MediabrowserUtility.pathId.replace(',,', '--');
                     } else {
-                        tree.jstree('open_node', folderEl, function () {
-                            tree.jstree('select_node', folderEl);
-                        });
+                        paths[i] = _encodePathId(val);
                     }
-                },
-
-                /**
-                 * Get currentPath decode it returns new path array
-                 */
-                _parseCurrentPath = function () {
-                    var paths = [];
+                });
+                paths.unshift('root');
+                paths.reverse();
 
-                    $.each(encodedPath, function (i, val) {
-                        var isLastElement = i === encodedPath.length - 1;
-
-                        if (isLastElement) {
-                            paths[i] = window.MediabrowserUtility.pathId.replace(',,', '--');
-                        } else {
-                            paths[i] = Base64.encode(val).replace('==', '--');
-                        }
-                    });
-                    paths.unshift('root');
-                    paths.reverse();
-
-                    return paths;
-                };
+                return paths;
+            };
 
             $(window).on('reload.MediaGallery', function () {
-                encodedPath = Base64.decode(window.MediabrowserUtility.pathId.replace(/--|,,/, '==')).split('/');
                 pathId =  window.MediabrowserUtility.pathId.replace(',,', '--');
+                path = _parseCurrentPath();
 
                 tree.jstree('deselect_all');
 
-                if (encodedPath.length > 1) {
-                    path =  _parseCurrentPath(encodedPath);
+                if (path.length > 1) {
                     recursiveOpen();
                 } else {
                     tree.jstree('open_node', $('[data-id="' + pathId + '"]'), function () {