tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

mujma: BUGFIX: Fixed image flickering under IE6

Browse Source 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41990 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-16 00:51:15 +00:00
parent 8e08868354
commit 5150e6c6b6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
javascript/ImageEditor/ImageHistory.js
View File

@ -33,9 +33,9 @@ ImageHistory = {
if(this.operationMade(this.historyPointer-1,'rotate') || this.operationMade(this.historyPointer-1,'crop')) if(this.operationMade(this.historyPointer-1,'rotate') || this.operationMade(this.historyPointer-1,'crop'))
this.modifiedOriginalImage = true; else this.modifiedOriginalImage = false; this.modifiedOriginalImage = true; else this.modifiedOriginalImage = false;
} }
this.image.src = this.history[this.historyPointer-1].fileUrl; Event.observe('image','load',this.onImageLoad);
this.historyPointer--; this.historyPointer = this.historyPointer - 1;
this.onImageLoad(); this.image.src = this.history[this.historyPointer].fileUrl;
} else { } else {
alert("No more undo"); alert("No more undo");
} }
@ -45,9 +45,9 @@ ImageHistory = {
if(this.historyPointer < this.history.length-1) { if(this.historyPointer < this.history.length-1) {
operation = this.history[this.historyPointer+1].operation; operation = this.history[this.historyPointer+1].operation;
if(operation == 'rotate' || operation == 'crop') this.modifiedOriginalImage = true; if(operation == 'rotate' || operation == 'crop') this.modifiedOriginalImage = true;
this.image.src = this.history[this.historyPointer+1].fileUrl; Event.observe('image','load',this.onImageLoad);
this.historyPointer++; this.historyPointer = this.historyPointer + 1;
this.onImageLoad(); this.image.src = this.history[this.historyPointer].fileUrl;
} else { } else {
alert("No more redo"); alert("No more redo");
} }
@ -111,6 +111,7 @@ ImageHistory = {
}, },
onImageLoad: function(event) { onImageLoad: function(event) {
Event.stopObserving($('image'),'load',this.onImageLoad);
imageBox.checkOutOfDrawingArea(this.size[this.historyPointer].width,this.size[this.historyPointer].height); imageBox.checkOutOfDrawingArea(this.size[this.historyPointer].width,this.size[this.historyPointer].height);
this.image.style.width = this.size[this.historyPointer].width + 'px'; this.image.style.width = this.size[this.historyPointer].width + 'px';
this.image.style.height = this.size[this.historyPointer].height + 'px'; this.image.style.height = this.size[this.historyPointer].height + 'px';