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

[DE + DE mobile] Update for underscore 1.8.3.

Browse source
This commit is contained in:
Julia Radzhabova 2017-04-13 15:04:31 +03:00
parent bd053831c8
commit df96594911
10 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ define([
'</div>' '</div>'
].join(''); ].join('');
this.options.tpl = _.template(this.template, this.options); this.options.tpl = _.template(this.template)(this.options);
this.api = this.options.api; this.api = this.options.api;
Common.UI.Window.prototype.initialize.call(this, this.options); Common.UI.Window.prototype.initialize.call(this, this.options);

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

@ -54,7 +54,7 @@ define([
'<div id="id-mail-recepients-placeholder"></div>' '<div id="id-mail-recepients-placeholder"></div>'
].join(''); ].join('');
_options.tpl = _.template(this.template, _options); _options.tpl = _.template(this.template)(_options);
this.fileChoiceUrl = options.fileChoiceUrl || ''; this.fileChoiceUrl = options.fileChoiceUrl || '';
Common.UI.Window.prototype.initialize.call(this, _options); Common.UI.Window.prototype.initialize.call(this, _options);

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

@ -55,7 +55,7 @@ define([
'<div id="id-mail-merge-folder-placeholder"></div>' '<div id="id-mail-merge-folder-placeholder"></div>'
].join(''); ].join('');
_options.tpl = _.template(this.template, _options); _options.tpl = _.template(this.template)(_options);
this.mergeFolderUrl = options.mergeFolderUrl || ''; this.mergeFolderUrl = options.mergeFolderUrl || '';
this.mergedFileUrl = options.mergedFileUrl || ''; this.mergedFileUrl = options.mergedFileUrl || '';

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

@ -89,7 +89,7 @@ define([
'</div>' '</div>'
].join(''); ].join('');
this.options.tpl = _.template(this.template, this.options); this.options.tpl = _.template(this.template)(this.options);
this.spinners = []; this.spinners = [];
this._noApply = false; this._noApply = false;

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

@ -79,7 +79,7 @@ define([
'</div>' '</div>'
].join(''); ].join('');
this.options.tpl = _.template(this.template, this.options); this.options.tpl = _.template(this.template)(this.options);
this.spinners = []; this.spinners = [];
this._noApply = false; this._noApply = false;

6
apps/documenteditor/main/app/view/Statusbar.js
View file

@ -96,7 +96,7 @@ define([
templateUserList: _.template('<ul>' + templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' + '<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' + '<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' + '<% }); %>' +
'</ul>'), '</ul>'),
@ -436,7 +436,7 @@ define([
_onAddUser: function(m, c, opts) { _onAddUser: function(m, c, opts) {
if (this.panelUsersList) { if (this.panelUsersList) {
this.panelUsersList.find('ul').append(_.template(this.tplUser, {user: m, scope: this})); this.panelUsersList.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true}); this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
} }
}, },
@ -566,7 +566,7 @@ define([
label: this.labelSelect, label: this.labelSelect,
btns: {ok: this.btnOk, cancel: this.btnCancel} btns: {ok: this.btnOk, cancel: this.btnCancel}
}); });
this.options.tpl = _.template(this.template, this.options); this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options); Common.UI.Window.prototype.initialize.call(this, this.options);
}, },

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

@ -70,7 +70,7 @@ define([
'</div>' '</div>'
].join(''); ].join('');
this.options.tpl = _.template(this.template, this.options); this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options); Common.UI.Window.prototype.initialize.call(this, this.options);
}, },

2
apps/documenteditor/mobile/app/view/Settings.js
View file

@ -175,7 +175,7 @@ define([
'</div>', '</div>',
'</label>', '</label>',
'</li>' '</li>'
].join(''), { ].join(''))({
android: Framework7.prototype.device.android, android: Framework7.prototype.device.android,
item: size, item: size,
index: index, index: index,

2
apps/documenteditor/mobile/app/view/edit/EditChart.js
View file

@ -203,7 +203,7 @@ define([
'<% }); %>', '<% }); %>',
'</ul>', '</ul>',
'<% }); %>' '<% }); %>'
].join(''), { ].join(''))({
styles: styles styles: styles
}); });

2
apps/documenteditor/mobile/app/view/edit/EditTable.js
View file

@ -138,7 +138,7 @@ define([
'</div>', '</div>',
'<% }); %>', '<% }); %>',
'</div>' '</div>'
].join(''), { ].join(''))({
styles: styles styles: styles
}); });