убрал g_oUndoRedoAutoFiltersMoveData

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63016 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/UndoRedo.js

@@ -3361,16 +3361,9 @@ UndoRedoWoorksheet.prototype = {
 			{
 				worksheetView.autoFilters._cleanStyleTable(to);
 			}
-			if(g_oUndoRedoAutoFiltersMoveData)
-			{
-				worksheetView.autoFilters._moveAutoFilters(null, null, g_oUndoRedoAutoFiltersMoveData);
-				g_oUndoRedoAutoFiltersMoveData = null;
-			}
-			else
-			{
-				worksheetView.autoFilters.reDrawFilter(to);
-				worksheetView.autoFilters.reDrawFilter(from);
-			}
+
+			worksheetView.autoFilters.reDrawFilter(to);
+			worksheetView.autoFilters.reDrawFilter(from);
 		}
 		else if(historyitem_Worksheet_Merge == Type || historyitem_Worksheet_Unmerge == Type)
 		{
@@ -3712,7 +3705,6 @@ UndoRedoComment.prototype = {
 };
 
 var g_oUndoRedoAutoFilters = null;
-var g_oUndoRedoAutoFiltersMoveData = null;
 function UndoRedoAutoFilters(wb){
 	this.wb = wb;
 	this.nType = UndoRedoClassTypes.Add(function(){return g_oUndoRedoAutoFilters;});
@@ -3731,11 +3723,7 @@ UndoRedoAutoFilters.prototype = {
 		var api = window["Asc"]["editor"];
 		if (!api.wb)
 			return;
-		if(bUndo && Type == 6)
-		{
-			g_oUndoRedoAutoFiltersMoveData = Data;
-			return;
-		}
+		
 		var ws = api.wb.getWorksheetById(nSheetId);
 		Data.worksheet = ws;
 		var autoFilters = ws.autoFilters;

Excel/model/autofilters.js

@@ -950,12 +950,12 @@ var maxIndividualValues = 10000;
 			// Undo
 			Undo: function (type, data) {
 				var aWs = this._getCurrentWS();
-				data = data.undo;
+				var undoData = data.undo;
 				var cloneData;
-				if(data.clone)
-					cloneData = data.clone(null);
+				if(undoData.clone)
+					cloneData = undoData.clone(null);
 				else
-					cloneData = data;
+					cloneData = undoData;
 					
 				if(!cloneData)
 					return;
@@ -978,8 +978,13 @@ var maxIndividualValues = 10000;
 						}
 					}
 				}
-
-				if(cloneData.FilterColumns || cloneData.AutoFilter || cloneData.TableColumns || (cloneData.Ref && (cloneData instanceof AutoFilter || cloneData instanceof TablePart)))
+				
+				//TODO переделать undo, по типам
+				if(type === historyitem_AutoFilter_Move)
+				{
+					this._moveAutoFilters(null, null, data);
+				}
+				else if(cloneData.FilterColumns || cloneData.AutoFilter || cloneData.TableColumns || (cloneData.Ref && (cloneData instanceof AutoFilter || cloneData instanceof TablePart)))
 				{
 					if(cloneData.Ref)
 					{