Permalink
Browse files

v1.5.0. Improvement.

- v1.5.0 December 14, 2012
	- Removed backbone dependency, should now be handled by the parent
project
	- Added support for Backbone v0.9.9 - [backbone issue
#1922](jashkenas/backbone#1922) broke it
  • Loading branch information...
1 parent e46579b commit 3e650ddfdf2c32b52077df0e3d31834dea4e172e @balupton balupton committed Dec 14, 2012
Showing with 20 additions and 6 deletions.
  1. +2 −1 History.md
  2. +16 −3 README.md
  3. +1 −1 out/lib/query-engine.js
  4. +1 −1 src/lib/query-engine.coffee
View
@@ -1,7 +1,8 @@
## History
- v1.5.0 December 14, 2012
- - Removed backbone dependency, should be handled by the parent project now
+ - Removed backbone dependency, should now be handled by the parent project
+ - Added support for Backbone v0.9.9 - [backbone issue #1922](https://github.com/documentcloud/backbone/issues/1922) broke it
- v1.4.1 December 14, 2012
- Changed backbone dependency version from `0.9.x` to `0.9.2` due to the b/c break
View
@@ -1,6 +1,6 @@
# QueryEngine [![Build Status](https://secure.travis-ci.org/bevry/query-engine.png?branch=master)](http://travis-ci.org/bevry/query-engine)
-QueryEngine provides extensive Querying, Filtering, and Searching abilities for [Backbone.js Collections](http://documentcloud.github.com/backbone/#Collection) as well as JavaScript arrays and objects.
+QueryEngine provides extensive Querying, Filtering, and Searching abilities for [Backbone.js Collections](http://documentcloud.github.com/backbone/#Collection) as well as JavaScript arrays and objects. The Backbone.js and Underscore dependencies are optional.
## Features
@@ -22,13 +22,19 @@ QueryEngine provides extensive Querying, Filtering, and Searching abilities for
1. [Install Node.js](https://github.com/balupton/node/wiki/Installing-Node.js)
-2. Install QueryEngine
+1. Install Backbone (optional, but required for `QueryCollection`)
+
+ ``` bash
+ npm install backbone
+ ```
+
+1. Install QueryEngine
``` bash
npm install query-engine
```
-3. Require QueryEngine
+1. Require QueryEngine
``` javascript
var queryEngine = require('query-engine');
@@ -40,8 +46,11 @@ QueryEngine provides extensive Querying, Filtering, and Searching abilities for
1. Include the necessary scripts
``` html
+ <!-- Optional: But required for QueryCollection -->
<script src="http://documentcloud.github.com/underscore/underscore-min.js"></script>
<script src="http://documentcloud.github.com/backbone/backbone-min.js"></script>
+
+ <!-- Required -->
<script src="http://raw.github.com/bevry/query-engine/master/out/lib/query-engine.js"></script>
```
@@ -58,6 +67,10 @@ QueryEngine provides extensive Querying, Filtering, and Searching abilities for
[You can discover the history inside the `History.md` file](https://github.com/bevry/query-engine/blob/master/History.md#files)
+## Compatability
+
+Tested and working against backbone versions 0.9.2 and 0.9.9.
+
## License
Oops, something went wrong.
@@ -405,7 +405,7 @@ class QueryCollection extends Backbone.Collection
if model.id? and @get(model.id)
exists = true
# Check by the model's cid
- else if model.cid? and @getByCid(model.cid)
+ else if model.cid? and @_byCid[model.cid]?
exists = true
# Otherwise fail
else

0 comments on commit 3e650dd

Please sign in to comment.