Permalink
Browse files

resolved conflits using master files

  • Loading branch information...
crimsonred committed Jan 9, 2013
2 parents e7b8468 + 7224604 commit 86ef289eb2b626c1596d24500e412ad931301f39
Showing 963 changed files with 127,132 additions and 11,041 deletions.
@@ -37,42 +37,36 @@
</div>
<!-- PUBNUB SOURCE -->
-<script src=https://pubnub.s3.amazonaws.com/pubnub-3.4.min.js></script>
+<script src=../../javascript/pubnub-3.4.js></script>
<script>(function(){
/* GENERATE CHANNEL */
var channel = PUBNUB.uuid()
-, pub_key = 'pub-7d598eb7-1523-4c72-9786-d8650a856bf5'
-, sub_key = 'sub-041c0011-6d41-11e1-8b07-35f1f17243aa'
+, pub_key = 'demo'
+, sub_key = 'demo'
, out = PUBNUB.$('pubnub-terminal-out')
-, p = PUBNUB.init({ subscribe_key : sub_key });
+, p = PUBNUB.init({ subscribe_key : sub_key, publish_key : pub_key });
/* OPEN RECEIVE SOCKET */
p.subscribe({
channel : channel,
- message : function(data) { out.innerHTML = parse(data)||'' }
+ message : function(data) { out.innerHTML = parse(data)||'' },
+ connect : start_replay
});
-function parse(data) { try{return JSON.parse(data)} catch(e){} }
-
/* START THE MOVIE STREAM */
-(function(){
- var img = p.create('img');
- img.src = p.supplant([
- 'http:','','23.23.187.160:9050',
- 'v1','replay','{pub_key}',
- '{sub_key}','{src_channel}',
- '{des_channel}'
- ].join('/'), {
- pub_key : pub_key,
- sub_key : sub_key,
- des_channel : channel,
- src_channel : '0cefce37-606c-4eae-a9e9-aff35186b854'
- } );
- p.css( img, { display : 'none' } );
- p.search('body')[0].appendChild(img);
-})();
+function start_replay() {
+ p.replay({
+ //source : '0cefce37-606c-4eae-a9e9-aff35186b854',
+ source : 'my_channel',
+ destination : channel,
+ reverse : true
+ });
+}
+
+function parse(data) { return data }
+
})();</script>
</body>
</html>
Oops, something went wrong.

0 comments on commit 86ef289

Please sign in to comment.