summaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authorroot <root@lalalizard.com>2012-12-23 13:53:14 -0500
committerroot <root@lalalizard.com>2012-12-24 12:06:12 -0500
commit6c9d1c1cdc5985bb836306f6ae7dc83b014c9f77 (patch)
tree4a7616ae391153c8a655f708bcb9db003dbcd2f8 /frontend
parent06a01eb199dd8564c5efa0316e727f2a85afceb5 (diff)
s/likeVideo/likeContent/g
Diffstat (limited to 'frontend')
-rw-r--r--frontend/static/js/calendar.js2
-rw-r--r--frontend/static/js/chat.js2
-rw-r--r--frontend/static/js/glitter.js2
-rw-r--r--frontend/static/js/like.js10
-rw-r--r--frontend/static/js/player.js4
-rw-r--r--frontend/static/js/profile.js12
-rw-r--r--frontend/static/template/profile.html4
-rw-r--r--frontend/templates/profile.html4
8 files changed, 20 insertions, 20 deletions
diff --git a/frontend/static/js/calendar.js b/frontend/static/js/calendar.js
index cf70e29..87e686a 100644
--- a/frontend/static/js/calendar.js
+++ b/frontend/static/js/calendar.js
@@ -262,7 +262,7 @@ var Main =
Auth.checkin()
Profile.init()
Player.init()
- Like.likeVideoDelay = 6000
+ Like.likeContentDelay = 6000
$("#controls").fadeIn(2000)
$("#contact").fadeIn(2000)
setTimeout('Viewport.standardResize()', 1000)
diff --git a/frontend/static/js/chat.js b/frontend/static/js/chat.js
index 0c0656e..2973188 100644
--- a/frontend/static/js/chat.js
+++ b/frontend/static/js/chat.js
@@ -100,7 +100,7 @@ var Chat =
s +=
'<a href="'+word+'" target="_blank" class="pic">'+
'<img src="'+word+'" />'+
- '</a><br><span id="like_'+id+'" class="like img_like" onClick="Like.likeVideo({id:'+id+'})">like</span>'
+ '</a><br><span id="like_'+id+'" class="like img_like" onClick="Like.likeContent({id:'+id+'})">like</span>'
}
else if (word.indexOf("scannerjammer.com/profile") !== -1)
{
diff --git a/frontend/static/js/glitter.js b/frontend/static/js/glitter.js
index 2c3b07e..e046ca6 100644
--- a/frontend/static/js/glitter.js
+++ b/frontend/static/js/glitter.js
@@ -88,7 +88,7 @@ var Glitter =
$("#glitter-go").bind("click", Glitter.go)
$("#flower img").attr("src", "/static/img/glitter_flower.gif")
Chat.callback = Glitter.generate
- Like.likeVideoDelay = 10000
+ Like.likeContentDelay = 10000
var newtitle = "<img src='/static/img/glitter_scannerjammer.gif' />"
setTimeout('$("#heading").html("'+newtitle+'")', 6000)
$("#topic").css({position:"fixed", top: 40, left: 750})
diff --git a/frontend/static/js/like.js b/frontend/static/js/like.js
index f564f4c..2d43b7b 100644
--- a/frontend/static/js/like.js
+++ b/frontend/static/js/like.js
@@ -1,7 +1,7 @@
var Like =
{
timeout: false,
- likeVideoDelay: 1000,
+ likeContentDelay: 1000,
likeMessageDelay: 10000,
favewords:
[
@@ -39,11 +39,11 @@ var Like =
{
d.joy("LIKE ANIMATION FADE")
Like.timeout = false
- $("#plant").fadeOut(Like.likeVideoDelay)
- $("#flower").fadeOut(Like.likeVideoDelay)
+ $("#plant").fadeOut(Like.likeContentDelay)
+ $("#flower").fadeOut(Like.likeContentDelay)
$("#likereport").fadeOut(Like.likeMessageDelay, function(){$("#likereport").html("")})
},
- likeVideo: function (video)
+ likeContent: function (video)
{
if (! Auth.session)
return d.error("like: not logged in")
@@ -79,7 +79,7 @@ var Like =
if (Player.currentKey === video.key)
$("#like").addClass("liked")
$("#like_"+video.id).addClass("liked").html("liked")
- $("#flower").show().fadeOut(Like.likeVideoDelay)
+ $("#flower").show().fadeOut(Like.likeContentDelay)
video.liked = true
Local.like(video.id)
if (video.score)
diff --git a/frontend/static/js/player.js b/frontend/static/js/player.js
index 87973a4..a64c003 100644
--- a/frontend/static/js/player.js
+++ b/frontend/static/js/player.js
@@ -295,7 +295,7 @@ var Player =
likeClick: function ()
{
d.act("+ clicked player like")
- Like.likeVideo(Player.video)
+ Like.likeContent(Player.video)
},
linkClick: function ()
{
@@ -449,7 +449,7 @@ var Playlist =
var videokey = Player.queue[idx]
var video = Player.videos[videokey]
d.act("+ clicked playlist like "+video.key)
- Like.likeVideo(video)
+ Like.likeContent(video)
},
clickChatlink: function (e)
{
diff --git a/frontend/static/js/profile.js b/frontend/static/js/profile.js
index a528597..e5da4c6 100644
--- a/frontend/static/js/profile.js
+++ b/frontend/static/js/profile.js
@@ -393,11 +393,11 @@ var Profile =
if (Profile.mode === "like")
return
Profile.page = 0
- Profile.pages = [likeVideoQueue]
+ Profile.pages = [likeContentQueue]
Profile.mode = "like"
$(".mode").removeClass("mode")
$("#likeQueue").addClass("mode")
- Profile.loadQueue(likeVideoQueue)
+ Profile.loadQueue(likeContentQueue)
},
loadTopQueue: function ()
{
@@ -446,11 +446,11 @@ var Profile =
$("#queueLinks").append('<li id="userQueue">'+userVideoQueueTitle+'</li>')
$("#userQueue").bind("click", Profile.loadUserQueue)
}
- if (likeVideoQueue && likeVideoQueue.length && likeVideoQueueTitle)
+ if (likeContentQueue && likeContentQueue.length && likeContentQueueTitle)
{
- $("#queueLinks").append('<li id="likeQueue">'+likeVideoQueueTitle+'</li>')
+ $("#queueLinks").append('<li id="likeQueue">'+likeContentQueueTitle+'</li>')
$("#likeQueue").bind("click", Profile.loadLikeQueue)
- likeVideoQueue.reverse()
+ likeContentQueue.reverse()
}
if (topVideoQueue && topVideoQueue.length && topVideoQueueTitle)
{
@@ -460,7 +460,7 @@ var Profile =
}
if (userVideoQueue && userVideoQueue.length)
Profile.loadUserQueue()
- else if (likeVideoQueue && likeVideoQueue.length)
+ else if (likeContentQueue && likeContentQueue.length)
Profile.loadLikeQueue()
// if (imageQueue && imageQueue.length)
// Profile.loadImages()
diff --git a/frontend/static/template/profile.html b/frontend/static/template/profile.html
index 839d686..53a7099 100644
--- a/frontend/static/template/profile.html
+++ b/frontend/static/template/profile.html
@@ -121,8 +121,8 @@ var userVideoQueue = %%VIDZ%%
var userVideoQueueTitle = "my scans"
var topVideoQueue = %%TOPZ%%
var topVideoQueueTitle = "top scans"
-var likeVideoQueue = %%LIKEZ%%
-var likeVideoQueueTitle = "jams i like"
+var likeContentQueue = %%LIKEZ%%
+var likeContentQueueTitle = "jams i like"
var imageQueue = %%IMAGEZ%%
var userProfile = %%PROFILE%%
var now = %%NOW%%
diff --git a/frontend/templates/profile.html b/frontend/templates/profile.html
index e4c8665..b8f7ade 100644
--- a/frontend/templates/profile.html
+++ b/frontend/templates/profile.html
@@ -123,8 +123,8 @@ var userVideoQueue = {{VIDZ|safe}}
var userVideoQueueTitle = "my scans"
var topVideoQueue = {{TOPZ|safe}}
var topVideoQueueTitle = "top scans"
-var likeVideoQueue = {{LIKEZ|safe}}
-var likeVideoQueueTitle = "jams i like"
+var likeContentQueue = {{LIKEZ|safe}}
+var likeContentQueueTitle = "jams i like"
var userProfile = {{PROFILE|safe}}
var now = {{NOW}}
</script>