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

Merge pull request #22 from ONLYOFFICE/release/v4.1.0

Browse source 
Release/v4.1.0
This commit is contained in:
Julia Radzhabova 2016-08-30 13:33:22 +03:00 committed by GitHub
parent 59bac2b215 5779ec35eb
commit 01134f7d20
4 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -922,7 +922,7 @@ define([
onEditorPermissions: function(params) { onEditorPermissions: function(params) {
var licType = params.asc_getLicenseType(); var licType = params.asc_getLicenseType();
if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType || Asc.c_oLicenseResult.ExpiredTrial === licType) {
Common.UI.warning({ Common.UI.warning({
title: this.titleLicenseExp, title: this.titleLicenseExp,
msg: this.warnLicenseExp, msg: this.warnLicenseExp,

10
apps/documenteditor/mobile/index.html.deploy
View file

@ -53,16 +53,6 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.loader-page-text {
display: inline-block;
font-size: 14px;
margin-left: 80px;
margin-top: 125px;
color: #888;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
line-height: 20px;
}
.romb { .romb {
width: 40px; width: 40px;
height: 40px; height: 40px;

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -713,7 +713,7 @@ define([
onEditorPermissions: function(params) { onEditorPermissions: function(params) {
var licType = params.asc_getLicenseType(); var licType = params.asc_getLicenseType();
if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType || Asc.c_oLicenseResult.ExpiredTrial === licType) {
Common.UI.warning({ Common.UI.warning({
title: this.titleLicenseExp, title: this.titleLicenseExp,
msg: this.warnLicenseExp, msg: this.warnLicenseExp,

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -736,7 +736,7 @@ define([
var licType = params ? params.asc_getLicenseType() : Asc.c_oLicenseResult.Error; var licType = params ? params.asc_getLicenseType() : Asc.c_oLicenseResult.Error;
if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) { if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) {
if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType || Asc.c_oLicenseResult.ExpiredTrial === licType) {
Common.UI.warning({ Common.UI.warning({
title: this.titleLicenseExp, title: this.titleLicenseExp,
msg: this.warnLicenseExp, msg: this.warnLicenseExp,