Permalink
Browse files

Widget: Properly set widgetEventPrefix when redefining a widget. Fixe…

…s #9316 - Widget: widgetEventPrefix is empty when widget is (occasionally) loaded twice.
  • Loading branch information...
scottgonzalez committed May 20, 2013
1 parent 9726cd7 commit 2eb89f07341a557084fa3363fe22afe62530654d
Showing with 11 additions and 1 deletion.
  1. +10 −0 tests/unit/widget/widget_core.js
  2. +1 −1 ui/jquery.ui.widget.js
@@ -331,6 +331,16 @@ test( "re-init", function() {
deepEqual( actions, [ "optionfoo", "init" ], "correct methods called on re-init with options" );
});
test( "redeclare", function() {
expect( 2 );
$.widget( "ui.testWidget", {} );
equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" );
$.widget( "ui.testWidget", {} );
equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" );
});
test( "inheritance", function() {
expect( 6 );
// #5830 - Widget: Using inheritance overwrites the base classes options
View
@@ -106,7 +106,7 @@ $.widget = function( name, base, prototype ) {
// TODO: remove support for widgetEventPrefix
// always use the name + a colon as the prefix, e.g., draggable:start
// don't prefix for widgets that aren't DOM-based
widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
}, proxiedPrototype, {
constructor: constructor,
namespace: namespace,

0 comments on commit 2eb89f0

Please sign in to comment.