diff --git a/ui (gen4)/index.html b/ui (gen4)/index.html index 9d13e5ae..26e40693 100755 --- a/ui (gen4)/index.html +++ b/ui (gen4)/index.html @@ -110,6 +110,10 @@ body { box-shadow: 5px 5px 60px -5px rgba(0, 0, 0, 0.3); } +.single-image-mode .ribbon { + box-shadow: none; +} + /* DEBUG stuff... */ .container-center { diff --git a/ui (gen4)/lib/features.js b/ui (gen4)/lib/features.js index 99d2834c..b04044e2 100755 --- a/ui (gen4)/lib/features.js +++ b/ui (gen4)/lib/features.js @@ -215,13 +215,14 @@ module.FeatureSet = { res = res.concat(e.depends) res.push(n) }) - // remove duplicates, keeping only the first occurance... - lst = res.filter(function(e, i, l){ return l.indexOf(e) == i }) + lst = res // sort features via priority keeping the order as close to // manual as possible... var l = lst.length lst = lst + // remove duplicates, keeping only the first occurance... + .filter(function(e, i, l){ return l.indexOf(e) == i }) // remove undefined features... .filter(function(e){ return that[e] != null }) // build the sort table: [ , , ] diff --git a/ui (gen4)/ui.js b/ui (gen4)/ui.js index 8d23dd29..9b4eae34 100755 --- a/ui (gen4)/ui.js +++ b/ui (gen4)/ui.js @@ -209,11 +209,11 @@ $(function(){ // XXX for some reason this is not visible when loading... a.setEmptyMsg('Loading...') - viewer.ImageGridFeatures.setup(a, [ // features... 'ui-ribbon-align-to-order', 'ui-single-image-view', + 'ui-partial-ribbons', 'fs-loader', 'app-control', @@ -222,7 +222,6 @@ $(function(){ 'image-marks', 'image-bookmarks', - 'ui-partial-ribbons', // chrome... 'ui-animation', 'ui-bounds-indicators', diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js index cefb55f7..36122bb8 100755 --- a/ui (gen4)/viewer.js +++ b/ui (gen4)/viewer.js @@ -1690,6 +1690,8 @@ var CurrentImageIndicatorActions = actions.Actions({ css.borderWidth = border // set border with a delay... + // NOTE: this is to prevent the ugly border resize before + // the scale on scale down animation starts... } else { setTimeout(function(){ marker.css({ borderWidth: border }) @@ -1763,7 +1765,12 @@ module.CurrentImageIndicator = features.Feature(ImageGridFeatures, { return function(){ this.updateCurrentImageIndicator(target, false) //this.ribbons.restoreTransitions(m, true) - m.show() + m + .show() + // NOTE: keeping display in inline style will + // prevent the element from being hidden + // by css... + .css({display: ''}) } } }],