a85a0881 by Michael Richards

Build 0.5.5.

1 parent 548a4ea6
......@@ -2,7 +2,7 @@
"name": "rivets",
"repo": "mikeric/rivets",
"description": "Declarative data binding facility.",
"version": "0.5.4",
"version": "0.5.5",
"keywords": ["data binding", "templating"],
"scripts": ["dist/rivets.js"],
"main": "dist/rivets.js",
......
// Rivets.js
// version: 0.5.4
// version: 0.5.5
// author: Michael Richards
// license: MIT
(function() {
......@@ -630,7 +630,7 @@
}
},
routine: function(el, collection) {
var data, i, index, k, key, model, modelName, options, previous, template, v, view, _i, _j, _len, _len1, _ref, _ref1, _ref2, _results;
var data, i, index, k, key, model, modelName, options, previous, template, v, view, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3, _results;
modelName = this.args[0];
collection = collection || [];
......@@ -652,7 +652,9 @@
_ref1 = this.view.models;
for (key in _ref1) {
model = _ref1[key];
data[key] = model;
if ((_ref2 = data[key]) == null) {
data[key] = model;
}
}
previous = this.iterated.length ? this.iterated[this.iterated.length - 1].els[0] : this.marker;
options = {
......@@ -660,9 +662,9 @@
formatters: this.view.options.formatters,
config: {}
};
_ref2 = this.view.options.config;
for (k in _ref2) {
v = _ref2[k];
_ref3 = this.view.options.config;
for (k in _ref3) {
v = _ref3[k];
options.config[k] = v;
}
options.config.preloadData = true;
......
{
"name": "rivets",
"description": "Declarative data binding facility.",
"version": "0.5.4",
"version": "0.5.5",
"author": "Michael Richards",
"url": "http://rivetsjs.com",
"main": "./dist/rivets.js",
......
# Rivets.js
# =========
# > version: 0.5.4
# > version: 0.5.5
# > author: Michael Richards
# > license: MIT
# >
......