Merge branch 'release/v6.0.0' into develop

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);

apps/common/main/lib/view/Header.js

@@ -117,7 +117,6 @@ define([
                                     '<div class="btn-slot" id="slot-btn-dt-redo"></div>' +
                                 '</div>' +
                                 '<div class="lr-separator" id="id-box-doc-name">' +
-                                    // '<input type="text" id="title-doc-name" spellcheck="false" data-can-copy="false" style="pointer-events: none;" disabled="disabled">' +
                                     '<label id="title-doc-name" />' +
                                 '</div>' +
                                 '<label id="title-user-name" style="pointer-events: none;"></label>' +
@@ -206,12 +205,22 @@ define([
         }
 
         function onAppShowed(config) {
-            if ( config.isCrypted && this.labelDocName ) {
+            if ( this.labelDocName ) {
+                if ( config.isCrypted ) {
                     this.labelDocName.before(
                         '<div class="inner-box-icon crypted">' +
                             '<svg class="icon"><use xlink:href="#svg-icon-crypted"></use></svg>' +
                         '</div>');
                 }
+
+                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);
+            }
         }
 
         function onAppReady(mode) {

apps/common/main/lib/view/ListSettingsDialog.js

@@ -225,7 +225,6 @@ 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,
@@ -258,6 +257,7 @@ define([
                     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;
@@ -269,7 +269,6 @@ define([
                         this._changedProps.asc_putSymbol(this.bulletProps.symbol);
                     }
                 }
-                }
             }, this));
 
             this.spnSize = new Common.UI.MetricSpinner({

apps/common/main/resources/less/buttons.less

@@ -309,7 +309,7 @@
 
     &:not(.icon-top)
     .caption:not(:empty) {
-        padding: 0 5px;
+        padding: 0 4px;
     }
 
     .icon {

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,<br>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",

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),
+                        name: name,
-                        origin: name,
+                        origin: origin,
-                        args: ((descrarr && descrarr[name]) ? descrarr[name].a : '').replace(/[,;]/g, this.api.asc_getFunctionArgumentSeparator()),
+                        args: ((descrarr && descrarr[origin]) ? descrarr[origin].a : '').replace(/[,;]/g, this.api.asc_getFunctionArgumentSeparator()),
-                        desc: (descrarr && descrarr[name]) ? descrarr[name].d : ''
+                        desc: (descrarr && descrarr[origin]) ? descrarr[origin].d : ''
                     };
 
                 (new SSE.Views.FormulaWizard({

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) {

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,

apps/spreadsheeteditor/main/app/template/SlicerSettings.template

@@ -110,11 +110,11 @@
             <div id="slicer-check-show-nodata-last"></div>
         </td>
     </tr>
-    <tr>
+    <!--<tr>-->
-        <td class="padding-small" colspan=2>
+        <!--<td class="padding-small" colspan=2>-->
-            <div id="slicer-check-show-deleted"></div>
+            <!--<div id="slicer-check-show-deleted"></div>-->
-        </td>
+        <!--</td>-->
-    </tr>
+    <!--</tr>-->
     <tr>
         <td class="padding-small" colspan=2>
             <div class="separator horizontal"></div>

apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template

@@ -52,7 +52,7 @@
                 <div class="padding-small" id="sliceradv-check-hide-nodata"></div>
                 <div class="padding-small" id="sliceradv-check-indicate-nodata"></div>
                 <div class="padding-small" id="sliceradv-check-show-nodata-last"></div>
-                <div class="padding-small" id="sliceradv-check-show-deleted"></div>
+                <!--<div class="padding-small" id="sliceradv-check-show-deleted"></div>-->
             </div>
         </div>
     </div>

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);
             }
         },
         

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({

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;

apps/spreadsheeteditor/mobile/locale/en.json

@@ -198,6 +198,7 @@
   "SSE.Controllers.Main.errorUnexpectedGuid": "External error.<br>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.<br>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,<br>but will not be able to download it until the connection is restored and page is reloaded.",