summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Davis <thomasalwyndavis@gmail.com>2013-11-07 03:00:43 +1000
committerThomas Davis <thomasalwyndavis@gmail.com>2013-11-07 03:00:43 +1000
commite82d496677f9389ef5d3db1667d0992bede679db (patch)
tree919a473326a5cf97d691078ec92147519ac78e94
parent52d199724d7c4bd6281b3f66e583a3337aae5823 (diff)
parent58b9a916d01dbab16243cf81a8fff346f8c9c972 (diff)
downloadbackbonetutorials-e82d496677f9389ef5d3db1667d0992bede679db.zip
backbonetutorials-e82d496677f9389ef5d3db1667d0992bede679db.tar.gz
backbonetutorials-e82d496677f9389ef5d3db1667d0992bede679db.tar.bz2
Merge branch 'gh-pages' of github.com:thomasdavis/backbonetutorials into gh-pages
-rw-r--r--_site/organizing-backbone-using-modules/index.html2
-rw-r--r--examples/modular-backbone/js/collections/projects/ProjectsCollection.js6
-rw-r--r--videos/beginner/index.html3
3 files changed, 3 insertions, 8 deletions
diff --git a/_site/organizing-backbone-using-modules/index.html b/_site/organizing-backbone-using-modules/index.html
index 2dc30d0..e578138 100644
--- a/_site/organizing-backbone-using-modules/index.html
+++ b/_site/organizing-backbone-using-modules/index.html
@@ -269,7 +269,7 @@ We should setup any useful containers that might be used by our Backbone views.<
<p>Any modules we develop for our application using AMD/Require.js will be asynchronously loaded.</p>
-<p>We have a heavy dependency on jQuery, Underscore and Backbone, unfortunately this libraries are loaded synchronously and also depend on each other existing in the global namespace.</p>
+<p>We have a heavy dependency on jQuery, Underscore and Backbone. Unfortunately, these libraries are loaded synchronously and also depend on each other existing in the global namespace.</p>
<h2>A boiler plate module</h2>
diff --git a/examples/modular-backbone/js/collections/projects/ProjectsCollection.js b/examples/modular-backbone/js/collections/projects/ProjectsCollection.js
index a8b0676..cdeb187 100644
--- a/examples/modular-backbone/js/collections/projects/ProjectsCollection.js
+++ b/examples/modular-backbone/js/collections/projects/ProjectsCollection.js
@@ -9,12 +9,6 @@ define([
initialize: function(){
- var project0 = new ProjectModel('Cross Domain', 'https://github.com/thomasdavis/backbonetutorials/tree/gh-pages/examples/cross-domain');
- var project1 = new ProjectModel('Infinite Scroll', 'https://github.com/thomasdavis/backbonetutorials/tree/gh-pages/examples/infinite-scroll');
- var project2 = new ProjectModel('Modular Backbone','https://github.com/thomasdavis/backbonetutorials/tree/gh-pages/examples/modular-backbone');
- var project3 = new ProjectModel('Node MongoDB Mongoose Restify','https://github.com/thomasdavis/backbonetutorials/tree/gh-pages/examples/nodejs-mongodb-mongoose-restify');
- var project4 = new ProjectModel('Todo App','https://github.com/thomasdavis/backbonetutorials/tree/gh-pages/examples/todo-app');
-
//this.add([project0, project1, project2, project3, project4]);
}
diff --git a/videos/beginner/index.html b/videos/beginner/index.html
index cb6c380..2f1d719 100644
--- a/videos/beginner/index.html
+++ b/videos/beginner/index.html
@@ -129,7 +129,8 @@
console.log('destroyed');
router.navigate('', {trigger:true});
}
- })
+ });
+ return false;
},
render: function (options) {
var that = this;