Skip to content

Commit

Permalink
Merge pull request tastejs#609 from cujojs/cujojs-update
Browse files Browse the repository at this point in the history
Update to latest cujoJS releases
  • Loading branch information
stephenplusplus committed Jun 18, 2013
2 parents 575d1e6 + 57e70d6 commit c488f56
Show file tree
Hide file tree
Showing 127 changed files with 5,151 additions and 4,477 deletions.
11 changes: 3 additions & 8 deletions labs/architecture-examples/cujo/app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,8 @@ define({
}
},

plugins: [
// { module: 'wire/debug', trace: true },
{ module: 'wire/dom' },
{ module: 'wire/dom/render' },
{ module: 'wire/on' },
{ module: 'wire/aop' },
{ module: 'wire/connect' },
{ module: 'cola' }
plugins: [ //'wire/debug',
'wire/dom', 'wire/dom/render', 'wire/on',
'wire/aop', 'wire/connect', 'cola'
]
});
10 changes: 5 additions & 5 deletions labs/architecture-examples/cujo/app/run.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*global curl */
(function (curl) {
// Bootstrap the app. Notice that curl is not a global, only define.
/*global define*/
define(['curl'], function (curl) {
'use strict';

curl({
Expand All @@ -12,10 +13,9 @@
{ name: 'cola', location: 'bower_components/cola', main: 'cola' },
{ name: 'poly', location: 'bower_components/poly', main: 'poly' }
],
preloads: ['poly/string', 'poly/array'],
preloads: ['poly/es5'],
// Turn off i18n locale sniffing. Change or remove this line if you want to
// test specific locales or try automatic locale-sniffing.
locale: false
});

})(curl);
});
8 changes: 4 additions & 4 deletions labs/architecture-examples/cujo/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "todomvc-cujoJS",
"version": "0.0.0",
"dependencies": {
"todomvc-common": "~0.1.4",
"curl": "~0.7.3",
"todomvc-common": "~0.1.7",
"curl": "~0.7.4",
"cola": "latest",
"poly": "~0.5.1",
"when": "~2.1.0",
"wire": "~0.9.4",
"when": "~2.1.1",
"wire": "~0.10.0",
"meld": "~1.3.0"
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.

This file was deleted.

39 changes: 0 additions & 39 deletions labs/architecture-examples/cujo/bower_components/curl/package.json

This file was deleted.

Loading

0 comments on commit c488f56

Please sign in to comment.