Skip to content

S
sdkjs
Commit addf5e1a authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options

В asc_CBorder убрал ненужный параметр width (в Excel нет понятия ширины бордера, есть только стиль) 

ToDo заглушка на время, пока уберут код в меню (в конструкторе)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50923 954022d7-b5bf-4e40-9824-e11837661b57
parent a27a5bf9
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 33 deletions
Excel/Spreadsheet.html.deploy
View file @ addf5e1a
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
var g = Math.floor(Math.random() * 255); var g = Math.floor(Math.random() * 255);
var b = Math.floor(Math.random() * 255); var b = Math.floor(Math.random() * 255);
val = []; val = [];
val[t] = new window.Asc.asc_CBorder(null, "thick", "rgb("+r+","+g+","+b+")"); val[t] = new window.Asc.asc_CBorder("thick", "rgb("+r+","+g+","+b+")");
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
}); });
$("#copyws").click(function(){ $("#copyws").click(function(){
......
Excel/menu/menu.js
View file @ addf5e1a
...@@ -1089,55 +1089,55 @@ ...@@ -1089,55 +1089,55 @@
} }
case "1":{ case "1":{
val = []; val = [];
val[c_oAscBorderOptions.Left] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Left] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
case "4":{ case "4":{
val = []; val = [];
val[c_oAscBorderOptions.Top] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Top] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
case "16":{ case "16":{
val = []; val = [];
val[c_oAscBorderOptions.Right] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Right] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
case "64":{ case "64":{
val = []; val = [];
val[c_oAscBorderOptions.Bottom] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Bottom] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
case "85":{ case "85":{
val = []; val = [];
val[c_oAscBorderOptions.Left] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Left] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
val[c_oAscBorderOptions.Top] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Top] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
val[c_oAscBorderOptions.Right] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Right] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
val[c_oAscBorderOptions.Bottom] = new window.Asc.asc_CBorder(0, "thin", Asc.numberToAscColor(Asc.parseColor("#000").binary)); val[c_oAscBorderOptions.Bottom] = new window.Asc.asc_CBorder("thin", Asc.numberToAscColor(Asc.parseColor("#000").binary));
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
case "170":{ case "170":{
val = []; val = [];
val[c_oAscBorderOptions.Left] = new window.Asc.asc_CBorder(0, "thick", "#000"); val[c_oAscBorderOptions.Left] = new window.Asc.asc_CBorder("thick", "#000");
val[c_oAscBorderOptions.Top] = new window.Asc.asc_CBorder(0, "thick", "#000"); val[c_oAscBorderOptions.Top] = new window.Asc.asc_CBorder("thick", "#000");
val[c_oAscBorderOptions.Right] = new window.Asc.asc_CBorder(0, "thick", "#000"); val[c_oAscBorderOptions.Right] = new window.Asc.asc_CBorder("thick", "#000");
val[c_oAscBorderOptions.Bottom] = new window.Asc.asc_CBorder(0, "thick", "#000"); val[c_oAscBorderOptions.Bottom] = new window.Asc.asc_CBorder("thick", "#000");
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
case "324":{ case "324":{
val = []; val = [];
val[c_oAscBorderOptions.DiagD] = new window.Asc.asc_CBorder(0, "thin", "#000"); val[c_oAscBorderOptions.DiagD] = new window.Asc.asc_CBorder("thin", "#000");
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
case "341":{ case "341":{
val = []; val = [];
val[c_oAscBorderOptions.DiagU] = new window.Asc.asc_CBorder(0, "thin", "#000"); val[c_oAscBorderOptions.DiagU] = new window.Asc.asc_CBorder("thin", "#000");
api.asc_setCellBorders(val); api.asc_setCellBorders(val);
break; break;
} }
......
Excel/model/CellInfo.js
View file @ addf5e1a
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
asc_getLockText: function() { return this.lockText; } asc_getLockText: function() { return this.lockText; }
}; };
window["Asc"].asc_CCellFlag = asc_CCellFlag; window["Asc"].asc_CCellFlag = window["Asc"]["asc_CCellFlag"] = asc_CCellFlag;
window["Asc"]["asc_CCellFlag"] = asc_CCellFlag;
prot = asc_CCellFlag.prototype; prot = asc_CCellFlag.prototype;
prot["asc_getMerge"] = prot.asc_getMerge; prot["asc_getMerge"] = prot.asc_getMerge;
...@@ -59,8 +58,7 @@ ...@@ -59,8 +58,7 @@
asc_getColor: function () { return this.color; } asc_getColor: function () { return this.color; }
}; };
window["Asc"].asc_CFont = asc_CFont; window["Asc"].asc_CFont = window["Asc"]["asc_CFont"] = asc_CFont;
window["Asc"]["asc_CFont"] = asc_CFont;
prot = asc_CFont.prototype; prot = asc_CFont.prototype;
prot["asc_getName"] = prot.asc_getName; prot["asc_getName"] = prot.asc_getName;
...@@ -81,29 +79,30 @@ ...@@ -81,29 +79,30 @@
asc_getColor: function() { return this.color; } asc_getColor: function() { return this.color; }
}; };
window["Asc"].asc_CFill = asc_CFill; window["Asc"].asc_CFill = window["Asc"]["asc_CFill"] = asc_CFill;
window["Asc"]["asc_CFill"] = asc_CFill;
prot = asc_CFill.prototype; prot = asc_CFill.prototype;
prot["asc_getColor"] = prot.asc_getColor; prot["asc_getColor"] = prot.asc_getColor;
function asc_CBorder(width, style, color) { function asc_CBorder(style, color) {
this.width = width !== undefined ? width : null; if (3 === arguments.length) {
this.style = style !== undefined ? style : "none"; // ToDo заглушка на время, пока уберут код в меню
this.color = color !== undefined ? color : null; this.style = arguments[1] !== undefined ? arguments[1] : "none";
this.color = arguments[2] !== undefined ? arguments[2] : null;
} else {
this.style = style !== undefined ? style : "none";
this.color = color !== undefined ? color : null;
}
} }
asc_CBorder.prototype = { asc_CBorder.prototype = {
asc_getWidth: function() { return this.width; },
asc_getStyle: function() { return this.style; }, asc_getStyle: function() { return this.style; },
asc_getColor: function() { return this.color; } asc_getColor: function() { return this.color; }
}; };
window["Asc"].asc_CBorder = asc_CBorder; window["Asc"].asc_CBorder = window["Asc"]["asc_CBorder"] = asc_CBorder;
window["Asc"]["asc_CBorder"] = asc_CBorder;
prot = asc_CBorder.prototype; prot = asc_CBorder.prototype;
prot["asc_getWidth"] = prot.asc_getWidth;
prot["asc_getStyle"] = prot.asc_getStyle; prot["asc_getStyle"] = prot.asc_getStyle;
prot["asc_getColor"] = prot.asc_getColor; prot["asc_getColor"] = prot.asc_getColor;
...@@ -125,8 +124,7 @@ ...@@ -125,8 +124,7 @@
asc_getDiagUp: function() { return this.diagUp; } asc_getDiagUp: function() { return this.diagUp; }
}; };
window["Asc"].asc_CBorders = asc_CBorders; window["Asc"].asc_CBorders = window["Asc"]["asc_CBorders"] = asc_CBorders;
window["Asc"]["asc_CBorders"] = asc_CBorders;
prot = asc_CBorders.prototype; prot = asc_CBorders.prototype;
prot["asc_getLeft"] = prot.asc_getLeft; prot["asc_getLeft"] = prot.asc_getLeft;
...@@ -176,8 +174,7 @@ ...@@ -176,8 +174,7 @@
asc_getAngle: function () { return this.angle; } asc_getAngle: function () { return this.angle; }
}; };
window["Asc"].asc_CCellInfo = asc_CCellInfo; window["Asc"].asc_CCellInfo = window["Asc"]["asc_CCellInfo"] = asc_CCellInfo;
window["Asc"]["asc_CCellInfo"] = asc_CCellInfo;
prot = asc_CCellInfo.prototype; prot = asc_CCellInfo.prototype;
prot["asc_getName"] = prot.asc_getName; prot["asc_getName"] = prot.asc_getName;
......
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