From f1c3e58465d59f15acf38211b5647bda58aa366d Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 4 May 2017 00:58:08 +0300 Subject: [PATCH] minor fixes... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/meta.js | 4 +--- ui (gen4)/features/ui-chrome.js | 8 ++++++++ ui (gen4)/features/ui-partial-ribbons-vdom.js | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ui (gen4)/features/meta.js b/ui (gen4)/features/meta.js index 5cabc624..126b2416 100755 --- a/ui (gen4)/features/meta.js +++ b/ui (gen4)/features/meta.js @@ -68,12 +68,10 @@ core.ImageGridFeatures.Feature('viewer-testing', [ 'ui-partial-ribbons-2', '-ui-partial-ribbons', //*/ - // XXX EXPERIMENTAL... + /*/ XXX EXPERIMENTAL... 'ui-partial-ribbons-vdom', '-ui-partial-ribbons', '-ui-partial-ribbons-2', - // XXX this conflicts with ui-partial-ribbons-vdom... - //'-ui-current-image-indicator', //*/ 'marks', diff --git a/ui (gen4)/features/ui-chrome.js b/ui (gen4)/features/ui-chrome.js index 374552e1..b49200b6 100755 --- a/ui (gen4)/features/ui-chrome.js +++ b/ui (gen4)/features/ui-chrome.js @@ -187,6 +187,13 @@ var CurrentImageIndicatorActions = actions.Actions({ return } + // create marker if it does not exist... + if(marker.length == 0 && ribbon_set.length > 0){ + $('
') + .addClass('current-marker') + .prependTo(ribbon_set) + } + // get config... var border = this.config['current-image-border'] var min_border = this.config['current-image-min-border'] @@ -249,6 +256,7 @@ module.CurrentImageIndicator = core.ImageGridFeatures.Feature({ ['load', function(){ var fadein = this.config['current-image-indicator-fadein'] + this.updateCurrentImageIndicator() this.ribbons.viewer.find('.current-marker') .css({ display: 'block', diff --git a/ui (gen4)/features/ui-partial-ribbons-vdom.js b/ui (gen4)/features/ui-partial-ribbons-vdom.js index c546c2bd..4ebec64f 100755 --- a/ui (gen4)/features/ui-partial-ribbons-vdom.js +++ b/ui (gen4)/features/ui-partial-ribbons-vdom.js @@ -213,7 +213,9 @@ var VirtualDOMRibbonsPrototype = { transform: 'scale('+ s +', '+ s +')', } }, [ + // current image indicator... vdom.h('div.current-marker'), + // ribbon locator... vdom.h('div.ribbon-locator', {