Skip to content

Commit 36074a9

Browse files
committed
#29411: Formatting fixes
1 parent eb1f0bb commit 36074a9

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ define([
2121
directoryTreeSelector: '#media-gallery-directory-tree',
2222
getDirectoryTreeUrl: 'media_gallery/directories/gettree',
2323
createDirectoryUrl: 'media_gallery/directories/create',
24+
deleteDirectoryUrl: 'media_gallery/directories/delete',
2425
jsTreeReloaded: null,
2526
modules: {
2627
directories: '${ $.name }_directories',
@@ -88,27 +89,23 @@ define([
8889
* @param {Array} directories
8990
*/
9091
createFolderIfNotExists: function (directories) {
91-
var isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
92-
currentTreePath = isMediaBrowser ? window.MediabrowserUtility.pathId : null,
92+
var requestedDirectory = this.getRequestedDirectory(),
9393
deferred = $.Deferred(),
94-
decodedPath,
9594
pathArray;
9695

97-
if (!currentTreePath) {
96+
if (_.isNull(requestedDirectory)) {
9897
deferred.resolve(false);
9998

10099
return deferred.promise();
101100
}
102101

103-
decodedPath = Base64.idDecode(currentTreePath);
104-
105-
if (this.isDirectoryExist(directories[0], decodedPath)) {
102+
if (this.isDirectoryExist(directories[0], requestedDirectory)) {
106103
deferred.resolve(false);
107104

108105
return deferred.promise();
109106
}
110107

111-
pathArray = this.convertPathToPathsArray(decodedPath);
108+
pathArray = this.convertPathToPathsArray(requestedDirectory);
112109

113110
$.each(pathArray, function (i, val) {
114111
if (this.isDirectoryExist(directories[0], val)) {
@@ -204,7 +201,7 @@ define([
204201
/**
205202
* Remove ability to multiple select on nodes
206203
*/
207-
overrideMultiselectBehavior: function () {
204+
disableMultiselectBehavior : function () {
208205
$.jstree.defaults.ui['select_range_modifier'] = false;
209206
$.jstree.defaults.ui['select_multiple_modifier'] = false;
210207
},
@@ -213,16 +210,16 @@ define([
213210
* Handle jstree events
214211
*/
215212
initEvents: function () {
216-
this.firejsTreeEvents();
217-
this.overrideMultiselectBehavior();
213+
this.initJsTreeEvents();
214+
this.disableMultiselectBehavior();
218215

219216
$(window).on('reload.MediaGallery', function () {
220217
this.getJsonTree().then(function (data) {
221218
this.createFolderIfNotExists(data).then(function (isCreated) {
222219
if (isCreated) {
223220
this.renderDirectoryTree().then(function () {
224221
this.setJsTreeReloaded(true);
225-
this.firejsTreeEvents();
222+
this.initJsTreeEvents();
226223
}.bind(this));
227224
} else {
228225
this.updateSelectedDirectory();
@@ -235,7 +232,7 @@ define([
235232
/**
236233
* Fire event for jstree component
237234
*/
238-
firejsTreeEvents: function () {
235+
initJsTreeEvents: function () {
239236
$(this.directoryTreeSelector).on('select_node.jstree', function (element, data) {
240237
this.setActiveNodeFilter($(data.rslt.obj).data('path'));
241238
this.setJsTreeReloaded(false);
@@ -244,7 +241,6 @@ define([
244241
$(this.directoryTreeSelector).on('loaded.jstree', function () {
245242
this.updateSelectedDirectory();
246243
}.bind(this));
247-
248244
},
249245

250246
/**
@@ -285,6 +281,11 @@ define([
285281
return false;
286282
},
287283

284+
/**
285+
* Get requested directory from MediabrowserUtility
286+
*
287+
* @returns {String|null}
288+
*/
288289
getRequestedDirectory: function () {
289290
return (!_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== '')
290291
? Base64.idDecode(window.MediabrowserUtility.pathId)
@@ -306,9 +307,7 @@ define([
306307
* @param {String} path
307308
*/
308309
locateNode: function (path) {
309-
var selectedId = $(this.directoryTreeSelector).jstree('get_selected').attr('id');
310-
311-
if (path === selectedId) {
310+
if (path === $(this.directoryTreeSelector).jstree('get_selected').attr('id')) {
312311
return;
313312
}
314313
path = path.replace(/\//g, '\\/');
@@ -332,7 +331,6 @@ define([
332331
* @param {String} nodePath
333332
*/
334333
setActiveNodeFilter: function (nodePath) {
335-
336334
if (this.activeNode() === nodePath && !this.jsTreeReloaded) {
337335
this.selectStorageRoot();
338336
} else {
@@ -361,7 +359,6 @@ define([
361359
this.directories().setInActive();
362360
}.bind(this)
363361
);
364-
365362
},
366363

367364
/**

0 commit comments

Comments
 (0)