Browse Source

Allow downloading of presentations.

pull/80/head
Joachim Bauch 11 years ago
parent
commit
d14af48ba0
  1. 13
      src/styles/components/_presentation.scss
  2. 30
      static/js/directives/presentation.js
  3. 3
      static/partials/presentation.html

13
src/styles/components/_presentation.scss

@ -207,14 +207,21 @@ @@ -207,14 +207,21 @@
display: block;
}
.presentation .thumbnail .delete {
.presentation .thumbnail .presentation-action {
position: absolute;
top: 1px;
right: 1px;
display: none;
}
.presentation .thumbnail:hover .delete {
.presentation .thumbnail .download {
left: 1px;
}
.presentation .thumbnail .delete {
right: 1px;
}
.presentation .thumbnail:hover .presentation-action {
display: block;
}

30
static/js/directives/presentation.js

@ -53,6 +53,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'], @@ -53,6 +53,7 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'],
this.file = null;
this.handler = null;
this.session = null;
this.url = null;
};
BasePresentation.prototype.stop = function() {
@ -75,7 +76,6 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'], @@ -75,7 +76,6 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'],
BasePresentation.call(this, scope, fileInfo, token);
this.owner = owner;
this.progress = 0;
this.url = null;
this.presentable = false;
this.downloading = true;
this.uploaded = false;
@ -129,6 +129,15 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'], @@ -129,6 +129,15 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'],
}
};
DownloadPresentation.prototype.browserOpen = function(target) {
target = target || "_blank";
if (this.downloading) {
console.log("Presentation download not finished yet, not opening", this);
return;
}
$window.open(this.url, target);
};
DownloadPresentation.prototype.close = function() {
this.openCallback = null;
};
@ -176,6 +185,14 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'], @@ -176,6 +185,14 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'],
callback(this.file);
};
UploadPresentation.prototype.browserOpen = function(target) {
target = target || "_blank";
if (!this.url) {
this.url = URL.createObjectURL(this.file.file);
}
$window.open(this.url, target);
};
UploadPresentation.prototype.close = function() {
};
@ -199,6 +216,10 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'], @@ -199,6 +216,10 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'],
this.scope.$destroy();
this.scope = null;
}
if (this.url) {
URL.revokeObjectURL(this.url);
this.url = null;
}
this.session = null;
BasePresentation.prototype.clear.call(this);
};
@ -651,6 +672,13 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'], @@ -651,6 +672,13 @@ define(['jquery', 'underscore', 'text!partials/presentation.html', 'bigscreen'],
presentation.clear();
};
$scope.downloadPresentation = function(presentation, $event) {
if ($event) {
$event.preventDefault();
}
presentation.browserOpen();
};
$scope.toggleFullscreen = function(elem) {
if (BigScreen.enabled) {

3
static/partials/presentation.html

@ -44,7 +44,8 @@ @@ -44,7 +44,8 @@
title="{{ presentation.info.name }}">
<div class="fa active fa-check" ng-show="presentation === currentPresentation"></div>
<div class="fa notavailable fa-ban" ng-show="presentation !== currentPresentation && !presentation.presentable"></div>
<a class="btn btn-danger delete" ng-show="presentation.uploaded" ng-click="deletePresentation(presentation, $event)"><i class="fa fa-trash-o fa-lg"></i></a>
<a class="btn btn-primary presentation-action download" ng-show="presentation.uploaded || !presentation.downloading" ng-click="downloadPresentation(presentation, $event)"><i class="fa fa-download fa-lg"></i></a>
<a class="btn btn-danger presentation-action delete" ng-show="presentation.uploaded" ng-click="deletePresentation(presentation, $event)"><i class="fa fa-trash-o fa-lg"></i></a>
<div class="fa filetype fa-file-pdf-o"></div>
<div class="caption">
<span class="name">{{ presentation.info.name }}</span><br>

Loading…
Cancel
Save