Skip to content

Commit

Permalink
Merge pull request #51 from SpaceK33z/remove-el
Browse files Browse the repository at this point in the history
Remove `el()` method
  • Loading branch information
clayallsopp committed Mar 11, 2016
2 parents a618e2a + 840cdd7 commit 0700b54
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ React.BackboneMixin({
});
```

If your Collection or Model class does not inherit directly from Backbone.Model
If your Collection or Model class does not inherit directly from Backbone.Model
or Backbone.Collection, you may customize the behavior on a library level by
overriding the React.BackboneMixin.ConsiderAsCollection function.

Expand Down Expand Up @@ -158,4 +158,5 @@ define(['backbone', 'react', 'react.backbone'], function(Backbone, React) {
});
```

Version 0.7.0 supports React >0.14 and Backbone >1.0; for React <0.14, check out versions 0.6.0 and prior
Version 0.7.0 supports React >0.14 and Backbone >1.0; for React <0.14, check out versions 0.6.0 and prior.
React Native is also supported, but only works with npm v3 (otherwise it will use the wrong React dependency).
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react.backbone",
"version": "0.7.0",
"version": "0.8.0",
"author": "Clay Allsopp <[email protected]>",
"scripts": {
"test": "jest"
Expand Down Expand Up @@ -29,7 +29,6 @@
},
"peerDependencies": {
"react": ">=0.14.x <1.x.x",
"react-dom": ">=0.14.x <1.x.x",
"backbone": "1.x.x",
"underscore": ">=1.2.x"
},
Expand Down
12 changes: 4 additions & 8 deletions react.backbone.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
(function(root, factory) {
if (typeof exports === 'object') {
// CommonJS
module.exports = factory(require('backbone'), require('react'), require('react-dom'), require('underscore'));
module.exports = factory(require('backbone'), require('react'), require('underscore'));
} else if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['backbone', 'react', 'react-dom', 'underscore'], factory);
define(['backbone', 'react', 'underscore'], factory);
} else {
// Browser globals
root.amdWeb = factory(root.Backbone, root.React, root.ReactDOM, root._);
root.amdWeb = factory(root.Backbone, root.React, root._);
}
}(this, function(Backbone, React, ReactDOM, _) {
}(this, function(Backbone, React, _) {

'use strict';

Expand Down Expand Up @@ -122,10 +122,6 @@
collection: function() {
return this.getCollection();
},

el: function() {
return this.isMounted() && ReactDOM.findDOMNode(this);
}
};

React.createBackboneClass = function(spec) {
Expand Down

0 comments on commit 0700b54

Please sign in to comment.