рефакторинг

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

Excel/model/clipboard.js

@@ -1495,33 +1495,7 @@
 				 return newArr;
 			},
 			
-            _editorPasteExec: function (worksheet, node, isText,onlyFromLocalStorage)
-            {
-				if(node == undefined)
-					return;
-				var pasteFragment = node;
-                var t = this;
-				
-				if(isOnlyLocalBufferSafari && navigator.userAgent.toLowerCase().indexOf('safari') > -1 && navigator.userAgent.toLowerCase().indexOf('mac'))
-					onlyFromLocalStorage = true;
-				
-				//если находимся внутри шейпа
-				if(worksheet.objectRender.controller.curState.textObject && worksheet.objectRender.controller.curState.textObject.txBody)
-				{
-					if(onlyFromLocalStorage)
-					{
-						if(t.lStorage && t.lStorage.htmlInShape)
-							worksheet.objectRender.controller.curState.textObject.txBody.insertHtml(t.lStorage.htmlInShape);
-					}
-					else
-						worksheet.objectRender.controller.curState.textObject.txBody.insertHtml(node);
-					window.GlobalPasteFlag = false;
-					window.GlobalPasteFlagCounter = 0;
-					return;
-				}
-				
-				//****binary****
-				if(copyPasteUseBinary)
+			_pasteFromBinary: function(worksheet, node, onlyFromLocalStorage)
 			{
 				var base64 = null;
 				if(onlyFromLocalStorage)
@@ -1530,15 +1504,15 @@
 					{
 						if(t.lStorage.htmlInShape)
 						{
-								node = t.lStorage.htmlInShape;
-								pasteFragment = node;
+							return t.lStorage.htmlInShape;
 						}
 						else
 						{
 							worksheet.setSelectionInfo('paste',t,false,true);
+							
 							window.GlobalPasteFlag = false;
 							window.GlobalPasteFlagCounter = 0;
-								return;
+							return true;
 						}
 					}
 					else
@@ -1570,7 +1544,8 @@
 						}
 					}
 				}
-					if(base64 != null)
+				
+				if(base64 != null)//from excel
 				{
 					var oBinaryFileReader = new Asc.BinaryFileReader(null, true);
 					var tempWorkbook = new Workbook;
@@ -1592,18 +1567,67 @@
 						}
 						window.GlobalPasteFlag = false;
 						window.GlobalPasteFlagCounter = 0;
-							return;
+						
+						return true;
+					}
 				} 
-					} else if (base64FromWord && copyPasteFromWordUseBinary) {
+				else if (base64FromWord && copyPasteFromWordUseBinary)//from word
+				{
 					var pasteData = this.ReadFromBinaryWord(base64FromWord);
 					var pasteFromBinaryWord = new Asc.pasteFromBinaryWord(this, worksheet);
+					
 					pasteFromBinaryWord._paste(worksheet, pasteData);
+					
 					window.GlobalPasteFlag = false;
 					window.GlobalPasteFlagCounter = 0;
+					
+					return true;
+				};
+				
+				return false;
+			},
+			
+            _editorPasteExec: function (worksheet, node, isText,onlyFromLocalStorage)
+            {
+				if(node == undefined)
 					return;
+				var pasteFragment = node;
+                var t = this;
+				
+				if(isOnlyLocalBufferSafari && navigator.userAgent.toLowerCase().indexOf('safari') > -1 && navigator.userAgent.toLowerCase().indexOf('mac'))
+					onlyFromLocalStorage = true;
+				
+				//если находимся внутри шейпа
+				if(worksheet.objectRender.controller.curState.textObject && worksheet.objectRender.controller.curState.textObject.txBody)
+				{
+					if(onlyFromLocalStorage)
+					{
+						if(t.lStorage && t.lStorage.htmlInShape)
+							worksheet.objectRender.controller.curState.textObject.txBody.insertHtml(t.lStorage.htmlInShape);
 					}
+					else
+						worksheet.objectRender.controller.curState.textObject.txBody.insertHtml(node);
+					window.GlobalPasteFlag = false;
+					window.GlobalPasteFlagCounter = 0;
+					return;
 				}
 				
+				//****binary****
+				var binaryResult;
+				if(copyPasteUseBinary)
+				{
+					binaryResult = this._pasteFromBinary(worksheet, node, onlyFromLocalStorage);
+					
+					if(binaryResult === true)
+						return;
+					else if(binaryResult !== false && binaryResult != undefined)
+					{
+						pasteFragment = binaryResult;
+						node = binaryResult;
+					};
+				};
+				
+				
 				if(activateLocalStorage)
 				{
 					//в случае вставки по нажатию на правую кнопку мыши