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

Release/v4.1.0

apps/documenteditor/main/app/controller/Main.js

@@ -922,7 +922,7 @@ define([
 
             onEditorPermissions: function(params) {
                 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({
                         title: this.titleLicenseExp,
                         msg: this.warnLicenseExp,

apps/documenteditor/mobile/index.html.deploy

@@ -53,16 +53,6 @@
                 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 {
                 width: 40px;
                 height: 40px;

apps/presentationeditor/main/app/controller/Main.js

@@ -713,7 +713,7 @@ define([
 
             onEditorPermissions: function(params) {
                 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({
                         title: this.titleLicenseExp,
                         msg: this.warnLicenseExp,

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -736,7 +736,7 @@ define([
                 var licType = params ? params.asc_getLicenseType() : Asc.c_oLicenseResult.Error;
 
                 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({
                             title: this.titleLicenseExp,
                             msg: this.warnLicenseExp,