Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated performance comparison section

  • Loading branch information...
commit 351a0c95f8cdfb6f162e865934dc85357b59ec45 1 parent 8874690
Dhruva Ray authored
4 README.md
View
@@ -566,9 +566,9 @@ Refer to issue [#28](https://github.com/dhruvaray/backbone-associations/issues/2
## <a name="performance"/>Performance Comparison
-![Performance](http://dhruvaray.github.com/backbone-associations/docs/img/speed0.4.2.png)
+![Performance](http://dhruvaray.github.com/backbone-associations/docs/img/speed0.4.2-0.8.5.png)
-Each operation comprises of n (10, 15, 20, 25, 30) inserts. The chart above compares the performance (time and operations/sec) of the two implementations. (backbone-associations v0.4.2 v/s backbone-relational v0.8.0+ [2fff8e](https://github.com/PaulUithol/Backbone-relational/tree/4da5586bc92f5e6a63d725f26fe7f1b66c2fff8e))
+Each operation comprises of n (10, 15, 20, 25, 30) inserts. The chart above compares the performance (time and operations/sec) of the two implementations. (backbone-associations v0.4.2 v/s backbone-relational v0.8.5)
Run tests on your machine configuration instantly [here](http://dhruvaray.github.com/backbone-associations/test/speed-comparison.html)
BIN  docs/img/speed0.4.2-0.8.5.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  docs/img/speed0.4.2.png
View
Deleted file not rendered
5 test/lib/backbone-relational.js
View
@@ -1,6 +1,6 @@
/* vim: set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab: */
/**
- * Backbone-relational.js 0.8.0+
+ * Backbone-relational.js 0.8.5
* (c) 2011-2013 Paul Uithol and contributors (https://github.com/PaulUithol/Backbone-relational/graphs/contributors)
*
* Backbone-relational may be freely distributed under the MIT license; see the accompanying LICENSE.txt.
@@ -1792,6 +1792,7 @@
*/
var reset = Backbone.Collection.prototype.__reset = Backbone.Collection.prototype.reset;
Backbone.Collection.prototype.reset = function( models, options ) {
+ options = _.extend( { merge: true }, options );
reset.call( this, models, options );
if ( this.model.prototype instanceof Backbone.RelationalModel ) {
@@ -1856,4 +1857,4 @@
return child;
};
-})();
+})();
Please sign in to comment.
Something went wrong with that request. Please try again.