Skip to content

Commit

Permalink
Rewrote the entire client to use browserchannel.
Browse files Browse the repository at this point in the history
  • Loading branch information
@josephg
josephg committed Jan 23, 2012
1 parent 4279098 commit 692865c
Show file tree
Hide file tree
Showing 32 changed files with 1,000 additions and 882 deletions.
4 changes: 2 additions & 2 deletions examples/_wiki/wiki.html.mu
View file
Expand Up @@ -16,7 +16,7 @@
<div id="editor">{{{content}}}</div>
<script src="/lib/markdown/showdown.js" type="text/javascript"></script>
<script src="/lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/ace.js"></script>
<script>
Expand All @@ -33,7 +33,7 @@ window.onload = function() {
// sharejs.open('{{{docName}}}', function(doc, error) {
// ...

var connection = new sharejs.Connection('http://' + window.location.hostname + ':' + 8000 + '/sjs');
var connection = new sharejs.Connection('http://' + window.location.hostname + ':' + 8000 + '/channel');

connection.open('{{{docName}}}', function(error, doc) {
if (error) {
Expand Down
2 changes: 1 addition & 1 deletion examples/ace/index.html
View file
Expand Up @@ -14,7 +14,7 @@
<div id="editor">Connecting...</div>
<script src="/lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/lib/ace/mode-coffee.js" type="text/javascript" charset="utf-8"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/ace.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/clobber-ace.html
View file
Expand Up @@ -15,7 +15,7 @@
<div id="editor">Some content. The document will be replaced with this contents when its opened.</div>

<script src="/lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/ace.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/code.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="/lib/ace/ace.js"></script>
<script src="/lib/ace/mode-coffee.js"></script>
<script src="/lib/ace/theme-idle_fingers.js"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/ace.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/demos.html
View file
Expand Up @@ -120,7 +120,7 @@ <h2>Pad</h2>
<p>When you open this page, it creates a new empty editing pad with a random name (pad:XXXX).
You can share the URL with someone else and edit with them.
</p>
<p><a class="btn primary" href="static/html">Edit a new pad &raquo;</a></p>
<p><a class="btn primary" href="pad/">Edit a new pad &raquo;</a></p>
</div>

<div class="span6 demo">
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-ace.html
View file
Expand Up @@ -15,7 +15,7 @@
<div id="editor"></div>

<script src="/lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/ace.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/hello-node.js
View file
Expand Up @@ -3,7 +3,7 @@

var client = require('..').client;

client.open('hello', 'text', 'http://localhost:8000/sjs', function(error, doc) {
client.open('hello', 'text', 'http://localhost:8000/channel', function(error, doc) {
doc.insert('Hi there\n', 0);

console.log(doc.snapshot);
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-readonly.html
View file
Expand Up @@ -10,7 +10,7 @@
<div id='text' class='content'></div>
</div>

<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>

<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-stream.js
View file
Expand Up @@ -3,7 +3,7 @@

var client = require('..').client;

client.open('hello', 'text', 'http://localhost:8000/sjs', function(error, doc) {
client.open('hello', 'text', 'http://localhost:8000/channel', function(error, doc) {
if (error) {
throw error;
}
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-tp2.html
View file
Expand Up @@ -15,7 +15,7 @@
<div id="editor"></div>

<script src="/lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/text-tp2.uncompressed.js"></script>
<script src="/share/ace.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/hex.html
View file
Expand Up @@ -58,7 +58,7 @@
}
</style>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/json.js"></script>
</head>
Expand Down
3 changes: 2 additions & 1 deletion examples/index.html
View file
Expand Up @@ -191,7 +191,8 @@ <h3>Code</h3>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
<script src="/socket.io/socket.io.js"></script>
<!--<script src="/socket.io/socket.io.js"></script>-->
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/textarea.js"></script>
<script src="/lib/prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/pad/pad.html
View file
Expand Up @@ -20,7 +20,7 @@
<body>
<div id="editor">Connecting...</div>
<script src="/lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/ace.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/readonly/html.html
View file
Expand Up @@ -6,7 +6,7 @@
<div id="container">
<div id='text' class='content'></div>
</div>
<script src="/socket.io/socket.io.js" type="text/javascript"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js" type="text/javascript"></script>
<script type="text/javascript">

Expand Down
2 changes: 1 addition & 1 deletion examples/readonly/markdown.html
View file
Expand Up @@ -7,7 +7,7 @@
<div id="container">
<div id='text' class='content'></div>
</div>
<script src="/socket.io/socket.io.js" type="text/javascript"></script>
<script src="/channel/bcsocket.js"></script>
<script src="../lib/markdown/showdown.js" type="text/javascript"></script>
<script src="/share/share.js" type="text/javascript"></script>
<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion examples/sharefile.coffee
View file
Expand Up @@ -8,7 +8,7 @@ fs = require('fs')
argv = require('optimist')
.usage('Usage: $0 -d docname [--url URL] [-f filename]')
.default('d', 'hello')
.default('url', 'http://localhost:8000/sjs')
.default('url', 'http://localhost:8000/channel')
.argv

filename = argv.f || argv.d
Expand Down
2 changes: 1 addition & 1 deletion examples/textarea.html
View file
Expand Up @@ -18,7 +18,7 @@
</div>
<textarea id="editor" disabled>Loading...</textarea>

<script src="/socket.io/socket.io.js"></script>
<script src="/channel/bcsocket.js"></script>
<script src="/share/share.js"></script>
<script src="/share/textarea.js"></script>
<script>
Expand Down

0 comments on commit 692865c

Please sign in to comment.