leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-15 07:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-batch' into pre-release

Browse Source 
Conflicts:
	public/langs/zh-cn.js
	public/langs/zh-hk.js
This commit is contained in:
life
2015-10-26 23:16:32 +08:00
parent 2e22ea5f5c c60988da72
commit bd59846b0a
14 changed files with 1355 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/common.js
View File

@@ -1569,12 +1569,26 @@ var trimTitle = function(title) {
var Loading = {
$loadingDialog: $('#loadingDialog'),
$progressBar: $('#loadingDialog .progress-bar'),
$progressRate: $('#loadingDialog .progress-rate'),
$msg: $('#loadingDialogBodyMsg'),
// option {hasProgress: true, onClose: function}
inited: false,
setMsg: function (msg) {
this.$msg.html(msg);
},
setProgressRate: function (msg) {
this.$progressRate.html(msg);
},
show: function(msg, option) {
option = option || {};
msg || (msg = getMsg("loading..."));
$('#loadingDialogBodyMsg').html(msg);
this.$msg.html(msg);
if (option.isLarge) {
this.$loadingDialog.find('.modal-dialog').addClass('modal-large');
}
else {
this.$loadingDialog.find('.modal-dialog').addClass('modal-large');
}
this.$loadingDialog.modal({backdrop: 'static', keyboard: true});
if (option.hasProgress) {
this.$loadingDialog.addClass('has-progress');