Fixed issue within Safari

blindsidenetworks · Aug 18, 2017 · 6e60dce · 6e60dce
1 parent 8e5714d
commit 6e60dce
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 43 deletions.
diff --git a/lib.php b/lib.php
@@ -78,43 +78,46 @@ function atto_recordrtc_params_for_js($elementid, $options, $fpoptions) {
 function atto_recordrtc_strings_for_js() {
     global $PAGE;
 
-    $PAGE->requires->strings_for_js(array('audiortc',
-                                          'videortc',
-                                          'gumabort_title',
-                                          'gumabort',
-                                          'gumnotallowed_title',
-                                          'gumnotallowed',
-                                          'gumnotfound_title',
-                                          'gumnotfound',
-                                          'gumnotreadable_title',
-                                          'gumnotreadable',
-                                          'gumoverconstrained_title',
-                                          'gumoverconstrained',
-                                          'gumsecurity_title',
-                                          'gumsecurity',
-                                          'gumtype_title',
-                                          'gumtype',
-                                          'insecurealert_title',
-                                          'insecurealert',
-                                          'browseralert_title',
-                                          'browseralert',
-                                          'startrecording',
-                                          'recordagain',
-                                          'stoprecording',
-                                          'recordingfailed',
-                                          'attachrecording',
-                                          'norecordingfound_title',
-                                          'norecordingfound',
-                                          'nearingmaxsize_title',
-                                          'nearingmaxsize',
-                                          'uploadprogress',
-                                          'uploadfailed',
-                                          'uploadfailed404',
-                                          'uploadaborted',
-                                          'annotationprompt',
-                                          'annotation:audio',
-                                          'annotation:video'),
-                                          'atto_recordrtc');
+    $strings_for_js = array('audiortc',
+                            'videortc',
+                            'gumabort_title',
+                            'gumabort',
+                            'gumnotallowed_title',
+                            'gumnotallowed',
+                            'gumnotfound_title',
+                            'gumnotfound',
+                            'gumnotreadable_title',
+                            'gumnotreadable',
+                            'gumoverconstrained_title',
+                            'gumoverconstrained',
+                            'gumsecurity_title',
+                            'gumsecurity',
+                            'gumtype_title',
+                            'gumtype',
+                            'insecurealert_title',
+                            'insecurealert',
+                            'browseralert_title',
+                            'browseralert',
+                            'startrecording',
+                            'recordagain',
+                            'stoprecording',
+                            'recordingfailed',
+                            'attachrecording',
+                            'norecordingfound_title',
+                            'norecordingfound',
+                            'nearingmaxsize_title',
+                            'nearingmaxsize',
+                            'uploadprogress',
+                            'uploadfailed',
+                            'uploadfailed404',
+                            'uploadaborted',
+                            'annotationprompt',
+                            'annotation:audio',
+                            'annotation:video',
+                            'nowebrtc',
+                            'nowebrtc_title'
+                        );
+    $PAGE->requires->strings_for_js($strings_for_js, 'atto_recordrtc');
 }
 
 /**

diff --git a/yui/build/moodle-atto_recordrtc-recording/moodle-atto_recordrtc-recording-debug.js b/yui/build/moodle-atto_recordrtc-recording/moodle-atto_recordrtc-recording-debug.js
@@ -70,7 +70,7 @@ M.atto_recordrtc.commonmodule = {
 
     // Show alert and close plugin if browser does not support WebRTC at all.
     check_has_gum: function() {
-        if (!navigator.mediaDevices.getUserMedia) {
+        if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
             Y.use('moodle-core-notification-alert', function() {
                 new M.core.alert({
                     title: M.util.get_string('nowebrtc_title', 'atto_recordrtc'),
@@ -113,6 +113,7 @@ M.atto_recordrtc.commonmodule = {
         }
     },
 
+
     // Capture webcam/microphone stream.
     capture_user_media: function(mediaConstraints, successCallback, errorCallback) {
         window.navigator.mediaDevices.getUserMedia(mediaConstraints).then(successCallback).catch(errorCallback);