Skip to content

Commit 5d85604

Browse files
committed
release 0.7.7
1 parent 4b342d3 commit 5d85604

File tree

5 files changed

+243
-139
lines changed

5 files changed

+243
-139
lines changed

Diff for: bookshelf.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Bookshelf.js 0.7.6
1+
// Bookshelf.js 0.7.7
22
// ---------------
33

44
// (c) 2013 Tim Griesser
@@ -15,7 +15,7 @@ var Bookshelf = function() {
1515
// `Model` and `Collection` constructors for use in the current instance.
1616
Bookshelf.initialize = function(knex) {
1717
var bookshelf = {
18-
VERSION: '0.7.6'
18+
VERSION: '0.7.7'
1919
};
2020

2121
var _ = require('lodash');

Diff for: browser/bookshelf.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Bookshelf=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
2-
// Bookshelf.js 0.7.6
2+
// Bookshelf.js 0.7.7
33
// ---------------
44

55
// (c) 2013 Tim Griesser
@@ -16,7 +16,7 @@ var Bookshelf = function() {
1616
// `Model` and `Collection` constructors for use in the current instance.
1717
Bookshelf.initialize = function(knex) {
1818
var bookshelf = {
19-
VERSION: '0.7.6'
19+
VERSION: '0.7.7'
2020
};
2121

2222
var _ = _dereq_('lodash');
@@ -1311,6 +1311,7 @@ _.extend(BookshelfRelation.prototype, {
13111311
// If the parent object is eager loading, and it's a polymorphic `morphTo` relation,
13121312
// we can't know what the target will be until the models are sorted and matched.
13131313
if (this.type === 'morphTo' && !parent._isEager) {
1314+
parent.attributes = parent.format(parent.attributes);
13141315
this.target = Helpers.morphCandidate(this.candidates, parent.get(this.key('morphKey')));
13151316
this.targetTableName = _.result(this.target.prototype, 'tableName');
13161317
this.targetIdAttribute = _.result(this.target.prototype, 'idAttribute');

0 commit comments

Comments
 (0)