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

[DE] refactoring

Browse source
This commit is contained in:
Maxim Kadushkin 2017-04-03 19:24:24 +03:00
parent ae12690dea
commit 240a3c1358
3 changed files with 28 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/main/app/controller/DocumentHolder.js
View file

@ -144,6 +144,11 @@ define([
} }
}, this)); }, this));
} }
},
getView: function (name) {
return !name ?
this.documentHolder : Backbone.Controller.prototype.getView.call()
} }
}); });
}); });

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

@ -538,7 +538,7 @@ define([
this.api.SetMarkerFormat(false); this.api.SetMarkerFormat(false);
toolbarView.btnHighlightColor.toggle(false, false); toolbarView.btnHighlightColor.toggle(false, false);
} }
application.getController('DocumentHolder').getView('DocumentHolder').focus(); application.getController('DocumentHolder').getView().focus();
if (this.api) { if (this.api) {
var cansave = this.api.asc_isDocumentCanSave(); var cansave = this.api.asc_isDocumentCanSave();
@ -740,8 +740,8 @@ define([
if (window.styles_loaded) { if (window.styles_loaded) {
clearInterval(timer_sl); clearInterval(timer_sl);
documentHolderController.getView('DocumentHolder').createDelayedElements(); documentHolderController.getView().createDelayedElements();
documentHolderController.getView('DocumentHolder').changePosition(); documentHolderController.getView().changePosition();
me.loadLanguages(); me.loadLanguages();
var shapes = me.api.asc_getPropertyEditorShapes(); var shapes = me.api.asc_getPropertyEditorShapes();
@ -884,7 +884,7 @@ define([
if (me.appOptions.canBranding) if (me.appOptions.canBranding)
me.getApplication().getController('LeftMenu').leftMenu.getMenu('about').setLicInfo(me.editorConfig.customization); me.getApplication().getController('LeftMenu').leftMenu.getMenu('about').setLicInfo(me.editorConfig.customization);
documentHolderController.getView('DocumentHolder').setApi(me.api).on('editcomplete', _.bind(me.onEditComplete, me)); documentHolderController.getView().setApi(me.api).on('editcomplete', _.bind(me.onEditComplete, me));
if (me.appOptions.isEdit) { if (me.appOptions.isEdit) {
value = Common.localStorage.getItem("de-settings-autosave"); value = Common.localStorage.getItem("de-settings-autosave");
@ -902,7 +902,7 @@ define([
toolbarController.createDelayedElements(); toolbarController.createDelayedElements();
documentHolderController.getView('DocumentHolder').createDelayedElements(); documentHolderController.getView().createDelayedElements();
me.loadLanguages(); me.loadLanguages();
var shapes = me.api.asc_getPropertyEditorShapes(); var shapes = me.api.asc_getPropertyEditorShapes();
@ -1067,7 +1067,7 @@ define([
viewport = app.getController('Viewport').getView('Viewport'), viewport = app.getController('Viewport').getView('Viewport'),
// headerView = app.getController('Viewport').getView('Common.Views.Header'), // headerView = app.getController('Viewport').getView('Common.Views.Header'),
statusbarView = app.getController('Statusbar').getView('Statusbar'), statusbarView = app.getController('Statusbar').getView('Statusbar'),
documentHolder = app.getController('DocumentHolder').getView('DocumentHolder'); documentHolder = app.getController('DocumentHolder').getView();
// if (headerView) { // if (headerView) {
// headerView.setHeaderCaption(this.appOptions.isEdit ? 'Document Editor' : 'Document Viewer'); // headerView.setHeaderCaption(this.appOptions.isEdit ? 'Document Editor' : 'Document Viewer');
@ -1562,7 +1562,7 @@ define([
synchronizeChanges: function() { synchronizeChanges: function() {
this.getApplication().getController('Statusbar').synchronizeChanges(); this.getApplication().getController('Statusbar').synchronizeChanges();
this.getApplication().getController('Common.Controllers.ReviewChanges').synchronizeChanges(); this.getApplication().getController('Common.Controllers.ReviewChanges').synchronizeChanges();
this.getApplication().getController('DocumentHolder').getView('DocumentHolder').hideTips(); this.getApplication().getController('DocumentHolder').getView().hideTips();
/** coauthoring begin **/ /** coauthoring begin **/
this.getApplication().getController('Toolbar').getView('Toolbar').synchronizeChanges(); this.getApplication().getController('Toolbar').getView('Toolbar').synchronizeChanges();
/** coauthoring end **/ /** coauthoring end **/
@ -1661,7 +1661,7 @@ define([
me.getApplication().getController('RightMenu').UpdateThemeColors(); me.getApplication().getController('RightMenu').UpdateThemeColors();
}, 50); }, 50);
setTimeout(function(){ setTimeout(function(){
me.getApplication().getController('DocumentHolder').getView('DocumentHolder').updateThemeColors(); me.getApplication().getController('DocumentHolder').getView().updateThemeColors();
}, 50); }, 50);
setTimeout(function(){ setTimeout(function(){
@ -1695,7 +1695,7 @@ define([
return 0; return 0;
}); });
this.getApplication().getController('DocumentHolder').getView('DocumentHolder').setLanguages(langs); this.getApplication().getController('DocumentHolder').getView().setLanguages(langs);
this.getApplication().getController('Statusbar').setLanguages(langs); this.getApplication().getController('Statusbar').setLanguages(langs);
}, },

41
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -560,7 +560,7 @@ define([
onApiCanAddHyperlink: function(value) { onApiCanAddHyperlink: function(value) {
var need_disable = !value || this._state.prcontrolsdisable; var need_disable = !value || this._state.prcontrolsdisable;
if (need_disable != this.toolbar.btnInsertHyperlink.isDisabled() && this.editMode) { if ( this.editMode ) {
this.toolbar.btnInsertHyperlink.setDisabled(need_disable); this.toolbar.btnInsertHyperlink.setDisabled(need_disable);
} }
}, },
@ -700,35 +700,26 @@ define([
} }
need_disable = need_disable || !enable_dropcap || in_equation; need_disable = need_disable || !enable_dropcap || in_equation;
if (need_disable !== toolbar.btnDropCap.isDisabled()) toolbar.btnDropCap.setDisabled(need_disable);
toolbar.btnDropCap.setDisabled(need_disable);
if (!toolbar.btnDropCap.isDisabled() && disable_dropcapadv!==toolbar.mnuDropCapAdvanced.isDisabled() ) if ( !toolbar.btnDropCap.isDisabled() )
toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv); toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv);
need_disable = !can_add_table || header_locked || in_equation; need_disable = !can_add_table || header_locked || in_equation;
if (need_disable != toolbar.btnInsertTable.isDisabled()) { toolbar.btnInsertTable.setDisabled(need_disable);
toolbar.btnInsertTable.setDisabled(need_disable);
}
need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled(); need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled();
toolbar.mnuInsertPageNum.setDisabled(need_disable);
if (need_disable != toolbar.mnuInsertPageNum.isDisabled()) {
toolbar.mnuInsertPageNum.setDisabled(need_disable);
}
need_disable = paragraph_locked || header_locked || in_header || in_equation && !btn_eq_state; need_disable = paragraph_locked || header_locked || in_header || in_equation && !btn_eq_state;
toolbar.btnsPageBreak.disable(need_disable); toolbar.btnsPageBreak.disable(need_disable);
need_disable = paragraph_locked || header_locked || !can_add_image || in_equation; need_disable = paragraph_locked || header_locked || !can_add_image || in_equation;
if (need_disable != toolbar.btnInsertImage.isDisabled()) { toolbar.btnInsertImage.setDisabled(need_disable);
toolbar.btnInsertImage.setDisabled(need_disable); toolbar.btnInsertShape.setDisabled(need_disable);
toolbar.btnInsertShape.setDisabled(need_disable); toolbar.btnInsertText.setDisabled(need_disable);
toolbar.btnInsertText.setDisabled(need_disable);
}
if ((need_disable || in_image) != toolbar.mnuInsertTextArt.isDisabled()) toolbar.mnuInsertTextArt.setDisabled(need_disable || in_image);
toolbar.mnuInsertTextArt.setDisabled(need_disable || in_image);
if (in_chart !== this._state.in_chart) { if (in_chart !== this._state.in_chart) {
toolbar.btnInsertChart.updateHint(in_chart ? toolbar.tipChangeChart : toolbar.tipInsertChart); toolbar.btnInsertChart.updateHint(in_chart ? toolbar.tipChangeChart : toolbar.tipInsertChart);
@ -736,20 +727,16 @@ define([
} }
need_disable = in_chart && image_locked || !in_chart && need_disable; need_disable = in_chart && image_locked || !in_chart && need_disable;
if (need_disable != toolbar.btnInsertChart.isDisabled()) toolbar.btnInsertChart.setDisabled(need_disable);
toolbar.btnInsertChart.setDisabled(need_disable);
need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation; need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation;
if (need_disable !== toolbar.btnInsertEquation.isDisabled()) toolbar.btnInsertEquation.setDisabled(need_disable); toolbar.btnInsertEquation.setDisabled(need_disable);
need_disable = paragraph_locked || header_locked || in_equation; need_disable = paragraph_locked || header_locked || in_equation;
if (need_disable !== toolbar.btnSuperscript.isDisabled()) { toolbar.btnSuperscript.setDisabled(need_disable);
toolbar.btnSuperscript.setDisabled(need_disable); toolbar.btnSubscript.setDisabled(need_disable);
toolbar.btnSubscript.setDisabled(need_disable);
}
if (in_equation !== toolbar.btnEditHeader.isDisabled()) toolbar.btnEditHeader.setDisabled(in_equation);
toolbar.btnEditHeader.setDisabled(in_equation);
if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled()) if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined); toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);