removed age/gender from emo demo, hid webcam link from Safari and mobile

Author: steverucker

php-demo/detect/js/detectDemoApp.js

@@ -28,13 +28,6 @@ detectDemoApp =  {
         // options
         this.minHeadScale = 0.015;
         this.confidenceThreshold = .98;
-        // detect getUserMedia compatibility
-        // hide webcam link if not supported
-        navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
-        if (!navigator.getUserMedia) {
-            $(".webcam").hide();
-            $(".ui-buttons .upload").addClass("full-width");
-        }
         var fileTypeList = [];
         $(this.config.uploadFileTypesImage).each(function(idx, fileType) {
             fileTypeList.push(" ." + fileType.toString().split("/")[1])

php-demo/detect/js/detectUi.js

@@ -22,6 +22,21 @@ else {
 	$(".options-panel").hide();
 }
 
+// hide webcam link if Safari or mobile
+var hideWebcam = function() {
+	if (utils.isSafari() || $(window).width() < 768) {
+	    $(".webcam").hide();
+	    $(".ui-buttons .upload").addClass("full-width");
+	} else {
+		$(".webcam").show();
+	    $(".ui-buttons .upload").removeClass("full-width");
+	}
+}
+hideWebcam();
+$( window ).resize(function() {
+  hideWebcam();
+});
+
 // show JSON container by default at larger resolutions
 if ($(window).width() > 768) {
 	$(".json-response-container").show();

php-demo/emotion/index.php

@@ -136,14 +136,14 @@
             <div class="message-container strong">{{message1}}</div>
             <div class="message-container">{{message2}}</div>
         </div>
-        <div class="response-box-container">
+        <!-- <div class="response-box-container">
         {{#if gender}}
             <div class="response-box-gender"></div>
         {{/if}}
         {{#if age}}
             <div class="response-box-age"></div>
         {{/if}}
-        </div>
+        </div> -->
     </script>
     <script id="json-template" type="text/x-handlebars-template">
         <div class="spinner-message-container">

php-demo/emotion/js/emoDemoApp.js

@@ -32,13 +32,6 @@ emoDemoApp =  {
         }
         this.captureInterval = 10000;
         $("#optionPollTimeout").val(this.config.pollTimeout);
-        // detect getUserMedia compatibility
-        // hide webcam link if not supported
-        navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
-        if (!navigator.getUserMedia) {
-            $(".webcam").hide();
-            $(".ui-buttons .upload").addClass("full-width");
-        }
         // hide webcam link from Windows platform until supported
         if (navigator.platform.indexOf('Win') > -1) {
             $(".webcam").hide();

php-demo/emotion/js/emotionUi.js

@@ -23,6 +23,21 @@ else {
 	$(".options-panel").hide();
 }
 
+// hide webcam link if Safari or mobile
+var hideWebcam = function() {
+	if (utils.isSafari() || $(window).width() < 768) {
+	    $(".webcam").hide();
+	    $(".ui-buttons .upload").addClass("full-width");
+	} else {
+		$(".webcam").show();
+	    $(".ui-buttons .upload").removeClass("full-width");
+	}
+}
+hideWebcam();
+$( window ).resize(function() {
+  hideWebcam();
+});
+
 $(".video-thumbnail img").eq(0).css("opacity","1");
 
 // show/hide Highcharts tooltip

php-demo/js/utils.js

@@ -339,6 +339,13 @@ utils =  {
                 return false;
             }
         return true;
+    },
+    isSafari: function(){
+        is_safari = false;
+        if (navigator.userAgent.indexOf('Safari') != -1 && navigator.userAgent.indexOf('Chrome') == -1) {
+            is_safari = true;
+        }
+        return is_safari;
     }
 
 }