Skip to content
This repository was archived by the owner on Nov 3, 2021. It is now read-only.

Commit f8b5278

Browse files
committed
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
2 parents b8629e1 + bcfc7f9 commit f8b5278

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"underscore": "1.4.4",
1313

1414
"normalize.css": "~3.0.3",
15-
"js-spatial-navigation": "git://github.com/luke-chang/js-spatial-navigation.git"
15+
"js-spatial-navigation": "luke-chang/js-spatial-navigation#v0.3"
1616
},
1717
"ignore": [
1818
"*.py",

src/media/css/app-list.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
}
140140

141141
// chrome only
142-
&:not(*:root) {
142+
@supports (-webkit-appearance:none) {
143143
outline-color: $main-background-color;
144144
}
145145
}

src/media/js/views/homepage.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,17 @@ define('views/homepage',
7575
});
7676
});
7777

78-
z.page.on('sn:willfocus', '.app-button', function() {
79-
SpatialNavigation.pause();
78+
z.page.on('sn:willfocus', '.app-button', function(e) {
79+
if (e.originalEvent.detail.previousElement) {
80+
SpatialNavigation.pause();
8081

81-
scrollToApp.call(this, function() {
82-
SpatialNavigation.focus(this);
83-
SpatialNavigation.resume();
84-
});
82+
scrollToApp.call(this, function() {
83+
SpatialNavigation.focus(this);
84+
SpatialNavigation.resume();
85+
});
8586

86-
return false;
87+
return false;
88+
}
8789
});
8890

8991
z.page.on('focus', '.app-button', function(e) {

0 commit comments

Comments
 (0)