Permalink
Browse files

Widget: Support events with dashes and colons

Fixes #9708
Closes gh-1159
  • Loading branch information...
ryakh authored and scottgonzalez committed Jan 3, 2014
1 parent 28310ff commit be2a339b2beaed69105abae91a118bc1c8669a1b
Showing with 18 additions and 3 deletions.
  1. +17 −2 tests/unit/widget/widget_core.js
  2. +1 −1 ui/jquery.ui.widget.js
@@ -865,21 +865,36 @@ test( "_on() with delegate to descendent", function() {
});
test( "_on() to common element", function() {
expect( 1 );
expect( 4 );
$.widget( "ui.testWidget", {
_create: function() {
this._on( this.document, {
"customevent": "_handler"
"customevent": "_handler",
"with:colons": "_colonHandler",
"with-dashes": "_dashHandler",
"with-dashes:and-colons": "_commbinedHandler"
});
},
_handler: function() {
ok( true, "handler triggered" );
},
_colonHandler: function() {
ok( true, "colon handler triggered" );
},
_dashHandler: function() {
ok( true, "dash handler triggered" );
},
_commbinedHandler: function() {
ok( true, "combined handler triggered" );
}
});
var widget = $( "#widget" ).testWidget().testWidget( "instance" );
$( "#widget-wrapper" ).testWidget();
widget.destroy();
$( document ).trigger( "customevent" );
$( document ).trigger( "with:colons" );
$( document ).trigger( "with-dashes" );
$( document ).trigger( "with-dashes:and-colons" );
});
test( "_off() - single event", function() {
View
@@ -414,7 +414,7 @@ $.Widget.prototype = {
handler.guid || handlerProxy.guid || $.guid++;
}
var match = event.match( /^(\w+)\s*(.*)$/ ),
var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
eventName = match[1] + instance.eventNamespace,
selector = match[2];
if ( selector ) {

0 comments on commit be2a339

Please sign in to comment.