Merge pull request #32486 from justindarc/bug1215293

Bug 1215293 - Music close icon next to search box would not close or …
mozilla-b2g · Oct 16, 2015 · badac95 · badac95
2 parents 7ff6fda + 1c9a6ed
commit badac95
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/apps/music/views/home/view.css b/apps/music/views/home/view.css
@@ -6,6 +6,10 @@ body[data-search="true"] {
   overflow: hidden;
 }
 
+#tiles {
+  min-height: 100%;
+}
+
 .tile {
   border-bottom: solid 1px var(--background);
   box-sizing: border-box;

diff --git a/apps/music/views/home/view.js b/apps/music/views/home/view.js
@@ -19,7 +19,8 @@ var HomeView = View.extend(function HomeView() {
 
   this.searchResults.addEventListener('close', () => {
     this.client.method('searchClose');
-    document.body.removeAttribute('data-search');
+    document.body.dataset.search = false;
+    window.scrollTo(0, this.searchBox.HEIGHT);
   });
 
   this.searchResults.addEventListener('resultclick', (evt) => {
@@ -35,6 +36,8 @@ var HomeView = View.extend(function HomeView() {
 
   this.searchResults.getItemImageSrc = (item) => this.getThumbnail(item.name);
 
+  window.scrollTo(0, this.searchBox.HEIGHT);
+
   this.tiles.addEventListener('click', (evt) => {
     var link = evt.target.closest('a[data-file-path]');
     if (link) {