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

Merge pull request #608 from ONLYOFFICE/fix/bugfix

Browse source 
[DE mobile] Fix Bug 47807
This commit is contained in:
Julia Radzhabova 2020-12-07 13:12:42 +03:00 committed by GitHub
parent 08de23608e dab6db4c98
commit ad3cd5c698
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -555,12 +555,6 @@ define([
var zf = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : 100); var zf = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : 100);
(zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); (zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100));
value = Common.localStorage.getItem("de-show-hiddenchars");
me.api.put_ShowParaMarks((value!==null) ? eval(value) : false);
value = Common.localStorage.getItem("de-show-tableline");
me.api.put_ShowTableEmptyLine((value!==null) ? eval(value) : true);
value = Common.localStorage.getBool("de-mobile-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false)); value = Common.localStorage.getBool("de-mobile-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false));
Common.Utils.InternalSettings.set("de-mobile-spellcheck", value); Common.Utils.InternalSettings.set("de-mobile-spellcheck", value);
me.api.asc_setSpellCheck(value); me.api.asc_setSpellCheck(value);
@ -575,10 +569,10 @@ define([
me.api.SetTextBoxInputMode(Common.localStorage.getBool("de-settings-inputmode")); me.api.SetTextBoxInputMode(Common.localStorage.getBool("de-settings-inputmode"));
value = Common.localStorage.getItem("de-mobile-no-characters"); value = Common.localStorage.getItem("de-mobile-no-characters");
me.api.put_ShowParaMarks((value!==null) ? eval(value) : false); me.api.put_ShowParaMarks(value==='true');
value = Common.localStorage.getItem("de-mobile-hidden-borders"); value = Common.localStorage.getItem("de-mobile-hidden-borders");
me.api.put_ShowTableEmptyLine((value!==null) ? eval(value) : true); me.api.put_ShowTableEmptyLine(value===null || value==='true');
/** coauthoring begin **/ /** coauthoring begin **/
if (me.appOptions.isEdit && me.appOptions.canLicense && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) { if (me.appOptions.isEdit && me.appOptions.canLicense && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) {

5
apps/documenteditor/mobile/app/controller/Settings.js
View file

@ -236,9 +236,10 @@ define([
me.initPageAdvancedSettings(); me.initPageAdvancedSettings();
$('#settings-spellcheck input:checkbox').attr('checked', Common.Utils.InternalSettings.get("de-mobile-spellcheck")); $('#settings-spellcheck input:checkbox').attr('checked', Common.Utils.InternalSettings.get("de-mobile-spellcheck"));
$('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me)); $('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me));
$('#settings-no-characters input:checkbox').attr('checked', (Common.localStorage.getItem("de-mobile-no-characters") == 'true') ? true : false); $('#settings-no-characters input:checkbox').attr('checked', Common.localStorage.getItem("de-mobile-no-characters") === 'true');
$('#settings-no-characters input:checkbox').single('change', _.bind(me.onNoCharacters, me)); $('#settings-no-characters input:checkbox').single('change', _.bind(me.onNoCharacters, me));
$('#settings-hidden-borders input:checkbox').attr('checked', (Common.localStorage.getItem("de-mobile-hidden-borders") == 'true') ? true : false); var value = Common.localStorage.getItem("de-mobile-hidden-borders");
$('#settings-hidden-borders input:checkbox').attr('checked', value===null || value==='true');
$('#settings-hidden-borders input:checkbox').single('change', _.bind(me.onShowTableEmptyLine, me)); $('#settings-hidden-borders input:checkbox').single('change', _.bind(me.onShowTableEmptyLine, me));
$('#settings-orthography').single('click', _.bind(me.onOrthographyCheck, me)); $('#settings-orthography').single('click', _.bind(me.onOrthographyCheck, me));
var displayComments = Common.localStorage.getBool("de-mobile-settings-livecomment", true); var displayComments = Common.localStorage.getBool("de-mobile-settings-livecomment", true);