Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #926 from ONLYOFFICE/fix/bug-50447

Browse source 
Fix/bug 50447
This commit is contained in:
Julia Radzhabova 2021-06-18 10:36:14 +03:00 committed by GitHub
parent db70a44d4e a405a14afc
commit fbdaa0e0f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -82,7 +82,7 @@ define([
* UI Components
*/
this.SchemeNames = [
this.SchemeNames = [ this.txtScheme22,
this.txtScheme1, this.txtScheme2, this.txtScheme3, this.txtScheme4, this.txtScheme5,
this.txtScheme6, this.txtScheme7, this.txtScheme8, this.txtScheme9, this.txtScheme10,
this.txtScheme11, this.txtScheme12, this.txtScheme13, this.txtScheme14, this.txtScheme15,
@ -2130,7 +2130,7 @@ define([
schemecolors.push(clr);
}
if (index == 21) {
if (index == 22) {
this.mnuColorSchema.addItem({
caption: '--'
});
@ -2140,7 +2140,7 @@ define([
template: itemTemplate,
cls: 'color-schemas-menu',
colors: schemecolors,
caption: (index < 21) ? (me.SchemeNames[index] || name) : name,
caption: (index < 22) ? (me.SchemeNames[index] || name) : name,
value: index,
checkable: true,
toggleGroup: 'menuSchema'
@ -2471,7 +2471,8 @@ define([
mniCapitalizeWords: 'Capitalize Each Word',
mniToggleCase: 'tOGGLE cASE',
textChangeLevel: 'Change List Level',
mniTextToTable: 'Convert Text to Table'
mniTextToTable: 'Convert Text to Table',
txtScheme22: 'New Office'
}
})(), DE.Views.Toolbar || {}));
});

1
apps/documenteditor/main/locale/en.json
View file

@ -2721,6 +2721,7 @@
"DE.Views.Toolbar.txtScheme2": "Grayscale",
"DE.Views.Toolbar.txtScheme20": "Urban",
"DE.Views.Toolbar.txtScheme21": "Verve",
"DE.Views.Toolbar.txtScheme22": "New Office",
"DE.Views.Toolbar.txtScheme3": "Apex",
"DE.Views.Toolbar.txtScheme4": "Aspect",
"DE.Views.Toolbar.txtScheme5": "Civic",

9
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -104,7 +104,7 @@ define([
me.synchTooltip = undefined;
me.needShowSynchTip = false;
me.SchemeNames = [
me.SchemeNames = [me.txtScheme22,
me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5,
me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10,
me.txtScheme11, me.txtScheme12, me.txtScheme13, me.txtScheme14, me.txtScheme15,
@ -1444,7 +1444,7 @@ define([
schemecolors.push(clr);
}
if (index == 21) {
if (index == 22) {
mnuColorSchema.addItem({
caption: '--'
});
@ -1454,7 +1454,7 @@ define([
template: itemTemplate,
cls: 'color-schemas-menu',
colors: schemecolors,
caption: (index < 21) ? (me.SchemeNames[index] || name) : name,
caption: (index < 22) ? (me.SchemeNames[index] || name) : name,
value: index,
checkable: true,
toggleGroup: 'menuSchema'
@ -1815,7 +1815,8 @@ define([
mniCapitalizeWords: 'Capitalize Each Word',
mniToggleCase: 'tOGGLE cASE',
strMenuNoFill: 'No Fill',
tipHighlightColor: 'Highlight color'
tipHighlightColor: 'Highlight color',
txtScheme22: 'New Office'
}
}()), PE.Views.Toolbar || {}));
});

1
apps/presentationeditor/main/locale/en.json
View file

@ -1988,6 +1988,7 @@
"PE.Views.Toolbar.txtScheme2": "Grayscale",
"PE.Views.Toolbar.txtScheme20": "Urban",
"PE.Views.Toolbar.txtScheme21": "Verve",
"PE.Views.Toolbar.txtScheme22": "New Office",
"PE.Views.Toolbar.txtScheme3": "Apex",
"PE.Views.Toolbar.txtScheme4": "Aspect",
"PE.Views.Toolbar.txtScheme5": "Civic",

9
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -116,7 +116,7 @@ define([
var me = this,
options = {};
me.SchemeNames = [
me.SchemeNames = [me.txtScheme22,
me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5,
me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10,
me.txtScheme11, me.txtScheme12, me.txtScheme13, me.txtScheme14, me.txtScheme15,
@ -2263,7 +2263,7 @@ define([
schemecolors.push(clr);
}
if (index == 21) {
if (index == 22) {
this.mnuColorSchema.addItem({
caption : '--'
});
@ -2273,7 +2273,7 @@ define([
template: itemTemplate,
cls : 'color-schemas-menu',
colors : schemecolors,
caption: (index < 21) ? (me.SchemeNames[index] || name) : name,
caption: (index < 22) ? (me.SchemeNames[index] || name) : name,
value: index,
checkable: true,
toggleGroup: 'menuSchema'
@ -2694,6 +2694,7 @@ define([
textAutoColor: 'Automatic',
textItems: 'Items',
tipInsertSpark: 'Insert sparkline',
capInsertSpark: 'Sparklines'
capInsertSpark: 'Sparklines',
txtScheme22: 'New Office'
}, SSE.Views.Toolbar || {}));
});

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -3329,6 +3329,7 @@
"SSE.Views.Toolbar.txtScheme2": "Grayscale",
"SSE.Views.Toolbar.txtScheme20": "Urban",
"SSE.Views.Toolbar.txtScheme21": "Verve",
"SSE.Views.Toolbar.txtScheme22": "New Office",
"SSE.Views.Toolbar.txtScheme3": "Apex",
"SSE.Views.Toolbar.txtScheme4": "Aspect",
"SSE.Views.Toolbar.txtScheme5": "Civic",