Commit 54088f43 authored by Alexander.Trofimov's avatar Alexander.Trofimov

Revert "paragraphContent.js to common"

This reverts commit 96299eb9.
parent 3fa9330b
......@@ -29,7 +29,6 @@
"../common/editor/paragraph.js",
"../common/editor/document.js",
"../common/editor/documentContent.js",
"../common/editor/paragraphContent.js",
"../common/Shapes/EditorSettings.js",
"../common/Shapes/Serialize.js",
......@@ -128,6 +127,7 @@
"../word/Editor/Comments.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/Field.js",
......
......@@ -29,7 +29,6 @@
"../common/editor/paragraph.js",
"../common/editor/document.js",
"../common/editor/documentContent.js",
"../common/editor/paragraphContent.js",
"../common/Shapes/EditorSettings.js",
"../common/Shapes/Serialize.js",
......@@ -118,6 +117,7 @@
"../slide/Editor/Format/Layout.js",
"../slide/Editor/Format/Comments.js",
"../word/Editor/Numbering.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/Field.js",
......
......@@ -32,7 +32,6 @@
"../common/editor/paragraph.js",
"../common/editor/document.js",
"../common/editor/documentContent.js",
"../common/editor/paragraphContent.js",
"../common/Shapes/EditorSettings.js",
"../common/Shapes/Serialize.js",
......@@ -102,6 +101,7 @@
"../word/Editor/CollaborativeEditing.js",
"../word/Editor/Comments.js",
"../word/Editor/FlowObjects.js",
"../word/Editor/ParagraphContent.js",
"../word/Editor/ParagraphContentBase.js",
"../word/Editor/Hyperlink.js",
"../word/Editor/Field.js",
......
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
"use strict";
// Содержимое параграфа должно иметь:
......@@ -52,6 +28,9 @@ var isRealObject = AscCommon.isRealObject;
var History = AscCommon.History;
var CRFonts = AscCommon.CRFonts;
var HitInLine = AscFormat.HitInLine;
var MOVE_DELTA = AscFormat.MOVE_DELTA;
var c_oAscRelativeFromH = Asc.c_oAscRelativeFromH;
var c_oAscRelativeFromV = Asc.c_oAscRelativeFromV;
......@@ -4998,10 +4977,10 @@ ParaDrawing.prototype =
if( this.GraphicObj.bNeedUpdatePosition || !(AscFormat.isRealNumber(this.GraphicObj.posX) && AscFormat.isRealNumber(this.GraphicObj.posY)) ||
!(Math.abs(this.GraphicObj.posX-_x) < AscFormat.MOVE_DELTA && Math.abs(this.GraphicObj.posY-_y) < AscFormat.MOVE_DELTA))
!(Math.abs(this.GraphicObj.posX-_x) < MOVE_DELTA && Math.abs(this.GraphicObj.posY-_y) < MOVE_DELTA))
this.GraphicObj.updatePosition(_x, _y);
if( this.GraphicObj.bNeedUpdatePosition || !(AscFormat.isRealNumber(this.wrappingPolygon.posX) && AscFormat.isRealNumber(this.wrappingPolygon.posY)) ||
!(Math.abs(this.wrappingPolygon.posX -_x) < AscFormat.MOVE_DELTA && Math.abs(this.wrappingPolygon.posY-_y) < AscFormat.MOVE_DELTA))
!(Math.abs(this.wrappingPolygon.posX -_x) < MOVE_DELTA && Math.abs(this.wrappingPolygon.posY-_y) < MOVE_DELTA))
this.wrappingPolygon.updatePosition(_x, _y);
this.calculateSnapArrays();
},
......@@ -6910,7 +6889,7 @@ ParaDrawing.prototype =
vy = cur_point.y - previous_point.y;
if(Math.abs(vx) > 0 || Math.abs(vy) > 0)
{
if(AscFormat.HitInLine(this.drawingDocument.CanvasHitContext, x, y, previous_point.x, previous_point.y, cur_point.x, cur_point.y))
if(HitInLine(this.drawingDocument.CanvasHitContext, x, y, previous_point.x, previous_point.y, cur_point.x, cur_point.y))
return {hit: true, hitType: WRAP_HIT_TYPE_SECTION, pointNum1: arr_point.length - 1, pointNum2: 0};
}
......@@ -6924,7 +6903,7 @@ ParaDrawing.prototype =
if(Math.abs(vx) > 0 || Math.abs(vy) > 0)
{
if(AscFormat.HitInLine(this.drawingDocument.CanvasHitContext, x, y, previous_point.x, previous_point.y, cur_point.x, cur_point.y))
if(HitInLine(this.drawingDocument.CanvasHitContext, x, y, previous_point.x, previous_point.y, cur_point.x, cur_point.y))
return {hit: true, hitType: WRAP_HIT_TYPE_SECTION, pointNum1: point_index-1, pointNum2: point_index};
}
}
......
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