Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a tag instead of abbr tag for search-choice-close #2726

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

use a tag instead of abbr tag for search-choice-close #2726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1eec4b1
use a tag instead of abbr tag for search-choice-close
koenpunt Oct 15, 2016
8d1d503
target correct element for backspace delete
koenpunt Oct 18, 2016
80569d5
make close link a button
koenpunt Oct 18, 2016
2b4e530
prevent focus of close icon when Chosen is disabled
koenpunt Oct 18, 2016
b54f682
replace overly explicit rules
koenpunt Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions coffee/chosen.jquery.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ class Chosen extends AbstractChosen
this.activate_field()

container_mouseup: (evt) ->
this.results_reset(evt) if evt.target.nodeName is "ABBR" and not @is_disabled
if not @is_disabled and @allow_single_deselect and $(evt.target).hasClass('search-choice-close')
this.results_reset(evt)

search_results_mousewheel: (evt) ->
delta = evt.originalEvent.deltaY or -evt.originalEvent.wheelDelta or evt.originalEvent.detail if evt.originalEvent
Expand Down Expand Up @@ -299,7 +300,7 @@ class Chosen extends AbstractChosen
if item.disabled
choice.addClass 'search-choice-disabled'
else
close_link = $('<a />', { class: 'search-choice-close', 'data-option-array-index': item.array_index })
close_link = $('<button />', { type: 'button', tabindex: -1, class: 'search-choice-close', 'data-option-array-index': item.array_index })
close_link.bind 'click.chosen', (evt) => this.choice_destroy_link_click(evt)
choice.append close_link

Expand Down Expand Up @@ -331,7 +332,7 @@ class Chosen extends AbstractChosen

results_reset_cleanup: ->
@current_selectedIndex = @form_field.selectedIndex
@selected_item.find("abbr").remove()
@selected_item.find('.search-choice-close').remove()

result_select: (evt) ->
if @result_highlight
Expand Down Expand Up @@ -402,8 +403,9 @@ class Chosen extends AbstractChosen

single_deselect_control_build: ->
return unless @allow_single_deselect
@selected_item.find("span").first().after "<abbr class=\"search-choice-close\"></abbr>" unless @selected_item.find("abbr").length
@selected_item.addClass("chosen-single-with-deselect")
unless @selected_item.find('.search-choice-close').length
@selected_item.find('span').first().after '<button type="button" tabindex="-1" class="search-choice-close"></button>'
@selected_item.addClass('chosen-single-with-deselect')

get_search_field_value: ->
@search_field.val()
Expand Down Expand Up @@ -451,7 +453,7 @@ class Chosen extends AbstractChosen

keydown_backstroke: ->
if @pending_backstroke
this.choice_destroy @pending_backstroke.find("a").first()
this.choice_destroy @pending_backstroke.find('.search-choice-close').first()
this.clear_backstroke()
else
next_available_destroy = @search_container.siblings("li.search-choice").last()
Expand Down
13 changes: 7 additions & 6 deletions coffee/chosen.proto.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class @Chosen extends AbstractChosen

if @is_multiple
@search_choices.stopObserving()
@container.select(".search-choice-close").each (choice) ->
@container.select('.search-choice-close').each (choice) ->
choice.stopObserving()
else
@selected_item.stopObserving()
Expand Down Expand Up @@ -290,7 +290,7 @@ class @Chosen extends AbstractChosen
if item.disabled
choice.addClassName 'search-choice-disabled'
else
close_link = new Element('a', { href: '#', class: 'search-choice-close', rel: item.array_index })
close_link = new Element('button', { type: 'button', tabindex: -1, class: 'search-choice-close', rel: item.array_index })
close_link.observe "click", (evt) => this.choice_destroy_link_click(evt)
choice.insert close_link

Expand Down Expand Up @@ -322,7 +322,7 @@ class @Chosen extends AbstractChosen

results_reset_cleanup: ->
@current_selectedIndex = @form_field.selectedIndex
deselect_trigger = @selected_item.down("abbr")
deselect_trigger = @selected_item.down('.search-choice-close')
deselect_trigger.remove() if(deselect_trigger)

result_select: (evt) ->
Expand Down Expand Up @@ -392,8 +392,9 @@ class @Chosen extends AbstractChosen

single_deselect_control_build: ->
return unless @allow_single_deselect
@selected_item.down("span").insert { after: "<abbr class=\"search-choice-close\"></abbr>" } unless @selected_item.down("abbr")
@selected_item.addClassName("chosen-single-with-deselect")
unless @selected_item.down('.search-choice-close')
@selected_item.down('span').insert { after: '<button type="button" tabindex="-1" class="search-choice-close"></button>' }
@selected_item.addClassName('chosen-single-with-deselect')

get_search_field_value: ->
@search_field.value
Expand Down Expand Up @@ -445,7 +446,7 @@ class @Chosen extends AbstractChosen

keydown_backstroke: ->
if @pending_backstroke
this.choice_destroy @pending_backstroke.down("a")
this.choice_destroy @pending_backstroke.down(".search-choice-close")
this.clear_backstroke()
else
next_available_destroy = @search_container.siblings().last()
Expand Down
52 changes: 27 additions & 25 deletions sass/chosen.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ $chosen-sprite-retina: url('[email protected]') !default;
cursor: pointer;
}

.search-choice, .chosen-single{
.search-choice,
.chosen-single{
.group-name{
margin-right: 4px;
overflow: hidden;
Expand All @@ -44,6 +45,21 @@ $chosen-sprite-retina: url('[email protected]') !default;
}
}
}
.search-choice-close {
border: none;
cursor: pointer;
background: none;
display: block;
width: 12px;
height: 12px;
background: $chosen-sprite -42px 1px no-repeat;
font-size: 1px;

&:hover,
&:focus {
background-position: -42px -10px;
}
}
}
/* @end */

Expand Down Expand Up @@ -79,21 +95,10 @@ $chosen-sprite-retina: url('[email protected]') !default;
.chosen-single-with-deselect span {
margin-right: 38px;
}
.chosen-single abbr {
.chosen-single .search-choice-close {
position: absolute;
top: 6px;
right: 26px;
display: block;
width: 12px;
height: 12px;
background: $chosen-sprite -42px 1px no-repeat;
font-size: 1px;
&:hover {
background-position: -42px -10px;
}
}
&.chosen-disabled .chosen-single abbr:hover {
background-position: -42px -10px;
}
.chosen-single div {
position: absolute;
Expand Down Expand Up @@ -253,14 +258,6 @@ $chosen-sprite-retina: url('[email protected]') !default;
position: absolute;
top: 4px;
right: 3px;
display: block;
width: 12px;
height: 12px;
background: $chosen-sprite -42px 1px no-repeat;
font-size: 1px;
&:hover {
background-position: -42px -10px;
}
}
}
&.search-choice-disabled {
Expand Down Expand Up @@ -330,8 +327,14 @@ $chosen-sprite-retina: url('[email protected]') !default;
.chosen-single {
cursor: default;
}
.chosen-choices .search-choice .search-choice-close {
.search-choice-close {
cursor: default;
&:hover,
&:focus {
outline: none;
background-position: -42px 1px;
cursor: default;
}
}
}
/* @end */
Expand All @@ -355,7 +358,7 @@ $chosen-sprite-retina: url('[email protected]') !default;
right: auto;
left: 3px;
}
.chosen-single abbr {
.chosen-single .search-choice-close {
right: auto;
left: 26px;
}
Expand Down Expand Up @@ -410,10 +413,9 @@ $chosen-sprite-retina: url('[email protected]') !default;
/* @group Retina compatibility */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) {
.chosen-rtl .chosen-search input[type="text"],
.chosen-container-single .chosen-single abbr,
.chosen-container-single .chosen-single div b,
.chosen-container-single .chosen-search input[type="text"],
.chosen-container-multi .chosen-choices .search-choice .search-choice-close,
.chosen-container .search-choice-close,
.chosen-container .chosen-results-scroll-down span,
.chosen-container .chosen-results-scroll-up span {
background-image: $chosen-sprite-retina !important;
Expand Down