Comparing version 0.2.4 to 0.2.5
@@ -1,2 +0,2 @@ | ||
// Bookshelf.js 0.2.4 | ||
// Bookshelf.js 0.2.5 | ||
@@ -9,2 +9,4 @@ // (c) 2013 Tim Griesser | ||
"use strict"; | ||
// Initial Setup | ||
@@ -29,3 +31,3 @@ // ------------- | ||
// Keep in sync with `package.json`. | ||
Bookshelf.VERSION = '0.2.4'; | ||
Bookshelf.VERSION = '0.2.5'; | ||
@@ -60,3 +62,5 @@ // We're using `Backbone.Events` rather than `EventEmitter`, | ||
var method = args[0]; | ||
if (_.isObject(method)) { | ||
if (_.isFunction(method)) { | ||
method.apply(this._builder, this._builder); | ||
} else if (_.isObject(method)) { | ||
for (var key in method) { | ||
@@ -66,5 +70,5 @@ var target = _.isArray(method[key]) ? method[key] : [method[key]]; | ||
} | ||
return this; | ||
} else { | ||
this._builder[method].apply(this._builder, args.slice(1)); | ||
} | ||
this._builder[method].apply(this._builder, args.slice(1)); | ||
return this; | ||
@@ -932,3 +936,3 @@ }, | ||
if (relatedData) { | ||
if (!relatedData.fkValue && !options.parentResponse) { | ||
if (relatedData.fkValue == null && !options.parentResponse) { | ||
return when.reject(new Error("The " + relatedData.otherKey + " must be specified.")); | ||
@@ -1178,2 +1182,2 @@ } | ||
}).call(this); | ||
}).call(this); |
{ | ||
"name": "bookshelf", | ||
"version": "0.2.4", | ||
"version": "0.2.5", | ||
"description": "A lightweight Active Record ORM for PostgreSQL, MySQL, and SQLite3, influenced by Backbone.js", | ||
@@ -36,3 +36,5 @@ "main": "bookshelf.js", | ||
"objectdump": "~0.3.0", | ||
"underscore.string": "~2.3.1" | ||
"underscore.string": "~2.3.1", | ||
"grunt": "~0.4.1", | ||
"grunt-release": "~0.5.1" | ||
}, | ||
@@ -39,0 +41,0 @@ "author": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
171102
20
4598
8