diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 8426c9be9..ad2263ec6 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -96,7 +96,7 @@ info: 'Some info', logo: '' }, - about: false, + about: true, feedback: { visible: false, url: http://... @@ -521,7 +521,8 @@ var data = { type: evt.type, x: evt.x - r.left, - y: evt.y - r.top + y: evt.y - r.top, + event: evt }; _sendCommand({ @@ -568,7 +569,7 @@ lang: 'en', canCoAuthoring: true, customization: { - about: false, + about: true, feedback: false } } diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index a29800a04..c559e76a6 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1479,8 +1479,12 @@ define([ hidePreloader: function() { if (!this._state.customizationDone) { this._state.customizationDone = true; - if (this.appOptions.customization && !this.appOptions.isDesktopApp) - this.appOptions.customization.about = true; + if (this.appOptions.customization) { + if (this.appOptions.isDesktopApp) + this.appOptions.customization.about = false; + else if (!this.appOptions.canBrandingExt) + this.appOptions.customization.about = true; + } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); if (this.appOptions.canBrandingExt) { Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 898f80e21..d8a0e206b 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1232,8 +1232,12 @@ define([ hidePreloader: function() { if (!this._state.customizationDone) { this._state.customizationDone = true; - if (this.appOptions.customization && !this.appOptions.isDesktopApp) - this.appOptions.customization.about = true; + if (this.appOptions.customization) { + if (this.appOptions.isDesktopApp) + this.appOptions.customization.about = false; + else if (!this.appOptions.canBrandingExt) + this.appOptions.customization.about = true; + } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); if (this.appOptions.canBrandingExt) { Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index c589e4ce1..0aa9f9b4c 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -695,12 +695,15 @@ define([ (new SSE.Views.ChartSettingsDlg( { chartSettings: props, + imageSettings: item.chartInfo, isChart: true, api: me.api, handler: function(result, value) { if (result == 'ok') { if (me.api) { me.api.asc_editChartDrawingObject(value.chartSettings); + if (value.imageSettings) + me.api.asc_setGraphicObjectProps(value.imageSettings); } } Common.NotificationCenter.trigger('edit:complete', me); @@ -1205,6 +1208,7 @@ define([ isshapemenu = true; } } else if ( elValue.asc_getChartProperties() ) { + documentHolder.mnuChartEdit.chartInfo = elValue; ischartmenu = true; has_chartprops = true; } diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 15c790aa2..60c559866 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -363,7 +363,7 @@ define([ var editor = document.getElementById('editor_sdk'); if (editor) { var rect = editor.getBoundingClientRect(); - var event = window.event || arguments.callee.caller.arguments[0]; + var event = data.event || {}; this.api.asc_onMouseUp(event, data.x - rect.left, data.y - rect.top); } } @@ -1370,8 +1370,12 @@ define([ hidePreloader: function() { if (!this._state.customizationDone) { this._state.customizationDone = true; - if (this.appOptions.customization && !this.appOptions.isDesktopApp) - this.appOptions.customization.about = true; + if (this.appOptions.customization) { + if (this.appOptions.isDesktopApp) + this.appOptions.customization.about = false; + else if (!this.appOptions.canBrandingExt) + this.appOptions.customization.about = true; + } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); if (this.appOptions.canBrandingExt) { Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 171a775b6..ccf5d99d4 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -750,18 +750,30 @@ define([ var win, props; if (me.api){ props = me.api.asc_getChartObject(); + var selectedObjects = me.api.asc_getGraphicObjectProps(), + imageSettings = null; + for (var i = 0; i < selectedObjects.length; i++) { + if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) { + var elValue = selectedObjects[i].asc_getObjectValue(); + if ( elValue.asc_getChartProperties() ) + imageSettings = elValue; + } + } if (props) { var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText); (new SSE.Views.ChartSettingsDlg( { chartSettings: props, + imageSettings: imageSettings, isChart: true, api: me.api, handler: function(result, value) { if (result == 'ok') { if (me.api) { (ischartedit) ? me.api.asc_editChartDrawingObject(value.chartSettings) : me.api.asc_addChartDrawingObject(value.chartSettings); + if (value.imageSettings) + me.api.asc_setGraphicObjectProps(value.imageSettings); } } Common.NotificationCenter.trigger('edit:complete', me.toolbar); diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js index fe79fa0b0..0b9dfd6b5 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js @@ -151,8 +151,7 @@ define([ var color = _fontInfo.asc_getColor(), clr = me._sdkToThemeColor(color); - $('#text-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr)); - + $('#font-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr)); // Align $('#edit-text-align-block').css('display', (_textIn == TextType.inShape) ? 'block' : 'none'); @@ -279,7 +278,7 @@ define([ onTextColor:function (palette, color) { this.api.asc_setCellTextColor(Common.Utils.ThemeColor.getRgbColor(color)); - $('#text-color .color-preview').css('background-color', '#' + (_.isObject(color) ? color.color : color)); + $('#font-color .color-preview').css('background-color', '#' + (_.isObject(color) ? color.color : color)); }, onHAlignChange: function (e) { diff --git a/apps/spreadsheeteditor/mobile/app/template/EditChart.template b/apps/spreadsheeteditor/mobile/app/template/EditChart.template index 559ecbf2d..ec92990fa 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditChart.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditChart.template @@ -461,7 +461,7 @@ -
<%= scope.textTickOptions %>Tick Options
+
<%= scope.textTickOptions %>
  • - +
    <% if (!android) { %>
    <% } %>
    diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js index 78d54d8b3..dadda1dc3 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js @@ -259,6 +259,7 @@ define([ textValReverseOrder: 'Values in Reverse Order', textTickOptions: 'Tick Options', textMajorType: 'Major Type', + textMinorType: 'Minor Type', textLabelOptions: 'Label Options', textLabelPos: 'Label Position', textAxisPosition: 'Axis Position', diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index ef7f99106..6cc0de839 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -326,6 +326,7 @@ "SSE.Views.EditChart.textMajorType": "Major Type", "SSE.Views.EditChart.textMaxValue": "Maximum Value", "SSE.Views.EditChart.textMinor": "Minor", + "SSE.Views.EditChart.textMinorType": "Minor Type", "SSE.Views.EditChart.textMinValue": "Minimum Value", "SSE.Views.EditChart.textNone": "None", "SSE.Views.EditChart.textNoOverlay": "No Overlay",