Bug 1001210 - Hide start page before showing task manager r=kgrandon

mozilla-b2g · Apr 25, 2014 · eaaa33b · eaaa33b
1 parent f4c81a9
commit eaaa33b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/apps/system/js/rocketbar.js b/apps/system/js/rocketbar.js
@@ -342,6 +342,11 @@ var Rocketbar = {
    */
   showTaskManager: function() {
     this.cardView = true;
+    if (this._port) {
+      this._port.postMessage({
+        action: 'showTaskManager'
+      });
+    }
     this.showResults();
     window.dispatchEvent(new CustomEvent('taskmanagershow'));
     this.clear();
@@ -502,7 +507,8 @@ var Rocketbar = {
           !this.onHomescreen) {
           this.collapse();
         }
-        if (dy > this.TASK_MANAGER_THRESHOLD && !this.active) {
+        if (dy > this.TASK_MANAGER_THRESHOLD &&
+            !this.active && !this.cardView) {
           this.showTaskManager();
         }
         break;