Skip to content

Commit d3f30aa

Browse files
author
Vlad Balin
committed
Merge pull request #109 from Volicon/develop
Minor fixes
2 parents b98276b + 7a051b9 commit d3f30aa

File tree

4 files changed

+27
-6
lines changed

4 files changed

+27
-6
lines changed

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright (c) 2014-2015 Vlad Balin, Volicon
2+
3+
Permission is hereby granted, free of charge, to any person
4+
obtaining a copy of this software and associated documentation
5+
files (the "Software"), to deal in the Software without
6+
restriction, including without limitation the rights to use,
7+
copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the
9+
Software is furnished to do so, subject to the following
10+
conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
19+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.

nestedtypes.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@
3232
"webpack": "^1.12.2"
3333
},
3434
"files": [
35-
"nestedtypes.js"
35+
"nestedtypes.js",
36+
"LICENSE"
3637
],
3738
"license": "MIT",
38-
"version": "1.1.2",
39+
"version": "1.1.3",
3940
"scripts": {
4041
"test": "node_modules/.bin/mocha",
4142
"build": "./node_modules/.bin/webpack",

src/collection.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ module.exports = Backbone.Collection.extend( {
4343
this.__changing = 0;
4444
this._changed = false;
4545

46-
Backbone.Collection.apply( this, arguments );
47-
4846
this.listenTo( this, this._listenToChanges, handleChange );
47+
Backbone.Collection.apply( this, arguments );
4948
},
5049

5150
getStore : function(){

0 commit comments

Comments
 (0)