Skip to content

W
web-apps
Commit 23d56283 authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

Merge branch 'release/4.0.1' into develop

parents 6a4e5d98 33de23b4
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 59 deletions
Readme.md 0 → 100644
View file @ 23d56283
[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html) ![Release](https://img.shields.io/badge/Release-v4.0.1-blue.svg?style=flat)
## web-apps
The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor.
## Project Information
Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org")
Code repository: [https://github.com/ONLYOFFICE/web-apps](https://github.com/ONLYOFFICE/web-apps "https://github.com/ONLYOFFICE/web-apps")
SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com")
## User Feedback and Support
If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1].
[1]: http://dev.onlyoffice.org
[2]: https://github.com/ONLYOFFICE/DocumentServer
## License
web-apps is released under an GNU AGPL v3.0 license. See the LICENSE file for more information.
apps/common/main/resources/less/plugins.less
View file @ 23d56283
......@@ -29,7 +29,7 @@
background-color: @secondary;
.plugin-icon {
.box-shadow(0 0 0 2px @primary);
.box-shadow(0 0 0 2px transparent);
}
}
}
......@@ -46,11 +46,12 @@
width: 31px;
height: 31px;
display: inline-block;
.box-shadow(0 0 0 1px @gray);
.box-shadow(0 0 0 1px transparent);
vertical-align: middle;
background-position: 0 0;
background-size: cover;
margin-right: 10px;
margin-top: -1px;
.background-ximage('@{common-image-path}/plugin/icon_add_on_default.png', '@{common-image-path}/plugin/icon_add_on_default@2x.png', 31px);
}
......
apps/documenteditor/main/app/controller/LeftMenu.js
View file @ 23d56283
......@@ -158,11 +158,11 @@ define([
createDelayedElements: function() {
/** coauthoring begin **/
if ( this.mode.canCoAuthoring ) {
this.leftMenu.btnComments[this.mode.isEdit&&this.mode.canComments ? 'show' : 'hide']();
this.leftMenu.btnComments[(this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canComments)
this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments'));
this.leftMenu.btnChat[this.mode.canChat ? 'show' : 'hide']();
this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canChat)
this.leftMenu.setOptionsPanel('chat', this.getApplication().getController('Common.Controllers.Chat').getView('Common.Views.Chat'));
} else {
......@@ -574,13 +574,13 @@ define([
break;
/** coauthoring begin **/
case 'chat':
if (this.mode.canCoAuthoring && this.mode.canChat) {
if (this.mode.canCoAuthoring && this.mode.canChat && !this.mode.isLightVersion) {
Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('chat');
}
return false;
case 'comments':
if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments) {
if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) {
Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('comments');
this.getApplication().getController('Common.Controllers.Comments').onAfterShow();
......
apps/documenteditor/main/app/controller/Main.js
View file @ 23d56283
......@@ -837,9 +837,11 @@ define([
application.getController('Common.Controllers.ExternalDiagramEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization});
application.getController('Common.Controllers.ExternalMergeEditor').setApi(this.api).loadConfig({config:this.editorConfig, customization: this.editorConfig.customization});
pluginsController.setApi(this.api);
this.updatePluginsList(this.plugins);
this.api.asc_registerCallback('asc_onPluginsInit', _.bind(this.updatePluginsList, this));
if (!me.appOptions.isLightVersion) {
pluginsController.setApi(me.api);
me.updatePluginsList(me.plugins);
me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
}
documentHolderController.setApi(me.api);
documentHolderController.createDelayedElements();
......@@ -938,6 +940,7 @@ define([
this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review;
this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable();
this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false;
this.appOptions.isLightVersion = params.asc_getIsLight();
this.appOptions.isOffline = this.api.asc_isOffline();
this.appOptions.isReviewOnly = (this.permissions.review === true) && (this.permissions.edit === false);
this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;
......
apps/documenteditor/main/app/controller/Statusbar.js
View file @ 23d56283
......@@ -181,10 +181,10 @@ define([
});
value = Common.localStorage.getItem("de-track-changes-tip");
this.showTrackChangesTip = !(value && parseInt(value) == 1);
this.showTrackChangesTip = !(value && parseInt(value) == 1) && !this.statusbar.mode.isLightVersion;
value = Common.localStorage.getItem("de-new-changes");
this.showNewChangesTip = !(value && parseInt(value) == 1);
this.showNewChangesTip = !(value && parseInt(value) == 1) && !this.statusbar.mode.isLightVersion;
if (this.statusbar.mode.isReviewOnly) {
var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl);
......@@ -207,7 +207,7 @@ define([
var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl);
(this.api.asc_HaveRevisionsChanges()) ? iconEl.removeClass(this.statusbar.btnReviewCls).addClass('btn-ic-changes') : iconEl.removeClass('btn-ic-changes').addClass(this.statusbar.btnReviewCls);
if (value!==null && parseInt(value) == 1) {
this.changeReviewStatus(true);
this.changeReviewStatus(!this.statusbar.mode.isLightVersion);
// show tooltip "track changes in this document" and change icon
if (this.showTrackChangesTip && !statusbarIsHidden){
this.statusbar.btnReview.updateHint('');
......@@ -300,7 +300,7 @@ define([
if (this.api) {
this.api.asc_SetTrackRevisions(state);
}
this.showHideReviewChangesPanel(state);
this.showHideReviewChangesPanel(state && !this.statusbar.mode.isLightVersion);
},
showHideReviewChangesPanel: function(state) {
......
apps/documenteditor/main/app/view/Statusbar.js
View file @ 23d56283
......@@ -380,7 +380,7 @@ define([
setMode: function(mode) {
this.mode = mode;
this.$el.find('.el-edit')[mode.isEdit?'show':'hide']();
this.$el.find('.el-review')[mode.canReview?'show':'hide']();
this.$el.find('.el-review')[(mode.canReview && !mode.isLightVersion)?'show':'hide']();
this.lblChangeRights[(!this.mode.isOffline && !this.mode.isReviewOnly && this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length)?'show':'hide']();
this.panelUsers[(!this.mode.isOffline && !this.mode.isReviewOnly && this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length)?'show':'hide']();
},
......
apps/documenteditor/main/app/view/Toolbar.js
View file @ 23d56283
......@@ -1243,7 +1243,7 @@ define([
return this;
},
render: function () {
render: function (mode) {
var me = this;
/**
......@@ -1253,7 +1253,7 @@ define([
this.trigger('render:before', this);
var value = Common.localStorage.getItem("de-compact-toolbar");
var valueCompact = (value !== null && parseInt(value) == 1);
var valueCompact = (mode.isLightVersion || value !== null && parseInt(value) == 1);
value = Common.localStorage.getItem("de-hidden-title");
var valueTitle = (value !== null && parseInt(value) == 1);
......@@ -1264,6 +1264,7 @@ define([
value = Common.localStorage.getItem("de-hidden-rulers");
var valueRulers = (value !== null && parseInt(value) == 1);
this.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
this.mnuitemCompactToolbar.setChecked(valueCompact, true);
this.mnuitemHideTitleBar.setChecked(valueTitle, true);
this.mnuitemHideStatusBar.setChecked(valueStatus, true);
......
apps/documenteditor/main/app/view/Viewport.js
View file @ 23d56283
......@@ -140,7 +140,7 @@ define([
rightMenuView = DE.getController('RightMenu').getView('RightMenu'),
statusBarView = DE.getController('Statusbar').getView('Statusbar');
me._toolbar = toolbarView.render();
me._toolbar = toolbarView.render(this.mode);
me._rightMenu = rightMenuView.render(this.mode);
var value = Common.localStorage.getItem('de-hidden-status');
......
apps/documenteditor/main/locale/es.json
View file @ 23d56283
......@@ -909,7 +909,7 @@
"DE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto",
"DE.Views.FileMenuPanels.Settings.txtAll": "Ver todo",
"DE.Views.FileMenuPanels.Settings.txtCm": "Centímetro",
"DE.Views.FileMenuPanels.Settings.txtInch": "Inch",
"DE.Views.FileMenuPanels.Settings.txtInch": "Pulgada",
"DE.Views.FileMenuPanels.Settings.txtInput": "Entrada alternativa",
"DE.Views.FileMenuPanels.Settings.txtLast": "Ver últimos",
"DE.Views.FileMenuPanels.Settings.txtLiveComment": "Demostración de Comentarios",
......@@ -961,10 +961,10 @@
"DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancelar",
"DE.Views.ImageSettingsAdvanced.okButtonText": "Aceptar",
"DE.Views.ImageSettingsAdvanced.strMargins": "Márgenes interiores",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absoluto",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alineación",
"DE.Views.ImageSettingsAdvanced.textArrows": "Flechas",
"DE.Views.ImageSettingsAdvanced.textAspectRatio": "Lock aspect ratio",
"DE.Views.ImageSettingsAdvanced.textAspectRatio": "Bloquear relación de aspecto",
"DE.Views.ImageSettingsAdvanced.textBeginSize": "Tamaño inicial",
"DE.Views.ImageSettingsAdvanced.textBeginStyle": "Estilo inicial",
"DE.Views.ImageSettingsAdvanced.textBelow": "abajo",
......@@ -999,7 +999,7 @@
"DE.Views.ImageSettingsAdvanced.textPosition": "Posición",
"DE.Views.ImageSettingsAdvanced.textPositionPc": "Posición Relativa",
"DE.Views.ImageSettingsAdvanced.textRelative": "en relación a\n",
"DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relative",
"DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relativo",
"DE.Views.ImageSettingsAdvanced.textRight": "Derecho",
"DE.Views.ImageSettingsAdvanced.textRightMargin": "Margen derecho",
"DE.Views.ImageSettingsAdvanced.textRightOf": "a la derecha de",
......@@ -1307,7 +1307,7 @@
"DE.Views.TableSettingsAdvanced.okButtonText": "Aceptar",
"DE.Views.TableSettingsAdvanced.textAlign": "Alineación",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alineación",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Permitir espacio entre celdas",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Espacio entre celdas",
"DE.Views.TableSettingsAdvanced.textAnchorText": "Texto",
"DE.Views.TableSettingsAdvanced.textAutofit": "Cambiar tamaño automáticamente para ajustar a contenido",
"DE.Views.TableSettingsAdvanced.textBackColor": "Fondo de celda",
......@@ -1317,13 +1317,13 @@
"DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Bordes y fondo",
"DE.Views.TableSettingsAdvanced.textBorderWidth": "Tamaño de borde",
"DE.Views.TableSettingsAdvanced.textBottom": "Inferior",
"DE.Views.TableSettingsAdvanced.textCellOptions": "Cell Options",
"DE.Views.TableSettingsAdvanced.textCellProps": "Propiedades de la celda",
"DE.Views.TableSettingsAdvanced.textCellSize": "Cell Size",
"DE.Views.TableSettingsAdvanced.textCellOptions": "Opciones de celda",
"DE.Views.TableSettingsAdvanced.textCellProps": "Celda",
"DE.Views.TableSettingsAdvanced.textCellSize": "Tamaño de Celda",
"DE.Views.TableSettingsAdvanced.textCenter": "Al centro",
"DE.Views.TableSettingsAdvanced.textCenterTooltip": "Al centro",
"DE.Views.TableSettingsAdvanced.textCheckMargins": "Usar márgenes predeterminados",
"DE.Views.TableSettingsAdvanced.textDefaultMargins": "Márgenes predeterminados",
"DE.Views.TableSettingsAdvanced.textDefaultMargins": "Márgenes de celda predeterminados",
"DE.Views.TableSettingsAdvanced.textDistance": "Distancia del texto",
"DE.Views.TableSettingsAdvanced.textHorizontal": "Horizontal ",
"DE.Views.TableSettingsAdvanced.textIndLeft": "Sangría a la izquierda",
......@@ -1331,7 +1331,7 @@
"DE.Views.TableSettingsAdvanced.textLeftTooltip": "Izquierdo",
"DE.Views.TableSettingsAdvanced.textMargin": "Margen",
"DE.Views.TableSettingsAdvanced.textMargins": "Márgenes de celda",
"DE.Views.TableSettingsAdvanced.textMeasure": "Measure in",
"DE.Views.TableSettingsAdvanced.textMeasure": "medir en",
"DE.Views.TableSettingsAdvanced.textMove": "Desplazar objeto con texto",
"DE.Views.TableSettingsAdvanced.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.TableSettingsAdvanced.textOnlyCells": "Sólo para celdas seleccionadas",
......@@ -1339,17 +1339,17 @@
"DE.Views.TableSettingsAdvanced.textOverlap": "Superposición",
"DE.Views.TableSettingsAdvanced.textPage": "Página",
"DE.Views.TableSettingsAdvanced.textPosition": "Posición",
"DE.Views.TableSettingsAdvanced.textPrefWidth": "Preferred width",
"DE.Views.TableSettingsAdvanced.textPrefWidth": "Anchura Preferida",
"DE.Views.TableSettingsAdvanced.textPreview": "Vista previa",
"DE.Views.TableSettingsAdvanced.textRelative": "en relación a\n",
"DE.Views.TableSettingsAdvanced.textRight": "Derecho",
"DE.Views.TableSettingsAdvanced.textRightOf": "a la derecha de",
"DE.Views.TableSettingsAdvanced.textRightTooltip": "Derecho",
"DE.Views.TableSettingsAdvanced.textStandartColors": "Colores estándar",
"DE.Views.TableSettingsAdvanced.textTable": "Table",
"DE.Views.TableSettingsAdvanced.textTable": "Tabla",
"DE.Views.TableSettingsAdvanced.textTableBackColor": "Fondo de tabla",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position",
"DE.Views.TableSettingsAdvanced.textTableSize": "Table Size",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Posición de la tabla",
"DE.Views.TableSettingsAdvanced.textTableSize": "Tamaño de tabla",
"DE.Views.TableSettingsAdvanced.textThemeColors": "Colores de tema",
"DE.Views.TableSettingsAdvanced.textTitle": "Tabla - Ajustes avanzados",
"DE.Views.TableSettingsAdvanced.textTop": "Superior",
......@@ -1359,8 +1359,8 @@
"DE.Views.TableSettingsAdvanced.textWrap": "Ajuste de texto",
"DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Tabla en línea",
"DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Tabla flujo",
"DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style",
"DE.Views.TableSettingsAdvanced.textWrapText": "Wrap text",
"DE.Views.TableSettingsAdvanced.textWrappingStyle": "Ajuste de texto",
"DE.Views.TableSettingsAdvanced.textWrapText": "Ajustar texto",
"DE.Views.TableSettingsAdvanced.tipAll": "Fijar borde exterior y todas líneas interiores ",
"DE.Views.TableSettingsAdvanced.tipCellAll": "Fijar bordes sólo para celdas interiores",
"DE.Views.TableSettingsAdvanced.tipCellInner": "Fijar líneas verticales y horizontales sólo para celdas interiores",
......@@ -1372,7 +1372,7 @@
"DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Fijar borde exterior y líneas verticales y horizontales para celdas inferiores",
"DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Fijar borde de tabla exterior y bordes exteriores para celdas interiores",
"DE.Views.TableSettingsAdvanced.txtCm": "Centímetro",
"DE.Views.TableSettingsAdvanced.txtInch": "Inch",
"DE.Views.TableSettingsAdvanced.txtInch": "Pulgada",
"DE.Views.TableSettingsAdvanced.txtNoBorders": "Sin bordes",
"DE.Views.TableSettingsAdvanced.txtPercent": "Por ciento",
"DE.Views.TableSettingsAdvanced.txtPt": "Punto",
......
apps/presentationeditor/main/app/controller/LeftMenu.js
View file @ 23d56283
......@@ -155,11 +155,11 @@ define([
createDelayedElements: function() {
/** coauthoring begin **/
if ( this.mode.canCoAuthoring ) {
this.leftMenu.btnComments[this.mode.isEdit&&this.mode.canComments ? 'show' : 'hide']();
this.leftMenu.btnComments[(this.mode.isEdit&&this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canComments)
this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments'));
this.leftMenu.btnChat[this.mode.canChat ? 'show' : 'hide']();
this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canChat)
this.leftMenu.setOptionsPanel('chat', this.getApplication().getController('Common.Controllers.Chat').getView('Common.Views.Chat'));
} else {
......@@ -454,13 +454,13 @@ define([
break;
/** coauthoring begin **/
case 'chat':
if (this.mode.canCoAuthoring && this.mode.canChat && (!previewPanel || !previewPanel.isVisible())){
if (this.mode.canCoAuthoring && this.mode.canChat && !this.mode.isLightVersion && (!previewPanel || !previewPanel.isVisible())){
Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('chat');
}
return false;
case 'comments':
if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && (!previewPanel || !previewPanel.isVisible()) && !this._state.no_slides) {
if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion && (!previewPanel || !previewPanel.isVisible()) && !this._state.no_slides) {
Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('comments');
this.getApplication().getController('Common.Controllers.Comments').onAfterShow();
......
apps/presentationeditor/main/app/controller/Main.js
View file @ 23d56283
......@@ -720,6 +720,7 @@ define([
/** coauthoring end **/
this.appOptions.isOffline = this.api.asc_isOffline();
this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false;
this.appOptions.isLightVersion = params.asc_getIsLight();
this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;
this.appOptions.canEdit = this.permissions.edit !== false && // can edit
(this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined
......
apps/presentationeditor/main/app/view/Toolbar.js
View file @ 23d56283
......@@ -213,7 +213,9 @@ define([
});
me.slideOnlyControls.push(me.btnChangeSlide);
me.listenTo(PE.getCollection('SlideLayouts'), 'reset', function() {
me.mnuChangeSlidePicker._needRecalcSlideLayout = me.mnuAddSlidePicker._needRecalcSlideLayout = true;
me.mnuAddSlidePicker._needRecalcSlideLayout = true;
if (me.mnuChangeSlidePicker)
me.mnuChangeSlidePicker._needRecalcSlideLayout = true;
});
me.btnPreview = new Common.UI.Button({
......@@ -1145,7 +1147,7 @@ define([
});
},
render: function () {
render: function (mode) {
var me = this,
el = $(this.el);
......@@ -1156,7 +1158,7 @@ define([
this.trigger('render:before', this);
var value = Common.localStorage.getItem('pe-compact-toolbar');
var valueCompact = (value!==null && parseInt(value) == 1);
var valueCompact = (mode.isLightVersion || value!==null && parseInt(value) == 1);
value = Common.localStorage.getItem('pe-hidden-title');
var valueTitle = (value!==null && parseInt(value) == 1);
......@@ -1167,6 +1169,7 @@ define([
value = Common.localStorage.getItem("pe-hidden-rulers");
var valueRulers = (value !== null && parseInt(value) == 1);
me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
me.mnuitemCompactToolbar.setChecked(valueCompact);
me.mnuitemHideTitleBar.setChecked(valueTitle);
me.mnuitemHideStatusBar.setChecked(valueStatus);
......
apps/presentationeditor/main/app/view/Viewport.js
View file @ 23d56283
......@@ -131,7 +131,7 @@ define([
rightMenuView = PE.getController('RightMenu').getView('RightMenu'),
statusBarView = PE.getController('Statusbar').getView('Statusbar');
me._toolbar = toolbarView.render();
me._toolbar = toolbarView.render(this.mode);
me._rightMenu = rightMenuView.render();
var value = Common.localStorage.getItem('pe-hidden-status');
......
apps/presentationeditor/main/locale/es.json
View file @ 23d56283
......@@ -147,7 +147,7 @@
"PE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1.",
"PE.Controllers.Main.textAnonymous": "Anónimo",
"PE.Controllers.Main.textBuyNow": "Visit website",
"PE.Controllers.Main.textCloseTip": "\nPulse para cerrar el consejo",
"PE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo",
"PE.Controllers.Main.textContactUs": "Contact sales",
"PE.Controllers.Main.textLoadingDocument": "Cargando presentación",
"PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
......
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file @ 23d56283
......@@ -163,11 +163,11 @@ define([
createDelayedElements: function() {
/** coauthoring begin **/
if ( this.mode.canCoAuthoring ) {
this.leftMenu.btnComments[this.mode.isEdit&&this.mode.canComments ? 'show' : 'hide']();
this.leftMenu.btnComments[(this.mode.isEdit&&this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canComments)
this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments'));
this.leftMenu.btnChat[this.mode.canChat ? 'show' : 'hide']();
this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canChat)
this.leftMenu.setOptionsPanel('chat', this.getApplication().getController('Common.Controllers.Chat').getView('Common.Views.Chat'));
} else {
......@@ -621,13 +621,13 @@ define([
break;
/** coauthoring begin **/
case 'chat':
if (this.mode.canCoAuthoring && this.mode.canChat) {
if (this.mode.canCoAuthoring && this.mode.canChat && !this.mode.isLightVersion) {
Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('chat');
}
return false;
case 'comments':
if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments) {
if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) {
Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('comments');
this.getApplication().getController('Common.Controllers.Comments').onAfterShow();
......
apps/spreadsheeteditor/main/app/controller/Main.js
View file @ 23d56283
......@@ -738,6 +738,7 @@ define([
/** coauthoring end **/
this.appOptions.isOffline = this.api.asc_isOffline();
this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false;
this.appOptions.isLightVersion = params.asc_getIsLight();
this.appOptions.canComments = this.appOptions.canLicense && !((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);
......
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @ 23d56283
......@@ -1567,7 +1567,7 @@ define([
});
},
render: function (isEditDiagram, isEditMailMerge) {
render: function (mode) {
var me = this,
el = $(this.el);
......@@ -1579,8 +1579,9 @@ define([
JSON.parse(Common.localStorage.getItem('sse-hidden-title')) && (options.title = true);
JSON.parse(Common.localStorage.getItem('sse-hidden-formula')) && (options.formula = true);
JSON.parse(Common.localStorage.getItem('sse-hidden-headings')) && (options.headings = true);
var isCompactView = !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact'));
var isCompactView = mode.isLightVersion || !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact'));
me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
me.mnuitemCompactToolbar.setChecked(isCompactView);
me.mnuitemHideTitleBar.setChecked(!!options.title);
me.mnuitemHideFormulaBar.setChecked(!!options.formula);
......@@ -1589,12 +1590,12 @@ define([
this.trigger('render:before', this);
el.html(this.template({
isEditDiagram: isEditDiagram,
isEditMailMerge: isEditMailMerge,
isEditDiagram: mode.isEditDiagram,
isEditMailMerge: mode.isEditMailMerge,
isCompactView: isCompactView
}));
me.rendererComponents(isEditDiagram ? 'diagram' : (isEditMailMerge ? 'merge' : isCompactView ? 'short' : 'full'));
me.rendererComponents(mode.isEditDiagram ? 'diagram' : (mode.isEditMailMerge ? 'merge' : isCompactView ? 'short' : 'full'));
this.trigger('render:after', this);
......
apps/spreadsheeteditor/main/app/view/Viewport.js
View file @ 23d56283
......@@ -149,14 +149,9 @@ define([
var me = this,
toolbarView = SSE.getController('Toolbar').getView('Toolbar'),
rightMenuView = SSE.getController('RightMenu').getView('RightMenu');
// statusBarView = SSE.getController('Statusbar').getView('Statusbar');
//
me._toolbar = toolbarView.render(this.mode.isEditDiagram, this.mode.isEditMailMerge);
me._toolbar = toolbarView.render(this.mode);
me._rightMenu = rightMenuView.render();
//
// var value = Common.localStorage.getItem('de-hidden-status');
// if (value !== null && parseInt(value) == 1)
// statusBarView.setVisible(false);
},
setMode: function(mode, delay) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7