Commit 651a978d authored by Oleg Korshul's avatar Oleg Korshul

.

parent 916cbdcb
...@@ -2662,7 +2662,7 @@ function cff_size_done(cffsize) ...@@ -2662,7 +2662,7 @@ function cff_size_done(cffsize)
var internal = cffsize.internal; var internal = cffsize.internal;
if (internal != null) if (internal != null)
{ {
var funcs = cff_size_get_globals_funcs(size); var funcs = cff_size_get_globals_funcs(cffsize);
if (funcs != null) if (funcs != null)
{ {
funcs.destroy(internal.topfont); funcs.destroy(internal.topfont);
...@@ -3152,7 +3152,7 @@ function cff_face_init(stream, face, face_index, num_params, params) ...@@ -3152,7 +3152,7 @@ function cff_face_init(stream, face, face_index, num_params, params)
var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name); var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name);
/* do we have a `/FontName' for a CID-keyed font? */ /* do we have a `/FontName' for a CID-keyed font? */
if (cid_font_name != null) if (cid_font_name != null)
face.family_name = cff_strcpy(memory, cid_font_name); face.family_name = cff_strcpy(face.memory, cid_font_name);
} }
if (style_name != null) if (style_name != null)
...@@ -5820,7 +5820,7 @@ function cff_get_ros(face, registry, ordering, supplement) ...@@ -5820,7 +5820,7 @@ function cff_get_ros(face, registry, ordering, supplement)
ret.supplement = dict.cid_supplement; ret.supplement = dict.cid_supplement;
} }
return error; return ret;
} }
function cff_get_is_cid(face) function cff_get_is_cid(face)
......
...@@ -1554,7 +1554,7 @@ function T1_Get_MM_Var(face) ...@@ -1554,7 +1554,7 @@ function T1_Get_MM_Var(face)
if (error != 0) if (error != 0)
return { err: error, mm : null }; return { err: error, mm : null };
var _num_axis = master.num_axis; var _num_axis = mmaster.num_axis;
mmvar.axis = new Array(_num_axis); mmvar.axis = new Array(_num_axis);
for (var i = 0; i < _num_axis; i++) for (var i = 0; i < _num_axis; i++)
mmvar.axis[i] = new FT_Var_Axis(); mmvar.axis[i] = new FT_Var_Axis();
......
...@@ -33582,12 +33582,12 @@ function cff_size_done(cffsize) ...@@ -33582,12 +33582,12 @@ function cff_size_done(cffsize)
var internal = cffsize.internal; var internal = cffsize.internal;
if (internal != null) if (internal != null)
{ {
var funcs = cff_size_get_globals_funcs(size); var funcs = cff_size_get_globals_funcs(cffsize);
if (funcs != null) if (funcs != null)
{ {
funcs.destroy(internal.topfont); funcs.destroy(internal.topfont);
for (var i = font.num_subfonts; i > 0; i--) for (var i = internal.topfont.num_subfonts; i > 0; i--)
funcs.destroy(internal.subfonts[i - 1]); funcs.destroy(internal.subfonts[i - 1]);
} }
/* `internal' is freed by destroy_size (in ftobjs.c) */ /* `internal' is freed by destroy_size (in ftobjs.c) */
...@@ -34072,7 +34072,7 @@ function cff_face_init(stream, face, face_index, num_params, params) ...@@ -34072,7 +34072,7 @@ function cff_face_init(stream, face, face_index, num_params, params)
var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name); var cid_font_name = cff_index_get_sid_string(cff, dict.cid_font_name);
/* do we have a `/FontName' for a CID-keyed font? */ /* do we have a `/FontName' for a CID-keyed font? */
if (cid_font_name != null) if (cid_font_name != null)
face.family_name = cff_strcpy(memory, cid_font_name); face.family_name = cff_strcpy(face.memory, cid_font_name);
} }
if (style_name != null) if (style_name != null)
...@@ -36740,7 +36740,7 @@ function cff_get_ros(face, registry, ordering, supplement) ...@@ -36740,7 +36740,7 @@ function cff_get_ros(face, registry, ordering, supplement)
ret.supplement = dict.cid_supplement; ret.supplement = dict.cid_supplement;
} }
return error; return ret;
} }
function cff_get_is_cid(face) function cff_get_is_cid(face)
...@@ -38441,7 +38441,7 @@ function T1_Get_MM_Var(face) ...@@ -38441,7 +38441,7 @@ function T1_Get_MM_Var(face)
if (error != 0) if (error != 0)
return { err: error, mm : null }; return { err: error, mm : null };
var _num_axis = master.num_axis; var _num_axis = mmaster.num_axis;
mmvar.axis = new Array(_num_axis); mmvar.axis = new Array(_num_axis);
for (var i = 0; i < _num_axis; i++) for (var i = 0; i < _num_axis; i++)
mmvar.axis[i] = new FT_Var_Axis(); mmvar.axis[i] = new FT_Var_Axis();
...@@ -162,10 +162,10 @@ BinaryCommonWriter.prototype.WriteBorder = function(border) ...@@ -162,10 +162,10 @@ BinaryCommonWriter.prototype.WriteBorder = function(border)
if (null != border.Color) if (null != border.Color)
color = border.Color; color = border.Color;
else if (null != border.Unifill) { else if (null != border.Unifill) {
var doc = editor.WordControl.m_oLogicDocument; var doc = window.editor.WordControl.m_oLogicDocument;
border.Unifill.check(doc.Get_Theme(), doc.Get_ColorMap()); border.Unifill.check(doc.Get_Theme(), doc.Get_ColorMap());
var RGBA = border.Unifill.getRGBAColor(); var RGBA = border.Unifill.getRGBAColor();
color = new AscCommonWord.CDocumentColor(RGBA.R, RGBA.G, RGBA.B); color = new window['AscCommonWord'].CDocumentColor(RGBA.R, RGBA.G, RGBA.B);
} }
if (null != color && !color.Auto) if (null != color && !color.Auto)
this.WriteColor(c_oSerBorderType.Color, color); this.WriteColor(c_oSerBorderType.Color, color);
......
/* * (c) Copyright Ascensio System SIA 2010-2017 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) * version 3 as published by the Free Software Foundation. In accordance with * Section 7(a) of the GNU AGPL 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 * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, * EU, LV-1021. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under * Section 5 of the GNU AGPL version 3. * * Pursuant to Section 7(b) of the License you must retain the original Product * logo when distributing the program. Pursuant to Section 7(e) we decline to * grant you any rights under trademark law for use of our trademarks. * * All the Product's GUI elements, including illustrations and icon sets, as * well as technical writing content are licensed under the terms of the * Creative Commons Attribution-ShareAlike 4.0 International. See the License * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ "use strict"; (/** * @param {Window} window * @param {undefined} undefined */ function(window, undefined) { /** * Класс user для совместного редактирования/просмотра документа * ----------------------------------------------------------------------------- * * @constructor * @memberOf Asc */ function asc_CUser(val) { this.id = null; // уникальный id - пользователя this.idOriginal = null; // уникальный id - пользователя this.userName = null; // имя пользователя this.state = undefined; // состояние (true - подключен, false - отключился) this.indexUser = -1; // Индекс пользователя (фактически равно числу заходов в документ на сервере) this.color = null; // цвет пользователя this.view = false; // просмотр(true), редактор(false) this._setUser(val); return this; } asc_CUser.prototype._setUser = function(val) { if (val) { this.id = val['id']; this.idOriginal = val['idOriginal']; this.userName = val['username']; this.indexUser = val['indexUser']; this.color = AscCommon.getUserColorById(this.idOriginal, this.userName, false, true); this.view = val['view']; } }; asc_CUser.prototype.asc_getId = function() { return this.id; }; asc_CUser.prototype.asc_getUserName = function() { return this.userName; }; asc_CUser.prototype.asc_getFirstName = function() { return this.firstName; }; asc_CUser.prototype.asc_getLastName = function() { return this.lastName; }; asc_CUser.prototype.asc_getState = function() { return this.state; }; asc_CUser.prototype.asc_getColor = function() { return '#' + ('000000' + this.color.toString(16)).substr(-6); }; asc_CUser.prototype.asc_getView = function() { return this.view; }; asc_CUser.prototype.setId = function(val) { this.id = val; }; asc_CUser.prototype.setUserName = function(val) { this.userName = val; }; asc_CUser.prototype.setFirstName = function(val) { this.firstName = val; }; asc_CUser.prototype.setLastName = function(val) { this.lastName = val; }; asc_CUser.prototype.setState = function(val) { this.state = val; }; var ConnectionState = { Reconnect: -1, // reconnect state None: 0, // not initialized WaitAuth: 1, // waiting session id Authorized: 2, // authorized ClosedCoAuth: 3, // closed coauthoring ClosedAll: 4, // closed all SaveChanges: 10, // save AskSaveChanges: 11 // ask save }; var c_oEditorId = { Word:0, Spreadsheet:1, Presentation:2 }; var c_oCloseCode = { serverShutdown: 4001, sessionIdle: 4002, sessionAbsolute: 4003, accessDeny: 4004, jwtExpired: 4005, jwtError: 4006 }; var c_oAscServerCommandErrors = { NoError: 0, DocumentIdError: 1, ParseError: 2, UnknownError: 3, NotModified: 4, UnknownCommand: 5, Token: 6, TokenExpire: 7 }; var c_oAscForceSaveTypes = { Command: 0, Button: 1, Timeout: 2 }; /* * Export * ----------------------------------------------------------------------------- */ var prot; window['AscCommon'] = window['AscCommon'] || {}; window["AscCommon"].asc_CUser = asc_CUser; prot = asc_CUser.prototype; prot["asc_getId"] = prot.asc_getId; prot["asc_getUserName"] = prot.asc_getUserName; prot["asc_getState"] = prot.asc_getState; prot["asc_getColor"] = prot.asc_getColor; prot["asc_getView"] = prot.asc_getView; window["AscCommon"].ConnectionState = ConnectionState; window["AscCommon"].c_oEditorId = c_oEditorId; window["AscCommon"].c_oCloseCode = c_oCloseCode; window["AscCommon"].c_oAscServerCommandErrors = c_oAscServerCommandErrors; window["AscCommon"].c_oAscForceSaveTypes = c_oAscForceSaveTypes; })(window); /* * (c) Copyright Ascensio System SIA 2010-2017 * * This program is a free software product. You can redistribute it and/or * modify it under the terms of the GNU Affero General Public License (AGPL) * version 3 as published by the Free Software Foundation. In accordance with * Section 7(a) of the GNU AGPL 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 * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html * * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, * EU, LV-1021. * * The interactive user interfaces in modified source and object code versions * of the Program must display Appropriate Legal Notices, as required under * Section 5 of the GNU AGPL version 3. * * Pursuant to Section 7(b) of the License you must retain the original Product * logo when distributing the program. Pursuant to Section 7(e) we decline to * grant you any rights under trademark law for use of our trademarks. * * All the Product's GUI elements, including illustrations and icon sets, as * well as technical writing content are licensed under the terms of the * Creative Commons Attribution-ShareAlike 4.0 International. See the License * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ "use strict"; (/** * @param {Window} window * @param {undefined} undefined */ function(window, undefined) { /** * Класс user для совместного редактирования/просмотра документа * ----------------------------------------------------------------------------- * * @constructor * @memberOf Asc */ function asc_CUser(val) { this.id = null; // уникальный id - пользователя this.idOriginal = null; // уникальный id - пользователя this.userName = null; // имя пользователя this.state = undefined; // состояние (true - подключен, false - отключился) this.indexUser = -1; // Индекс пользователя (фактически равно числу заходов в документ на сервере) this.color = null; // цвет пользователя this.view = false; // просмотр(true), редактор(false) this._setUser(val); return this; } asc_CUser.prototype._setUser = function(val) { if (val) { this.id = val['id']; this.idOriginal = val['idOriginal']; this.userName = val['username']; this.indexUser = val['indexUser']; this.color = window['AscCommon'].getUserColorById(this.idOriginal, this.userName, false, true); this.view = val['view']; } }; asc_CUser.prototype.asc_getId = function() { return this.id; }; asc_CUser.prototype.asc_getUserName = function() { return this.userName; }; asc_CUser.prototype.asc_getFirstName = function() { return this.firstName; }; asc_CUser.prototype.asc_getLastName = function() { return this.lastName; }; asc_CUser.prototype.asc_getState = function() { return this.state; }; asc_CUser.prototype.asc_getColor = function() { return '#' + ('000000' + this.color.toString(16)).substr(-6); }; asc_CUser.prototype.asc_getView = function() { return this.view; }; asc_CUser.prototype.setId = function(val) { this.id = val; }; asc_CUser.prototype.setUserName = function(val) { this.userName = val; }; asc_CUser.prototype.setFirstName = function(val) { this.firstName = val; }; asc_CUser.prototype.setLastName = function(val) { this.lastName = val; }; asc_CUser.prototype.setState = function(val) { this.state = val; }; var ConnectionState = { Reconnect: -1, // reconnect state None: 0, // not initialized WaitAuth: 1, // waiting session id Authorized: 2, // authorized ClosedCoAuth: 3, // closed coauthoring ClosedAll: 4, // closed all SaveChanges: 10, // save AskSaveChanges: 11 // ask save }; var c_oEditorId = { Word:0, Spreadsheet:1, Presentation:2 }; var c_oCloseCode = { serverShutdown: 4001, sessionIdle: 4002, sessionAbsolute: 4003, accessDeny: 4004, jwtExpired: 4005, jwtError: 4006 }; var c_oAscServerCommandErrors = { NoError: 0, DocumentIdError: 1, ParseError: 2, UnknownError: 3, NotModified: 4, UnknownCommand: 5, Token: 6, TokenExpire: 7 }; var c_oAscForceSaveTypes = { Command: 0, Button: 1, Timeout: 2 }; /* * Export * ----------------------------------------------------------------------------- */ var prot; window['AscCommon'] = window['AscCommon'] || {}; window["AscCommon"].asc_CUser = asc_CUser; prot = asc_CUser.prototype; prot["asc_getId"] = prot.asc_getId; prot["asc_getUserName"] = prot.asc_getUserName; prot["asc_getState"] = prot.asc_getState; prot["asc_getColor"] = prot.asc_getColor; prot["asc_getView"] = prot.asc_getView; window["AscCommon"].ConnectionState = ConnectionState; window["AscCommon"].c_oEditorId = c_oEditorId; window["AscCommon"].c_oCloseCode = c_oCloseCode; window["AscCommon"].c_oAscServerCommandErrors = c_oAscServerCommandErrors; window["AscCommon"].c_oAscForceSaveTypes = c_oAscForceSaveTypes; })(window);
\ No newline at end of file \ No newline at end of file
......
...@@ -501,7 +501,6 @@ ...@@ -501,7 +501,6 @@
if (window.editor == undefined) if (window.editor == undefined)
{ {
window.editor = this; window.editor = this;
window.editor;
window['editor'] = window.editor; window['editor'] = window.editor;
if (window["NATIVE_EDITOR_ENJINE"]) if (window["NATIVE_EDITOR_ENJINE"])
......
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