Merge pull request #30706 from shamenchens/Bug1168256-MusicSearchInTi…

…le-v22 Bug 1168256 - Fix search during scanning music in tile/list view
mozilla-b2g · Jun 30, 2015 · 15e415e · 15e415e
2 parents b39d4f5 + 934c941
commit 15e415e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/apps/music/js/ui/views/list_view.js b/apps/music/js/ui/views/list_view.js
@@ -76,7 +76,8 @@ var ListView = {
   hideSearch: function lv_hideSearch() {
     this.searchInput.value = '';
     // XXX: we probably want to animate this...
-    if (this.view.scrollTop < this.searchBox.offsetHeight) {
+    if (this.view.scrollTop < this.searchBox.offsetHeight &&
+        ModeManager.currentMode !== MODE_SEARCH_FROM_LIST) {
       this.view.scrollTop = this.searchBox.offsetHeight;
     }
   },

diff --git a/apps/music/js/ui/views/tiles_view.js b/apps/music/js/ui/views/tiles_view.js
@@ -57,7 +57,8 @@ var TilesView = {
   hideSearch: function tv_hideSearch() {
     this.searchInput.value = '';
     // XXX: we probably want to animate this...
-    if (this.view.scrollTop < this.searchBox.offsetHeight) {
+    if (this.view.scrollTop < this.searchBox.offsetHeight &&
+        ModeManager.currentMode !== MODE_SEARCH_FROM_TILES) {
       this.view.scrollTop = this.searchBox.offsetHeight;
     }
   },
@@ -147,7 +148,7 @@ var TilesView = {
     if (!result.metadata.picture) {
       container.appendChild(titleBar);
     } else {
-      container.setAttribute('aria-label', artistName.textContent + ' ' + 
+      container.setAttribute('aria-label', artistName.textContent + ' ' +
                                            albumName.textContent);
     }