diff options
16 files changed, 41 insertions, 86 deletions
diff --git a/examples/modular-backbone/js/app.js b/examples/modular-backbone/js/app.js index d1b1f05..78db732 100644 --- a/examples/modular-backbone/js/app.js +++ b/examples/modular-backbone/js/app.js @@ -1,8 +1,8 @@ // Filename: app.js define([ - 'jQuery', - 'Underscore', - 'Backbone', + 'jquery', + 'underscore', + 'backbone', 'router', // Request router.js ], function($, _, Backbone, Router){ var initialize = function(){ @@ -10,7 +10,7 @@ define([ Router.initialize(); } - return { + return { initialize: initialize }; }); diff --git a/examples/modular-backbone/js/boilerplate.js b/examples/modular-backbone/js/boilerplate.js index 455546c..0b3ccfc 100644 --- a/examples/modular-backbone/js/boilerplate.js +++ b/examples/modular-backbone/js/boilerplate.js @@ -1,7 +1,7 @@ define([ - 'jQuery', - 'Underscore', - 'Backbone' + 'jquery', + 'underscore', + 'backbone' ], function($, _, Backbone){ return {}; diff --git a/examples/modular-backbone/js/collections/.projects.js.swp b/examples/modular-backbone/js/collections/.projects.js.swp Binary files differdeleted file mode 100644 index 2318b81..0000000 --- a/examples/modular-backbone/js/collections/.projects.js.swp +++ /dev/null diff --git a/examples/modular-backbone/js/collections/projects.js b/examples/modular-backbone/js/collections/projects.js index 2efd596..bd5490f 100644 --- a/examples/modular-backbone/js/collections/projects.js +++ b/examples/modular-backbone/js/collections/projects.js @@ -1,7 +1,7 @@ define([ - 'jQuery', - 'Underscore', - 'Backbone', + 'jquery', + 'underscore', + 'backbone', 'models/projects' ], function($, _, Backbone, projectsModel){ var projectsCollection = Backbone.Collection.extend({ @@ -11,6 +11,6 @@ define([ } }); - + return new projectsCollection; }); diff --git a/examples/modular-backbone/js/collections/template.js b/examples/modular-backbone/js/collections/template.js deleted file mode 100644 index 455546c..0000000 --- a/examples/modular-backbone/js/collections/template.js +++ /dev/null @@ -1,8 +0,0 @@ -define([ - 'jQuery', - 'Underscore', - 'Backbone' -], function($, _, Backbone){ - - return {}; -}); diff --git a/examples/modular-backbone/js/libs/jquery/jquery-serialize.js b/examples/modular-backbone/js/libs/jquery/jquery-serialize.js deleted file mode 100644 index c2020d5..0000000 --- a/examples/modular-backbone/js/libs/jquery/jquery-serialize.js +++ /dev/null @@ -1,27 +0,0 @@ -jQuery.fn.serializeObject = function(){ - var arrayData, objectData; - arrayData = this.serializeArray(); - objectData = {}; - - jQuery.each(arrayData, function() { - var value; - - if (this.value != null) { - value = this.value; - } else { - value = ''; - } - - if (objectData[this.name] != null) { - if (!objectData[this.name].push) { - objectData[this.name] = [objectData[this.name]]; - } - - objectData[this.name].push(value); - } else { - objectData[this.name] = value; - } - }); - - return objectData; -} diff --git a/examples/modular-backbone/js/libs/jquery/jquery.js b/examples/modular-backbone/js/libs/jquery/jquery.js deleted file mode 100644 index 5ea7925..0000000 --- a/examples/modular-backbone/js/libs/jquery/jquery.js +++ /dev/null @@ -1,3 +0,0 @@ -define([ 'loader'], function(Loader){ - return Loader.$; -}); diff --git a/examples/modular-backbone/js/text.js b/examples/modular-backbone/js/libs/require/text.js index 0caaacf..0caaacf 100644 --- a/examples/modular-backbone/js/text.js +++ b/examples/modular-backbone/js/libs/require/text.js diff --git a/examples/modular-backbone/js/main.js b/examples/modular-backbone/js/main.js index d9894e3..c1196cc 100644 --- a/examples/modular-backbone/js/main.js +++ b/examples/modular-backbone/js/main.js @@ -5,10 +5,10 @@ // 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', + jquery: 'libs/jquery/jquery-min', + underscore: 'libs/underscore/underscore-min', + backbone: 'libs/backbone/backbone-optamd3-min', + text: 'libs/require/text', templates: '../templates' } @@ -17,7 +17,7 @@ require.config({ require([ // Load our app module and pass it to our definition function - 'app', + 'app' // 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 diff --git a/examples/modular-backbone/js/models/.projects.js.swp b/examples/modular-backbone/js/models/.projects.js.swp Binary files differdeleted file mode 100644 index 3eed458..0000000 --- a/examples/modular-backbone/js/models/.projects.js.swp +++ /dev/null diff --git a/examples/modular-backbone/js/models/projects.js b/examples/modular-backbone/js/models/projects.js index e1ba3bc..e35c846 100644 --- a/examples/modular-backbone/js/models/projects.js +++ b/examples/modular-backbone/js/models/projects.js @@ -1,6 +1,6 @@ define([ - 'Underscore', - 'Backbone' + 'underscore', + 'backbone' ], function(_, Backbone) { var projectsModel = Backbone.Model.extend({ defaults: { @@ -8,7 +8,7 @@ define([ }, initialize: function(){ } - + }); return projectsModel; diff --git a/examples/modular-backbone/js/order.js b/examples/modular-backbone/js/order.js deleted file mode 100644 index ac9ff95..0000000 --- a/examples/modular-backbone/js/order.js +++ /dev/null @@ -1,8 +0,0 @@ -/* - RequireJS order 0.27.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved. - Available via the MIT or new BSD license. - see: http://github.com/jrburke/requirejs for details -*/ -(function(){function k(a){var b=a.currentTarget||a.srcElement,c;if(a.type==="load"||l.test(b.readyState)){a=b.getAttribute("data-requiremodule");j[a]=!0;for(a=0;c=g[a];a++)if(j[c.name])c.req([c.name],c.onLoad);else break;a>0&&g.splice(0,a);setTimeout(function(){b.parentNode.removeChild(b)},15)}}function m(a){var b,c;a.setAttribute("data-orderloaded","loaded");for(a=0;c=h[a];a++)if((b=i[c])&&b.getAttribute("data-orderloaded")==="loaded")delete i[c],require.addScriptToDom(b);else break;a>0&&h.splice(0, -a)}var f=typeof document!=="undefined"&&typeof window!=="undefined"&&document.createElement("script"),n=f&&(f.async||window.opera&&Object.prototype.toString.call(window.opera)==="[object Opera]"||"MozAppearance"in document.documentElement.style),o=f&&f.readyState==="uninitialized",l=/^(complete|loaded)$/,g=[],j={},i={},h=[],f=null;define({version:"0.27.0",load:function(a,b,c,d){var e=b.nameToUrl(a,null);require.s.skipAsync[e]=!0;n||d.isBuild?b([a],c):o?(d=require.s.contexts._,!d.urlFetched[e]&&!d.loaded[a]&& -(d.urlFetched[e]=!0,require.resourcesReady(!1),d.scriptCount+=1,e=require.attach(e,d,a,null,null,m),i[a]=e,h.push(a)),b([a],c)):b.specified(a)?b([a],c):(g.push({name:a,req:b,onLoad:c}),require.attach(e,null,a,k,"script/cache"))}})})(); diff --git a/examples/modular-backbone/js/router.js b/examples/modular-backbone/js/router.js index e606f3e..4fc78c1 100644 --- a/examples/modular-backbone/js/router.js +++ b/examples/modular-backbone/js/router.js @@ -1,8 +1,8 @@ // Filename: router.js define([ - 'jQuery', - 'Underscore', - 'Backbone', + 'jquery', + 'underscore', + 'backbone', 'views/home/main', 'views/projects/list', 'views/users/list' @@ -10,9 +10,9 @@ define([ var AppRouter = Backbone.Router.extend({ routes: { // Define some URL routes - '/projects': 'showProjects', - '/users': 'showUsers', - + 'projects': 'showProjects', + 'users': 'showUsers', + // Default '*actions': 'defaultAction' }, @@ -27,8 +27,8 @@ define([ userListView.render(); }, defaultAction: function(actions){ - // We have no matching route, lets display the home page - mainHomeView.render(); + // We have no matching route, lets display the home page + mainHomeView.render(); } }); @@ -36,7 +36,7 @@ define([ var app_router = new AppRouter; Backbone.history.start(); }; - return { + return { initialize: initialize }; }); diff --git a/examples/modular-backbone/js/views/home/main.js b/examples/modular-backbone/js/views/home/main.js index c53b3da..a4a5a63 100644 --- a/examples/modular-backbone/js/views/home/main.js +++ b/examples/modular-backbone/js/views/home/main.js @@ -1,7 +1,8 @@ +// Filename: views/home/main define([ - 'jQuery', - 'Underscore', - 'Backbone', + 'jquery', + 'underscore', + 'backbone', 'text!templates/home/main.html' ], function($, _, Backbone, mainHomeTemplate){ diff --git a/examples/modular-backbone/js/views/projects/list.js b/examples/modular-backbone/js/views/projects/list.js index 0c2f268..4c12bbe 100644 --- a/examples/modular-backbone/js/views/projects/list.js +++ b/examples/modular-backbone/js/views/projects/list.js @@ -1,8 +1,8 @@ // Filename: views/projects/list define([ - 'jQuery', - 'Underscore', - 'Backbone', + 'jquery', + 'underscore', + 'backbone', // Pull in the Collection module from above 'collections/projects', 'text!templates/projects/list.html' @@ -23,10 +23,10 @@ define([ render: function(){ var data = { projects: this.collection.models, - _: _ + _: _ }; var compiledTemplate = _.template( projectListTemplate, data ); - $("#page").html( compiledTemplate ); + $("#page").html( compiledTemplate ); } }); return new projectListView; diff --git a/examples/modular-backbone/js/views/users/list.js b/examples/modular-backbone/js/views/users/list.js index 5f17cbe..a19cf95 100644 --- a/examples/modular-backbone/js/views/users/list.js +++ b/examples/modular-backbone/js/views/users/list.js @@ -1,8 +1,8 @@ // Filename: views/projects/list define([ - 'jQuery', - 'Underscore', - 'Backbone', + 'jquery', + 'underscore', + 'backbone', 'text!templates/users/list.html' ], function($, _, Backbone, userListTemplate){ var userListView = Backbone.View.extend({ @@ -12,7 +12,7 @@ define([ render: function(){ var data = {}; var compiledTemplate = _.template( userListTemplate, data ); - this.el.html( compiledTemplate ); + this.el.html( compiledTemplate ); } }); return new userListView; |