diff --git a/html/main.html b/html/main.html index 21c4f6c3..738c994d 100644 --- a/html/main.html +++ b/html/main.html @@ -13,7 +13,7 @@
- + diff --git a/src/i18n/messages-de.po b/src/i18n/messages-de.po index 173aea6f..81745e5b 100644 --- a/src/i18n/messages-de.po +++ b/src/i18n/messages-de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Spreed Speak Freely\n" "Report-Msgid-Bugs-To: simon@struktur.de\n" -"POT-Creation-Date: 2014-03-25 12:57+0100\n" -"PO-Revision-Date: 2014-03-25 12:58+0100\n" +"POT-Creation-Date: 2014-03-25 16:27+0100\n" +"PO-Revision-Date: 2014-03-25 16:31+0100\n" "Last-Translator: Simon Eisenmann \n" "Language-Team: de \n" "Plural-Forms: nplurals=1; plural=0\n" @@ -407,6 +407,19 @@ msgstr "Sie sind nun im Raum %s ..." msgid "Your browser does not support file transfer." msgstr "Mit Ihrem Browser können keine Dateien übertragen werden." +msgid "" +"Permission to start screen sharing was denied. Make sure to have enabled " +"screen sharing access for your browser. Copy chrome://flags/#enable-" +"usermedia-screen-capture and open it with your browser and enable the " +"flag on top. Then restart the browser and you are ready to go." +msgstr "" +"Die Berechtigung für die Bildschirmaufzeichnung wurde verweigert. Bitte " +"stellen Sie sicher die Unterstützung für Bildschimaufzeichnung in Ihrem " +"Browser aktiviert ist. Kopieren Sie dazu chrome://flags/#enable-" +"usermedia-screen-capture und öffnen Sie diese Adresse in Ihrem Browser. " +"Aktivieren Sie die oberste Einstellung und starten dann den Browser neu. " +"Anschließend können Sie die Bildschirmfreigabe benutzen." + msgid "Meet with me here:" msgstr "Meeting:" diff --git a/src/i18n/messages.pot b/src/i18n/messages.pot index 1f88ff65..81e17254 100644 --- a/src/i18n/messages.pot +++ b/src/i18n/messages.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Spreed Speak Freely 1.0\n" "Report-Msgid-Bugs-To: simon@struktur.de\n" -"POT-Creation-Date: 2014-03-25 12:57+0100\n" +"POT-Creation-Date: 2014-03-25 16:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -401,6 +401,13 @@ msgstr "" msgid "Your browser does not support file transfer." msgstr "" +msgid "" +"Permission to start screen sharing was denied. Make sure to have enabled " +"screen sharing access for your browser. Copy chrome://flags/#enable-" +"usermedia-screen-capture and open it with your browser and enable the " +"flag on top. Then restart the browser and you are ready to go." +msgstr "" + msgid "Meet with me here:" msgstr "" diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js index 4b0e47fc..18585d89 100644 --- a/static/js/controllers/mediastreamcontroller.js +++ b/static/js/controllers/mediastreamcontroller.js @@ -149,7 +149,6 @@ define(['underscore', 'bigscreen', 'moment', 'webrtc.adapter'], function(_, BigS videoQuality: "high", stereo: true, maxFrameRate: 20, - screensharingMedia: false, defaultRoom: "" } }; diff --git a/static/js/directives/screenshare.js b/static/js/directives/screenshare.js index 1fa70af7..924d2531 100644 --- a/static/js/directives/screenshare.js +++ b/static/js/directives/screenshare.js @@ -20,7 +20,7 @@ */ define(['jquery', 'underscore', 'text!partials/screenshare.html', 'text!partials/screensharepeer.html', 'bigscreen'], function($, _, template, templatePeer, BigScreen) { - return ["$window", "mediaStream", "$compile", "safeApply", "videoWaiter", "$timeout", function($window, mediaStream, $compile, safeApply, videoWaiter, $timeout) { + return ["$window", "mediaStream", "$compile", "safeApply", "videoWaiter", "$timeout", "alertify", "translation", function($window, mediaStream, $compile, safeApply, videoWaiter, $timeout, alertify, translation) { var peerTemplate = $compile(templatePeer); @@ -222,10 +222,13 @@ define(['jquery', 'underscore', 'text!partials/screenshare.html', 'text!partials }); }); - usermedia.e.one("mediaerror", function() { + usermedia.e.one("mediaerror", function(event, usermedia, error) { $scope.$apply(function(scope) { - scope.usermedia = null; + scope.stopScreenshare(); }); + if (error && error.name === "PermissionDeniedError") { + alertify.dialog.alert(translation._("Permission to start screen sharing was denied. Make sure to have enabled screen sharing access for your browser. Copy chrome://flags/#enable-usermedia-screen-capture and open it with your browser and enable the flag on top. Then restart the browser and you are ready to go.")); + } }); }; diff --git a/static/js/mediastream/usermedia.js b/static/js/mediastream/usermedia.js index 1e5e4988..3334e9cd 100644 --- a/static/js/mediastream/usermedia.js +++ b/static/js/mediastream/usermedia.js @@ -125,7 +125,7 @@ define(['jquery', 'underscore', 'audiocontext', 'webrtc.adapter'], function($, _ } // Let webrtc handle the rest. - this.e.triggerHandler("mediaerror", [this]); + this.e.triggerHandler("mediaerror", [this, error]); }; diff --git a/static/partials/settings.html b/static/partials/settings.html index fb8d06f0..6884d040 100644 --- a/static/partials/settings.html +++ b/static/partials/settings.html @@ -109,18 +109,6 @@
-
- -
-
- -
- {{_('Chrome usermedia screen capture feature is required.')}} (chrome://flags/#enable-usermedia-screen-capture) -
-
-