Added trial and developer mode.

This commit is contained in:
Julia Radzhabova 2017-10-25 17:36:59 +03:00
parent 03890e6403
commit dcf80f9ba0
15 changed files with 28 additions and 15 deletions

View file

@ -191,7 +191,7 @@ define([
if (this.mode.canUseHistory)
this.leftMenu.setOptionsPanel('history', this.getApplication().getController('Common.Controllers.History').getView('Common.Views.History'));
this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode);
Common.util.Shortcuts.resumeEvents();
return this;
@ -203,7 +203,7 @@ define([
this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins'));
} else
this.leftMenu.btnPlugins.hide();
this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode);
},
clickMenuFileItem: function(menu, action, isopts) {

View file

@ -1014,7 +1014,7 @@ define([
this.appOptions.canForcesave = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
this.appOptions.forcesave = this.appOptions.canForcesave;
this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
this.appOptions.isTrial = params.asc_getTrial();
this.appOptions.trialMode = params.asc_getLicenseMode();
if ( this.appOptions.isLightVersion ) {
this.appOptions.canUseHistory =

View file

@ -360,7 +360,7 @@ define([
if ( !this.$el.is(':visible') ) return;
if (!this.developerHint) {
this.developerHint = $('<div id="developer-hint">' + this.txtDeveloper + '</div>').appendTo(this.$el);
this.developerHint = $('<div id="developer-hint">' + ((mode == Asc.c_oLicenseMode.Trial) ? this.txtTrial : this.txtDeveloper) + '</div>').appendTo(this.$el);
this.devHeight = this.developerHint.outerHeight();
$(window).on('resize', _.bind(this.onWindowResize, this));
}
@ -382,6 +382,7 @@ define([
tipSupport : 'Feedback & Support',
tipSearch : 'Search',
tipPlugins : 'Plugins',
txtDeveloper: 'DEVELOPER MODE'
txtDeveloper: 'DEVELOPER MODE',
txtTrial: 'TRIAL MODE'
}, DE.Views.LeftMenu || {}));
});

View file

@ -1145,6 +1145,7 @@
"DE.Views.LeftMenu.tipSupport": "Feedback & Support",
"DE.Views.LeftMenu.tipTitles": "Titles",
"DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
"DE.Views.LeftMenu.txtTrial": "TRIAL MODE",
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",

View file

@ -994,6 +994,7 @@
"DE.Views.FileMenuPanels.Settings.strFontRender": "Хинтинг шрифтов",
"DE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы",
"DE.Views.FileMenuPanels.Settings.strInputSogou": "Включить метод ввода Sogou Pinyin",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Включить отображение комментариев в тексте",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Включить отображение решенных комментариев",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе",
@ -1144,6 +1145,7 @@
"DE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка",
"DE.Views.LeftMenu.tipTitles": "Заголовки",
"DE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
"DE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ",
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Отмена",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Отправить",

View file

@ -179,7 +179,7 @@ define([
this.leftMenu.btnChat.hide();
this.leftMenu.btnComments.hide();
}
this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode);
/** coauthoring end **/
Common.util.Shortcuts.resumeEvents();
this.leftMenu.btnThumbs.toggle(true);
@ -192,7 +192,7 @@ define([
this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins'));
} else
this.leftMenu.btnPlugins.hide();
this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode);
},
clickMenuFileItem: function(menu, action, isopts) {

View file

@ -785,7 +785,7 @@ define([
this.appOptions.canForcesave = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
this.appOptions.forcesave = this.appOptions.canForcesave;
this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
this.appOptions.isTrial = params.asc_getTrial();
this.appOptions.trialMode = params.asc_getLicenseMode();
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';

View file

@ -358,7 +358,7 @@ define([
if ( !this.$el.is(':visible') ) return;
if (!this.developerHint) {
this.developerHint = $('<div id="developer-hint">' + this.txtDeveloper + '</div>').appendTo(this.$el);
this.developerHint = $('<div id="developer-hint">' + ((mode == Asc.c_oLicenseMode.Trial) ? this.txtTrial : this.txtDeveloper) + '</div>').appendTo(this.$el);
this.devHeight = this.developerHint.outerHeight();
$(window).on('resize', _.bind(this.onWindowResize, this));
}
@ -382,6 +382,7 @@ define([
tipSearch : 'Search',
tipSlides: 'Slides',
tipPlugins : 'Plugins',
txtDeveloper: 'DEVELOPER MODE'
txtDeveloper: 'DEVELOPER MODE',
txtTrial: 'TRIAL MODE'
}, PE.Views.LeftMenu || {}));
});

View file

@ -919,6 +919,7 @@
"PE.Views.LeftMenu.tipSupport": "Feedback & Support",
"PE.Views.LeftMenu.tipTitles": "Titles",
"PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
"PE.Views.LeftMenu.txtTrial": "TRIAL MODE",
"PE.Views.ParagraphSettings.strLineHeight": "Line Spacing",
"PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing",
"PE.Views.ParagraphSettings.strSpacingAfter": "After",

View file

@ -840,6 +840,7 @@
"PE.Views.FileMenuPanels.Settings.strFast": "Быстрый",
"PE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)",
"PE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы",
"PE.Views.FileMenuPanels.Settings.strInputSogou": "Включить метод ввода Sogou Pinyin",
"PE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе",
"PE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Включить проверку орфографии",
"PE.Views.FileMenuPanels.Settings.strStrict": "Строгий",
@ -918,6 +919,7 @@
"PE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка",
"PE.Views.LeftMenu.tipTitles": "Заголовки",
"PE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
"PE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ",
"PE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал",
"PE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами",
"PE.Views.ParagraphSettings.strSpacingAfter": "После",

View file

@ -187,7 +187,7 @@ define([
this.leftMenu.btnChat.hide();
this.leftMenu.btnComments.hide();
}
this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode);
/** coauthoring end **/
Common.util.Shortcuts.resumeEvents();
if (!this.mode.isEditMailMerge && !this.mode.isEditDiagram)
@ -201,7 +201,7 @@ define([
this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins'));
} else
this.leftMenu.btnPlugins.hide();
this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode);
},
clickMenuFileItem: function(menu, action, isopts) {

View file

@ -806,7 +806,7 @@ define([
this.appOptions.canComments = this.appOptions.canComments && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
this.appOptions.canRename = !!this.permissions.rename;
this.appOptions.isTrial = params.asc_getTrial();
this.appOptions.trialMode = params.asc_getLicenseMode();
this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding)

View file

@ -330,7 +330,7 @@ define([
if ( !this.$el.is(':visible') ) return;
if (!this.developerHint) {
this.developerHint = $('<div id="developer-hint">' + this.txtDeveloper + '</div>').appendTo(this.$el);
this.developerHint = $('<div id="developer-hint">' + ((mode == Asc.c_oLicenseMode.Trial) ? this.txtTrial : this.txtDeveloper) + '</div>').appendTo(this.$el);
this.devHeight = this.developerHint.outerHeight();
$(window).on('resize', _.bind(this.onWindowResize, this));
}
@ -354,6 +354,7 @@ define([
tipFile : 'File',
tipSearch : 'Search',
tipPlugins : 'Plugins',
txtDeveloper: 'DEVELOPER MODE'
txtDeveloper: 'DEVELOPER MODE',
txtTrial: 'TRIAL MODE'
}, SSE.Views.LeftMenu || {}));
});

View file

@ -1245,6 +1245,7 @@
"SSE.Views.LeftMenu.tipSearch": "Search",
"SSE.Views.LeftMenu.tipSupport": "Feedback & Support",
"SSE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
"SSE.Views.LeftMenu.txtTrial": "TRIAL MODE",
"SSE.Views.MainSettingsPrint.okButtonText": "Save",
"SSE.Views.MainSettingsPrint.strBottom": "Bottom",
"SSE.Views.MainSettingsPrint.strLandscape": "Landscape",

View file

@ -1100,6 +1100,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocale": "Язык формул",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocaleEx": "Пример: СУММ; МИН; МАКС; СЧЁТ",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strInputSogou": "Включить метод ввода Sogou Pinyin",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strLiveComment": "Включить отображение комментариев в тексте",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strRegSettings": "Региональные параметры",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strRegSettingsEx": "Пример:",
@ -1120,6 +1121,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "Немецкий",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "Английский",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Дюйм",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInput": "Альтернативный ввод",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Отображение комментариев",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "как OS X",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Собственный",
@ -1243,6 +1245,7 @@
"SSE.Views.LeftMenu.tipSearch": "Поиск",
"SSE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка",
"SSE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
"SSE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ",
"SSE.Views.MainSettingsPrint.okButtonText": "Сохранить",
"SSE.Views.MainSettingsPrint.strBottom": "Снизу",
"SSE.Views.MainSettingsPrint.strLandscape": "Альбомная",