Somehow missed that tooltips were broken, caused by jquery defining itself using the 'jquery' name, which prevented our custom module from being included and extending jquery.

2013-09-14 17:21:25 -07:00
parent 8f67381c79
commit 2a1c67ffdb
31 changed files with 54 additions and 46 deletions
@@ -55,8 +55,16 @@ require.config({
    },

    'jquery-src': {
-      // requiring should work, but isn't required
-      exports: 'jQuery'
+      init: (function (global) {
+        'use strict';
+        return function () {
+          var jQuery = global.jQuery;
+          // jquery defines itself, but we want to extend it and provide our version as the 'jquery'
+          // package
+          require.undef('jquery');
+          return jQuery;
+        };
+      })(this)
    },

    // simple dependency declatation