Skip to content

S
sdkjs
Commit d91d0e85 authored by Alexey Golubev's avatar Alexey Golubev
Browse files
Options

Merge

parents 137dac32 ee6078a5
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 34 deletions
Makefile
View file @ d91d0e85
......@@ -4,6 +4,9 @@ GRUNT_FLAGS = --no-color -v
OUTPUT_DIR = deploy
OUTPUT = $(OUTPUT_DIR)
COMPANY_NAME ?= onlyoffice
PRODUCT_NAME ?= documentserver
PRODUCT_VERSION ?= 0.0.0
BUILD_NUMBER ?= 0
......@@ -12,7 +15,7 @@ GRUNT_ENV += BUILD_NUMBER=$(BUILD_NUMBER)
WEBAPPS_DIR = web-apps
ifeq ($(PRODUCT_NAME),documentserver-integration)
ifeq ($(PRODUCT_NAME),$(filter $(PRODUCT_NAME),documentserver-integration documentserver-enterprise))
WEBAPPS_DIR = web-apps-pro
endif
......
build/build-mobile.command
View file @ d91d0e85
#!/bin/bash
PRODUCT_VERSION="5.0.1"
BUILD_NUMBER="42"
PRODUCT_VERSION="5.0.2"
BUILD_NUMBER="12"
echo "----------------------------------------"
echo "Building for mobile"
......
cell/native/native.js
View file @ d91d0e85
......@@ -7652,25 +7652,15 @@ window["Asc"]["spreadsheet_api"].prototype.openDocument = function(sData) {
//console.log("JS - openDocument()");
t.wbModel = t._openDocument(sData);
t.wb = new AscCommonExcel.WorkbookView(t.wbModel, t.controller, t.handlers,
var thenCallback = function() {
t.wb = new AscCommonExcel.WorkbookView(t.wbModel, t.controller, t.handlers,
window["_null_object"], window["_null_object"], t,
t.collaborativeEditing, t.fontRenderingMode);
t.openDocumentFromZip(t.wbModel, AscCommon.g_oDocumentUrls.getUrl('Editor.xlsx')).then(function() {
t.FontLoader.LoadDocumentFonts(t.wbModel.generateFontMap2());
// Какая-то непонятная заглушка, чтобы не падало в ipad
if (t.isMobileVersion) {
AscCommon.AscBrowser.isSafariMacOs = false;
AscCommon.PasteElementsId.PASTE_ELEMENT_ID = "wrd_pastebin";
AscCommon.PasteElementsId.ELEMENT_DISPAY_STYLE = "none";
}
}).catch(function(err) {
if (window.console && window.console.log) {
window.console.log(err);
}
t.sendEvent('asc_onError', c_oAscError.ID.Unknown, c_oAscError.Level.Critical);
});
};
t.openDocumentFromZip(t.wbModel, undefined, window["native"]["GetXlsxPath"]()).then(thenCallback, thenCallback);
t.DocumentLoadComplete = true;
if (!sdkCheck) {
......
slide/Drawing/DrawingDocument.js
View file @ d91d0e85
......@@ -3616,10 +3616,7 @@ function CThumbnailsManager()
if (oThis.m_oWordControl)
oThis.m_oWordControl.m_oApi.checkLastWork();
if (e.preventDefault)
e.preventDefault();
else
e.returnValue = false;
AscCommon.stopEvent(e);
if (AscCommon.g_inputContext && AscCommon.g_inputContext.externalChangeFocus())
return;
......@@ -4015,19 +4012,23 @@ function CThumbnailsManager()
oThis.m_oWordControl.m_oScrollThumbApi.scrollByY(45);
}
this.onMouseUp = function(e)
this.onMouseUp = function(e, bIsWindow)
{
if (oThis.m_oWordControl)
oThis.m_oWordControl.m_oApi.checkLastWork();
var _oldSender = global_mouseEvent.Sender;
AscCommon.check_MouseUpEvent(e);
global_mouseEvent.UnLockMouse();
var control = oThis.m_oWordControl.m_oThumbnails.HtmlElement;
if (global_mouseEvent.Sender != control)
{
// такого быть не должно
return;
if (_oldSender != control || true !== bIsWindow)
{
// такого быть не должно
return;
}
}
oThis.CheckNeedAnimateScrolls(-1);
......@@ -4081,6 +4082,8 @@ function CThumbnailsManager()
oThis.MouseDownTrackX = -1;
oThis.MouseDownTrackY = -1;
oThis.MouseDownTrackPosition = -1;
oThis.onMouseMove(e);
}
this.onMouseLeave = function(e)
......
slide/Drawing/HtmlPage.js
View file @ d91d0e85
......@@ -1787,7 +1787,7 @@ function CEditorPage(api)
else
{
Splitter.style.left = parseInt((this.Splitter1Pos + GlobalSkin.SplitterWidthMM) * g_dKoef_mm_to_pix) + "px";
Splitter.style.top = this.Height - parseInt((this.Splitter2Pos + GlobalSkin.SplitterWidthMM) * g_dKoef_mm_to_pix) + "px";
Splitter.style.top = (this.Height - parseInt((this.Splitter2Pos + GlobalSkin.SplitterWidthMM) * g_dKoef_mm_to_pix) + 1) + "px";
Splitter.style.width = this.Width - parseInt((this.Splitter1Pos + GlobalSkin.SplitterWidthMM) * g_dKoef_mm_to_pix) + "px";
Splitter.style.height = parseInt(GlobalSkin.SplitterWidthMM * g_dKoef_mm_to_pix) + "px";
this.SplitterType = 2;
......@@ -1850,7 +1850,7 @@ function CEditorPage(api)
if (_isCatch)
{
if (oWordControl.m_oApi.isReporterMode && oWordControl.m_oMainParent && oWordControl.m_oMainParent.HtmlElement)
if (oWordControl.m_oMainParent && oWordControl.m_oMainParent.HtmlElement)
oWordControl.m_oMainParent.HtmlElement.style.pointerEvents = "none";
AscCommon.stopEvent(e);
}
......@@ -2008,7 +2008,7 @@ function CEditorPage(api)
var oWordControl = oThis;
oWordControl.m_oDrawingDocument.UnlockCursorType();
if (oWordControl.m_oApi.isReporterMode && oWordControl.m_oMainParent && oWordControl.m_oMainParent.HtmlElement)
if (oWordControl.m_oMainParent && oWordControl.m_oMainParent.HtmlElement)
oWordControl.m_oMainParent.HtmlElement.style.pointerEvents = "";
if (null != oWordControl.SplitterDiv)
......
slide/Drawing/Transitions.js
View file @ d91d0e85
......@@ -3429,12 +3429,17 @@ function CDemonstrationManager(htmlpage)
return false;
}
this.onMouseUp = function(e, isAttack)
this.onMouseUp = function(e, isAttack, isFromMainToReporter)
{
if (!oThis.isMouseDown && true !== isAttack)
return;
if (AscCommon.global_mouseEvent.IsLocked)
AscCommon.global_mouseEvent.IsLocked = false;
oThis.isMouseDown = false;
if (isFromMainToReporter && oThis.PointerDiv && oThis.HtmlPage.m_oApi.isReporterMode)
oThis.PointerRemove();
if (oThis.PointerDiv && oThis.HtmlPage.m_oApi.isReporterMode)
{
......
slide/api.js
View file @ d91d0e85
......@@ -6150,7 +6150,7 @@ background-repeat: no-repeat;\
}
else if (undefined !== _obj["mouseUp"])
{
_this.WordControl.DemonstrationManager.onMouseUp({}, true);
_this.WordControl.DemonstrationManager.onMouseUp({}, true, true);
}
else if (undefined !== _obj["mouseWhell"])
{
......
word/api.js
View file @ d91d0e85
......@@ -245,6 +245,10 @@
{
this["recordTo"] = obj.recordTo;
}
if (typeof obj.isJson != 'undefined')
{
this["isJson"] = obj.isJson;
}
}
else
{
......@@ -258,6 +262,7 @@
this["recordTo"] = null;
this["recordCount"] = null;
this["userId"] = null;
this["isJson"] = null;
}
}
......@@ -341,6 +346,14 @@
{
this["userId"] = v;
};
CMailMergeSendData.prototype.get_IsJson = function()
{
return this["isJson"]
};
CMailMergeSendData.prototype.put_IsJson = function(v)
{
this["isJson"] = v;
};
function CAscFootnotePr(obj)
{
......@@ -6911,6 +6924,7 @@ background-repeat: no-repeat;\
// Меняем тип состояния (на сохранение)
this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Save;
var isNoBase64 = typeof ArrayBuffer !== 'undefined';
var _fCallbackRequest = fCallbackRequest;
var dataContainer = {data : null, part : null, index : 0, count : 0};
var oAdditionalData = {};
......@@ -7020,7 +7034,19 @@ background-repeat: no-repeat;\
aRowOut.push(oRow[j]);
aJsonOut.push(aRowOut);
}
dataContainer.data = dataContainer.data.length + ';' + dataContainer.data + JSON.stringify(aJsonOut);
var editorData = dataContainer.data;
dataContainer.data = JSON.stringify(aJsonOut);
options.oMailMergeSendData.put_IsJson(true);
//save Editor.bin after json
_fCallbackRequest = function(incomeObject){
oAdditionalData["savekey"] = incomeObject["data"];
dataContainer = {data : editorData, part : null, index : 0, count : 0};
options.oMailMergeSendData.put_IsJson(false);
AscCommon.saveWithParts(function(fCallback1, oAdditionalData1, dataContainer1) {
sendCommand(t, fCallback1, oAdditionalData1, dataContainer1);
}, fCallback, fCallbackRequest, oAdditionalData, dataContainer);
}
}
var fCallback = null;
if (!options.isNoCallback)
......@@ -7070,7 +7096,7 @@ background-repeat: no-repeat;\
AscCommon.saveWithParts(function(fCallback1, oAdditionalData1, dataContainer1)
{
sendCommand(t, fCallback1, oAdditionalData1, dataContainer1);
}, fCallback, fCallbackRequest, oAdditionalData, dataContainer);
}, fCallback, _fCallbackRequest, oAdditionalData, dataContainer);
}
// Вставка диаграмм
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7