Commit 42418b3f authored by Sergey Luzyanin's avatar Sergey Luzyanin

Merge remote-tracking branch 'remotes/origin/develop' into feature/sparklines

parents 4f73be77 4879f710
No related merge requests found
GRUNT = grunt
GRUNT_FLAGS = --no-color -v
GRUNT_FLAGS = --private=true --no-color -v
OUTPUT_DIR = deploy
OUTPUT = $(OUTPUT_DIR)
......
......@@ -173,7 +173,7 @@ module.exports = function(grunt) {
});
var mobileFiles = packageFile['compile']['sdk']['mobile'];
if(mobileFiles){
srcFiles = srcFiles.concat(mobileFiles);
srcFiles = mobileFiles.concat(srcFiles);
}
}
......
......@@ -112,7 +112,7 @@
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/Overlay.js",
"../common/Overlay.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/Metafile.js",
......
{
"info": {
"version": "3.7.0",
"version": "3.8.0",
"build": 148
},
"update_src": {
......@@ -107,7 +107,7 @@
"../common/wordcopypaste.js",
"../cell/view/DrawingObjectsController.js",
"../cell/model/DrawingObjects/Graphics.js",
"../cell/model/DrawingObjects/Overlay.js",
"../common/Overlay.js",
"../common/Controls.js",
"../cell/model/DrawingObjects/ShapeDrawer.js",
"../cell/model/DrawingObjects/DrawingDocument.js",
......@@ -204,4 +204,4 @@
"compile_sdk"
]
}
}
\ No newline at end of file
}
{
"info": {
"version": "3.7.0",
"version": "3.8.0",
"build": 158
},
"update_src": {
......@@ -65,7 +65,7 @@
"../common/Drawings/TrackObjects/MoveTracks.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/Overlay.js",
"../common/Overlay.js",
"../word/Drawing/ShapeDrawer.js",
"../slide/Drawing/Transitions.js",
"../slide/Drawing/DrawingDocument.js",
......@@ -171,7 +171,7 @@
"exclude_mobile": [
"../common/browser.js",
"../word/Drawing/ShapeDrawer.js",
"../word/Drawing/Overlay.js",
"../common/Overlay.js",
"../slide/Drawing/HtmlPage.js",
"../slide/Drawing/DrawingDocument.js"
],
......@@ -207,4 +207,4 @@
"compile_sdk"
]
}
}
\ No newline at end of file
}
{
"info": {
"version": "3.7.0",
"version": "3.8.0",
"build": 167
},
"update_src": {
......@@ -103,7 +103,7 @@
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/Overlay.js",
"../common/Overlay.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/ShapeDrawer.js",
"../word/Drawing/Metafile.js",
......@@ -158,8 +158,7 @@
"../common/Local/common.js",
"../word/Local/api.js"
],
"exclude_mobile": [
],
"exclude_mobile": [],
"dst": "../word/sdk-all.js",
"externs": [
"../common/Build/Externs.js",
......@@ -191,4 +190,4 @@
"compile_sdk"
]
}
}
\ No newline at end of file
}
......@@ -856,7 +856,10 @@ var editor;
oAdditionalData["userid"] = this.documentUserId;
oAdditionalData["vkey"] = this.documentVKey;
oAdditionalData["outputformat"] = sFormat;
oAdditionalData["title"] = changeFileExtention(this.documentTitle, getExtentionByFormat(sFormat));
oAdditionalData["title"] = changeFileExtention(this.documentTitle, getExtentionByFormat(sFormat));
if (DownloadType.Print === options.downloadType) {
oAdditionalData["inline"] = 1;
}
if (c_oAscFileType.PDF === sFormat) {
var printPagesData = this.wb.calcPagesPrint(this.adjustPrint);
var pdf_writer = new CPdfPrinter();
......
/*
*
* (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.
*
*/
/*
*
* (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";
var g_dDpiX = 96.0;
......@@ -4890,4 +4890,26 @@ function CDrawingDocument(drawingObjects)
if (this.m_oWordControl && this.m_oWordControl.MobileTouchManager)
this.m_oWordControl.MobileTouchManager.CheckSelectEnd(false);
}
}
\ No newline at end of file
}
// заглушка
function CHtmlPage()
{
this.drawingPage = { top: 0, left: 0, right: 0, bottom: 0 };
this.width_mm = 0;
this.height_mm = 0;
}
CHtmlPage.prototype.init = function(x, y, w_pix, h_pix, w_mm, h_mm) {
this.drawingPage.top = y;
this.drawingPage.left = x;
this.drawingPage.right = w_pix;
this.drawingPage.bottom = h_pix;
this.width_mm = w_mm;
this.height_mm = h_mm;
};
CHtmlPage.prototype.GetDrawingPageInfo = function() {
return { drawingPage: this.drawingPage, width_mm: this.width_mm, height_mm: this.height_mm };
};
\ No newline at end of file
This diff is collapsed.
/*
*
* (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.
*
*/
/*
*
* (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";
//-----------------------------------------------------------------------------------
......@@ -560,7 +560,7 @@ function FrozenPlace(ws, type) {
_this.restore(canvas.shapeCtx);
};
_this.setTransform = function(shapeCtx, shapeOverlayCtx, autoShapeTrack) {
_this.setTransform = function(shapeCtx, shapeOverlayCtx, autoShapeTrack, trackOverlay) {
if ( shapeCtx && shapeOverlayCtx && autoShapeTrack ) {
......@@ -580,6 +580,15 @@ function FrozenPlace(ws, type) {
autoShapeTrack.Graphics.CalculateFullTransform();
_this.worksheet.objectRender.controller.recalculateCurPos();
}
if(trackOverlay && trackOverlay.m_oHtmlPage)
{
var width = trackOverlay.m_oHtmlPage.drawingPage.right - trackOverlay.m_oHtmlPage.drawingPage.left;
var height = trackOverlay.m_oHtmlPage.drawingPage.bottom - trackOverlay.m_oHtmlPage.drawingPage.top;
trackOverlay.m_oHtmlPage.drawingPage.left = x;
trackOverlay.m_oHtmlPage.drawingPage.top = y;
trackOverlay.m_oHtmlPage.drawingPage.right = x + width;
trackOverlay.m_oHtmlPage.drawingPage.bottom = y + height;
}
};
// Range constructor
......@@ -682,7 +691,7 @@ DrawingArea.prototype.drawSelection = function(drawingDocument) {
}
for ( var i = 0; i < this.frozenPlaces.length; i++ ) {
this.frozenPlaces[i].setTransform(shapeCtx, shapeOverlayCtx, autoShapeTrack);
this.frozenPlaces[i].setTransform(shapeCtx, shapeOverlayCtx, autoShapeTrack, trackOverlay);
// Clip
this.frozenPlaces[i].clip(shapeOverlayCtx);
......
This diff is collapsed.
/*
*
* (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.
*
*/
/*
*
* (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";
var BOUNDS_DELTA = 3;
......@@ -3829,7 +3829,7 @@ CShape.prototype =
{
var clip_rect = this.clipRect;
var oBodyPr = this.getBodyPr();
if(!oBodyPr || oBodyPr.upright)
if(!oBodyPr || !oBodyPr.upright)
{
graphics.transform3(this.transform);
graphics.AddClipRect(clip_rect.x, clip_rect.y, clip_rect.w, clip_rect.h);
......
......@@ -4737,7 +4737,10 @@ function _downloadAs(editor, filetype, actionType, options)
oAdditionalData["vkey"] = editor.documentVKey;
oAdditionalData["outputformat"] = filetype;
oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype));
oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
if (DownloadType.Print === options.downloadType) {
oAdditionalData["inline"] = 1;
}
if(c_oAscFileType.PDF == filetype)
{
var dd = editor.WordControl.m_oDrawingDocument;
......
......@@ -6733,6 +6733,9 @@ function _downloadAs(editor, command, filetype, actionType, options, fCallbackRe
oAdditionalData["outputformat"] = filetype;
oAdditionalData["title"] = changeFileExtention(editor.documentTitle, getExtentionByFormat(filetype));
oAdditionalData["savetype"] = c_oAscSaveTypes.CompleteAll;
if (DownloadType.Print === options.downloadType) {
oAdditionalData["inline"] = 1;
}
if (options.isNoData) {
;//nothing
} else if (null == options.oDocumentMailMerge && c_oAscFileType.PDF === filetype) {
......
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