Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me) #12246

Merged
merged 1 commit into from Sep 18, 2013
Merged

Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me) #12246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 17 additions & 11 deletions apps/homescreen/everything.me/js/everything.me.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ var EverythingME = {
if (footer) {
footer.style.MozTransition = '-moz-transform .3s ease';
}

var self = this,
page = document.getElementById('landing-page'),
activationIcon = document.getElementById('evme-activation-icon');
Expand Down Expand Up @@ -42,7 +42,7 @@ var EverythingME = {

EverythingME.migrateStorage();
},

activate: function EverythingME_activate(e) {
document.body.classList.add('evme-loading');

Expand All @@ -52,10 +52,10 @@ var EverythingME = {
activationIcon = document.getElementById('evme-activation-icon'),
input = activationIcon.querySelector('input'),
existingQuery = input && input.value;

landingPage.appendChild(page.parentNode.removeChild(page));
EvmeFacade.onShow();

// set the query the user entered before loaded
input = document.getElementById('search-q');
if (input) {
Expand All @@ -68,7 +68,7 @@ var EverythingME = {
}

document.body.classList.remove('evme-loading');

activationIcon.parentNode.removeChild(activationIcon);
});
},
Expand Down Expand Up @@ -103,9 +103,13 @@ var EverythingME = {
'js/api/DoATAPI.js',
'js/helpers/EventHandler.js',
'js/helpers/Idle.js',
'shared/js/settings_listener.js',
'js/plugins/Analytics.js',
'js/plugins/APIStatsEvents.js'];
var css_files = ['css/common.css',
var css_files = ['shared/style/confirm.css',
'shared/style_unstable/progress_activity.css',
'shared/style/status.css',
'css/common.css',
'modules/Apps/Apps.css',
'modules/BackgroundImage/BackgroundImage.css',
'modules/Banner/Banner.css',
Expand Down Expand Up @@ -146,15 +150,17 @@ var EverythingME = {
var link = document.createElement('link');
link.type = 'text/css';
link.rel = 'stylesheet';
link.href = 'everything.me/' + file + (CB ? '?' + Date.now() : '');
link.href = (file.indexOf('shared/') !== -1 ? '' : 'everything.me/') +
file + (CB ? '?' + Date.now() : '');
link.addEventListener('load', onCSSLoad);
setTimeout(function appendCSS() { head.appendChild(link); }, 0);
}

function loadScript(file) {
var script = document.createElement('script');
script.type = 'text/javascript';
script.src = 'everything.me/' + file + (CB ? '?' + Date.now() : '');
script.src = (file.indexOf('shared/') !== -1 ? '' : 'everything.me/') +
file + (CB ? '?' + Date.now() : '');
script.defer = true;
script.addEventListener('load', onScriptLoad);
setTimeout(function appendScript() { head.appendChild(script) }, 0);
Expand Down Expand Up @@ -223,7 +229,7 @@ var EverythingME = {
for (var key in AUTOMATIC_KEYS) {
EverythingME.copyStorageToDB(key, AUTOMATIC_KEYS[key], onDataMigrated);
}

function onDataMigrated() {
numberOfKeysDone++;
if (numberOfKeysDone >= numberOfKeys) {
Expand All @@ -233,7 +239,7 @@ var EverythingME = {
}
});
},

copyStorageToDB: function copyStorageToDB(oldKey, newKey, onComplete) {
if (!onComplete) {
onComplete = function() {};
Expand Down Expand Up @@ -277,7 +283,7 @@ var EverythingME = {
onComplete(false);
return false;
}

function deleteOld() {
window.localStorage[oldKey] = null;
delete window.localStorage[oldKey];
Expand Down
8 changes: 5 additions & 3 deletions apps/homescreen/index.html
View file
Open in desktop
Expand Up @@ -14,18 +14,20 @@
<script type="text/javascript" src="shared/js/l10n_date.js"></script>
<script type="text/javascript" defer src="shared/js/screen_layout.js"></script>
<script type="text/javascript" defer src="shared/js/manifest_helper.js"></script>
<script type="text/javascript" src="shared/js/settings_listener.js"></script>
<!-- <script type="text/javascript" src="shared/js/settings_listener.js"></script> -->
<script type="text/javascript" defer src="shared/js/async_storage.js"></script>
<script defer type="text/javascript" src="shared/js/icc_helper.js"></script>
<script type="text/javascript" defer src="shared/js/lazy_loader.js"></script>

<link rel="stylesheet" type="text/css" href="shared/style_unstable/progress_activity.css">
<link rel="stylesheet" type="text/css" href="shared/style/status.css">
<!-- Lazy load for ConfirmDialog -->
<!-- <link rel="stylesheet" type="text/css" href="shared/style/buttons.css"> -->
<!-- <link rel="stylesheet" type="text/css" href="shared/style/headers.css"> -->
<!-- <link rel="stylesheet" type="text/css" href="shared/style/confirm.css"> -->

<!-- Lazy load for Ev.me -->
<!-- <link rel="stylesheet" type="text/css" href="shared/style_unstable/progress_activity.css"> -->
<!-- <link rel="stylesheet" type="text/css" href="shared/style/status.css"> -->

<!-- Specific code -->
<script type="text/javascript" defer src="js/bookmark.js"></script>
<script type="text/javascript" defer src="js/state.js"></script>
Expand Down