Merge branch 'release/v7.1.0' into feature/fix-bug-react

# Conflicts:
#	apps/common/mobile/resources/less/common.less

apps/common/main/lib/component/ComboBoxFonts.js

@@ -457,6 +457,7 @@ define([
                     this.trigger('show:after', this, e);
                     this.flushVisibleFontsTiles();
                     this.updateVisibleFontsTiles(null, 0);
+                    Common.Utils.isGecko && this.scroller && this.scroller.update();
                 } else {
                     Common.UI.ComboBox.prototype.onAfterShowMenu.apply(this, arguments);
                 }

apps/common/main/lib/component/DataView.js

@@ -397,13 +397,7 @@ define([
                 });
 
                 if (record) {
-                    if (this.delaySelect) {
-                        setTimeout(function () {
                     record.set({selected: true});
-                        }, 300);
-                    } else {
-                        record.set({selected: true});
-                    }
                 }
             } else {
                 if (record)
@@ -607,15 +601,31 @@ define([
 
             window._event = e;  //  for FireFox only
 
-            if (this.showLast) this.selectRecord(record);
+            if (this.showLast) {
+                if (!this.delaySelect) {
+                    this.selectRecord(record);
+                } else {
+                    _.each(this.store.where({selected: true}), function(rec){
+                        rec.set({selected: false});
+                    });
+                    if (record) {
+                        setTimeout(_.bind(function () {
+                            record.set({selected: true});
+                            this.trigger('item:click', this, view, record, e);
+                        }, this), 300);
+                    }
+                }
+            }
             this.lastSelectedRec = null;
 
             var tip = view.$el.data('bs.tooltip');
             if (tip) (tip.tip()).remove();
 
             if (!this.isSuspendEvents) {
+                if (!this.delaySelect) {
                     this.trigger('item:click', this, view, record, e);
                 }
+            }
         },
 
         onDblClickItem: function(view, record, e) {

apps/common/mobile/resources/less/common.less

@@ -124,12 +124,14 @@
         }
     }
 }
+
 // Bullets, numbers and multilevels
+
 .bullets,
 .numbers,
 .multilevels {
     .row.list {
-            margin: 5px;
+        margin: 0;
         ul {
             background: none;
             &:before, &:after {
@@ -138,8 +140,7 @@
             display: flex;
             justify-content: space-around;
             width: 100%;
-                margin-top: 10px;
+            padding: 5px;
-                padding:  0 5px;
 
             li {
                 width: 70px;
@@ -195,6 +196,14 @@
     }
 }
 
+.popover .list + .list {
+    margin-top: 0;
+}
+
+.popover .list:first-child li:first-child, .popover .list:first-child li:first-child a, .popover .list:first-child li:first-child > label, .popover .list:last-child li:last-child, .popover .list:last-child li:last-child a, .popover .list:last-child li:last-child > label {
+    border-radius: 0;
+}
+
 .shapes {
     li {
         width: 70px;

apps/documenteditor/main/app/controller/RightMenu.js

@@ -155,7 +155,8 @@ define([
             this._settings[Common.Utils.documentSettingsType.MailMerge].locked = false;
             this._settings[Common.Utils.documentSettingsType.Signature].locked = false;
 
-            var isChart = false;
+            var isChart = false,
+                isSmartArtInternal = false;
             var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
                 control_lock = false;
             for (i=0; i<SelectedObjects.length; i++)
@@ -179,6 +180,7 @@ define([
                         settingsType = Common.Utils.documentSettingsType.Chart;
                     } else if (value.get_ShapeProperties() !== null) {
                         isChart = value.get_ShapeProperties().get_FromChart();
+                        isSmartArtInternal = value.get_ShapeProperties().get_FromSmartArtInternal();
                         settingsType = Common.Utils.documentSettingsType.Shape;
                         if (value.get_ShapeProperties().asc_getTextArtProperties()) {
                             this._settings[Common.Utils.documentSettingsType.TextArt].props = value;
@@ -189,6 +191,7 @@ define([
                     control_lock = control_lock || value.get_Locked();
                 } else if (settingsType == Common.Utils.documentSettingsType.Paragraph) {
                     this._settings[settingsType].panel.isChart = isChart;
+                    this._settings[settingsType].panel.isSmartArtInternal = isSmartArtInternal;
                     can_add_table = value.get_CanAddTable();
                     control_lock = control_lock || value.get_Locked();
                 }

apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -182,7 +182,7 @@
                     <label class="input-label"><%= scope.textAlign %></label>
                     <div id="paraadv-cmb-align"></div>
                 </div>
-                <div class="padding-large" style="display: inline-block;">
+                <div class="padding-large text-only" style="display: inline-block;">
                     <label class="input-label"><%= scope.textLeader %></label>
                     <div id="paraadv-cmb-leader"></div>
                 </div>

apps/documenteditor/main/app/template/StatusBar.template

@@ -1,36 +1,36 @@
 
 <div class="statusbar" style="display:table;">
     <div class="status-group dropup">
-        <label id="label-pages" class="status-label dropdown-toggle" style="margin-left: 40px;" data-toggle="dropdown" data-hint="0" data-hint-direction="top"><%= textPageNumber %></label>
+        <label id="label-pages" class="status-label dropdown-toggle margin-top-large" style="margin-left: 40px;" data-toggle="dropdown" data-hint="0" data-hint-direction="top"><%= textPageNumber %></label>
         <div id="status-goto-box" class="dropdown-menu">
             <label style="float:left;line-height:22px;"><%= textGotoPage %></label>
             <div id="status-goto-page" style="display:inline-block;"></div>
         </div>
     </div>
     <div class="status-group" style="width:100%; text-align:center;">
-        <label id="label-action" class="status-label" data-layout-name="statusBar-actionStatus"></label>
+        <label id="label-action" class="status-label margin-top-large" data-layout-name="statusBar-actionStatus"></label>
     </div>
     <div class="status-group" style="">
         <div class="separator short el-edit"></div>
-        <span id="btn-cnt-lang" class="el-edit" data-layout-name="statusBar-textLang"></span>
+        <span id="btn-cnt-lang" class="el-edit margin-top-small" data-layout-name="statusBar-textLang"></span>
-        <span id="btn-doc-lang" class="el-edit" data-layout-name="statusBar-docLang"></span>
+        <span id="btn-doc-lang" class="el-edit margin-top-small" data-layout-name="statusBar-docLang"></span>
         <div class="separator short el-edit space"></div>
-        <span id="btn-doc-spell" class="el-edit"></span>
+        <span id="btn-doc-spell" class="el-edit margin-top-small"></span>
         <div class="separator short el-edit el-lang"></div>
-        <div id="btn-doc-review" class="el-edit el-review" style="display: inline-block;"></div>
+        <div id="btn-doc-review" class="el-edit el-review margin-top-small" style="display: inline-block;"></div>
         <div class="separator short el-edit el-review"></div>
         <div class="separator short hide-select-tools"></div>
-        <button id="btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-select-tool">&nbsp;</span></button>
+        <button id="btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-select-tool">&nbsp;</span></button>
-        <button id="btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-hand-tool">&nbsp;</span></button>
+        <button id="btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-hand-tool">&nbsp;</span></button>
         <div class="separator short hide-select-tools"></div>
-        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</span></button>
+        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</span></button>
-        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
+        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
-        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
+        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
         <div class="cnt-zoom">
             <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
                 <label id="label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>
-        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
+        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
     </div>
 </div>

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -1694,6 +1694,7 @@ define([
                                 paragraphProps      : elValue,
                                 borderProps         : me.borderAdvancedProps,
                                 isChart             : (item.isChart===true),
+                                isSmartArtInternal  : (item.isSmartArtInternal===true),
                                 api             : me.api,
                                 handler: function(result, value) {
                                     if (result == 'ok') {
@@ -2767,9 +2768,11 @@ define([
                     menuImgReplace.menu.items[2].setVisible(me.mode.canRequestInsertImage || me.mode.fileChoiceUrl && me.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
 
                     menuImgRotate.setVisible(!value.imgProps.isChart && (pluginGuid===null || pluginGuid===undefined));
-                    if (menuImgRotate.isVisible())
+                    if (menuImgRotate.isVisible()) {
                         menuImgRotate.setDisabled(islocked || value.imgProps.isSmartArt);
-
+                        menuImgRotate.menu.items[3].setDisabled(value.imgProps.isSmartArtInternal);
+                        menuImgRotate.menu.items[4].setDisabled(value.imgProps.isSmartArtInternal);
+                    }
                     me.menuImgCrop.setVisible(me.api.asc_canEditCrop());
                     if (me.menuImgCrop.isVisible())
                         me.menuImgCrop.setDisabled(islocked);
@@ -4056,6 +4059,7 @@ define([
                         me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270);
                     }
                     menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart);
+                    menuParagraphAdvanced.isSmartArtInternal = (value.imgProps && value.imgProps.isSmartArtInternal);
                     menuParagraphBreakBefore.setVisible(!isInShape && !isInChart && !isEquation);
                     menuParagraphKeepLines.setVisible(!isInShape && !isInChart && !isEquation);
                     if (value.paraProps) {

apps/documenteditor/main/app/view/ImageSettingsAdvanced.js

@@ -1561,6 +1561,8 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
                 }
                 if (props.get_FromSmartArtInternal()) {
                     this.chAutofit.setDisabled(true);
+                    this.chFlipHor.setDisabled(true);
+                    this.chFlipVert.setDisabled(true);
                 }
 
                 var stroke = props.get_stroke();

apps/documenteditor/main/app/view/ParagraphSettings.js

@@ -87,6 +87,7 @@ define([
             this.lockedControls = [];
             this._locked = true;
             this.isChart = false;
+            this.isSmartArtInternal = false;
 
             this._arrLineRule = [
                 {displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'},
@@ -452,7 +453,7 @@ define([
                 this.createDelayedElements();
 
             this.disableControls(this._locked);
-            this.hideTextOnlySettings(this.isChart);
+            this.hideTextOnlySettings(this.isChart || this.isSmartArtInternal);
 
             if (prop) {
                 var Spacing = {
@@ -635,6 +636,7 @@ define([
                                 paragraphProps: elValue,
                                 borderProps: me.borderAdvancedProps,
                                 isChart: me.isChart,
+                                isSmartArtInternal: me.isSmartArtInternal,
                                 api: me.api,
                                 handler: function(result, value) {
                                     if (result == 'ok') {

apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js

@@ -95,6 +95,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.api = this.options.api;
             this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps);
             this.isChart = this.options.isChart;
+            this.isSmartArtInternal = this.options.isSmartArtInternal;
 
             this.CurLineRuleIdx = this._originalProps.get_Spacing().get_LineRule();
 
@@ -410,7 +411,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             _.each(_arrBorderPresets, function(item, index, list){
                 var _btn = new Common.UI.Button({
                     parentEl: $('#'+item[2]),
-                    style: 'margin-left: 5px; margin-bottom: 4px;',
+                    style: 'margin-left: 4px; margin-bottom: 4px;',
                     cls: 'btn-options large border-off',
                     iconCls: item[1],
                     strId   :item[0],
@@ -549,7 +550,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                     '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
                     '<div style="width:117px;display: inline-block;"><%= value %></div>',
                     '<div style="width:121px;display: inline-block;"><%= displayTabAlign %></div>',
-                    '<div style="width:96px;display: inline-block;"><%= displayTabLeader %></div>',
+                    (this.isChart || this.isSmartArtInternal) ? '' : '<div style="width:96px;display: inline-block;"><%= displayTabLeader %></div>',
                     '</div>'
                 ].join('')),
                 tabindex: 1
@@ -809,7 +810,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             if (props ){
                 this._originalProps = new Asc.asc_CParagraphProperty(props);
 
-                this.hideTextOnlySettings(this.isChart);
+                this.hideTextOnlySettings(this.isChart || this.isSmartArtInternal);
 
                 this.FirstLine = (props.get_Ind() !== null) ? props.get_Ind().get_FirstLine() : null;
                 this.LeftIndent = (props.get_Ind() !== null) ? props.get_Ind().get_Left() : null;

apps/documenteditor/main/app/view/ShapeSettings.js

@@ -822,6 +822,8 @@ define([
                 this._originalProps = new Asc.asc_CImgProperty(props);
 
                 this._noApply = true;
+                this._state.isFromImage = !!shapeprops.get_FromImage();
+                this._state.isFromSmartArtInternal = !!shapeprops.get_FromSmartArtInternal();
 
                 this.disableControls(this._locked, !shapeprops.get_CanFill());
                 this.hideShapeOnlySettings(shapeprops.get_FromChart() || !!shapeprops.get_FromImage());
@@ -832,10 +834,8 @@ define([
                     || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
                     || shapetype=='straightConnector1';
                 this.hideChangeTypeSettings(hidechangetype || control_props);
-                this._state.isFromImage = !!shapeprops.get_FromImage();
-                this._state.isFromSmartArtInternal = !!shapeprops.get_FromSmartArtInternal();
                 if (!hidechangetype && this.btnChangeShape.menu.items.length) {
-                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || shapeprops.get_FromSmartArtInternal());
+                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || this._state.isFromSmartArtInternal);
                 }
 
                 var value = props.get_WrappingStyle();
@@ -1986,6 +1986,8 @@ define([
                 });
                 this.linkAdvanced.toggleClass('disabled', disable);
             }
+            this.btnFlipV.setDisabled(disable || this._state.isFromSmartArtInternal);
+            this.btnFlipH.setDisabled(disable || this._state.isFromSmartArtInternal);
         },
 
         hideShapeOnlySettings: function(value) {

apps/documenteditor/main/app/view/TableSettingsAdvanced.js

@@ -948,7 +948,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             _.each(_arrBorderPresets, function(item, index, list){
                 var _btn = new Common.UI.Button({
                     parentEl: $('#'+item[2]),
-                    style: 'margin-left: 5px; margin-bottom: 4px;',
+                    style: 'margin-left: 4px; margin-bottom: 4px;',
                     cls: 'btn-options large border-off',
                     iconCls: item[1],
                     strId   :item[0],
@@ -974,7 +974,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             _.each(_arrTableBorderPresets, function(item, index, list){
                 var _btn = new Common.UI.Button({
                     parentEl: $('#'+item[3]),
-                    style: 'margin-left: 5px; margin-bottom: 4px;',
+                    style: 'margin-left: 4px; margin-bottom: 4px;',
                     cls: 'btn-options large border-off',
                     iconCls: item[2],
                     strCellId  :item[0],

apps/documenteditor/main/app/view/Toolbar.js

@@ -291,7 +291,6 @@ define([
                         dataHintOffset: '0, -16'
                     });
                     this.paragraphControls.push(this.btnHighlightColor);
-                    this.textOnlyControls.push(this.btnHighlightColor);
 
                     this.btnFontColor = new Common.UI.ButtonColored({
                         id: 'id-toolbar-btn-fontcolor',

apps/documenteditor/main/resources/less/statusbar.less

@@ -4,15 +4,11 @@
 
     .status-label {
         position: relative;
-        top: 1px;
     }
 
     #label-pages, #label-zoom {
         cursor: pointer;
     }
-    #label-pages, #label-action {
-        margin-top: 2px;
-    }
 
     #users-icon,#status-users-count {
         display: inline-block;
@@ -41,11 +37,20 @@
     .status-group {
         display: table-cell;
         white-space: nowrap;
-        padding-top: 3px;
         vertical-align: top;
         &.dropup {
             position: static;
         }
+
+        .status-label.margin-top-large {
+            margin-top: 6px;
+        }
+
+        button.margin-top-small,
+        .margin-top-small > button,
+        .margin-top-small > .btn-group {
+            margin-top: 3px;
+        }
     }
 
     .separator {
@@ -53,7 +58,6 @@
 
         &.short {
             height: 25px;
-            margin-top: -2px;
         }
 
         &.space {
@@ -70,7 +74,8 @@
 
     .cnt-zoom {
         display: inline-block;
-
+        vertical-align: middle;
+        margin-top: 4px;
         .dropdown-menu {
             min-width: 80px;
             margin-left: -4px;

apps/documenteditor/mobile/locale/az.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Konkurs",
     "txtScheme7": "Bərabər",
     "txtScheme8": "Axın",
-    "txtScheme9": "Emalatxana"
+    "txtScheme9": "Emalatxana",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Saxlanmamış dəyişiklikləriniz var. Avtomatik saxlanmanı gözləmək üçün \"Bu Səhifədə Qalın\" üzərinə klikləyin. Bütün saxlanmamış dəyişiklikləri ləğv etmək üçün \"Bu səhifədən Çıxın\" hissəsinin üzərinə klikləyin.",

apps/documenteditor/mobile/locale/be.json

@@ -612,6 +612,12 @@
     "textDownloadTxt": "If you continue saving in this format all features except the text will be lost. Are you sure you want to continue?",
     "textEnableAllMacrosWithoutNotification": "Enable all macros without notification",
     "textFindAndReplaceAll": "Find and Replace All",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No",
     "txtDownloadTxt": "Download TXT",
     "txtIncorrectPwd": "Password is incorrect",
     "txtProtected": "Once you enter the password and open the file, the current password will be reset",

apps/documenteditor/mobile/locale/bg.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/ca.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Esplanada",
     "txtScheme7": "Equitat",
     "txtScheme8": "Flux",
-    "txtScheme9": "Foneria"
+    "txtScheme9": "Foneria",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Tens canvis sense desar. Fes clic a \"Mantingueu-vos en aquesta pàgina\" per esperar al desament automàtic. Fes clic a \"Deixar aquesta pàgina\" per descartar tots els canvis no desats.",

apps/documenteditor/mobile/locale/cs.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Hala",
     "txtScheme7": "Rovnost",
     "txtScheme8": "Tok",
-    "txtScheme9": "Slévárna"
+    "txtScheme9": "Slévárna",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "V tomto dokumentu máte neuložené změny. Klikněte na 'Zůstat na této stránce'. Klikněte na 'Opustit tuto stránku' pro zahození neuložených změn.",

apps/documenteditor/mobile/locale/da.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/de.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Halle",
     "txtScheme7": "Kapital",
     "txtScheme8": "Fluss",
-    "txtScheme9": "Gießerei"
+    "txtScheme9": "Gießerei",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Sie haben nicht gespeicherte Änderungen. Klicken Sie auf \"Auf dieser Seite bleiben\" und warten Sie, bis die Datei automatisch gespeichert wird. Klicken Sie auf \"Die Seite verlassen\", um nicht gespeicherte Änderungen zu verwerfen.",

apps/documenteditor/mobile/locale/el.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Συνάθροιση",
     "txtScheme7": "Μετοχή",
     "txtScheme8": "Ροή",
-    "txtScheme9": "Χυτήριο"
+    "txtScheme9": "Χυτήριο",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Έχετε μη αποθηκευμένες αλλαγές. Πατήστε 'Παραμονή στη Σελίδα' για να περιμένετε την αυτόματη αποθήκευση. Πατήστε 'Έξοδος από τη Σελίδα' για να απορρίψετε όλες τις μη αποθηκευμένες αλλαγές.",

apps/documenteditor/mobile/locale/es.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Concurrencia",
     "txtScheme7": "Equidad ",
     "txtScheme8": "Flujo",
-    "txtScheme9": "Fundición"
+    "txtScheme9": "Fundición",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Tiene cambios sin guardar. Haga clic en \"Permanecer en esta página\" para esperar a que se guarde automáticamente. Haga clic en \"Salir de esta página\" para descartar todos los cambios no guardados.",

apps/documenteditor/mobile/locale/fi.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/fr.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Rotonde",
     "txtScheme7": "Capitaux",
     "txtScheme8": "Flux",
-    "txtScheme9": "Fonderie"
+    "txtScheme9": "Fonderie",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur Rester sur cette page et attendez l'enregistrement automatique. Cliquez sur Quitter cette page pour annuler toutes les modifications non enregistrées.",

apps/documenteditor/mobile/locale/gl.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Concorrencia",
     "txtScheme7": "Equidade",
     "txtScheme8": "Fluxo",
-    "txtScheme9": "Fundición"
+    "txtScheme9": "Fundición",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Ten cambios sen gardar. Prema en \"Permanecer nesta páxina\" para esperar a que se garde automaticamente. Prema en \"Saír desta páxina\" para descartar todos os cambios non gardados.",

apps/documenteditor/mobile/locale/hu.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Előcsarnok",
     "txtScheme7": "Saját tőke",
     "txtScheme8": "Folyam",
-    "txtScheme9": "Öntöde"
+    "txtScheme9": "Öntöde",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Nem mentett módosításai vannak. Kattintson a „Maradj ezen az oldalon” gombra az automatikus mentés megvárásához. Kattintson a \"Hagyja el ezt az oldalt\" gombra az összes nem mentett módosítás elvetéséhez.",

apps/documenteditor/mobile/locale/it.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Concorso",
     "txtScheme7": "Equità",
     "txtScheme8": "Flusso",
-    "txtScheme9": "Fonderia"
+    "txtScheme9": "Fonderia",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Hai dei cambiamenti non salvati. Premi 'Rimanere sulla pagina' per attendere il salvataggio automatico. Premi 'Lasciare la pagina' per eliminare tutte le modifiche non salvate.",

apps/documenteditor/mobile/locale/ja.json

@@ -615,7 +615,13 @@
     "txtScheme6": "コンコース",
     "txtScheme7": "株主資本",
     "txtScheme8": "フロー",
-    "txtScheme9": "ファウンドリ"
+    "txtScheme9": "ファウンドリ",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "保存されていない変更があります。自動保存を待つように「このページから移動しない」をクリックしてください。保存されていない変更を破棄ように「このページから移動する」をクリックしてください。",

apps/documenteditor/mobile/locale/ko.json

@@ -615,7 +615,13 @@
     "txtScheme6": "광장",
     "txtScheme7": "같음",
     "txtScheme8": "플로우",
-    "txtScheme9": "발견"
+    "txtScheme9": "발견",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "저장하지 않은 변경 사항이 있습니다. 자동 저장이 완료될 때까지 기다리려면 \"이 페이지에 머물기\"를 클릭하십시오. \"이 페이지에서 나가기\"를 클릭하면 저장되지 않은 모든 변경 사항이 삭제됩니다.",

apps/documenteditor/mobile/locale/lo.json

@@ -606,6 +606,12 @@
     "textMarginsW": "Left and right margins are too wide for a given page width",
     "textOpenFile": "Enter a password to open the file",
     "textPages": "Pages",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No",
     "txtDownloadTxt": "Download TXT",
     "txtIncorrectPwd": "Password is incorrect",
     "txtProtected": "Once you enter the password and open the file, the current password will be reset",

apps/documenteditor/mobile/locale/lv.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/nb.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/nl.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Concours",
     "txtScheme7": "Vermogen",
     "txtScheme8": "Stroom",
-    "txtScheme9": "Gieterij"
+    "txtScheme9": "Gieterij",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "U heeft nog niet opgeslagen wijzigingen. Klik op 'Blijf op deze pagina' om te wachten op automatisch opslaan. Klik op 'Verlaat deze pagina' om alle niet-opgeslagen wijzigingen te verwijderen.",

apps/documenteditor/mobile/locale/pl.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/pt.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Concurso",
     "txtScheme7": "Patrimônio Líquido",
     "txtScheme8": "Fluxo",
-    "txtScheme9": "Fundição"
+    "txtScheme9": "Fundição",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Você tem mudanças não salvas. Clique em 'Ficar nesta página' para esperar pela auto-salvar. Clique em 'Sair desta página' para descartar todas as mudanças não salvas.",

apps/documenteditor/mobile/locale/ro.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Concurență",
     "txtScheme7": "Echilibru",
     "txtScheme8": "Flux",
-    "txtScheme9": "Forjă"
+    "txtScheme9": "Forjă",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Nu ați salvat modificările din documentul. Faceți clic pe Rămâi în pagină și așteptați la salvare automată. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.",

apps/documenteditor/mobile/locale/ru.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Открытая",
     "txtScheme7": "Справедливость",
     "txtScheme8": "Поток",
-    "txtScheme9": "Литейная"
+    "txtScheme9": "Литейная",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",

apps/documenteditor/mobile/locale/sk.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Hala",
     "txtScheme7": "Spravodlivosť",
     "txtScheme8": "Tok",
-    "txtScheme9": "Zlieváreň"
+    "txtScheme9": "Zlieváreň",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Máte neuložené zmeny. Kliknite na „Zostať na tejto stránke“ a počkajte na automatické uloženie. Kliknutím na „Opustiť túto stránku“ zahodíte všetky neuložené zmeny.",

apps/documenteditor/mobile/locale/sl.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/sv.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/tr.json

@@ -614,6 +614,12 @@
     "txtScheme7": "Net Değer",
     "txtScheme8": "Yayılma",
     "txtScheme9": "Döküm",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No",
     "txtScheme14": "Oriel",
     "txtScheme19": "Trek"
   },

apps/documenteditor/mobile/locale/uk.json

@@ -615,7 +615,13 @@
     "txtScheme6": "Відкрита",
     "txtScheme7": "Власний",
     "txtScheme8": "Потік",
-    "txtScheme9": "Ливарна"
+    "txtScheme9": "Ливарна",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "У документі є незбережені зміни. Натисніть 'Залишитись на сторінці', щоб дочекатися автозбереження. Натисніть 'Піти зі сторінки', щоб скинути всі незбережені зміни.",

apps/documenteditor/mobile/locale/vi.json

@@ -615,7 +615,13 @@
     "textParagraphs": "Paragraphs",
     "textSpaces": "Spaces",
     "textSymbols": "Symbols",
-    "textWords": "Words"
+    "textWords": "Words",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/zh.json

@@ -615,7 +615,13 @@
     "txtScheme6": "汇合",
     "txtScheme7": "公平",
     "txtScheme8": "流动",
-    "txtScheme9": "发现"
+    "txtScheme9": "发现",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "你有未保存的修改。点击“留在该页”可等待自动保存完成。点击“离开该页”将丢弃全部未经保存的修改。",

apps/documenteditor/mobile/src/controller/ContextMenu.jsx

@@ -227,7 +227,7 @@ class ContextMenu extends ContextMenuController {
         } else {
             const { t } = this.props;
             const _t = t("ContextMenu", {returnObjects: true});
-            const { canViewComments, canCoAuthoring, canComments } = this.props;
+            const { canViewComments, canCoAuthoring, canComments, dataDoc } = this.props;
 
             const api = Common.EditorApi.get();
             const stack = api.getSelectedElements();

apps/documenteditor/mobile/src/controller/Main.jsx

@@ -658,7 +658,9 @@ class MainController extends Component {
         const storeDocumentInfo = this.props.storeDocumentInfo;
 
         this.api.asc_registerCallback("asc_onGetDocInfoStart", () => {
+            this.timerLoading = setTimeout(() => {
                 storeDocumentInfo.switchIsLoaded(false);
+            }, 2000);
         });
 
         this.api.asc_registerCallback("asc_onGetDocInfoStop", () => {
@@ -666,10 +668,20 @@ class MainController extends Component {
         });
 
         this.api.asc_registerCallback("asc_onDocInfo", (obj) => {
-            storeDocumentInfo.changeCount(obj);
+            clearTimeout(this.timerLoading);
+
+            this.objectInfo = obj;
+            if(!this.timerDocInfo) {
+                this.timerDocInfo = setInterval(() => {
+                    storeDocumentInfo.changeCount(this.objectInfo);
+                }, 300);
+                storeDocumentInfo.changeCount(this.objectInfo);
+            }
         });
 
         this.api.asc_registerCallback('asc_onGetDocInfoEnd', () => {
+          clearTimeout(this.timerLoading);
+          clearInterval(this.timerDocInfo);
           storeDocumentInfo.switchIsLoaded(true);
         });
 

apps/documenteditor/mobile/src/less/app.less

@@ -239,3 +239,9 @@
         color: @brandColor;
     }
 }
+
+.calendar-sheet {
+    .calendar-month-picker, .calendar-year-picker {
+        border-top: 1px solid var(--background-menu-divider);
+    }
+}

apps/documenteditor/mobile/src/store/documentInfo.js

@@ -20,7 +20,7 @@ export class storeDocumentInfo {
     symbolsWSCount: 0,
   };
 
-  isLoaded = false;
+  isLoaded = true;
   dataDoc;
 
   switchIsLoaded(value) {

apps/documenteditor/mobile/src/view/edit/EditText.jsx

@@ -207,11 +207,7 @@ const PageBullets = observer(props => {
                             <ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) && 
                                 (storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
                                 onClick={() => {
-                                    if (bullet.type === -1) {
-                                        storeTextSettings.resetBullets(-1);
-                                    } else {
                                     storeTextSettings.resetBullets(bullet.type);
-                                    }
                                     props.onBullet(bullet.type);
                                 }}>
                                 {bullet.thumb.length < 1 ?
@@ -256,11 +252,7 @@ const PageNumbers = observer(props => {
                         <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
                             (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
                             onClick={() => {
-                                if (number.type === -1) {
-                                    storeTextSettings.resetNumbers(-1);
-                                } else {
                                 storeTextSettings.resetNumbers(number.type);
-                                }
                                 props.onNumber(number.type);
                             }}>
                             {number.thumb.length < 1 ?

apps/presentationeditor/embed/locale/id.json

@@ -13,11 +13,16 @@
   "PE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1",
   "PE.ApplicationController.errorFilePassProtect": "File diproteksi kata sandi",
   "PE.ApplicationController.errorFileSizeExceed": "Ukuran file melebihi",
+  "PE.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
+  "PE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.<br>Silakan kontak admin Server Dokumen Anda.",
+  "PE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Hubungan internet telah",
   "PE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
   "PE.ApplicationController.notcriticalErrorTitle": "Peringatan",
+  "PE.ApplicationController.openErrorText": "Eror ketika membuka file.",
   "PE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat,",
   "PE.ApplicationController.textAnonymous": "Anonim",
+  "PE.ApplicationController.textGuest": "Tamu",
   "PE.ApplicationController.textLoadingDocument": "Memuat penyajian",
   "PE.ApplicationController.textOf": "Dari",
   "PE.ApplicationController.txtClose": "Tutup",
@@ -28,5 +33,6 @@
   "PE.ApplicationView.txtEmbed": "Melekatkan",
   "PE.ApplicationView.txtFileLocation": "Buka Dokumen",
   "PE.ApplicationView.txtFullScreen": "Layar penuh",
+  "PE.ApplicationView.txtPrint": "Cetak",
   "PE.ApplicationView.txtShare": "Bagikan"
 }

apps/presentationeditor/main/app/controller/Animation.js

@@ -347,8 +347,11 @@ define([
         onFocusObject: function(selectedObjects) {
             this.AnimationProperties = null;
             for (var i = 0; i<selectedObjects.length; i++) {
-                if (selectedObjects[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.Animation) {
+                var type = selectedObjects[i].get_ObjectType();
+                if (type == Asc.c_oAscTypeSelectElement.Animation) {
                     this.AnimationProperties = selectedObjects[i].get_ObjectValue();
+                } else if (type==Asc.c_oAscTypeSelectElement.Slide) {
+                    this._state.timingLock = selectedObjects[i].get_ObjectValue().get_LockTiming();
                 }
             }
             if (this._state.onactivetab)
@@ -548,6 +551,8 @@ define([
                 this.lockToolbar(PE.enumLock.noAnimationRepeat, this._state.noAnimationRepeat);
             if (this._state.noAnimationDuration != undefined)
                 this.lockToolbar(PE.enumLock.noAnimationDuration, this._state.noAnimationDuration);
+            if (this._state.timingLock != undefined)
+                this.lockToolbar(PE.enumLock.timingLock, this._state.timingLock);
         }
 
     }, PE.Controllers.Animation || {}));

apps/presentationeditor/main/app/template/StatusBar.template

@@ -1,10 +1,10 @@
 
 <div class="statusbar" style="display:table;">
     <div class="status-group">
-        <div id="slot-status-btn-preview" style="display: inline-block;margin-left: 9px;"></div>
+        <div id="slot-status-btn-preview" style="display: inline-block;margin-left: 9px;" class="margin-top-small"></div>
     </div>
     <div class="status-group dropup">
-        <label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px; display: none;" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
+        <label id="status-label-pages" class="status-label dropdown-toggle margin-top-large" style="margin-left: 7px; display: none;" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
         <div id="status-goto-box" class="dropdown-menu">
             <label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>
             <div id="status-goto-page" style="display:inline-block;"></div>
@@ -24,22 +24,22 @@
         <div class="separator short" style="margin-left: 10px;"></div>
     </div>
     <div class="status-group" style="width:100%; text-align:center;">
-        <label id="status-label-action" class="status-label" data-layout-name="statusBar-actionStatus"></label>
+        <label id="status-label-action" class="status-label margin-top-large" data-layout-name="statusBar-actionStatus"></label>
     </div>
     <div class="status-group" style="">
-        <span id="btn-cnt-lang" class="el-edit" data-layout-name="statusBar-textLang"></span>
+        <span id="btn-cnt-lang" class="el-edit margin-top-small" data-layout-name="statusBar-textLang"></span>
-        <span id="btn-doc-lang" class="el-edit" data-layout-name="statusBar-docLang"></span>
+        <span id="btn-doc-lang" class="el-edit margin-top-small" data-layout-name="statusBar-docLang"></span>
         <div class="separator short el-edit space"></div>
-        <span id="btn-doc-spell" class="el-edit"></span>
+        <span id="btn-doc-spell" class="el-edit margin-top-small"></span>
         <div class="separator short el-edit el-lang"></div>
-        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtoslide"></i></button>
+        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtoslide">&nbsp;</span></button>
-        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth"></i></button>
+        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
-        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown"></i></button>
+        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
         <div class="cnt-zoom">
             <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
                 <label id="status-label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>
-        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon toolbar__icon btn-zoomup"></i></button>
+        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
     </div>
 </div>

apps/presentationeditor/main/app/view/Animation.js

@@ -207,7 +207,7 @@ define([
                     store: new Common.UI.DataViewStore(this._arrEffectName),
                     additionalMenuItems: [{caption: '--'}, this.listEffectsMore],
                     enableKeyEvents: true,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: '-16, 0',
@@ -241,7 +241,7 @@ define([
                     caption: this.txtPreview,
                     split: false,
                     iconCls: 'toolbar__icon animation-preview-start',
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noAnimationPreview],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noAnimationPreview, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -253,7 +253,7 @@ define([
                     caption: this.txtParameters,
                     iconCls: 'toolbar__icon icon animation-parameters',
                     menu: new Common.UI.Menu({items: []}),
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationParam],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationParam, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -265,7 +265,7 @@ define([
                     caption: this.txtAnimationPane,
                     split: true,
                     iconCls: 'toolbar__icon transition-apply-all',
-                    lock: [_set.slideDeleted, _set.noSlides],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'medium'
@@ -277,7 +277,7 @@ define([
                     caption: this.txtAddEffect,
                     iconCls: 'toolbar__icon icon add-animation',
                     menu: true,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -298,7 +298,7 @@ define([
                         {value: 1, displayValue: this.str1},
                         {value: 0.5, displayValue: this.str0_5}
                     ],
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'top',
                     dataHintOffset: 'small'
@@ -309,7 +309,7 @@ define([
                     el: this.$el.find('#animation-duration'),
                     iconCls: 'toolbar__icon animation-duration',
                     caption: this.strDuration,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration]
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration, _set.timingLock]
                 });
                 this.lockedControls.push(this.lblDuration);
 
@@ -318,7 +318,7 @@ define([
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-trigger',
                     caption: this.strTrigger,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.timingLock],
                     menu        : new Common.UI.Menu({
                          items: [
                             {
@@ -351,7 +351,7 @@ define([
                     defaultUnit: this.txtSec,
                     maxValue: 300,
                     minValue: 0,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'big'
@@ -362,7 +362,7 @@ define([
                     el: this.$el.find('#animation-delay'),
                     iconCls: 'toolbar__icon animation-delay',
                     caption: this.strDelay,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation]
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock]
                 });
                 this.lockedControls.push(this.lblDelay);
 
@@ -370,7 +370,7 @@ define([
                     cls: 'input-group-nr',
                     menuStyle: 'min-width: 100%;',
                     editable: false,
-                    lock: [_set.slideDeleted,  _set.noSlides, _set.noGraphic, _set.noAnimation],
+                    lock: [_set.slideDeleted,  _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock],
                     data: [
                         {value: AscFormat.NODE_TYPE_CLICKEFFECT, displayValue: this.textStartOnClick},
                         {value: AscFormat.NODE_TYPE_WITHEFFECT, displayValue: this.textStartWithPrevious},
@@ -386,14 +386,14 @@ define([
                     el: this.$el.find('#animation-label-start'),
                     iconCls: 'toolbar__icon btn-preview-start',
                     caption: this.strStart,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation]
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock]
                 });
                 this.lockedControls.push(this.lblStart);
 
                 this.chRewind = new Common.UI.CheckBox({
                     el: this.$el.find('#animation-checkbox-rewind'),
                     labelText: this.strRewind,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
@@ -405,7 +405,7 @@ define([
                     cls: 'input-group-nr',
                     menuStyle: 'min-width: 100%;',
                     editable: true,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat, _set.timingLock],
                     data: [
                         {value: 1, displayValue: this.textNoRepeat},
                         {value: 2, displayValue: "2"},
@@ -426,7 +426,7 @@ define([
                     el: this.$el.find('#animation-repeat'),
                     iconCls: 'toolbar__icon animation-repeat',
                     caption: this.strRepeat,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat]
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat, _set.timingLock]
                 });
                 this.lockedControls.push(this.lblRepeat);
 
@@ -436,7 +436,7 @@ define([
                     iconCls: 'toolbar__icon btn-arrow-up',
                     style: 'min-width: 82px',
                     caption: this.textMoveEarlier,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationEarlier],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationEarlier, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'medium'
@@ -449,7 +449,7 @@ define([
                     iconCls: 'toolbar__icon btn-arrow-down',
                     style: 'min-width: 82px',
                     caption: this.textMoveLater,
-                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationLater],
+                    lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationLater, _set.timingLock],
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'medium'

apps/presentationeditor/main/app/view/DocumentHolder.js

@@ -3579,8 +3579,11 @@ define([
                     mnuArrangeBackward.setDisabled(inSmartartInternal);
 
                     menuImgShapeRotate.setVisible(_.isUndefined(value.chartProps) && (pluginGuid===null || pluginGuid===undefined));
-                    if (menuImgShapeRotate.isVisible())
+                    if (menuImgShapeRotate.isVisible()) {
                         menuImgShapeRotate.setDisabled(disabled || (value.shapeProps && value.shapeProps.value.get_FromSmartArt()));
+                        menuImgShapeRotate.menu.items[3].setDisabled(inSmartartInternal);
+                        menuImgShapeRotate.menu.items[4].setDisabled(inSmartartInternal);
+                    }
 
                     // image properties
                     menuImgOriginalSize.setVisible(isimage);

apps/presentationeditor/main/app/view/ShapeSettings.js

@@ -766,6 +766,8 @@ define([
             {
                 this._originalProps = props;
                 this._noApply = true;
+                this._state.isFromImage = !!props.get_FromImage();
+                this._state.isFromSmartArtInternal = !!props.get_FromSmartArtInternal();
 
                 var shapetype = props.asc_getType();
 
@@ -778,10 +780,8 @@ define([
                     || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
                     || shapetype=='straightConnector1';
                 this.hideChangeTypeSettings(hidechangetype);
-                this._state.isFromImage = !!props.get_FromImage();
-                this._state.isFromSmartArtInternal = !!props.get_FromSmartArtInternal();
                 if (!hidechangetype && this.btnChangeShape.menu.items.length) {
-                    this.btnChangeShape.shapePicker.hideTextRect(props.get_FromImage() || props.get_FromSmartArtInternal());
+                    this.btnChangeShape.shapePicker.hideTextRect(props.get_FromImage() || this._state.isFromSmartArtInternal);
                 }
 
                 // background colors
@@ -1849,6 +1849,8 @@ define([
                 });
                 this.linkAdvanced.toggleClass('disabled', disable);
             }
+            this.btnFlipV.setDisabled(disable || this._state.isFromSmartArtInternal);
+            this.btnFlipH.setDisabled(disable || this._state.isFromSmartArtInternal);
         },
 
         hideShapeOnlySettings: function(value) {

apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js

@@ -576,6 +576,8 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                     this.radioNofit.setDisabled(true);
                     this.radioShrink.setDisabled(true);
                     this.radioFit.setDisabled(true);
+                    this.chFlipHor.setDisabled(true);
+                    this.chFlipVert.setDisabled(true);
                 }
 
                 this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Width()).toFixed(2), true);

apps/presentationeditor/main/app/view/Toolbar.js

@@ -95,7 +95,8 @@ define([
         noMoveAnimationLater: 'no-move-animation-later',
         noAnimationPreview: 'no-animation-preview',
         noAnimationRepeat: 'no-animation-repeat',
-        noAnimationDuration: 'no-animation-duration'
+        noAnimationDuration: 'no-animation-duration',
+        timingLock: 'timing-lock'
     };
 
     PE.Views.Toolbar =  Common.UI.Mixtbar.extend(_.extend((function(){
@@ -402,7 +403,7 @@ define([
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
-                        lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inSmartart, _set.inSmartartInternal],
+                        lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
                         menu: new Common.UI.Menu({
                             style: 'min-width: 100px;',
                             items: [

apps/presentationeditor/main/resources/less/statusbar.less

@@ -4,17 +4,12 @@
 
     .status-label {
         position: relative;
-        top: 1px;
     }
 
     #status-label-pages, #status-label-zoom {
         cursor: pointer;
     }
 
-    #status-label-pages, #status-label-action {
-        margin-top: 2px;
-    }
-
     #status-users-icon, #status-users-count {
         display: inline-block;
         cursor: pointer;
@@ -44,10 +39,19 @@
         display: table-cell;
         white-space: nowrap;
         vertical-align: top;
-        padding-top: 3px;
         &.dropup {
             position: static;
         }
+
+        .status-label.margin-top-large {
+            margin-top: 6px;
+        }
+
+        button.margin-top-small,
+        .margin-top-small > button,
+        .margin-top-small > .btn-group {
+            margin-top: 3px;
+        }
     }
 
     .separator {
@@ -55,7 +59,6 @@
 
         &.short {
             height: 25px;
-            margin-top: -2px;
         }
 
         &.space {
@@ -72,7 +75,8 @@
 
     .cnt-zoom {
         display: inline-block;
-
+        vertical-align: middle;
+        margin-top: 4px;
         .dropdown-menu {
             min-width: 80px;
             margin-left: -4px;

apps/presentationeditor/mobile/src/view/edit/EditText.jsx

@@ -490,7 +490,7 @@ const PageAdditionalFormatting = props => {
     )
 };
 
-const PageBullets = props => {
+const PageBullets = observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Edit', {returnObjects: true});
     const bulletArrays = [
@@ -525,11 +525,8 @@ const PageBullets = props => {
                             <ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) && 
                                 (storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
                                 onClick={() => {
-                                    if (bullet.type === -1) {
+                                    storeTextSettings.resetBullets(bullet.type);
-                                        storeTextSettings.resetBullets(-1);
+                                    props.onBullet(bullet.type);
-                                    }
-                                    props.onBullet(bullet.type)
-                                    props.f7router.back();
                                 }}>
                                 {bullet.thumb.length < 1 ?
                                     <Icon className="thumb" style={{position: 'relative'}}>
@@ -543,9 +540,9 @@ const PageBullets = props => {
             ))}
         </View>
     )
-};
+});
 
-const PageNumbers = props => {
+const PageNumbers = observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Edit', {returnObjects: true});
     const numberArrays = [
@@ -581,11 +578,8 @@ const PageNumbers = props => {
                         <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
                             (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
                             onClick={() => {
-                                if (number.type === -1) {
+                                storeTextSettings.resetNumbers(number.type);
-                                    storeTextSettings.resetNumbers(-1);
+                                props.onNumber(number.type);
-                                }
-                                props.onNumber(number.type)
-                                props.f7router.back();
                             }}>
                             {number.thumb.length < 1 ?
                                 <Icon className="thumb" style={{position: 'relative'}}>
@@ -599,7 +593,7 @@ const PageNumbers = props => {
             ))}
         </View>
     )
-};
+});
 
 const PageBulletsAndNumbers = props => {
     const { t } = useTranslation();

apps/spreadsheeteditor/embed/locale/id.json

@@ -13,10 +13,15 @@
   "SSE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1",
   "SSE.ApplicationController.errorFilePassProtect": "Dokumen dilindungi dengan kata sandi dan tidak dapat dibuka.",
   "SSE.ApplicationController.errorFileSizeExceed": "Dokumen melebihi ukuran ",
+  "SSE.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
+  "SSE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.<br>Silakan kontak admin Server Dokumen Anda.",
+  "SSE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
   "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Huhungan internet telah",
   "SSE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
   "SSE.ApplicationController.notcriticalErrorTitle": "Peringatan",
+  "SSE.ApplicationController.openErrorText": "Eror ketika membuka file.",
   "SSE.ApplicationController.scriptLoadError": "Hubungan terlalu lambat",
+  "SSE.ApplicationController.textAnonymous": "Anonim",
   "SSE.ApplicationController.textGuest": "Tamu",
   "SSE.ApplicationController.textLoadingDocument": "Memuat spread sheet",
   "SSE.ApplicationController.textOf": "Dari",

apps/spreadsheeteditor/main/app/controller/DocumentHolder.js

@@ -1937,6 +1937,8 @@ define([
 
                 documentHolder.menuImgRotate.setVisible(!ischartmenu && (pluginGuid===null || pluginGuid===undefined) && !isslicermenu);
                 documentHolder.menuImgRotate.setDisabled(isObjLocked || isSmartArt);
+                documentHolder.menuImgRotate.menu.items[3].setDisabled(isSmartArtInternal);
+                documentHolder.menuImgRotate.menu.items[4].setDisabled(isSmartArtInternal);
 
                 documentHolder.menuImgCrop.setVisible(this.api.asc_canEditCrop());
                 documentHolder.menuImgCrop.setDisabled(isObjLocked);

apps/spreadsheeteditor/main/app/controller/Print.js

@@ -115,6 +115,7 @@ define([
             this.api = o;
             this.api.asc_registerCallback('asc_onSheetsChanged', _.bind(this.updateSheetsInfo, this));
             this.api.asc_registerCallback('asc_onPrintPreviewSheetChanged', _.bind(this.onApiChangePreviewSheet, this));
+            this.api.asc_registerCallback('asc_onUpdateDocumentProps', _.bind(this.updateDocumentProps, this));
         },
 
         updateSheetsInfo: function() {
@@ -456,8 +457,8 @@ define([
             panel.spnMarginRight.on('change', _.bind(this.propertyChange, this, panel));
             panel.chPrintGrid.on('change', _.bind(this.propertyChange, this, panel));
             panel.chPrintRows.on('change', _.bind(this.propertyChange, this, panel));
-            panel.txtRangeTop.on('changing', _.bind(this.propertyChange, this, panel));
+            panel.txtRangeTop.on('changed:after', _.bind(this.propertyChange, this, panel));
-            panel.txtRangeLeft.on('changing', _.bind(this.propertyChange, this, panel));
+            panel.txtRangeLeft.on('changed:after', _.bind(this.propertyChange, this, panel));
             panel.txtRangeTop.on('button:click', _.bind(this.onPresetSelect, this, panel, 'top', panel.btnPresetsTop.menu, {value: 'select'}));
             panel.txtRangeLeft.on('button:click', _.bind(this.onPresetSelect, this, panel, 'left', panel.btnPresetsLeft.menu, {value: 'select'}));
             panel.btnPresetsTop.menu.on('item:click', _.bind(this.onPresetSelect, this, panel, 'top'));
@@ -521,7 +522,6 @@ define([
         fillComponents: function(panel, selectdata) {
             var me = this;
             panel.txtRangeTop.validation = function(value) {
-                !me._noApply && me.propertyChange(panel);
                 if (_.isEmpty(value)) {
                     return true;
                 }
@@ -531,7 +531,6 @@ define([
             selectdata && panel.txtRangeTop.updateBtnHint(this.textSelectRange);
 
             panel.txtRangeLeft.validation = function(value) {
-                !me._noApply &&  me.propertyChange(panel);
                 if (_.isEmpty(value)) {
                     return true;
                 }
@@ -748,6 +747,13 @@ define([
             this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2);
         },
 
+        updateDocumentProps: function (index) {
+            if (this._isPreviewVisible) {
+                this._changedProps[index] = this.api.asc_getPageOptions(index);
+                this.updatePreview();
+            }
+        },
+
         warnCheckMargings:      'Margins are incorrect',
         strAllSheets:           'All Sheets',
         textWarning: 'Warning',

apps/spreadsheeteditor/main/app/view/ShapeSettings.js

@@ -764,6 +764,8 @@ define([
                 this._originalProps = shapeprops;
 
                 this._noApply = true;
+                this._state.isFromImage = !!shapeprops.get_FromImage();
+                this._state.isFromSmartArtInternal = !!shapeprops.asc_getFromSmartArtInternal();
 
                 this.disableControls(this._locked, !shapeprops.asc_getCanFill());
                 this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || !!shapeprops.asc_getFromImage());
@@ -774,10 +776,8 @@ define([
                     || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
                     || shapetype=='straightConnector1';
                 this.hideChangeTypeSettings(hidechangetype);
-                this._state.isFromImage = !!shapeprops.get_FromImage();
-                this._state.isFromSmartArtInternal = !!shapeprops.asc_getFromSmartArtInternal();
                 if (!hidechangetype && this.btnChangeShape.menu.items.length) {
-                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || shapeprops.asc_getFromSmartArtInternal());
+                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || this._state.isFromSmartArtInternal);
                 }
 
                 // background colors
@@ -1868,6 +1868,8 @@ define([
                 });
                 this.linkAdvanced.toggleClass('disabled', disable);
             }
+            this.btnFlipV.setDisabled(disable || this._state.isFromSmartArtInternal);
+            this.btnFlipH.setDisabled(disable || this._state.isFromSmartArtInternal);
         },
 
         hideShapeOnlySettings: function(value) {

apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js

@@ -635,6 +635,8 @@ define([    'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
                 if (shapeprops.asc_getFromSmartArtInternal()) {
                     this.chAutofit.setDisabled(true);
                     this.chOverflow.setDisabled(true);
+                    this.chFlipHor.setDisabled(true);
+                    this.chFlipVert.setDisabled(true);
                 }
 
                 this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getWidth()).toFixed(2), true);

apps/spreadsheeteditor/main/resources/less/statusbar.less

@@ -368,7 +368,7 @@
         .status-label {
             font-weight: bold;
             color: @text-normal;
-            margin-top: 5px;
+            margin-top: 6px;
             width: 100%;
             text-align: center;
         }