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

Merge pull request #231 from ONLYOFFICE/feature/bug-fix

Browse source 
Feature/bug fix
This commit is contained in:
Julia Radzhabova 2019-08-23 16:00:38 +03:00 committed by GitHub
parent 6fe6b76fef 8a6af205d9
commit e1bf8204b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/common/mobile/lib/controller/Collaboration.js
View file

@ -209,7 +209,10 @@ define([
Common.Utils.addScrollIfNeed('.page[data-page=comments-view]', '.page[data-page=comments-view] .page-content');
} else {
if(editor === 'DE' && !this.appConfig.canReview) {
$('#reviewing-settings').hide();
this.canViewReview = me.api.asc_HaveRevisionsChanges(true);
if (!this.canViewReview) {
$('#reviewing-settings').hide();
}
}
}
},
@ -282,6 +285,11 @@ define([
$('#settings-reject-all').removeClass('disabled');
$('#settings-review').removeClass('disabled');
}
if (!this.appConfig.canReview) {
$('#settings-review').hide();
$('#settings-accept-all').hide();
$('#settings-reject-all').hide();
}
},
onTrackChanges: function(e) {
@ -384,6 +392,10 @@ define([
$('#btn-prev-change').addClass('disabled');
$('#btn-next-change').addClass('disabled');
}
if (!this.appConfig.canReview) {
$('#btn-accept-change').addClass('disabled');
$('#btn-reject-change').addClass('disabled');
}
},
onPrevChange: function() {

12
apps/documenteditor/main/app/view/StyleTitleDialog.js
View file

@ -71,6 +71,7 @@ define([
].join('');
this.options.tpl = _.template(this.template)(this.options);
this.options.formats = this.options.formats || [];
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -100,6 +101,7 @@ define([
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.options.formats.unshift({value: -1, displayValue: this.txtSameAs});
this.cmbNextStyle = new Common.UI.ComboBox({
el : $('#id-dlg-style-next-par'),
style : 'width: 100%;',
@ -109,8 +111,7 @@ define([
data : this.options.formats,
disabled : (this.options.formats.length==0)
});
if (this.options.formats.length>0)
this.cmbNextStyle.setValue(this.options.formats[0].value);
this.cmbNextStyle.setValue(-1);
},
show: function() {
@ -128,8 +129,8 @@ define([
},
getNextStyle: function () {
var me = this;
return (me.options.formats.length>0) ? me.cmbNextStyle.getValue() : null;
var val = this.cmbNextStyle.getValue();
return (val!=-1) ? val : null;
},
onBtnClick: function(event) {
@ -161,7 +162,8 @@ define([
textHeader: 'Create New Style',
txtEmpty: 'This field is required',
txtNotEmpty: 'Field must not be empty',
textNextStyle: 'Next paragraph style'
textNextStyle: 'Next paragraph style',
txtSameAs: 'Same as created new style'
}, DE.Views.StyleTitleDialog || {}))

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

@ -1873,6 +1873,7 @@
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
"DE.Views.StyleTitleDialog.txtSameAs": "Same as created new style",
"DE.Views.TableFormulaDialog.cancelButtonText": "Cancel",
"DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textBookmark": "Paste Bookmark",

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

@ -1873,6 +1873,7 @@
"DE.Views.StyleTitleDialog.textTitle": "Название",
"DE.Views.StyleTitleDialog.txtEmpty": "Это поле необходимо заполнить",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Поле не может быть пустым",
"DE.Views.StyleTitleDialog.txtSameAs": "Такой же, как создаваемый стиль",
"DE.Views.TableFormulaDialog.cancelButtonText": "Отмена",
"DE.Views.TableFormulaDialog.okButtonText": "ОК",
"DE.Views.TableFormulaDialog.textBookmark": "Вставить закладку",

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

@ -557,10 +557,10 @@ define([
if (url.charAt(url.length-1) !== '/') {
url += '/';
}
if (Common.SharedSettings.get('android')) {
url+='mobile-applications/documents/android/index.aspx';
} else if (Common.SharedSettings.get('sailfish')) {
if (Common.SharedSettings.get('sailfish')) {
url+='mobile-applications/documents/sailfish/index.aspx';
} else if (Common.SharedSettings.get('android')) {
url+='mobile-applications/documents/android/index.aspx';
} else {
url+='mobile-applications/documents/index.aspx';
}

6
apps/presentationeditor/mobile/app/view/Settings.js
View file

@ -184,10 +184,10 @@ define([
if (url.charAt(url.length-1) !== '/') {
url += '/';
}
if (Common.SharedSettings.get('android')) {
url+='mobile-applications/documents/android/index.aspx';
} else if (Common.SharedSettings.get('sailfish')) {
if (Common.SharedSettings.get('sailfish')) {
url+='mobile-applications/documents/sailfish/index.aspx';
} else if (Common.SharedSettings.get('android')) {
url+='mobile-applications/documents/android/index.aspx';
} else {
url+='mobile-applications/documents/index.aspx';
}

6
apps/spreadsheeteditor/mobile/app/controller/Settings.js
View file

@ -116,10 +116,10 @@ define([
if (url.charAt(url.length-1) !== '/') {
url += '/';
}
if (Common.SharedSettings.get('android')) {
url+='mobile-applications/documents/android/index.aspx';
} else if (Common.SharedSettings.get('sailfish')) {
if (Common.SharedSettings.get('sailfish')) {
url+='mobile-applications/documents/sailfish/index.aspx';
} else if (Common.SharedSettings.get('android')) {
url+='mobile-applications/documents/android/index.aspx';
} else {
url+='mobile-applications/documents/index.aspx';
}