Permalink
Browse files

Rewrote the entire client to use browserchannel.

  • Loading branch information...
1 parent 4279098 commit 692865cd25b2d51d6ceb9d2c76424f2a86a2bdc3 @josephg committed Jan 23, 2012
@@ -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>
@@ -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) {
View
@@ -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>
@@ -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>
View
@@ -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>
View
@@ -120,7 +120,7 @@
<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">
View
@@ -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>
View
@@ -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);
@@ -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>
View
@@ -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;
}
View
@@ -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>
View
@@ -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>
View
@@ -191,7 +191,8 @@
<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>
View
@@ -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>
@@ -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">
@@ -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">
@@ -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
View
@@ -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>
Oops, something went wrong.

0 comments on commit 692865c

Please sign in to comment.