ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3471 from FinnStutzenstein/hideWrongErrorMessageInProjector

Browse Source 
hide 'undefined' error message
This commit is contained in:
Emanuel Schütze 2017-11-03 10:47:49 +01:00 committed by GitHub
commit 969274faf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/core/static/js/core/projector.js
View File

@ -126,6 +126,7 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
// delay displaying the error message, because with a slow internet // delay displaying the error message, because with a slow internet
// connection, the autoupdate with the projector may be delayed. We // connection, the autoupdate with the projector may be delayed. We
// de not want to irritate the user by showing this error to early. // de not want to irritate the user by showing this error to early.
$scope.error = '';
$timeout(function () { $timeout(function () {
if ($scope.showError) { if ($scope.showError) {
$scope.error = gettext('Can not open the projector.'); $scope.error = gettext('Can not open the projector.');

2
openslides/core/static/templates/projector-container.html
View File

@ -13,7 +13,7 @@
<script src="static/js/openslides.js"></script> <script src="static/js/openslides.js"></script>
<script src="static/js/openslides-templates.js"></script> <script src="static/js/openslides-templates.js"></script>
<div class="pContainer" ng-controller="ProjectorContainerCtrl"> <div class="pContainer" ng-controller="ProjectorContainerCtrl" ng-cloak>
<div> <div>
<style> <style>
.pContainer #iframe { .pContainer #iframe {