瀏覽代碼

remove all jquery shims and map to private jquery

JC Brand 10 年之前
父節點
當前提交
0c144d020a
共有 1 個文件被更改,包括 10 次插入4 次删除
  1. 10 4
      main.js

+ 10 - 4
main.js

@@ -105,6 +105,16 @@ config = {
         "trimmed_chat":             "src/templates/trimmed_chat"
         "trimmed_chat":             "src/templates/trimmed_chat"
     },
     },
 
 
+    map: {
+        // '*' means all modules will get 'jquery-private'
+        // for their 'jquery' dependency.
+        '*': { 'jquery': 'jquery-private' },
+        // 'jquery-private' wants the real jQuery module
+        // though. If this line was not here, there would
+        // be an unresolvable cyclic dependency.
+        'jquery-private': { 'jquery': 'jquery' }
+    },
+
     tpl: {
     tpl: {
         // Configuration for requirejs-tpl
         // Configuration for requirejs-tpl
         // Use Mustache style syntax for variable interpolation
         // Use Mustache style syntax for variable interpolation
@@ -117,7 +127,6 @@ config = {
     // define module dependencies for modules not using define
     // define module dependencies for modules not using define
     shim: {
     shim: {
         'underscore':           { exports: '_' },
         'underscore':           { exports: '_' },
-        'bootstrap':            { deps: ['jquery'] },
         'crypto.aes':           { deps: ['crypto.cipher-core'] },
         'crypto.aes':           { deps: ['crypto.cipher-core'] },
         'crypto.cipher-core':   { deps: ['crypto.enc-base64', 'crypto.evpkdf'] },
         'crypto.cipher-core':   { deps: ['crypto.enc-base64', 'crypto.evpkdf'] },
         'crypto.enc-base64':    { deps: ['crypto.core'] },
         'crypto.enc-base64':    { deps: ['crypto.core'] },
@@ -129,9 +138,6 @@ config = {
         'crypto.sha1':          { deps: ['crypto.core'] },
         'crypto.sha1':          { deps: ['crypto.core'] },
         'crypto.sha256':        { deps: ['crypto.core'] },
         'crypto.sha256':        { deps: ['crypto.core'] },
         'bigint':               { deps: ['crypto'] },
         'bigint':               { deps: ['crypto'] },
-        'typeahead':            { deps: ['jquery'] },
-        'jquery.browser':       { deps: ['jquery'] },
-        'jquery.easing':        { deps: ['jquery'] },
         'strophe.disco':        { deps: ['strophe'] },
         'strophe.disco':        { deps: ['strophe'] },
         'strophe.muc':          { deps: ['strophe'] },
         'strophe.muc':          { deps: ['strophe'] },
         'strophe.roster':       { deps: ['strophe'] },
         'strophe.roster':       { deps: ['strophe'] },