Skip to content

brainfood / rivets

Go to a project
Toggle navigation
Toggle navigation pinning
372a30f1 by Michael Richards
Options

Merge branch 'master' into advanced-custom-binders-api

2 parents 11b5f2da 84e325a6
Expand all
Inline Side-by-side
Showing 4 changed files with 10 additions and 5 deletions
1 // rivets.js 1 // rivets.js
2 // version: 0.3.12 2 // version: 0.3.13
3 // author: Michael Richards 3 // author: Michael Richards
4 // license: MIT 4 // license: MIT
5 (function() { 5 (function() {
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 if (!this.options.bypass) { 126 if (!this.options.bypass) {
127 Rivets.config.adapter.unsubscribe(this.model, this.keypath, this.sync); 127 Rivets.config.adapter.unsubscribe(this.model, this.keypath, this.sync);
128 if (this.isBidirectional()) { 128 if (this.isBidirectional()) {
129 unbindEvent(this.el('change', this.publish)); 129 unbindEvent(this.el, 'change', this.publish);
130 } 130 }
131 } 131 }
132 if ((_ref = this.options.dependencies) != null ? _ref.length : void 0) { 132 if ((_ref = this.options.dependencies) != null ? _ref.length : void 0) {
...@@ -238,8 +238,13 @@ ...@@ -238,8 +238,13 @@
238 path = context.shift(); 238 path = context.shift();
239 splitPath = path.split(/\.|:/); 239 splitPath = path.split(/\.|:/);
240 options.formatters = pipes; 240 options.formatters = pipes;
241 model = _this.models[splitPath.shift()];
242 options.bypass = path.indexOf(':') !== -1; 241 options.bypass = path.indexOf(':') !== -1;
242 if (splitPath[0]) {
243 model = _this.models[splitPath.shift()];
244 } else {
245 model = _this.models;
246 splitPath.shift();
247 }
243 keypath = splitPath.join('.'); 248 keypath = splitPath.join('.');
244 if (model) { 249 if (model) {
245 if (dependencies = context.shift()) { 250 if (dependencies = context.shift()) {
......
1 { 1 {
2 "name" : "rivets", 2 "name" : "rivets",
3 "description" : "Declarative data binding facility.", 3 "description" : "Declarative data binding facility.",
4 "version" : "0.3.12", 4 "version" : "0.3.13",
5 "author" : "Michael Richards", 5 "author" : "Michael Richards",
6 "url" : "http://rivetsjs.com", 6 "url" : "http://rivetsjs.com",
7 "main" : "./lib/rivets.js", 7 "main" : "./lib/rivets.js",
......
1 # rivets.js 1 # rivets.js
2 # version : 0.3.12 2 # version : 0.3.13
3 # author : Michael Richards 3 # author : Michael Richards
4 # license : MIT 4 # license : MIT
5 5
......