diff --git a/css/ImageEditor/ImageEditor.css b/css/ImageEditor/ImageEditor.css index 8cb2da20..f068e69b 100644 --- a/css/ImageEditor/ImageEditor.css +++ b/css/ImageEditor/ImageEditor.css @@ -90,7 +90,6 @@ #cropBox { position: absolute; - background-image: url("cms/images/ImageEditor/white.gif"); display: inline; } .greyBox diff --git a/javascript/ImageEditor/Crop.js b/javascript/ImageEditor/Crop.js index 4f522c6f..d1dbfd0b 100644 --- a/javascript/ImageEditor/Crop.js +++ b/javascript/ImageEditor/Crop.js @@ -114,6 +114,7 @@ var Crop = { alert('Crop area too small'); } this.disable(); + $('image').style.visibility = 'visible';//hack for IE for not selecting image during crop } }, @@ -128,9 +129,9 @@ var Crop = { Event.observe('cropOk','click',this.onCropOk); Event.observe('cropCancel','click',this.onCropCancel); }, - onCropStart: function() { if(this.isEnabled) { + $('image').style.visibility = "hidden";//hack for IE for not selecting image during crop this.setVisible(true); Element.show($('cropOk'),$('cropCancel')); imageHistory.disable(); @@ -154,7 +155,8 @@ var Crop = { imageHistory.enable(); effects.enableRotate(); this.enable(); - } + } + $('image').style.visibility = 'visible';//hack for IE for not selecting image during crop }, setVisible: function(setVisible) { diff --git a/javascript/ImageEditor/Image.js b/javascript/ImageEditor/Image.js index 8a37a346..ab2d6dc6 100644 --- a/javascript/ImageEditor/Image.js +++ b/javascript/ImageEditor/Image.js @@ -24,8 +24,7 @@ var ImageToResize = { onImageLoad: function(event) { if(this.imageToResize.width != 0 && this.imageToResize.height != 0) { - //$('imageContainer').style.width = this.imageToResize.width + 'px'; - //$('imageContainer').style.height = this.imageToResize.height + 'px'; + $('imageContainer').style.backgroundImage = 'url("' + $('image').src + '")'; imageBox.hideIndicator(); Element.show($('imageContainer'),$('image')); if(resize.imageContainerResize.originalHeight == 0 && resize.imageContainerResize.originalWidth == 0) { diff --git a/javascript/ImageEditor/ImageHistory.js b/javascript/ImageEditor/ImageHistory.js index d6f82769..3babaa7b 100644 --- a/javascript/ImageEditor/ImageHistory.js +++ b/javascript/ImageEditor/ImageHistory.js @@ -18,7 +18,6 @@ ImageHistory = { this.enable = ImageHistory.enable.bind(this); this.disable = ImageHistory.disable.bind(this); this.clear = ImageHistory.clear.bind(this); - this.fakeImage = Positioning.addBehaviour($('fakeImg')); this.image = Positioning.addBehaviour($('image')); this.size = new Array(); }, diff --git a/templates/ImageEditor.ss b/templates/ImageEditor.ss index 8f547722..0284a597 100644 --- a/templates/ImageEditor.ss +++ b/templates/ImageEditor.ss @@ -36,8 +36,7 @@
- - +