pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 06:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/bugfix' (#241) from fix/bugfix into release/v8.3.0

Browse Source
This commit is contained in:
Julia Radzhabova
2025-01-22 16:10:33 +00:00
parent 7a7b31707e 6b8838644d
commit cf6b4387cf
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/main/lib/util/LanguageInfo.js
View File

@ -440,8 +440,7 @@ Common.util.LanguageInfo = new(function() {
0x0431 : ["ts-ZA", "Tsonga (South Africa)", "Tsonga (South Africa)"],
0x0433 : ["ven-ZA", "South Africa", "South Africa"],
0x0092 : ["ku", "Central Kurdish"],
0x7C92 : ["ku-Arab", "Central Kurdish", "Central Kurdish"],
0x0492 : ["ku-Arab-IQ", "Central Kurdish (Iraq)", "Central Kurdish (Iraq)"]
0x7C92 : ["ku-Arab", "کوردیی ناوەندی", "Central Kurdish"]
};
return {

2
apps/documenteditor/main/app/controller/RightMenu.js
View File

@ -247,7 +247,7 @@ define([
}
}
if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // если находимся в locked header/footer, то считаем, что все элементы в нем тоже недоступны
if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // all elements are locked if header/footer is locked
for (i=0; i<this._settings.length; i++) {
if (this._settings[i])
this._settings[i].locked = true;

2
apps/presentationeditor/main/app/controller/RightMenu.js
View File

@ -174,7 +174,7 @@ define([
}
}
if ( this._settings[Common.Utils.documentSettingsType.Slide].locked ) { // если находимся в locked slide, то считаем, что все элементы в нем тоже недоступны
if ( this._settings[Common.Utils.documentSettingsType.Slide].locked ) { // all elements are locked if the slide is locked
for (i=0; i<this._settings.length; i++) {
if (this._settings[i])
this._settings[i].locked = true;

1
apps/presentationeditor/main/app/controller/Toolbar.js
View File

@ -2784,6 +2784,7 @@ define([
var animationController = me.getApplication().getController('Animation');
animationController.setApi(me.api).setConfig({toolbar: me,mode:config}).createToolbarPanel();
Array.prototype.push.apply(me.toolbar.slideOnlyControls,animationController.getView().getButtons());
me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));