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