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

Bug 827288 - Pressing home to exit activity picker gets device into bust... #7353

Merged
merged 1 commit into from Jan 8, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 14 additions & 10 deletions apps/system/js/list_menu.js
Expand Up @@ -124,12 +124,15 @@ var ListMenu = {
return;

var self = this;
this.container.addEventListener('transitionend',
function onTransitionEnd() {
self.element.classList.remove('visible');
self.container.removeEventListener('transitionend', onTransitionEnd);
});
this.container.classList.add('slidedown');
var container = this.container;
container.addEventListener('transitionend', function list_hide() {
container.removeEventListener('transitionend', list_hide);
self.element.classList.remove('visible');
});

setTimeout(function() {
container.classList.add('slidedown');
});
},

handleEvent: function lm_handleEvent(evt) {
Expand Down Expand Up @@ -162,10 +165,11 @@ var ListMenu = {
break;

case 'home':
if (this.visible) {
this.hide();
this.oncancel();
}
if (!this.visible)
return;

this.hide();
this.oncancel();
break;
}
}
Expand Down
7 changes: 2 additions & 5 deletions apps/system/style/list_menu/list_menu.css
Expand Up @@ -6,7 +6,8 @@
visibility: visible;
}

#listmenu menu {
#listmenu menu,
#listmenu.visible menu.slidedown {
transition: transform 0.3s ease;
transform: translateY(100%);
}
Expand All @@ -15,10 +16,6 @@
transform: translateY(0);
}

#listmenu menu.slidedown {
transform: translateY(100%);
}

#listmenu menu button.icon,
#listmenu menu a[role="button"].icon {
background-repeat: no-repeat;
Expand Down