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

Commit

Permalink
Revert "Namespace before event name"
Browse files Browse the repository at this point in the history
This reverts commit 4813532.
  • Loading branch information
humancopy committed Dec 27, 2014
1 parent 4813532 commit 456c6e2
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 33 deletions.
30 changes: 15 additions & 15 deletions fancySelect.coffee
Expand Up @@ -48,17 +48,17 @@ $.fn.fancySelect = (opts = {}) ->
triggerHtml = settings.triggerTemplate(sel.find(':selected'))
trigger.html(triggerHtml)

sel.on 'fs.blur', ->
sel.on 'blur.fs', ->
if trigger.hasClass 'open'
setTimeout ->
trigger.trigger 'fs.close'
trigger.trigger 'close.fs'
, 120

trigger.on 'fs.close', ->
trigger.on 'close.fs', ->
trigger.removeClass 'open'
options.removeClass 'open'

trigger.on 'click fs.click', ->
trigger.on 'click.fs', ->
unless disabled
trigger.toggleClass 'open'

Expand Down Expand Up @@ -93,7 +93,7 @@ $.fn.fancySelect = (opts = {}) ->
wrapper.addClass 'disabled'
disabled = true

sel.on 'fs.change', (e) ->
sel.on 'change.fs', (e) ->
if e.originalEvent && e.originalEvent.isTrusted
# discard firefox-only automatic event when hitting enter, we want to trigger our own
e.stopPropagation()
Expand All @@ -109,7 +109,7 @@ $.fn.fancySelect = (opts = {}) ->
if !options.hasClass('open')
if w in [13, 32, 38, 40] # enter, space, up, down
e.preventDefault()
trigger.trigger 'fs.click'
trigger.trigger 'click.fs'
else
if w == 38 # up
e.preventDefault()
Expand All @@ -125,12 +125,12 @@ $.fn.fancySelect = (opts = {}) ->
options.find('li:first-child').addClass('hover')
else if w == 27 # escape
e.preventDefault()
trigger.trigger 'fs.click'
trigger.trigger 'click.fs'
else if w in [13, 32] # enter, space
e.preventDefault()
hovered.trigger 'fs.click'
hovered.trigger 'click.fs'
else if w == 9 # tab
if trigger.hasClass 'open' then trigger.trigger 'fs.close'
if trigger.hasClass 'open' then trigger.trigger 'close.fs'

newHovered = options.find('.hover')
if newHovered.length
Expand All @@ -139,27 +139,27 @@ $.fn.fancySelect = (opts = {}) ->

# Handle item selection, and
# Add class selected to selected item
options.on 'click fs.click', 'li', (e) ->
options.on 'click.fs', 'li', (e) ->
clicked = $(this)

sel.val(clicked.data('raw-value'))

sel.trigger('fs.blur').trigger('fs.focus') unless isiOS
sel.trigger('blur.fs').trigger('focus.fs') unless isiOS

options.find('.selected').removeClass('selected')
clicked.addClass 'selected'
trigger.addClass 'selected'
return sel.val(clicked.data('raw-value')).trigger('fs.change').trigger('fs.blur').trigger('fs.focus')
return sel.val(clicked.data('raw-value')).trigger('change.fs').trigger('blur.fs').trigger('focus.fs')

# handle mouse selection
options.on 'mouseenter fs.mouseenter', 'li', ->
options.on 'mouseenter.fs', 'li', ->
nowHovered = $(this)
hovered = options.find('.hover')
hovered.removeClass 'hover'

nowHovered.addClass 'hover'

options.on 'mouseleave fs.mouseleave', 'li', ->
options.on 'mouseleave.fs', 'li', ->
options.find('.hover').removeClass('hover')

copyOptionsToList = ->
Expand Down Expand Up @@ -187,7 +187,7 @@ $.fn.fancySelect = (opts = {}) ->
options.append "<li data-raw-value=\"#{opt.val()}\">#{optHtml}</li>"

# for updating the list of options after initialization
sel.on 'fs.update', ->
sel.on 'update.fs', ->
wrapper.find('.options').empty()
copyOptionsToList()

Expand Down
30 changes: 15 additions & 15 deletions fancySelect.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions index.html
Expand Up @@ -47,9 +47,7 @@
<script src="fancySelect.js"></script>
<script>
$(document).ready(function() {
$('#basic-usage-demo').fancySelect().on('fs.change', function() {
$(this).change();
});
$('#basic-usage-demo').fancySelect();

// Boilerplate
var repoName = 'fancyselect'
Expand Down

0 comments on commit 456c6e2

Please sign in to comment.