Skip to content

Commit d6a9f58

Browse files
author
Vlad Balin
committed
Merge remote-tracking branch 'refs/remotes/origin/develop'
Conflicts: package.json
2 parents e6f05b0 + 2012aab commit d6a9f58

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "backbone.nested-types",
2+
"name": "nestedtypes",
33
"main": "nestedtypes.js",
4-
"description": "backbone.js extension adding type annotations to model attributes, easiest possible way of dealing with nested models and collections, and native properties for attributes. Providing you with a more or less complete, simple, and powerful object system for JavaScript.",
4+
"description": "Next generation data framework, which can be used as drop-in backbonejs replacement.",
55
"homepage": "https://github.com/Volicon/backbone.nestedTypes",
66
"keywords": [ "backbone", "relation", "nested", "model", "types", "properties" ],
77
"repository": {
@@ -12,11 +12,11 @@
1212
"contributors": "",
1313
"dependencies": {
1414
"underscore": ">=1.5.0",
15-
"backbone": ">=1.1.2"
15+
"jquery" : ">=2.0.0"
1616
},
1717
"files": [
1818
"nestedtypes.js"
1919
],
2020
"license": "MIT",
21-
"version": "1.1.0"
21+
"version": "1.1.8"
2222
}

nestedtypes.js

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"LICENSE"
3636
],
3737
"license": "MIT",
38-
"version": "1.1.7",
38+
"version": "1.1.8",
3939
"scripts": {
4040
"test": "node_modules/.bin/mocha",
4141
"build": "./node_modules/.bin/webpack",

src/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var Store = exports.Model = Model.extend({
1010
// end store lookup sequence on this class
1111
getStore : function(){ return this; },
1212

13-
sync : Backbone.sync,
13+
sync : function(){ return Backbone.sync.apply( Backbone, arguments ); },
1414
// delegate item lookup to owner, and to the global store if undefined
1515
get : function( name ){ return this[ name ] || ( this._owner && this._owner.get( name ) ) || _store[ name ]; }
1616
});

0 commit comments

Comments
 (0)