Commit 2391d7d0 authored by Alexey.Musinov's avatar Alexey.Musinov

Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

* 'develop' of https://github.com/ONLYOFFICE/sdkjs:
  c_oAscBorderStyles add description fix ansi
  export c_oAscBorderStyles
parents e30a886f 2b1a1dc0
...@@ -574,7 +574,11 @@ ...@@ -574,7 +574,11 @@
Medium : 2, // 2px Medium : 2, // 2px
Thick : 3 // 3px Thick : 3 // 3px
}; };
// Располагаются в порядке значимости для отрисовки /** @enum {number} */
/**
* Располагаются в порядке значимости для отрисовки
* @enum {number}
*/
var c_oAscBorderStyles = { var c_oAscBorderStyles = {
None : 0, None : 0,
Double : 1, Double : 1,
...@@ -720,7 +724,7 @@ ...@@ -720,7 +724,7 @@
None : 0, None : 0,
Tab : 1, Tab : 1,
Semicolon : 2, Semicolon : 2,
Сolon : 3, Colon : 3,
Comma : 4, Comma : 4,
Space : 5 Space : 5
}; };
...@@ -865,9 +869,6 @@ ...@@ -865,9 +869,6 @@
}; };
/** @enum {number} */ /** @enum {number} */
var c_oAscMathInterfaceBarPos = { var c_oAscMathInterfaceBarPos = {
Top : 0, Top : 0,
...@@ -912,8 +913,6 @@ ...@@ -912,8 +913,6 @@
Right : 2 Right : 2
}; };
/** @enum {number} */ /** @enum {number} */
var c_oAscMathInterfaceEqArrayAlign = { var c_oAscMathInterfaceEqArrayAlign = {
Top : 0, Top : 0,
...@@ -921,7 +920,6 @@ ...@@ -921,7 +920,6 @@
Bottom : 2 Bottom : 2
}; };
/** @enum {number} */ /** @enum {number} */
var c_oAscMathInterfaceNaryLimitLocation = { var c_oAscMathInterfaceNaryLimitLocation = {
UndOvr : 0, UndOvr : 0,
...@@ -935,7 +933,6 @@ ...@@ -935,7 +933,6 @@
Bottom : 1 Bottom : 1
}; };
var c_oAscEncodings = [ var c_oAscEncodings = [
[0, 28596, "ISO-8859-6", "Arabic (ISO 8859-6)"], [0, 28596, "ISO-8859-6", "Arabic (ISO 8859-6)"],
[1, 720, "DOS-720", "Arabic (OEM 720)"], [1, 720, "DOS-720", "Arabic (OEM 720)"],
...@@ -1420,6 +1417,22 @@ ...@@ -1420,6 +1417,22 @@
prot['Page'] = prot.Page; prot['Page'] = prot.Page;
prot['Paragraph'] = prot.Paragraph; prot['Paragraph'] = prot.Paragraph;
prot['TopMargin'] = prot.TopMargin; prot['TopMargin'] = prot.TopMargin;
window['Asc']['c_oAscPageOrientation'] = window['AscCommon'].c_oAscBorderStyles = c_oAscBorderStyles;
prot = c_oAscPageOrientation;
prot['None'] = prot.None;
prot['Double'] = prot.Double;
prot['Hair'] = prot.Hair;
prot['DashDotDot'] = prot.DashDotDot;
prot['DashDot'] = prot.DashDot;
prot['Dotted'] = prot.Dotted;
prot['Dashed'] = prot.Dashed;
prot['Thin'] = prot.Thin;
prot['MediumDashDotDot'] = prot.MediumDashDotDot;
prot['SlantDashDot'] = prot.SlantDashDot;
prot['MediumDashDot'] = prot.MediumDashDot;
prot['MediumDashed'] = prot.MediumDashed;
prot['Medium'] = prot.Medium;
prot['Thick'] = prot.Thick;
window['Asc']['c_oAscPageOrientation'] = window['Asc'].c_oAscPageOrientation = c_oAscPageOrientation; window['Asc']['c_oAscPageOrientation'] = window['Asc'].c_oAscPageOrientation = c_oAscPageOrientation;
prot = c_oAscPageOrientation; prot = c_oAscPageOrientation;
prot['PagePortrait'] = prot.PagePortrait; prot['PagePortrait'] = prot.PagePortrait;
...@@ -1641,7 +1654,6 @@ ...@@ -1641,7 +1654,6 @@
window["AscCommon"].c_oAscSizeRelFromV = c_oAscSizeRelFromV; window["AscCommon"].c_oAscSizeRelFromV = c_oAscSizeRelFromV;
window["AscCommon"].c_oAscWrapStyle = c_oAscWrapStyle; window["AscCommon"].c_oAscWrapStyle = c_oAscWrapStyle;
window["AscCommon"].c_oAscBorderWidth = c_oAscBorderWidth; window["AscCommon"].c_oAscBorderWidth = c_oAscBorderWidth;
window["AscCommon"].c_oAscBorderStyles = c_oAscBorderStyles;
window["AscCommon"].c_oAscBorderType = c_oAscBorderType; window["AscCommon"].c_oAscBorderType = c_oAscBorderType;
window["AscCommon"].c_oAscLockTypes = c_oAscLockTypes; window["AscCommon"].c_oAscLockTypes = c_oAscLockTypes;
window["AscCommon"].c_oAscFormatPainterState = c_oAscFormatPainterState; window["AscCommon"].c_oAscFormatPainterState = c_oAscFormatPainterState;
...@@ -1971,7 +1983,7 @@ ...@@ -1971,7 +1983,7 @@
_object["variations"].push(this.variations[i].serialize()); _object["variations"].push(this.variations[i].serialize());
} }
return _object; return _object;
} };
CPlugin.prototype["deserialize"] = function(_object) CPlugin.prototype["deserialize"] = function(_object)
{ {
this.name = (_object["name"] != null) ? _object["name"] : this.name; this.name = (_object["name"] != null) ? _object["name"] : this.name;
...@@ -1984,7 +1996,7 @@ ...@@ -1984,7 +1996,7 @@
_variation["deserialize"](_object["variations"][i]); _variation["deserialize"](_object["variations"][i]);
this.variations.push(_variation); this.variations.push(_variation);
} }
} };
window["Asc"]["CPluginVariation"] = window["Asc"].CPluginVariation = CPluginVariation; window["Asc"]["CPluginVariation"] = window["Asc"].CPluginVariation = CPluginVariation;
window["Asc"]["CPlugin"] = window["Asc"].CPlugin = CPlugin; window["Asc"]["CPlugin"] = window["Asc"].CPlugin = CPlugin;
......
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