Skip to content

Commit

Permalink
Update version to 0.5.18.
Browse files Browse the repository at this point in the history
  • Loading branch information
mcfarljw committed Nov 2, 2016
1 parent a1f6f36 commit c24b3c9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions dist/backbone-gelato.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Backbone Gelato
* Version: 0.5.17
* Date: Tue Nov 01 2016 10:38:36 GMT+0800 (CST)
* Version: 0.5.18
* Date: Wed Nov 02 2016 10:24:38 GMT+0800 (CST)
*/
html, body {
height: 100%;
Expand Down
16 changes: 7 additions & 9 deletions dist/backbone-gelato.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Backbone Gelato
* Version: 0.5.17
* Date: Tue Nov 01 2016 10:38:36 GMT+0800 (CST)
* Version: 0.5.18
* Date: Wed Nov 02 2016 10:24:38 GMT+0800 (CST)
*/
;(function(root, factory) {
if (typeof define === 'function' && define.amd) {
Expand Down Expand Up @@ -113,9 +113,9 @@ Gelato.isLocalhost = isLocalhost;

Gelato.isWebsite = isWebsite;

Gelato._BUILD = 'Tue Nov 01 2016 10:38:36 GMT+0800 (CST)';
Gelato._BUILD = 'Wed Nov 02 2016 10:24:38 GMT+0800 (CST)';

Gelato._VERSION = '0.5.17';
Gelato._VERSION = '0.5.18';

var GelatoApplication = function (_Backbone$View) {
_inherits(GelatoApplication, _Backbone$View);
Expand Down Expand Up @@ -216,7 +216,7 @@ var GelatoView = function (_Backbone$View2) {
var _this2 = _possibleConstructorReturn(this, (GelatoView.__proto__ || Object.getPrototypeOf(GelatoView)).call(this, options));

_this2.components = {};
_this2.parent = null;
_this2.parent = Backbone.$(document.body);
return _this2;
}

Expand Down Expand Up @@ -299,7 +299,7 @@ var GelatoView = function (_Backbone$View2) {
var _this3 = this;

_.forOwn(this.components, function (component) {
component.parent = _this3;
component.parent = _this3.$el;

if (component.autoRender) {
component.render();
Expand Down Expand Up @@ -431,9 +431,7 @@ var GelatoComponent = function (_Gelato$View) {
_createClass(GelatoComponent, [{
key: 'renderTemplate',
value: function renderTemplate(context) {
if (this.container) {
this.parent.$(this.container).html(this.$el);
}
this.parent.find(this.container).html(this.$el);

Gelato.View.prototype.renderTemplate.call(this, context);

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"email": "[email protected]",
"url": "http://www.jernung.com"
},
"version": "0.5.17",
"version": "0.5.18",
"license": "MIT",
"main": "./dist/backbone-gelato.js",
"repository": {
Expand Down

0 comments on commit c24b3c9

Please sign in to comment.