diff options
| author | Rob Dawson <robert@rojotek.com> | 2011-11-19 16:04:53 +1000 |
|---|---|---|
| committer | Rob Dawson <robert@rojotek.com> | 2011-11-19 16:04:53 +1000 |
| commit | e414278db948e5619f200ea04eedd94d3c463341 (patch) | |
| tree | c20605b60b9e79d3d0a05addf45ece5346ce5f88 /examples | |
| parent | c380ac190d3ca80039e6e739651aa836c4cd4e65 (diff) | |
| download | backbonetutorials-e414278db948e5619f200ea04eedd94d3c463341.zip backbonetutorials-e414278db948e5619f200ea04eedd94d3c463341.tar.gz backbonetutorials-e414278db948e5619f200ea04eedd94d3c463341.tar.bz2 | |
Nice loader for the modular backbone. Only one reference to the un AMD items, and nice clean code.
Diffstat (limited to 'examples')
5 files changed, 15 insertions, 13 deletions
diff --git a/examples/modular-backbone/js/libs/backbone/backbone.js b/examples/modular-backbone/js/libs/backbone/backbone.js index e8cb2ac..37330b5 100644 --- a/examples/modular-backbone/js/libs/backbone/backbone.js +++ b/examples/modular-backbone/js/libs/backbone/backbone.js @@ -1,5 +1,3 @@ -define(['order!libs/backbone/backbone-min'], function(){ - _.noConflict(); - $.noConflict(); - return Backbone.noConflict(); +define(['loader'], function(Loader){ + return Loader.Backbone; }); diff --git a/examples/modular-backbone/js/libs/backbone/loader.js b/examples/modular-backbone/js/libs/backbone/loader.js new file mode 100644 index 0000000..73c1658 --- /dev/null +++ b/examples/modular-backbone/js/libs/backbone/loader.js @@ -0,0 +1,8 @@ +define(['order!libs/jquery/jquery-min', 'order!libs/underscore/underscore-min', 'order!libs/backbone/backbone-min'], +function(){ + return { + Backbone: Backbone.noConflict(), + _: _.noConflict(), + $: jQuery.noConflict() + }; +}); diff --git a/examples/modular-backbone/js/libs/jquery/jquery.js b/examples/modular-backbone/js/libs/jquery/jquery.js index d16b993..5ea7925 100644 --- a/examples/modular-backbone/js/libs/jquery/jquery.js +++ b/examples/modular-backbone/js/libs/jquery/jquery.js @@ -1,5 +1,3 @@ -define([ - 'order!libs/jquery/jquery-min', -], function(){ - return $; +define([ 'loader'], function(Loader){ + return Loader.$; }); diff --git a/examples/modular-backbone/js/libs/underscore/underscore.js b/examples/modular-backbone/js/libs/underscore/underscore.js index aadf2b6..b63d670 100644 --- a/examples/modular-backbone/js/libs/underscore/underscore.js +++ b/examples/modular-backbone/js/libs/underscore/underscore.js @@ -1,3 +1,3 @@ -define(['order!libs/underscore/underscore-min'], function(){ - return _; +define(['loader'], function(Loader){ + return Loader._; }); diff --git a/examples/modular-backbone/js/main.js b/examples/modular-backbone/js/main.js index 8e363e0..d9894e3 100644 --- a/examples/modular-backbone/js/main.js +++ b/examples/modular-backbone/js/main.js @@ -5,6 +5,7 @@ // Their usage will become more apparent futher along in the tutorial. require.config({ paths: { + loader: 'libs/backbone/loader', jQuery: 'libs/jquery/jquery', Underscore: 'libs/underscore/underscore', Backbone: 'libs/backbone/backbone', @@ -20,9 +21,6 @@ require([ // Some plugins have to be loaded in order due to their non AMD compliance // Because these scripts are not "modules" they do not pass any values to the definition function below - 'order!libs/jquery/jquery-min', - 'order!libs/underscore/underscore-min', - 'order!libs/backbone/backbone-min' ], function(App){ // The "app" dependency is passed in as "App" // Again, the other dependencies passed in are not "AMD" therefore don't pass a parameter to this function |