Merge 4ebe0f9 into 69b0af5

textAngular · Jul 3, 2015 · 617a4f4 · 617a4f4
2 parents 69b0af5 + 4ebe0f9
commit 617a4f4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main.js b/src/main.js
@@ -262,8 +262,8 @@ textAngular.directive("textAngular", [
 								y: Math.max(0, startPosition.height + (event.clientY - startPosition.y))
 							};
 
-							if(event.shiftKey){
-								// keep ratio
+							var keepRatio = (attrs.taImageResizeKeepAspectRatio !== undefined);
+							if(keepRatio || event.shiftKey) {
 								var newRatio = pos.y / pos.x;
 								pos.x = ratio > newRatio ? pos.x : pos.y / ratio;
 								pos.y = ratio > newRatio ? pos.x * ratio : pos.y;