Fix skylinkjs 0.6.14 dependencies.

Temasys · Sep 8, 2016 · a949e93 · a949e93
1 parent b93d5fc
commit a949e93
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/source/js/loader.js b/source/js/loader.js
@@ -10,8 +10,8 @@ require.config({
 
     paths: {
         socketio: '//cdn.temasys.com.sg/libraries/socket.io-client/1.4.4/socket.io',
-        adapter: '//cdn.temasys.com.sg/adapterjs/0.13.3/adapter.screenshare',
-        skylink: '//cdn.temasys.com.sg/skylink/skylinkjs/0.6.12/skylink.debug',
+        adapter: 'libs/adapter',
+        skylink: '//cdn.temasys.com.sg/skylink/skylinkjs/0.6.13/skylink.debug',
         // facebook: '//connect.facebook.net/en_US/all',
         // twitter: '//platform.twitter.com/widgets',
         fastclick: '//cdnjs.cloudflare.com/ajax/libs/fastclick/0.6.11/fastclick.min',

diff --git a/source/js/main.js b/source/js/main.js
@@ -340,9 +340,15 @@ define([
                     Configs.Skylink.apiMCUKey : Configs.Skylink.apiNoMCUKey,
                 defaultRoom: room
             }, function() {
-                Skylink.joinRoom({
-                    audio: true,
-                    video: true
+                navigator.getUserMedia({
+                  audio: true,
+                  video: true
+                }, function (stream) {
+                  window.console.log('Got stream', stream);
+                  Skylink.sendStream(stream);
+                  Skylink.joinRoom();
+                }, function (error) {
+                  window.console.error('The error', error);
                 });
             });
         },

diff --git a/source/jsx/loader.jsx b/source/jsx/loader.jsx
@@ -10,8 +10,8 @@ require.config({
 
     paths: {
         socketio: '//cdn.temasys.com.sg/libraries/socket.io-client/1.4.4/socket.io',
-        adapter: '//cdn.temasys.com.sg/adapterjs/0.13.3/adapter.screenshare',
-        skylink: '//cdn.temasys.com.sg/skylink/skylinkjs/0.6.13/skylink.debug',
+        adapter: 'libs/adapter',
+        skylink: '//cdn.temasys.com.sg/skylink/skylinkjs/0.6.14/skylink.debug',
         // facebook: '//connect.facebook.net/en_US/all',
         // twitter: '//platform.twitter.com/widgets',
         fastclick: '//cdnjs.cloudflare.com/ajax/libs/fastclick/0.6.11/fastclick.min',

diff --git a/source/jsx/main.jsx b/source/jsx/main.jsx
@@ -340,9 +340,15 @@ define([
                     Configs.Skylink.apiMCUKey : Configs.Skylink.apiNoMCUKey,
                 defaultRoom: room
             }, function() {
-                Skylink.joinRoom({
-                    audio: true,
-                    video: true
+                navigator.getUserMedia({
+                  audio: true,
+                  video: true
+                }, function (stream) {
+                  window.console.log('Got stream', stream);
+                  Skylink.sendStream(stream);
+                  Skylink.joinRoom();
+                }, function (error) {
+                  window.console.error('The error', error);
                 });
             });
         },