Many fixes

New ownCloud package with a built-in webmail
This commit is contained in:
RainLoop Team 2015-02-12 01:39:27 +04:00
parent 323dd34c8b
commit 6116597f6f
56 changed files with 1137 additions and 232 deletions

View file

@ -50,6 +50,37 @@
}
});
Globals.$win.on('resize', function () {
Events.pub('window.resize');
});
Events.sub('window.resize', _.throttle(function () {
var
iH = Globals.$win.height(),
iW = Globals.$win.height()
;
if (Globals.$win.__sizes[0] !== iH || Globals.$win.__sizes[1] !== iW)
{
Globals.$win.__sizes[0] = iH;
Globals.$win.__sizes[1] = iW;
Events.pub('window.resize.real');
}
}, 50));
// TODO
// Events.sub({
// 'window.resize': function () {
// window.console.log('window.resize');
// },
// 'window.resize.real': function () {
// window.console.log('window.resize.real');
// }
// });
Globals.$doc.on('keydown', function (oEvent) {
if (oEvent && oEvent.ctrlKey)
{
@ -315,6 +346,8 @@
ssm.ready();
require('Stores/Language').populate();
require('Stores/Theme').populate();
require('Stores/Social').populate();

View file

@ -41,6 +41,7 @@
MessageModel = require('Model/Message'),
AccountModel = require('Model/Account'),
IdentityModel = require('Model/Identity'),
TemplateModel = require('Model/Template'),
OpenPgpKeyModel = require('Model/OpenPgpKey'),
AbstractApp = require('App/Abstract')
@ -611,12 +612,10 @@
{
Utils.delegateRunOnDestroy(TemplateStore.templates());
IdentityStore.templates(_.map(oData.Result['Templates'], function (oIdentityData) {
return {
'id': Utils.pString(oIdentityData['Id']),
'name': Utils.pString(oIdentityData['Name'])
};
}));
TemplateStore.templates(_.compact(_.map(oData.Result['Templates'], function (oTemplateData) {
var oTemplate = new TemplateModel();
return oTemplate.parse(oTemplateData) ? oTemplate : null;
})));
}
});
};