From f2a498a5dde7a9f5b411b7f3fd46240121db63ce Mon Sep 17 00:00:00 2001 From: ccd0 Date: Thu, 5 Feb 2015 22:21:35 -0800 Subject: [PATCH] Merge from Appchan X: src/General/UI.coffee (The UI.checkbox changes were merged in previous commit e1b63d4a9965aaa5d63e15fd84788921a53def72.) --- src/General/UI.coffee | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/General/UI.coffee b/src/General/UI.coffee index b58f27fbe..8ef668b64 100755 --- a/src/General/UI.coffee +++ b/src/General/UI.coffee @@ -65,8 +65,7 @@ UI = do -> $.addClass lastToggledButton, 'active' - $.on d, 'click', @close - $.on d, 'CloseMenu', @close + $.one d, 'click scroll CloseMenu', @close $.add button, menu # Position @@ -121,7 +120,6 @@ UI = do -> $.rmClass lastToggledButton, 'active' currentMenu = null lastToggledButton = null - $.off d, 'click CloseMenu', @close findNextEntry: (entry, direction) -> entries = [entry.parentNode.children...] @@ -162,6 +160,7 @@ UI = do -> onFocus: (e) => e.stopPropagation() @focus e.target + focus: (entry) -> while focused = $.x 'parent::*/child::*[contains(@class,"focused")]', entry $.rmClass focused, 'focused' @@ -376,7 +375,6 @@ UI = do -> $.add label, [input, $.tn " #{text}"] label - return { dialog: dialog Menu: Menu