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

Release commit

Browse source 
Refactoring
This commit is contained in:
RainLoop Team 2014-07-15 22:45:15 +04:00
parent 958c814c86
commit 484271bb69
21 changed files with 407 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dev/Common/LinkBuilder.js
View file

@ -6,9 +6,10 @@
function LinkBuilder()
{
this.sBase = '#/';
this.sServer = './?';
this.sVersion = RL.settingsGet('Version');
this.sSpecSuffix = RL.settingsGet('AuthAccountHash') || '0';
this.sServer = (RL.settingsGet('IndexFile') || './') + '?';
this.sStaticPrefix = RL.settingsGet('StaticPrefix') || 'rainloop/v/' + this.sVersion + '/static/';
}
/**
@ -235,17 +236,7 @@ LinkBuilder.prototype.exportContactsCsv = function ()
*/
LinkBuilder.prototype.emptyContactPic = function ()
{
return 'rainloop/v/' + this.sVersion + '/static/css/images/empty-contact.png';
};
/**
* @return {string}
*/
LinkBuilder.prototype.emptyFullContactPic = function ()
{
return window.location.protocol + '//' + window.location.hostname +
('80' === '' + window.location.port || '' === '' + window.location.port ? '' : ':' + window.location.port) + window.location.pathname +
'rainloop/v/' + this.sVersion + '/static/css/images/empty-contact.png';
return this.sStaticPrefix + 'css/images/empty-contact.png';
};
/**
@ -254,7 +245,7 @@ LinkBuilder.prototype.emptyFullContactPic = function ()
*/
LinkBuilder.prototype.sound = function (sFileName)
{
return 'rainloop/v/' + this.sVersion + '/static/sounds/' + sFileName;
return this.sStaticPrefix + 'sounds/' + sFileName;
};
/**
@ -278,7 +269,7 @@ LinkBuilder.prototype.themePreviewLink = function (sTheme)
*/
LinkBuilder.prototype.notificationMailIcon = function ()
{
return 'rainloop/v/' + this.sVersion + '/static/css/images/icom-message-notification.png';
return this.sStaticPrefix + 'css/images/icom-message-notification.png';
};
/**
@ -286,7 +277,7 @@ LinkBuilder.prototype.notificationMailIcon = function ()
*/
LinkBuilder.prototype.openPgpJs = function ()
{
return 'rainloop/v/' + this.sVersion + '/static/js/openpgp.min.js';
return this.sStaticPrefix + 'js/openpgp.min.js';
};
/**

4
dev/Storages/AbstractCache.js
View file

@ -31,7 +31,7 @@ AbstractCacheStorage.prototype.clear = function ()
AbstractCacheStorage.prototype.getUserPic = function (sEmail, fCallback)
{
sEmail = Utils.trim(sEmail);
var
sUrl = '',
sService = '',
@ -44,8 +44,6 @@ AbstractCacheStorage.prototype.getUserPic = function (sEmail, fCallback)
if (this.bCapaGravatar && '' === sUrl && '' !== sEmailLower)
{
fCallback('//secure.gravatar.com/avatar/' + Utils.md5(sEmailLower) + '.jpg?s=80&d=mm', sEmail);
// fCallback('//secure.gravatar.com/avatar/' + Utils.md5(sEmailLower) + '.jpg?s=80&d=' +
// window.encodeURIComponent(RL.link().emptyFullContactPic()), sEmail);
}
else
{