Merge pull request #60 from jostw/josyeh/Marketplace/master/Bug1258276

Bug 1258276 - [TV][2.5] Upgrade js-spatial-navigation to v0.3 and fix broken features
mozilla-b2g · Mar 21, 2016 · f8b5278 · f8b5278
2 parents b8629e1 + bcfc7f9
commit f8b5278
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -12,7 +12,7 @@
         "underscore": "1.4.4",
 
         "normalize.css": "~3.0.3",
-        "js-spatial-navigation": "git://github.com/luke-chang/js-spatial-navigation.git"
+        "js-spatial-navigation": "luke-chang/js-spatial-navigation#v0.3"
     },
     "ignore": [
         "*.py",

diff --git a/src/media/css/app-list.styl b/src/media/css/app-list.styl
@@ -139,7 +139,7 @@
     }
 
     // chrome only
-    &:not(*:root) {
+    @supports (-webkit-appearance:none) {
         outline-color: $main-background-color;
     }
 }
diff --git a/src/media/js/views/homepage.js b/src/media/js/views/homepage.js
@@ -75,15 +75,17 @@ define('views/homepage',
         });
     });
 
-    z.page.on('sn:willfocus', '.app-button', function() {
-        SpatialNavigation.pause();
+    z.page.on('sn:willfocus', '.app-button', function(e) {
+        if (e.originalEvent.detail.previousElement) {
+            SpatialNavigation.pause();
 
-        scrollToApp.call(this, function() {
-            SpatialNavigation.focus(this);
-            SpatialNavigation.resume();
-        });
+            scrollToApp.call(this, function() {
+                SpatialNavigation.focus(this);
+                SpatialNavigation.resume();
+            });
 
-        return false;
+            return false;
+        }
     });
 
     z.page.on('focus', '.app-button', function(e) {