From 886834e8229283fdab2d03f2f3a06b0ebef96938 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Fri, 17 May 2013 18:56:11 -0400
Subject: [PATCH] Fix broken URLs from last commit

---
 README.md              | 2 +-
 www/assets/js/iourl.js | 1 +
 www/channellist.html   | 6 +++---
 www/index.html         | 2 +-
 www/login.html         | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 204f2ca2..1ec6c419 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Then, follow these instructions to install CyTube:
 3. Install your distribution's `libmysqlclient` package.
 3. Install dependencies: `npm install`
 4. Edit `config.js` and input your database details and connection port
-5. Edit `www/assets/js/iourl.js` and change the value of `IO_URL` to `yourhostname:port` where `port` is the port defined in `config.js`
+5. Edit `www/assets/js/iourl.js` and change the value of `IO_URL` to `yourhostname:port` where `port` is the port defined in `config.js`.  Also change `WEB_URL` to `yourhostname:web_port` where `web_port` is the websocket port you defined in `config.js`
 
 Running
 -------
diff --git a/www/assets/js/iourl.js b/www/assets/js/iourl.js
index 5ea91d1a..a837738b 100644
--- a/www/assets/js/iourl.js
+++ b/www/assets/js/iourl.js
@@ -10,6 +10,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 */
 
 var IO_URL = "http://localhost:1337";
+var WEB_URL = "http://localhost:8080";
 
 $.getScript(IO_URL+"/socket.io/socket.io.js", function() {
     try {
diff --git a/www/channellist.html b/www/channellist.html
index 8f9154bf..3f6201d1 100644
--- a/www/channellist.html
+++ b/www/channellist.html
@@ -50,7 +50,7 @@
             var uname = readCookie("sync_uname") || "";
             var p = "";
             if(uname && session) {
-                $.getJSON(IO_URL+"/api/json/login?name="+uname+"&session="+session+"&callback=?", function(data) {
+                $.getJSON(WEB_URL+"/api/json/login?name="+uname+"&session="+session+"&callback=?", function(data) {
                     if(data.success) {
                         $(".loginform").remove();
                         createCookie("sync_uname", uname, 7);
@@ -65,7 +65,7 @@
             $("#login").click(function() {
                 uname =  $("#name").val();
                 q = "name=" + $("#name").val() + "&pw=" + $("#pw").val();
-                $.getJSON(IO_URL+"/api/json/login?"+q+"&callback=?", function(data) {
+                $.getJSON(WEB_URL+"/api/json/login?"+q+"&callback=?", function(data) {
                     if(data.success) {
                         $(".loginform").remove();
                         session = data.session;
@@ -109,7 +109,7 @@
                 return entry;
             }
             function refresh() {
-                $.getJSON(IO_URL+"/api/json/listloaded?"+p+"&callback=?", function(data) {
+                $.getJSON(WEB_URL+"/api/json/listloaded?"+p+"&callback=?", function(data) {
                     var host = document.location + "";
                     host = host.substring(0, host.indexOf("/widget.html"));
                     if(data.error) {
diff --git a/www/index.html b/www/index.html
index c63de15e..3a001b50 100644
--- a/www/index.html
+++ b/www/index.html
@@ -126,7 +126,7 @@
             return entry;
         }
         function refresh() {
-            $.getJSON(IO_URL+"/api/json/listloaded?filter=public&callback=?", function(data) {
+            $.getJSON(WEB_URL+"/api/json/listloaded?filter=public&callback=?", function(data) {
                 $("#channeldata").find("tbody").remove();
                 data.sort(function(a, b) {
                     var x = a.usercount;
diff --git a/www/login.html b/www/login.html
index 9bc49bd0..07a4a285 100644
--- a/www/login.html
+++ b/www/login.html
@@ -86,7 +86,7 @@
             window.addEventListener("message", respond, false);
 
             $("#login").click(function() {
-                $.getJSON(IO_URL+"/api/json/login?name="+$("#username").val()+"&pw="+$("#pw").val()+"&callback=?", function(data) {
+                $.getJSON(WEB_URL+"/api/json/login?name="+$("#username").val()+"&pw="+$("#pw").val()+"&callback=?", function(data) {
                     data.uname = $("#username").val();
                     source.postMessage("cytube-login:"+JSON.stringify(data), document.location);
                 });
@@ -100,7 +100,7 @@
                     $("#confirm").addClass("text-error");
                     return;
                 }
-                $.getJSON(IO_URL+"/api/json/register?name="+$("#username").val()+"&pw="+$("#pw").val()+"&callback=?", function(data) {
+                $.getJSON(WEB_URL+"/api/json/register?name="+$("#username").val()+"&pw="+$("#pw").val()+"&callback=?", function(data) {
                     console.log(data);
                     data.uname = $("#username").val();
                     source.postMessage("cytube-login:"+JSON.stringify(data), document.location);
@@ -116,7 +116,7 @@
                     $("#confirm").addClass("text-error");
                     return;
                 }
-                $.getJSON(IO_URL+"/api/json/changepass?name="+$("#username").val()+"&oldpw="+$("#pw").val()+"&newpw="+$("#newpass").val()+"&callback=?", function(data) {
+                $.getJSON(WEB_URL+"/api/json/changepass?name="+$("#username").val()+"&oldpw="+$("#pw").val()+"&newpw="+$("#newpass").val()+"&callback=?", function(data) {
                     if(data.success) {
                         $("#newpassdiv").css("display", "none");
                         $("#pw2div").css("display", "none");