Commit 001b52e9 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov

были тормоза при наборе текста в шейпе

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48412 954022d7-b5bf-4e40-9824-e11837661b57
parent 6db660e1
...@@ -1947,14 +1947,7 @@ function DrawingObjects() { ...@@ -1947,14 +1947,7 @@ function DrawingObjects() {
currentSheet.model.Drawings[i].worksheet = worksheet; currentSheet.model.Drawings[i].worksheet = worksheet;
var clone = _this.cloneDrawingObject(currentSheet.model.Drawings[i]); var clone = _this.cloneDrawingObject(currentSheet.model.Drawings[i]);
if ( currentSheet.model.Drawings[i].isChart() ) {
_this.calcChartInterval(clone.chart);
clone.chart.worksheet = worksheet;
aObjects.push( clone );
}
if ( currentSheet.model.Drawings[i].imageUrl) { if ( currentSheet.model.Drawings[i].imageUrl) {
aObjectsSync[aObjectsSync.length] = clone; aObjectsSync[aObjectsSync.length] = clone;
...@@ -1963,9 +1956,6 @@ function DrawingObjects() { ...@@ -1963,9 +1956,6 @@ function DrawingObjects() {
if (clone.graphicObject instanceof CChartAsGroup) { if (clone.graphicObject instanceof CChartAsGroup) {
_this.calcChartInterval(clone.chart);
clone.worksheet = worksheet; clone.worksheet = worksheet;
clone.graphicObject.drawingBase = clone; clone.graphicObject.drawingBase = clone;
clone.graphicObject.drawingObjects = _this; clone.graphicObject.drawingObjects = _this;
......
...@@ -146,11 +146,13 @@ DrawingObjectsController.prototype = ...@@ -146,11 +146,13 @@ DrawingObjectsController.prototype =
onKeyDown: function(e) onKeyDown: function(e)
{ {
this.curState.onKeyDown(e); this.curState.onKeyDown(e);
//return true;
}, },
onKeyPress: function(e) onKeyPress: function(e)
{ {
this.curState.onKeyPress(e); this.curState.onKeyPress(e);
//return true;
}, },
resetSelectionState: function() resetSelectionState: function()
......
...@@ -329,7 +329,7 @@ function NullState(drawingObjectsController, drawingObjects) ...@@ -329,7 +329,7 @@ function NullState(drawingObjectsController, drawingObjects)
if(isRealNumber(e.charCode)) if(isRealNumber(e.charCode))
{ {
selected_objects[0].paragraphAdd(new ParaText(String.fromCharCode(e.charCode))); selected_objects[0].paragraphAdd(new ParaText(String.fromCharCode(e.charCode)));
this.drawingObjects.showDrawingObjects(true); this.drawingObjects.showDrawingObjects(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