Merge pull request #108 from aiham/fix/update-js-samples

Update JS samples

Author: aiham

sample/Archiving/static/js/host.js

@@ -1,50 +1,61 @@
-var session = OT.initSession(sessionId),
-    publisher = OT.initPublisher("publisher"),
+var session = OT.initSession(apiKey, sessionId),
+    publisher = OT.initPublisher('publisher'),
     archiveID = null;
 
-session.connect(apiKey, token, function(err, info) {
-  if(err) {
-    alert(err.message || err);
+session.connect(token, function(error, info) {
+  if (error) {
+    console.error('Failed to connect', error);
+  } else {
+    session.publish(publisher, function(error) {
+      if (error) {
+        console.error('Failed to publish', error);
+      }
+    });
   }
-  session.publish(publisher);
 });
 
 session.on('streamCreated', function(event) {
-  session.subscribe(event.stream, "subscribers", { insertMode: "append" });
+  session.subscribe(event.stream, 'subscribers', {
+    insertMode: 'append'
+  }, function(error) {
+    if (error) {
+      console.error('Failed to subscribe', error);
+    }
+  });
 });
 
 session.on('archiveStarted', function(event) {
   archiveID = event.id;
-  console.log("ARCHIVE STARTED");
-  $(".start").hide();
-  $(".stop").show();
+  console.log('ARCHIVE STARTED');
+  $('.start').hide();
+  $('.stop').show();
   disableForm();
 });
 
 session.on('archiveStopped', function(event) {
   archiveID = null;
-  console.log("ARCHIVE STOPPED");
-  $(".start").show();
-  $(".stop").hide();
+  console.log('ARCHIVE STOPPED');
+  $('.start').show();
+  $('.stop').hide();
   enableForm();
 });
 
 $(document).ready(function() {
-  $(".start").click(function (event) {
-    var options = $(".archive-options").serialize();
+  $('.start').click(function (event) {
+    var options = $('.archive-options').serialize();
     disableForm();
-    $.post("/start", options).fail(enableForm);
+    $.post('/start', options).fail(enableForm);
   }).show();
-  $(".stop").click(function(event){
-    $.get("stop/" + archiveID);
+  $('.stop').click(function(event){
+    $.get('stop/' + archiveID);
   }).hide();
 });
 
 
 function disableForm() {
-  $(".archive-options-fields").attr('disabled', 'disabled');
+  $('.archive-options-fields').attr('disabled', 'disabled');
 }
 
 function enableForm() {
-  $(".archive-options-fields").removeAttr('disabled');
-}
+  $('.archive-options-fields').removeAttr('disabled');
+}

sample/Archiving/static/js/participant.js

@@ -1,13 +1,24 @@
-var session = OT.initSession(sessionId),
-    publisher = OT.initPublisher("publisher");
+var session = OT.initSession(apiKey, sessionId),
+    publisher = OT.initPublisher('publisher');
 
-session.connect(apiKey, token, function(err, info) {
-  if(err) {
-    alert(err.message || err);
+session.connect(token, function(error, info) {
+  if (error) {
+    console.error('Failed to connect', error);
+  } else {
+    session.publish(publisher, function(error) {
+      if (error) {
+        console.error('Failed to publish', error);
+      }
+    });
   }
-  session.publish(publisher);
 });
 
 session.on('streamCreated', function(event) {
-  session.subscribe(event.stream, "subscribers", { insertMode : "append" });
+  session.subscribe(event.stream, 'subscribers', {
+    insertMode : 'append'
+  }, function(error) {
+    if (error) {
+      console.error('Failed to subscribe', error);
+    }
+  });
 });

sample/Archiving/templates/host.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}
 
-<script src="//static.opentok.com/webrtc/v2.2/js/opentok.min.js"></script>
+<script src="https://static.opentok.com/v2/js/opentok.min.js"></script>
 
   <div class="container bump-me">
 

sample/Archiving/templates/participant.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}
 
-  <script src="//static.opentok.com/webrtc/v2.2/js/opentok.min.js"></script>
+  <script src="https://static.opentok.com/v2/js/opentok.min.js"></script>
 
   <div class="container bump-me">
 

sample/HelloWorld/static/js/helloworld.js

@@ -1,8 +1,8 @@
 // Initialize an OpenTok Session object
-var session = TB.initSession(sessionId);
+var session = OT.initSession(apiKey, sessionId);
 
 // Initialize a Publisher, and place it into the element with id="publisher"
-var publisher = TB.initPublisher(apiKey, 'publisher');
+var publisher = OT.initPublisher('publisher');
 
 // Attach event handlers
 session.on({
@@ -11,7 +11,11 @@ session.on({
   sessionConnected: function(event) {
     // Publish the publisher we initialzed earlier (this will trigger 'streamCreated' on other
     // clients)
-    session.publish(publisher);
+    session.publish(publisher, function(error) {
+      if (error) {
+        console.error('Failed to publish', error);
+      }
+    });
   },
 
   // This function runs when another client publishes a stream (eg. session.publish())
@@ -23,10 +27,18 @@ session.on({
     document.getElementById('subscribers').appendChild(subContainer);
 
     // Subscribe to the stream that caused this event, put it inside the container we just made
-    session.subscribe(event.stream, subContainer);
+    session.subscribe(event.stream, subContainer, function(error) {
+      if (error) {
+        console.error('Failed to subscribe', error);
+      }
+    });
   }
 
 });
 
 // Connect to the Session using the 'apiKey' of the application and a 'token' for permission
-session.connect(apiKey, token);
+session.connect(token, function(error) {
+  if (error) {
+    console.error('Failed to connect', error);
+  }
+});

sample/HelloWorld/templates/index.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <title>OpenTok Hello World</title>
-    <script src="//static.opentok.com/webrtc/v2.2/js/TB.min.js"></script>
+    <script src="https://static.opentok.com/v2/js/opentok.min.js"></script>
     <script type="text/javascript">
         var apiKey = '{{ api_key }}';
         var sessionId = '{{ session_id }}';