Merge pull request sakaiproject#245 from ramonchu2k/SAM-2453

Merged. Thanks for the changes.
yuyilin · Mar 4, 2015 · f481b86 · f481b86
2 parents eefdb97 + 8683aff
commit f481b86
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/reference/library/src/webapp/js/sakai-recorder.js b/reference/library/src/webapp/js/sakai-recorder.js
@@ -582,7 +582,7 @@ $(document).ready(function() {
         userMediaSupport = false;
 
         // Why is the user denying the mic? Reload and try again.
-        location.reload();
+        $('#sakai-recorder-error').show();
       });
 
     }

diff --git a/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties b/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
@@ -545,6 +545,7 @@ audio_recorder_attempts_allowed=Total attempts allowed:
 audio_recorder_attempts_remaining=Attempts remaining:
 audio_recorder_browser_plea=Your browser does not support HTML5 audio APIs and does not have Flash support. Please consider using the latest version of Chrome or Firefox.
 audio_recorder_last_attempt=Your final attempt will be saved automatically when you click Stop
+audio_not_allowed=Your browser does not have permission to use the microphone. Please adjust the permissions in your browser to use it and refresh the page.
 
 #message parameters:
 #0: user input

diff --git a/...amigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_es.properties b/...amigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_es.properties
@@ -538,6 +538,7 @@ audio_recorder_attempts_allowed=Total de intentos permitidos\:
 audio_recorder_attempts_remaining=Intentos restantes\:
 audio_recorder_browser_plea=Su navegador no soporta las API's d audio HTML5 y no tiene soporte Flash. Por favor, considere el uso de la \u00faltima versi\u00f3n de Chrome o Firefox.
 audio_recorder_last_attempt=Tu intento definitivo se guardar\u00e1 autom\u00e1ticamente cuando pulses en Detener
+audio_not_allowed=No tiene permisos en el navegador para usar el micr\u00f3fono, por favor cambie los permisos en su navegador para poder usarlo y recargue la p\u00e1gina.
 
 #message parameters:
 #0: user input

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/audioObject.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/audioObject.jsp
@@ -26,6 +26,10 @@
 
 <f:verbatim><div id="audio-recorder-container"></f:verbatim>
 
+<f:verbatim><div id="sakai-recorder-error" style="display:none" class="messageSamigo"></f:verbatim>
+    <h:outputFormat value="#{deliveryMessages.audio_not_allowed} " escape="false"/> 
+<f:verbatim></div></f:verbatim>
+
 <f:verbatim><div id="audio-popup-question"></f:verbatim>
   <h:outputFormat value="#{deliveryMessages.q} " />
   <f:verbatim> <span id="audio-popup-question-number">1</span> </f:verbatim>