@@ -21,6 +21,7 @@ define([
21
21
directoryTreeSelector : '#media-gallery-directory-tree' ,
22
22
getDirectoryTreeUrl : 'media_gallery/directories/gettree' ,
23
23
createDirectoryUrl : 'media_gallery/directories/create' ,
24
+ deleteDirectoryUrl : 'media_gallery/directories/delete' ,
24
25
jsTreeReloaded : null ,
25
26
modules : {
26
27
directories : '${ $.name }_directories' ,
@@ -88,27 +89,23 @@ define([
88
89
* @param {Array } directories
89
90
*/
90
91
createFolderIfNotExists : function ( directories ) {
91
- var isMediaBrowser = ! _ . isUndefined ( window . MediabrowserUtility ) ,
92
- currentTreePath = isMediaBrowser ? window . MediabrowserUtility . pathId : null ,
92
+ var requestedDirectory = this . getRequestedDirectory ( ) ,
93
93
deferred = $ . Deferred ( ) ,
94
- decodedPath ,
95
94
pathArray ;
96
95
97
- if ( ! currentTreePath ) {
96
+ if ( _ . isNull ( requestedDirectory ) ) {
98
97
deferred . resolve ( false ) ;
99
98
100
99
return deferred . promise ( ) ;
101
100
}
102
101
103
- decodedPath = Base64 . idDecode ( currentTreePath ) ;
104
-
105
- if ( this . isDirectoryExist ( directories [ 0 ] , decodedPath ) ) {
102
+ if ( this . isDirectoryExist ( directories [ 0 ] , requestedDirectory ) ) {
106
103
deferred . resolve ( false ) ;
107
104
108
105
return deferred . promise ( ) ;
109
106
}
110
107
111
- pathArray = this . convertPathToPathsArray ( decodedPath ) ;
108
+ pathArray = this . convertPathToPathsArray ( requestedDirectory ) ;
112
109
113
110
$ . each ( pathArray , function ( i , val ) {
114
111
if ( this . isDirectoryExist ( directories [ 0 ] , val ) ) {
@@ -204,7 +201,7 @@ define([
204
201
/**
205
202
* Remove ability to multiple select on nodes
206
203
*/
207
- overrideMultiselectBehavior : function ( ) {
204
+ disableMultiselectBehavior : function ( ) {
208
205
$ . jstree . defaults . ui [ 'select_range_modifier' ] = false ;
209
206
$ . jstree . defaults . ui [ 'select_multiple_modifier' ] = false ;
210
207
} ,
@@ -213,16 +210,16 @@ define([
213
210
* Handle jstree events
214
211
*/
215
212
initEvents : function ( ) {
216
- this . firejsTreeEvents ( ) ;
217
- this . overrideMultiselectBehavior ( ) ;
213
+ this . initJsTreeEvents ( ) ;
214
+ this . disableMultiselectBehavior ( ) ;
218
215
219
216
$ ( window ) . on ( 'reload.MediaGallery' , function ( ) {
220
217
this . getJsonTree ( ) . then ( function ( data ) {
221
218
this . createFolderIfNotExists ( data ) . then ( function ( isCreated ) {
222
219
if ( isCreated ) {
223
220
this . renderDirectoryTree ( ) . then ( function ( ) {
224
221
this . setJsTreeReloaded ( true ) ;
225
- this . firejsTreeEvents ( ) ;
222
+ this . initJsTreeEvents ( ) ;
226
223
} . bind ( this ) ) ;
227
224
} else {
228
225
this . updateSelectedDirectory ( ) ;
@@ -235,7 +232,7 @@ define([
235
232
/**
236
233
* Fire event for jstree component
237
234
*/
238
- firejsTreeEvents : function ( ) {
235
+ initJsTreeEvents : function ( ) {
239
236
$ ( this . directoryTreeSelector ) . on ( 'select_node.jstree' , function ( element , data ) {
240
237
this . setActiveNodeFilter ( $ ( data . rslt . obj ) . data ( 'path' ) ) ;
241
238
this . setJsTreeReloaded ( false ) ;
@@ -244,7 +241,6 @@ define([
244
241
$ ( this . directoryTreeSelector ) . on ( 'loaded.jstree' , function ( ) {
245
242
this . updateSelectedDirectory ( ) ;
246
243
} . bind ( this ) ) ;
247
-
248
244
} ,
249
245
250
246
/**
@@ -285,6 +281,11 @@ define([
285
281
return false ;
286
282
} ,
287
283
284
+ /**
285
+ * Get requested directory from MediabrowserUtility
286
+ *
287
+ * @returns {String|null }
288
+ */
288
289
getRequestedDirectory : function ( ) {
289
290
return ( ! _ . isUndefined ( window . MediabrowserUtility ) && window . MediabrowserUtility . pathId !== '' )
290
291
? Base64 . idDecode ( window . MediabrowserUtility . pathId )
@@ -306,9 +307,7 @@ define([
306
307
* @param {String } path
307
308
*/
308
309
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' ) ) {
312
311
return ;
313
312
}
314
313
path = path . replace ( / \/ / g, '\\/' ) ;
@@ -332,7 +331,6 @@ define([
332
331
* @param {String } nodePath
333
332
*/
334
333
setActiveNodeFilter : function ( nodePath ) {
335
-
336
334
if ( this . activeNode ( ) === nodePath && ! this . jsTreeReloaded ) {
337
335
this . selectStorageRoot ( ) ;
338
336
} else {
@@ -361,7 +359,6 @@ define([
361
359
this . directories ( ) . setInActive ( ) ;
362
360
} . bind ( this )
363
361
) ;
364
-
365
362
} ,
366
363
367
364
/**
0 commit comments