Commit 46f9d301 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

версия с бранча

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51812 954022d7-b5bf-4e40-9824-e11837661b57
parent 92df1697
...@@ -5283,10 +5283,12 @@ function ClickCounter() { ...@@ -5283,10 +5283,12 @@ function ClickCounter() {
_this.clickCount = 1; _this.clickCount = 1;
if ( _this.log ) { if ( _this.log ) {
console.log("-----");
console.log("x: " + (_this.x === x)); console.log("x: " + (_this.x === x));
console.log("y: " + (_this.y === y)); console.log("y: " + (_this.y === y));
console.log("Time: " + (currTime - _this.time)); console.log("Time: " + (currTime - _this.time));
console.log("Count: " + _this.clickCount); console.log("Count: " + _this.clickCount);
console.log("");
} }
_this.time = currTime; _this.time = currTime;
...@@ -5543,6 +5545,13 @@ function readFromBinaryParagraphContent(r) ...@@ -5543,6 +5545,13 @@ function readFromBinaryParagraphContent(r)
return Element; return Element;
} }
function CreateParagraphContent(s)
{
if(s != " ")
return new ParaText(s);
return new ParaSpace(1);
}
function getTextString(docContent) function getTextString(docContent)
{ {
var ret = ""; var ret = "";
......
...@@ -1397,13 +1397,6 @@ ...@@ -1397,13 +1397,6 @@
var t = this; var t = this;
var coord = t._getCoordinates(event); var coord = t._getCoordinates(event);
var graphicsInfo = t.handlers.trigger("getGraphicsInfo", coord.x, coord.y);
if ( asc["editor"].isStartAddShape || (graphicsInfo && graphicsInfo.isGraphicObject) ) {
event.ClickCount = 2;
t.handlers.trigger("graphicObjectMouseDown", event, coord.x, coord.y);
return;
}
if (this.handlers.trigger("isGlobalLockEditCell")) if (this.handlers.trigger("isGlobalLockEditCell"))
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment