Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

Browse source
This commit is contained in:
Alexander Yuzhin 2017-03-13 14:21:04 +03:00
parent c18bff6131 497b5313ce
commit 42517720ac
11 changed files with 47 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/api/documents/api.js
View file

@ -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
}
}

8
apps/documenteditor/main/app/controller/Main.js
View file

@ -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);

8
apps/presentationeditor/main/app/controller/Main.js
View file

@ -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);

4
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -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;
}

10
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -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);

12
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -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);

5
apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
View file

@ -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) {

6
apps/spreadsheeteditor/mobile/app/template/EditChart.template
View file

@ -461,7 +461,7 @@
</li>
</ul>
</div>
<div class="content-block-title"><%= scope.textTickOptions %>Tick Options</div>
<div class="content-block-title"><%= scope.textTickOptions %></div>
<div class="list-block">
<ul>
<li>
@ -480,7 +480,7 @@
<select name="vertical-axis-tick-minor"></select>
<div class="item-content">
<div class="item-inner">
<div class="item-title"><%= scope.textMajorType %></div>
<div class="item-title"><%= scope.textMinorType %></div>
<div class="item-after"><%= scope.textNone %></div>
</div>
</div>
@ -596,7 +596,7 @@
<select name="horizontal-axis-tick-minor"></select>
<div class="item-content">
<div class="item-inner">
<div class="item-title"><%= scope.textMajorType %></div>
<div class="item-title"><%= scope.textMinorType %></div>
<div class="item-after"><%= scope.textNone %></div>
</div>
</div>

2
apps/spreadsheeteditor/mobile/app/template/EditText.template
View file

@ -24,7 +24,7 @@
</div>
</li>
<li>
<a id="text-color" class="item-link" data-page="#edit-text-color">
<a id="font-color" class="item-link" data-page="#edit-text-color">
<div class="item-content">
<% if (!android) { %><div class="item-media" style="padding-top: 0;"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %>
<div class="item-inner">

1
apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js
View file

@ -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',

1
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -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",