From c18729622292807992897d4b979b9c5874454f87 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Fri, 25 Nov 2016 15:05:17 +0300 Subject: [PATCH 1/8] [embed] removed unnecessary symbol --- apps/common/embed/lib/controller/modals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/embed/lib/controller/modals.js b/apps/common/embed/lib/controller/modals.js index d31e41f67..f85f39e92 100644 --- a/apps/common/embed/lib/controller/modals.js +++ b/apps/common/embed/lib/controller/modals.js @@ -53,7 +53,7 @@ $dlgShare = common.view.modals.create('share'); var _encoded = encodeURIComponent(appConfig.shareUrl); - var _mailto = 'mailto:?subject=I have shared a document with you: ' + appConfig.docTitle + '&body=I have shared a document with you: ' + _encoded + '"'; + var _mailto = 'mailto:?subject=I have shared a document with you: ' + appConfig.docTitle + '&body=I have shared a document with you: ' + _encoded; $dlgShare.find('#btn-copyshort').on('click', copytext.bind(this, $dlgShare.find('#id-short-url'))); $dlgShare.find('.share-buttons > span').on('click', function(e){ From ff73fca1e27b69158d9cb7427534782ea5f1de32 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 28 Nov 2016 19:25:37 +0300 Subject: [PATCH 2/8] Links to new files. --- apps/documenteditor/sdk_dev_scripts.js | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/sdk_dev_scripts.js b/apps/documenteditor/sdk_dev_scripts.js index 915b58c45..eb9739e1f 100644 --- a/apps/documenteditor/sdk_dev_scripts.js +++ b/apps/documenteditor/sdk_dev_scripts.js @@ -11,7 +11,10 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/apiCommon.js", "../../../../sdkjs/common/SerializeCommonWordExcel.js", "../../../../sdkjs/common/editorscommon.js", - "../../../../sdkjs/common/NumFormat.js", + "../../../../sdkjs/common/HistoryCommon.js", + "../../../../sdkjs/common/TableId.js", + "../../../../sdkjs/common/TableIdChanges.js", + "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", "../../../../sdkjs/common/AdvancedOptions.js", "../../../../sdkjs/common/FontsFreeType/font_engine.js", @@ -28,7 +31,6 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Drawings/Hit.js", "../../../../sdkjs/common/Drawings/ArcTo.js", "../../../../sdkjs/common/Drawings/ColorArray.js", - "../../../../sdkjs/common/Drawings/Format/Constants.js", "../../../../sdkjs/common/Drawings/CommonController.js", "../../../../sdkjs/word/Editor/GraphicObjects/DrawingStates.js", "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", @@ -82,12 +84,21 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js", "../../../../sdkjs/word/Editor/CollaborativeEditing.js", "../../../../sdkjs/word/Editor/Comments.js", + "../../../../sdkjs/word/Editor/CommentsChanges.js", "../../../../sdkjs/word/Editor/Styles.js", + "../../../../sdkjs/word/Editor/StylesChanges.js", "../../../../sdkjs/word/Editor/ParagraphContent.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaTextPr.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaTextPrChanges.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaDrawing.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaDrawingChanges.js", "../../../../sdkjs/word/Editor/Paragraph.js", + "../../../../sdkjs/word/Editor/ParagraphChanges.js", "../../../../sdkjs/word/Editor/DocumentContentBase.js", "../../../../sdkjs/word/Editor/Document.js", + "../../../../sdkjs/word/Editor/DocumentChanges.js", "../../../../sdkjs/word/Editor/DocumentContent.js", + "../../../../sdkjs/word/Editor/DocumentContentChanges.js", "../../../../sdkjs/word/Editor/DocumentControllerBase.js", "../../../../sdkjs/word/Editor/LogicDocumentController.js", "../../../../sdkjs/word/Editor/DrawingsController.js", @@ -95,25 +106,35 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/FlowObjects.js", "../../../../sdkjs/word/Editor/ParagraphContentBase.js", "../../../../sdkjs/word/Editor/Hyperlink.js", + "../../../../sdkjs/word/Editor/HyperlinkChanges.js", "../../../../sdkjs/word/Editor/Field.js", + "../../../../sdkjs/word/Editor/FieldChanges.js", "../../../../sdkjs/word/Editor/Run.js", + "../../../../sdkjs/word/Editor/RunChanges.js", "../../../../sdkjs/word/Editor/Math.js", + "../../../../sdkjs/word/Editor/MathChanges.js", "../../../../sdkjs/word/Editor/Paragraph_Recalculate.js", "../../../../sdkjs/word/Editor/Sections.js", + "../../../../sdkjs/word/Editor/SectionsChanges.js", "../../../../sdkjs/word/Editor/Numbering.js", "../../../../sdkjs/word/Editor/HeaderFooter.js", "../../../../sdkjs/word/Editor/Common.js", "../../../../sdkjs/word/Editor/Numbering.js", + "../../../../sdkjs/word/Editor/NumberingChanges.js", "../../../../sdkjs/word/Editor/Table.js", + "../../../../sdkjs/word/Editor/Table/TableChanges.js", "../../../../sdkjs/word/Editor/Table/TableRecalculate.js", "../../../../sdkjs/word/Editor/Table/TableDraw.js", "../../../../sdkjs/word/Editor/Table/TableRow.js", + "../../../../sdkjs/word/Editor/Table/TableRowChanges.js", "../../../../sdkjs/word/Editor/Table/TableCell.js", + "../../../../sdkjs/word/Editor/Table/TableCellChanges.js", "../../../../sdkjs/word/Editor/Serialize2.js", "../../../../sdkjs/word/Editor/Search.js", "../../../../sdkjs/word/Editor/FontClassification.js", "../../../../sdkjs/word/Editor/Spelling.js", "../../../../sdkjs/word/Editor/Footnotes.js", + "../../../../sdkjs/word/Editor/FootnotesChanges.js", "../../../../sdkjs/word/Editor/FootEndNote.js", "../../../../sdkjs/word/Drawing/Graphics.js", "../../../../sdkjs/word/Drawing/ShapeDrawer.js", From 0fb162320d5f8976e57e58a37f4ae73f33839a9f Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 29 Nov 2016 12:51:23 +0300 Subject: [PATCH 3/8] Added links to the new files. --- apps/presentationeditor/sdk_dev_scripts.js | 22 ++++++++++++++++++++- apps/spreadsheeteditor/sdk_dev_scripts.js | 23 +++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/sdk_dev_scripts.js b/apps/presentationeditor/sdk_dev_scripts.js index 0be236e9a..29cf9bb73 100644 --- a/apps/presentationeditor/sdk_dev_scripts.js +++ b/apps/presentationeditor/sdk_dev_scripts.js @@ -8,6 +8,9 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/apiCommon.js", "../../../../sdkjs/common/SerializeCommonWordExcel.js", "../../../../sdkjs/common/editorscommon.js", + "../../../../sdkjs/common/HistoryCommon.js", + "../../../../sdkjs/common/TableId.js", + "../../../../sdkjs/common/TableIdChanges.js", "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", "../../../../sdkjs/common/AdvancedOptions.js", @@ -25,7 +28,6 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Drawings/Hit.js", "../../../../sdkjs/common/Drawings/ArcTo.js", "../../../../sdkjs/common/Drawings/ColorArray.js", - "../../../../sdkjs/common/Drawings/Format/Constants.js", "../../../../sdkjs/common/Drawings/CommonController.js", "../../../../sdkjs/common/Drawings/States.js", "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", @@ -75,17 +77,23 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/slide/Drawing/ThemeLoader.js", "../../../../sdkjs/word/Editor/Serialize2.js", "../../../../sdkjs/word/Editor/Numbering.js", + "../../../../sdkjs/word/Editor/NumberingChanges.js", "../../../../sdkjs/slide/Editor/CollaborativeEditing.js", "../../../../sdkjs/word/Drawing/GraphicsEvents.js", "../../../../sdkjs/word/Drawing/Rulers.js", "../../../../sdkjs/word/Editor/Table.js", + "../../../../sdkjs/word/Editor/Table/TableChanges.js", "../../../../sdkjs/word/Editor/Table/TableRecalculate.js", "../../../../sdkjs/word/Editor/Table/TableDraw.js", "../../../../sdkjs/word/Editor/Table/TableRow.js", + "../../../../sdkjs/word/Editor/Table/TableRowChanges.js", "../../../../sdkjs/word/Editor/Table/TableCell.js", + "../../../../sdkjs/word/Editor/Table/TableCellChanges.js", "../../../../sdkjs/word/Editor/Common.js", "../../../../sdkjs/word/Editor/Sections.js", + "../../../../sdkjs/word/Editor/SectionsChanges.js", "../../../../sdkjs/word/Editor/Styles.js", + "../../../../sdkjs/word/Editor/StylesChanges.js", "../../../../sdkjs/slide/Editor/Format/StylesPrototype.js", "../../../../sdkjs/word/Drawing/Graphics.js", "../../../../sdkjs/word/Drawing/ShapeDrawer.js", @@ -99,10 +107,17 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/slide/Editor/Format/Layout.js", "../../../../sdkjs/slide/Editor/Format/Comments.js", "../../../../sdkjs/word/Editor/ParagraphContent.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaTextPr.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaTextPrChanges.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaDrawing.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaDrawingChanges.js", "../../../../sdkjs/word/Editor/Paragraph.js", + "../../../../sdkjs/word/Editor/ParagraphChanges.js", "../../../../sdkjs/word/Editor/DocumentContentBase.js", "../../../../sdkjs/word/Editor/Document.js", + "../../../../sdkjs/word/Editor/DocumentChanges.js", "../../../../sdkjs/word/Editor/DocumentContent.js", + "../../../../sdkjs/word/Editor/DocumentContentChanges.js", "../../../../sdkjs/word/Editor/DocumentControllerBase.js", "../../../../sdkjs/word/Editor/LogicDocumentController.js", "../../../../sdkjs/word/Editor/DrawingsController.js", @@ -115,8 +130,11 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/Numbering.js", "../../../../sdkjs/word/Editor/ParagraphContentBase.js", "../../../../sdkjs/word/Editor/Hyperlink.js", + "../../../../sdkjs/word/Editor/HyperlinkChanges.js", "../../../../sdkjs/word/Editor/Field.js", + "../../../../sdkjs/word/Editor/FieldChanges.js", "../../../../sdkjs/word/Editor/Run.js", + "../../../../sdkjs/word/Editor/RunChanges.js", "../../../../sdkjs/word/Math/mathTypes.js", "../../../../sdkjs/word/Math/mathText.js", "../../../../sdkjs/word/Math/mathContent.js", @@ -134,8 +152,10 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/Paragraph_Recalculate.js", "../../../../sdkjs/word/Editor/HeaderFooter.js", "../../../../sdkjs/word/Editor/Math.js", + "../../../../sdkjs/word/Editor/MathChanges.js", "../../../../sdkjs/word/Editor/Spelling.js", "../../../../sdkjs/word/Editor/Footnotes.js", + "../../../../sdkjs/word/Editor/FootnotesChanges.js", "../../../../sdkjs/word/Editor/FootEndNote.js", "../../../../sdkjs/word/Editor/Search.js", "../../../../sdkjs/word/Editor/FontClassification.js", diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index b290dad2c..56246072f 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -8,6 +8,9 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/apiCommon.js", "../../../../sdkjs/common/SerializeCommonWordExcel.js", "../../../../sdkjs/common/editorscommon.js", + "../../../../sdkjs/common/HistoryCommon.js", + "../../../../sdkjs/common/TableId.js", + "../../../../sdkjs/common/TableIdChanges.js", "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", "../../../../sdkjs/common/AdvancedOptions.js", @@ -25,7 +28,6 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Drawings/Hit.js", "../../../../sdkjs/common/Drawings/ArcTo.js", "../../../../sdkjs/common/Drawings/ColorArray.js", - "../../../../sdkjs/common/Drawings/Format/Constants.js", "../../../../sdkjs/common/Drawings/CommonController.js", "../../../../sdkjs/common/Drawings/States.js", "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", @@ -114,12 +116,21 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/cell/Private/comments.js", "../../../../sdkjs/word/Editor/Common.js", "../../../../sdkjs/word/Editor/Comments.js", + "../../../../sdkjs/word/Editor/CommentsChanges.js", "../../../../sdkjs/word/Editor/Styles.js", + "../../../../sdkjs/word/Editor/StylesChanges.js", "../../../../sdkjs/word/Editor/ParagraphContent.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaTextPr.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaTextPrChanges.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaDrawing.js", + "../../../../sdkjs/word/Editor/Paragraph/ParaDrawingChanges.js", "../../../../sdkjs/word/Editor/Paragraph.js", + "../../../../sdkjs/word/Editor/ParagraphChanges.js", "../../../../sdkjs/word/Editor/DocumentContentBase.js", "../../../../sdkjs/word/Editor/Document.js", + "../../../../sdkjs/word/Editor/DocumentChanges.js", "../../../../sdkjs/word/Editor/DocumentContent.js", + "../../../../sdkjs/word/Editor/DocumentContentChanges.js", "../../../../sdkjs/word/Editor/DocumentControllerBase.js", "../../../../sdkjs/word/Editor/LogicDocumentController.js", "../../../../sdkjs/word/Editor/DrawingsController.js", @@ -127,22 +138,32 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/FlowObjects.js", "../../../../sdkjs/word/Editor/ParagraphContentBase.js", "../../../../sdkjs/word/Editor/Hyperlink.js", + "../../../../sdkjs/word/Editor/HyperlinkChanges.js", "../../../../sdkjs/word/Editor/Field.js", + "../../../../sdkjs/word/Editor/FieldChanges.js", "../../../../sdkjs/word/Editor/Run.js", + "../../../../sdkjs/word/Editor/RunChanges.js", "../../../../sdkjs/word/Editor/Math.js", + "../../../../sdkjs/word/Editor/MathChanges.js", "../../../../sdkjs/word/Editor/Paragraph_Recalculate.js", "../../../../sdkjs/word/Editor/Sections.js", + "../../../../sdkjs/word/Editor/SectionsChanges.js", "../../../../sdkjs/word/Editor/Numbering.js", + "../../../../sdkjs/word/Editor/NumberingChanges.js", "../../../../sdkjs/word/Editor/HeaderFooter.js", "../../../../sdkjs/word/Editor/Table.js", + "../../../../sdkjs/word/Editor/Table/TableChanges.js", "../../../../sdkjs/word/Editor/Table/TableRecalculate.js", "../../../../sdkjs/word/Editor/Table/TableDraw.js", "../../../../sdkjs/word/Editor/Table/TableRow.js", + "../../../../sdkjs/word/Editor/Table/TableRowChanges.js", "../../../../sdkjs/word/Editor/Table/TableCell.js", + "../../../../sdkjs/word/Editor/Table/TableCellChanges.js", "../../../../sdkjs/word/Editor/Serialize2.js", "../../../../sdkjs/word/Editor/FontClassification.js", "../../../../sdkjs/word/Editor/Spelling.js", "../../../../sdkjs/word/Editor/Footnotes.js", + "../../../../sdkjs/word/Editor/FootnotesChanges.js", "../../../../sdkjs/word/Editor/FootEndNote.js", "../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js", "../../../../sdkjs/word/Math/mathTypes.js", From 93cf75ce81bd3866923fb78947f9acdece58dea7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 29 Nov 2016 14:59:05 +0300 Subject: [PATCH 4/8] [SSE] Disable adding formula from the cell editor line only when input text to the cell. --- apps/spreadsheeteditor/main/app/controller/CellEditor.js | 2 ++ apps/spreadsheeteditor/main/app/view/CellEditor.js | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js index 2147bd64c..27ddf7fbe 100644 --- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js @@ -125,6 +125,7 @@ define([ this.api.isCEditorFocused = false; this.editor.cellNameDisabled(false); } + this.editor.$btnfunc.toggleClass('disabled', state == Asc.c_oAscCellEditorState.editText); }, onApiCellSelection: function(info) { @@ -147,6 +148,7 @@ define([ onCellsRange: function(status) { this.editor.cellNameDisabled(status != Asc.c_oAscSelectionDialogType.None); + this.editor.$btnfunc.toggleClass('disabled', status != Asc.c_oAscSelectionDialogType.None); }, onLayoutResize: function(o, r) { diff --git a/apps/spreadsheeteditor/main/app/view/CellEditor.js b/apps/spreadsheeteditor/main/app/view/CellEditor.js index 2e4671261..43f05f074 100644 --- a/apps/spreadsheeteditor/main/app/view/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/view/CellEditor.js @@ -102,7 +102,6 @@ define([ cellNameDisabled: function(disabled){ (disabled) ? this.$cellname.attr('disabled', 'disabled') : this.$cellname.removeAttr('disabled'); - this.$btnfunc.toggleClass('disabled', disabled); this.btnNamedRanges.setDisabled(disabled); }, From 28a4bf62b7d4816c7dacd18703992caa2acc1c1c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 29 Nov 2016 15:01:29 +0300 Subject: [PATCH 5/8] [SSE] Added hints for the table templates. --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 3 ++- apps/spreadsheeteditor/main/app/view/TableSettings.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 1a8b32f99..e215f313e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1385,7 +1385,8 @@ define([ type : item.asc_getType(), imageUrl : item.asc_getImage(), allowSelected : true, - selected : false + selected : false, + tip : item.asc_getDisplayName() }); }); diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index bafa46c25..99192676a 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -387,7 +387,8 @@ define([ type : template.asc_getType(), imageUrl : template.asc_getImage(), allowSelected : true, - selected : false + selected : false, + tip : template.asc_getDisplayName() }); }); self.cmbTableTemplate.menuPicker.store.add(arr); From 2600efb38c0a51a08ceca2c097d4a8afb2df0572 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 29 Nov 2016 15:48:18 +0300 Subject: [PATCH 6/8] [SSE] Update table templates depending on whether or not a table is selected. Query table templates when theme colors are changed. --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 11 +++++++++-- apps/spreadsheeteditor/main/app/view/TableSettings.js | 10 +++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index e215f313e..84e898f9a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -272,7 +272,7 @@ define([ setApi: function(api) { this.api = api; - this.api.asc_registerCallback('asc_onInitTablePictures', _.bind(this.onApiInitTableTemplates, this)); + this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this, true)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); @@ -1366,14 +1366,21 @@ define([ }, onTableTplMenuOpen: function(cmp) { - var scroller = this.toolbar.mnuTableTemplatePicker.scroller; + this.onApiInitTableTemplates(this.api.asc_getTablePictures(this.api.asc_getCellInfo().asc_getFormatTableInfo())); + var scroller = this.toolbar.mnuTableTemplatePicker.scroller; if (scroller) { scroller.update({alwaysVisibleY: true}); scroller.scrollTop(0); } }, + onSendThemeColors: function() { + // get new table templates + if (this.toolbar.btnTableTemplate.rendered && this.toolbar.btnTableTemplate.cmpEl.hasClass('open')) + this.onTableTplMenuOpen(); + }, + onApiInitTableTemplates: function(images) { var store = this.getCollection('TableTemplates'); if (store) { diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index 99192676a..355b471d0 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -140,7 +140,7 @@ define([ setApi: function(o) { this.api = o; if (o) { - this.api.asc_registerCallback('asc_onInitTablePictures', _.bind(this.onApiInitTableTemplates, this)); + this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); } return this; }, @@ -347,6 +347,14 @@ define([ } }, + onSendThemeColors: function() { + // get new table templates + if (this.cmbTableTemplate) { + this.onApiInitTableTemplates(this.api.asc_getTablePictures(this._originalProps)); + this.cmbTableTemplate.menuPicker.scroller.update({alwaysVisibleY: true}); + } + }, + onApiInitTableTemplates: function(Templates){ var self = this; this._isTemplatesChanged = true; From 2d7f7737b717ce93e0605a1e077bde86f999d5ee Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 30 Nov 2016 17:08:26 +0300 Subject: [PATCH 7/8] [SSE] Added data and location ranges for sparklines. --- .../app/template/ChartSettingsDlg.template | 58 +++++++++---------- .../main/app/view/ChartSettingsDlg.js | 10 +++- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template index f005dc48c..e694f2ce4 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template @@ -335,35 +335,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
+ +
+
+ 		+ +
+ +
+
+ 		+ +
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index f3ed54337..142f74bba 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -840,7 +840,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' labelText: this.textSingle, name: 'asc-radio-sparkline' }); - + */ this.txtSparkDataRange = new Common.UI.InputField({ el : $('#spark-dlg-txt-range'), name : 'range', @@ -868,7 +868,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' el: $('#spark-dlg-btn-data') }); // this.btnSelectLocationData.on('click', _.bind(this.onSelectData, this)); - */ + this._arrEmptyCells = [ { value: Asc.c_oAscEDispBlanksAs.Gap, displayValue: this.textGaps }, @@ -1373,6 +1373,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.spnSparkMinValue.setValue((props.asc_getManualMin() !== null) ? props.asc_getManualMin() : '', true); this.spnSparkMaxValue.setValue((props.asc_getManualMax() !== null) ? props.asc_getManualMax() : '', true); + var value = props.asc_getDataRanges(); + if (value && value.length==2) { + this.txtSparkDataRange.setValue((value[0]) ? value[0] : ''); + this.txtSparkDataLocation.setValue((value[1]) ? value[1] : ''); + } + this._changedProps = new Asc.sparklineGroup(); this._noApply = false; } From 641a4962e84c63bc97bbafbd077298d91b019259 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Wed, 30 Nov 2016 18:00:23 +0300 Subject: [PATCH 8/8] change scripts list --- apps/spreadsheeteditor/sdk_dev_scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index 56246072f..d0f471fbf 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -63,7 +63,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Overlay.js", "../../../../sdkjs/common/Drawings/HatchPattern.js", "../../../../sdkjs/common/scroll.js", - "../../../../sdkjs/cell/view/iscroll.js", + "../../../../sdkjs/common/Scrolls/iscroll.js", "../../../../sdkjs/common/wordcopypaste.js", "../../../../sdkjs/cell/apiDefines.js", "../../../../sdkjs/cell/document/empty-workbook.js",