Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deal the #64 Issue,Error when Microphone is not available or not exist #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Deal the #64 Issue,Error when Microphone is not available or not exist #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion html/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ $(function () {
FWRecorder.isReady = true;
$uploadStatus.css({'color': '#000'});
break;

case "show_premission_window_failed":
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I understand, the only case when the showPermissionWindow function may throw an error is the case when there is no microphone connected to a device, right? Why can't we emit the existing no_microphone_found event?

There is another problem. Most probably, not only showPermissionWindow function, but any other will throw the error you've discribed in #64, right? So, that's the second reason why the event should not be called "show_premission_window_failed".

//microphone is not exist or not available
FWRecorder.resize(1,1);
break;
case "permission_panel_closed":
FWRecorder.defaultSize();
recorderEl().removeClass("floating");
Expand Down
14 changes: 9 additions & 5 deletions html/js/recorder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
},

getCurrentTime: function(name) {
return Recorder.recorder.getCurrentTime(name);
return Recorder.recorder.getCurrentTime(name);
},

isMicrophoneAccessible: function() {
Expand All @@ -130,10 +130,14 @@
Recorder.resize(240, 160);
// need to wait until app is resized before displaying permissions screen
var permissionCommand = function() {
if (options && options.permanent) {
Recorder.recorder.permitPermanently();
} else {
Recorder.recorder.permit();
try{
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a detail but, in our code style, there should be single space before the {. The same below with catch.

if (options && options.permanent) {
Recorder.recorder.permitPermanently();
} else {
Recorder.recorder.permit();
}
}catch(e){
window.fwr_event_handler("show_premission_window_failed");
}
};
setTimeout(permissionCommand, 1);
Expand Down