added btns hints

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

@@ -1404,9 +1404,9 @@ define([
                 if (data.keyCode==Common.UI.Keys.RETURN) {
                     if (this.selectedBeforeHideRec) // only for ComboDataView menuPicker
                         rec = this.selectedBeforeHideRec;
-                    if (this.canAddRecents) // only for DaraViewShape
+                    if (this.canAddRecents) // only for DataViewShape
                         this.addRecentItem(rec);
-                    this.trigger('item:click', this, this, rec, e);
+                    rec && this.trigger('item:click', this, this, rec, e);
                     if (this.parentMenu)
                         this.parentMenu.hide();
                 } else {
@@ -1880,6 +1880,8 @@ define([
             this.addRecentItem(record);
         },
         addRecentItem: function (rec) {
+            if (!rec) return;
+
             var me = this,
                 exist = false,
                 type = rec.get('data').shapeType,

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

@@ -685,7 +685,7 @@ define([
         }
     })(), Common.UI.InputFieldBtnPassword || {}));
 
-    Common.UI.InputFieldBtnCalendar = Common.UI.InputFieldBtn.extend((function (){
+    Common.UI.InputFieldBtnCalendar = Common.UI.InputFieldBtn.extend(_.extend((function() {
         return {
             options: {
                 id: null,
@@ -767,7 +767,7 @@ define([
 
             textDate: 'Select date'
         }
-    })());
+    })(), Common.UI.InputFieldBtnCalendar || {}));
 
     Common.UI.InputFieldFixed = Common.UI.InputField.extend((function() {
         return {

apps/common/main/resources/img/toolbar/2.5x/btn-macros-pause.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M9 13H8V7h1zm3 0h-1V7h1z" fill="#000"/>
+    <path d="M17 17H3V3h14zM4 16h12V4H4z" fill="#000"/>
+</svg>

apps/common/main/resources/img/toolbar/2.5x/btn-macros-record.svg

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14.5 10a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9m0 1a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7" fill="#000"/>
+    <path d="M17 9h-1V6H4v10h5v1H3V3h14zM4 5h12V4H4z" fill="#000"/>
+    <path d="M9 12H6v-1h3zm3-3H6V8h6zm2.5 3.25a2.25 2.25 0 1 1 0 4.5 2.25 2.25 0 0 1 0-4.5" fill="#000"/>
+</svg>

apps/common/main/resources/img/toolbar/2.5x/btn-macros-stop.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13 13H7V7h6z" fill="#000"/>
+    <path d="M17 17H3V3h14zM4 16h12V4H4z" fill="#000"/>
+</svg>

apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-pause.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none">
+    <path d="M13.5 9.5v5m-3-5v5m-4 4h11a1 1 0 0 0 1-1v-11a1 1 0 0 0-1-1h-11a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1Z" class="icon-stroke-gray-primary"/>
+</svg>

apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-record.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none">
+    <path d="M10.5 18.5h-4a1 1 0 0 1-1-1v-10m0 0v-1a1 1 0 0 1 1-1h11a1 1 0 0 1 1 1v1m-13 0h13m0 3v-3m-10 3h5m-5 3h2m10 3a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" class="icon-stroke-gray-primary"/>
+    <path d="M16.5 14.25a2.25 2.25 0 1 1 0 4.5 2.25 2.25 0 0 1 0-4.5Z" class="icon-fill-red" stroke="none" fill="currentColor"/>
+</svg>

apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-stop.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none">
+    <path d="M5.5 6.5a1 1 0 0 1 1-1h11a1 1 0 0 1 1 1v11a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1v-11Z" class="icon-stroke-red"/>
+    <path d="M13.999 9A1 1 0 0 1 15 10v4a1 1 0 0 1-1.001 1H10a1 1 0 0 1-1-1v-4a1 1 0 0 1 1-1h3.999Z" class="icon-fill-red" stroke="none" fill="currentColor"/>
+</svg>

apps/documenteditor/forms/app.js

@@ -154,7 +154,8 @@ require([
                 'common/main/lib/view/SearchBar',
                 'common/forms/lib/view/modals'
             ], function() {
-                app.postLaunchScripts = ['documenteditor/forms/code'];
+                const code_path = !window.isIEBrowser ? 'documenteditor/forms/code' : 'documenteditor/forms/ie/code';
+                app.postLaunchScripts = [code_path];
 
                 app.start();
             });

apps/documenteditor/main/app.js

@@ -205,8 +205,10 @@ require([
                 ,'common/main/lib/controller/Protection'
                 ,'common/main/lib/controller/Draw'
             ], function() {
+                const code_path = !window.isIEBrowser ?
+                        'documenteditor/main/code' : 'documenteditor/main/ie/code';
                 app.postLaunchScripts = [
-                    'documenteditor/main/code',
+                    code_path,
                 ];
                 app.start();
             });

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

@@ -90,7 +90,7 @@ define([
                                     '</tr>',
                                     '<tr>',
                                         '<td class="padding-extra-small">',
-                                            '<label class="header margin-right-10">', me.textSort,'</label>',
+                                            '<label class="header margin-right-10 vertical-align-middle">', me.textSort,'</label>',
                                             '<div id="bookmarks-radio-name" class="margin-right-10"></div>',
                                             '<div id="bookmarks-radio-location"></div>',
                                         '</td>',

apps/presentationeditor/main/app.js

@@ -205,8 +205,9 @@ require([
             ,'presentationeditor/main/app/controller/Transitions'
             ,'presentationeditor/main/app/controller/Animation'
         ], function() {
+            const code_path = !window.isIEBrowser ? 'presentationeditor/main/code' : 'presentationeditor/main/ie/code';            
             app.postLaunchScripts = [
-                'presentationeditor/main/code',
+                code_path,
             ];
 
             app.start();

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

@@ -123,8 +123,7 @@ define([
                 {displayValue: this.textColor,          value: Asc.c_oAscFill.FILL_TYPE_SOLID},
                 {displayValue: this.textGradientFill,   value: Asc.c_oAscFill.FILL_TYPE_GRAD},
                 {displayValue: this.textImageTexture,   value: Asc.c_oAscFill.FILL_TYPE_BLIP},
-                {displayValue: this.textPatternFill,    value: Asc.c_oAscFill.FILL_TYPE_PATT},
-                {displayValue: this.textNoFill,         value: Asc.c_oAscFill.FILL_TYPE_NOFILL}
+                {displayValue: this.textPatternFill,    value: Asc.c_oAscFill.FILL_TYPE_PATT}
             ];
 
             this.cmbFillSrc = new Common.UI.ComboBox({
@@ -146,7 +145,7 @@ define([
             this.btnBackColor = new Common.UI.ColorButton({
                 parentEl: $('#slide-back-color-btn'),
                 disabled: true,
-                transparent: true,
+                transparent: false,
                 menu: true,
                 color: 'ffffff',
                 eyeDropper: true,
@@ -356,17 +355,6 @@ define([
                         this.api.SetSlideProps(props);
                     }
                     break;
-                case Asc.c_oAscFill.FILL_TYPE_NOFILL:
-                    this._state.FillType = Asc.c_oAscFill.FILL_TYPE_NOFILL;
-                    if (!this._noApply) {
-                        var props = new Asc.CAscSlideProps();
-                        var fill = new Asc.asc_CShapeFill();
-                        fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL);
-                        fill.put_fill(null);
-                        props.put_background(fill);
-                        this.api.SetSlideProps(props);
-                    }
-                    break;
             }
             this.fireEvent('editcomplete', this);
         },
@@ -377,16 +365,9 @@ define([
             if (this.api && !this._noApply) {
                 var props = new Asc.CAscSlideProps();
                 var fill = new Asc.asc_CShapeFill();
-
-                if (this.SlideColor.Color=='transparent') {
-                    fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL);
-                    fill.put_fill(null);
-                } else {
-                    fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
-                    fill.put_fill( new Asc.asc_CFillSolid());
-                    fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(this.SlideColor.Color));
-                }
-
+                fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
+                fill.put_fill( new Asc.asc_CFillSolid());
+                fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(this.SlideColor.Color));
                 props.put_background(fill);
                 this.api.SetSlideProps(props);
             }
@@ -1252,7 +1233,7 @@ define([
                 }
 
                 if (fill===null || fill_type===null || fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет или не совпадает у неск. фигур
-                    this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL;
+                    this.OriginalFillType = null;
                 } else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) {
                     fill = fill.get_fill();
                     color = fill.get_color();

apps/presentationeditor/main/locale/en.json

@@ -437,6 +437,39 @@
   "Common.UI.ButtonColored.textAutoColor": "Automatic",
   "Common.UI.ButtonColored.textEyedropper": "Eyedropper",
   "Common.UI.ButtonColored.textNewColor": "More colors",
+  "Common.UI.Calendar.textApril": "April",
+  "Common.UI.Calendar.textAugust": "August",
+  "Common.UI.Calendar.textDecember": "December",
+  "Common.UI.Calendar.textFebruary": "February",
+  "Common.UI.Calendar.textJanuary": "January",
+  "Common.UI.Calendar.textJuly": "July",
+  "Common.UI.Calendar.textJune": "June",
+  "Common.UI.Calendar.textMarch": "March",
+  "Common.UI.Calendar.textMay": "May",
+  "Common.UI.Calendar.textMonths": "Months",
+  "Common.UI.Calendar.textNovember": "November",
+  "Common.UI.Calendar.textOctober": "October",
+  "Common.UI.Calendar.textSeptember": "September",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "Common.UI.Calendar.textShortAugust": "Aug",
+  "Common.UI.Calendar.textShortDecember": "Dec",
+  "Common.UI.Calendar.textShortFebruary": "Feb",
+  "Common.UI.Calendar.textShortFriday": "Fr",
+  "Common.UI.Calendar.textShortJanuary": "Jan",
+  "Common.UI.Calendar.textShortJuly": "Jul",
+  "Common.UI.Calendar.textShortJune": "Jun",
+  "Common.UI.Calendar.textShortMarch": "Mar",
+  "Common.UI.Calendar.textShortMay": "May",
+  "Common.UI.Calendar.textShortMonday": "Mo",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortOctober": "Oct",
+  "Common.UI.Calendar.textShortSaturday": "Sa",
+  "Common.UI.Calendar.textShortSeptember": "Sep",
+  "Common.UI.Calendar.textShortSunday": "Su",
+  "Common.UI.Calendar.textShortThursday": "Th",
+  "Common.UI.Calendar.textShortTuesday": "Tu",
+  "Common.UI.Calendar.textShortWednesday": "We",
+  "Common.UI.Calendar.textYears": "Years",
   "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
   "Common.UI.ComboDataView.emptyComboText": "No styles",
@@ -446,6 +479,7 @@
   "Common.UI.ExtendedColorDialog.textNew": "New",
   "Common.UI.ExtendedColorDialog.textRGBErr": "The entered value is incorrect.<br>Please enter a numeric value between 0 and 255.",
   "Common.UI.HSBColorPicker.textNoColor": "No color",
+  "Common.UI.InputFieldBtnCalendar.textDate": "Select date",
   "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
   "Common.UI.InputFieldBtnPassword.textHintHold": "Press and hold to show password",
   "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",

apps/presentationeditor/mobile/src/controller/edit/EditSlide.jsx

@@ -105,16 +105,9 @@ class EditSlideController extends Component {
 
         let props = new Asc.CAscSlideProps(),
             fill = new Asc.asc_CShapeFill();
-
-        if (color == 'transparent') {
-            fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL);
-            fill.put_fill(null);
-        } else {
-            fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
-            fill.put_fill(new Asc.asc_CFillSolid());
-            fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(color));
-        }
-
+        fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
+        fill.put_fill(new Asc.asc_CFillSolid());
+        fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(color));
         props.put_background(fill);
         api.SetSlideProps(props);
         

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

@@ -449,7 +449,7 @@ const PageFillColor = props => {
                     </NavRight>
                 }
             </Navbar>
-            <ThemeColorPalette changeColor={changeColor} curColor={fillColor} customColors={customColors} transparent={true} />
+            <ThemeColorPalette changeColor={changeColor} curColor={fillColor} customColors={customColors} transparent={false} />
             <List>
                 <ListItem title={_t.textAddCustomColor} link={'/edit-custom-color/'} routeProps={{
                     onFillColor: props.onFillColor

apps/spreadsheeteditor/main/app.js

@@ -205,8 +205,9 @@ require([
             ,'common/main/lib/controller/Protection'
             ,'common/main/lib/controller/Draw'
         ], function() {
+            const code_path = !window.isIEBrowser ? 'spreadsheeteditor/main/code' : 'spreadsheeteditor/main/ie/code';            
             app.postLaunchScripts = [
-                'spreadsheeteditor/main/code',
+                code_path,
             ];
 
             app.start();

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

@@ -4578,7 +4578,7 @@ define([
                     }
 
                     if ( config.canFeatureTable ) {
-                        tab = {caption: 'Table Design', action: 'tabledesign', extcls: config.isEdit ? 'canedit' : '', layoutname: 'toolbar-tabledesign', dataHintTitle: 'B', aux: true};
+                        tab = {caption: me.toolbar.textTabTableDesign, action: 'tabledesign', extcls: config.isEdit ? 'canedit' : '', layoutname: 'toolbar-tabledesign', dataHintTitle: 'B', aux: true};
                         var tabledesigntab = me.getApplication().getController('TableDesignTab');
                         tabledesigntab.setApi(me.api).setConfig({toolbar: me});
                         var view = tabledesigntab.getView('TableDesignTab');

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

@@ -354,7 +354,7 @@ define([
             var record = null, listView = this.seriesList;
 
             if (listView.disabled) return;
-            if (_.isUndefined(undefined)) data = e;
+            if (_.isUndefined(data)) data = e;
 
             if (data.keyCode==Common.UI.Keys.DELETE && !this.btnDelete.isDisabled()) {
                 // this.onDeleteSeries();

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

@@ -265,9 +265,6 @@ define([
                         const helpCenter = Common.Utils.InternalSettings.get('url-help-center');
                         if ( helpCenter ) {
                             const _url_obj = new URL(helpCenter);
-                            if ( !!_url_obj.searchParams )
-                                _url_obj.searchParams.set('function', func);
-
                             window.open(_url_obj.toString(), '_blank');
                         }
 

apps/spreadsheeteditor/main/locale/en.json

@@ -291,6 +291,39 @@
   "Common.UI.ButtonColored.textAutoColor": "Automatic",
   "Common.UI.ButtonColored.textEyedropper": "Eyedropper",
   "Common.UI.ButtonColored.textNewColor": "More colors",
+  "Common.UI.Calendar.textApril": "April",
+  "Common.UI.Calendar.textAugust": "August",
+  "Common.UI.Calendar.textDecember": "December",
+  "Common.UI.Calendar.textFebruary": "February",
+  "Common.UI.Calendar.textJanuary": "January",
+  "Common.UI.Calendar.textJuly": "July",
+  "Common.UI.Calendar.textJune": "June",
+  "Common.UI.Calendar.textMarch": "March",
+  "Common.UI.Calendar.textMay": "May",
+  "Common.UI.Calendar.textMonths": "Months",
+  "Common.UI.Calendar.textNovember": "November",
+  "Common.UI.Calendar.textOctober": "October",
+  "Common.UI.Calendar.textSeptember": "September",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "Common.UI.Calendar.textShortAugust": "Aug",
+  "Common.UI.Calendar.textShortDecember": "Dec",
+  "Common.UI.Calendar.textShortFebruary": "Feb",
+  "Common.UI.Calendar.textShortFriday": "Fr",
+  "Common.UI.Calendar.textShortJanuary": "Jan",
+  "Common.UI.Calendar.textShortJuly": "Jul",
+  "Common.UI.Calendar.textShortJune": "Jun",
+  "Common.UI.Calendar.textShortMarch": "Mar",
+  "Common.UI.Calendar.textShortMay": "May",
+  "Common.UI.Calendar.textShortMonday": "Mo",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortOctober": "Oct",
+  "Common.UI.Calendar.textShortSaturday": "Sa",
+  "Common.UI.Calendar.textShortSeptember": "Sep",
+  "Common.UI.Calendar.textShortSunday": "Su",
+  "Common.UI.Calendar.textShortThursday": "Th",
+  "Common.UI.Calendar.textShortTuesday": "Tu",
+  "Common.UI.Calendar.textShortWednesday": "We",
+  "Common.UI.Calendar.textYears": "Years",
   "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
   "Common.UI.ComboDataView.emptyComboText": "No styles",
@@ -301,6 +334,7 @@
   "Common.UI.ExtendedColorDialog.textRGBErr": "The entered value is incorrect.<br>Please enter a numeric value between 0 and 255.",
   "Common.UI.HSBColorPicker.textNoColor": "No Color",
   "Common.UI.InputField.txtEmpty": "This field is required",
+  "Common.UI.InputFieldBtnCalendar.textDate": "Select date",
   "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Hide password",
   "Common.UI.InputFieldBtnPassword.textHintHold": "Press and hold to show password",
   "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Show password",
@@ -4439,6 +4473,7 @@
   "SSE.Views.Toolbar.textTabLayout": "Layout",
   "SSE.Views.Toolbar.textTabProtect": "Protection",
   "SSE.Views.Toolbar.textTabView": "View",
+  "SSE.Views.Toolbar.textTabTableDesign": "Table Design",
   "SSE.Views.Toolbar.textThisPivot": "From this pivot",
   "SSE.Views.Toolbar.textThisSheet": "From this sheet",
   "SSE.Views.Toolbar.textThisTable": "From this table",

apps/visioeditor/main/app.js

@@ -167,8 +167,9 @@ require([
                 'common/main/lib/controller/Chat',
                 'common/main/lib/controller/Plugins'
             ], function() {
+                const code_path = !window.isIEBrowser ? 'visioeditor/main/code' : 'visioeditor/main/ie/code';            
                 app.postLaunchScripts = [
-                    'visioeditor/main/code'
+                    code_path,
                 ];
 
                 app.start();