Skip to content

Commit ac264bd

Browse files
author
Vlad Balin
committed
Started changing the collections
1 parent 55dbe3f commit ac264bd

31 files changed

+531
-183
lines changed
Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
55
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
66
<head>
7-
<title>Aggregation Tree - Type-R</title>
7+
<title>Overview - Type-R</title>
88
<meta name="description" content="Universal state management framework" />
99
<meta name="author" content="Vlad Balin">
1010
<meta charset="UTF-8">
11-
<link rel="icon" href="themes/daux/img/favicon-navy.png" type="image/x-icon">
11+
<link rel="icon" href="../themes/daux/img/favicon-navy.png" type="image/x-icon">
1212
<!-- Mobile -->
1313
<meta name="apple-mobile-web-app-capable" content="yes" />
1414
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1515

1616
<!-- Font -->
1717
<link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic' rel='stylesheet' type='text/css'>
1818
<!-- CSS -->
19-
<link href='themes/daux/css/theme-navy.min.css' rel='stylesheet' type='text/css'>
19+
<link href='../themes/daux/css/theme-navy.min.css' rel='stylesheet' type='text/css'>
2020
<!-- Tipue Search -->
21-
<link href="tipuesearch/tipuesearch.css" rel="stylesheet">
21+
<link href="../tipuesearch/tipuesearch.css" rel="stylesheet">
2222

2323
<!--[if lt IE 9]>
2424
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -27,7 +27,7 @@
2727
<body class="">
2828

2929
<header class="Navbar hidden-print">
30-
<a class="Navbar__brand" href="index.html">Type-R</a>
30+
<a class="Navbar__brand" href="../index.html">Type-R</a>
3131

3232
<div class="Search">
3333
<svg class="Search__icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 451 451"><path d="M447.05 428l-109.6-109.6c29.4-33.8 47.2-77.9 47.2-126.1C384.65 86.2 298.35 0 192.35 0 86.25 0 .05 86.3.05 192.3s86.3 192.3 192.3 192.3c48.2 0 92.3-17.8 126.1-47.2L428.05 447c2.6 2.6 6.1 4 9.5 4s6.9-1.3 9.5-4c5.2-5.2 5.2-13.8 0-19zM26.95 192.3c0-91.2 74.2-165.3 165.3-165.3 91.2 0 165.3 74.2 165.3 165.3s-74.1 165.4-165.3 165.4c-91.1 0-165.3-74.2-165.3-165.4z"/></svg>
@@ -46,7 +46,7 @@
4646

4747
<div class="Collapsible__content">
4848
<!-- Navigation -->
49-
<ul class='Nav'><li class='Nav__item '><a href="Getting_Started.html">Getting Started</a></li><li class='Nav__item '><a href="Overview.html">Overview</a></li><li class='Nav__item has-children'><a href="Record/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Record</a><ul class='Nav'><li class='Nav__item '><a href="Record/Overview.html">Overview</a></li><li class='Nav__item '><a href="Record/Aggregation_tree.html">Aggregation tree</a></li><li class='Nav__item '><a href="Record/Updates_and_change_events.html">Updates and change events</a></li><li class='Nav__item '><a href="Record/Validation.html">Validation</a></li><li class='Nav__item '><a href="Record/Custom_serialization.html">Custom serialization</a></li><li class='Nav__item '><a href="Record/id_ and_id-references.html">id and id-references</a></li></ul></li><li class='Nav__item has-children'><a href="Collection/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Collection</a><ul class='Nav'><li class='Nav__item '><a href="Collection/Overview.html">Overview</a></li><li class='Nav__item '><a href="Collection/Proxied_array_methods.html">Proxied array methods</a></li><li class='Nav__item '><a href="Collection/Iteration_methods.html">Iteration methods</a></li><li class='Nav__item '><a href="Collection/Sorted_collections.html">Sorted collections</a></li><li class='Nav__item '><a href="Collection/Serialization.html">Serialization</a></li><li class='Nav__item '><a href="Collection/Updates_and_Events.html">Updates and Events</a></li><li class='Nav__item '><a href="Collection/Validation.html">Validation</a></li></ul></li><li class='Nav__item Nav__item--active'><a href="Aggregation_Tree.html">Aggregation Tree</a></li><li class='Nav__item '><a href="Serialization.html">Serialization</a></li><li class='Nav__item '><a href="Validation.html">Validation</a></li><li class='Nav__item '><a href="Events.html">Events</a></li><li class='Nav__item '><a href="Mixins.html">Mixins</a></li></ul>
49+
<ul class='Nav'><li class='Nav__item '><a href="../Getting_Started.html">Getting Started</a></li><li class='Nav__item '><a href="../Overview.html">Overview</a></li><li class='Nav__item has-children'><a href="../Record/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Record</a><ul class='Nav'><li class='Nav__item '><a href="../Record/Overview.html">Overview</a></li><li class='Nav__item '><a href="../Record/Aggregation_tree.html">Aggregation tree</a></li><li class='Nav__item '><a href="../Record/Updates_and_change_events.html">Updates and change events</a></li><li class='Nav__item '><a href="../Record/Validation.html">Validation</a></li><li class='Nav__item '><a href="../Record/Custom_serialization.html">Custom serialization</a></li><li class='Nav__item '><a href="../Record/id_ and_id-references.html">id and id-references</a></li></ul></li><li class='Nav__item has-children'><a href="../Collection/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Collection</a><ul class='Nav'><li class='Nav__item '><a href="../Collection/Overview.html">Overview</a></li><li class='Nav__item '><a href="../Collection/Proxied_array_methods.html">Proxied array methods</a></li><li class='Nav__item '><a href="../Collection/Iteration_methods.html">Iteration methods</a></li><li class='Nav__item '><a href="../Collection/Sorted_collections.html">Sorted collections</a></li><li class='Nav__item '><a href="../Collection/Serialization.html">Serialization</a></li><li class='Nav__item '><a href="../Collection/Updates_and_Events.html">Updates and Events</a></li><li class='Nav__item '><a href="../Collection/Validation.html">Validation</a></li></ul></li><li class='Nav__item Nav__item--open has-children'><a href="../Aggregation_tree/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Aggregation tree</a><ul class='Nav'><li class='Nav__item Nav__item--active'><a href="../Aggregation_tree/Overview.html">Overview</a></li><li class='Nav__item '><a href="../Aggregation_tree/Serialization.html">Serialization</a></li><li class='Nav__item '><a href="../Aggregation_tree/Validation.html">Validation</a></li><li class='Nav__item '><a href="../Aggregation_tree/Shared_objects.html">Shared objects</a></li><li class='Nav__item '><a href="../Aggregation_tree/id-references.html">id-references</a></li></ul></li><li class='Nav__item '><a href="../Events.html">Events</a></li><li class='Nav__item '><a href="../Mixins.html">Mixins</a></li></ul>
5050

5151
<div class="Links">
5252
<hr/>
@@ -75,9 +75,9 @@
7575
<article class="Page">
7676

7777
<div class="Page__header">
78-
<h1>Aggregation Tree</h1>
78+
<h1>Overview</h1>
7979
<span style="float: right; font-size: 10px; color: gray;">
80-
<a href="https://github.com/Volicon/React-MVx/blob/develop/docs/07_Aggregation_Tree.md" target="_blank">Edit on GitHub</a>
80+
<a href="https://github.com/Volicon/React-MVx/blob/develop/docs/06_Aggregation_tree/01_Overview.md" target="_blank">Edit on GitHub</a>
8181
</span>
8282
</div>
8383

@@ -109,34 +109,6 @@ <h1>Aggregation Tree</h1>
109109
<li>They are validated as part of the record.</li>
110110
<li>They are serialized as nested JSON.</li>
111111
</ul>
112-
<h1 id="page_Shared+objects">Shared objects</h1>
113-
<p>Record's attributes can hold the records and collections from <em>other</em> aggregation trees if they are marked as <code>shared</code>.</p>
114-
<h3 id="page_attr+%3A+RecordOrCollection.shared"><code>attrDef</code> attr : RecordOrCollection.shared</h3>
115-
<p>Record's attribute with a reference to the shared model or collection.</p>
116-
<ul>
117-
<li>It's initialized with <code>null</code>
118-
</li>
119-
<li>It's not cloned when the record is cloned (just the reference is copied over).</li>
120-
<li>It's not disposed when the record is disposed.</li>
121-
<li>It's not validated as part of the record (always valid by default)</li>
122-
<li>It's excluded from serialization.</li>
123-
</ul>
124-
<pre><code class="language-javascript">@define class UsersListState extends Record {
125-
static attributes = {
126-
users : User.Collection,
127-
selected : User.shared // Can be assigned with the user from this.users
128-
}
129-
}
130-
</code></pre>
131-
<h3 id="page_attr+%3A+Collection.Refs"><code>attrDef</code> attr : Collection.Refs</h3>
132-
<h3 id="page_new+Collection.Refs%28%29">new Collection.Refs()</h3>
133-
<p>Collection of references to shared records, which <em>does not aggregate</em> its elements. In constrast to the <code>Collection.shared</code>, <code>Collection.Refs</code> creates an instance of collection which <em>is the part the parent record</em>. Still, its items are not validated and serialized.</p>
134-
<pre><code>@define class MyRecord extends Record {
135-
static attributes = {
136-
notCloned : SomeCollection.shared, // Reference to the _shared collection_ object.
137-
cloned : SomeCollection.Refs // _Aggregated_ collection of references to the _shared records_.
138-
}
139-
</code></pre>
140112
<h1 id="page_Aggregation+tree+methods">Aggregation tree methods</h1>
141113
<h3 id="page_recordOrCollection.getOwner%28%29">recordOrCollection.getOwner()</h3>
142114
<p>Return the reference to the record's owner, or <code>null</code> if record is not the part of aggregation tree.</p>
@@ -157,7 +129,7 @@ <h3 id="page_recordOrCollection.dispose%28%29">recordOrCollection.dispose()</h3>
157129

158130
<nav>
159131
<ul class="Pager">
160-
<li class=Pager--prev><a href="Collection/Validation.html">Previous</a></li> <li class=Pager--next><a href="Serialization.html">Next</a></li> </ul>
132+
<li class=Pager--prev><a href="../Collection/Validation.html">Previous</a></li> <li class=Pager--next><a href="../Aggregation_tree/Serialization.html">Next</a></li> </ul>
161133
</nav>
162134
</article>
163135

@@ -168,24 +140,24 @@ <h3 id="page_recordOrCollection.dispose%28%29">recordOrCollection.dispose()</h3>
168140

169141

170142
<!-- jQuery -->
171-
<script src="themes/daux/js/jquery-1.11.3.min.js"></script>
143+
<script src="../themes/daux/js/jquery-1.11.3.min.js"></script>
172144

173145
<!-- hightlight.js -->
174-
<script src="themes/daux/js/highlight.pack.js"></script>
146+
<script src="../themes/daux/js/highlight.pack.js"></script>
175147
<script>hljs.initHighlightingOnLoad();</script>
176148

177149
<!-- JS -->
178150

179-
<script src="themes/daux/js/daux.js"></script>
151+
<script src="../themes/daux/js/daux.js"></script>
180152

181153
<!-- Tipue Search -->
182-
<script type="text/javascript" src="tipuesearch/tipuesearch.js"></script>
154+
<script type="text/javascript" src="../tipuesearch/tipuesearch.js"></script>
183155

184156
<script>
185157
window.onunload = function(){}; // force $(document).ready to be called on back/forward navigation in firefox
186158
$(function() {
187159
tipuesearch({
188-
'base_url': ''
160+
'base_url': '../'
189161
});
190162
});
191163
</script>
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<meta name="description" content="Universal state management framework" />
99
<meta name="author" content="Vlad Balin">
1010
<meta charset="UTF-8">
11-
<link rel="icon" href="themes/daux/img/favicon-navy.png" type="image/x-icon">
11+
<link rel="icon" href="../themes/daux/img/favicon-navy.png" type="image/x-icon">
1212
<!-- Mobile -->
1313
<meta name="apple-mobile-web-app-capable" content="yes" />
1414
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1515

1616
<!-- Font -->
1717
<link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic' rel='stylesheet' type='text/css'>
1818
<!-- CSS -->
19-
<link href='themes/daux/css/theme-navy.min.css' rel='stylesheet' type='text/css'>
19+
<link href='../themes/daux/css/theme-navy.min.css' rel='stylesheet' type='text/css'>
2020
<!-- Tipue Search -->
21-
<link href="tipuesearch/tipuesearch.css" rel="stylesheet">
21+
<link href="../tipuesearch/tipuesearch.css" rel="stylesheet">
2222

2323
<!--[if lt IE 9]>
2424
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -27,7 +27,7 @@
2727
<body class="">
2828

2929
<header class="Navbar hidden-print">
30-
<a class="Navbar__brand" href="index.html">Type-R</a>
30+
<a class="Navbar__brand" href="../index.html">Type-R</a>
3131

3232
<div class="Search">
3333
<svg class="Search__icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 451 451"><path d="M447.05 428l-109.6-109.6c29.4-33.8 47.2-77.9 47.2-126.1C384.65 86.2 298.35 0 192.35 0 86.25 0 .05 86.3.05 192.3s86.3 192.3 192.3 192.3c48.2 0 92.3-17.8 126.1-47.2L428.05 447c2.6 2.6 6.1 4 9.5 4s6.9-1.3 9.5-4c5.2-5.2 5.2-13.8 0-19zM26.95 192.3c0-91.2 74.2-165.3 165.3-165.3 91.2 0 165.3 74.2 165.3 165.3s-74.1 165.4-165.3 165.4c-91.1 0-165.3-74.2-165.3-165.4z"/></svg>
@@ -46,7 +46,7 @@
4646

4747
<div class="Collapsible__content">
4848
<!-- Navigation -->
49-
<ul class='Nav'><li class='Nav__item '><a href="Getting_Started.html">Getting Started</a></li><li class='Nav__item '><a href="Overview.html">Overview</a></li><li class='Nav__item has-children'><a href="Record/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Record</a><ul class='Nav'><li class='Nav__item '><a href="Record/Overview.html">Overview</a></li><li class='Nav__item '><a href="Record/Aggregation_tree.html">Aggregation tree</a></li><li class='Nav__item '><a href="Record/Updates_and_change_events.html">Updates and change events</a></li><li class='Nav__item '><a href="Record/Validation.html">Validation</a></li><li class='Nav__item '><a href="Record/Custom_serialization.html">Custom serialization</a></li><li class='Nav__item '><a href="Record/id_ and_id-references.html">id and id-references</a></li></ul></li><li class='Nav__item has-children'><a href="Collection/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Collection</a><ul class='Nav'><li class='Nav__item '><a href="Collection/Overview.html">Overview</a></li><li class='Nav__item '><a href="Collection/Proxied_array_methods.html">Proxied array methods</a></li><li class='Nav__item '><a href="Collection/Iteration_methods.html">Iteration methods</a></li><li class='Nav__item '><a href="Collection/Sorted_collections.html">Sorted collections</a></li><li class='Nav__item '><a href="Collection/Serialization.html">Serialization</a></li><li class='Nav__item '><a href="Collection/Updates_and_Events.html">Updates and Events</a></li><li class='Nav__item '><a href="Collection/Validation.html">Validation</a></li></ul></li><li class='Nav__item '><a href="Aggregation_Tree.html">Aggregation Tree</a></li><li class='Nav__item Nav__item--active'><a href="Serialization.html">Serialization</a></li><li class='Nav__item '><a href="Validation.html">Validation</a></li><li class='Nav__item '><a href="Events.html">Events</a></li><li class='Nav__item '><a href="Mixins.html">Mixins</a></li></ul>
49+
<ul class='Nav'><li class='Nav__item '><a href="../Getting_Started.html">Getting Started</a></li><li class='Nav__item '><a href="../Overview.html">Overview</a></li><li class='Nav__item has-children'><a href="../Record/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Record</a><ul class='Nav'><li class='Nav__item '><a href="../Record/Overview.html">Overview</a></li><li class='Nav__item '><a href="../Record/Aggregation_tree.html">Aggregation tree</a></li><li class='Nav__item '><a href="../Record/Updates_and_change_events.html">Updates and change events</a></li><li class='Nav__item '><a href="../Record/Validation.html">Validation</a></li><li class='Nav__item '><a href="../Record/Custom_serialization.html">Custom serialization</a></li><li class='Nav__item '><a href="../Record/id_ and_id-references.html">id and id-references</a></li></ul></li><li class='Nav__item has-children'><a href="../Collection/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Collection</a><ul class='Nav'><li class='Nav__item '><a href="../Collection/Overview.html">Overview</a></li><li class='Nav__item '><a href="../Collection/Proxied_array_methods.html">Proxied array methods</a></li><li class='Nav__item '><a href="../Collection/Iteration_methods.html">Iteration methods</a></li><li class='Nav__item '><a href="../Collection/Sorted_collections.html">Sorted collections</a></li><li class='Nav__item '><a href="../Collection/Serialization.html">Serialization</a></li><li class='Nav__item '><a href="../Collection/Updates_and_Events.html">Updates and Events</a></li><li class='Nav__item '><a href="../Collection/Validation.html">Validation</a></li></ul></li><li class='Nav__item Nav__item--open has-children'><a href="../Aggregation_tree/Overview.html" class="folder"><i class="Nav__arrow">&nbsp;</i>Aggregation tree</a><ul class='Nav'><li class='Nav__item '><a href="../Aggregation_tree/Overview.html">Overview</a></li><li class='Nav__item Nav__item--active'><a href="../Aggregation_tree/Serialization.html">Serialization</a></li><li class='Nav__item '><a href="../Aggregation_tree/Validation.html">Validation</a></li><li class='Nav__item '><a href="../Aggregation_tree/Shared_objects.html">Shared objects</a></li><li class='Nav__item '><a href="../Aggregation_tree/id-references.html">id-references</a></li></ul></li><li class='Nav__item '><a href="../Events.html">Events</a></li><li class='Nav__item '><a href="../Mixins.html">Mixins</a></li></ul>
5050

5151
<div class="Links">
5252
<hr/>
@@ -77,7 +77,7 @@
7777
<div class="Page__header">
7878
<h1>Serialization</h1>
7979
<span style="float: right; font-size: 10px; color: gray;">
80-
<a href="https://github.com/Volicon/React-MVx/blob/develop/docs/08_Serialization.md" target="_blank">Edit on GitHub</a>
80+
<a href="https://github.com/Volicon/React-MVx/blob/develop/docs/06_Aggregation_tree/02_Serialization.md" target="_blank">Edit on GitHub</a>
8181
</span>
8282
</div>
8383

@@ -105,7 +105,7 @@ <h3 id="page_attr+%3A+Type.has.parse%28+%28+json%2C+name+%29+%3D%3E+value+%29"><
105105

106106
<nav>
107107
<ul class="Pager">
108-
<li class=Pager--prev><a href="Aggregation_Tree.html">Previous</a></li> <li class=Pager--next><a href="Validation.html">Next</a></li> </ul>
108+
<li class=Pager--prev><a href="../Aggregation_tree/Overview.html">Previous</a></li> <li class=Pager--next><a href="../Aggregation_tree/Validation.html">Next</a></li> </ul>
109109
</nav>
110110
</article>
111111

@@ -116,24 +116,24 @@ <h3 id="page_attr+%3A+Type.has.parse%28+%28+json%2C+name+%29+%3D%3E+value+%29"><
116116

117117

118118
<!-- jQuery -->
119-
<script src="themes/daux/js/jquery-1.11.3.min.js"></script>
119+
<script src="../themes/daux/js/jquery-1.11.3.min.js"></script>
120120

121121
<!-- hightlight.js -->
122-
<script src="themes/daux/js/highlight.pack.js"></script>
122+
<script src="../themes/daux/js/highlight.pack.js"></script>
123123
<script>hljs.initHighlightingOnLoad();</script>
124124

125125
<!-- JS -->
126126

127-
<script src="themes/daux/js/daux.js"></script>
127+
<script src="../themes/daux/js/daux.js"></script>
128128

129129
<!-- Tipue Search -->
130-
<script type="text/javascript" src="tipuesearch/tipuesearch.js"></script>
130+
<script type="text/javascript" src="../tipuesearch/tipuesearch.js"></script>
131131

132132
<script>
133133
window.onunload = function(){}; // force $(document).ready to be called on back/forward navigation in firefox
134134
$(function() {
135135
tipuesearch({
136-
'base_url': ''
136+
'base_url': '../'
137137
});
138138
});
139139
</script>

0 commit comments

Comments
 (0)