1.6.0 release

CardDav support.
New skin (Blurred).
Login animation.
Small fixes.
This commit is contained in:
RainLoop Team 2013-12-27 05:00:40 +04:00
parent bc6c320ecb
commit 011855bf8a
26 changed files with 386 additions and 337 deletions

View file

@ -1,16 +1,14 @@
<VirtualHost *:80> <VirtualHost *:80>
AcceptPathInfo On
ServerName dav.mydomain.com
DocumentRoot /var/www/mydomain.com
AcceptPathInfo On RewriteEngine On
ServerName dav.mydomain.com RewriteRule /.well-known/carddav /index.php/dav [R,L]
DocumentRoot /var/www/mydomain.com
RewriteEngine On
RewriteRule /.well-known/carddav /index.php/dav [R,L]
<Directory "/var/www/mydomain.com">
Options None
Options +FollowSymlinks
AllowOverride All
</Directory>
<Directory "/var/www/mydomain.com">
Options None
Options +FollowSymlinks
AllowOverride All
</Directory>
</VirtualHost> </VirtualHost>

View file

@ -1,16 +1,14 @@
<VirtualHost *:80> <VirtualHost *:80>
AcceptPathInfo On
ServerName mydomain.com
DocumentRoot /var/www/mydomain.com
AcceptPathInfo On RewriteEngine On
ServerName mydomain.com RewriteRule /.well-known/carddav /index.php/dav [R,L]
DocumentRoot /var/www/mydomain.com
RewriteEngine On
RewriteRule /.well-known/carddav /index.php/dav [R,L]
<Directory "/var/www/mydomain.com">
Options None
Options +FollowSymlinks
AllowOverride All
</Directory>
<Directory "/var/www/mydomain.com">
Options None
Options +FollowSymlinks
AllowOverride All
</Directory>
</VirtualHost> </VirtualHost>

View file

@ -1,41 +1,43 @@
server { server {
listen 80; listen 80;
server_name dav.mydomain.com; server_name dav.mydomain.com;
root /var/www/mydomain.com; root /var/www/mydomain.com;
access_log /var/log/nginx/dav.mydomain.com.access.log main; access_log /var/log/nginx/dav.mydomain.com.access.log;
error_log /var/log/nginx/dav.mydomain.com.error.log; error_log /var/log/nginx/dav.mydomain.com.error.log;
index index.php; index index.php;
charset utf-8; charset utf-8;
log_not_found off; log_not_found off;
location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
expires max; expires max;
add_header Pragma public; add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate"; add_header Cache-Control "public, must-revalidate, proxy-revalidate";
} }
location = /favicon.ico { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; } location = /robots.txt { access_log off; log_not_found off; }
location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; } location = /humans.txt { access_log off; log_not_found off; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; } location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; }
# rewrite for carddav autoprovision
rewrite ^/.well-known/carddav / redirect;
rewrite ^/.well-known/carddav / redirect;
rewrite ^(.*)$ /index.php/dav$1 last; rewrite ^(.*)$ /index.php/dav$1 last;
location ~ /index\.php/dav/.*$ { # php for carddav only
include fastcgi_params; location ~ /index\.php/dav/.*$ {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000; fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
# fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$; fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_NAME index.php; fastcgi_param SCRIPT_NAME index.php;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
} }
} }

View file

@ -1,47 +1,48 @@
server { server {
listen 80; listen 80;
server_name mydomain.com; server_name mydomain.com;
root /var/www/mydomain.com; root /var/www/mydomain.com;
access_log /var/log/nginx/mydomain.com.access.log main; access_log /var/log/nginx/mydomain.com.access.log;
error_log /var/log/nginx/mydomain.com.error.log; error_log /var/log/nginx/mydomain.com.error.log;
index index.php index.html; index index.php index.html;
charset utf-8; charset utf-8;
log_not_found off; log_not_found off;
location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
expires max; expires max;
add_header Pragma public; add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate"; add_header Cache-Control "public, must-revalidate, proxy-revalidate";
} }
location = /favicon.ico { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; } location = /robots.txt { access_log off; log_not_found off; }
location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; } location = /humans.txt { access_log off; log_not_found off; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; } location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; }
rewrite ^/.well-known/carddav /index.php/dav/ redirect; # rewrite for carddav autoprovision
rewrite ^/.well-known/carddav /index.php/dav/ redirect;
location ~ /index\.php/dav/.*$ { # php for carddav
include fastcgi_params; location ~ /index\.php/dav/.*$ {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000; fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
# fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$; fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_NAME index.php; fastcgi_param SCRIPT_NAME index.php;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
} }
location ~ \.php { # php (other)
include fastcgi_params; location ~ \.php {
fastcgi_pass 127.0.0.1:9000; include fastcgi_params;
# fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
} }
} }

View file

@ -34,8 +34,7 @@ window['__RLBOOT'] = function (fCall) {
window['rainloopTEMPLATES'] = {}; window['rainloopTEMPLATES'] = {};
kn.setBoot(RL).bootstart(); kn.setBoot(RL).bootstart();
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
$html.addClass('rl-started');
}, 50); }, 50);
} }

View file

@ -36,11 +36,6 @@ Knoin.prototype.oScreens = {};
Knoin.prototype.oBoot = null; Knoin.prototype.oBoot = null;
Knoin.prototype.oCurrentScreen = null; Knoin.prototype.oCurrentScreen = null;
Knoin.prototype.showLoading = function ()
{
$('#rl-loading').show();
};
Knoin.prototype.hideLoading = function () Knoin.prototype.hideLoading = function ()
{ {
$('#rl-loading').hide(); $('#rl-loading').hide();
@ -307,6 +302,10 @@ Knoin.prototype.screenOnRoute = function (sScreenName, sSubPart)
*/ */
Knoin.prototype.startScreens = function (aScreensClasses) Knoin.prototype.startScreens = function (aScreensClasses)
{ {
$('#rl-content').css({
'visibility': 'hidden'
});
_.each(aScreensClasses, function (CScreen) { _.each(aScreensClasses, function (CScreen) {
var var
@ -345,6 +344,14 @@ Knoin.prototype.startScreens = function (aScreensClasses)
hasher.initialized.add(oCross.parse, oCross); hasher.initialized.add(oCross.parse, oCross);
hasher.changed.add(oCross.parse, oCross); hasher.changed.add(oCross.parse, oCross);
hasher.init(); hasher.init();
$('#rl-content').css({
'visibility': 'visible'
});
_.delay(function () {
$html.removeClass('rl-started-trigger').addClass('rl-started');
}, 50);
}; };
/** /**

View file

@ -51,8 +51,26 @@
0% {background-position: 0 0;} 100% {background-position: 60px 0;} 0% {background-position: 0 0;} 100% {background-position: 60px 0;}
} }
html.rl-started-trigger .b-login-content .loginFormWrapper {
-webkit-transform: translateY(-30px);
-moz-transform: translateY(-30px);
transform: translateY(-30px);
}
html.rl-started-trigger #rl-content {
.opacity(70);
}
.rl-anim { .rl-anim {
&.csstransitions #rl-content {
.transition(~"0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940)");
}
&.csstransitions .b-login-content .loginFormWrapper {
.transition(~"0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940)");
}
&.rgba.cssanimations.backgroundsize .e-strip-animation { &.rgba.cssanimations.backgroundsize .e-strip-animation {
-webkit-background-size: 60px 60px; -webkit-background-size: 60px 60px;
-moz-background-size: 60px 60px; -moz-background-size: 60px 60px;

View file

@ -1,72 +0,0 @@
.select2-container-multi {
.select2-choices {
background-image: none;
border: @rlInputBorderSize solid @inputBorder;
.border-radius(@inputBorderRadius);
.select2-search-choice {
line-height: 15px;
font-size: 16px;
}
}
&.select2-container-active {
.select2-choices {
border: @rlInputBorderSize solid darken(@inputBorder, 20%);
.box-shadow(none);
}
}
}
.select2-drop {
.box-shadow(none);
.select2-subname {
color: #777;
}
.select2-highlighted .select2-subname {
color: #eee;
}
}
.select2-results {
margin: 0;
padding: 0;
max-height: 400px;
.select2-searching {
padding: 1px 4px;
}
}
.select2-icon {
line-height: 20px;
padding: 0 0 0 7px
}
.select2-icon-result {
line-height: 40px;
}
.select2-result-label {
margin: 0px !important;
padding: 5px !important;
font-size: 16px;
height: 40px;
line-height: 40px;
.select2-user-pic {
display: inline-block;
height: 40px;
width: 40px;
margin-right: 10px;
}
}

View file

@ -1,8 +1,8 @@
{ {
"name": "RainLoop", "name": "RainLoop",
"title": "RainLoop Webmail", "title": "RainLoop Webmail",
"version": "1.5.1", "version": "1.6.0",
"release": "557", "release": "615",
"description": "Simple, modern & fast web-based email client", "description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net", "homepage": "http://rainloop.net",
"main": "Gruntfile.js", "main": "Gruntfile.js",

View file

@ -5,6 +5,7 @@ namespace RainLoop;
if (!\defined('RAINLOOP_APP_ROOT_PATH')) if (!\defined('RAINLOOP_APP_ROOT_PATH'))
{ {
\define('RAINLOOP_APP_LIBRARIES_PATH', \rtrim(\realpath(__DIR__), '\\/').'/libraries/'); \define('RAINLOOP_APP_LIBRARIES_PATH', \rtrim(\realpath(__DIR__), '\\/').'/libraries/');
\define('RAINLOOP_MB_SUPPORTED', \function_exists('mb_strtoupper'));
\spl_autoload_register(function ($sClassName) { \spl_autoload_register(function ($sClassName) {
@ -14,6 +15,12 @@ if (!\defined('RAINLOOP_APP_ROOT_PATH'))
} }
else if (0 === \strpos($sClassName, 'Sabre') && false !== \strpos($sClassName, '\\')) else if (0 === \strpos($sClassName, 'Sabre') && false !== \strpos($sClassName, '\\'))
{ {
if (!RAINLOOP_MB_SUPPORTED && !defined('RL_MB_FIXED'))
{
\define('RL_MB_FIXED', true);
include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/SabreDAV/MbStringFix.php';
}
return include RAINLOOP_APP_LIBRARIES_PATH.'Sabre/'.\str_replace('\\', '/', \substr($sClassName, 6)).'.php'; return include RAINLOOP_APP_LIBRARIES_PATH.'Sabre/'.\str_replace('\\', '/', \substr($sClassName, 6)).'.php';
} }

View file

@ -201,7 +201,7 @@ Enables caching in the system'),
'ignore_folders_subscription' => array(false, 'ignore_folders_subscription' => array(false,
'Experimental settings. Handle with care. 'Experimental settings. Handle with care.
'), '),
'sync_dav_digest_auth' => array(false), 'sync_dav_digest_auth' => array(true),
'sync_dav_domain' => array(''), 'sync_dav_domain' => array(''),
'sync_use_dav_browser' => array(true), 'sync_use_dav_browser' => array(true),
'allow_message_append' => array(false), 'allow_message_append' => array(false),

View file

@ -408,8 +408,11 @@ if (!function_exists('mb_strcut'))
{ {
function mb_strcut($str, $start, $length = null, $encoding = '') function mb_strcut($str, $start, $length = null, $encoding = '')
{ {
// TODO $match = array();
return \MailSo\Base\Utils::Utf8Clear(substr($str, $start, $length)); // use the regex unicode support to separate the UTF-8 characters into an array
preg_match_all( '/./us', $str, $match );
$chars = is_null( $length )? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
return implode( '', $chars );
} }
} }

View file

@ -715,8 +715,6 @@ class ServiceActions
{ {
try try
{ {
include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/SabreDAV/MbStringFix.php';
\set_error_handler(function ($errno, $errstr, $errfile, $errline ) { \set_error_handler(function ($errno, $errstr, $errfile, $errline ) {
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline); throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
}); });
@ -741,20 +739,22 @@ class ServiceActions
$oAddressBookRoot = new \Sabre\CardDAV\AddressBookRoot($oPrincipalBackend, $oCarddavBackend); $oAddressBookRoot = new \Sabre\CardDAV\AddressBookRoot($oPrincipalBackend, $oCarddavBackend);
$oServer = new \Sabre\DAV\Server(array( $aTree = array($oPrincipalCollection, $oAddressBookRoot);
$oPrincipalCollection, $oAddressBookRoot $this->Plugins()->RunHook('filter.sabre-dav-tree', array(&$aTree));
));
if (false === \strpos($this->oHttp->GetUrl(), '/index.php/dav/')) $oServer = new \Sabre\DAV\Server($aTree);
{
$oServer->setBaseUri('/'); $sBaseUri = '/';
} if (false !== \strpos($this->oHttp->GetUrl(), '/index.php/dav/'))
else
{ {
$aPath = \trim($this->oHttp->GetPath(), '/\\ '); $aPath = \trim($this->oHttp->GetPath(), '/\\ ');
$oServer->setBaseUri((0 < \strlen($aPath) ? '/'.$aPath : '').'/index.php/dav/'); $sBaseUri = (0 < \strlen($aPath) ? '/'.$aPath : '').'/index.php/dav/';
} }
$this->Plugins()->RunHook('filter.sabre-dav-base-url', array(&$sBaseUri));
$oServer->setBaseUri($sBaseUri);
// Plugins // Plugins
$oServer->addPlugin(new \Sabre\DAV\Auth\Plugin($oAuthBackend, 'RainLoop')); $oServer->addPlugin(new \Sabre\DAV\Auth\Plugin($oAuthBackend, 'RainLoop'));
$oServer->addPlugin(new \Sabre\CardDAV\Plugin()); $oServer->addPlugin(new \Sabre\CardDAV\Plugin());

View file

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html id="id-html"> <html id="id-html" class="no-js rl-booted-trigger rl-started-trigger">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@ -50,7 +50,7 @@
<div id="rl-loading-error" class="thm-loading"> <div id="rl-loading-error" class="thm-loading">
An Error occurred,<br />please refresh the page and try again. An Error occurred,<br />please refresh the page and try again.
</div> </div>
<div id="rl-content"> <div id="rl-content" class="startup-animation">
<div id="rl-popups"></div> <div id="rl-popups"></div>
<div id="rl-center"> <div id="rl-center">
<div id="rl-top"></div> <div id="rl-top"></div>

View file

@ -40,6 +40,7 @@
.thm-body { .thm-body {
color: @main-color; color: @main-color;
background-color: @main-background-color; background-color: @main-background-color;
background-size: @main-background-size;
.thm-body-background-image(@main-background-image); .thm-body-background-image(@main-background-image);
} }

View file

@ -3,6 +3,7 @@
@main-color: #333; @main-color: #333;
@main-background-color: #e3e3e3; @main-background-color: #e3e3e3;
@main-background-image: none; // "images/background.png" @main-background-image: none; // "images/background.png"
@main-background-size: contain;
// LOADING // LOADING
@loading-color: #000; // #ddd @loading-color: #000; // #ddd

View file

@ -25,9 +25,9 @@
<br /> <br />
<label data-bind="click: function () { contactsSync(!contactsSync()); }"> <label data-bind="click: function () { contactsSync(!contactsSync()); }">
<i data-bind="css: contactsSync() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i> <i data-bind="css: contactsSync() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
Allow contacts sync (CardDAV) Allow contacts sync (CardDAV) <span style="color:red">beta</span>
</label> </label>
<a href="http://rainloop.net/docs/carddav/" target="_blank">read about web server configuration</a> <a href="http://rainloop.net/docs/web-servers/" target="_blank">Web server configuration examples</a>
</div> </div>
</div> </div>
<br /> <br />

View file

@ -8272,6 +8272,27 @@ html.rl-message-fullscreen .messageView .b-content .buttonFull {
background-position: 60px 0; background-position: 60px 0;
} }
} }
html.rl-started-trigger .b-login-content .loginFormWrapper {
-webkit-transform: translateY(-30px);
-moz-transform: translateY(-30px);
transform: translateY(-30px);
}
html.rl-started-trigger #rl-content {
opacity: 0.7;
filter: alpha(opacity=70);
}
.rl-anim.csstransitions #rl-content {
-webkit-transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
-moz-transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
-o-transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
transition: 0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940);
}
.rl-anim.csstransitions .b-login-content .loginFormWrapper {
-webkit-transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
-moz-transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
-o-transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
transition: 0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940);
}
.rl-anim.rgba.cssanimations.backgroundsize .e-strip-animation { .rl-anim.rgba.cssanimations.backgroundsize .e-strip-animation {
-webkit-background-size: 60px 60px; -webkit-background-size: 60px 60px;
-moz-background-size: 60px 60px; -moz-background-size: 60px 60px;

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
/*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */ /*! RainLoop Webmail Admin Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (window, $, ko, crossroads, hasher, _) { (function (window, $, ko, crossroads, hasher, _) {
'use strict'; 'use strict';
@ -70,14 +70,14 @@ var
$document = $(window.document), $document = $(window.document),
NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
; ;
/*jshint onevar: false*/ /*jshint onevar: false*/
/** /**
* @type {?AdminApp} * @type {?AdminApp}
*/ */
var RL = null; var RL = null;
/*jshint onevar: true*/ /*jshint onevar: true*/
/** /**
* @type {?} * @type {?}
*/ */
@ -138,7 +138,7 @@ Globals.bDisableNanoScroll = Globals.bMobileDevice;
Globals.bAnimationSupported = !Globals.bMobileDevice && $html.hasClass('csstransitions'); Globals.bAnimationSupported = !Globals.bMobileDevice && $html.hasClass('csstransitions');
Globals.sAnimationType = ''; Globals.sAnimationType = '';
Consts.Defaults = {}; Consts.Defaults = {};
Consts.Values = {}; Consts.Values = {};
Consts.DataImages = {}; Consts.DataImages = {};
@ -256,7 +256,7 @@ Consts.DataImages.UserDotPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA
* @type {string} * @type {string}
*/ */
Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII='; Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
/** /**
* @enum {string} * @enum {string}
*/ */
@ -590,7 +590,7 @@ Enums.Notification = {
'UnknownNotification': 999, 'UnknownNotification': 999,
'UnknownError': 999 'UnknownError': 999
}; };
Utils.trim = $.trim; Utils.trim = $.trim;
Utils.inArray = $.inArray; Utils.inArray = $.inArray;
Utils.isArray = _.isArray; Utils.isArray = _.isArray;
@ -2099,7 +2099,7 @@ Utils.computedPagenatorHelper = function (koCurrentPage, koPageCount)
return aResult; return aResult;
}; };
}; };
// Base64 encode / decode // Base64 encode / decode
// http://www.webtoolkit.info/ // http://www.webtoolkit.info/
@ -2262,7 +2262,7 @@ Base64 = {
} }
}; };
/*jslint bitwise: false*/ /*jslint bitwise: false*/
ko.bindingHandlers.tooltip = { ko.bindingHandlers.tooltip = {
'init': function (oElement, fValueAccessor) { 'init': function (oElement, fValueAccessor) {
if (!Globals.bMobileDevice) if (!Globals.bMobileDevice)
@ -2889,7 +2889,7 @@ ko.observable.fn.validateFunc = function (fFunc)
return this; return this;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -3162,7 +3162,7 @@ LinkBuilder.prototype.socialFacebook = function ()
{ {
return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : ''); return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
}; };
/** /**
* @type {Object} * @type {Object}
*/ */
@ -3256,7 +3256,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
}; };
/** /**
* @constructor * @constructor
*/ */
@ -3330,7 +3330,7 @@ CookieDriver.prototype.get = function (sKey)
return mResult; return mResult;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -3402,7 +3402,7 @@ LocalStorageDriver.prototype.get = function (sKey)
return mResult; return mResult;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -3445,7 +3445,7 @@ LocalStorage.prototype.get = function (iKey)
{ {
return this.oDriver ? this.oDriver.get('p' + iKey) : null; return this.oDriver ? this.oDriver.get('p' + iKey) : null;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -3458,7 +3458,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
{ {
}; };
/** /**
* @param {string=} sPosition = '' * @param {string=} sPosition = ''
* @param {string=} sTemplate = '' * @param {string=} sTemplate = ''
@ -3518,7 +3518,7 @@ KnoinAbstractViewModel.prototype.viewModelPosition = function ()
KnoinAbstractViewModel.prototype.cancelCommand = KnoinAbstractViewModel.prototype.closeCommand = function () KnoinAbstractViewModel.prototype.cancelCommand = KnoinAbstractViewModel.prototype.closeCommand = function ()
{ {
}; };
/** /**
* @param {string} sScreenName * @param {string} sScreenName
* @param {?=} aViewModels = [] * @param {?=} aViewModels = []
@ -3594,7 +3594,7 @@ KnoinAbstractScreen.prototype.__start = function ()
this.oCross = oRoute; this.oCross = oRoute;
} }
}; };
/** /**
* @constructor * @constructor
*/ */
@ -3631,11 +3631,6 @@ Knoin.prototype.oScreens = {};
Knoin.prototype.oBoot = null; Knoin.prototype.oBoot = null;
Knoin.prototype.oCurrentScreen = null; Knoin.prototype.oCurrentScreen = null;
Knoin.prototype.showLoading = function ()
{
$('#rl-loading').show();
};
Knoin.prototype.hideLoading = function () Knoin.prototype.hideLoading = function ()
{ {
$('#rl-loading').hide(); $('#rl-loading').hide();
@ -3902,6 +3897,10 @@ Knoin.prototype.screenOnRoute = function (sScreenName, sSubPart)
*/ */
Knoin.prototype.startScreens = function (aScreensClasses) Knoin.prototype.startScreens = function (aScreensClasses)
{ {
$('#rl-content').css({
'visibility': 'hidden'
});
_.each(aScreensClasses, function (CScreen) { _.each(aScreensClasses, function (CScreen) {
var var
@ -3940,6 +3939,14 @@ Knoin.prototype.startScreens = function (aScreensClasses)
hasher.initialized.add(oCross.parse, oCross); hasher.initialized.add(oCross.parse, oCross);
hasher.changed.add(oCross.parse, oCross); hasher.changed.add(oCross.parse, oCross);
hasher.init(); hasher.init();
$('#rl-content').css({
'visibility': 'visible'
});
_.delay(function () {
$html.removeClass('rl-started-trigger').addClass('rl-started');
}, 50);
}; };
/** /**
@ -3982,7 +3989,7 @@ Knoin.prototype.bootstart = function ()
}; };
kn = new Knoin(); kn = new Knoin();
/** /**
* @param {string=} sEmail * @param {string=} sEmail
* @param {string=} sName * @param {string=} sName
@ -4346,7 +4353,7 @@ EmailModel.prototype.inputoTagLine = function ()
{ {
return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email; return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -4566,7 +4573,7 @@ PopupsDomainViewModel.prototype.clearForm = function ()
this.smtpAuth(true); this.smtpAuth(true);
this.whiteList(''); this.whiteList('');
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -4703,7 +4710,7 @@ PopupsPluginViewModel.prototype.onBuild = function ()
return bResult; return bResult;
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -4813,7 +4820,7 @@ PopupsActivateViewModel.prototype.validateSubscriptionKey = function ()
{ {
var sValue = this.key(); var sValue = this.key();
return '' === sValue || !!/^RL[\d]+-[A-Z0-9\-]+Z$/.test(Utils.trim(sValue)); return '' === sValue || !!/^RL[\d]+-[A-Z0-9\-]+Z$/.test(Utils.trim(sValue));
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -4887,7 +4894,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
RL.data().mainLanguage(sLang); RL.data().mainLanguage(sLang);
this.cancelCommand(); this.cancelCommand();
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -5002,7 +5009,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -5089,7 +5096,7 @@ AdminLoginViewModel.prototype.onHide = function ()
{ {
this.loginFocus(false); this.loginFocus(false);
}; };
/** /**
* @param {?} oScreen * @param {?} oScreen
* *
@ -5111,7 +5118,7 @@ AdminMenuViewModel.prototype.link = function (sRoute)
{ {
return '#/' + sRoute; return '#/' + sRoute;
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -5133,7 +5140,7 @@ AdminPaneViewModel.prototype.logoutClick = function ()
RL.remote().adminLogout(function () { RL.remote().adminLogout(function () {
RL.loginAndLogoutReload(); RL.loginAndLogoutReload();
}); });
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5252,7 +5259,7 @@ AdminGeneral.prototype.selectLanguage = function ()
{ {
kn.showScreenPopup(PopupsLanguagesViewModel); kn.showScreenPopup(PopupsLanguagesViewModel);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5304,7 +5311,7 @@ AdminLogin.prototype.onBuild = function ()
}, 50); }, 50);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5524,7 +5531,7 @@ AdminContacts.prototype.onBuild = function ()
}, 50); }, 50);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5613,7 +5620,7 @@ AdminDomains.prototype.onDomainListChangeRequest = function ()
{ {
RL.reloadDomainList(); RL.reloadDomainList();
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5694,7 +5701,7 @@ AdminSecurity.prototype.phpInfoLink = function ()
{ {
return RL.link().phpInfo(); return RL.link().phpInfo();
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5810,7 +5817,7 @@ AdminSocial.prototype.onBuild = function ()
}, 50); }, 50);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5907,7 +5914,7 @@ AdminPlugins.prototype.onPluginDisableRequest = function (sResult, oData)
RL.reloadPluginList(); RL.reloadPluginList();
}; };
/** /**
* @constructor * @constructor
*/ */
@ -6011,7 +6018,7 @@ AdminPackages.prototype.installPackage = function (oPackage)
RL.remote().packageInstall(this.requestHelper(oPackage, true), oPackage); RL.remote().packageInstall(this.requestHelper(oPackage, true), oPackage);
} }
}; };
/** /**
* @constructor * @constructor
*/ */
@ -6062,7 +6069,7 @@ AdminLicensing.prototype.licenseExpiredMomentValue = function ()
{ {
var oDate = moment.unix(this.licenseExpired()); var oDate = moment.unix(this.licenseExpired());
return oDate.format('LL') + ' (' + oDate.from(moment()) + ')'; return oDate.format('LL') + ' (' + oDate.from(moment()) + ')';
}; };
/** /**
* @constructor * @constructor
*/ */
@ -6131,7 +6138,7 @@ AbstractData.prototype.populateDataOnStart = function()
this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed')); this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
}; };
/** /**
* @constructor * @constructor
* @extends AbstractData * @extends AbstractData
@ -6165,7 +6172,7 @@ _.extend(AdminDataStorage.prototype, AbstractData.prototype);
AdminDataStorage.prototype.populateDataOnStart = function() AdminDataStorage.prototype.populateDataOnStart = function()
{ {
AbstractData.prototype.populateDataOnStart.call(this); AbstractData.prototype.populateDataOnStart.call(this);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -6439,7 +6446,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
'Version': sVersion 'Version': sVersion
}); });
}; };
/** /**
* @constructor * @constructor
* @extends AbstractAjaxRemoteStorage * @extends AbstractAjaxRemoteStorage
@ -6683,7 +6690,7 @@ AdminAjaxRemoteStorage.prototype.adminPing = function (fCallback)
{ {
this.defaultRequest(fCallback, 'AdminPing'); this.defaultRequest(fCallback, 'AdminPing');
}; };
/** /**
* @constructor * @constructor
*/ */
@ -6749,7 +6756,7 @@ AbstractCacheStorage.prototype.setEmailsPicsHashesData = function (oData)
{ {
this.oEmailsPicsHashes = oData; this.oEmailsPicsHashes = oData;
}; };
/** /**
* @constructor * @constructor
* @extends AbstractCacheStorage * @extends AbstractCacheStorage
@ -6760,7 +6767,7 @@ function AdminCacheStorage()
} }
_.extend(AdminCacheStorage.prototype, AbstractCacheStorage.prototype); _.extend(AdminCacheStorage.prototype, AbstractCacheStorage.prototype);
/** /**
* @param {Array} aViewModels * @param {Array} aViewModels
* @constructor * @constructor
@ -6937,7 +6944,7 @@ AbstractSettings.prototype.routes = function ()
['', oRules] ['', oRules]
]; ];
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractScreen * @extends KnoinAbstractScreen
@ -6952,7 +6959,7 @@ _.extend(AdminLoginScreen.prototype, KnoinAbstractScreen.prototype);
AdminLoginScreen.prototype.onShow = function () AdminLoginScreen.prototype.onShow = function ()
{ {
RL.setTitle(''); RL.setTitle('');
}; };
/** /**
* @constructor * @constructor
* @extends AbstractSettings * @extends AbstractSettings
@ -6972,7 +6979,7 @@ AdminSettingsScreen.prototype.onShow = function ()
// AbstractSettings.prototype.onShow.call(this); // AbstractSettings.prototype.onShow.call(this);
RL.setTitle(''); RL.setTitle('');
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractBoot * @extends KnoinAbstractBoot
@ -7234,7 +7241,7 @@ AbstractApp.prototype.bootstart = function ()
Utils.windowResize(); Utils.windowResize();
}, 1000); }, 1000);
}; };
/** /**
* @constructor * @constructor
* @extends AbstractApp * @extends AbstractApp
@ -7481,7 +7488,7 @@ AdminApp.prototype.bootstart = function ()
* @type {AdminApp} * @type {AdminApp}
*/ */
RL = new AdminApp(); RL = new AdminApp();
$html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile'); $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
$window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS); $window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
@ -7516,8 +7523,7 @@ window['__RLBOOT'] = function (fCall) {
window['rainloopTEMPLATES'] = {}; window['rainloopTEMPLATES'] = {};
kn.setBoot(RL).bootstart(); kn.setBoot(RL).bootstart();
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
$html.addClass('rl-started');
}, 50); }, 50);
} }
@ -7529,9 +7535,9 @@ window['__RLBOOT'] = function (fCall) {
window['__RLBOOT'] = null; window['__RLBOOT'] = null;
}); });
}; };
if (window.SimplePace) { if (window.SimplePace) {
window.SimplePace.add(10); window.SimplePace.add(10);
} }
}(window, jQuery, ko, crossroads, hasher, _)); }(window, jQuery, ko, crossroads, hasher, _));

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
/*! RainLoop Webmail Main Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */ /*! RainLoop Webmail Main Module (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (window, $, ko, crossroads, hasher, moment, Jua, _) { (function (window, $, ko, crossroads, hasher, moment, Jua, _) {
'use strict'; 'use strict';
@ -70,14 +70,14 @@ var
$document = $(window.document), $document = $(window.document),
NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
; ;
/*jshint onevar: false*/ /*jshint onevar: false*/
/** /**
* @type {?RainLoopApp} * @type {?RainLoopApp}
*/ */
var RL = null; var RL = null;
/*jshint onevar: true*/ /*jshint onevar: true*/
/** /**
* @type {?} * @type {?}
*/ */
@ -138,7 +138,7 @@ Globals.bDisableNanoScroll = Globals.bMobileDevice;
Globals.bAnimationSupported = !Globals.bMobileDevice && $html.hasClass('csstransitions'); Globals.bAnimationSupported = !Globals.bMobileDevice && $html.hasClass('csstransitions');
Globals.sAnimationType = ''; Globals.sAnimationType = '';
Consts.Defaults = {}; Consts.Defaults = {};
Consts.Values = {}; Consts.Values = {};
Consts.DataImages = {}; Consts.DataImages = {};
@ -256,7 +256,7 @@ Consts.DataImages.UserDotPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA
* @type {string} * @type {string}
*/ */
Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII='; Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
/** /**
* @enum {string} * @enum {string}
*/ */
@ -590,7 +590,7 @@ Enums.Notification = {
'UnknownNotification': 999, 'UnknownNotification': 999,
'UnknownError': 999 'UnknownError': 999
}; };
Utils.trim = $.trim; Utils.trim = $.trim;
Utils.inArray = $.inArray; Utils.inArray = $.inArray;
Utils.isArray = _.isArray; Utils.isArray = _.isArray;
@ -2099,7 +2099,7 @@ Utils.computedPagenatorHelper = function (koCurrentPage, koPageCount)
return aResult; return aResult;
}; };
}; };
// Base64 encode / decode // Base64 encode / decode
// http://www.webtoolkit.info/ // http://www.webtoolkit.info/
@ -2262,7 +2262,7 @@ Base64 = {
} }
}; };
/*jslint bitwise: false*/ /*jslint bitwise: false*/
ko.bindingHandlers.tooltip = { ko.bindingHandlers.tooltip = {
'init': function (oElement, fValueAccessor) { 'init': function (oElement, fValueAccessor) {
if (!Globals.bMobileDevice) if (!Globals.bMobileDevice)
@ -2889,7 +2889,7 @@ ko.observable.fn.validateFunc = function (fFunc)
return this; return this;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -3162,7 +3162,7 @@ LinkBuilder.prototype.socialFacebook = function ()
{ {
return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : ''); return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
}; };
/** /**
* @type {Object} * @type {Object}
*/ */
@ -3256,7 +3256,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
}; };
/** /**
* @constructor * @constructor
*/ */
@ -4152,7 +4152,7 @@ HtmlEditor.htmlFunctions = {
}, this), this.toolbar); }, this), this.toolbar);
} }
}; };
/** /**
* @constructor * @constructor
* @param {koProperty} oKoList * @param {koProperty} oKoList
@ -4686,7 +4686,7 @@ Selector.prototype.on = function (sEventName, fCallback)
{ {
this.oCallbacks[sEventName] = fCallback; this.oCallbacks[sEventName] = fCallback;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -4760,7 +4760,7 @@ CookieDriver.prototype.get = function (sKey)
return mResult; return mResult;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -4832,7 +4832,7 @@ LocalStorageDriver.prototype.get = function (sKey)
return mResult; return mResult;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -4875,7 +4875,7 @@ LocalStorage.prototype.get = function (iKey)
{ {
return this.oDriver ? this.oDriver.get('p' + iKey) : null; return this.oDriver ? this.oDriver.get('p' + iKey) : null;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -4888,7 +4888,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
{ {
}; };
/** /**
* @param {string=} sPosition = '' * @param {string=} sPosition = ''
* @param {string=} sTemplate = '' * @param {string=} sTemplate = ''
@ -4948,7 +4948,7 @@ KnoinAbstractViewModel.prototype.viewModelPosition = function ()
KnoinAbstractViewModel.prototype.cancelCommand = KnoinAbstractViewModel.prototype.closeCommand = function () KnoinAbstractViewModel.prototype.cancelCommand = KnoinAbstractViewModel.prototype.closeCommand = function ()
{ {
}; };
/** /**
* @param {string} sScreenName * @param {string} sScreenName
* @param {?=} aViewModels = [] * @param {?=} aViewModels = []
@ -5024,7 +5024,7 @@ KnoinAbstractScreen.prototype.__start = function ()
this.oCross = oRoute; this.oCross = oRoute;
} }
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5061,11 +5061,6 @@ Knoin.prototype.oScreens = {};
Knoin.prototype.oBoot = null; Knoin.prototype.oBoot = null;
Knoin.prototype.oCurrentScreen = null; Knoin.prototype.oCurrentScreen = null;
Knoin.prototype.showLoading = function ()
{
$('#rl-loading').show();
};
Knoin.prototype.hideLoading = function () Knoin.prototype.hideLoading = function ()
{ {
$('#rl-loading').hide(); $('#rl-loading').hide();
@ -5332,6 +5327,10 @@ Knoin.prototype.screenOnRoute = function (sScreenName, sSubPart)
*/ */
Knoin.prototype.startScreens = function (aScreensClasses) Knoin.prototype.startScreens = function (aScreensClasses)
{ {
$('#rl-content').css({
'visibility': 'hidden'
});
_.each(aScreensClasses, function (CScreen) { _.each(aScreensClasses, function (CScreen) {
var var
@ -5370,6 +5369,14 @@ Knoin.prototype.startScreens = function (aScreensClasses)
hasher.initialized.add(oCross.parse, oCross); hasher.initialized.add(oCross.parse, oCross);
hasher.changed.add(oCross.parse, oCross); hasher.changed.add(oCross.parse, oCross);
hasher.init(); hasher.init();
$('#rl-content').css({
'visibility': 'visible'
});
_.delay(function () {
$html.removeClass('rl-started-trigger').addClass('rl-started');
}, 50);
}; };
/** /**
@ -5412,7 +5419,7 @@ Knoin.prototype.bootstart = function ()
}; };
kn = new Knoin(); kn = new Knoin();
/** /**
* @param {string=} sEmail * @param {string=} sEmail
* @param {string=} sName * @param {string=} sName
@ -5776,7 +5783,7 @@ EmailModel.prototype.inputoTagLine = function ()
{ {
return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email; return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -5898,7 +5905,7 @@ ContactModel.prototype.lineAsCcc = function ()
return aResult.join(' '); return aResult.join(' ');
}; };
/** /**
* @param {number=} iType = Enums.ContactPropertyType.Unknown * @param {number=} iType = Enums.ContactPropertyType.Unknown
* @param {string=} sValue = '' * @param {string=} sValue = ''
@ -5920,7 +5927,7 @@ function ContactPropertyModel(iType, sValue, bFocused, sPlaceholder)
return sPlaceholder ? Utils.i18n(sPlaceholder) : ''; return sPlaceholder ? Utils.i18n(sPlaceholder) : '';
}, this); }, this);
} }
/** /**
* @constructor * @constructor
*/ */
@ -6147,7 +6154,7 @@ AttachmentModel.prototype.iconClass = function ()
return sClass; return sClass;
}; };
/** /**
* @constructor * @constructor
* @param {string} sId * @param {string} sId
@ -6208,7 +6215,7 @@ ComposeAttachmentModel.prototype.initByUploadJson = function (oJsonAttachment)
} }
return bResult; return bResult;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -7163,7 +7170,7 @@ MessageModel.prototype.showInternalImages = function (bLazy)
Utils.windowResize(500); Utils.windowResize(500);
} }
}; };
/** /**
* @constructor * @constructor
*/ */
@ -7487,7 +7494,7 @@ FolderModel.prototype.printableFullName = function ()
{ {
return this.fullName.split(this.delimiter).join(' / '); return this.fullName.split(this.delimiter).join(' / ');
}; };
/** /**
* @param {string} sEmail * @param {string} sEmail
* @param {boolean=} bCanBeDelete = true * @param {boolean=} bCanBeDelete = true
@ -7508,7 +7515,7 @@ AccountModel.prototype.email = '';
AccountModel.prototype.changeAccountLink = function () AccountModel.prototype.changeAccountLink = function ()
{ {
return RL.link().change(this.email); return RL.link().change(this.email);
}; };
/** /**
* @param {string} sId * @param {string} sId
* @param {string} sEmail * @param {string} sEmail
@ -7544,7 +7551,7 @@ IdentityModel.prototype.formattedNameForEmail = function ()
var sName = this.name(); var sName = this.name();
return '' === sName ? this.email() : '"' + Utils.quoteName(sName) + '" <' + this.email() + '>'; return '' === sName ? this.email() : '"' + Utils.quoteName(sName) + '" <' + this.email() + '>';
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -7654,7 +7661,7 @@ PopupsFolderClearViewModel.prototype.onBuild = function ()
return bResult; return bResult;
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -7774,7 +7781,7 @@ PopupsFolderCreateViewModel.prototype.onBuild = function ()
return bResult; return bResult;
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -7893,7 +7900,7 @@ PopupsFolderSystemViewModel.prototype.onBuild = function ()
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -9298,7 +9305,7 @@ PopupsComposeViewModel.prototype.triggerForResize = function ()
this.resizer(!this.resizer()); this.resizer(!this.resizer());
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -9893,7 +9900,7 @@ PopupsContactsViewModel.prototype.onHide = function ()
oItem.checked(false); oItem.checked(false);
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10034,7 +10041,7 @@ PopupsAdvancedSearchViewModel.prototype.onBuild = function ()
return bResult; return bResult;
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10158,7 +10165,7 @@ PopupsAddAccountViewModel.prototype.onBuild = function ()
return bResult; return bResult;
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10317,7 +10324,7 @@ PopupsIdentityViewModel.prototype.onBuild = function ()
return bResult; return bResult;
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10391,7 +10398,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
RL.data().mainLanguage(sLang); RL.data().mainLanguage(sLang);
this.cancelCommand(); this.cancelCommand();
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10506,7 +10513,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
}); });
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10776,7 +10783,7 @@ LoginViewModel.prototype.selectLanguage = function ()
kn.showScreenPopup(PopupsLanguagesViewModel); kn.showScreenPopup(PopupsLanguagesViewModel);
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10843,7 +10850,7 @@ AbstractSystemDropDownViewModel.prototype.logoutClick = function ()
RL.loginAndLogoutReload(true, RL.settingsGet('ParentEmail') && 0 < RL.settingsGet('ParentEmail').length); RL.loginAndLogoutReload(true, RL.settingsGet('ParentEmail') && 0 < RL.settingsGet('ParentEmail').length);
}); });
}; };
/** /**
* @constructor * @constructor
* @extends AbstractSystemDropDownViewModel * @extends AbstractSystemDropDownViewModel
@ -10855,7 +10862,7 @@ function MailBoxSystemDropDownViewModel()
} }
Utils.extendAsViewModel('MailBoxSystemDropDownViewModel', MailBoxSystemDropDownViewModel, AbstractSystemDropDownViewModel); Utils.extendAsViewModel('MailBoxSystemDropDownViewModel', MailBoxSystemDropDownViewModel, AbstractSystemDropDownViewModel);
/** /**
* @constructor * @constructor
* @extends AbstractSystemDropDownViewModel * @extends AbstractSystemDropDownViewModel
@ -10867,7 +10874,7 @@ function SettingsSystemDropDownViewModel()
} }
Utils.extendAsViewModel('SettingsSystemDropDownViewModel', SettingsSystemDropDownViewModel, AbstractSystemDropDownViewModel); Utils.extendAsViewModel('SettingsSystemDropDownViewModel', SettingsSystemDropDownViewModel, AbstractSystemDropDownViewModel);
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -10982,7 +10989,7 @@ MailBoxFolderListViewModel.prototype.contactsClick = function ()
kn.showScreenPopup(PopupsContactsViewModel); kn.showScreenPopup(PopupsContactsViewModel);
} }
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -11850,7 +11857,7 @@ MailBoxMessageListViewModel.prototype.initUploaderForAppend = function ()
; ;
return !!oJua; return !!oJua;
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -12189,7 +12196,7 @@ MailBoxMessageViewViewModel.prototype.showImages = function (oMessage)
oMessage.showExternalImages(true); oMessage.showExternalImages(true);
} }
}; };
/** /**
* @param {?} oScreen * @param {?} oScreen
* *
@ -12216,7 +12223,7 @@ SettingsMenuViewModel.prototype.backToMailBoxClick = function ()
{ {
kn.setHash(RL.link().inbox()); kn.setHash(RL.link().inbox());
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractViewModel * @extends KnoinAbstractViewModel
@ -12239,7 +12246,7 @@ SettingsPaneViewModel.prototype.backToMailBoxClick = function ()
{ {
kn.setHash(RL.link().inbox()); kn.setHash(RL.link().inbox());
}; };
/** /**
* @constructor * @constructor
*/ */
@ -12393,7 +12400,7 @@ SettingsGeneral.prototype.selectLanguage = function ()
{ {
kn.showScreenPopup(PopupsLanguagesViewModel); kn.showScreenPopup(PopupsLanguagesViewModel);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -12431,7 +12438,7 @@ SettingsContacts.prototype.onShow = function ()
{ {
this.showPassword(false); this.showPassword(false);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -12497,7 +12504,7 @@ SettingsAccounts.prototype.deleteAccount = function (oAccountToRemove)
} }
} }
}; };
/** /**
* @constructor * @constructor
*/ */
@ -12548,7 +12555,7 @@ SettingsIdentity.prototype.onBuild = function ()
}, 50); }, 50);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -12669,7 +12676,7 @@ SettingsIdentities.prototype.onBuild = function (oDom)
}); });
}, 50); }, 50);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -12736,7 +12743,7 @@ function SettingsSocialScreen()
} }
Utils.addSettingsViewModel(SettingsSocialScreen, 'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social'); Utils.addSettingsViewModel(SettingsSocialScreen, 'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
/** /**
* @constructor * @constructor
*/ */
@ -12800,7 +12807,7 @@ SettingsChangePasswordScreen.prototype.onChangePasswordResponse = function (sRes
this.passwordUpdateError(true); this.passwordUpdateError(true);
} }
}; };
/** /**
* @constructor * @constructor
*/ */
@ -12995,7 +13002,7 @@ SettingsFolders.prototype.unSubscribeFolder = function (oFolder)
oFolder.subScribed(false); oFolder.subScribed(false);
}; };
/** /**
* @constructor * @constructor
*/ */
@ -13212,7 +13219,7 @@ SettingsThemes.prototype.initCustomThemeUploader = function ()
return false; return false;
}; };
/** /**
* @constructor * @constructor
*/ */
@ -13281,7 +13288,7 @@ AbstractData.prototype.populateDataOnStart = function()
this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed')); this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
}; };
/** /**
* @constructor * @constructor
* @extends AbstractData * @extends AbstractData
@ -14229,7 +14236,7 @@ WebMailDataStorage.prototype.setMessageList = function (oData, bCached)
)); ));
} }
}; };
/** /**
* @constructor * @constructor
*/ */
@ -14503,7 +14510,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
'Version': sVersion 'Version': sVersion
}); });
}; };
/** /**
* @constructor * @constructor
* @extends AbstractAjaxRemoteStorage * @extends AbstractAjaxRemoteStorage
@ -15181,7 +15188,7 @@ WebMailAjaxRemoteStorage.prototype.socialUsers = function (fCallback)
this.defaultRequest(fCallback, 'SocialUsers'); this.defaultRequest(fCallback, 'SocialUsers');
}; };
/** /**
* @constructor * @constructor
*/ */
@ -15247,7 +15254,7 @@ AbstractCacheStorage.prototype.setEmailsPicsHashesData = function (oData)
{ {
this.oEmailsPicsHashes = oData; this.oEmailsPicsHashes = oData;
}; };
/** /**
* @constructor * @constructor
* @extends AbstractCacheStorage * @extends AbstractCacheStorage
@ -15564,7 +15571,7 @@ WebMailCacheStorage.prototype.storeMessageFlagsToCacheByFolderAndUid = function
this.setMessageFlagsToCache(sFolder, sUid, aFlags); this.setMessageFlagsToCache(sFolder, sUid, aFlags);
} }
}; };
/** /**
* @param {Array} aViewModels * @param {Array} aViewModels
* @constructor * @constructor
@ -15741,7 +15748,7 @@ AbstractSettings.prototype.routes = function ()
['', oRules] ['', oRules]
]; ];
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractScreen * @extends KnoinAbstractScreen
@ -15756,7 +15763,7 @@ _.extend(LoginScreen.prototype, KnoinAbstractScreen.prototype);
LoginScreen.prototype.onShow = function () LoginScreen.prototype.onShow = function ()
{ {
RL.setTitle(''); RL.setTitle('');
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractScreen * @extends KnoinAbstractScreen
@ -15921,7 +15928,7 @@ MailBoxScreen.prototype.routes = function ()
[/^([^\/]*)$/, {'normalize_': fNormS}] [/^([^\/]*)$/, {'normalize_': fNormS}]
]; ];
}; };
/** /**
* @constructor * @constructor
* @extends AbstractSettings * @extends AbstractSettings
@ -15949,7 +15956,7 @@ SettingsScreen.prototype.onShow = function ()
RL.setTitle(this.sSettingsTitle); RL.setTitle(this.sSettingsTitle);
}; };
/** /**
* @constructor * @constructor
* @extends KnoinAbstractBoot * @extends KnoinAbstractBoot
@ -16211,7 +16218,7 @@ AbstractApp.prototype.bootstart = function ()
Utils.windowResize(); Utils.windowResize();
}, 1000); }, 1000);
}; };
/** /**
* @constructor * @constructor
* @extends AbstractApp * @extends AbstractApp
@ -17132,7 +17139,7 @@ RainLoopApp.prototype.bootstart = function ()
* @type {RainLoopApp} * @type {RainLoopApp}
*/ */
RL = new RainLoopApp(); RL = new RainLoopApp();
$html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile'); $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
$window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS); $window.keydown(Utils.killCtrlAandS).keyup(Utils.killCtrlAandS);
@ -17167,8 +17174,7 @@ window['__RLBOOT'] = function (fCall) {
window['rainloopTEMPLATES'] = {}; window['rainloopTEMPLATES'] = {};
kn.setBoot(RL).bootstart(); kn.setBoot(RL).bootstart();
$html.removeClass('no-js rl-booted-trigger').addClass('rl-booted');
$html.addClass('rl-started');
}, 50); }, 50);
} }
@ -17180,9 +17186,9 @@ window['__RLBOOT'] = function (fCall) {
window['__RLBOOT'] = null; window['__RLBOOT'] = null;
}); });
}; };
if (window.SimplePace) { if (window.SimplePace) {
window.SimplePace.add(10); window.SimplePace.add(10);
} }
}(window, jQuery, ko, crossroads, hasher, moment, Jua, _)); }(window, jQuery, ko, crossroads, hasher, moment, Jua, _));

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View file

@ -0,0 +1,53 @@
// MAIN
@main-color: #333;
@main-background-color: #563c55;
@main-background-image: "images/background.jpg";
@main-background-size: cover;
// LOADING
@loading-color: #ddd;
@loading-text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
// LOGIN
@login-color: #eee;
@login-background-color: #2b333d;
@login-rgba-background-color: rgba(0,0,0,0.5);
@login-box-shadow: 0px 2px 10px rgba(0,0,0,0.5);
@login-border: none;
@login-border-radius: 7px;
// MENU
@dropdown-menu-color: #333;
@dropdown-menu-background-color: #fff;
@dropdown-menu-hover-background-color: #48525C;
@dropdown-menu-hover-color: #eee;
@dropdown-menu-disable-color: #999;
// FOLDERS
@folders-color: #fff;
@folders-disabled-color: #aaa;
@folders-selected-color: #fff;
@folders-selected-background-color: #2b333d;
@folders-selected-rgba-background-color: rgba(255,255,255,0.3);
@folders-hover-color: #fff;
@folders-hover-background-color: #2b333d;
@folders-hover-rgba-background-color: rgba(255,255,255,0.3);
@folders-drop-color: #fff;
@folders-drop-background-color: #2b333d;
@folders-drop-rgba-background-color: rgba(255,255,255,0.3);
// SETTINGS
@settings-menu-color: #fff;
@settings-menu-disabled-color: #aaa;
@settings-menu-selected-color: #fff;
@settings-menu-selected-background-color: #2b333d;
@settings-menu-selected-rgba-background-color: rgba(255,255,255,0.3);
@settings-menu-hover-color: #fff;
@settings-menu-hover-background-color: #2b333d;
@settings-menu-hover-rgba-background-color: rgba(255,255,255,0.3);
// MESSAGE LIST
@message-list-toolbar-background-color: #eee;
@message-list-toolbar-gradient-start: #f4f4f4;
@message-list-toolbar-gradient-end: #dfdfdf;