0x2620/pandora_bakma
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix home

Browse source
This commit is contained in:
j 2014-10-23 12:50:41 +01:00
parent 75677ea07e
commit be410bc450
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
static/js/home.bakma.js
View file

@ -97,9 +97,11 @@ pandora.ui.home = function() {
margin: '0 auto 0 auto', margin: '0 auto 0 auto',
opacity: 0 opacity: 0
}) })
.click(function(e) { .on({
click: function(e) {
// fixme: why? // fixme: why?
e.stopPropagation(); e.stopPropagation();
}
}) })
.bindEvent({ .bindEvent({
submit: function(data) { submit: function(data) {
@ -533,12 +535,8 @@ pandora.ui.home = function() {
.appendTo($featureBox[i]); .appendTo($featureBox[i]);
}); });
self.keydown = function(e) { self.keydown = function(e) {
var focused = Ox.Focus.focused(), var key = Ox.KEYS[e.keyCode];
key = Ox.KEYS[e.keyCode]; if (!Ox.Focus.focusedElementIsInput()) {
if (
focused === null
|| !Ox.UI.elements[focused].hasClass('OxInput')
) {
if (key == 'left' && selected > 0) { if (key == 'left' && selected > 0) {
selectItem(selected - 1); selectItem(selected - 1);
} else if (key == 'up' && selected > 0) { } else if (key == 'up' && selected > 0) {
@ -667,7 +665,7 @@ pandora.ui.home = function() {
} }
that.fadeInScreen = function() { that.fadeInScreen = function() {
that.appendTo(Ox.UI.$body).animate({opacity: 1}, 500, function() { that.appendTo(Ox.$body).animate({opacity: 1}, 500, function() {
that.find('*').animate({opacity: 1}, 250, function() { that.find('*').animate({opacity: 1}, 250, function() {
$findInput.focusInput(true); $findInput.focusInput(true);
showFeatures(); showFeatures();
@ -689,7 +687,7 @@ pandora.ui.home = function() {
that.showScreen = function(callback) { that.showScreen = function(callback) {
var $elements = that.find('*'), count = 0; var $elements = that.find('*'), count = 0;
$box.css({top: window.innerHeight / 2 - 80 + 'px'}); $box.css({top: window.innerHeight / 2 - 80 + 'px'});
that.css({opacity: 1}).appendTo(Ox.UI.$body); that.css({opacity: 1}).appendTo(Ox.$body);
$findInput.focusInput(true); $findInput.focusInput(true);
$box.animate({top: '80px'}, 500, function() { $box.animate({top: '80px'}, 500, function() {
$elements.animate({opacity: 1}, 250, function() { $elements.animate({opacity: 1}, 250, function() {