Merge pull request 'fix/bugfix' (#46) from fix/bugfix into release/v8…

….2.0
ONLYOFFICE · Sep 26, 2024 · 70c9fce · 70c9fce
2 parents fae7147 + ea03200
commit 70c9fce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js
@@ -398,7 +398,7 @@ Common.util.LanguageInfo = new(function() {
         0x0420 : ["ur-PK", "اُردو (پاکستان)‏", "Urdu (Islamic Republic of Pakistan)"],
         0x0820 : ["ur-IN", "اُردو (بھارت)‏", "Urdu (India)"],
         0x0080 : ["ug", "ئۇيغۇر يېزىقى‏"],
-        0x0480 : ["ug-CN", "(ئۇيغۇر يېزىقى (جۇڭخۇا خەلق جۇمھۇرىيىتى‏", "Uighur (People's Republic of China)"],
+        0x0480 : ["ug-CN", "ئۇيغۇر يېزىقى (جۇڭخۇا خەلق جۇمھۇرىيىتى)‏", "Uighur (People's Republic of China)"],
         0x7843 : ["uz-Cyrl", "Ўзбек"],
         0x0843 : ["uz-Cyrl-UZ", "Ўзбек (Ўзбекистон)", "Uzbek (Cyrillic, Uzbekistan)"],
         0x0043 : ["uz", "U'zbek"],

diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
@@ -827,6 +827,8 @@ define([
             },
 
             getPanel: function (role, config) {
+                !appConfig && (appConfig = config);
+
                 var me = this;
 
                 function createTitleButton(iconid, slot, disabled, hintDirection, hintOffset, hintTitle, lock) {
@@ -1108,6 +1110,8 @@ define([
             },
 
             changeLogo: function () {
+                if (!appConfig) return;
+
                 var value = this.branding;
                 var logo = this.getSuitableLogo(value, appConfig, Common.Utils.InternalSettings.get("settings-tab-style"), Common.Utils.InternalSettings.get("settings-tab-background"));
                 $('#header-logo').toggleClass('logo-light', logo.isLight);

diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js
@@ -649,9 +649,10 @@ define([
                 var nodeType = effect[0] === AscFormat.NODE_TYPE_CLICKEFFECT ? this.view.textStartOnClick :
                     (effect[0] === AscFormat.NODE_TYPE_WITHEFFECT ? this.view.textStartWithPrevious :
                         (effect[0] === AscFormat.NODE_TYPE_AFTEREFFECT ? this.view.textStartAfterPrevious : ''));
-                var presetClass = _.findWhere(Common.define.effectData.getEffectGroupData(), {value: effect[1]});
+                var presetClass = _.findWhere(Common.define.effectData.getEffectGroupData(), {value: effect[1]}),
+                    presetId = presetClass ? presetClass.id : '';
                 presetClass = presetClass ? presetClass.caption : '';
-                var preset = _.findWhere(Common.define.effectData.getEffectData(), {value: effect[2]});
+                var preset = _.findWhere(Common.define.effectData.getEffectFullData(), {group: presetId, value: effect[2]});
                 preset = preset ? preset.displayValue : '';
                 var name = Common.Utils.String.htmlEncode(effect[3]) || '';
                 result = nodeType + '\n' + presetClass + '\n' + preset + ' : ' + name;