Merge pull request #21 from Temasys/development

Release 0.4.2

README.md

@@ -33,52 +33,52 @@ Install node.js [here](https://nodejs.org/en/download/) as it should also includ
 In the contents of the `source/` folder:
 
 - `configs.jsx`: Defines the App Keys based on the different environment. Modify `local` only. You can [sign up for your own App key here](https://console.temasys.io).
-    
+
 - `index.html`: Defines the HTML file for getaroom app. This contains the Google Analytics settings in which you can modify for your custom getaroom app.
 
 - `jsx/`: The React JSX files for the Javascript end.
-      
+
    - `constants.jsx`: Defines the getaroom constants used across the getaroom app.
-      
+
    - `loader.jsx`: Defines the dependencies and libraries versions.
-      
+
    - `main.jsx`: Handles the Temasys Web SDK connection.
-      
+
    - `utils.jsx`: Handles the utilities functionalities used across the getaroom app.
-      
+
    - `components/controls.jsx`: Handles the getaroom app controls.
-      
+
    - `components/userareas.jsx`: Handles the user video element.
-      
+
 - `js/`: The generated output Javascript files from the React JSX files. Do not modify changes on here.
-     
+
    - `libs/`: Stores the custom dependencies Javascript files if needed.
-      
+
 - `img/`: Stores the `jsx/components/controls.jsx` icons.
-   
+
 - `assets/`: Stores the getaroom logo.
-   
+
 - `styles/`: The Stylus files for the CSS end. Dont not modify the `.css` files in there as they are auto-generated.
-   
+
    - `mixins/`: The mixin files.
-      
+
    - `app.styl`: The getaroom app styling.
-      
+
    - `fonts.styl`: The getaroom font styling if needed.
-      
+
 - `ca.crt`: The CA cert file for localhost webserver `https:`. This is self-signed. Replace for your own app when required.
-   
+
 - `server.crt`: The server cert file for localhost webserver `https:`. This is self-signed. Replace for your own app when required.
-   
+
 - `server.key`: The certificate private key for localhost webserver `https:`. This is self-signed. Replace for your own app when required.
-   
+
 
 #### 3. Start testing modifications
 
 Run `grunt dev` to compile the React JSX (js) and Stylus (css) files.
 
 This opens `https://localhost:8085` in your browser as it runs localhost webserver on your device.
-   
+
 #### 4. Make it production ready
 
 Once ready for production, run `grunt stage` to create a `staging/` folder which contains the compiled and minified version of the application.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "getaroomio",
   "description": "FREE and hassle free audio/video real-time chat for desktop and mobile.",
-  "version": "0.3.5",
+  "version": "0.4.2",
   "homepage": "http://github.com/serrynaimo/getaroom",
   "author": {
     "name": "Thomas Gorissen",
@@ -20,9 +20,7 @@
   "scripts": {
     "start": "grunt dev"
   },
-  "dependencies": {
-    "skylinkjs": "^0.6.0"
-  },
+  "dependencies": {},
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.5.0",

source/jsx/components/userareas.jsx

@@ -73,6 +73,14 @@ define([
       if (video && renderedStreamId && scope.props.user.stream && scope.props.user.streamId !== renderedStreamId.value) {
         window.attachMediaStream(video, scope.props.user.stream);
         renderedStreamId.value = scope.props.user.streamId;
+
+        if (video.hasAttribute('controls')) {
+          setTimeout(function () {
+            video.removeAttribute('controls');
+          });
+
+          video.setAttribute('playsinline', true);
+        }
       }
     },
 
@@ -95,7 +103,7 @@ define([
             Share your camera and microphone to participate in the call
           </span>
         );
-      
+
       // If is not self and has not been connected
       } else if (!scope.props.user.connected && scope.props.userId !== 'self') {
         outputHTML.push(
@@ -110,7 +118,8 @@ define([
         outputHTML.push(React.DOM.video({
           id: 'stream-' + scope.props.userId,
           autoPlay: true,
-          muted: scope.props.userId === 'self'
+          muted: scope.props.userId === 'self',
+          controls: true
         }));
 
         outputHTML.push(React.DOM.input({

source/jsx/configs.jsx

@@ -43,7 +43,7 @@ define([], function() {
 
     default:
       config = {
-        env: 'local',
+        env: 'localhost',
         Skylink: {
           apiMCUKey: '7bcba74c-ee42-4fb7-ba17-94a9edb3c1bf',
           apiNoMCUKey: '7e31b061-71e6-4dd7-bd55-516579973930'

source/jsx/loader.jsx

@@ -17,7 +17,6 @@ require.config({
     fastclick: '//cdnjs.cloudflare.com/ajax/libs/fastclick/0.6.11/fastclick.min',
     // facebook: '//connect.facebook.net/en_US/all',
     // twitter: '//platform.twitter.com/widgets'
-
   },
 
   shim: {

source/jsx/main.jsx

@@ -290,7 +290,7 @@ define([
 
             app.state.room.status = Constants.RoomState.LOAD_ERROR;
             app.state.room.statusError = errorMessage || 'Unknown Error';
-        
+
         }
 
         app.setState(app.state);
@@ -330,7 +330,7 @@ define([
           case Skylink.SOCKET_ERROR.CONNECTION_ABORTED:
             app.state.room.status = Constants.RoomState.CONNECTION_ERROR;
             break;
-          
+
           case Skylink.SOCKET_ERROR.RECONNECTION_ATTEMPT:
             app.state.room.status = Constants.RoomState.RECONNECTING;
             break;
@@ -443,7 +443,7 @@ define([
           app.state.users.self.connected = false;
           app.state.room.status = app.state.room.states.mcuRestart ?
             Constants.RoomState.RECONNECTING : Constants.RoomState.DISCONNECTED;
-      
+
         } else {
           delete app.state.users[peerId];
           app.setState(app.state);
@@ -519,7 +519,7 @@ define([
         }
 
         var userInfo = app.parseUserInfo(peerInfo, peerId);
-        
+
         app.state.users[isSelf ? 'self' : peerId].name = userInfo.name;
         app.state.users[isSelf ? 'self' : peerId].priority = userInfo.priority;
         app.state.users[isSelf ? 'self' : peerId].audio = userInfo.audio;
@@ -530,7 +530,7 @@ define([
         if(Utils.keys(app.state.users).length >= 2) {
           app.state.show.controls = false;
         }
-        
+
         app.setState(app.state);
         Dispatcher.setScreen();
       });
@@ -600,7 +600,7 @@ define([
               date: (new Date()).toISOString()
             });
             break;
-          
+
           default:
             app.state.room.messages.push({
               userId: 'getaroom.io',
@@ -680,7 +680,7 @@ define([
 
     componentDidMount: function() {
       var app = this;
-  
+
       Router.configure({
         html5history: true
       }).mount({
@@ -694,7 +694,7 @@ define([
     render: function() {
       var app = this;
       var className = '';
-      var screensharingSupported = 
+      var screensharingSupported =
         (window.webrtcDetectedBrowser === 'chrome' && window.webrtcDetectedVersion > 34) ||
         (window.webrtcDetectedBrowser === 'firefox' && window.webrtcDetectedVersion > 33) ||
         (AdapterJS.WebRTCPlugin && AdapterJS.WebRTCPlugin.plugin && AdapterJS.WebRTCPlugin.plugin.isScreensharingAvailable);