Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-10 06:58:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Opening an email with specific content „hangs” RainLoop in the browser (Closes #308)

Browse source 
Code refactoring
This commit is contained in:
RainLoop Team 2014-09-05 19:53:44 +04:00
parent af43329902
commit 7a374ebe03
40 changed files with 1100 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/ViewModels/LoginViewModel.js
View file

@ -337,18 +337,16 @@
_.delay(function () {
Data.language.subscribe(function (sValue) {
self.langRequest(true);
$.ajax({
'url': LinkBuilder.langLink(sValue),
'dataType': 'script',
'cache': true
}).done(function() {
Utils.reloadLanguage(sValue, function() {
self.bSendLanguage = true;
Utils.i18nReload();
$.cookie('rllang', Data.language(), {'expires': 30});
}).always(function() {
$.cookie('rllang', sValue, {'expires': 30});
}, null, function() {
self.langRequest(false);
});
});
}, 50);

9
dev/ViewModels/Popups/PopupsComposeOpenPgpViewModel.js
View file

@ -4,7 +4,6 @@
'use strict';
var
window = require('window'),
_ = require('_'),
ko = require('ko'),
key = require('key'),
@ -14,7 +13,7 @@
Data = require('Storage:RainLoop:Data'),
EmailModel = require('Model:Email'),
EmailModel = require('Model/Email'),
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
@ -114,19 +113,19 @@
if (oPrivateKey && 0 === aPublicKeys.length)
{
self.resultCallback(
window.openpgp.signClearMessage([oPrivateKey], self.text())
Data.openpgp.signClearMessage([oPrivateKey], self.text())
);
}
else if (oPrivateKey && 0 < aPublicKeys.length)
{
self.resultCallback(
window.openpgp.signAndEncryptMessage(aPublicKeys, oPrivateKey, self.text())
Data.openpgp.signAndEncryptMessage(aPublicKeys, oPrivateKey, self.text())
);
}
else if (!oPrivateKey && 0 < aPublicKeys.length)
{
self.resultCallback(
window.openpgp.encryptMessage(aPublicKeys, self.text())
Data.openpgp.encryptMessage(aPublicKeys, self.text())
);
}
}

2
dev/ViewModels/Popups/PopupsComposeViewModel.js
View file

@ -25,7 +25,7 @@
Cache = require('Storage:RainLoop:Cache'),
Remote = require('Storage:RainLoop:Remote'),
ComposeAttachmentModel = require('Model:ComposeAttachment'),
ComposeAttachmentModel = require('Model/ComposeAttachment'),
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')

8
dev/ViewModels/Popups/PopupsContactsViewModel.js
View file

@ -20,10 +20,10 @@
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote'),
EmailModel = require('Model:Email'),
ContactModel = require('Model:Contact'),
ContactTagModel = require('Model:ContactTag'),
ContactPropertyModel = require('Model:ContactProperty'),
EmailModel = require('Model/Email'),
ContactModel = require('Model/Contact'),
ContactTagModel = require('Model/ContactTag'),
ContactPropertyModel = require('Model/ContactProperty'),
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')

2
dev/ViewModels/Popups/PopupsLanguagesViewModel.js
View file

@ -22,7 +22,7 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsLanguages');
this.Data = Globals.__APP.data(); // TODO
this.Data = Globals.__APP__.data(); // TODO
this.exp = ko.observable(false);

5
dev/ViewModels/Popups/PopupsNewOpenPgpKeyViewModel.js
View file

@ -4,7 +4,6 @@
'use strict';
var
window = require('window'),
_ = require('_'),
ko = require('ko'),
@ -62,8 +61,8 @@
this.submitRequest(true);
_.delay(function () {
// mKeyPair = window.openpgp.generateKeyPair(1, Utils.pInt(self.keyBitLength()), sUserID, Utils.trim(self.password()));
mKeyPair = window.openpgp.generateKeyPair({
// mKeyPair = Data.openpgp.generateKeyPair(1, Utils.pInt(self.keyBitLength()), sUserID, Utils.trim(self.password()));
mKeyPair = Data.openpgp.generateKeyPair({
'userId': sUserID,
'numBits': Utils.pInt(self.keyBitLength()),
'passphrase': Utils.trim(self.password())