aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.widget.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-05-24 19:47:42 +0200
committerFelix Nagel <info@felixnagel.com>2013-05-24 19:47:42 +0200
commitcccb8c6e826b8140dd99f225a28cc6f725e86ced (patch)
treebb5ca77b1e1230a059f59d3e86ef933d5bbe03a6 /ui/jquery.ui.widget.js
parent7e0737edc03d36b07c45981e0a6b58f8aab3824e (diff)
parentc19e7b3496d14b40e71ba892213889fc8cc81d4f (diff)
downloadjquery-ui-cccb8c6e826b8140dd99f225a28cc6f725e86ced.tar.gz
jquery-ui-cccb8c6e826b8140dd99f225a28cc6f725e86ced.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.widget.js')
-rw-r--r--ui/jquery.ui.widget.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index 741ac74d7..9fc0136c4 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -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,