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

30ece2bd · Igor.Zotov · Alexander.Trofimov · e2752af2 · 30ece2bd
Commit 30ece2bd authored Nov 19, 2013 by Igor.Zotov Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 18 deletions

Excel/model/clipboard.js Excel/model/clipboard.js +18 -18

No files found.
--- a/Excel/model/clipboard.js
+++ b/Excel/model/clipboard.js
@@ -1523,6 +1523,24 @@
 				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)
 				{
@@ -1564,24 +1582,6 @@
 					}
 				}
 				
-				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;
-				}
-				
 				if(activateLocalStorage)
 				{
 					//в случае вставки по нажатию на правую кнопку мыши