Skip to content

Commit

Permalink
Syntax cleanup, version increment.
Browse files Browse the repository at this point in the history
  • Loading branch information
gmac committed Feb 25, 2014
1 parent e634b42 commit 6ba8cc1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions backbone.epoxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@
self.model = addSourceToViewContext(self, context, options, 'model');
self.viewModel = addSourceToViewContext(self, context, options, 'viewModel');
self.collection = addSourceToViewContext(self, context, options, 'collection');
// Support legacy "collection.view" API for rendering list items:

// Support legacy "collection.view" API for rendering list items:
if (self.collection && self.collection.view) {
self.itemView = self.collection.view;
}
self.itemView = self.collection.view;
}

// Add all additional data sources:
if (sources) {
Expand Down
2 changes: 1 addition & 1 deletion backbone.epoxy.min.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"jQuery": "~1.7.4"
},
"main": "backbone.epoxy.js",
"version": "1.1.0",
"version": "1.2.0",
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-uglify": "~0.1.2",
Expand Down
8 changes: 4 additions & 4 deletions www/js/backbone.epoxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@
self.model = addSourceToViewContext(self, context, options, 'model');
self.viewModel = addSourceToViewContext(self, context, options, 'viewModel');
self.collection = addSourceToViewContext(self, context, options, 'collection');
// Support legacy "collection.view" API for rendering list items:

// Support legacy "collection.view" API for rendering list items:
if (self.collection && self.collection.view) {
self.itemView = self.collection.view;
}
self.itemView = self.collection.view;
}

// Add all additional data sources:
if (sources) {
Expand Down

0 comments on commit 6ba8cc1

Please sign in to comment.