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

File menu refactoring

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-01 11:50:22 +03:00
parent 291f525b78
commit 6d5f42a234
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/view/FileMenu.js
View file

@ -82,7 +82,7 @@ define([
}, },
render: function () { render: function () {
let $markup = $(this.template()); var $markup = $(this.template());
this.miSave = new Common.UI.MenuItem({ this.miSave = new Common.UI.MenuItem({
el : $markup.elementById('#fm-btn-save'), el : $markup.elementById('#fm-btn-save'),

35
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -92,7 +92,7 @@ define([
if (_.isUndefined(this.scroller)) { if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({ this.scroller = new Common.UI.Scroller({
el: $(this.el), el: this.$el,
suppressScrollX: true suppressScrollX: true
}); });
} }
@ -153,7 +153,7 @@ define([
if (_.isUndefined(this.scroller)) { if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({ this.scroller = new Common.UI.Scroller({
el: $(this.el), el: this.$el,
suppressScrollX: true suppressScrollX: true
}); });
} }
@ -244,8 +244,8 @@ define([
}, },
render: function(node) { render: function(node) {
let me = this; var me = this;
let $markup = $(this.template({scope: this})); var $markup = $(this.template({scope: this}));
this.chInputMode = new Common.UI.CheckBox({ this.chInputMode = new Common.UI.CheckBox({
el: $markup.findById('#fms-chb-input-mode'), el: $markup.findById('#fms-chb-input-mode'),
@ -376,14 +376,14 @@ define([
this.btnApply.on('click', this.applySettings.bind(this)); this.btnApply.on('click', this.applySettings.bind(this));
this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) { if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({ this.scroller = new Common.UI.Scroller({
el: $(this.el), el: this.$el,
suppressScrollX: true suppressScrollX: true
}); });
} }
this.$el = $(node).html($markup);
return this; return this;
}, },
@ -884,14 +884,13 @@ define([
this.updateInfo(this.doc); this.updateInfo(this.doc);
this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) { if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({ this.scroller = new Common.UI.Scroller({
el: $markup, el: this.$el,
suppressScrollX: true suppressScrollX: true
}); });
} }
me.$el = $(node).html($markup);
return this; return this;
}, },
@ -1154,17 +1153,17 @@ define([
this.updateInfo(this.doc); this.updateInfo(this.doc);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: $markup,
suppressScrollX: true
});
}
Common.NotificationCenter.on('collaboration:sharing', this.changeAccessRights.bind(this)); Common.NotificationCenter.on('collaboration:sharing', this.changeAccessRights.bind(this));
Common.NotificationCenter.on('collaboration:sharingdeny', this.onLostEditRights.bind(this)); Common.NotificationCenter.on('collaboration:sharingdeny', this.onLostEditRights.bind(this));
this.$el = $(node).html($markup); this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: this.$el,
suppressScrollX: true
});
}
return this; return this;
}, },
@ -1495,7 +1494,7 @@ define([
this.cntSignatureView = $('#id-fms-signature-view'); this.cntSignatureView = $('#id-fms-signature-view');
if (_.isUndefined(this.scroller)) { if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({ this.scroller = new Common.UI.Scroller({
el: $(this.el), el: this.$el,
suppressScrollX: true suppressScrollX: true
}); });
} }