Commit ca9a71f2 authored by Alexander.Trofimov's avatar Alexander.Trofimov

Merge branch 'hotfix/v4.3.4' into develop

# Conflicts:
#	cell/api.js
#	slide/api.js
#	word/api.js
parents fcb2bddb bda31d16
......@@ -559,17 +559,6 @@ var editor;
if (this.collaborativeEditing) {
this.collaborativeEditing.setViewerMode(isViewMode);
}
if (false === isViewMode) {
// Отправка стилей
this._sendWorkbookStyles();
if (this.IsSendDocumentLoadCompleate && this.collaborativeEditing) {
// Принимаем чужие изменения
this.collaborativeEditing.applyChanges();
// Пересылаем свои изменения
this.collaborativeEditing.sendChanges();
}
}
};
/*
......
......@@ -10022,7 +10022,12 @@ function CorrectUniColor(asc_color, unicolor, flag)
function builder_CreateLinearGradient(aGradientStop, Angle){
var oUniFill = builder_CreateGradient(aGradientStop);
oUniFill.fill.lin = new AscFormat.GradLin();
oUniFill.fill.lin.angle = Angle;
if(!AscFormat.isRealNumber(Angle)){
oUniFill.fill.lin.angle = 0;
}
else{
oUniFill.fill.lin.angle = Angle;
}
return oUniFill;
}
......
......@@ -2248,14 +2248,7 @@ CUserCacheColor.prototype.init = function(nColor) {
var script = document.createElement('script');
script.type = 'text/javascript';
script.src = url;
script.onreadystatechange = function () {
if (this.readyState === 'complete' || this.readyState === 'loaded') {
script.onreadystatechange = null;
setTimeout(callback, 0);
}
};
script.onload = callback;
script.onload = script.onerror = callback;
// Fire the loading
document.head.appendChild(script);
......
......@@ -5643,12 +5643,6 @@ background-repeat: no-repeat;\
}
else
{
if (this.bInit_word_control === true)
{
AscCommon.CollaborativeEditing.Apply_Changes();
AscCommon.CollaborativeEditing.Release_Locks();
}
this.WordControl.checkNeedRules();
this.WordControl.m_oDrawingDocument.ClearCachePages();
this.WordControl.OnResize(true);
......
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