wassname/HackFlowy
1
0
Fork 0
mirror of https://github.com/wassname/HackFlowy.git synced 2026-07-10 00:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gh-pages

Browse Source 
Conflicts:
	javascripts/app.js
This commit is contained in:
Is Isilon
2016-01-31 15:36:33 +08:00
parent 64ccdc912a 7c802873e0
commit c3618498d9
13 changed files with 443 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
javascripts/app.js
+3 -8
View File
@@ -3,23 +3,18 @@ require.config({
//load lib files required
paths: {
jquery: '../bower_components/jquery/dist/jquery.min',
lodash: "../bower_components/lodash/dist/lodash.min",
underscore: "../bower_components/underscore/underscore.min",
backbone: '../bower_components/backbone/backbone-min',
localforage: '../bower_components/localforage/dist/localforage',
localforagebackbone: '../bower_components/localforage-backbone/dist/localforage.backbone',
modernizr: "vendor/custom.modernizr",
socket: "../bower_components/socket.io-client/socket.io",
text: '../bower_components/text/text',
},
map: {
"*": {
// alias underscore to lodash for backbone
"underscore": "lodash"
}
marionette: '../bower_components/backbone.marionette/lib/backbone.marionette'
},
shim: {
backbone: {
deps: ["lodash", "jquery"],
deps: ["underscore", "jquery"],
exports: "Backbone"
}
},