From cd983cdb26f7c459b68cb9f93b2eda4bd8af794c Mon Sep 17 00:00:00 2001
From: Jeena Paradies <spam@jeenaparadies.net>
Date: Thu, 28 Feb 2013 18:23:37 +0100
Subject: [PATCH] fixed problems with youtube video inline

---
 Mac/English.lproj/MainMenu.xib       |  12 ++++-----
 WebKit/css/default.css               |  17 +++++++++++++
 WebKit/img/play.png                  | Bin 0 -> 1541 bytes
 WebKit/scripts/controller/Profile.js |   1 -
 WebKit/scripts/helper/Core.js        |  35 ++++++++++++++++++---------
 5 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 WebKit/img/play.png

diff --git a/Mac/English.lproj/MainMenu.xib b/Mac/English.lproj/MainMenu.xib
index a64c31f..5a0bacb 100644
--- a/Mac/English.lproj/MainMenu.xib
+++ b/Mac/English.lproj/MainMenu.xib
@@ -891,7 +891,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="690752143"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">bungloo</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -970,7 +970,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="126069112"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">mentions</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1029,7 +1029,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="352293288"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">conversation</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1088,7 +1088,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="106985301"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">profile</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1258,7 +1258,7 @@
 					<reference key="NSNextKeyView" ref="433812480"/>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">preferences</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1350,7 +1350,7 @@
 					<reference key="NSNextKeyView" ref="98105857"/>
 					<string key="NSReuseIdentifierKey">_NS:21</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">NO</bool>
 			</object>
diff --git a/WebKit/css/default.css b/WebKit/css/default.css
index aaef22c..ad31028 100644
--- a/WebKit/css/default.css
+++ b/WebKit/css/default.css
@@ -345,4 +345,21 @@ header.profile button {
 
 header.profile button.following {
 	background: #D84A38;
+}
+
+a.youtube {
+	position: relative;
+	display: inline-block;
+}
+
+a.youtube:before {
+	content: " ";
+	background: url(../img/play.png) no-repeat;
+	width: 37px;
+	height: 24px;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	margin-left: -19px;
+	margin-top: -12px;
 }
\ No newline at end of file
diff --git a/WebKit/img/play.png b/WebKit/img/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e255a95c152ed9593bcd8ecbe22b1bb67a4f05
GIT binary patch
literal 1541
zcmeAS@N?(olHy`uVBq!ia0vp^sz5Bk!3HF2t4s=jlw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#24<zqkcg59UmvUF{9L_6kQ%*;T##-C1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T
zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8)
zeo$(0erZuMFyhjbK~@!5ITxiSmgE<O<mczWLNOpCza+mnBfmhwIoMReH!(Rg55xzn
z_w}{%%quQQ%u7!7bg@+enxL1NnPO$+X5nmXYGmYMZenU^=xS);WbSHd?r7v<<Y;2%
zW?>4`>yn>bnwy$e0@Is<&})oSFDNPG765H_NiE7OOHFYr%Fk5*d)X=zw_6Nwng`XJ
zg4->IIQ8lS9itD5Sfq%C2?0|NhzU=&Kn^_Nr{)1udl4{MA8B@Z#=yW->FMGaQgQ3Z
zbl>c#K!LXS$J?JdI|hntNd+yb-u!CSSALdTz24$);|n4;eP@qw2`CH|;^fG?6dIec
zKtQoci6gROL7qs@kBN8YSytp~WbSp>f7Z(AI=AxOoSBx&AKcT=)EQMLsJ*=)H?8oz
ziYL>|G|nj{7Bcf~<@o#h`ZjFe-X8n%<x9@P4+ZY#i8mj7Al>}SDL`KG!uJ4;mg`}Q
zFDh*CkNRdM&%tuXZLwg{uWORFvYs!$Po3qr+<E`~`o+on?!SBgem#?B;M%a}`|sP&
zrUjb@A91u{NflsJ@>LW5QDYafI<#VM+>EnnrZ;&?YU1zaZ4a2WQX@Y<KXGf+#PiP$
z=bum97!hI_^y%#FHy=L+p73B1>OOkmWr;wqTVZ*5d)#{UH?LLiOFN%UGtM)yd-Ty_
z-TL){oh}!0%nYS^w>4cl8L&uc!E-A+yJJ6pS{{06P_$F#)mN(+J@GG9dpG3I3chsm
zWaowcsI_9-|7*_lQJUy+Aa8qdu+@Z<`t4k7%}xPt%Vwu1&CLi}9;BIKBxy1CT&VGy
z&u9DdH%8>t*66={^@{6d$*lA8QaxUeb7F!ozx*<P{@puw9(?*FG}Wv1x+r7dZtdR1
zS<5nPVq#(z1ZX^X@Sq|7-RvLXYk#kJyy>RSdTFgUzJK#rT@OzV(V7~dBUU+$kDtGC
zdM?*yQ<2zHEFpT+6OCpn<V)UWTKi1oZlaP@|M3eMCI%8bdpfR){8Z}~{#N32-KOz`
zK~~DM_o^*6|C8>1^h;q~_P%SKwO4rZqlJ&F&-XoQ4_jUPwRFa&bFV%%|FQFX+;Y%U
zhuhk`%ll(z^Q@;k{a&Uel<j}KKjQo89m_v0`X1fD$dJ8uw;tb06=qPu?CI*~vd$@?
F2>_#OOPBxv

literal 0
HcmV?d00001

diff --git a/WebKit/scripts/controller/Profile.js b/WebKit/scripts/controller/Profile.js
index 623c2dc..972c0e9 100644
--- a/WebKit/scripts/controller/Profile.js
+++ b/WebKit/scripts/controller/Profile.js
@@ -246,7 +246,6 @@ function(HostApp, Core, Paths, URI) {
     Profile.prototype.showProfile = function(profile) {
 
         var basic = profile["https://tent.io/types/info/basic/v0.1.0"];
-        debug(basic)
 
         if (profile && basic) {
 
diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js
index 65cd16e..eff5cec 100644
--- a/WebKit/scripts/helper/Core.js
+++ b/WebKit/scripts/helper/Core.js
@@ -934,19 +934,32 @@ function(jQuery, Paths, URI, HostApp, Cache) {
     }
 
     Core.prototype.addYouTube = function(id, images) {
-        var iframe = $('<iframe class="youtube" type="text/html" width="100%" height="200" frameborder="0" webkitAllowFullScreen allowFullScreen />')
-        iframe.appendTo(images);
-
-        // This is a workaround without it it in the Mentions view it scrolls
-        // down to the first video on load.
-        iframe.load(function() {
-            iframe.contents().find('*').each(function () {
-                $(this).removeAttr("tabindex");
-            });
+        var a = $("<a>", {
+            href: "http://youtu.be/" + id,
+            class: "youtube"
         });
 
-        // Appending the src
-        iframe.attr("src", 'http://www.youtube.com/embed/' + id + '?rel=0&showsearch=0&version=3&modestbranding=1');
+        var img = $("<img>", {src: "http://img.youtube.com/vi/" + id + "/0.jpg"});
+        var h = 200;
+        img.load(function() {
+            h = img.height();
+        });
+
+        a.click(function() {
+            var iframe = $('<iframe />', {
+                class: "youtube",
+                type: "text/html",
+                width: "100%",
+                height: h,
+                frameborder: 0,
+                src: 'http://www.youtube.com/embed/' + id + '?rel=0&showsearch=0&version=3&modestbranding=1&autoplay=1'
+            })
+            a.replaceWith(iframe);
+            return false;
+        })
+
+        img.appendTo(a);
+        a.appendTo(images);
     }
 
     Core.prototype.addVimeo = function(id, images) {