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

Commit

Permalink
Bug 849280 - lazyloading of HTML, CSS & JS in the browser app r=benfr…
Browse files Browse the repository at this point in the history 
…ancis

shared files fix

lint fix

newline

linting errors

lint

lazy loader tests

lazy load shared css

first time thumbnail screen fix

leftovers

topsites screen fixed

web activities fix
(cherry picked from commit d7f7c66)
  • Loading branch information
@michalbe @benfrancis
michalbe authored and benfrancis committed Mar 20, 2013
1 parent 3867f16 commit 7af427d
Show file tree
Hide file tree
Showing 5 changed files with 305 additions and 162 deletions.
133 changes: 75 additions & 58 deletions apps/browser/index.html
View file
Expand Up @@ -4,30 +4,26 @@
<meta charset="utf-8">
<meta http-equiv="pragma" content="no-cache">
<title>Browser</title>
<!-- Common style -->
<link rel="stylesheet" href="shared/style/headers.css" type="text/css">
<!-- Shared CSS-->
<!-- <link rel="stylesheet" href="shared/style/headers.css" type="text/css">
<link rel="stylesheet" href="shared/style/buttons.css" type="text/css">
<link rel="stylesheet" href="shared/style/input_areas.css" type="text/css">
<link rel="stylesheet" href="shared/style/status.css" type="text/css">
<link rel="stylesheet" href="shared/style/confirm.css" type="text/css"> -->

<!-- Specific style -->
<link rel="stylesheet" href="style/browser.css" type="text/css">
<link rel="stylesheet" href="shared/style/confirm.css" type="text/css">
<link rel="stylesheet" href="style/action_menu.css" type="text/css">
<link rel="stylesheet" href="style/authentication_dialog.css" type="text/css">
<!-- Localization -->
<link rel="resource" type="application/l10n" href="shared/locales/branding.ini">
<link rel="resource" type="application/l10n" href="locales/locales.ini">
<!-- Shared code -->
<script defer src="shared/js/l10n.js"></script>
<script defer src="shared/js/gesture_detector.js"></script>

<script defer src="shared/js/lazy_loader.js"></script>
<!-- <script defer src="shared/js/gesture_detector.js"></script> -->

<!-- Specific code -->
<script defer src="js/places.js"></script>
<script defer src="js/date_helper.js"></script>
<script defer src="js/modal_dialog.js"></script>
<script defer src="js/authentication_dialog.js"></script>
<script defer src="js/browser.js"></script>
<script defer src="js/browser_extensions.js"></script>

<!-- Resources -->
<link rel="resource" type="image/png" href="shared/resources/branding/Browser.png"/>
Expand All @@ -45,7 +41,7 @@
data-l10n-id="enter-search-or-address" x-inputmode="verbatim"/>
<input type="image" id="url-button" value="" />
</form>
<span id="tabs-badge"></span>
<span id="tabs-badge"> 1&#x203A;</span>
<button id="awesomescreen-cancel-button"></button>
<div id="throbber"></div>
</menu>
Expand All @@ -59,12 +55,13 @@ <h2 data-l10n-id="top-sites">Top Sites</h2>
<ul id="top-site-thumbnails">
</ul>
<p id="no-top-sites" class="hidden" data-l10n-id="start-browsing">
Enter a search term or web address to start browsing.
Enter a search term or web address to start browsing.
</p>
</div>
</div>

<div id="awesomescreen">
<!--
<nav data-role="tabs" id="tab-headers">
<ul role="tablist">
<li role="tab">
Expand All @@ -90,19 +87,24 @@ <h2 data-l10n-id="top-sites">Top Sites</h2>
</section>
</div>
<section id="results" class="hidden">
</section>
</section>
-->
</div>

<div id="crashscreen">
<!--
<h3 data-l10n-id="this-is-embarrassing">Well, this is embarrassing.</h3>
<img src="style/images/crashed-tab-icon.png" />
<p data-l10n-id="not-responding">We tried to display this webpage but it's not responding.</p>
<p data-l10n-id="not-responding">
We tried to display this webpage but it's not responding.
</p>
<menu type="toolbar">
<button data-l10n-id="close-tab" id="close-tab">Close Tab</button>
<button data-l10n-id="reload-tab" id="try-reloading">
Try Reloading
</button>
</menu>
Try Reloading
</button>
</menu>
-->
</div>

</div>
Expand All @@ -118,14 +120,17 @@ <h3 data-l10n-id="this-is-embarrassing">Well, this is embarrassing.</h3>
</menu>

<div id="tray">
<!--
<menu type="toolbar" id="tray-toolbar">
<button type="button" id="new-tab-button"></button>
<button type="button" id="settings-button"></button>
</menu>
<div id="tabs-list"></div>
<div id="tabs-list"></div>
-->
</div>

<section id="bookmark-menu" role="dialog" class="hidden">
<!--
<menu class="actions">
<h3 data-l10n-id="bookmarks">Bookmarks</h3>
<ul>
Expand All @@ -135,10 +140,12 @@ <h3 data-l10n-id="bookmarks">Bookmarks</h3>
<li><button id="bookmark-menu-add-home" data-l10n-id="add-to-home-screen">Add to Home Screen</button></li>
<li><button id="bookmark-menu-cancel" data-l10n-id="cancel">Cancel</button></li>
</ul>
</menu>
</menu>
-->
</section>

<section id="bookmark-entry-sheet" role="region" class="hidden skin-organic">
<!--
<header>
<button id="bookmark-entry-sheet-cancel">
<span class="icon icon-close" data-l10n-id="cancel">Cancel</span>
Expand All @@ -154,10 +161,12 @@ <h1 data-l10n-id="edit-bookmark">Edit Bookmark</h1>
<label data-l10n-id="address">
Address <input type="url" id="bookmark-url"></input>
</label>
<input type="hidden" id="bookmark-previous-url"></input>
<input type="hidden" id="bookmark-previous-url"></input>
-->
</section>

<section id="http-authentication-dialog" role="region" class="hidden skin-organic">
<!--
<header>
<button id="http-authentication-cancel">
<span class="icon icon-close">close</span>
Expand All @@ -173,29 +182,33 @@ <h1 l10n-id="login-to-a-website">Login to a website</h1>
</label>
<label data-l10n-id="password">Password
<input id="http-authentication-password" type="password" />
</label>
</label>
-->
</section>

<form role="dialog" id="modal-dialog-confirm" data-type="confirm" hidden>
<section>
<p><span id="modal-dialog-confirm-message"></span></p>
</section>
<menu>
<button id="modal-dialog-confirm-cancel" data-l10n-id="cancel">Cancel</button>
<button id="modal-dialog-confirm-ok" data-l10n-id="ok">OK</button>
</menu>
<!-- <section>
<p><span id="modal-dialog-confirm-message"></span></p>
</section>
<menu>
<button id="modal-dialog-confirm-cancel" data-l10n-id="cancel">Cancel</button>
<button id="modal-dialog-confirm-ok" data-l10n-id="ok">OK</button>
</menu> -->
</form>

<form role="dialog" id="modal-dialog-alert" data-type="confirm" hidden>
<!--
<section>
<p><span id="modal-dialog-alert-message"></span></p>
</section>
<menu>
<button id="modal-dialog-alert-ok" class="full" data-l10n-id="ok">OK</button>
</menu>
</menu>
-->
</form>

<form role="dialog" id="modal-dialog-prompt" data-type="confirm" hidden>
<!--
<section>
<p>
<span id="modal-dialog-prompt-message"></span>
Expand All @@ -207,50 +220,54 @@ <h1 l10n-id="login-to-a-website">Login to a website</h1>
Cancel
</button>
<button id="modal-dialog-prompt-ok" data-l10n-id="ok">OK</button>
</menu>
</menu>
-->
</form>

<form role="dialog" id="modal-dialog-custom-prompt" data-type="confirm" hidden>
<!--
<section>
<p><span id="modal-dialog-custom-prompt-message"></span></p>
<label>
<input id="modal-dialog-custom-prompt-checkbox" type="checkbox" />
<span></span>
<span></span>
</label>
</section>
<menu id="modal-dialog-custom-prompt-buttons"></menu>
<menu id="modal-dialog-custom-prompt-buttons"></menu>
-->
</form>

<section role="region" id="settings" class="skin-organic">
<header id="settings-header">
<button id="settings-done-button"><span class="icon icon-back"></span></button>
<h1 data-l10n-id="browser-settings">Browser Settings</h1>
</header>
<ul>
<li>
<button id="about-browser-button"
data-l10n-id="about-browser" class="icon icon-view">About Browser</button>
</li>
</ul>
<header>
<h2 data-l10n-id="privacy-and-security">Privacy & Security</h2>
</header>
<ul>
<li>
<button id="clear-history-button"
data-l10n-id="clear-browsing-history">Clear browsing history</button>
</li>
<li>
<button id="clear-private-data-button"
data-l10n-id="clear-cookies-and-stored-data">Clear cookies and stored data</button>
</li>
</ul>
<!--
<header id="settings-header">
<button id="settings-done-button"><span class="icon icon-back"></span></button>
<h1 data-l10n-id="browser-settings">Browser Settings</h1>
</header>
<ul>
<li>
<button id="about-browser-button"
data-l10n-id="about-browser" class="icon icon-view">About Browser</button>
</li>
</ul>
<header>
<h2 data-l10n-id="privacy-and-security">Privacy & Security</h2>
</header>
<ul>
<li>
<button id="clear-history-button"
data-l10n-id="clear-browsing-history">Clear browsing history</button>
</li>
<li>
<button id="clear-private-data-button"
data-l10n-id="clear-cookies-and-stored-data">Clear cookies and stored data</button>
</li>
</ul>
-->
</section>

<section id="save-image-status" role="status">
<p> </p>
</section>

</body>

</html>

0 comments on commit 7af427d

Please sign in to comment.