Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Bump underscore version.

Browse Source
This commit is contained in:
JC Brand 2015-03-09 19:36:47 +01:00
parent d61c52f053
commit 2888bc59ab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bower.json
View File

@ -13,7 +13,7 @@
"requirejs": "~2.1.15", "requirejs": "~2.1.15",
"jquery": "1.11.0", "jquery": "1.11.0",
"jed": "0.5.4", "jed": "0.5.4",
"underscore": "1.6.0", "underscore": "~1.8.2",
"backbone": "1.1.2", "backbone": "1.1.2",
"backbone.browserStorage": "*", "backbone.browserStorage": "*",
"backbone.overview": "*", "backbone.overview": "*",
@ -33,5 +33,8 @@
"strophejs": "https://github.com/strophe/strophejs.git#9e285eaa59f4ceb2b25e4d95c5bbe90690251bbc", "strophejs": "https://github.com/strophe/strophejs.git#9e285eaa59f4ceb2b25e4d95c5bbe90690251bbc",
"strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd" "strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd"
}, },
"resolutions": {
"backbone": "1.1.2"
},
"exportsOverride": {} "exportsOverride": {}
} }

1
main.js
View File

@ -155,7 +155,6 @@ require.config({
// define module dependencies for modules not using define // define module dependencies for modules not using define
shim: { shim: {
'underscore': { exports: '_' },
'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'] },