yonote/yjs
14
0
Fork 0
Code Pull Requests 1 Releases Activity

merge

Browse Source
This commit is contained in:
Kevin Jahns
2014-10-06 14:19:56 +02:00
parent 693f9bab67 98e582c413
commit d2f16eaa87
62 changed files with 2357 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/class/IwcConnector.html
View File

@@ -302,7 +302,11 @@ data from the received intent.</p>
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

4
doc/class/JsonFramework.html
View File

@@ -335,7 +335,11 @@ JsonFramework was initialized (Depending on the HistoryBuffer implementation).</
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

4
doc/class/JsonType.html
View File

@@ -466,7 +466,11 @@ if (x.type === &quot;JsonType&quot;) {
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

4
doc/class/JsonTypeWrapper.html
View File

@@ -139,7 +139,11 @@ console.log(w.newProperty == &quot;Awesome&quot;) # true!</code></pre>
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

24
doc/class/PeerJsConnector.html
View File

@@ -72,6 +72,17 @@ user-id of the peer (browser/client). And then you can connect to it.</p>
Receive the id of every connected peer.
</span>
</li>
<li>
<span class='signature'>
<a href='#onNewConnection-dynamic'>
#
(void)
<b>onNewConnection</b><span>(f)</span>
</a>
</span>
<span class='desc'>
</span>
</li>
<li>
<span class='signature'>
<a href='#addConnection-dynamic'>
@@ -194,6 +205,15 @@ on how to do that with urls.</p>
</li>
</ul>
</div>
</div>
<div class='method_details'>
<p class='signature' id='onNewConnection-dynamic'>
#
(void)
<b>onNewConnection</b><span>(f)</span>
<br>
</p>
</div>
<div class='method_details'>
<p class='signature' id='addConnection-dynamic'>
@@ -222,7 +242,11 @@ on how to do that with urls.</p>
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

4
doc/class/TextFramework.html
View File

@@ -356,7 +356,11 @@ JsonFramework was initialized (Depending on the HistoryBuffer implementation).</
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

4
doc/class/WordType.html
View File

@@ -455,7 +455,11 @@ yatta.bind(textbox);</code></pre>
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

4
doc/class/XmlFramework.html
View File

@@ -303,7 +303,11 @@ JsonFramework was initialized (Depending on the HistoryBuffer implementation).</
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 06, 14 10:16:21 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>

22
doc/class/XmlType.html
View File

@@ -44,8 +44,9 @@
<p>Manages XML types
Not supported:</p><ul>
<li>Attribute nodes</li>
<li>Real replace of child elements (to much overhead). Currently, the new element is inserted after the &#39;replaced&#39; element, and then it is deleted.
*</li>
<li>Real replace of child elements (to much overhead). Currently, the new element is inserted after the &#39;replaced&#39; element, and then it is deleted.</li>
<li>Namespaces (*NS)</li>
<li>Browser specific methods (webkit-* operations)</li>
</ul>
</div>
@@ -122,7 +123,6 @@ Use it in order to check whether this is an xml-type or something else.</p>
</a>
</span>
<span class='desc'>
If possible set the replace manager in the content.
</span>
</li>
<li>
@@ -208,17 +208,7 @@ Use it in order to check whether this is an xml-type or something else.</p>
<b>execute</b><span>()</span>
<br>
</p>
<div class='docstring'>
<p>If possible set the replace manager in the content.</p>
</div>
<div class='tags'>
<h3>See also:</h3>
<ul class='see'>
<li>
<a href='WordType.setReplaceManager'>WordType.setReplaceManager</a>
</li>
</ul>
</div>
</div>
<div class='method_details'>
<p class='signature' id='getParent-dynamic'>
@@ -258,7 +248,11 @@ This result can be send to other clients.</p>
</div>
</div>
<div id='footer'>
<<<<<<< HEAD
October 06, 14 10:34:33 by
=======
October 02, 14 15:16:56 by
>>>>>>> XML-Support
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>