Bug 816829 Clicking on awesome screen search results replaces browser…

… app with target page
marshall · Nov 30, 2012 · 3e9f708 · 3e9f708
1 parent 9e567b0
commit 3e9f708
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/apps/browser/index.html b/apps/browser/index.html
@@ -65,14 +65,16 @@ <h2 data-l10n-id="top-sites">Top Sites</h2>
               </li>
             </ul>
           </nav>
-          <section id="top-sites" role="tabpanel" class="selected">
-          </section>
-          <section id="bookmarks" role="tabpanel">
-          </section>
-          <section id="history" role="tabpanel">
-          </section>
-          <section id="results">
-          </section>
+          <div id="tab-panels">
+            <section id="top-sites" role="tabpanel" class="selected">
+            </section>
+            <section id="bookmarks" role="tabpanel">
+            </section>
+            <section id="history" role="tabpanel">
+            </section>
+            <section id="results">
+            </section>
+          </div>
         </div>
 
         <div id="crashscreen">

diff --git a/apps/browser/js/browser.js b/apps/browser/js/browser.js
@@ -63,9 +63,7 @@ var Browser = {
     this.urlInput.addEventListener('mouseup', this.urlMouseUp.bind(this));
     this.urlInput.addEventListener('keyup',
       this.handleUrlInputKeypress.bind(this));
-    this.topSites.addEventListener('click', this.followLink.bind(this));
-    this.bookmarks.addEventListener('click', this.followLink.bind(this));
-    this.history.addEventListener('click', this.followLink.bind(this));
+    this.tabPanels.addEventListener('click', this.followLink.bind(this));
     this.urlButton.addEventListener('click',
       this.handleUrlFormSubmit.bind(this));
     this.tabsBadge.addEventListener('click',
@@ -169,7 +167,7 @@ var Browser = {
       'bookmark-entry-sheet-done', 'bookmark-title', 'bookmark-url',
       'bookmark-previous-url', 'bookmark-menu-add-home', 'new-tab-button',
       'awesomescreen-cancel-button', 'startscreen', 'top-site-thumbnails',
-      'no-top-sites', 'clear-private-data-button', 'results'];
+      'no-top-sites', 'clear-private-data-button', 'results', 'tab-panels'];
 
     // Loop and add element with camel style name to Modal Dialog attribute.
     elementIDs.forEach(function createElementRef(name) {