s/scannerjammer.fm/scannerjammer.com/ migration

10 files changed, 41 insertions, 41 deletions

diff --git a/frontend/static/js/auth.js b/frontend/static/js/auth.js
index bb2d304..a0c667d 100644
--- a/frontend/static/js/auth.js
+++ b/frontend/static/js/auth.js
@@ -33,7 +33,7 @@ var Auth =
 		Auth.session = u[2]
 		Auth.access = u[3]
 
-		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400"
+		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400"
 		Auth.success()
 		},
 	checkin: function ()
@@ -80,7 +80,7 @@ var Auth =
 		d.warn(lines[1])
 		if (! Auth.session)
 			return
-		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400"
+		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400"
 		Auth.success()
 		},
 	logout: function ()
@@ -92,7 +92,7 @@ var Auth =
 		Auth.username = false
 		Local.set('userid', false)
 		Local.set('username', false)
-		document.cookie = "session=false;path=/;domain=.scannerjammer.fm;max-age=0"
+		document.cookie = "session=false;path=/;domain=.scannerjammer.com;max-age=0"
 		Auth.session = ""
 		Auth.load()
 		},
diff --git a/frontend/static/js/avatar.js b/frontend/static/js/avatar.js
index ce97617..11d39d4 100644
--- a/frontend/static/js/avatar.js
+++ b/frontend/static/js/avatar.js
@@ -86,8 +86,8 @@ Chat.say = function ()
 		// $("#chat").append(newdiv)
 		// if (newdiv.indexOf("<img") !== -1)
 		// 	setTimeout('d.scrollToBottom("#chat")', 2000)
-		if (msg.indexOf("scannerjammer.fm/avatar") === -1)
-			msg = "http://scannerjammer.fm/avatar/" + d.choice(AVATARS) + " " + msg
+		if (msg.indexOf("scannerjammer.com/avatar") === -1)
+			msg = "http://scannerjammer.com/avatar/" + d.choice(AVATARS) + " " + msg
 		$.post(API.URL.room.say, {room: Room.name, session: Auth.session, msg: msg}, Room.sayCallback)
 		d.scrollToBottom("#chat")
 		}
@@ -105,7 +105,7 @@ Chat.parseWords = function (raw)
 			var word = words[i]
 			if (word.indexOf("http") !== -1)
 				{
-				if (word.indexOf("scannerjammer.fm/avatar") !== -1)
+				if (word.indexOf("scannerjammer.com/avatar") !== -1)
 					{
 					avatar = word
 					}
@@ -180,7 +180,7 @@ Chat.parseWords = function (raw)
 					{
 					s += '<a href="'+word+'" target="_blank" class="pic"><img src="'+word+'" /></a>'
 					}
-				else if (word.indexOf("scannerjammer.fm/profile") !== -1)
+				else if (word.indexOf("scannerjammer.com/profile") !== -1)
 					{
 					var username = word.substr( word.indexOf("profile")+8 ).replace("/","")
 					s += '<a href="'+word+'">ScannerJammer: '+username+'</a>'
diff --git a/frontend/static/js/chat.js b/frontend/static/js/chat.js
index 099f6da..822e1ee 100644
--- a/frontend/static/js/chat.js
+++ b/frontend/static/js/chat.js
@@ -99,7 +99,7 @@ var Chat =
 					{
 					s += '<a href="'+word+'" target="_blank" class="pic"><img src="'+word+'" /></a>'
 					}
-				else if (word.indexOf("scannerjammer.fm/profile") !== -1)
+				else if (word.indexOf("scannerjammer.com/profile") !== -1)
 					{
 					var username = word.substr( word.indexOf("profile")+8 ).replace("/","")
 					s += '<a href="'+word+'">@'+username+'</a>'
diff --git a/frontend/static/js/player.js b/frontend/static/js/player.js
index 55250ab..87973a4 100644
--- a/frontend/static/js/player.js
+++ b/frontend/static/js/player.js
@@ -306,7 +306,7 @@ var Player =
 		{
 		d.warn("UPDATING LINK")
 		$("#video-link").attr("href", video.src)
-		var vidurl = "http://scannerjammer.fm/"
+		var vidurl = "http://scannerjammer.com/"
 		if (Room.name !== "main")
 			vidurl += Room.name+"/"
 		vidurl += "#v="+video.id
diff --git a/frontend/static/js/profile.js b/frontend/static/js/profile.js
index addce07..4a57d6b 100644
--- a/frontend/static/js/profile.js
+++ b/frontend/static/js/profile.js
@@ -163,8 +163,8 @@ var Settings =
 	eventSet: false,
 	defaults:
 		{
-		avatar: "http://scannerjammer.fm/img/runner.gif",
-		bg: "http://scannerjammer.fm/bgz/scannerjammer_cyberspace.jpg",
+		avatar: "http://scannerjammer.com/img/runner.gif",
+		bg: "http://scannerjammer.com/bgz/scannerjammer_cyberspace.jpg",
 		},
 	open: function ()
 		{
diff --git a/frontend/static/js/register.js b/frontend/static/js/register.js
index 87923b5..d4854bf 100644
--- a/frontend/static/js/register.js
+++ b/frontend/static/js/register.js
@@ -22,7 +22,7 @@ var API =
 	HEADER: "#@scanjam 0.3b",
 	LIKE_STRING: "like",
 	HAS_LOCAL_STORAGE: supports_html5_storage(),
-	BASE_URL: "http://scannerjammer.fm",
+	BASE_URL: "http://scannerjammer.com",
 	URL:
 		{
 		auth:
@@ -126,7 +126,7 @@ var Register =
 		var u = lines[1].split("\t")
 		Local.userid(u[0])
 		Local.username(u[1])
-		document.cookie = "session="+u[2]+";path=/;domain=.scannerjammer.fm;max-age=1086400"
+		document.cookie = "session="+u[2]+";path=/;domain=.scannerjammer.com;max-age=1086400"
 
 		$("#register").fadeOut(1000, function ()
 			{
diff --git a/frontend/static/js/room.js b/frontend/static/js/room.js
index a5e70d0..48924d9 100644
--- a/frontend/static/js/room.js
+++ b/frontend/static/js/room.js
@@ -259,7 +259,7 @@ var Room =
 	//	$("#chat").append(div)
 		setTimeout(Player.start, 2000)
 		Room.loaded = true
-		document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.fm;max-age=86400"
+		document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.com;max-age=86400"
 		if (Room.loadCallback)
 			Room.loadCallback()
 		},
@@ -285,13 +285,13 @@ var Rooms =
 	{
 	loaded: false,
 	queue: [
-		[0, "rooms", "/", "http://scannerjammer.fm/bgz/gridzy9.jpg", "<span style='color: #fff;'>&rarr; SEE ALL <span style='text-decoration: underline;'>OPEN ROOMS</span></span>"],
-		[1, "main", "/main", "http://scannerjammer.fm/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"],
-		[12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.fm/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"],
-		[2, "avatar", "/avatar", "http://scannerjammer.fm/img/avatar2.png", "avatar"],
-		[3, "glitter", "/glitter", "http://scannerjammer.fm/bgz/argus.gif", "glitter"],
-		[10, 'jono', '/jonomilo', 'http://scannerjammer.fm/bgz/whitesquare.gif', 'j&ograve;n&ograve; m&igrave; l&ograve;'],
-		//[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.fm/img/idgiguy2.png', 'SJD'],
+		[0, "rooms", "/", "http://scannerjammer.com/bgz/gridzy9.jpg", "<span style='color: #fff;'>&rarr; SEE ALL <span style='text-decoration: underline;'>OPEN ROOMS</span></span>"],
+		[1, "main", "/main", "http://scannerjammer.com/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"],
+		[12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.com/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"],
+		[2, "avatar", "/avatar", "http://scannerjammer.com/img/avatar2.png", "avatar"],
+		[3, "glitter", "/glitter", "http://scannerjammer.com/bgz/argus.gif", "glitter"],
+		[10, 'jono', '/jonomilo', 'http://scannerjammer.com/bgz/whitesquare.gif', 'j&ograve;n&ograve; m&igrave; l&ograve;'],
+		//[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.com/img/idgiguy2.png', 'SJD'],
 		[4, "waterfall", "/waterfall", "http://i.imgur.com/QEZRF.gif", "waterfall"],
 		],
 	list: function ()
@@ -332,7 +332,7 @@ var About =
 	loaded: false,
 	init: function ()
 		{
-		$("#your-profile").attr('href', 'http://scannerjammer.fm/profile/'+Auth.username)
+		$("#your-profile").attr('href', 'http://scannerjammer.com/profile/'+Auth.username)
 		About.loaded = true
 		}
 	}
@@ -412,7 +412,7 @@ var VideoChat =
 		},
 	open: function ()
 		{
-		// $("#tokbox-embed").html('<iframe id="tokbox-embedded" src="http://scannerjammer.fm/tokbox/" style="border:none"></iframe>')
+		// $("#tokbox-embed").html('<iframe id="tokbox-embedded" src="http://scannerjammer.com/tokbox/" style="border:none"></iframe>')
 		// $("#tokbox-embed").show()
 		// $(window).trigger('resize')
 		VideoChat.isOpen = true
diff --git a/frontend/static/js/roomlist.js b/frontend/static/js/roomlist.js
index a1d737c..1b6c6d8 100644
--- a/frontend/static/js/roomlist.js
+++ b/frontend/static/js/roomlist.js
@@ -88,7 +88,7 @@ var Roomlist =
 		var presortMap = {}
 		for (var i = 0; i < presortOrder.length; i++)
 			presortMap[presortOrder[i]] = true
-		//roomz['sjd'] = Roomlist.newRecord([0,"sjd",0,0,"http://scannerjammer.fm/img/sjd.jpg"])
+		//roomz['sjd'] = Roomlist.newRecord([0,"sjd",0,0,"http://scannerjammer.com/img/sjd.jpg"])
 		for (var i = 0; i < ROOM_LIST.length; i++)
 			{
 			var row = ROOM_LIST[i]
diff --git a/frontend/static/js/sj6.js b/frontend/static/js/sj6.js
index 73d2880..8aef9a8 100644
--- a/frontend/static/js/sj6.js
+++ b/frontend/static/js/sj6.js
@@ -3380,7 +3380,7 @@ var Auth =
 		Auth.session = u[2]
 		Auth.access = u[3]
 
-		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400"
+		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400"
 		Auth.success()
 		},
 	checkin: function ()
@@ -3427,7 +3427,7 @@ var Auth =
 		d.warn(lines[1])
 		if (! Auth.session)
 			return
-		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400"
+		document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400"
 		Auth.success()
 		},
 	logout: function ()
@@ -3439,7 +3439,7 @@ var Auth =
 		Auth.username = false
 		Local.set('userid', false)
 		Local.set('username', false)
-		document.cookie = "session=false;path=/;domain=.scannerjammer.fm;max-age=0"
+		document.cookie = "session=false;path=/;domain=.scannerjammer.com;max-age=0"
 		Auth.session = ""
 		Auth.load()
 		},
@@ -4107,7 +4107,7 @@ var Player =
 		{
 		d.warn("UPDATING LINK")
 		$("#video-link").attr("href", video.src)
-		var vidurl = "http://scannerjammer.fm/"
+		var vidurl = "http://scannerjammer.com/"
 		if (Room.name !== "main")
 			vidurl += Room.name+"/"
 		vidurl += "#v="+video.id
@@ -5203,7 +5203,7 @@ var Chat =
 					{
 					s += '<a href="'+word+'" target="_blank" class="pic"><img src="'+word+'" /></a>'
 					}
-				else if (word.indexOf("scannerjammer.fm/profile") !== -1)
+				else if (word.indexOf("scannerjammer.com/profile") !== -1)
 					{
 					var username = word.substr( word.indexOf("profile")+8 ).replace("/","")
 					s += '<a href="'+word+'">@'+username+'</a>'
@@ -5643,7 +5643,7 @@ var Room =
 	//	$("#chat").append(div)
 		setTimeout(Player.start, 2000)
 		Room.loaded = true
-		document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.fm;max-age=86400"
+		document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.com;max-age=86400"
 		if (Room.loadCallback)
 			Room.loadCallback()
 		},
@@ -5669,13 +5669,13 @@ var Rooms =
 	{
 	loaded: false,
 	queue: [
-		[0, "rooms", "/", "http://scannerjammer.fm/bgz/gridzy9.jpg", "<span style='color: #fff;'>&rarr; SEE ALL <span style='text-decoration: underline;'>OPEN ROOMS</span></span>"],
-		[1, "main", "/main", "http://scannerjammer.fm/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"],
-		[12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.fm/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"],
-		[2, "avatar", "/avatar", "http://scannerjammer.fm/img/avatar2.png", "avatar"],
-		[3, "glitter", "/glitter", "http://scannerjammer.fm/bgz/argus.gif", "glitter"],
-		[10, 'jono', '/jonomilo', 'http://scannerjammer.fm/bgz/whitesquare.gif', 'j&ograve;n&ograve; m&igrave; l&ograve;'],
-		//[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.fm/img/idgiguy2.png', 'SJD'],
+		[0, "rooms", "/", "http://scannerjammer.com/bgz/gridzy9.jpg", "<span style='color: #fff;'>&rarr; SEE ALL <span style='text-decoration: underline;'>OPEN ROOMS</span></span>"],
+		[1, "main", "/main", "http://scannerjammer.com/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"],
+		[12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.com/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"],
+		[2, "avatar", "/avatar", "http://scannerjammer.com/img/avatar2.png", "avatar"],
+		[3, "glitter", "/glitter", "http://scannerjammer.com/bgz/argus.gif", "glitter"],
+		[10, 'jono', '/jonomilo', 'http://scannerjammer.com/bgz/whitesquare.gif', 'j&ograve;n&ograve; m&igrave; l&ograve;'],
+		//[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.com/img/idgiguy2.png', 'SJD'],
 		[4, "waterfall", "/waterfall", "http://i.imgur.com/QEZRF.gif", "waterfall"],
 		],
 	list: function ()
@@ -5716,7 +5716,7 @@ var About =
 	loaded: false,
 	init: function ()
 		{
-		$("#your-profile").attr('href', 'http://scannerjammer.fm/profile/'+Auth.username)
+		$("#your-profile").attr('href', 'http://scannerjammer.com/profile/'+Auth.username)
 		About.loaded = true
 		}
 	}
@@ -5796,7 +5796,7 @@ var VideoChat =
 		},
 	open: function ()
 		{
-		// $("#tokbox-embed").html('<iframe id="tokbox-embedded" src="http://scannerjammer.fm/tokbox/" style="border:none"></iframe>')
+		// $("#tokbox-embed").html('<iframe id="tokbox-embedded" src="http://scannerjammer.com/tokbox/" style="border:none"></iframe>')
 		// $("#tokbox-embed").show()
 		// $(window).trigger('resize')
 		VideoChat.isOpen = true
diff --git a/frontend/static/js/test-admin.js b/frontend/static/js/test-admin.js
index ebae8f4..5c34099 100644
--- a/frontend/static/js/test-admin.js
+++ b/frontend/static/js/test-admin.js
@@ -66,7 +66,7 @@ var AdminTest =
 		$("#room-name").html(Room.name)
 		$("#return-link").attr("href", "/"+Room.name)
 		$("#room-lastlog").val(Lastlog.old)
-		$("#pnp").attr("src", "http://scannerjammer.fm/"+Room.name+"/read")
+		$("#pnp").attr("src", "http://scannerjammer.com/"+Room.name+"/read")
 		},
 	statsLoad: function ()
 		{
@@ -78,7 +78,7 @@ var AdminTest =
 		greetings += "&gt;&gt;&gt; <a href='/register/reset'>Need to fix someone's password?</a>"
 		greetings += "<br/><br/>"
 		greetings += "<b>Congratulations, %%USERNAME%%!</b> You, on the basis of your score, have been selected to be a SCANNERJAMMER MODERATOR!<br/><br/>"
-		greetings += "This means we are asking you to be a part of our team. As a moderator, your responsibility is to clear all of the crap videos from the playlist.  If something seems like it doesn't belong, do not hesitate to remove it.  We care about the content of our site. Soon we will also be adding a mute feature.<br/><br/>Another power you have been granted is to make your OWN SCANNERJAMMER ROOM.  Only mods can do this! All you need to do is add the name of your new room to the end of the URL. For example, type <i><b>scannerjammer.fm/whatupdoe</b></i> into the address bar and lo and behold, the SCANNERJAMMER \"whatupdoe\" room has been created!<br/><br/>This is a great way to have a more private SCANNERJAMMER experience, should you want to talk to friends.  Feel free to create as many rooms as you want.<br><br/> Thank you, we love you! -Pepper and ryz"
+		greetings += "This means we are asking you to be a part of our team. As a moderator, your responsibility is to clear all of the crap videos from the playlist.  If something seems like it doesn't belong, do not hesitate to remove it.  We care about the content of our site. Soon we will also be adding a mute feature.<br/><br/>Another power you have been granted is to make your OWN SCANNERJAMMER ROOM.  Only mods can do this! All you need to do is add the name of your new room to the end of the URL. For example, type <i><b>scannerjammer.com/whatupdoe</b></i> into the address bar and lo and behold, the SCANNERJAMMER \"whatupdoe\" room has been created!<br/><br/>This is a great way to have a more private SCANNERJAMMER experience, should you want to talk to friends.  Feel free to create as many rooms as you want.<br><br/> Thank you, we love you! -Pepper and ryz"
 		greetings = greetings.replace("%%USERNAME%%", Auth.username)
 		if (html)
 			greetings += "<br/><br/><b>STATS TODAY</b><br/>"+html