From 7672fd60e7095c42620a54f61f6dd94e2beef12f Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Fri, 11 Jul 2014 18:34:20 +0200
Subject: [PATCH] Show status while presentation is loading.

---
 static/js/directives/presentation.js | 12 ++++++++----
 static/partials/presentation.html    |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/static/js/directives/presentation.js b/static/js/directives/presentation.js
index 2a75a4c9..abaee087 100644
--- a/static/js/directives/presentation.js
+++ b/static/js/directives/presentation.js
@@ -36,7 +36,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 			$scope.currentFileInfo = null;
 			$scope.currentPage = null;
 			$scope.receivedPage = null;
-			$scope.downloading = false;
+			$scope.loading = false;
 			$scope.downloadSize = 0;
 			$scope.downloadProgress = 0;
 			$scope.sharedFilesCache = {};
@@ -78,7 +78,6 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 			};
 
 			$scope.$on("pdfLoaded", function(event, source, doc) {
-				$scope.downloading = false;
 				$scope.currentPageNumber = -1;
 				if ($scope.isPresenter) {
 					$scope.$emit("showPdfPage", 1);
@@ -92,7 +91,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 			});
 
 			$scope.$on("pdfLoadError", function(event, source, errorMessage, moreInfo) {
-				$scope.downloading = false;
+				$scope.loading = false;
 				alertify.dialog.alert(errorMessage);
 			});
 
@@ -131,6 +130,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 
 			downloadScope.$on("writeComplete", function(event, url, fileInfo) {
 				event.stopPropagation();
+				$scope.downloadSize = 0;
 				// need to store for internal file it and received token
 				// to allow cleanup and prevent duplicate download
 				fileInfo.url = url;
@@ -153,6 +153,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 
 				$scope.presentationLoaded = false;
 				$scope.pendingPageRequest = null;
+				$scope.loading = true;
 
 				var token = fileInfo.id;
 				var existing = $scope.sharedFilesCache[token];
@@ -165,7 +166,6 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 				downloadProgressBar.style.width = '0%';
 				$scope.downloadProgress = 0;
 				$scope.downloadSize = fileInfo.size;
-				$scope.downloading = true;
 				downloadScope.info = fileInfo;
 
 				downloadScope.handler = mediaStream.tokens.on(token, function(event, currenttoken, to, data, type, to2, from, xfer) {
@@ -317,6 +317,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 			};
 
 			$scope.$on("pdfPageLoading", function(event, page) {
+				$scope.loading = false;
 				$scope.currentPageNumber = page;
 				if ($scope.receivedPage === page) {
 					// we received this page request, don't publish to others
@@ -334,10 +335,12 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 			});
 
 			$scope.$on("pdfPageLoadError", function(event, page, errorMessage) {
+				$scope.loading = false;
 				alertify.dialog.alert(errorMessage);
 			});
 
 			$scope.$on("pdfPageRenderError", function(event, pageNumber, maxPageNumber, errorMessage) {
+				$scope.loading = false;
 				alertify.dialog.alert(errorMessage);
 			});
 
@@ -355,6 +358,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html'], function($,
 				$scope.isPresenter = true;
 				$scope.currentFileInfo = fileInfo;
 				$scope.receivedPage = null;
+				$scope.loading = true;
 				$scope.$emit("openPdf", file);
 				addVisibleSharedFile(file);
 				$scope.sharedFilesCache[fileInfo.id] = file;
diff --git a/static/partials/presentation.html b/static/partials/presentation.html
index 6a119126..11458196 100644
--- a/static/partials/presentation.html
+++ b/static/partials/presentation.html
@@ -1,13 +1,13 @@
 <div class="presentation">
 	<div class="presentationpane nicescroll">
-		<div class="welcome container-fluid" ng-show="downloading">
+		<div class="welcome container-fluid" ng-show="loading">
 			<h1>{{_('Loading presentation ...')}}</h1>
-			<div class="progress">
+			<div class="progress" ng-show="downloadSize &gt; 0">
 				<span class="download-info">{{downloadSize|humanizeFilesize}} <span ng-show="downloading">/ {{downloadProgress}}%</span></span>
 				<div class="progress-bar progress-bar-success"></div>
 			</div>
 		</div>
-		<div class="welcome container-fluid" ng-hide="maxPageNumber !== -1 || downloading">
+		<div class="welcome container-fluid" ng-hide="maxPageNumber !== -1 || loading">
 			<h1>{{_('Please upload a PDF document')}}</h1>
 			<div class="center-block">
 				<p>{{_('Documents are shared with everyone in this call.')}}</p>
@@ -15,7 +15,7 @@
 				<p>{{_('You can drag files here too.')}}</p>
 			</div>
 		</div>
-		<pdfcanvas ng-hide="maxPageNumber === -1 || downloading" />
+		<pdfcanvas ng-hide="maxPageNumber === -1 || loading" />
 	</div>
 	<div class="overlaybar form-horizontal" ng-class="{notvisible: hideControlsBar}">
 		<a class="overlaybar-button" ng-model="hideControlsBar" btn-checkbox btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Presentation controls')}}"><i class="fa fa-cogs"></i></a>