Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6839 from benfrancis/818645

Bug 818645 User is unable to scroll entries in the browser's Top Sites, Bookmarks, or History tabs
  • Loading branch information...
commit 389835adca88b093612707497f52f24cf437cba6 2 parents 6cd734d + d209dfa
@daleharvey daleharvey authored
View
4 apps/browser/index.html
@@ -72,9 +72,9 @@ <h2 data-l10n-id="top-sites">Top Sites</h2>
</section>
<section id="history" role="tabpanel">
</section>
- <section id="results">
- </section>
</div>
+ <section id="results" class="hidden">
+ </section>
</div>
<div id="crashscreen">
View
24 apps/browser/js/browser.js
@@ -64,6 +64,7 @@ var Browser = {
this.urlInput.addEventListener('keyup',
this.handleUrlInputKeypress.bind(this));
this.tabPanels.addEventListener('click', this.followLink.bind(this));
+ this.results.addEventListener('click', this.followLink.bind(this));
this.urlButton.addEventListener('click',
this.handleUrlFormSubmit.bind(this));
this.tabsBadge.addEventListener('click',
@@ -808,31 +809,14 @@ var Browser = {
this.bookmarksTab.classList.remove('selected');
this.history.classList.remove('selected');
this.historyTab.classList.remove('selected');
- this.results.classList.remove('selected');
- },
-
- showAwesomescreenTabs: function browser_showAwesomescreenTabs() {
- this.topSites.style.display = '';
- this.bookmarks.style.display = '';
- this.history.style.display = '';
- this.tabHeaders.style.display = '';
- },
-
- hideAwesomescreenTabs: function browser_hideAwesomescreenTabs() {
- this.topSites.style.display = 'none';
- this.bookmarks.style.display = 'none';
- this.history.style.display = 'none';
- this.tabHeaders.style.display = 'none';
},
updateAwesomeScreen: function browser_updateAwesomeScreen(filter) {
if (!filter) {
- this.showAwesomescreenTabs();
- this.results.classList.remove('selected');
+ this.results.classList.add('hidden');
filter = false;
} else {
- this.hideAwesomescreenTabs();
- this.results.classList.add('selected');
+ this.results.classList.remove('hidden');
}
Places.getTopSites(20, filter, this.showResults.bind(this));
},
@@ -1348,6 +1332,7 @@ var Browser = {
},
showAwesomeScreen: function browser_showAwesomeScreen() {
+ this.results.classList.add('hidden');
this.tabsBadge.innerHTML = '';
// Ensure the user cannot interact with the browser until the
// transition has ended, this will not be triggered unless the
@@ -1359,7 +1344,6 @@ var Browser = {
this.mainScreen.addEventListener('transitionend', pageShown, true);
this.switchScreen(this.AWESOME_SCREEN);
this.setUrlButtonMode(this.GO);
- this.showAwesomescreenTabs();
this.showTopSitesTab();
},
View
24 apps/browser/style/browser.css
@@ -603,6 +603,10 @@ nav[data-role="tabs"] {
height: 36px;
}
+#tab-panels {
+ height: 100%;
+}
+
ul[role="tablist"] {
margin: 0;
padding: 0;
@@ -642,7 +646,6 @@ li[role="tab"] a.selected {
background-origin: padding-box;
}
-#results,
section[role="tabpanel"] {
padding-top: 5px;
clear: both;
@@ -650,11 +653,26 @@ section[role="tabpanel"] {
display: none;
}
-#results.selected,
section[role="tabpanel"].selected {
display: block;
}
+#results {
+ padding-top: 5px;
+ background-color: #f3f4f8;
+ display: block;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+#results.hidden {
+ display: none;
+}
+
#awesomescreen h3 {
font-size: 0.9em;
margin: 0 10px;
@@ -735,7 +753,7 @@ li[role="listitem"] small {
}
#history, #bookmarks, #top-sites {
- height: -moz-calc(100% - 36px);
+ height: calc(100% - 36px);
overflow-y: auto;
overflow-x: hidden;
}
Please sign in to comment.
Something went wrong with that request. Please try again.