diff --git a/ui/modes.js b/ui/modes.js index d21cf5c8..571a05cf 100755 --- a/ui/modes.js +++ b/ui/modes.js @@ -171,7 +171,7 @@ var toggleSingleImageMode = createCSSClassToggler( var toggleSingleRibbonMode = makeCropModeToggler( 'single-ribbon-mode', function(){ - cropDataTo(DATA.ribbons[getRibbonIndex()].slice()) + cropDataTo(getRibbonGIDs()) }) @@ -320,43 +320,6 @@ var toggleInlineImageInfo = createCSSClassToggler( }) -function setImageProportions(image, mode){ - var h = image.outerHeight(true) - var w = image.outerWidth(true) - mode = mode == null ? toggleImageProportions('?') : 'square' - mode = mode == 'fit-viewer' ? 'viewer' : 'squzre' - - if(mode == 'viewer'){ - var viewer = $('.viewer') - var W = viewer.innerWidth() - var H = viewer.innerHeight() - - if(W > H){ - image.css('width', W * h/H) - } else { - image.css('height', H * w/W) - } - - // account for rotation... - correctImageProportionsForRotation(image) - centerView(null, 'css') - - } else { - var size = Math.min(w, h) - image.css({ - width: size, - height: size - }) - - // account for rotation... - correctImageProportionsForRotation(image) - centerView(null, 'css') - } - - return image -} - - // Toggle image container proportions mode // // Available modes: