[cmd:sort] fix Studio-42#2774 to make can disable "Also Treeview" sor…

…t option
mjyu51 · Nov 27, 2018 · 2f8c345 · 2f8c345
1 parent 12450d3
commit 2f8c345
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/js/commands/sort.js b/js/commands/sort.js
@@ -21,7 +21,7 @@ elFinder.prototype.commands.sort = function() {
 				'stick',
 				(fm.sortStickFolders? '<span class="ui-icon ui-icon-check"/>' : '') + '&nbsp;' + fm.i18n('sortFoldersFirst')
 			]);
-			if (fm.ui.tree) {
+			if (fm.ui.tree && fm.options.sortAlsoTreeview !== null) {
 				self.variants.push('|');
 				self.variants.push([
 					'tree',

diff --git a/js/elFinder.js b/js/elFinder.js
@@ -1278,7 +1278,7 @@ var elFinder = function(elm, opts, bootCallback) {
 	}
 
 	this.sortAlsoTreeview = this.storage('sortAlsoTreeview');
-	if (this.sortAlsoTreeview === null) {
+	if (this.sortAlsoTreeview === null || this.options.sortAlsoTreeview === null) {
 		this.sortAlsoTreeview = !!this.options.sortAlsoTreeview;
 	} else {
 		this.sortAlsoTreeview = !!this.sortAlsoTreeview;

diff --git a/js/elFinder.options.js b/js/elFinder.options.js
@@ -961,9 +961,9 @@ elFinder.prototype._options = {
 	sortStickFolders : true,
 
 	/**
-	 * Sort also applies to the treeview
+	 * Sort also applies to the treeview (null: disable this feature)
 	 *
-	 * @type {Boolean}
+	 * @type Boolean|null
 	 * @default false
 	 */
 	sortAlsoTreeview : false,

diff --git a/js/ui/sortbutton.js b/js/ui/sortbutton.js
@@ -76,22 +76,22 @@ $.fn.elfindersortbutton = function(cmd) {
 				cmd.exec([], 'stick');
 			});
 
-		if ($.fn.elfindertree && $.inArray('tree', fm.options.ui) !== -1) {
-			$('<div class="'+item+' '+item+'-separated elfinder-sort-ext elfinder-sort-tree"><span class="ui-icon ui-icon-check"/>'+fm.i18n('sortAlsoTreeview')+'</div>')
+		fm.one('init', function() {
+			if (fm.ui.tree && fm.options.sortAlsoTreeview !== null) {
+				$('<div class="'+item+' '+item+'-separated elfinder-sort-ext elfinder-sort-tree"><span class="ui-icon ui-icon-check"/>'+fm.i18n('sortAlsoTreeview')+'</div>')
 				.appendTo(menu)
 				.on('click', function() {
 					cmd.exec([], 'tree');
 				});
-		}
-
-		fm.bind('disable select', hide).getUI().on('click', hide);
-
-		fm.bind('open', function() {
+			}
+		})
+		.bind('disable select', hide)
+		.bind('open', function() {
 			menu.children('[rel]').each(function() {
 				var $this = $(this);
 				$this.toggle(fm.sorters[$this.attr('rel')]);
 			});
-		}).bind('sortchange', update);
+		}).bind('sortchange', update).getUI().on('click', hide);
 
 		if (menu.children().length > 1) {
 			cmd.change(function() {