Merge remote-tracking branch 'refs/remotes/origin/develop'

Author: Vlad Balin

README.md

@@ -180,25 +180,22 @@ Event subscription is managed automatically. No props passed - no problems.
 ## Data binding
 
 `nestedreact` supports data binding links compatible with standard React's `valueLink`.
-Links are "live" in a sense that they always point to actual value based on current model or collection state.
-It doesn't break anything in React, rather extends possible use cases.
 
-- `var link = model.getLink( 'attr' )` creates link for model attribute. 
-- `var link = collection.getLink( model )` creates boolean link, toggling model in collection. True if model is contained in collection, assignments will add/remove given model. Useful for checkboxes.
+Create link for object property of Model, Collection, and every object type created with Object.extend().
 
-### Value access methods
+`var link = object.getLink( 'attr' )`  
 
-In addition to standard members `link.requestChange( x )` and `link.value`, links supports all popular property access styles:
+Create boolean link, toggling model in collection. True if model is contained in collection, assignments will add/remove given model. Useful for checkboxes.
+`var link = collection.hasLink( model )` 
 
-- jQuery property style: setter `link.val( x )`, getter `link.val()`
-- Backbone style: setter `link.set( x )`, getter `link.get()`
-- plain assugnments style: setter `link.value = x`, getter `link.value`
-- `link.toggle()` is a shortcut for `link.requestChange( !link.value )`
+Here's a brief reference for links API. Consult [Guide to Data Binding Use Cases](/example/databinding.md) to understand how to use it.
 
-Most efficient way to work with link is using `link.val()` function, that's how its internally implemented. `val` function is bound, and can be passed around safely.
+### Value access methods
 
-Here's a brief reference for liks API. Consult [Guide to Data Binding Use Cases](/example/databinding.md) to understand how to use it.
+In addition to standard members `link.requestChange( x )` and `link.value`, there are pair of shortcuts available:
 
+- `link.set( x )`, which is a shortcut for `this.requestChange( x )`
+- `link.toggle()` is a shortcut for `link.requestChange( !link.value )`
 
 ### Link transformations
 

example/databinding.md

@@ -18,7 +18,7 @@ Standard `<input/>` will work. Custom Checkbox component might be implemented li
 
 ```javascript
 const Checkbox = ({ className = 'checkbox', checkedLink }) => (
-    <div className={ className + ( checkedLink.val() ? ' selected' : '' ) }
+    <div className={ className + ( checkedLink.value ? ' selected' : '' ) }
          onClick = { checkedLink.update( x => !x ) }
     />
 );
@@ -113,7 +113,7 @@ with one difference in click handler:
 
 ```javascript
 const Radio = ({ className = 'radio', checkedLink }) => (
-    <div className={ className + ( checkedLink.val() ? ' selected' : '' ) }
+    <div className={ className + ( checkedLink.value ? ' selected' : '' ) }
          onClick = { checkedLink.update( () => true ) }
     />
 );
@@ -155,7 +155,7 @@ with validation and appearance.
 ```javascript
 const Input = ({ valueLink, ...props }) => (
     <div className='wrapping'
-        <input {...props} value={ valueLink.val() } onChange={ e => valueLink.val( e.target.value ) }/>
+        <input {...props} value={ valueLink.value } onChange={ e => valueLink.set( e.target.value ) }/>
     </div>
 );
 ```

nestedreact.js

@@ -29,7 +29,7 @@
     "nestedreact.js.map"
   ],
   "license": "MIT",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "scripts": {
     "build": "./node_modules/.bin/webpack",
     "watch": "./node_modules/.bin/webpack --watch"

nestedreact.js.map

@@ -37,36 +37,23 @@ var ValueLink = require( './value-link' );
 var Link = Nested.Link = ValueLink.Link;
 Nested.link = ValueLink.link;
 
-var ModelProto = Nested.Model.prototype;
+var ClassProto = Nested.Class.prototype,
+    ModelProto = Nested.Model.prototype,
+    CollectionProto = Nested.Collection.prototype;
 
-ModelProto.getLink = function( attr ){
+ClassProto.getLink = ModelProto.getLink = CollectionProto.getLink = function( attr ){
     var model = this;
 
-    return new Link( function( x ){
-        if( arguments.length ){
-            model[ attr ] = x;
-        }
-
-        return model[ attr ];
+    return new Link( model[ attr ], function( x ){
+        model[ attr ] = x;
     });
 };
 
-var CollectionProto = Nested.Collection.prototype;
-
-CollectionProto.getLink = function( model ){
+CollectionProto.hasLink = function( model ){
     var collection = this;
 
-    return new Link( function( x ){
-        var prev = Boolean( collection.get( model ) );
-
-        if( arguments.length ){
-            var next = Boolean( x );
-            if( prev !== next ){
-                collection.toggle( model, x );
-                return next;
-            }
-        }
-
-        return prev;
+    return new Link( Boolean( collection.get( model ) ), function( x ){
+        var next = Boolean( x );
+        this.value === next || collection.toggle( model, next );
     });
 };