From 8da34990b57471d47dd70ba8547d0b65343b1e66 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Wed, 8 Feb 2017 06:24:56 +0300 Subject: [PATCH] some tweaking... Signed-off-by: Alex A. Naanou --- ui (gen4)/css/experimenting.css | 2 +- ui (gen4)/css/widget/browse.css | 27 ++++++++++++++------------- ui (gen4)/features/history.js | 10 +++++++++- ui (gen4)/lib/widget/browse.js | 20 +++++++++++++++----- 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/ui (gen4)/css/experimenting.css b/ui (gen4)/css/experimenting.css index 8ad25048..4549f838 100755 --- a/ui (gen4)/css/experimenting.css +++ b/ui (gen4)/css/experimenting.css @@ -197,7 +197,7 @@ body { .browse-widget .list .item .sort-handle { display: inline-block; - float: right; + float: left; padding-left: 0.2em; padding-right: 0.5em; diff --git a/ui (gen4)/css/widget/browse.css b/ui (gen4)/css/widget/browse.css index c508475f..01befa54 100755 --- a/ui (gen4)/css/widget/browse.css +++ b/ui (gen4)/css/widget/browse.css @@ -303,48 +303,49 @@ /* numbers... */ /* XXX need to show this only on devices with keyboards... */ -.browse-widget .list .text:before { +.browse-widget .list .item:before { opacity: 0.3; float: left; font-size: small; } -.browse-widget.filtering .list .item .text:first-child:before { +.browse-widget.filtering .list .item:before { display: none; } -.browse-widget .list .item .text:first-child:before { +.browse-widget .list .item:before { width: 12px; margin-left: -15px; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(1) .text:first-child:before { +/* XXX these are messed up with groups... */ +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(1):before { content: "1"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(2) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(2):before { content: "2"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(3) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(3):before { content: "3"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(4) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(4):before { content: "4"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(5) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(5):before { content: "5"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(6) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(6):before { content: "6"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(7) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(7):before { content: "7"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(8) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(8):before { content: "8"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(9) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(9):before { content: "9"; } -.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(10) .text:first-child:before { +.browse-widget:not(.no-item-numbers) .list .item:nth-of-type(10):before { content: "0"; } diff --git a/ui (gen4)/features/history.js b/ui (gen4)/features/history.js index 181cb799..796e79cd 100755 --- a/ui (gen4)/features/history.js +++ b/ui (gen4)/features/history.js @@ -733,11 +733,19 @@ var URLHistoryUIActions = actions.Actions({ to_remove: to_remove, + /*/ XXX not sure if this is the right way... + pins_buttons: [ + // open... + ['↗', + function(p){ dialog.browsePath(p) }], + 'PIN', + 'REMOVE', + ], + //*/ buttons: [ // open... ['↗', function(p){ dialog.browsePath(p) }], - // XXX should the pins have a "to top" button??? ['♦', 'TO_TOP'], 'PIN', 'REMOVE', diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js index 3d00ce57..246d34d4 100755 --- a/ui (gen4)/lib/widget/browse.js +++ b/ui (gen4)/lib/widget/browse.js @@ -815,10 +815,16 @@ function(list, options){ // make sortable... if(options.sortable){ // add sort handle... + res.find('.text:first-child') + .before($('') + .addClass('sort-handle') + .html('☰')) + /* res.find('.button-container') .before($('') .addClass('sort-handle') .html('☰')) + //*/ // make the block sortable... res.parent().sortable({ handle: '.sort-handle', @@ -1014,6 +1020,7 @@ function(list, pins, options){ //------------------------------------ setup options: main/pins --- // buttons... var buttons = options.buttons = (options.buttons || []).slice() + var pins_buttons = (options.pins_buttons || buttons).slice() // pin/unpin button... var pin = [ '●' @@ -1041,10 +1048,13 @@ function(list, pins, options){ // XXX this is slow... that.dialog.update() }] - var i = buttons.indexOf('PIN') - i < 0 ? - buttons.push(pin) - : (buttons[i] = pin) + ;[buttons, pins_buttons] + .forEach(function(b){ + var i = b.indexOf('PIN') + i < 0 ? + b.push(pin) + : (b[i] = pin) + }) options.isItemHidden = function(e){ return pins.indexOf(e) >= 0 } options.skipHiddenItems = options.skipHiddenItems !== false ? true : false @@ -1056,7 +1066,7 @@ function(list, pins, options){ isItemHidden: null, - buttons: (options.pins_buttons || options.buttons).slice(), + buttons: pins_buttons, } pins_options.__proto__ = options var sortable = pins_options.sortable =