From 849b4f3a47fb8981e273fd183e799a1d461e2d7d Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 2 Feb 2017 04:19:43 +0300 Subject: [PATCH] minor tweak... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/ui-widgets.js | 3 ++- ui (gen4)/lib/widget/browse.js | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index aa2f4d2e..9c0625e8 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -1707,7 +1707,7 @@ var WidgetTestActions = actions.Actions({ // NOTE: passing things other than strings into a list editor // is not supported... - var pins = ['a', 'b'] + var pins = ['b', 'a'] var letters = ['a', 'b', 'c', 'd', 'e', 'f', 'g'] return browse.makeLister(null, function(path, make){ @@ -1718,6 +1718,7 @@ var WidgetTestActions = actions.Actions({ }) make.EditablePinnedList(letters, pins, { list_id: 'letters', + //pins_sortable: false, }) // NOTE: the dialog's .parent is not yet set at this point... diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js index 59ab4f71..1f62dd7d 100755 --- a/ui (gen4)/lib/widget/browse.js +++ b/ui (gen4)/lib/widget/browse.js @@ -944,7 +944,7 @@ function(list, pins, options){ sortable || (options.sort instanceof Function ? pins.sort(options.sort) - : pins.sortAs(list)) + : pins.sortAs(dialog.__list[id])) // unpin... } else { @@ -970,11 +970,14 @@ function(list, pins, options){ isItemDisabled: null, } pins_options.__proto__ = options - var sortable = pins_options.sortable = options.pins_sortable !== false || true - sortable - || (options.sort instanceof Function ? - pins.sort(options.sort) - : pins.sortAs(list)) + var sortable = pins_options.sortable = + options.pins_sortable === undefined + || options.pins_sortable + if(!sortable){ + pins_options.sort = options.sort instanceof Function ? + options.sort + : pins.sortAs(dialog.__list[id]) + } //---------------------------------------------- build the list --- var res = this.EditableList(pins, pins_options) @@ -982,7 +985,6 @@ function(list, pins, options){ .toArray() res.length > 0 - && list.length > 0 && res.push(this.Separator()[0]) res.concat(this.EditableList(