Merge branch 'master' of ssh://dump.fm/pichat/repo

author: sostler <sbostler@gmail.com> 2010-04-11 16:50:45 -0400
committer: sostler <sbostler@gmail.com> 2010-04-11 16:50:45 -0400
commit: 5587ef8a9b45ba7c969df2643ab1baa2591e2be4 (patch)
tree: acbb7dd475eee49aa3ce98af60175e756b2bd76a
parent: 57c3298cbb88181ab2a9e2dd5309b7a5df6eb30f (diff)
parent: b489d3df189b2a87e3d8b1ba321b9a8f2a441009 (diff)
10 files changed, 136 insertions, 14 deletions
diff --git a/src/site.clj b/src/site.clj
index 85e93d1..ebf2077 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -242,7 +242,7 @@
    })
 
 ;;  User-id/nick cache
-;;  I keep needing to grab user-id from a nick or nick from a user-id so I thought I'd cache them
+;;  I keep needing to grab user-id from a nick so I thought I'd cache them
 
 (def user-id-cache (ref {}))
 (def *user-id-cache-size* 500)
diff --git a/static/css/directory.css b/static/css/directory.css
index 2a4d5f1..67e3ccd 100644
--- a/static/css/directory.css
+++ b/static/css/directory.css
@@ -41,6 +41,7 @@ z-index:5555;
 
 }
 #logavatar img{
+image-rendering: -moz-crisp-edges;
     max-width:50px;
     width: expression(this.width > 50 ? 50: true);
     max-height:50px;
diff --git a/static/css/dump.css b/static/css/dump.css
index 40e29c8..e3d81c3 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -471,7 +471,7 @@ background-color:#f3f3f3;
     max-height:30px;
     height: expression(this.width > 30 ? 30: true);
     max-width:30px;
-
+image-rendering: -moz-crisp-edges;
 	float:right;
 	right:1px;
 	z-index:77;
diff --git a/static/css/header.css b/static/css/header.css
index 4c64c72..bf2b0bd 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -328,3 +328,20 @@ image-rendering: -moz-crisp-edges;
   width: 27px;
   display: block;
 }
+
+a.youtube {
+  position: relative;
+}
+
+.youtube .youtube-thumb {
+  width: 130px;
+  height: 97px;
+  padding-bottom: 22px;
+  margin: 0;
+}
+.youtube .youtube-controls {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  margin: 0;
+}
+\ No newline at end of file
diff --git a/static/css/index.css b/static/css/index.css
index 24a28da..f64b448 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -7,6 +7,9 @@ body {
 	background-position:top;
 
 }
+#video{
+display:none;
+}
 #content{
 margin:6%;
 }
diff --git a/static/css/log.css b/static/css/log.css
index 10b8e99..670bdd8 100644
--- a/static/css/log.css
+++ b/static/css/log.css
@@ -40,6 +40,7 @@ z-index:5555;
 
 }
 #logavatar img{
+image-rendering: -moz-crisp-edges;
     max-width:50px;
     width: expression(this.width > 50 ? 50: true);
     max-height:50px;
diff --git a/static/css/profile.css b/static/css/profile.css
index 4429a91..902cac7 100755
--- a/static/css/profile.css
+++ b/static/css/profile.css
@@ -32,6 +32,7 @@ letter-spacing:;
 width:auto;
 	position:absolute;
 	top:29px;
+image-rendering: -moz-crisp-edges;
 left:545;
 max-width:180;
 	margin-top:34px;
@@ -96,6 +97,7 @@ margin-top:0;
 	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde;
   -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde;
   -moz-box-shadow: 0 0 10px #d8dbde, 2px 2px 5px #d8dbde;
+
 }
 #chatrap{
   width:650;
diff --git a/static/img/youtube.controls.png b/static/img/youtube.controls.png
new file mode 100644
index 0000000..77e5d04
--- /dev/null
+++ b/static/img/youtube.controls.png
diff --git a/static/index.html b/static/index.html
index 08b934e..afab9b1 100755
--- a/static/index.html
+++ b/static/index.html
@@ -34,7 +34,7 @@ $(document).ready(function(){
 </head>
 <body>
 <div id="panel">
-<center><object width="600" height="450"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;autoplay=1&amp;show_portrait=0&amp;color=ffffff&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=ffffff&amp;autoplay=1&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="600" height="450"></embed></object></center>
+<center><object width="460" height="345"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;autoplay=1&amp;show_portrait=0&amp;color=ffffff&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=ffffff&amp;autoplay=1&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="460" height="345"></embed></object></center>
 </div>
 
 <p class="slide"><a href="#" class="btn-slide">watch a lil video!</a>
@@ -67,6 +67,7 @@ $(document).ready(function(){
       Remember Me
     </label></div>
   </div>
+  
 </div>
 <div id="info" align="right">
   <img src="/static/img/vxhtml.gif">
@@ -75,10 +76,10 @@ $(document).ready(function(){
       <img src="/static/img/geocities.gif">
   <img src="/static/img/valid_html.gif">
  
-</div>
+</div> 
 
-            
-</div></div>
+</div>
+</div>
 <div id="preload">
   <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
 </div>
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 886e2c1..46ae121 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -6,6 +6,7 @@ var RawFavs = {}
 var MaxImagePosts = 40
 
 // todo: preload these. also, look into image sprites (no go on animating their sizes tho)
+// css clipping perhaps?
 Imgs = {
   "chatThumb": "/static/img/thumbs/smallheartfaved.gif",
   "chatThumbBig": "/static/img/thumbs/chatheartover.gif",
@@ -73,19 +74,71 @@ function linkify(text) {
 // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/
 var LastMsgContainsImage = false
 function linkReplace(url) {
-    var urlWithoutParams = url.replace(/\?.*$/i, "");
+    //var urlWithoutParams = url.replace(/\?.*$/i, "");
     
     if (url.indexOf('http://') == 0 || url.indexOf('https://') == 0 || url.indexOf('ftp://') == 0)
         linkUrl = url;
     else
         linkUrl = 'http://' + url;
     
-    if (PicRegex.test(urlWithoutParams)){
-        LastMsgContainsImage = true
-        return "<a target='_blank' href='" + linkUrl + "'><img src='" + linkUrl + "'></a>"
-    } else {
-        return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>"
+    var uri = parseUri(url)
+    switch(getUriType(uri)) {
+      case 'image':
+        LastMsgContainsImage = true;
+        return "<a target='_blank' href='" + linkUrl + "'><img src='" + linkUrl + "'></a>"; break;
+      case 'youtube': 
+        Youtube.startAnimation();
+        return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" +
+               "<img class='youtube-thumb' width='130' height='97' src='"+Youtube.nextThumbUrl(uri.queryKey.v)+"'>" + 
+               "<img class='youtube-controls' src='/static/img/youtube.controls.png'></a>"; break;
+      default:
+        return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>";
     }
+    
+}
+
+Youtube = {
+  "timer": 0,
+  
+  "startAnimation": function(){
+    if (!Youtube.timer)
+      Youtube.timer = setTimeout(Youtube.animate, 1000)
+  },
+  
+  "animate": function(){
+    var thumbs = $(".youtube-thumb")
+    thumbs.each(Youtube.nextThumb)
+    if (thumbs.length == 0){
+      clearTimeout(Youtube.timer)
+      Youtube.timer = 0
+    } else Youtube.timer = setTimeout(Youtube.animate, 1000);
+  },
+  
+  "nextThumb": function(){
+    var img = $(this);
+    // yt thumb url is http://i.ytimg.com/vi/0123456789A/1.jpg
+    var v = img.attr("src").substr(22,11)
+    var num = img.attr("src").charAt(34);
+    img.attr("src", (Youtube.nextThumbUrl(v, num)))
+  },
+  
+  "nextThumbUrl": function(v, num){
+    if (!num) num = 0;
+    num = (parseInt(num) % 3) + 1 // cycle over 1,2,3
+    return "http://i.ytimg.com/vi/" + v + "/" + num + ".jpg"
+  },
+  
+}
+
+
+function getUriType(uri){
+  if (PicRegex.test(uri.file.toLowerCase()))
+    return "image";
+    
+  if (parseDomain(uri.host) == "youtube.com" && 'v' in uri.queryKey)
+    return "youtube";
+    
+  return "link";
 }
 
 function linkifyWithoutImage(text) {
@@ -758,7 +811,8 @@ function initBigHand(id){
     
 }
 
-// grab message id etc from some element e that's inside a message
+// grab message id etc from some element e that's inside a dump
+// (messages have something like id="message-0001" class="dump" )
 function getMessageInfo(e){
     var message = $(e).parents(".dump")
     var id = message.attr("id").substr(8) // cut "message-001" to "001"
@@ -807,7 +861,7 @@ Tag = {
     if (favorited) {
       Tag.rm(message.id, "favorite")
       $(button).parents(".dump").removeClass("favorite")
-      if (RawFavs && RawFavs[message.id]) {
+      if (RawFavs[message.id]) {
         delete RawFavs[message.id]
         paletteImageCache = false
       }
@@ -865,3 +919,46 @@ function MM_swapImage() { //v3.0
   var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
    if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
 }
+
+function timeFunc(f){
+  var start = new Date().getTime();
+  var res = f();
+  console.log((new Date().getTime()) - start + " msecs");
+  return res;
+}
+
+// parseUri 1.2.2 from http://blog.stevenlevithan.com/archives/parseuri
+// (c) Steven Levithan <stevenlevithan.com>, MIT License
+function parseUri (str) {
+	var	o   = parseUri.options,
+		m   = o.parser[o.strictMode ? "strict" : "loose"].exec(str),
+		uri = {},
+		i   = 14;
+
+	while (i--) uri[o.key[i]] = m[i] || "";
+
+	uri[o.q.name] = {};
+	uri[o.key[12]].replace(o.q.parser, function ($0, $1, $2) {
+		if ($1) uri[o.q.name][$1] = $2;
+	});
+
+	return uri;
+};
+
+parseUri.options = {
+	strictMode: false,
+	key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
+	q:   {
+		name:   "queryKey",
+		parser: /(?:^|&)([^&=]*)=?([^&]*)/g
+	},
+	parser: {
+		strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
+		loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
+	}
+};
+// end parseUri
+
+function parseDomain(host){
+  return host.toLowerCase().replace(/^www\./, "")
+}
+\ No newline at end of file
author	sostler <sbostler@gmail.com>	2010-04-11 16:50:45 -0400
committer	sostler <sbostler@gmail.com>	2010-04-11 16:50:45 -0400
commit	5587ef8a9b45ba7c969df2643ab1baa2591e2be4 (patch)
tree	acbb7dd475eee49aa3ce98af60175e756b2bd76a
parent	57c3298cbb88181ab2a9e2dd5309b7a5df6eb30f (diff)
parent	b489d3df189b2a87e3d8b1ba321b9a8f2a441009 (diff)