Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 04:59:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code improvements

Browse source
This commit is contained in:
RainLoop Team 2016-05-24 00:56:48 +03:00
parent c43e35530e
commit 06d3dac310
13 changed files with 121 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dev/Common/Booter.jsx
View file

@ -28,6 +28,12 @@ window.__rlah_clear = () => {
}
};
function getComputedStyle(id, name)
{
var element = window.document.getElementById(id);
return element.currentStyle ? element.currentStyle[name] : (window.getComputedStyle ? window.getComputedStyle(element, null).getPropertyValue(name) : null);
}
function includeStyle(styles)
{
window.document.write(unescape('%3Csty' + 'le%3E' + styles + '"%3E%3C/' + 'sty' + 'le%3E'));
@ -41,10 +47,16 @@ function includeScr(src)
function includeLayout()
{
const
css = require('Styles/@Boot.css'),
layout = require('Html/Layout.html'),
app = window.document.getElementById('rl-app')
;
if (css)
{
includeStyle(css);
}
if (app && layout)
{
app.innerHTML = layout.replace(/[\r\n\t]+/g, '');
@ -163,12 +175,6 @@ function runApp()
libs = window.jassl(appData.StaticLibJsLink).then(() => {
if (window.$)
{
if (!window.$('#rl-check').is(':visible'))
{
window.$('html').addClass('no-css');
throw new Error('no-css');
}
window.$('#rl-check').remove();
if (appData.IncludeBackground)
@ -224,7 +230,7 @@ window.__initAppData = function(data) {
if (rlAppDataStorage.NewThemeLink)
{
window.document.getElementById('app-theme-link').href = rlAppDataStorage.NewThemeLink;
(window.document.getElementById('app-theme-link') || {}).href = rlAppDataStorage.NewThemeLink;
}
if (rlAppDataStorage.IncludeCss)
@ -244,6 +250,12 @@ window.__runBoot = function() {
window.document.location.replace('./?/NoCookie');
}
if ('none' !== getComputedStyle('rl-check', 'display'))
{
const root = document.documentElement;
root.className += ' no-css';
}
if (includeLayout())
{
includeAppScr(getRainloopBootData());

28
dev/Common/Utils.js
View file

@ -1532,6 +1532,25 @@
}
};
Utils.appendStyles = function ($styleTag, css)
{
if ($styleTag && $styleTag[0])
{
if ($styleTag[0].styleSheet && !Utils.isUnd($styleTag[0].styleSheet.cssText))
{
$styleTag[0].styleSheet.cssText = css;
}
else
{
$styleTag.text(css);
}
return true;
}
return false;
};
Utils.__themeTimer = 0;
Utils.__themeAjax = null;
@ -1583,14 +1602,9 @@
if (oThemeStyle && oThemeStyle[0])
{
oThemeStyle.attr('data-href', sUrl).attr('data-theme', aData[0]);
if (oThemeStyle[0].styleSheet && !Utils.isUnd(oThemeStyle[0].styleSheet.cssText))
if (Utils.appendStyles(oThemeStyle, aData[1]))
{
oThemeStyle[0].styleSheet.cssText = aData[1];
}
else
{
oThemeStyle.text(aData[1]);
oThemeStyle.attr('data-href', sUrl).attr('data-theme', aData[0]);
}
}