From 19425425c418c080fd8db265907a8579c2e13a7c Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Tue, 26 Nov 2013 15:32:49 +0700 Subject: -video --- src/java/com/juick/http/www/PageTemplates.java | 7 +------ src/java/com/juick/http/www/UserThread.java | 18 +++--------------- web/scripts3.js | 13 ------------- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index d3733305..5b5681e0 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -52,7 +52,6 @@ public class PageTemplates { out.print(""); out.print(""); out.print(""); - out.print(""); out.print(""); if (headers != null) { out.print(headers); @@ -458,11 +457,7 @@ public class PageTemplates { out.print("
" + txt + "
"); if (msg.AttachmentType != null) { - if (msg.AttachmentType.equals("mp4")) { - out.println("
\"\"/
"); - } else { - out.println("
\"\"/
"); - } + out.println("
\"\"/
"); } msg.ReadOnly |= blUIDs.contains(msg.User.UID); diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java index c7158f39..4862bd6c 100644 --- a/src/java/com/juick/http/www/UserThread.java +++ b/src/java/com/juick/http/www/UserThread.java @@ -136,11 +136,7 @@ public class UserThread { out.println("
" + txt + "
"); if (msg.AttachmentType != null) { - if (msg.AttachmentType.equals("mp4")) { - out.println("
\"\"/
"); - } else { - out.println("
\"\"/
"); - } + out.println("
\"\"/
"); } boolean visitorInBL = false; @@ -305,11 +301,7 @@ public class UserThread { out.println("
" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString, locale) + "
"); out.println("
" + PageTemplates.formatMessage(msg.Text) + "
"); if (msg.AttachmentType != null) { - if (msg.AttachmentType.equals("mp4")) { - out.println("
\"\"/
"); - } else { - out.println("
\"\"/
"); - } + out.println("
\"\"/
"); } if (msg.VisitorCanComment) { out.println("
" + rb.getString("Comment") + "
"); @@ -347,11 +339,7 @@ public class UserThread { out.println("
" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString, locale) + "
"); out.println("
" + PageTemplates.formatMessage(msg.Text) + "
"); if (msg.AttachmentType != null) { - if (msg.AttachmentType.equals("mp4")) { - out.println("
\"\"/
"); - } else { - out.println("
\"\"/
"); - } + out.println("
\"\"/
"); } out.print("
/" + msg.RID); if (msg.ReplyTo > 0) { diff --git a/web/scripts3.js b/web/scripts3.js index 3517ee56..087a2d66 100644 --- a/web/scripts3.js +++ b/web/scripts3.js @@ -394,19 +394,6 @@ function sendPM() { /******************************************************************************/ /******************************************************************************/ -function inlinevideo(mid) { - var flashvars={ - file:'http://i.juick.com/video/'+mid+'.mp4', - image:'http://i.juick.com/thumbs/'+mid+'.jpg', - skin:'http://static.juick.com/glow.zip', - autostart:'true' - }; - var params={ - allowfullscreen:'true' - }; - swfobject.embedSWF('//static.juick.com/player.swf','video-'+mid,'512','384','9.0.115','false',flashvars,params,null); -} - function postformListener(formEl,ev) { if(ev.ctrlKey && (ev.keyCode==10 || ev.keyCode==13)) formEl.submit(); } -- cgit v1.2.3