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

7ca8a9f0 · Oleg.Korshul · Alexander.Trofimov · 2e6beac1 · 7ca8a9f0 · 7ca8a9f0
Commit 7ca8a9f0 authored Dec 20, 2015 by Oleg.Korshul Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 6 deletions

Common/Local/common.js Common/Local/common.js +3 -5

Excel/api.js Excel/api.js +6 -0

PowerPoint/api.js PowerPoint/api.js +7 -1

Word/api.js Word/api.js +6 -0

No files found.
--- a/Common/Local/common.js
+++ b/Common/Local/common.js
@@ -198,8 +198,6 @@ function InitDragAndDrop(oHtmlElement, callback) {
 }

 // меняем среду
-AscBrowser.isSafari = false;
-AscBrowser.isSafariMacOs = false;
-window.USER_AGENT_SAFARI_MACOS = false;
-
-window["AscDesktopEditorButtonMode"] = true;
\ No newline at end of file
+//AscBrowser.isSafari = false;
+//AscBrowser.isSafariMacOs = false;
+//window.USER_AGENT_SAFARI_MACOS = false;
\ No newline at end of file
--- a/Excel/api.js
+++ b/Excel/api.js
@@ -421,7 +421,9 @@ var editor;
      _e.shiftKey = false;
      _e.which = 67;

+	  window["AscDesktopEditorButtonMode"] = true;
      this.controller._onWindowKeyDown(_e);
+	  window["AscDesktopEditorButtonMode"] = false;

      return;
    }
@@ -439,7 +441,9 @@ var editor;
      _e.shiftKey = false;
      _e.which = 86;

+	  window["AscDesktopEditorButtonMode"] = true;
      this.controller._onWindowKeyDown(_e);
+	  window["AscDesktopEditorButtonMode"] = false;

      return;
    }
@@ -457,7 +461,9 @@ var editor;
      _e.shiftKey = false;
      _e.which = 88;

+	  window["AscDesktopEditorButtonMode"] = true;
      this.controller._onWindowKeyDown(_e);
+	  window["AscDesktopEditorButtonMode"] = false;

      return;
    }

--- a/PowerPoint/api.js
+++ b/PowerPoint/api.js
@@ -1037,7 +1037,9 @@ asc_docs_api.prototype.Copy = function()
        _e.CtrlKey = true;
        _e.KeyCode = 67;

+		window["AscDesktopEditorButtonMode"] = true;
        this.WordControl.m_oLogicDocument.OnKeyDown(_e);
+		window["AscDesktopEditorButtonMode"] = false;

        return;
    }
@@ -1054,7 +1056,9 @@ asc_docs_api.prototype.Cut = function()
        _e.CtrlKey = true;
        _e.KeyCode = 88;

+		window["AscDesktopEditorButtonMode"] = true;
        this.WordControl.m_oLogicDocument.OnKeyDown(_e);
+		window["AscDesktopEditorButtonMode"] = false;

        return;
    }
@@ -1068,7 +1072,9 @@ asc_docs_api.prototype.Paste = function()
        _e.CtrlKey = true;
        _e.KeyCode = 86;

-        this.WordControl.m_oLogicDocument.OnKeyDown(_e);
+		window["AscDesktopEditorButtonMode"] = true;
+        this.WordControl.m_oLogicDocument.OnKeyDown(_e);		
+		window["AscDesktopEditorButtonMode"] = false;

        return;
    }

--- a/Word/api.js
+++ b/Word/api.js
@@ -1723,7 +1723,9 @@ asc_docs_api.prototype.Copy = function()
        _e.CtrlKey = true;
        _e.KeyCode = 67;

+		window["AscDesktopEditorButtonMode"] = true;
        this.WordControl.m_oLogicDocument.OnKeyDown(_e);
+		window["AscDesktopEditorButtonMode"] = false;

        return;
    }
@@ -1740,7 +1742,9 @@ asc_docs_api.prototype.Cut = function()
        _e.CtrlKey = true;
        _e.KeyCode = 88;

+		window["AscDesktopEditorButtonMode"] = true;
        this.WordControl.m_oLogicDocument.OnKeyDown(_e);
+		window["AscDesktopEditorButtonMode"] = false;

        return;
    }
@@ -1754,7 +1758,9 @@ asc_docs_api.prototype.Paste = function()
        _e.CtrlKey = true;
        _e.KeyCode = 86;

+		window["AscDesktopEditorButtonMode"] = true;		
        this.WordControl.m_oLogicDocument.OnKeyDown(_e);
+		window["AscDesktopEditorButtonMode"] = false;

        return;
    }