[Pkg-javascript-commits] [backbone] 150/211: remove an extraneous this.options

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.5.0
in repository backbone.

commit 636e7b00a9f9dc3b6829a8e8593114c921639060
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Thu May 26 11:54:35 2011 -0400

    remove an extraneous this.options
---
 backbone.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backbone.js b/backbone.js
index 706c481..6cfffd3 100644
--- a/backbone.js
+++ b/backbone.js
@@ -772,7 +772,7 @@
     // an existing route, and `false` otherwise.
     start : function(options) {
       if (historyStarted) throw new Error("Backbone.history has already been started");
-      this.options          = _.extend({}, {root: '/'}, options);
+      this.options          = _.extend({}, {root: '/'}, this.options, options);
       this._wantsPushState  = !!this.options.pushState;
       this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
       var fragment          = this.getFragment();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/backbone.git