@@ -34,7 +34,7 @@ <h1 id="backbone-react-component">Backbone React Component</h1>
34
34
< div class ="pilwrap ">
35
35
< a class ="pilcrow " href ="#section-2 "> ¶</ a >
36
36
</ div >
37
- < pre > < code > Backbone.React.Component v0< span class ="hljs-number "> .8</ span > < span class ="hljs-number "> .0</ span > -beta < span class =" hljs-number " > .1 </ span >
37
+ < pre > < code > Backbone.React.Component v0< span class ="hljs-number "> .8</ span > < span class ="hljs-number "> .0</ span >
38
38
39
39
(c)
< span class ="
hljs-number "
> 2014
</ span > < span class ="
hljs-string "
> "Magalhas"
</ span > José Magalhães <
[email protected] >
40
40
Backbone.React.Component can be freely distributed under the MIT license.
@@ -435,6 +435,8 @@ <h1 id="backbone-react-component">Backbone React Component</h1>
435
435
</ div >
436
436
437
437
< div class ="content "> < div class ='highlight '> < pre > < span class ="hljs-keyword "> var</ span > props = nextProps || component.props || {};
438
+ < span class ="hljs-keyword "> var</ span > model, collection;
439
+
438
440
< span class ="hljs-keyword "> if</ span > (component.overrideModel && < span class ="hljs-keyword "> typeof</ span > component.overrideModel === < span class ="hljs-string "> 'function'</ span > ){</ pre > </ div > </ div >
439
441
440
442
</ li >
@@ -451,8 +453,11 @@ <h1 id="backbone-react-component">Backbone React Component</h1>
451
453
452
454
</ div >
453
455
454
- < div class ="content "> < div class ='highlight '> < pre > props.model = component.overrideModel();
456
+ < div class ="content "> < div class ='highlight '> < pre > model = component.overrideModel();
457
+ } < span class ="hljs-keyword "> else</ span > {
458
+ model = props.model;
455
459
}
460
+
456
461
< span class ="hljs-keyword "> if</ span > (component.overrideCollection && < span class ="hljs-keyword "> typeof</ span > component.overrideCollection === < span class ="hljs-string "> 'function'</ span > ){</ pre > </ div > </ div >
457
462
458
463
</ li >
@@ -469,9 +474,10 @@ <h1 id="backbone-react-component">Backbone React Component</h1>
469
474
470
475
</ div >
471
476
472
- < div class ="content "> < div class ='highlight '> < pre > props.collection = component.overrideCollection();
473
- }
474
- < span class ="hljs-keyword "> var</ span > model = props.model, collection = props.collection;</ pre > </ div > </ div >
477
+ < div class ="content "> < div class ='highlight '> < pre > collection = component.overrideCollection();
478
+ } < span class ="hljs-keyword "> else</ span > {
479
+ collection = props.collection;
480
+ }</ pre > </ div > </ div >
475
481
476
482
</ li >
477
483
0 commit comments