diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 8a0a84a0f..19ac737ee 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -241,7 +241,7 @@ define([ lockDrag = true; } }); - if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) { + if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1 || this.bar.isEditFormula) { lockDrag = true; } this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag); diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 99d14aced..5ce8af24e 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -117,7 +117,6 @@ define([ '
' + '' + '
' + - // '' + '
' + '' + @@ -206,11 +205,21 @@ define([ } function onAppShowed(config) { - if ( config.isCrypted && this.labelDocName ) { - this.labelDocName.before( - '
' + - '' + - '
'); + if ( this.labelDocName ) { + if ( config.isCrypted ) { + this.labelDocName.before( + '
' + + '' + + '
'); + } + + var $tools = this.btnSave.$el.parent('#header-tools'); + var _left_width = $tools.prev().outerWidth() + $tools.outerWidth(), + _right_width = this.labelUserName.outerWidth(); + + if ( _left_width < _right_width ) + this.labelDocName.parent().css('padding-left', _right_width - _left_width); + else this.labelDocName.parent().css('padding-right', _left_width - _right_width); } } diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index cf529bc62..e5388c8bc 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -225,49 +225,48 @@ define([ this.cmbBulletFormat.selectRecord(rec); this.bulletProps = {symbol: rec.get('symbol'), font: rec.get('font')}; this.cmbBulletFormat.on('selected', _.bind(function (combo, record) { - if (this._changedProps) { - if (record.value === 1) { - var me = this, - props = me.bulletProps, - handler = function(dlg, result, settings) { - if (result == 'ok') { - props.changed = true; - props.code = settings.code; - props.font = settings.font; - props.symbol = settings.symbol; - if (me._changedProps) { - me._changedProps.asc_putFont(props.font); - me._changedProps.asc_putSymbol(props.symbol); - } + if (record.value === 1) { + var me = this, + props = me.bulletProps, + handler = function(dlg, result, settings) { + if (result == 'ok') { + props.changed = true; + props.code = settings.code; + props.font = settings.font; + props.symbol = settings.symbol; + if (me._changedProps) { + me._changedProps.asc_putFont(props.font); + me._changedProps.asc_putSymbol(props.symbol); } - var store = combo.store; - if (!store.findWhere({value: 0, symbol: props.symbol, font: props.font})) - store.add({ displayValue: me.txtSymbol + ': ', value: 0, symbol: props.symbol, font: props.font }, {at: store.length-1}); - combo.setData(store.models); - combo.selectRecord(combo.store.findWhere({value: 0, symbol: props.symbol, font: props.font})); - }, - win = new Common.Views.SymbolTableDialog({ - api: me.options.api, - lang: me.options.interfaceLang, - modal: true, - type: 0, - font: props.font, - symbol: props.symbol, - handler: handler - }); - win.show(); - win.on('symbol:dblclick', handler); - } else if (record.value == -1) { + } + var store = combo.store; + if (!store.findWhere({value: 0, symbol: props.symbol, font: props.font})) + store.add({ displayValue: me.txtSymbol + ': ', value: 0, symbol: props.symbol, font: props.font }, {at: store.length-1}); + combo.setData(store.models); + combo.selectRecord(combo.store.findWhere({value: 0, symbol: props.symbol, font: props.font})); + }, + win = new Common.Views.SymbolTableDialog({ + api: me.options.api, + lang: me.options.interfaceLang, + modal: true, + type: 0, + font: props.font, + symbol: props.symbol, + handler: handler + }); + win.show(); + win.on('symbol:dblclick', handler); + } else if (record.value == -1) { + if (this._changedProps) this._changedProps.asc_putListType(0, record.value); - } else { - this.bulletProps.changed = true; - this.bulletProps.code = record.code; - this.bulletProps.font = record.font; - this.bulletProps.symbol = record.symbol; - if (this._changedProps) { - this._changedProps.asc_putFont(this.bulletProps.font); - this._changedProps.asc_putSymbol(this.bulletProps.symbol); - } + } else { + this.bulletProps.changed = true; + this.bulletProps.code = record.code; + this.bulletProps.font = record.font; + this.bulletProps.symbol = record.symbol; + if (this._changedProps) { + this._changedProps.asc_putFont(this.bulletProps.font); + this._changedProps.asc_putSymbol(this.bulletProps.symbol); } } }, this)); diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 8e3386b15..c937d79d4 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -309,7 +309,7 @@ &:not(.icon-top) .caption:not(:empty) { - padding: 0 5px; + padding: 0 4px; } .icon { diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index e0d7746d5..bb01ccfbb 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -193,6 +193,7 @@ "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "DE.Controllers.Main.errorUsersExceed": "The number of users was exceeded", "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download it until the connection is restored and page is reloaded.", + "DE.Controllers.Main.errorOpensource": "Using the free Community version you can open documents for viewing only. To access mobile web editors, a commercial license is required.", "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "DE.Controllers.Main.loadFontsTextText": "Loading data...", "DE.Controllers.Main.loadFontsTitleText": "Loading Data", diff --git a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js index d1e0cc5f8..49115ccc7 100644 --- a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js @@ -233,12 +233,13 @@ define([ // show formula settings var me = this; var name = props.asc_getName(), + origin = this.api.asc_getFormulaNameByLocale(name), descrarr = this.getDescription(Common.Utils.InternalSettings.get("sse-settings-func-locale")), funcprops = { - name: this.api.asc_getFormulaLocaleName(name), - origin: name, - args: ((descrarr && descrarr[name]) ? descrarr[name].a : '').replace(/[,;]/g, this.api.asc_getFunctionArgumentSeparator()), - desc: (descrarr && descrarr[name]) ? descrarr[name].d : '' + name: name, + origin: origin, + args: ((descrarr && descrarr[origin]) ? descrarr[origin].a : '').replace(/[,;]/g, this.api.asc_getFunctionArgumentSeparator()), + desc: (descrarr && descrarr[origin]) ? descrarr[origin].d : '' }; (new SSE.Views.FormulaWizard({ diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 467c902b8..779b1c9d0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -208,11 +208,14 @@ define([ statusbar = this.statusbar; statusbar.isEditFormula = disableAdd; + statusbar.tabbar && (statusbar.tabbar.isEditFormula = disableAdd); statusbar.btnZoomUp.setDisabled(disable); statusbar.btnZoomDown.setDisabled(disable); statusbar.labelZoom[disable?'addClass':'removeClass']('disabled'); statusbar.btnAddWorksheet.setDisabled(disable || this.api.asc_isWorkbookLocked() || statusbar.rangeSelectionMode!=Asc.c_oAscSelectionDialogType.None); + statusbar.$el.find('#statusbar_bottom li span').attr('oo_editor_input', !disableAdd); + if (disableAdd && mask.length>0 || !disableAdd && mask.length==0) return; statusbar.$el.find('.statusbar').toggleClass('masked', disableAdd); if(disableAdd) { diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index a75270b3a..a10a6859d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2378,7 +2378,7 @@ define([ this._state.inpivot = !!info.asc_getPivotTableInfo(); toolbar.lockToolbar(SSE.enumLock.editPivot, this._state.inpivot, { array: toolbar.btnsSetAutofilter.concat(toolbar.btnCustomSort, toolbar.btnMerge, toolbar.btnInsertHyperlink, toolbar.btnInsertTable, toolbar.btnRemoveDuplicates)}); - toolbar.lockToolbar(SSE.enumLock.noSlicerSource, !(this._state.inpivot || formatTableInfo), { array: [toolbar.btnInsertSlicer]}); + toolbar.lockToolbar(SSE.enumLock.noSlicerSource, !(formatTableInfo), { array: [toolbar.btnInsertSlicer]}); need_disable = !this.appConfig.canModifyFilter; toolbar.lockToolbar(SSE.enumLock.cantModifyFilter, need_disable, { array: toolbar.btnsSetAutofilter.concat(toolbar.btnsSortDown, toolbar.btnsSortUp, toolbar.btnCustomSort, toolbar.btnTableTemplate, diff --git a/apps/spreadsheeteditor/main/app/template/SlicerSettings.template b/apps/spreadsheeteditor/main/app/template/SlicerSettings.template index db9953804..b3f78bdc8 100644 --- a/apps/spreadsheeteditor/main/app/template/SlicerSettings.template +++ b/apps/spreadsheeteditor/main/app/template/SlicerSettings.template @@ -110,11 +110,11 @@
- - -
- - + + + + +
diff --git a/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template index d61f2be90..1ebab4738 100644 --- a/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template @@ -52,7 +52,7 @@
-
+ diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettings.js b/apps/spreadsheeteditor/main/app/view/PivotSettings.js index 5c6a8ee26..b6738db20 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettings.js @@ -371,6 +371,7 @@ define([ handler: function(result, value) { if (result == 'ok' && me.api && value) { me._originalProps.asc_set(me.api, value); + Common.NotificationCenter.trigger('edit:complete', me); } Common.NotificationCenter.trigger('edit:complete', me); @@ -646,10 +647,6 @@ define([ if (isLabel || event.target.className.match('checkbox')) { this.updateFieldCheck(listView, record); - - _.delay(function () { - listView.$el.find('.listview').focus(); - }, 100, this); } } }, @@ -665,6 +662,7 @@ define([ } else { this._originalProps.asc_removeField(this.api, record.get('index')); } + Common.NotificationCenter.trigger('edit:complete', this); } // listView.isSuspendEvents = false; @@ -830,6 +828,7 @@ define([ handler: function(result, value) { if (result == 'ok' && me.api && value) { field.asc_set(me.api, me._originalProps, dataIndex, value); + Common.NotificationCenter.trigger('edit:complete', me); } Common.NotificationCenter.trigger('edit:complete', me); @@ -848,6 +847,7 @@ define([ handler: function(result, value) { if (result == 'ok' && me.api && value) { pivotField.asc_set(me.api, me._originalProps, pivotIndex, value); + Common.NotificationCenter.trigger('edit:complete', me); } Common.NotificationCenter.trigger('edit:complete', me); @@ -860,24 +860,28 @@ define([ onAddFilter: function(index, moveTo) { if (this.api && !this._locked && this._state.field){ this._originalProps.asc_addPageField(this.api, _.isNumber(index) ? index : this._state.field.record.get('index'), _.isNumber(moveTo) ? moveTo : undefined); + Common.NotificationCenter.trigger('edit:complete', this); } }, onAddRow: function(index, moveTo) { if (this.api && !this._locked && this._state.field){ this._originalProps.asc_addRowField(this.api, _.isNumber(index) ? index : this._state.field.record.get('index'), _.isNumber(moveTo) ? moveTo : undefined); + Common.NotificationCenter.trigger('edit:complete', this); } }, onAddColumn: function(index, moveTo) { if (this.api && !this._locked && this._state.field){ this._originalProps.asc_addColField(this.api, _.isNumber(index) ? index : this._state.field.record.get('index'), _.isNumber(moveTo) ? moveTo : undefined); + Common.NotificationCenter.trigger('edit:complete', this); } }, onAddValues: function(index, moveTo) { if (this.api && !this._locked && this._state.field){ this._originalProps.asc_addDataField(this.api, _.isNumber(index) ? index : this._state.field.record.get('index'), _.isNumber(moveTo) ? moveTo : undefined); + Common.NotificationCenter.trigger('edit:complete', this); } }, @@ -887,6 +891,7 @@ define([ this._originalProps.asc_removeDataField(this.api, _.isNumber(pivotindex) ? pivotindex : this._state.field.record.get('pivotIndex'), _.isNumber(index) ? index : this._state.field.record.get('index')); else this._originalProps.asc_removeNoDataField(this.api, _.isNumber(pivotindex) ? pivotindex : this._state.field.record.get('pivotIndex')); + Common.NotificationCenter.trigger('edit:complete', this); } }, @@ -933,6 +938,7 @@ define([ this._originalProps.asc_movePageField(this.api, from, to); break; } + Common.NotificationCenter.trigger('edit:complete', this); }, onMoveTo: function(type, pivotindex, to) { @@ -953,6 +959,7 @@ define([ this._originalProps.asc_moveToPageField(this.api, pivotIndex, index); break; } + Common.NotificationCenter.trigger('edit:complete', this); } }, diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 34e292abd..023e61e7a 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -183,7 +183,7 @@ define([ iconCls: 'toolbar__icon btn-pivot-sum', caption: this.txtCreate, disabled : false, - lock : [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer] + lock : [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.editCell] }); this.btnPivotLayout = new Common.UI.Button({ diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 3d03bc64e..650e1cf2c 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -246,10 +246,17 @@ &.mousemove { + &:first-child { + > span { + padding-left: 8px; + } + } + > span { border-left: 2px solid @gray-deep; padding-left: 9px; } + &.right { > span { border-left: 1px solid @gray-dark; diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index bc86b395d..1f82bb368 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -198,6 +198,7 @@ "SSE.Controllers.Main.errorUnexpectedGuid": "External error.
Unexpected GUID. Please contact support in case the error persists.", "SSE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", + "SSE.Controllers.Main.errorOpensource": "Using the free Community version you can open documents for viewing only. To access mobile web editors, a commercial license is required.", "SSE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "SSE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download it until the connection is restored and page is reloaded.",