From c6044ce31d19aab5b94502a2c9e45a54f0aaf823 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Fri, 24 Oct 2014 17:18:54 +0400
Subject: [PATCH] added .uncropAndKeepOrder(..) action...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/viewer.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index 498c6945..b817eac8 100755
--- a/ui (gen4)/viewer.js	
+++ b/ui (gen4)/viewer.js	
@@ -365,10 +365,11 @@ actions.Actions({
 			this.data = this.data.crop(list, flatten)
 		}],
 	uncrop: ['Uncrop ribbons',
-		function(level, restore_current){
+		function(level, restore_current, keep_crop_order){
 			level = level || 1
 
 			var cur = this.current
+			var order = this.data.order
 
 			if(this.crop_stack == null){
 				return
@@ -389,16 +390,21 @@ actions.Actions({
 				this.data.focusImage(cur)
 			}
 
+			// restore order from the crop...
+			if(keep_crop_order){
+				this.data.order = order
+				this.data.sortImages()
+			}
+
+			// purge the stack...
 			if(this.crop_stack.length == 0){
 				delete this.crop_stack
 			}
 		}],
 	uncropAll: ['',
 		function(restore_current){ this.uncrop('all', restore_current) }],
-	// XXX not sure about this...
-	uncropAndKeepOrder: ['',
-		function(){
-		}],
+	uncropAndKeepOrder: ['Uncrop and keep crop image order',
+		function(level, restore_current){ this.uncrop(level, restore_current, true) }],
 	// XXX same as uncrop but will also try and merge changes...
 	mergeCrop: ['',
 		function(){