Skip to content

Commit

Permalink
Moved Bugfix from build output to source
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Meixner committed Jun 26, 2015
1 parent 286363a commit 063ae0a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 1 addition & 4 deletions hammer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1256,13 +1256,10 @@ var STATE_FAILED = 32;
* @param {Object} options
*/
function Recognizer(options) {
// make sure, options are copied over to a new object to prevent leaking it outside
options = extend({}, options || {});

this.id = uniqueId();

this.manager = null;
this.options = merge(options, this.defaults);
this.options = merge(options || {}, this.defaults);

// default is enable true
this.options.enable = ifUndefined(this.options.enable, true);
Expand Down
5 changes: 4 additions & 1 deletion src/recognizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ var STATE_FAILED = 32;
* @param {Object} options
*/
function Recognizer(options) {
// make sure, options are copied over to a new object to prevent leaking it outside
options = extend({}, options || {});

this.id = uniqueId();

this.manager = null;
this.options = merge(options || {}, this.defaults);
this.options = merge(options, this.defaults);

// default is enable true
this.options.enable = ifUndefined(this.options.enable, true);
Expand Down

0 comments on commit 063ae0a

Please sign in to comment.