mirror of
https://github.com/ONLYOFFICE/web-apps.git
synced 2026-07-27 18:43:30 +08:00
moved chart tab to common
This commit is contained in:
nikita_bartoshuk
@ -37,15 +37,15 @@
|
||||
*/
|
||||
define([
|
||||
'core',
|
||||
'documenteditor/main/app/view/ChartTab'
|
||||
'common/main/lib/view/ChartTab'
|
||||
], function () {
|
||||
'use strict';
|
||||
DE.Controllers.ChartTab = Backbone.Controller.extend(_.extend({
|
||||
Common.Controllers.ChartTab = Backbone.Controller.extend(_.extend({
|
||||
models : [],
|
||||
collections : [
|
||||
],
|
||||
views : [
|
||||
'ChartTab'
|
||||
'Common.Views.ChartTab'
|
||||
],
|
||||
sdkViewName : '#id_main',
|
||||
initialize: function () {
|
||||
@ -70,7 +70,7 @@ define([
|
||||
this._noApply = false;
|
||||
this._originalProps = null;
|
||||
this.addListeners({
|
||||
'ChartTab': {
|
||||
'Common.Views.ChartTab': {
|
||||
'charttab:3dsettings': _.bind(this.open3DSettings, this),
|
||||
'charttab:widthchange': _.bind(this.onWidthChange, this),
|
||||
'charttab:heightchange': _.bind(this.onHeightChange, this),
|
||||
@ -79,6 +79,7 @@ define([
|
||||
'charttab:editdata': _.bind(this.setEditData, this),
|
||||
},
|
||||
});
|
||||
console.log(window.DE, window.SSE)
|
||||
},
|
||||
|
||||
setEditData: function() {
|
||||
@ -183,7 +184,7 @@ define([
|
||||
var props = new Asc.asc_CImgProperty();
|
||||
if (props) {
|
||||
var oView3D = me.chartProps.getView3d();
|
||||
(new DE.Views.Charts3DDlg(
|
||||
(new Common.Views.Charts3DDlg(
|
||||
{
|
||||
oView3D: oView3D,
|
||||
chartProps: props,
|
||||
@ -486,7 +487,7 @@ define([
|
||||
},
|
||||
|
||||
setConfig: function(config) {
|
||||
this.view = this.createView('ChartTab', {
|
||||
this.view = this.createView('Common.Views.ChartTab', {
|
||||
toolbar: config.toolbar.toolbar
|
||||
});
|
||||
},
|
||||
@ -573,5 +574,5 @@ define([
|
||||
this.rangeSelectionMode = (status != Asc.c_oAscSelectionDialogType.None);
|
||||
},
|
||||
|
||||
}, DE.Controllers.ChartTab || {}));
|
||||
}, Common.Controllers.ChartTab || {}));
|
||||
});
|
||||
@ -42,58 +42,58 @@ define([
|
||||
'common/main/lib/component/Layout'
|
||||
], function () {
|
||||
'use strict';
|
||||
DE.Views.ChartTab = Common.UI.BaseView.extend(_.extend((function(){
|
||||
var template = '<section id="chart-design-panel" class="panel" data-tab="charttab" role="tabpanel" aria-labelledby="view">' +
|
||||
Common.Views.ChartTab = Common.UI.BaseView.extend(_.extend((function(){
|
||||
var template = '<section id="chart-design-panel1" class="panel" data-tab="charttab" role="tabpanel" aria-labelledby="view">' +
|
||||
'<div class="group">' +
|
||||
'<span class="btn-slot text x-huge" id="slot-btn-chart-elements"></span>' +
|
||||
'</div>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group">' +
|
||||
'<span class="btn-slot text x-huge" id="slot-btn-edit-data"></span>' +
|
||||
'</div>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group flex small" id="slot-field-chart-styles" style="min-width: 100px; width: 448px" data-group-width="448px">' +
|
||||
'</div>' +
|
||||
'<div class="separator long separator-chart-styles"></div>' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-btn-chart-type"></span>' +
|
||||
'<span class="btn-slot text x-huge" id="slot-btn-chart-elements1"></span>' +
|
||||
'</div>' +
|
||||
'<div class="elset">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-btn-chart-advanced-settings"></span>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group">' +
|
||||
'<span class="btn-slot text x-huge" id="slot-btn-edit-data1"></span>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group">' +
|
||||
'<span class="btn-slot text x-huge slot-img-wrapping"></span>' +
|
||||
'</div>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset" style="text-align: center;">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-lbl-width" style="text-align: center;margin-top: 2px;"></span>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group flex small" id="slot-field-chart-styles1" style="min-width: 100px; width: 448px" data-group-width="448px">' +
|
||||
'</div>' +
|
||||
'<div class="elset" style="text-align: center;">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-lbl-height" style="text-align: center;margin-top: 2px;"></span>' +
|
||||
'<div class="separator long separator-chart-styles"></div>' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-btn-chart-type1"></span>' +
|
||||
'</div>' +
|
||||
'<div class="elset">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-btn-chart-advanced-settings1"></span>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset">' +
|
||||
'<div id="id-chart-spin-width"></div>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group">' +
|
||||
'<span class="btn-slot text x-huge slot-img-wrapping"></span>' +
|
||||
'</div>' +
|
||||
'<div class="elset">' +
|
||||
'<div id="id-chart-spin-height"></div>' +
|
||||
'<div class="separator long"></div>' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset" style="text-align: center;">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-lbl-width1" style="text-align: center;margin-top: 2px;"></span>' +
|
||||
'</div>' +
|
||||
'<div class="elset" style="text-align: center;">' +
|
||||
'<span class="btn-slot text font-size-normal" id="slot-lbl-height1" style="text-align: center;margin-top: 2px;"></span>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset">' +
|
||||
'<span class="btn-slot text" id="slot-chk-ratio"></span>' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset">' +
|
||||
'<div id="id-chart-spin-width1"></div>' +
|
||||
'</div>' +
|
||||
'<div class="elset">' +
|
||||
'<div id="id-chart-spin-height1"></div>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="elset">' +
|
||||
'<div class="group small">' +
|
||||
'<div class="elset">' +
|
||||
'<span class="btn-slot text" id="slot-chk-ratio1"></span>' +
|
||||
'</div>' +
|
||||
'<div class="elset">' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="separator long separator-chart-3d"></div>' +
|
||||
'<div class="group">' +
|
||||
'<span class="btn-slot text x-huge" id="slot-btn-chart-3d-settings"></span>' +
|
||||
'<div class="separator long separator-chart-3d"></div>' +
|
||||
'<div class="group">' +
|
||||
'<span class="btn-slot text x-huge" id="slot-btn-chart-3d-settings1"></span>' +
|
||||
'</div>' +
|
||||
'</section>';
|
||||
function setEvents() {
|
||||
@ -131,8 +131,6 @@ define([
|
||||
}
|
||||
return {
|
||||
initialize: function (options) {
|
||||
var controller = DE.getController('ChartTab');
|
||||
// this._state = controller._state;
|
||||
Common.UI.BaseView.prototype.initialize.call(this);
|
||||
this.lockedControls = [];
|
||||
var me = this,
|
||||
@ -705,17 +703,18 @@ define([
|
||||
Common.Utils.injectComponent($host.findById(id), cmp);
|
||||
};
|
||||
|
||||
_injectComponent('#id-chart-spin-width', this.spnWidth);
|
||||
_injectComponent('#id-chart-spin-height', this.spnHeight);
|
||||
this.btnChartElements && this.btnChartElements.render($host.find('#slot-btn-chart-elements'));
|
||||
this.btnEditData && this.btnEditData.render($host.find('#slot-btn-edit-data'));
|
||||
this.chartStyles.render(this.$el.find('#slot-field-chart-styles'));
|
||||
this.btnChartType && this.btnChartType.render($host.find('#slot-btn-chart-type'));
|
||||
this.btnAdvancedSettings && this.btnAdvancedSettings.render($host.find('#slot-btn-chart-advanced-settings'));
|
||||
this.lblWidth && this.lblWidth.render($host.find('#slot-lbl-width'));
|
||||
this.lblHeight && this.lblHeight.render($host.find('#slot-lbl-height'));
|
||||
this.chRatio && this.chRatio.render($host.find('#slot-chk-ratio'));
|
||||
this.btn3DSettings && this.btn3DSettings.render($host.find('#slot-btn-chart-3d-settings'));
|
||||
_injectComponent('#id-chart-spin-width1', this.spnWidth);
|
||||
_injectComponent('#id-chart-spin-height1', this.spnHeight);
|
||||
this.btnChartElements && this.btnChartElements.render($host.find('#slot-btn-chart-elements1'));
|
||||
this.btnEditData && this.btnEditData.render($host.find('#slot-btn-edit-data1'));
|
||||
this.chartStyles.render(this.$el.find('#slot-field-chart-styles1'));
|
||||
this.btnChartType && this.btnChartType.render($host.find('#slot-btn-chart-type1'));
|
||||
this.btnAdvancedSettings && this.btnAdvancedSettings.render($host.find('#slot-btn-chart-advanced-settings1'));
|
||||
this.lblWidth && this.lblWidth.render($host.find('#slot-lbl-width1'));
|
||||
this.lblHeight && this.lblHeight.render($host.find('#slot-lbl-height1'));
|
||||
this.chRatio && this.chRatio.render($host.find('#slot-chk-ratio1'));
|
||||
this.btn3DSettings && this.btn3DSettings.render($host.find('#slot-btn-chart-3d-settings1'));
|
||||
|
||||
return this.$el;
|
||||
},
|
||||
|
||||
@ -725,13 +724,13 @@ define([
|
||||
this.btnChartType.setMenu( new Common.UI.Menu({
|
||||
style: 'width: 364px;padding-top: 12px;',
|
||||
items: [
|
||||
{template: _.template('<div id="id-chart-menu-insertchart" class="menu-insertchart"></div>')}
|
||||
{template: _.template('<div id="id-chart-menu-insertchart1" class="menu-insertchart"></div>')}
|
||||
]
|
||||
}));
|
||||
|
||||
var onShowBefore = function(menu) {
|
||||
var picker = new Common.UI.DataView({
|
||||
el: $('#id-chart-menu-insertchart'),
|
||||
el: $('#id-chart-menu-insertchart1'),
|
||||
parentMenu: menu,
|
||||
outerMenu: {menu: menu, index:0},
|
||||
showLast: false,
|
||||
@ -779,5 +778,5 @@ define([
|
||||
}, this);
|
||||
},
|
||||
}
|
||||
}()), DE.Views.ChartTab || {}));
|
||||
}()), Common.Views.ChartTab || {}));
|
||||
});
|
||||
@ -38,7 +38,7 @@
|
||||
define([], function () {
|
||||
'use strict';
|
||||
var nMaxRecent = 5;
|
||||
DE.Views.Charts3DDlg = Common.UI.Window.extend(_.extend({
|
||||
Common.Views.Charts3DDlg = Common.UI.Window.extend(_.extend({
|
||||
initialize : function (options) {
|
||||
var t = this,
|
||||
_options = {};
|
||||
@ -52,6 +52,7 @@ define([], function () {
|
||||
caption: 'Ok'
|
||||
}, 'cancel']
|
||||
}, options);
|
||||
|
||||
this.recentNumTypes = [];
|
||||
this.handler = options.handler;
|
||||
this.props = options.props;
|
||||
@ -127,10 +128,12 @@ define([], function () {
|
||||
_options.tpl = _.template(this.template)(_options);
|
||||
Common.UI.Window.prototype.initialize.call(this, _options);
|
||||
},
|
||||
|
||||
render: function () {
|
||||
Common.UI.Window.prototype.render.call(this);
|
||||
var me = this;
|
||||
this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
|
||||
|
||||
this.btnLeft = new Common.UI.Button({
|
||||
parentEl: $('#id-chart-btn-x-left'),
|
||||
cls: 'btn-toolbar',
|
||||
@ -142,6 +145,7 @@ define([], function () {
|
||||
this.btnLeft.on('click', _.bind(function() {
|
||||
this.spnX.setValue(Math.ceil((this.spnX.getNumberValue() - 10)/10)*10);
|
||||
}, this));
|
||||
|
||||
this.btnRight= new Common.UI.Button({
|
||||
parentEl: $('#id-chart-btn-x-right'),
|
||||
cls: 'btn-toolbar',
|
||||
@ -153,6 +157,7 @@ define([], function () {
|
||||
this.btnRight.on('click', _.bind(function() {
|
||||
this.spnX.setValue(Math.floor((this.spnX.getNumberValue() + 10)/10)*10);
|
||||
}, this));
|
||||
|
||||
this.spnX = new Common.UI.MetricSpinner({
|
||||
el: $('#id-chart-spin-x'),
|
||||
step: 10,
|
||||
@ -168,6 +173,7 @@ define([], function () {
|
||||
});
|
||||
this.spnX.on('change', _.bind(this.onXRotation, this));
|
||||
this.spnX.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
|
||||
|
||||
this.spnY = new Common.UI.MetricSpinner({
|
||||
el: $('#id-chart-spin-y'),
|
||||
step: 10,
|
||||
@ -183,6 +189,7 @@ define([], function () {
|
||||
});
|
||||
this.spnY.on('change', _.bind(this.onYRotation, this));
|
||||
this.spnY.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
|
||||
|
||||
this.btnUp = new Common.UI.Button({
|
||||
parentEl: $('#id-chart-btn-y-up'),
|
||||
cls: 'btn-toolbar',
|
||||
@ -194,6 +201,7 @@ define([], function () {
|
||||
this.btnUp.on('click', _.bind(function() {
|
||||
this.spnY.setValue(Math.ceil((this.spnY.getNumberValue() - 10)/10)*10);
|
||||
}, this));
|
||||
|
||||
this.btnDown= new Common.UI.Button({
|
||||
parentEl: $('#id-chart-btn-y-down'),
|
||||
cls: 'btn-toolbar',
|
||||
@ -205,6 +213,7 @@ define([], function () {
|
||||
this.btnDown.on('click', _.bind(function() {
|
||||
this.spnY.setValue(Math.floor((this.spnY.getNumberValue() + 10)/10)*10);
|
||||
}, this));
|
||||
|
||||
this.spnPerspective = new Common.UI.MetricSpinner({
|
||||
el: $('#id-chart-spin-persp'),
|
||||
step: 5,
|
||||
@ -220,6 +229,7 @@ define([], function () {
|
||||
});
|
||||
this.spnPerspective.on('change', _.bind(this.onPerspective, this));
|
||||
this.spnPerspective.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
|
||||
|
||||
this.btnNarrow = new Common.UI.Button({
|
||||
parentEl: $('#id-chart-btn-narrow'),
|
||||
cls: 'btn-toolbar',
|
||||
@ -231,6 +241,7 @@ define([], function () {
|
||||
this.btnNarrow.on('click', _.bind(function() {
|
||||
this.spnPerspective.setValue(Math.ceil((this.spnPerspective.getNumberValue() - 5)/5)*5);
|
||||
}, this));
|
||||
|
||||
this.btnWiden= new Common.UI.Button({
|
||||
parentEl: $('#id-chart-btn-widen'),
|
||||
cls: 'btn-toolbar',
|
||||
@ -242,6 +253,7 @@ define([], function () {
|
||||
this.btnWiden.on('click', _.bind(function() {
|
||||
this.spnPerspective.setValue(Math.floor((this.spnPerspective.getNumberValue() + 5)/5)*5);
|
||||
}, this));
|
||||
|
||||
this.chRightAngle = new Common.UI.CheckBox({
|
||||
el: $('#id-chart-checkbox-right-angle'),
|
||||
labelText: this.capRightAngleAxes
|
||||
@ -254,6 +266,7 @@ define([], function () {
|
||||
this.btnWiden.setDisabled(field.getValue()=='checked');
|
||||
}
|
||||
}, this));
|
||||
|
||||
this.chAutoscale = new Common.UI.CheckBox({
|
||||
el: $('#id-chart-checkbox-autoscale'),
|
||||
labelText: this.capAutoscale
|
||||
@ -264,6 +277,7 @@ define([], function () {
|
||||
this.spn3DHeight.setDisabled(field.getValue()=='checked');
|
||||
}
|
||||
}, this));
|
||||
|
||||
this.spn3DDepth = new Common.UI.MetricSpinner({
|
||||
el: $('#id-chart-spin-3d-depth'),
|
||||
step: 10,
|
||||
@ -279,6 +293,7 @@ define([], function () {
|
||||
});
|
||||
this.spn3DDepth.on('change', _.bind(this.on3DDepth, this));
|
||||
this.spn3DDepth.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
|
||||
|
||||
this.spn3DHeight = new Common.UI.MetricSpinner({
|
||||
el: $('#id-chart-spin-3d-height'),
|
||||
step: 10,
|
||||
@ -294,6 +309,7 @@ define([], function () {
|
||||
});
|
||||
this.spn3DHeight.on('change', _.bind(this.on3DHeight, this));
|
||||
this.spn3DHeight.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
|
||||
|
||||
this.linkDefRotation = $('#id-chart-def-rotate-link');
|
||||
this.linkDefRotation.on('click', _.bind(this.onDefRotation, this));
|
||||
this.spnX.setValue((me.X!==null && me.X !== undefined) ? me.X : '', true);
|
||||
@ -308,36 +324,43 @@ define([], function () {
|
||||
this.chAutoscale.setValue(me.Height3d===null, true);
|
||||
(me.Height3d!==null) && this.spn3DHeight.setValue(me.Height3d, true);
|
||||
this.spn3DHeight.setDisabled(me.Height3d===null);
|
||||
|
||||
this.btnOk = _.find(this.getFooterButtons(), function (item) {
|
||||
return (item.$el && item.$el.find('.primary').addBack().filter('.primary').length>0);
|
||||
}) || new Common.UI.Button({ el: this.$window.find('.primary') });
|
||||
this.afterRender();
|
||||
},
|
||||
|
||||
onXRotation: function(field, newValue, oldValue, eOpts){
|
||||
if (this.api && this.chartProps && this.oView3D) {
|
||||
this.oView3D.asc_setRotX(field.getNumberValue());
|
||||
}
|
||||
},
|
||||
|
||||
onYRotation: function(field, newValue, oldValue, eOpts){
|
||||
if (this.api && this.chartProps && this.oView3D) {
|
||||
this.oView3D.asc_setRotY(field.getNumberValue());
|
||||
}
|
||||
},
|
||||
|
||||
onPerspective: function(field, newValue, oldValue, eOpts){
|
||||
if (this.api && this.chartProps && this.oView3D) {
|
||||
this.oView3D.asc_setPerspective(field.getNumberValue());
|
||||
}
|
||||
},
|
||||
|
||||
on3DDepth: function(field, newValue, oldValue, eOpts){
|
||||
if (this.api && this.chartProps && this.oView3D) {
|
||||
this.oView3D.asc_setDepth(field.getNumberValue());
|
||||
}
|
||||
},
|
||||
|
||||
on3DHeight: function(field, newValue, oldValue, eOpts){
|
||||
if (this.api && this.chartProps && this.oView3D) {
|
||||
this.oView3D.asc_setHeight(field.getNumberValue());
|
||||
}
|
||||
},
|
||||
|
||||
onDefRotation: function() {
|
||||
var me = this;
|
||||
if (this.api && this.chartProps && this.oView3D) {
|
||||
@ -347,22 +370,28 @@ define([], function () {
|
||||
me.spnY.setValue(15);
|
||||
}
|
||||
},
|
||||
|
||||
getFocusedComponents: function() {
|
||||
return [this.btnLeft, this.btnRight].concat(this.getFooterButtons());
|
||||
},
|
||||
|
||||
getDefaultFocusableComponent: function () {
|
||||
return this.spnX;
|
||||
},
|
||||
|
||||
afterRender: function() {
|
||||
this._setDefaults(this.props);
|
||||
},
|
||||
|
||||
onPrimary: function(event) {
|
||||
this._handleInput('ok');
|
||||
return false;
|
||||
},
|
||||
|
||||
onBtnClick: function(event) {
|
||||
this._handleInput(event.currentTarget.attributes['result'].value);
|
||||
},
|
||||
|
||||
_handleInput: function(state) {
|
||||
var me = this;
|
||||
if (state === 'ok' && this.btnOk.isDisabled())
|
||||
@ -372,14 +401,17 @@ define([], function () {
|
||||
}
|
||||
this.close();
|
||||
},
|
||||
|
||||
_setDefaults: function (props) {
|
||||
if (props) {
|
||||
}
|
||||
},
|
||||
|
||||
getSettings: function() {
|
||||
},
|
||||
|
||||
SetDisabled: function(disabled) {
|
||||
this.btnOk.setDisabled(disabled);
|
||||
},
|
||||
}, DE.Views.Charts3DDlg || {}));
|
||||
}, Common.Views.Charts3DDlg || {}));
|
||||
});
|
||||
@ -145,11 +145,11 @@ require([
|
||||
'Main',
|
||||
'ViewTab',
|
||||
'HeaderFooterTab',
|
||||
'ChartTab',
|
||||
'Search',
|
||||
'DocProtection',
|
||||
'Print',
|
||||
'Common.Controllers.Fonts',
|
||||
'Common.Controllers.ChartTab',
|
||||
'Common.Controllers.History'
|
||||
/** coauthoring begin **/
|
||||
,'Common.Controllers.Chat'
|
||||
@ -190,12 +190,12 @@ require([
|
||||
'documenteditor/main/app/controller/Main',
|
||||
'documenteditor/main/app/controller/ViewTab',
|
||||
'documenteditor/main/app/controller/HeaderFooterTab',
|
||||
'documenteditor/main/app/controller/ChartTab',
|
||||
'documenteditor/main/app/controller/Search',
|
||||
'documenteditor/main/app/controller/DocProtection',
|
||||
'documenteditor/main/app/controller/Print',
|
||||
'common/main/lib/util/utils',
|
||||
'common/main/lib/controller/Fonts',
|
||||
'common/main/lib/controller/ChartTab',
|
||||
'common/main/lib/controller/History'
|
||||
/** coauthoring begin **/
|
||||
,'common/main/lib/controller/Comments'
|
||||
|
||||
@ -65,7 +65,7 @@ define([], function () {
|
||||
'createdelayedelements': this.createDelayedElements,
|
||||
'equation:callback': this.equationCallback
|
||||
},
|
||||
'ChartTab': {
|
||||
'Common.Views.ChartTab': {
|
||||
'charttab:updatemenu': function (menu) {
|
||||
me.chartProps = me.getCurrentChartProps();
|
||||
if (me.chartProps) {
|
||||
|
||||
@ -2066,7 +2066,7 @@ define([
|
||||
}
|
||||
|
||||
if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram && !me.appOptions.isEditOle && me.appOptions.canFeatureTable)
|
||||
application.getController('ChartTab').setMode(me.appOptions);
|
||||
application.getController('Common.Controllers.ChartTab').setMode(me.appOptions);
|
||||
|
||||
var toolbarView = (toolbarController) ? toolbarController.getView() : null;
|
||||
if (toolbarView) {
|
||||
|
||||
@ -177,7 +177,7 @@ define([
|
||||
'ViewTab': {
|
||||
'toolbar:setcompact': this.onChangeCompactView.bind(this)
|
||||
},
|
||||
'ChartTab': {
|
||||
'Common.Views.ChartTab': {
|
||||
'add:chart': this.onSelectChart.bind(this)
|
||||
},
|
||||
'DocumentHolder': {
|
||||
@ -3946,9 +3946,9 @@ define([
|
||||
Array.prototype.push.apply(me.toolbar.lockControls, headerfootertab.getView('HeaderFooterTab').getButtons());
|
||||
|
||||
tab = {caption: me.toolbar.textTabChart, action: 'charttab', extcls: config.isEdit ? 'canedit' : '', layoutname: 'toolbar-charttab', dataHintTitle: 'V', aux: true};
|
||||
var charttab = me.getApplication().getController('ChartTab');
|
||||
var charttab = me.getApplication().getController('Common.Controllers.ChartTab');
|
||||
charttab.setApi(me.api).setConfig({toolbar: me});
|
||||
var view = charttab.getView('ChartTab');
|
||||
var view = charttab.getView('Common.Views.ChartTab');
|
||||
var chartbuttons = view.getButtons();
|
||||
var $panel = charttab.createToolbarPanel();
|
||||
if ($panel) {
|
||||
|
||||
@ -135,11 +135,11 @@ require([
|
||||
'Main',
|
||||
'ViewTab',
|
||||
'HeaderFooterTab',
|
||||
'ChartTab',
|
||||
'Search',
|
||||
'DocProtection',
|
||||
'Print',
|
||||
'Common.Controllers.Fonts',
|
||||
'Common.Controllers.ChartTab',
|
||||
'Common.Controllers.History'
|
||||
/** coauthoring begin **/
|
||||
,'Common.Controllers.Chat'
|
||||
@ -180,12 +180,12 @@ require([
|
||||
'documenteditor/main/app/controller/Main',
|
||||
'documenteditor/main/app/controller/ViewTab',
|
||||
'documenteditor/main/app/controller/HeaderFooterTab',
|
||||
'documenteditor/main/app/controller/ChartTab',
|
||||
'documenteditor/main/app/controller/Search',
|
||||
'documenteditor/main/app/controller/DocProtection',
|
||||
'documenteditor/main/app/controller/Print',
|
||||
'common/main/lib/util/utils',
|
||||
'common/main/lib/controller/Fonts',
|
||||
'common/main/lib/controller/ChartTab',
|
||||
'common/main/lib/controller/History'
|
||||
/** coauthoring begin **/
|
||||
,'common/main/lib/controller/Comments'
|
||||
@ -238,6 +238,7 @@ require([
|
||||
'common/main/lib/view/MacrosAiDialog',
|
||||
'common/main/lib/view/ShortcutsDialog',
|
||||
'common/main/lib/view/ShortcutsEditDialog',
|
||||
'common/main/lib/view/Charts3DDlg',
|
||||
'common/main/lib/component/MonacoEditor',
|
||||
|
||||
'documenteditor/main/app/controller/DocumentHolderExt',
|
||||
@ -276,7 +277,6 @@ require([
|
||||
'documenteditor/main/app/view/NumberingValueDialog',
|
||||
'documenteditor/main/app/view/ListIndentsDialog',
|
||||
'documenteditor/main/app/view/ProtectDialog',
|
||||
'documenteditor/main/app/view/Charts3DDlg',
|
||||
'documenteditor/main/app/view/PageNumberingDlg',
|
||||
'documenteditor/main/app/view/MailMergeEmailDlg'
|
||||
];
|
||||
|
||||
@ -35,6 +35,7 @@ require([
|
||||
'common/main/lib/view/MacrosAiDialog',
|
||||
'common/main/lib/view/ShortcutsDialog',
|
||||
'common/main/lib/view/ShortcutsEditDialog',
|
||||
'common/main/lib/view/Charts3DDlg',
|
||||
'common/main/lib/component/MonacoEditor',
|
||||
|
||||
'documenteditor/main/app/controller/DocumentHolderExt',
|
||||
@ -73,7 +74,6 @@ require([
|
||||
'documenteditor/main/app/view/NumberingValueDialog',
|
||||
'documenteditor/main/app/view/ListIndentsDialog',
|
||||
'documenteditor/main/app/view/ProtectDialog',
|
||||
'documenteditor/main/app/view/Charts3DDlg',
|
||||
'documenteditor/main/app/view/PageNumberingDlg',
|
||||
'documenteditor/main/app/view/MailMergeEmailDlg'
|
||||
], function () {
|
||||
|
||||
@ -1252,6 +1252,70 @@
|
||||
"Common.Views.UserNameDialog.textDontShow": "Don't ask me again",
|
||||
"Common.Views.UserNameDialog.textLabel": "Label:",
|
||||
"Common.Views.UserNameDialog.textLabelError": "Label must not be empty.",
|
||||
"Common.Views.ChartTab.capChartElements": "Chart Elements",
|
||||
"Common.Views.ChartTab.tipChartElements": "Chart elements",
|
||||
"Common.Views.ChartTab.capEditData": "Edit Data",
|
||||
"Common.Views.ChartTab.tipEditData": "Edit data",
|
||||
"Common.Views.ChartTab.capChartType": "Chart type",
|
||||
"Common.Views.ChartTab.tipChartType": "Change chart type",
|
||||
"Common.Views.ChartTab.capAdvancedSettings": "Advanced settings",
|
||||
"Common.Views.ChartTab.tipAdvanced": "Advanced settings",
|
||||
"Common.Views.ChartTab.textWidth": "Width",
|
||||
"Common.Views.ChartTab.textHeight": "Height",
|
||||
"Common.Views.ChartTab.textLockRation": "Lock aspect ratio",
|
||||
"Common.Views.ChartTab.cap3DRotation": "3D rotation",
|
||||
"Common.Views.ChartTab.tip3DRotation": "3D rotation",
|
||||
"Common.Views.ChartTab.textAxes": "Axes",
|
||||
"Common.Views.ChartTab.textHorAxis": "Horizontal axis",
|
||||
"Common.Views.ChartTab.textVertAxis": "Vertical axis",
|
||||
"Common.Views.ChartTab.textHorAxisSec": "Secondary horizontal axis",
|
||||
"Common.Views.ChartTab.textVertAxisSec": "Secondary vertical axis",
|
||||
"Common.Views.ChartTab.DepthAxis": "Z axis",
|
||||
"Common.Views.ChartTab.textAxisTitles": "Axis Titles",
|
||||
"Common.Views.ChartTab.textChartTitle": "Chart title",
|
||||
"Common.Views.ChartTab.textNone": "None",
|
||||
"Common.Views.ChartTab.textNoOverlay": "No overlay",
|
||||
"Common.Views.ChartTab.textOverlay": "Overlay",
|
||||
"Common.Views.ChartTab.textDataLabels": "Data labels",
|
||||
"Common.Views.ChartTab.textCenter": "Center",
|
||||
"Common.Views.ChartTab.textInnerBottom": "Inner bottom",
|
||||
"Common.Views.ChartTab.textInnerTop": "Inner top",
|
||||
"Common.Views.ChartTab.textOuterTop": "Outer top",
|
||||
"Common.Views.ChartTab.textTop": "Top",
|
||||
"Common.Views.ChartTab.textLeft": "Left",
|
||||
"Common.Views.ChartTab.textRight": "Right",
|
||||
"Common.Views.ChartTab.textBottom": "Bottom",
|
||||
"Common.Views.ChartTab.textFit": "Fit to width",
|
||||
"Common.Views.ChartTab.textErrorBars": "Error Bars",
|
||||
"Common.Views.ChartTab.textStandardError": "Standard Error",
|
||||
"Common.Views.ChartTab.txtPercentage": "Percentage",
|
||||
"Common.Views.ChartTab.textStandardDeviation": "Standard Deviation",
|
||||
"Common.Views.ChartTab.textGridLines": "Gridlines",
|
||||
"Common.Views.ChartTab.textHorizontalMajor": "Horizontal Major",
|
||||
"Common.Views.ChartTab.textVerticalMajor": "Vertical Major",
|
||||
"Common.Views.ChartTab.textHorizontalMinor": "Horizontal Minor",
|
||||
"Common.Views.ChartTab.textVerticalMinor": "Vertical Minor",
|
||||
"Common.Views.ChartTab.textLegendPos": "Legend",
|
||||
"Common.Views.ChartTab.textLeftOverlay": "Left overlay",
|
||||
"Common.Views.ChartTab.textRightOverlay": "Right overlay",
|
||||
"Common.Views.ChartTab.textTrendlineOptions": "Trendline options",
|
||||
"Common.Views.ChartTab.textTrendline": "Trendline",
|
||||
"Common.Views.ChartTab.textLinear": "Linear",
|
||||
"Common.Views.ChartTab.textLinearForecast": "Linear Forecast",
|
||||
"Common.Views.ChartTab.textLinearTrend": "Linear trend",
|
||||
"Common.Views.ChartTab.textExponential": "Exponential",
|
||||
"Common.Views.ChartTab.textMovingAverage": "Moving Average (2)",
|
||||
"Common.Views.ChartTab.textUpDownBars": " Up/Down Bars",
|
||||
"Common.Views.ChartTab.textShowUpDown": "Show Up/Down Bars",
|
||||
"Common.Views.Charts3DDlg.txtXRotation": "X-rotation",
|
||||
"Common.Views.Charts3DDlg.txtYRotation": "Y-rotation",
|
||||
"Common.Views.Charts3DDlg.txtPerspective": "Perspective",
|
||||
"Common.Views.Charts3DDlg.txtDepth": "Depth (% of base)",
|
||||
"Common.Views.Charts3DDlg.txtHeight": "Height (% of base)",
|
||||
"Common.Views.Charts3DDlg.txtDefRotation": "Default Rotation",
|
||||
"Common.Views.Charts3DDlg.capRotation": "3D Rotation",
|
||||
"Common.Views.Charts3DDlg.capRightAngleAxes": "Right angle axes",
|
||||
"Common.Views.Charts3DDlg.capAutoscale": "Autoscale",
|
||||
"DE.Controllers.DocProtection.txtIsProtectedComment": "Document is protected. You may only insert comments to this document.",
|
||||
"DE.Controllers.DocProtection.txtIsProtectedForms": "Document is protected. You may only fill in forms in this document.",
|
||||
"DE.Controllers.DocProtection.txtIsProtectedTrack": "Document is protected. You may edit this document, but all changes will be tracked.",
|
||||
@ -3563,15 +3627,6 @@
|
||||
"DE.Views.ProtectDialog.txtRepeat": "Repeat password",
|
||||
"DE.Views.ProtectDialog.txtTitle": "Protect",
|
||||
"DE.Views.ProtectDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.",
|
||||
"DE.Views.Charts3DDlg.txtXRotation": "X-rotation",
|
||||
"DE.Views.Charts3DDlg.txtYRotation": "Y-rotation",
|
||||
"DE.Views.Charts3DDlg.txtPerspective": "Perspective",
|
||||
"DE.Views.Charts3DDlg.txtDepth": "Depth (% of base)",
|
||||
"DE.Views.Charts3DDlg.txtHeight": "Height (% of base)",
|
||||
"DE.Views.Charts3DDlg.txtDefRotation": "Default Rotation",
|
||||
"DE.Views.Charts3DDlg.capRotation": "3D Rotation",
|
||||
"DE.Views.Charts3DDlg.capRightAngleAxes": "Right angle axes",
|
||||
"DE.Views.Charts3DDlg.capAutoscale": "Autoscale",
|
||||
"DE.Views.RightMenu.ariaRightMenu": "Right menu",
|
||||
"DE.Views.RightMenu.txtChartSettings": "Chart settings",
|
||||
"DE.Views.RightMenu.txtFormSettings": "Form settings",
|
||||
@ -4315,61 +4370,6 @@
|
||||
"DE.Views.HeaderFooterTab.mniImageFromStorage": "Image from storage",
|
||||
"DE.Views.HeaderFooterTab.mniImageFromUrl": "Image from URL",
|
||||
"DE.Views.HeaderFooterTab.tipInsertImage": "Insert image",
|
||||
"DE.Views.ChartTab.capChartElements": "Chart Elements",
|
||||
"DE.Views.ChartTab.tipChartElements": "Chart elements",
|
||||
"DE.Views.ChartTab.capEditData": "Edit Data",
|
||||
"DE.Views.ChartTab.tipEditData": "Edit data",
|
||||
"DE.Views.ChartTab.capChartType": "Chart type",
|
||||
"DE.Views.ChartTab.tipChartType": "Change chart type",
|
||||
"DE.Views.ChartTab.capAdvancedSettings": "Advanced settings",
|
||||
"DE.Views.ChartTab.tipAdvanced": "Advanced settings",
|
||||
"DE.Views.ChartTab.textWidth": "Width",
|
||||
"DE.Views.ChartTab.textHeight": "Height",
|
||||
"DE.Views.ChartTab.textLockRation": "Lock aspect ratio",
|
||||
"DE.Views.ChartTab.cap3DRotation": "3D rotation",
|
||||
"DE.Views.ChartTab.tip3DRotation": "3D rotation",
|
||||
"DE.Views.ChartTab.textAxes": "Axes",
|
||||
"DE.Views.ChartTab.textHorAxis": "Horizontal axis",
|
||||
"DE.Views.ChartTab.textVertAxis": "Vertical axis",
|
||||
"DE.Views.ChartTab.textHorAxisSec": "Secondary horizontal axis",
|
||||
"DE.Views.ChartTab.textVertAxisSec": "Secondary vertical axis",
|
||||
"DE.Views.ChartTab.DepthAxis": "Z axis",
|
||||
"DE.Views.ChartTab.textAxisTitles": "Axis Titles",
|
||||
"DE.Views.ChartTab.textChartTitle": "Chart title",
|
||||
"DE.Views.ChartTab.textNone": "None",
|
||||
"DE.Views.ChartTab.textNoOverlay": "No overlay",
|
||||
"DE.Views.ChartTab.textOverlay": "Overlay",
|
||||
"DE.Views.ChartTab.textDataLabels": "Data labels",
|
||||
"DE.Views.ChartTab.textCenter": "Center",
|
||||
"DE.Views.ChartTab.textInnerBottom": "Inner bottom",
|
||||
"DE.Views.ChartTab.textInnerTop": "Inner top",
|
||||
"DE.Views.ChartTab.textOuterTop": "Outer top",
|
||||
"DE.Views.ChartTab.textTop": "Top",
|
||||
"DE.Views.ChartTab.textLeft": "Left",
|
||||
"DE.Views.ChartTab.textRight": "Right",
|
||||
"DE.Views.ChartTab.textBottom": "Bottom",
|
||||
"DE.Views.ChartTab.textFit": "Fit to width",
|
||||
"DE.Views.ChartTab.textErrorBars": "Error Bars",
|
||||
"DE.Views.ChartTab.textStandardError": "Standard Error",
|
||||
"DE.Views.ChartTab.txtPercentage": "Percentage",
|
||||
"DE.Views.ChartTab.textStandardDeviation": "Standard Deviation",
|
||||
"DE.Views.ChartTab.textGridLines": "Gridlines",
|
||||
"DE.Views.ChartTab.textHorizontalMajor": "Horizontal Major",
|
||||
"DE.Views.ChartTab.textVerticalMajor": "Vertical Major",
|
||||
"DE.Views.ChartTab.textHorizontalMinor": "Horizontal Minor",
|
||||
"DE.Views.ChartTab.textVerticalMinor": "Vertical Minor",
|
||||
"DE.Views.ChartTab.textLegendPos": "Legend",
|
||||
"DE.Views.ChartTab.textLeftOverlay": "Left overlay",
|
||||
"DE.Views.ChartTab.textRightOverlay": "Right overlay",
|
||||
"DE.Views.ChartTab.textTrendlineOptions": "Trendline options",
|
||||
"DE.Views.ChartTab.textTrendline": "Trendline",
|
||||
"DE.Views.ChartTab.textLinear": "Linear",
|
||||
"DE.Views.ChartTab.textLinearForecast": "Linear Forecast",
|
||||
"DE.Views.ChartTab.textLinearTrend": "Linear trend",
|
||||
"DE.Views.ChartTab.textExponential": "Exponential",
|
||||
"DE.Views.ChartTab.textMovingAverage": "Moving Average (2)",
|
||||
"DE.Views.ChartTab.textUpDownBars": " Up/Down Bars",
|
||||
"DE.Views.ChartTab.textShowUpDown": "Show Up/Down Bars",
|
||||
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
|
||||
"DE.Views.WatermarkSettingsDialog.textBold": "Bold",
|
||||
"DE.Views.WatermarkSettingsDialog.textColor": "Text color",
|
||||
|
||||
Reference in New Issue
Block a user