Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Bug 799714 - Define startup graphics and/or animation #6926

Merged
merged 1 commit into from

1 participant

@vingtetun
Collaborator

No description provided.

@vingtetun vingtetun merged commit b57def3 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 11, 2012
  1. @vingtetun
This page is out of date. Refresh to see the latest.
View
1  Makefile
@@ -309,6 +309,7 @@ define run-js-command
const GAIA_LOCALES_PATH = "$(GAIA_LOCALES_PATH)"; \
const BUILD_APP_NAME = "$(BUILD_APP_NAME)"; \
const PRODUCTION = "$(PRODUCTION)"; \
+ const OFFICIAL = "$(MOZILLA_OFFICIAL)"; \
const GAIA_ENGINE = "xpcshell"; \
'; \
$(XULRUNNERSDK) $(XPCSHELLSDK) -e "$$JS_CONSTS" -f build/utils.js "build/$(strip $1).js"
View
43 apps/system/index.html
@@ -27,10 +27,12 @@
<link rel="stylesheet" type="text/css" href="shared/style/confirm.css"/>
<link rel="stylesheet" type="text/css" href="shared/style/headers.css"/>
<link rel="stylesheet" type="text/css" href="shared/style/switches.css"/>
+
<link rel="stylesheet" type="text/css" href="style/fake-notification.css"/>
<!-- Include shared resources
<link rel="resource" type="application/json" href="shared/resources/apn.json"/>
+ <link rel="resource" type="image/png" href="shared/resources/branding/"/>
-->
<!-- applications.js must not be deferred
@@ -210,36 +212,27 @@
<link rel="stylesheet" type="text/css" href="style/zindex.css">
<style>
- /* initlogo style is here to prevent flashing */
-
- #initlogo {
- position: absolute;
- overflow: hidden;
- width: 100%;
- height: 100%;
-
- background: #000 url('./resources/images/initlogo.png') bottom right no-repeat;
+ /* initlogo style is here to prevent flashing */
+ #initlogo {
+ position: absolute;
+ overflow: hidden;
+ width: 100%;
+ height: 100%;
- z-index: 65536;
+ background: #000 url('shared/resources/branding/initlogo.png') bottom right no-repeat;
- visibility: visible;
- opacity: 1;
- transition: visibility 3s ease, opacity 3s ease;
- pointer-events: none;
- }
+ z-index: 65536;
- #initlogo.hide {
- visibility: hidden;
- opacity: 0;
- }
-
- #initlogo > img {
- position: absolute;
- bottom: 0;
- right: 0;
- }
+ opacity: 1;
+ transition: opacity 1s ease 3s;
+ pointer-events: none;
+ }
+ #initlogo.hide {
+ opacity: 0;
+ }
</style>
+
</head>
<body role="application">
View
1  apps/system/js/bootstrap.js
@@ -28,6 +28,7 @@ window.addEventListener('load', function startup() {
SourceView.init();
Shortcuts.init();
+ ScreenManager.turnScreenOn();
// We need to be sure to get the focus in order to wake up the screen
// if the phone goes to sleep before any user interaction.
View
20 build/webapp-zip.js
@@ -13,6 +13,11 @@ const PR_TRUNCATE = 0x20;
const PR_SYNC = 0x40;
const PR_EXCL = 0x80;
+function isSubjectToBranding(path) {
+ return /shared\/[a-zA-Z]+\/branding$/.test(path) ||
+ /branding\/initlogo.png/.test(path);
+}
+
/**
* Add a file or a directory, recursively, to a zip file
*
@@ -22,8 +27,8 @@ const PR_EXCL = 0x80;
*/
function addToZip(zip, pathInZip, file) {
// Branding specific code
- if (/shared\/locales\/branding$/.test(file.path)) {
- file.append((PRODUCTION == 1) ? 'official' : 'unofficial');
+ if (isSubjectToBranding(file.path)) {
+ file.append((OFFICIAL == 1) ? 'official' : 'unofficial');
}
if (!file.exists())
@@ -177,12 +182,14 @@ Gaia.webapps.forEach(function(webapp) {
break;
case 'locales':
let localeName = path.substr(0, path.lastIndexOf('.'));
- if (used.locales.indexOf(localeName) == -1)
+ if (used.locales.indexOf(localeName) == -1) {
used.locales.push(localeName);
+ }
break;
case 'resources':
- if (used.resources.indexOf(path) == -1)
+ if (used.resources.indexOf(path) == -1) {
used.resources.push(path);
+ }
break;
case 'style':
let styleName = path.substr(0, path.lastIndexOf('.'));
@@ -240,8 +247,9 @@ Gaia.webapps.forEach(function(webapp) {
file.append(segment);
});
if (!file.exists()) {
- throw new Error('Using inexistent shared resource: ' + path + ' from: ' +
- webapp.domain);
+ dump('Using inexistent shared resource: ' + path +
+ ' from: ' + webapp.domain + '\n');
+ return;
}
addToZip(zip, '/shared/resources/' + path, file);
});
View
BIN  shared/resources/branding/official/initlogo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  apps/system/resources/images/initlogo.png → shared/resources/branding/unofficial/initlogo.png
File renamed without changes
Something went wrong with that request. Please try again.