a85a0881 by Michael Richards

Build 0.5.5.

1 parent 548a4ea6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 "name": "rivets", 2 "name": "rivets",
3 "repo": "mikeric/rivets", 3 "repo": "mikeric/rivets",
4 "description": "Declarative data binding facility.", 4 "description": "Declarative data binding facility.",
5 "version": "0.5.4", 5 "version": "0.5.5",
6 "keywords": ["data binding", "templating"], 6 "keywords": ["data binding", "templating"],
7 "scripts": ["dist/rivets.js"], 7 "scripts": ["dist/rivets.js"],
8 "main": "dist/rivets.js", 8 "main": "dist/rivets.js",
......
1 // Rivets.js 1 // Rivets.js
2 // version: 0.5.4 2 // version: 0.5.5
3 // author: Michael Richards 3 // author: Michael Richards
4 // license: MIT 4 // license: MIT
5 (function() { 5 (function() {
...@@ -630,7 +630,7 @@ ...@@ -630,7 +630,7 @@
630 } 630 }
631 }, 631 },
632 routine: function(el, collection) { 632 routine: function(el, collection) {
633 var data, i, index, k, key, model, modelName, options, previous, template, v, view, _i, _j, _len, _len1, _ref, _ref1, _ref2, _results; 633 var data, i, index, k, key, model, modelName, options, previous, template, v, view, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3, _results;
634 634
635 modelName = this.args[0]; 635 modelName = this.args[0];
636 collection = collection || []; 636 collection = collection || [];
...@@ -652,7 +652,9 @@ ...@@ -652,7 +652,9 @@
652 _ref1 = this.view.models; 652 _ref1 = this.view.models;
653 for (key in _ref1) { 653 for (key in _ref1) {
654 model = _ref1[key]; 654 model = _ref1[key];
655 data[key] = model; 655 if ((_ref2 = data[key]) == null) {
656 data[key] = model;
657 }
656 } 658 }
657 previous = this.iterated.length ? this.iterated[this.iterated.length - 1].els[0] : this.marker; 659 previous = this.iterated.length ? this.iterated[this.iterated.length - 1].els[0] : this.marker;
658 options = { 660 options = {
...@@ -660,9 +662,9 @@ ...@@ -660,9 +662,9 @@
660 formatters: this.view.options.formatters, 662 formatters: this.view.options.formatters,
661 config: {} 663 config: {}
662 }; 664 };
663 _ref2 = this.view.options.config; 665 _ref3 = this.view.options.config;
664 for (k in _ref2) { 666 for (k in _ref3) {
665 v = _ref2[k]; 667 v = _ref3[k];
666 options.config[k] = v; 668 options.config[k] = v;
667 } 669 }
668 options.config.preloadData = true; 670 options.config.preloadData = true;
......
1 { 1 {
2 "name": "rivets", 2 "name": "rivets",
3 "description": "Declarative data binding facility.", 3 "description": "Declarative data binding facility.",
4 "version": "0.5.4", 4 "version": "0.5.5",
5 "author": "Michael Richards", 5 "author": "Michael Richards",
6 "url": "http://rivetsjs.com", 6 "url": "http://rivetsjs.com",
7 "main": "./dist/rivets.js", 7 "main": "./dist/rivets.js",
......
1 # Rivets.js 1 # Rivets.js
2 # ========= 2 # =========
3 3
4 # > version: 0.5.4 4 # > version: 0.5.5
5 # > author: Michael Richards 5 # > author: Michael Richards
6 # > license: MIT 6 # > license: MIT
7 # > 7 # >
......