diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index b2f9b76f2d..df47cccf4a 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/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, diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js index fecc5c2922..f8155b6d6d 100644 --- a/apps/common/main/lib/component/InputField.js +++ b/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 { diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/1.25x/btn-macros-pause.png new file mode 100644 index 0000000000..c10ce10ce4 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/1.25x/btn-macros-record.png new file mode 100644 index 0000000000..7204b69206 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/1.25x/btn-macros-stop.png new file mode 100644 index 0000000000..69c278611b Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/1.5x/btn-macros-pause.png new file mode 100644 index 0000000000..69f770b871 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/1.5x/btn-macros-record.png new file mode 100644 index 0000000000..39e9dba8e3 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/1.5x/btn-macros-stop.png new file mode 100644 index 0000000000..4bee74da4a Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/1.75x/btn-macros-pause.png new file mode 100644 index 0000000000..a3032fb464 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/1.75x/btn-macros-record.png new file mode 100644 index 0000000000..c14a60875c Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/1.75x/btn-macros-stop.png new file mode 100644 index 0000000000..fc08b3a59f Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/1x/btn-macros-pause.png new file mode 100644 index 0000000000..c8d0a58626 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/1x/btn-macros-record.png new file mode 100644 index 0000000000..e67cdb6185 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/1x/btn-macros-stop.png new file mode 100644 index 0000000000..a86b77062c Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-macros-pause.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-macros-pause.svg new file mode 100644 index 0000000000..46e9558c39 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-macros-pause.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-macros-record.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-macros-record.svg new file mode 100644 index 0000000000..891b0f7ab7 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-macros-record.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-macros-stop.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-macros-stop.svg new file mode 100644 index 0000000000..e357a7d5bf --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-macros-stop.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/2x/btn-macros-pause.png new file mode 100644 index 0000000000..9b653162f9 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/2x/btn-macros-record.png new file mode 100644 index 0000000000..1a62859713 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/2x/btn-macros-stop.png new file mode 100644 index 0000000000..6f5fa74ed0 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-pause.png new file mode 100644 index 0000000000..8362a70064 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-record.png new file mode 100644 index 0000000000..da47fab702 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-stop.png new file mode 100644 index 0000000000..26463cd6cc Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.25x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-pause.png new file mode 100644 index 0000000000..9b9b0f6cc2 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-record.png new file mode 100644 index 0000000000..d932a496f3 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-stop.png new file mode 100644 index 0000000000..c579cb0f6c Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.5x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-pause.png new file mode 100644 index 0000000000..ea578bcacf Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-record.png new file mode 100644 index 0000000000..da6e5cfca0 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-stop.png new file mode 100644 index 0000000000..db8f1b87e1 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1.75x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-pause.png new file mode 100644 index 0000000000..8367dbc5f9 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-record.png new file mode 100644 index 0000000000..742832c5a8 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-stop.png new file mode 100644 index 0000000000..5c7a71a961 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/1x/btn-macros-stop.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-pause.svg b/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-pause.svg new file mode 100644 index 0000000000..6d6eae6258 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-pause.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-record.svg b/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-record.svg new file mode 100644 index 0000000000..b955869130 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-record.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-stop.svg b/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-stop.svg new file mode 100644 index 0000000000..ac9d805136 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/v2/2.5x/btn-macros-stop.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-pause.png b/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-pause.png new file mode 100644 index 0000000000..9b8d4f18a7 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-pause.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-record.png b/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-record.png new file mode 100644 index 0000000000..ec19278fe2 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-record.png differ diff --git a/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-stop.png b/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-stop.png new file mode 100644 index 0000000000..ce787bd894 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/v2/2x/btn-macros-stop.png differ diff --git a/apps/documenteditor/forms/app.js b/apps/documenteditor/forms/app.js index 18ce72000c..c5ccbde01e 100644 --- a/apps/documenteditor/forms/app.js +++ b/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(); }); diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index fc31392a1b..269cc37fd3 100644 --- a/apps/documenteditor/main/app.js +++ b/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(); }); diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index b8a2ace1b7..d3dd464802 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -90,7 +90,7 @@ define([ '', '', '', - '', + '', '
', '
', '', diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index 9060a7e344..ecfeaf6979 100644 --- a/apps/presentationeditor/main/app.js +++ b/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(); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 62833f5280..85bdf340bc 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/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(); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 0befe25c2a..d44216c2b3 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/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.
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", diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditSlide.jsx index c8141ee4ca..a792b815f3 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditSlide.jsx +++ b/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); diff --git a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx index e95e2c05c7..5ea5f78cd0 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx @@ -449,7 +449,7 @@ const PageFillColor = props => { } - + 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", diff --git a/apps/visioeditor/main/app.js b/apps/visioeditor/main/app.js index ff827d7475..b5c298fa71 100644 --- a/apps/visioeditor/main/app.js +++ b/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();