Skip to content

Commit

Permalink
release 0.7.7
Browse files Browse the repository at this point in the history
  • Loading branch information
tgriesser committed Jul 23, 2014
1 parent 4b342d3 commit 5d85604
Showing 5 changed files with 243 additions and 139 deletions.
4 changes: 2 additions & 2 deletions bookshelf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Bookshelf.js 0.7.6
// Bookshelf.js 0.7.7
// ---------------

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

var _ = require('lodash');
5 changes: 3 additions & 2 deletions browser/bookshelf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!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){
// Bookshelf.js 0.7.6
// Bookshelf.js 0.7.7
// ---------------

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

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

0 comments on commit 5d85604

Please sign in to comment.