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

Merge pull request #29 from ONLYOFFICE/hotfix/v4.1.2

Browse source 
[DE] Bug with delayed loading of toolbar.
This commit is contained in:
Julia Radzhabova 2016-09-13 11:43:12 +03:00 committed by GitHub
parent 35d21fdb65 24ae06f271
commit 428bddd013
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -442,14 +442,21 @@ define([
this.paragraphControls.push(this.btnMultilevels); this.paragraphControls.push(this.btnMultilevels);
this.textOnlyControls.push(this.btnMultilevels); this.textOnlyControls.push(this.btnMultilevels);
var clone = function(source) {
var obj = {};
for (var prop in source)
obj[prop] = (typeof(source[prop])=='object') ? clone(source[prop]) : source[prop];
return obj;
};
this.mnuMarkersPicker = { this.mnuMarkersPicker = {
conf: {index:0}, conf: {index:0},
selectByIndex: function (idx) { selectByIndex: function (idx) {
this.conf.index = idx; this.conf.index = idx;
} }
}; };
this.mnuNumbersPicker = _.clone(this.mnuMarkersPicker); this.mnuNumbersPicker = clone(this.mnuMarkersPicker);
this.mnuMultilevelPicker = _.clone(this.mnuMarkersPicker); this.mnuMultilevelPicker = clone(this.mnuMarkersPicker);
this.btnInsertTable = new Common.UI.Button({ this.btnInsertTable = new Common.UI.Button({
id : 'id-toolbar-btn-inserttable', id : 'id-toolbar-btn-inserttable',
@ -546,8 +553,8 @@ define([
this.conf.disabled = val; this.conf.disabled = val;
} }
}; };
this.mnuPageNumCurrentPos = _.clone(this.mnuPageNumberPosPicker); this.mnuPageNumCurrentPos = clone(this.mnuPageNumberPosPicker);
this.mnuInsertPageNum = _.clone(this.mnuPageNumberPosPicker); this.mnuInsertPageNum = clone(this.mnuPageNumberPosPicker);
this.paragraphControls.push(this.mnuPageNumCurrentPos); this.paragraphControls.push(this.mnuPageNumCurrentPos);
this.toolbarControls.push(this.btnEditHeader); this.toolbarControls.push(this.btnEditHeader);
@ -747,7 +754,7 @@ define([
setChecked: function(val) { this.conf.checked = val;}, setChecked: function(val) { this.conf.checked = val;},
isChecked: function () { return this.conf.checked; } isChecked: function () { return this.conf.checked; }
}; };
this.btnFitWidth = _.clone(this.btnFitPage); this.btnFitWidth = clone(this.btnFitPage);
this.mnuZoom = {options: {value: 100}}; this.mnuZoom = {options: {value: 100}};
this.btnAdvSettings = new Common.UI.Button({ this.btnAdvSettings = new Common.UI.Button({