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

be5814b4 · Oleg.Korshul · Alexander.Trofimov · c638a060 · be5814b4
Commit be5814b4 authored Sep 25, 2013 by Oleg.Korshul Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Common/wordcopypaste.js Common/wordcopypaste.js +4 -2

No files found.
--- a/Common/wordcopypaste.js
+++ b/Common/wordcopypaste.js
@@ -2180,7 +2180,7 @@ function Editor_Paste(api, bClean)

        if (window.USER_AGENT_SAFARI_MACOS)
        {
-            if (window.GlobalPasteFlagCounter != 2)
+            if (window.GlobalPasteFlagCounter != 2 && !window.GlobalPasteFlag)
            {
                window.setTimeout(func_timeout, 10);
                return;
@@ -5447,7 +5447,9 @@ function Editor_CopyPaste_Create(api)
        if (window.GlobalPasteFlagCounter == 1)
        {
            Body_Paste(api,e);
-            window.GlobalPasteFlagCounter = 2;
+
+            if (window.GlobalPasteFlag)
+                window.GlobalPasteFlagCounter = 2;
        }
    };