From 98b6ae41bf96457fe45bd94795da99153f4a3933 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 30 Dec 2016 20:05:26 +0300 Subject: [PATCH] minor fix + css tweaking... Signed-off-by: Alex A. Naanou --- ui (gen4)/css/widget/browse.css | 3 +++ ui (gen4)/lib/widget/browse.js | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ui (gen4)/css/widget/browse.css b/ui (gen4)/css/widget/browse.css index 312366a5..8bcbeea7 100755 --- a/ui (gen4)/css/widget/browse.css +++ b/ui (gen4)/css/widget/browse.css @@ -285,6 +285,9 @@ .browse-widget .list>div.disabled { opacity: 0.3; } +.browse-widget .list>div.hidden { + font-style: italic; +} /* numbers... */ diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js index 66f07fae..ba83d9de 100755 --- a/ui (gen4)/lib/widget/browse.js +++ b/ui (gen4)/lib/widget/browse.js @@ -1036,12 +1036,9 @@ var BrowserPrototype = { // append text elements... .append(p) - if(!traversable){ - res.addClass('not-traversable') - } - if(disabled){ - res.addClass('disabled') - } + !traversable && res.addClass('not-traversable') + disabled && res.addClass('disabled') + hidden && res.addClass('hidden') // buttons... // action (open)... @@ -1968,7 +1965,7 @@ var BrowserPrototype = { push: function(pattern){ var browser = this.dom var cur = this.select('!') - var elem = this.select(!pattern ? '!' + var elem = this.filter(!pattern ? '!' : /-?[0-9]+/.test(pattern) ? pattern // XXX avoid keywords that .select(..) understands... //: '"'+pattern+'"' ) @@ -1979,6 +1976,11 @@ var BrowserPrototype = { return this } + // item disabled... + if(elem.hasClass('disabled')){ + return this + } + // nothing selected, select first and exit... if(cur.length == 0 && elem.length == 0){ this.select() @@ -1987,9 +1989,12 @@ var BrowserPrototype = { // if not traversable call the action... if(!this.traversable || elem.hasClass('not-traversable')){ + this.select(elem) return this.action() } + this.select(elem) + var path = this.path // XXX do we need qotes here??? //path.push('"'+ elem.find('.text').text() +'"')