diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 612729bb2..ad69d208f 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -146,7 +146,7 @@ define([ scope : me })); if (this.itemsTemplate) - this.cmpEl.find('ul').append( + this.cmpEl.find('ul').html( $(this.itemsTemplate({ items : items, scope : me diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index e4387beaa..e3f503b68 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -785,7 +785,7 @@ define([ isLocked: function() { return this.$window.hasClass('dethrone') || - (!this.options.modal && this.$window.parent().find('.asc-window.modal:visible').length); + (!this.initConfig.modal && this.$window.parent().find('.asc-window.modal:visible').length); }, getChild: function(selector) { diff --git a/apps/common/main/lib/controller/ExternalDiagramEditor.js b/apps/common/main/lib/controller/ExternalDiagramEditor.js index ad90550a1..518b24e76 100644 --- a/apps/common/main/lib/controller/ExternalDiagramEditor.js +++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js @@ -141,7 +141,12 @@ define([ handler: function(result, value) { if (this.isHandlerCalled) return; this.isHandlerCalled = true; - externalEditor && externalEditor.serviceCommand('queryClose',{mr:result}); + if (this.diagramEditorView._isExternalDocReady) + externalEditor && externalEditor.serviceCommand('queryClose',{mr:result}); + else { + this.diagramEditorView.hide(); + this.isHandlerCalled = false; + } }, setChartData: function() { diff --git a/apps/common/main/lib/view/ExternalDiagramEditor.js b/apps/common/main/lib/view/ExternalDiagramEditor.js index 511fe6585..29f6e8021 100644 --- a/apps/common/main/lib/view/ExternalDiagramEditor.js +++ b/apps/common/main/lib/view/ExternalDiagramEditor.js @@ -82,11 +82,9 @@ define([ disabled: true }); this.btnCancel = new Common.UI.Button({ - el: $('#id-btn-diagram-editor-cancel'), - disabled: true + el: $('#id-btn-diagram-editor-cancel') }); - this.$window.find('.tool.close').addClass('disabled'); this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this)); }, diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less index c3ef9c3fc..4f446d5df 100644 --- a/apps/common/main/resources/less/layout.less +++ b/apps/common/main/resources/less/layout.less @@ -49,7 +49,7 @@ } > .layout-resizer { - width: 4px; + width: 2px; cursor: col-resize; &.move { diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index b5dc426f7..6f4448e6d 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -361,6 +361,7 @@ define([ this.api.asc_registerCallback('asc_onColumnsProps', _.bind(this.onColumnsProps, this)); this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this)); this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); + this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this)); }, onChangeCompactView: function(view, compact) { @@ -613,6 +614,12 @@ define([ } }, + onShowParaMarks: function(v) { + this.toolbar.mnuNonPrinting.items[0].setChecked(v, true); + this.toolbar.btnShowHidenChars.toggle(v, true); + Common.localStorage.setItem("de-show-hiddenchars", v); + }, + onApiFocusObject: function(selectedObjects) { if (!this.editMode) return; diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 810557e60..0049fce41 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -3239,6 +3239,17 @@ define([ caption : '--' }); + var menuParaRefreshField = new Common.UI.MenuItem({ + caption: me.textRefreshField + }).on('click', function(item, e){ + me.api.asc_UpdateComplexField(item.options.fieldProps); + me.fireEvent('editcomplete', me); + }); + + var menuParaFieldSeparator = new Common.UI.MenuItem({ + caption : '--' + }); + this.textMenu = new Common.UI.Menu({ initMenu: function(value){ var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties())); @@ -3353,6 +3364,14 @@ define([ menuParaTOCSettings.setVisible(in_toc); menuParaTOCRefresh.setVisible(in_toc); menuParaTOCSeparator.setVisible(in_toc); + + var in_field = me.api.asc_GetCurrentComplexField(); + menuParaRefreshField.setVisible(!!in_field); + menuParaRefreshField.setDisabled(disabled); + menuParaFieldSeparator.setVisible(!!in_field); + if (in_field) { + menuParaRefreshField.options.fieldProps = in_field; + } }, items: [ me.menuSpellPara, @@ -3370,6 +3389,8 @@ define([ menuParaRemoveControl, menuParaControlSettings, menuParaControlSeparator, + menuParaRefreshField, + menuParaFieldSeparator, menuParaTOCSettings, menuParaTOCRefresh, menuParaTOCSeparator, @@ -3701,7 +3722,8 @@ define([ textUpdateAll: 'Refresh entire table', textUpdatePages: 'Refresh page numbers only', textTOCSettings: 'Table of contents settings', - textTOC: 'Table of contents' + textTOC: 'Table of contents', + textRefreshField: 'Refresh field' }, DE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index fe6551062..bb9f0f1b5 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -318,7 +318,7 @@ define([ if (this.api) { var section = this.api.asc_GetSectionProps(), ratio = (this._state.Height>0) ? this._state.Width/this._state.Height : 1, - pagew = section.get_W() - section.get_LeftMargin() - section.get_RightMargin(), + pagew = this.api.asc_GetCurrentColumnWidth(), pageh = section.get_H() - section.get_TopMargin() - section.get_BottomMargin(), pageratio = pagew/pageh, w, h; diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 76dc2a073..fab98afda 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1514,7 +1514,7 @@ define([ this.btnDecLeftOffset.updateHint(this.tipDecPrLeft + Common.Utils.String.platformKey('Ctrl+Shift+M')); this.btnIncLeftOffset.updateHint(this.tipIncPrLeft + Common.Utils.String.platformKey('Ctrl+M')); this.btnLineSpace.updateHint(this.tipLineSpace); - this.btnShowHidenChars.updateHint(this.tipShowHiddenChars); + this.btnShowHidenChars.updateHint(this.tipShowHiddenChars + Common.Utils.String.platformKey('Ctrl+*')); this.btnMarkers.updateHint(this.tipMarkers); this.btnNumbers.updateHint(this.tipNumbers); this.btnMultilevels.updateHint(this.tipMultilevels); diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 0e1cdd67f..99f4adedd 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -231,6 +231,7 @@ "Common.Views.ReviewChanges.txtAcceptAll": "Alle Änderungen annehmen", "Common.Views.ReviewChanges.txtAcceptChanges": "Änderungen annehmen", "Common.Views.ReviewChanges.txtAcceptCurrent": "Aktuelle Änderungen annehmen", + "Common.Views.ReviewChanges.txtChat": "Chat", "Common.Views.ReviewChanges.txtClose": "Schließen", "Common.Views.ReviewChanges.txtCoAuthMode": "Modus \"Gemeinsame Bearbeitung\"", "Common.Views.ReviewChanges.txtDocLang": "Sprache", @@ -897,6 +898,7 @@ "DE.Views.DocumentHolder.textNextPage": "Nächste Seite", "DE.Views.DocumentHolder.textPaste": "Einfügen", "DE.Views.DocumentHolder.textPrevPage": "Vorherige Seite", + "DE.Views.DocumentHolder.textRefreshField": "Feld aktualisieren", "DE.Views.DocumentHolder.textRemove": "Entfernen", "DE.Views.DocumentHolder.textRemoveControl": "Inhaltssteuerelement entfernen", "DE.Views.DocumentHolder.textSettings": "Einstellungen", @@ -1781,6 +1783,7 @@ "DE.Views.Toolbar.textTabHome": "Startseite", "DE.Views.Toolbar.textTabInsert": "Einfügen", "DE.Views.Toolbar.textTabLayout": "Layout", + "DE.Views.Toolbar.textTabLinks": "Quellenangaben", "DE.Views.Toolbar.textTabProtect": "Schutz", "DE.Views.Toolbar.textTabReview": "Review", "DE.Views.Toolbar.textTitleError": "Fehler", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 2dc13721c..3c04e4e5b 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -898,6 +898,7 @@ "DE.Views.DocumentHolder.textNextPage": "Next Page", "DE.Views.DocumentHolder.textPaste": "Paste", "DE.Views.DocumentHolder.textPrevPage": "Previous Page", + "DE.Views.DocumentHolder.textRefreshField": "Refresh field", "DE.Views.DocumentHolder.textRemove": "Remove", "DE.Views.DocumentHolder.textRemoveControl": "Remove content control", "DE.Views.DocumentHolder.textSettings": "Settings", @@ -1784,7 +1785,6 @@ "DE.Views.Toolbar.textTabLayout": "Layout", "DE.Views.Toolbar.textTabLinks": "References", "DE.Views.Toolbar.textTabProtect": "Protection", - "DE.Views.Toolbar.textTabLinks": "References", "DE.Views.Toolbar.textTabReview": "Review", "DE.Views.Toolbar.textTitleError": "Error", "DE.Views.Toolbar.textToCurrent": "To current position", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 9598c4dd3..ded18f894 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -231,6 +231,7 @@ "Common.Views.ReviewChanges.txtAcceptAll": "Принять все изменения", "Common.Views.ReviewChanges.txtAcceptChanges": "Принять изменения", "Common.Views.ReviewChanges.txtAcceptCurrent": "Принять текущее изменение", + "Common.Views.ReviewChanges.txtChat": "Чат", "Common.Views.ReviewChanges.txtClose": "Закрыть", "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования", "Common.Views.ReviewChanges.txtDocLang": "Язык", @@ -897,6 +898,7 @@ "DE.Views.DocumentHolder.textNextPage": "Следующая страница", "DE.Views.DocumentHolder.textPaste": "Вставить", "DE.Views.DocumentHolder.textPrevPage": "Предыдущая страница", + "DE.Views.DocumentHolder.textRefreshField": "Обновить поле", "DE.Views.DocumentHolder.textRemove": "Удалить", "DE.Views.DocumentHolder.textRemoveControl": "Удалить элемент управления содержимым", "DE.Views.DocumentHolder.textSettings": "Настройки", diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less index 1215b908d..38e3d28a7 100644 --- a/apps/documenteditor/main/resources/less/layout.less +++ b/apps/documenteditor/main/resources/less/layout.less @@ -39,7 +39,7 @@ label { top:0; right: 0; bottom: 0; - background-color: #f4f4f4; + background-color: @gray-light; overflow: hidden; } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index b1fd7d91d..b8516bb34 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -1,5 +1,4 @@ -//@tabs-bg-color: #4f6279; @tabs-bg-color: #446995; .toolbar { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 7daab5650..0461e7719 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -146,7 +146,8 @@ define([ 'Table': this.txtSldLtTTbl, 'Slide title': this.txtSlideTitle, 'Loading': this.txtLoading, - 'Click to add notes': this.txtAddNotes + 'Click to add notes': this.txtAddNotes, + 'Click to add first slide': this.txtAddFirstSlide } }); @@ -1994,7 +1995,8 @@ define([ txtLoading: 'Loading...', txtAddNotes: 'Click to add notes', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', - errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later." + errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", + txtAddFirstSlide: 'Click to add first slide' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index 6e6bd8ad3..898b9759f 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -2,7 +2,7 @@
- +