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

Excel/model/DrawingObjects/Format/Format.js

@@ -25,6 +25,7 @@ var TYPE_TRACK_GROUP = TYPE_TRACK_SHAPE;
 var TYPE_TRACK_GROUP_PASSIVE = 1;
 var TYPE_TRACK_TEXT = 2;
 var TYPE_TRACK_EMPTY_PH = 3;
+var TYPE_TRACK_LOCK_SHAPE = 4;
 
 
 var GLOBAL_BLIP_FILL_MAP = {};

Excel/model/DrawingObjects/Overlay.js

@@ -1152,6 +1152,12 @@ CAutoshapeTrack.prototype =
 
                 break;
             }
+            case TYPE_TRACK_LOCK_SHAPE:
+            {
+                var _offset_eps = 5;
+				// TODO:
+                break;
+            }
 
             default:
                 break;

Word/Drawing/DrawingDocument.js

@@ -3668,6 +3668,12 @@ function CDrawingDocument()
 
         if (this.IsTextMatrixUse)
             this.Overlay.m_oContext.strokeStyle = "#9ADBFE";
+
+        if (this.m_oWordControl.MobileTouchManager)
+        {
+            this.m_oWordControl.MobileTouchManager.RectSelect1 = null;
+            this.m_oWordControl.MobileTouchManager.RectSelect2 = null;
+        }
     }
     this.private_EndDrawSelection = function()
     {

Word/Drawing/HtmlPage.js

@@ -567,10 +567,23 @@ function CEditorPage(api)
 
             if (bIsAndroid)
             {
+                window.IS_USE_INPUT = true;
                 this.TextBoxBackground.HtmlElement["oninput"] = function(e)
                 {
                     var val = oThis.TextBoxBackground.HtmlElement.value;
                     oThis.TextBoxBackground.HtmlElement.value = "a";
+
+                    if (!window.IS_USE_INPUT && val == "aa")
+                    {
+                        if (e.preventDefault)
+                            e.preventDefault();
+
+                        e.returnValue = false;
+
+                        window.IS_USE_INPUT = true;
+                        return;
+                    }
+
                     if (val.length == 2)
                     {
                         var _e = {
@@ -585,9 +598,13 @@ function CEditorPage(api)
                             which : val.charCodeAt(1)
                         };
 
+                        _e.preventDefault = function()
+                        {
+                        };
+
                         if (_e.which == 32)
                         {
-                            _e.KeyCode = 32;
+                            _e.keyCode = 32;
                             oThis.onKeyDown(_e);
                         }
                         else
@@ -595,6 +612,16 @@ function CEditorPage(api)
                             oThis.onKeyPress(_e);
                         }
                     }
+                    else if (0 == val.length)
+                    {
+                        // пришла пустая. следом ждем "aa"
+                        window.IS_USE_INPUT = false;
+                    }
+
+                    if (e.preventDefault)
+                        e.preventDefault();
+
+                    e.returnValue = false;
                 }
             }
 
@@ -2093,7 +2120,7 @@ function CEditorPage(api)
 
     this.onKeyUp = function(e)
     {
-        global_keyboardEvent.AtlKey     = false;
+        global_keyboardEvent.AltKey     = false;
         global_keyboardEvent.CtrlKey    = false;
         global_keyboardEvent.ShiftKey   = false;
     }
@@ -2612,7 +2639,11 @@ function CEditorPage(api)
                 }
                 else
                 {
-                    this.m_oLogicDocument.Selection_Draw_Pages(0, drDoc.m_lPagesCount - 1);
+                    for (var i = 0; i <= drDoc.m_lPagesCount; i++)
+                    {
+                        if (!drDoc.IsFreezePage(i))
+                            this.m_oLogicDocument.Selection_Draw_Page(i);
+                    }
                 }
 
                 drDoc.private_EndDrawSelection();

Word/Drawing/WorkEvents.js

@@ -106,7 +106,7 @@ function CMouseEventHandler()
 
 function CKeyboardEvent()
 {
-    this.AtlKey     = false;                        // ������ �� ������ alt
+    this.AltKey     = false;                        // ������ �� ������ alt
     this.CtrlKey    = false;                        // ������ �� ������ ctrl
     this.ShiftKey   = false;                        // ������ �� ������ shift
 
@@ -122,7 +122,12 @@ var global_keyboardEvent = new CKeyboardEvent();
 function check_KeyboardEvent(e)
 {
     global_keyboardEvent.AltKey = e.altKey;
-    global_keyboardEvent.CtrlKey = e.ctrlKey || e.metaKey;
+
+    if (e.metaKey !== undefined)
+        global_keyboardEvent.CtrlKey = e.ctrlKey || e.metaKey;
+    else
+        global_keyboardEvent.CtrlKey = e.ctrlKey;
+
     global_keyboardEvent.ShiftKey = e.shiftKey;
 
     global_keyboardEvent.Sender = (e.srcElement) ? e.srcElement : e.target;

Word/api.js

@@ -6226,18 +6226,24 @@ asc_docs_api.prototype.OnHandleMessage = function(event)
 {
 	if (null != event && null != event.data)
     {
-		var data = JSON.parse(event.data);
-		if(null != data && null != data.type)
-		{
-			if(PostMessageType.UploadImage == data.type)
-			{
-				editor.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
-				if(c_oAscServerError.NoError == data.error)
-					this.AddImageUrl(data.url);
-				else
-					this.sync_ErrorCallback(_mapAscServerErrorToAscError(data.error), c_oAscError.Level.NoCritical);
-			}
-		}
+        try
+        {
+            var data = JSON.parse(event.data);
+            if(null != data && null != data.type)
+            {
+                if(PostMessageType.UploadImage == data.type)
+                {
+                    editor.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
+                    if(c_oAscServerError.NoError == data.error)
+                        this.AddImageUrl(data.url);
+                    else
+                        this.sync_ErrorCallback(_mapAscServerErrorToAscError(data.error), c_oAscError.Level.NoCritical);
+                }
+            }
+        }
+        catch (err)
+        {
+        }
 	}
 }
 asc_docs_api.prototype.asyncImageEndLoaded2 = null;