Permalink
Browse files

Core: Better detection of when core is loaded twice. Fixes #5636 - Lo…

…ad ui.position before ui.core couse ui.core not execute.
  • Loading branch information...
1 parent fc093e9 commit afaa03575f22bda227ac82ed3bb08bc29ba3b1be @scottgonzalez scottgonzalez committed May 20, 2010
Showing with 12 additions and 3 deletions.
  1. +12 −3 ui/jquery.ui.core.js
View
@@ -7,10 +7,19 @@
*
* http://docs.jquery.com/UI
*/
-;jQuery.ui || (function($) {
+
+(function($) {
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ($.ui.version) {
+ return;
+}
//Helper functions and ui object
-$.ui = {
+$.extend($.ui, {
version: "@VERSION",
// $.ui.plugin is deprecated. Use the proxy pattern instead.
@@ -103,7 +112,7 @@ $.ui = {
UP: 38,
WINDOWS: 91 // COMMAND
}
-};
+});
//jQuery plugins
$.fn.extend({

0 comments on commit afaa035

Please sign in to comment.