Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #7455 from Rik/osi-license-828210

Bug 828210 - Workaround for open source license bug 825622, r=kaze
  • Loading branch information...
commit 4a5c0d07717b9fc53581c2335d8e65576d790360 2 parents aa469f2 + 3b0ec3a
@fabi1cazenave fabi1cazenave authored
Showing with 54 additions and 64 deletions.
  1. +49 −49 apps/settings/index.html
  2. +5 −15 apps/settings/js/settings.js
View
98 apps/settings/index.html
@@ -81,7 +81,7 @@
-->
<!-- Connectivity :: Wi-Fi :: Network Status -->
- <section role="region" hidden id="wifi-status">
+ <section role="region" id="wifi-status">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -117,7 +117,7 @@ <h1 data-ssid> Network Status </h1>
</section>
<!-- Connectivity :: Wi-Fi :: Network Authentication -->
- <section role="region" hidden id="wifi-auth">
+ <section role="region" id="wifi-auth">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -155,7 +155,7 @@ <h1 data-ssid> Network Authentication </h1>
</section>
<!-- Connectivity :: Wi-Fi :: Join Hidden Network -->
- <section role="region" hidden id="wifi-joinHidden">
+ <section role="region" id="wifi-joinHidden">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -197,7 +197,7 @@ <h1 data-l10n-id="authentication"> Authentication </h1>
</section>
<!-- Connectivity :: Wi-Fi :: WPS -->
- <section role="region" hidden id="wifi-wps">
+ <section role="region" id="wifi-wps">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -241,7 +241,7 @@ <h2 data-l10n-id="wpsMethodSelection">Select WPS method:</h2>
</section>
<!-- Connectivity :: Wi-Fi :: Saved Networks -->
- <section role="region" hidden id="wifi-manageNetworks">
+ <section role="region" id="wifi-manageNetworks">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -283,7 +283,7 @@ <h2 data-l10n-id="hiddenNetworks"> Hidden Networks </h2>
</section>
<!-- Connectivity :: Wi-Fi -->
- <section role="region" hidden id="wifi">
+ <section role="region" id="wifi">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -345,7 +345,7 @@ <h2 data-l10n-id="advancedSettings"> Advanced Settings </h2>
</section>
<!-- Connectivity :: Call :: Call Forwarding Not Reachable -->
- <section role="region" hidden id="call-cf-notReachableSettings">
+ <section role="region" id="call-cf-notReachableSettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -372,7 +372,7 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
</section>
<!-- Connectivity :: Call :: Call Forwarding No Reply -->
- <section role="region" hidden id="call-cf-noReplySettings">
+ <section role="region" id="call-cf-noReplySettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -399,7 +399,7 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
</section>
<!-- Connectivity :: Call :: Call Forwarding Mobile Busy -->
- <section role="region" hidden id="call-cf-mobileBusySettings">
+ <section role="region" id="call-cf-mobileBusySettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -426,7 +426,7 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
</section>
<!-- Connectivity :: Call :: Call Forwarding Unconditional -->
- <section role="region" hidden id="call-cf-unconditionalSettings">
+ <section role="region" id="call-cf-unconditionalSettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -453,7 +453,7 @@ <h1 data-l10n-id="callForwarding"> Call forwarding </h1>
</section>
<!-- Connectivity :: Call -->
- <section role="region" hidden id="call">
+ <section role="region" id="call">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -520,7 +520,7 @@ <h1 data-l10n-id="confirmCallWaitingTitle">Unable to confirm call waiting prefer
</section>
<!-- Connectivity :: Cellular & Data :: Network Operator -->
- <section role="region" hidden id="carrier-operatorSettings">
+ <section role="region" id="carrier-operatorSettings">
<!--
<header>
<a href="#carrier"><span class="icon icon-back">back</span></a>
@@ -567,7 +567,7 @@ <h2 data-l10n-id="availableOperators"> Network Operators in the Area </h2>
</section>
<!-- Connectivity :: Cellular & Data :: Data Settings -->
- <section role="region" hidden id="carrier-dataSettings">
+ <section role="region" id="carrier-dataSettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -616,7 +616,7 @@ <h2 data-l10n-id="advancedSettings"> Advanced Settings </h2>
</section>
<!-- Connectivity :: Cellular & Data :: MMS Settings -->
- <section role="region" hidden id="carrier-mmsSettings">
+ <section role="region" id="carrier-mmsSettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -677,7 +677,7 @@ <h2 data-l10n-id="advancedSettings"> Advanced Settings </h2>
</section>
<!-- Connectivity :: Cellular & Data :: A-GPS Settings -->
- <section role="region" hidden id="carrier-suplSettings">
+ <section role="region" id="carrier-suplSettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -726,7 +726,7 @@ <h2 data-l10n-id="advancedSettings"> Advanced Settings </h2>
</section>
<!-- Connectivity :: Cellular & Data -->
- <section role="region" hidden id="carrier">
+ <section role="region" id="carrier">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -798,7 +798,7 @@ <h2 data-l10n-id="advancedSettings"> Advanced Settings </h2>
</section>
<!-- Connectivity :: Bluetooth -->
- <section role="region" hidden id="bluetooth">
+ <section role="region" id="bluetooth">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -868,7 +868,7 @@ <h2 data-l10n-id="bluetooth-devices-in-area">Devices found</h2>
</section>
<!-- Connectivity :: Internet Sharing :: Portable Wi-Fi Hotspot -->
- <section role="region" hidden id="hotspot-wifiSettings">
+ <section role="region" id="hotspot-wifiSettings">
<!--
<header>
<button type="reset"><span data-l10n-id="back" class="icon icon-back">Back</span></button>
@@ -901,7 +901,7 @@ <h1 data-l10n-id="hotspotSettings"> Hotspot Settings </h1>
</section>
<!-- Connectivity :: Internet Sharing -->
- <section role="region" hidden id="hotspot">
+ <section role="region" id="hotspot">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -966,7 +966,7 @@ <h2 data-l10n-id="internetSharing-usb"> USB </h2>
</section>
<!-- Personalization :: Sound :: Sound Selection -->
- <section role="region" hidden id="sound-selection">
+ <section role="region" id="sound-selection">
<!--
<header>
<button type="reset">
@@ -995,7 +995,7 @@ <h2 data-l10n-id="alert-tones">Alert Tones</h2>
</section>
<!-- Personalization :: Sound -->
- <section role="region" hidden id="sound">
+ <section role="region" id="sound">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1075,7 +1075,7 @@ <h2 data-l10n-id="other-sounds">Other Sounds</h2>
</section>
<!-- Personalization :: Display -->
- <section role="region" hidden id="display">
+ <section role="region" id="display">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1123,7 +1123,7 @@ <h2 data-l10n-id="brightness">Brightness</h2>
</section>
<!-- Personalization :: Notifications -->
- <section role="region" hidden id="notifications">
+ <section role="region" id="notifications">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1157,7 +1157,7 @@ <h1 data-l10n-id="notifications"> Notifications </h1>
</section>
<!-- Personalization :: Date & Time -->
- <section role="region" hidden id="dateTime">
+ <section role="region" id="dateTime">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1216,7 +1216,7 @@ <h2 data-l10n-id="timezoneMessage">Time zone</h2>
<!-- Personalization :: Language & Region -->
<!-- We should remove 'hidden' on the region selector and set
- data-l10n-id to languageAndRegion after being implemented in v2. -->
- <section role="region" hidden id="languages">
+ <section role="region" id="languages">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1255,7 +1255,7 @@ <h1 data-l10n-id="language"> Language </h1>
</section>
<!-- Personalization :: Keyboard -->
- <section role="region" hidden id="keyboard">
+ <section role="region" id="keyboard">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1360,7 +1360,7 @@ <h2 data-l10n-id="keyboardLayouts">Layouts</h2>
</section>
<!-- Security :: Phone Lock :: PIN Input -->
- <section role="region" hidden id="phoneLock-passcode">
+ <section role="region" id="phoneLock-passcode">
<!--
<header>
<a href="#phoneLock"><span class="icon icon-back">back</span></a>
@@ -1401,7 +1401,7 @@ <h1 data-l10n-id="enter-passcode" data-mode="confirm"> Enter Passcode </h1>
</section>
<!-- Security :: Phone Lock -->
- <section role="region" hidden id="phoneLock" data-passcode-enabled="false" data-lockscreen-enabled="false">
+ <section role="region" id="phoneLock" data-passcode-enabled="false" data-lockscreen-enabled="false">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1446,7 +1446,7 @@ <h1 data-l10n-id="phoneLock"> Phone Lock </h1>
</section>
<!-- Security :: SIM Security :: SIM PIN Input -->
- <section role="region" hidden id="simpin-dialog">
+ <section role="region" id="simpin-dialog">
<!--
<header>
<button type="reset">
@@ -1504,7 +1504,7 @@ <h1 data-l10n-id="phoneLock"> Phone Lock </h1>
</section>
<!-- Security :: SIM Security -->
- <section role="region" hidden id="simpin">
+ <section role="region" id="simpin">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1547,7 +1547,7 @@ <h1 data-l10n-id="simSecurity"> SIM Security </h1>
</section>
<!-- Security :: Application Permissions :: Details -->
- <section role="region" hidden id="appPermissions-details">
+ <section role="region" id="appPermissions-details">
<!--
<header>
<a href="#appPermissions"><span class="icon icon-back">back</span></a>
@@ -1578,7 +1578,7 @@ <h2 data-l10n-id="uninstallApp">Uninstall App</h2>
</section>
<!-- Security :: Application Permissions -->
- <section role="region" hidden id="appPermissions">
+ <section role="region" id="appPermissions">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1595,7 +1595,7 @@ <h1 data-l10n-id="appPermissions">
</section>
<!-- Security :: Do Not Track -->
- <section role="region" hidden id="doNotTrack">
+ <section role="region" id="doNotTrack">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -1632,7 +1632,7 @@ <h1 data-l10n-id="doNotTrack"> Do Not Track </h1>
</section>
<!-- Device :: Information :: More Information :: Developer -->
- <section role="region" hidden id="about-moreInfo-developer">
+ <section role="region" id="about-moreInfo-developer">
<!--
<header>
<button type="reset">
@@ -1733,7 +1733,7 @@ <h2 data-l10n-id="keyboardLayouts">Keyboard Layouts</h2>
</section>
<!-- Device :: Information :: More Information -->
- <section role="region" hidden id="about-moreInfo">
+ <section role="region" id="about-moreInfo">
<!--
<header>
<button type="reset">
@@ -1813,7 +1813,7 @@ <h2 data-l10n-id="devSettings"> Developer Settings </h2>
</section>
<!-- Device :: Information :: Your Rights -->
- <section role="region" hidden id="about-yourRights">
+ <section role="region" id="about-yourRights">
<!--
<header>
<button type="reset">
@@ -1853,7 +1853,7 @@ <h1 data-l10n-id="your-rights"> Your Rights </h1>
</section>
<!-- Device :: Information :: Your Privacy -->
- <section role="region" hidden id="about-yourPrivacy">
+ <section role="region" id="about-yourPrivacy">
<!--
<header>
<button type="reset">
@@ -1885,7 +1885,7 @@ <h2 data-l10n-id="about-other"> Other </h2>
</section>
<!-- Device :: Information :: Legal :: Open Source Notices -->
- <section role="region" hidden id="about-licensing">
+ <section role="region" id="about-licensing">
<!--
<header>
<a href="#about-legal">
@@ -1895,12 +1895,12 @@ <h1 data-l10n-id="open-source-notices">
Open Source Notices
</h1>
</header>
- <iframe src="resources/open_source_license.html" id="os-license"></iframe>
+ <iframe data-src="resources/open_source_license.html" id="os-license"></iframe>
-->
</section>
<!-- Device :: Information :: Legal -->
- <section role="region" hidden id="about-legal">
+ <section role="region" id="about-legal">
<!--
<header>
<a href="#about">
@@ -1927,7 +1927,7 @@ <h2 data-l10n-id="about-other"> Other </h2>
</section>
<!-- Device :: Information -->
- <section role="region" hidden id="about">
+ <section role="region" id="about">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -2017,7 +2017,7 @@ <h2 data-l10n-id="aboutBrowserOS"> About Browser OS </h2>
</section>
<!-- Device :: Battery -->
- <section role="region" hidden id="battery">
+ <section role="region" id="battery">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -2062,7 +2062,7 @@ <h2 data-l10n-id="powerSaveMode">Power Save Mode</h2>
</section>
<!-- Device :: Device Storage -->
- <section role="region" hidden id="deviceStorage">
+ <section role="region" id="deviceStorage">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -2101,7 +2101,7 @@ <h2 data-l10n-id="appStorage">Application Storage</h2>
</section>
<!-- Device :: Media Storage -->
- <section role="region" hidden id="mediaStorage">
+ <section role="region" id="mediaStorage">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -2147,7 +2147,7 @@ <h2 data-l10n-id="advanced">Advanced</h2>
</section>
<!-- Device :: Accessibility -->
- <section role="region" hidden id="accessibility">
+ <section role="region" id="accessibility">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -2174,7 +2174,7 @@ <h1 data-l10n-id="accessibility"> Accessibility </h1>
</section>
<!-- Device :: Improve Browser OS :: Crash Reports-->
- <section role="region" hidden id="crashReports">
+ <section role="region" id="crashReports">
<!--
<header>
<a href="#improveBrowserOS"><span class="icon icon-back">back</span></a>
@@ -2194,7 +2194,7 @@ <h1 data-l10n-id="crashReports"> Crash Reports </h1>
</section>
<!-- Device :: Improve Browser OS -->
- <section role="region" hidden id="improveBrowserOS">
+ <section role="region" id="improveBrowserOS">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -2269,7 +2269,7 @@ <h2 data-l10n-id="crashReports">Crash Reports</h2>
</section>
<!-- Device :: Help -->
- <section role="region" hidden id="help">
+ <section role="region" id="help">
<!--
<header>
<a href="#root"><span class="icon icon-back">back</span></a>
@@ -2298,7 +2298,7 @@ <h1 data-l10n-id="help"></h1>
</section>
<!-- SIM Toolkit -->
- <section role="region" hidden id="icc">
+ <section role="region" id="icc">
<!--
<header>
<button id="icc-stk-app-back" class="hidden">
View
20 apps/settings/js/settings.js
@@ -433,16 +433,6 @@ window.addEventListener('load', function loadSettings() {
window.removeEventListener('load', loadSettings);
window.addEventListener('change', Settings);
- var isInTransition = false;
- // Bug 823862 - Tapping multiple times results in white screen. There is
- // likely an underlying issue that could be the same root cause as bug
- // 825622. Let's workaround it (sigh) for now (welcome deadlines)!
- window.addEventListener('mousedown', function checkIfIsTransition() {
- if (isInTransition)
- return;
- evt.preventDefault();
- });
-
Settings.init();
handleDataConnectivity();
@@ -521,13 +511,10 @@ window.addEventListener('load', function loadSettings() {
// load panel (+ dependencies) if necessary -- this should be synchronous
lazyLoad(newPanel);
- newPanel.hidden = false;
// switch previous/current classes -- the timeout is required to make the
// transition smooth after lazy-loading a panel
setTimeout(function switchPanel() {
- isInTransition = true;
-
oldPanel.className = newPanel.className ? '' : 'previous';
newPanel.className = 'current';
oldHash = hash;
@@ -556,8 +543,11 @@ window.addEventListener('load', function loadSettings() {
oldPanel.addEventListener('transitionend', function onTransitionEnd() {
oldPanel.removeEventListener('transitionend', onTransitionEnd);
- oldPanel.hidden = true;
- isInTransition = false;
+ // Workaround for bug 825622, remove when fixed
+ if (newPanel.id == 'about-licensing') {
+ var iframe = document.getElementById('os-license');
+ iframe.src = iframe.dataset.src;
+ }
});
});
}
Please sign in to comment.
Something went wrong with that request. Please try again.