From 4bd93529242fc0c0b81b77e7c9e1a0256f4a49b5 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 15 Sep 2007 21:55:15 +0000
Subject: [PATCH] mujma: BUGFIX: Added blocking history during resize and
 rotate. (merged from branches/gsoc)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41962 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/ImageEditor/Effects.js | 1 +
 javascript/ImageEditor/Resize.js  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/javascript/ImageEditor/Effects.js b/javascript/ImageEditor/Effects.js
index bdbca4c9..e62fd9fc 100644
--- a/javascript/ImageEditor/Effects.js
+++ b/javascript/ImageEditor/Effects.js
@@ -22,6 +22,7 @@ var Effects = {
 			} else {
 				resize.imageContainerResize.disable();
 				crop.disable();
+				imageHistory.disable();
 				imageTransformation.rotate(90,Effects.rotateCallback.bind(this));
 				this.isRotateEnabled = false;
 			}
diff --git a/javascript/ImageEditor/Resize.js b/javascript/ImageEditor/Resize.js
index ce4de90c..7b54297d 100644
--- a/javascript/ImageEditor/Resize.js
+++ b/javascript/ImageEditor/Resize.js
@@ -29,6 +29,7 @@ var Resize = {
 					effects.disableRotate();
 					crop.disable();
 					this.imageContainerResize.disable();
+					imageHistory.disable();
 				}	
 			}
 		}