Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:vogievetsky/DVL
  • Loading branch information
vogievetsky committed Nov 20, 2013
2 parents 1694446 + e4fb18c commit f0cedad
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -30,6 +30,6 @@
"d3": "~3.2.7"
},
"scripts": {
"test": "./test"
"test": "./test-run"
}
}
6 changes: 5 additions & 1 deletion src/html.coffee
Expand Up @@ -482,7 +482,11 @@ dvl.html.combobox = ({parent, classStr, data, label, selectionLabel, link, class
return if $(menuCont.node()).find(target).length

if divCont.node() is target or $(divCont.node()).find(target).length
menuOpen.value(not menuOpen.value())
# only open the menu if the current state is closed or if the
# activeElement isn't the input text box for this combobox
togMenuOpen = not menuOpen.value()
if (togMenuOpen or valueOut.node().id isnt document.activeElement?.id)
menuOpen.value(not menuOpen.value())
else
menuOpen.value(false)

Expand Down

0 comments on commit f0cedad

Please sign in to comment.