Commit a7b49a7d authored by Jacob Thornton's avatar Jacob Thornton

nearly everything working with activedescendant... then decide it's wrong.

parent 10c6db4b
...@@ -2355,12 +2355,17 @@ table .span24 { ...@@ -2355,12 +2355,17 @@ table .span24 {
margin-left: 2px; margin-left: 2px;
} }
.dropdown:hover .caret, .dropdown a:focus .caret,
.dropdown a:hover .caret,
.open .caret { .open .caret {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
} }
.navbar .nav .open > a {
color: #ffffff;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
...@@ -2415,12 +2420,19 @@ table .span24 { ...@@ -2415,12 +2420,19 @@ table .span24 {
.dropdown-menu li > a:hover, .dropdown-menu li > a:hover,
.dropdown-menu .active > a, .dropdown-menu .active > a,
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover,
.dropdown-menu:hover #aria-active > a:hover,
.dropdown-menu #aria-active > a {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
background-color: #0088cc; background-color: #0088cc;
} }
.dropdown-menu:hover #aria-active > a {
color: #333333;
background-color: #ffffff;
}
.open { .open {
*z-index: 1000; *z-index: 1000;
} }
...@@ -3779,6 +3791,7 @@ input[type="submit"].btn.btn-mini { ...@@ -3779,6 +3791,7 @@ input[type="submit"].btn.btn-mini {
margin: 0; margin: 0;
} }
.navbar .nav > li > a:focus,
.navbar .nav > li > a:hover { .navbar .nav > li > a:hover {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
...@@ -3786,7 +3799,8 @@ input[type="submit"].btn.btn-mini { ...@@ -3786,7 +3799,8 @@ input[type="submit"].btn.btn-mini {
} }
.navbar .nav .active > a, .navbar .nav .active > a,
.navbar .nav .active > a:hover { .navbar .nav .active > a:hover,
.navbar .nav .active > a:focus {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
background-color: #222222; background-color: #222222;
...@@ -3916,6 +3930,7 @@ input[type="submit"].btn.btn-mini { ...@@ -3916,6 +3930,7 @@ input[type="submit"].btn.btn-mini {
background-color: transparent; background-color: transparent;
} }
.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
.navbar .nav li.dropdown.active > .dropdown-toggle:hover { .navbar .nav li.dropdown.active > .dropdown-toggle:hover {
color: #ffffff; color: #ffffff;
} }
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* ========================= */ * ========================= */
var toggle = '[data-toggle="dropdown"]' var toggle = '[data-toggle="dropdown"]'
, active = 'aria-active'
, Dropdown = function (element) { , Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle) var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () { $('html').on('click.dropdown.data-api', function () {
...@@ -41,34 +42,87 @@ ...@@ -41,34 +42,87 @@
, toggle: function (e) { , toggle: function (e) {
var $this = $(this) var $this = $(this)
, $parent , $parent
, selector
, isActive , isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
selector = $this.attr('data-target') $parent = getParent($this)
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
isActive = $parent.hasClass('open') isActive = $parent.hasClass('open')
clearMenus() clearMenus()
if (!isActive) $parent.toggleClass('open') if (!isActive) {
$parent.toggleClass('open')
$this.focus()
}
return false return false
} }
, keydown: function (e) {
var $this = $(this)
, $items
, $active
, $parent
, index
if (e.keyCode == 27) return $this.click()
if (!/(38|40|13)/.test(e.keyCode)) return
e.preventDefault()
e.stopPropagation()
if ($this.is('.disabled, :disabled')) return
$parent = getParent($this)
$parent.hasClass('open') || $this.click()
$items = $('[role=menu] li:not(.divider)', $parent)
if (!$items.length) return
index = $items.index($items.filter('#' + active))
$items
.eq(index)
.attr('id', '')
if (e.keyCode == 38 && index > 0) index-- // up
else if (e.keyCode == 40 && index < $items.length - 1) index++ // down
else if (e.keyCode == 13 && ~index) return $items.eq(index).find('a').click() // enter
if (!~index) index = 0
$items
.eq(index)
.attr('id', active)
}
} }
function clearMenus() { function clearMenus() {
$(toggle).parent().removeClass('open') getParent($(toggle))
.removeClass('open')
.find('#' + active)
.attr('id', '')
}
function getParent($this) {
var selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
return $parent
} }
...@@ -91,10 +145,12 @@ ...@@ -91,10 +145,12 @@
* =================================== */ * =================================== */
$(function () { $(function () {
$('html').on('click.dropdown.data-api', clearMenus) $('html')
.on('click.dropdown.data-api', clearMenus)
$('body') $('body')
.on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle, Dropdown.prototype.keydown)
}) })
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
...@@ -595,6 +595,7 @@ ...@@ -595,6 +595,7 @@
* ========================= */ * ========================= */
var toggle = '[data-toggle="dropdown"]' var toggle = '[data-toggle="dropdown"]'
, active = 'aria-active'
, Dropdown = function (element) { , Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle) var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () { $('html').on('click.dropdown.data-api', function () {
...@@ -609,34 +610,87 @@ ...@@ -609,34 +610,87 @@
, toggle: function (e) { , toggle: function (e) {
var $this = $(this) var $this = $(this)
, $parent , $parent
, selector
, isActive , isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
selector = $this.attr('data-target') $parent = getParent($this)
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
isActive = $parent.hasClass('open') isActive = $parent.hasClass('open')
clearMenus() clearMenus()
if (!isActive) $parent.toggleClass('open') if (!isActive) {
$parent.toggleClass('open')
$this.focus()
}
return false return false
} }
, keydown: function (e) {
var $this = $(this)
, $items
, $active
, $parent
, index
if (e.keyCode == 27) return $this.click()
if (!/(38|40|13)/.test(e.keyCode)) return
e.preventDefault()
e.stopPropagation()
if ($this.is('.disabled, :disabled')) return
$parent = getParent($this)
$parent.hasClass('open') || $this.click()
$items = $('[role=menu] li:not(.divider)', $parent)
if (!$items.length) return
index = $items.index($items.filter('#' + active))
$items
.eq(index)
.attr('id', '')
if (e.keyCode == 38 && index > 0) index-- // up
else if (e.keyCode == 40 && index < $items.length - 1) index++ // down
else if (e.keyCode == 13 && ~index) return $items.eq(index).find('a').click() // enter
if (!~index) index = 0
$items
.eq(index)
.attr('id', active)
}
} }
function clearMenus() { function clearMenus() {
$(toggle).parent().removeClass('open') getParent($(toggle))
.removeClass('open')
.find('#' + active)
.attr('id', '')
}
function getParent($this) {
var selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
return $parent
} }
...@@ -659,10 +713,12 @@ ...@@ -659,10 +713,12 @@
* =================================== */ * =================================== */
$(function () { $(function () {
$('html').on('click.dropdown.data-api', clearMenus) $('html')
.on('click.dropdown.data-api', clearMenus)
$('body') $('body')
.on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle, Dropdown.prototype.keydown)
}) })
}(window.jQuery);/* ========================================================= }(window.jQuery);/* =========================================================
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"laxbreak" : true, "laxbreak" : true,
"browser" : true, "browser" : true,
"debug" : true, "debug" : true,
"devel" : true,
"boss" : true, "boss" : true,
"expr" : true, "expr" : true,
"asi" : true "asi" : true
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* ========================= */ * ========================= */
var toggle = '[data-toggle="dropdown"]' var toggle = '[data-toggle="dropdown"]'
, active = 'aria-active'
, Dropdown = function (element) { , Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle) var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () { $('html').on('click.dropdown.data-api', function () {
...@@ -41,34 +42,87 @@ ...@@ -41,34 +42,87 @@
, toggle: function (e) { , toggle: function (e) {
var $this = $(this) var $this = $(this)
, $parent , $parent
, selector
, isActive , isActive
if ($this.is('.disabled, :disabled')) return if ($this.is('.disabled, :disabled')) return
selector = $this.attr('data-target') $parent = getParent($this)
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
isActive = $parent.hasClass('open') isActive = $parent.hasClass('open')
clearMenus() clearMenus()
if (!isActive) $parent.toggleClass('open') if (!isActive) {
$parent.toggleClass('open')
$this.focus()
}
return false return false
} }
, keydown: function (e) {
var $this = $(this)
, $items
, $active
, $parent
, index
if (e.keyCode == 27) return $this.click()
if (!/(38|40|13)/.test(e.keyCode)) return
e.preventDefault()
e.stopPropagation()
if ($this.is('.disabled, :disabled')) return
$parent = getParent($this)
$parent.hasClass('open') || $this.click()
$items = $('[role=menu] li:not(.divider)', $parent)
if (!$items.length) return
index = $items.index($items.filter('#' + active))
$items
.eq(index)
.attr('id', '')
if (e.keyCode == 38 && index > 0) index-- // up
else if (e.keyCode == 40 && index < $items.length - 1) index++ // down
else if (e.keyCode == 13 && ~index) return $items.eq(index).find('a').click() // enter
if (!~index) index = 0
$items
.eq(index)
.attr('id', active)
}
} }
function clearMenus() { function clearMenus() {
$(toggle).parent().removeClass('open') getParent($(toggle))
.removeClass('open')
.find('#' + active)
.attr('id', '')
}
function getParent($this) {
var selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
return $parent
} }
...@@ -91,10 +145,12 @@ ...@@ -91,10 +145,12 @@
* =================================== */ * =================================== */
$(function () { $(function () {
$('html').on('click.dropdown.data-api', clearMenus) $('html')
.on('click.dropdown.data-api', clearMenus)
$('body') $('body')
.on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle, Dropdown.prototype.keydown)
}) })
}(window.jQuery); }(window.jQuery);
\ No newline at end of file
...@@ -34,11 +34,16 @@ ...@@ -34,11 +34,16 @@
margin-top: 8px; margin-top: 8px;
margin-left: 2px; margin-left: 2px;
} }
.dropdown:hover .caret, .dropdown a:focus .caret,
.dropdown a:hover .caret,
.open .caret { .open .caret {
.opacity(100); .opacity(100);
} }
.navbar .nav .open > a {
color: @navbarLinkColorActive;
}
// The dropdown menu (ul) // The dropdown menu (ul)
// ---------------------- // ----------------------
.dropdown-menu { .dropdown-menu {
...@@ -90,11 +95,17 @@ ...@@ -90,11 +95,17 @@
// ----------- // -----------
.dropdown-menu li > a:hover, .dropdown-menu li > a:hover,
.dropdown-menu .active > a, .dropdown-menu .active > a,
.dropdown-menu .active > a:hover { .dropdown-menu .active > a:hover,
.dropdown-menu:hover #aria-active > a:hover,
.dropdown-menu #aria-active > a {
color: @dropdownLinkColorHover; color: @dropdownLinkColorHover;
text-decoration: none; text-decoration: none;
background-color: @dropdownLinkBackgroundHover; background-color: @dropdownLinkBackgroundHover;
} }
.dropdown-menu:hover #aria-active > a {
color: @dropdownLinkColor;
background-color: @dropdownBackground;
}
// Open state for the dropdown // Open state for the dropdown
// --------------------------- // ---------------------------
......
...@@ -228,6 +228,7 @@ ...@@ -228,6 +228,7 @@
padding: ((@navbarHeight - @elementHeight) / 2 - 1) 5px ((@navbarHeight - @elementHeight) / 2); padding: ((@navbarHeight - @elementHeight) / 2 - 1) 5px ((@navbarHeight - @elementHeight) / 2);
} }
// Hover // Hover
.navbar .nav > li > a:focus,
.navbar .nav > li > a:hover { .navbar .nav > li > a:hover {
background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
color: @navbarLinkColorHover; color: @navbarLinkColorHover;
...@@ -236,7 +237,8 @@ ...@@ -236,7 +237,8 @@
// Active nav items // Active nav items
.navbar .nav .active > a, .navbar .nav .active > a,
.navbar .nav .active > a:hover { .navbar .nav .active > a:hover,
.navbar .nav .active > a:focus {
color: @navbarLinkColorActive; color: @navbarLinkColorActive;
text-decoration: none; text-decoration: none;
background-color: @navbarLinkBackgroundActive; background-color: @navbarLinkBackgroundActive;
...@@ -343,6 +345,7 @@ ...@@ -343,6 +345,7 @@
} }
// Dropdown link on hover // Dropdown link on hover
.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
.navbar .nav li.dropdown.active > .dropdown-toggle:hover { .navbar .nav li.dropdown.active > .dropdown-toggle:hover {
color: @white; color: @white;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment