From d348ff03fa9c1c8168ebb34599248af26d16c6b6 Mon Sep 17 00:00:00 2001 From: Daniel Haehn Date: Sun, 3 Mar 2013 20:12:09 -0500 Subject: [PATCH] First version of collaborative realtime linking. --- css/viewer.css | 12 ++++++ gfx/link.png | Bin 0 -> 817 bytes gfx/link_selected.png | Bin 0 -> 695 bytes index.html | 4 +- js/pusher.min.js | 48 +++++++++++++++++++++++ js/x.realtime.js | 88 ++++++++++++++++++++++++++---------------- js/x.scene.js | 3 ++ js/x.share.js | 16 ++++---- 8 files changed, 129 insertions(+), 42 deletions(-) create mode 100755 gfx/link.png create mode 100644 gfx/link_selected.png create mode 100644 js/pusher.min.js diff --git a/css/viewer.css b/css/viewer.css index 906cd9a..a4cdf3f 100644 --- a/css/viewer.css +++ b/css/viewer.css @@ -46,6 +46,18 @@ float:right; } +#linkselectedlogo { + opacity: 0.7; + float:left; + margin-right: 10px; +} + +#linklogo { + opacity: 0.7; + float:left; + margin-right: 10px; +} + #share { display: none; position: absolute; diff --git a/gfx/link.png b/gfx/link.png new file mode 100755 index 0000000000000000000000000000000000000000..0b565148bdea6ecaf563c4c3df373039aa2c9e61 GIT binary patch literal 817 zcmV-11J3-3P)OZItr@8!G$2Zr69pKoS%W>;8iX+)B+9|IpI>K2I#ZS3n{ zw`Rb^hyenv^(-;pVzN_$>`_Z{LrPk)RxE~LxQZY#IHCOl6ku@-j0|ZLyag7$TgDkIWsqi%`3xvCGp<7 zVIhNW#bR*|VwY5pl;2<#aU4&v(Qg1U;pK)5D@!d7#2sdP(aUpIi3Dc4-R^v$PEN-qO2^q@%vaonz2!_%3jTe}6B zW@`>&M%;xDCTrbpqGDDdTfF8PLM&LREAl1P^ESul3iNHNdu1FKDBS6C; z^fSh!Dy1wC(=z1seqDBNJ5t)WfG|7oL`i^lyZsZ;OSog?3D;d_W2@-P4JLXI;m5Sz z+hOg(*5pq4Lqq3Z|`fX4BXtKIJQb*;?|Y>IejEfuQI#bW6b z{5Ih89lQp1-v^0ivsnp4c@4?VGSfLYoy5H_mP)0^nCWR|^T-&!z{VUvCC+Cc$v_fb zbPIu(kgx7&IWL67%FDg`p^QOEkUGHk}v4gxa?aLm6*h9GS-%ozhB6s{vf{;GQ)Wkx%i zK%uGodkoU;@3lvx+#IKA=Z~k}J4owBJ?B^OAMXfXeU|*R|NHCA`lcoM6?m(h>+`B% v*W3!cb6#~`H|&Zr&BFL5=jnz8_I7^&3o^#TM?1#o00000NkvXXu0mjf#{Foc}-nIcH`}5}QFjP68ke z>;QUzWuOQw7jl^fGTV$mK2B1?Mug4-gTO9e9*BXd0A>ogOr<_1Y(dlw?5<_F04xF~ z>_S!C1sedOx{y&|)QoZ9d0PkhI5{Njy3h$HOQ%e;hTRuhay&YD}Y@(3MxCQ~|^$D2Xn59Ws;4JVAc+tkicVKeW`RR?F2jIzY z<{R+9!#fZ1wYl@qC+Sic5LLyvhe;2mx_vx+_3#)NpE%WDYIzUxaS|*$4hP1V7pH-b z!0S|Cb6rNtP@k}DS&T}`dC?OXrIgvL(0FNR9{2#v7IK*)fL(r@^hc&MPBsD@0rmk? zk?D3tHU!*~bj(AS|Akj2G>};-SnJun5V%?PT=PufUyJ={!%hDk*j5QT;;##YzKyE?69UbCH1{u+ d=)XWm`~Xo`@sQHiD(C - +