diff --git a/ui (gen4)/lib/jli.js b/ui (gen4)/lib/jli.js index 0ed07423..ccf2050b 100755 --- a/ui (gen4)/lib/jli.js +++ b/ui (gen4)/lib/jli.js @@ -491,7 +491,7 @@ function getRelativeOffset(container, block, point){ // NOTE: at this point this works only on the X axis... function setElementTransform(elem, offset, scale, duration){ elem = $(elem) - //var t3d = USE_3D_TRANSFORM ? 'translateZ(0px)' : '' + //var t3d = USE_3D_TRANSFORM ? 'translateZ(0)' : '' var t3d = USE_3D_TRANSFORM ? 'translate3d(0,0,0)' : '' if(offset == null){ diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js index 10580bcd..8a114d62 100755 --- a/ui (gen4)/ribbons.js +++ b/ui (gen4)/ribbons.js @@ -247,6 +247,17 @@ module.RibbonsPrototype = { } setElementScale(ribbon_set, scale) + + /* XXX not sure if this is needed yet... + // XXX fix a render bug in chrome 38... + var v = this.viewer[0] + if(v.style.transform == ''){ + v.style.transform = 'translateZ(0)' + } else { + v.style.transform = '' + } + */ + return this }, diff --git a/ui (gen4)/ui.js b/ui (gen4)/ui.js index c06bad30..cb486b77 100755 --- a/ui (gen4)/ui.js +++ b/ui (gen4)/ui.js @@ -132,6 +132,7 @@ module.GLOBAL_KEYBOARD = { '#0': 'fitMax', '#1': { default: 'fitImage', + shift: 'fitRibbon', ctrl: 'fitOrig!', }, '#2': 'fitTwo', @@ -145,7 +146,7 @@ module.GLOBAL_KEYBOARD = { shift: 'fitFiveRibbons', }, '#6': 'fitSix', - '#7': 'fitSevenr', + '#7': 'fitSeven', '#8':'fitEight', '#9': 'fitNine', diff --git a/ui/index.html b/ui/index.html index be5b3dff..bd81ec90 100755 --- a/ui/index.html +++ b/ui/index.html @@ -10,8 +10,6 @@ diff --git a/ui/ribbons.js b/ui/ribbons.js index b0bc0226..fd8b3c70 100755 --- a/ui/ribbons.js +++ b/ui/ribbons.js @@ -1082,6 +1082,14 @@ function fitNImages(n, fixed_proportions, no_strict_fit){ setElementScale($('.ribbon-set'), scale) centerView(image, 'css') + // XXX fix a render bug in chrome 38... + var v = viewer[0] + if(v.style.transform == ''){ + v.style.transform = 'translateZ(0)' + } else { + v.style.transform = '' + } + viewer.trigger('fittingImages', [n]) return scale