Update JUA auploder

Small less fixes
This commit is contained in:
RainLoop Team 2013-12-09 02:14:55 +04:00
parent f22b90dbe3
commit efb9db36d2
12 changed files with 773 additions and 716 deletions

View file

@ -801,32 +801,35 @@ MailBoxMessageListViewModel.prototype.initUploaderForAppend = function ()
}
},
'dragAndDropElement': this.dragOverArea(),
'dragAndDropBodyElement': this.dragOverBodyArea(),
'onDragEnter': _.bind(function () {
'dragAndDropBodyElement': this.dragOverBodyArea()
});
oJua
.on('onDragEnter', _.bind(function () {
this.dragOverEnter(true);
}, this),
'onDragLeave': _.bind(function () {
}, this))
.on('onDragLeave', _.bind(function () {
this.dragOverEnter(false);
}, this),
'onBodyDragEnter': _.bind(function () {
}, this))
.on('onBodyDragEnter', _.bind(function () {
this.dragOver(true);
}, this),
'onBodyDragLeave': _.bind(function () {
}, this))
.on('onBodyDragLeave', _.bind(function () {
this.dragOver(false);
}, this),
'onSelect': _.bind(function (sUid, oData) {
}, this))
.on('onSelect', _.bind(function (sUid, oData) {
if (sUid && oData && 'message/rfc822' === oData['Type'])
{
RL.data().messageListLoading(true);
return true;
}
return false;
}),
'onComplete': _.bind(function () {
}, this))
.on('onComplete', _.bind(function () {
RL.reloadMessageList(true, true);
}, this)
});
}, this))
;
return !!oJua;
};

View file

@ -927,23 +927,29 @@ PopupsComposeViewModel.prototype.initUploader = function ()
'multipleSizeLimit': 50,
'disableFolderDragAndDrop': false,
'clickElement': this.composeUploaderButton(),
'dragAndDropElement': this.composeUploaderDropPlace(),
// 'onLimitReached': function (iLimit) {
'dragAndDropElement': this.composeUploaderDropPlace()
})
;
if (oJua)
{
oJua
// .on('onLimitReached', function (iLimit) {
// alert(iLimit);
// },
'onDragEnter': _.bind(function () {
// })
.on('onDragEnter', _.bind(function () {
this.dragAndDropOver(true);
}, this),
'onDragLeave': _.bind(function () {
}, this))
.on('onDragLeave', _.bind(function () {
this.dragAndDropOver(false);
}, this),
'onBodyDragEnter': _.bind(function () {
}, this))
.on('onBodyDragEnter', _.bind(function () {
this.dragAndDropVisible(true);
}, this),
'onBodyDragLeave': _.bind(function () {
}, this))
.on('onBodyDragLeave', _.bind(function () {
this.dragAndDropVisible(false);
}, this),
'onProgress': _.bind(function (sId, iLoaded, iTotal) {
}, this))
.on('onProgress', _.bind(function (sId, iLoaded, iTotal) {
var oItem = null;
if (Utils.isUnd(oUploadCache[sId]))
{
@ -963,9 +969,8 @@ PopupsComposeViewModel.prototype.initUploader = function ()
oItem.progress(' - ' + Math.floor(iLoaded / iTotal * 100) + '%');
}
}, this),
'onSelect': _.bind(function (sId, oData) {
}, this))
.on('onSelect', _.bind(function (sId, oData) {
this.dragAndDropOver(false);
@ -1001,9 +1006,8 @@ PopupsComposeViewModel.prototype.initUploader = function ()
return true;
}, this),
'onStart': _.bind(function (sId) {
}, this))
.on('onStart', _.bind(function (sId) {
var
oItem = null
@ -1028,9 +1032,8 @@ PopupsComposeViewModel.prototype.initUploader = function ()
oItem.uploading(true);
}
}, this),
'onComplete': _.bind(function (sId, bResult, oData) {
}, this))
.on('onComplete', _.bind(function (sId, bResult, oData) {
var
sError = '',
@ -1077,12 +1080,9 @@ PopupsComposeViewModel.prototype.initUploader = function ()
}
}
}, this)
})
;
}, this))
;
if (oJua)
{
this
.addAttachmentEnabled(true)
.dragAndDropEnabled(oJua.isDragAndDropSupported())