minor fixes...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-05-04 00:58:08 +03:00
parent b16a804958
commit f1c3e58465
3 changed files with 11 additions and 3 deletions

View File

@ -68,12 +68,10 @@ core.ImageGridFeatures.Feature('viewer-testing', [
'ui-partial-ribbons-2', 'ui-partial-ribbons-2',
'-ui-partial-ribbons', '-ui-partial-ribbons',
//*/ //*/
// XXX EXPERIMENTAL... /*/ XXX EXPERIMENTAL...
'ui-partial-ribbons-vdom', 'ui-partial-ribbons-vdom',
'-ui-partial-ribbons', '-ui-partial-ribbons',
'-ui-partial-ribbons-2', '-ui-partial-ribbons-2',
// XXX this conflicts with ui-partial-ribbons-vdom...
//'-ui-current-image-indicator',
//*/ //*/
'marks', 'marks',

View File

@ -187,6 +187,13 @@ var CurrentImageIndicatorActions = actions.Actions({
return return
} }
// create marker if it does not exist...
if(marker.length == 0 && ribbon_set.length > 0){
$('<div/>')
.addClass('current-marker')
.prependTo(ribbon_set)
}
// get config... // get config...
var border = this.config['current-image-border'] var border = this.config['current-image-border']
var min_border = this.config['current-image-min-border'] var min_border = this.config['current-image-min-border']
@ -249,6 +256,7 @@ module.CurrentImageIndicator = core.ImageGridFeatures.Feature({
['load', ['load',
function(){ function(){
var fadein = this.config['current-image-indicator-fadein'] var fadein = this.config['current-image-indicator-fadein']
this.updateCurrentImageIndicator()
this.ribbons.viewer.find('.current-marker') this.ribbons.viewer.find('.current-marker')
.css({ .css({
display: 'block', display: 'block',

View File

@ -213,7 +213,9 @@ var VirtualDOMRibbonsPrototype = {
transform: 'scale('+ s +', '+ s +')', transform: 'scale('+ s +', '+ s +')',
} }
}, [ }, [
// current image indicator...
vdom.h('div.current-marker'), vdom.h('div.current-marker'),
// ribbon locator... // ribbon locator...
vdom.h('div.ribbon-locator', vdom.h('div.ribbon-locator',
{ {