David %!s(int64=9) %!d(string=hai) anos
pai
achega
0318292463

+ 2 - 0
front/controllers/cutCtrl.js

@@ -6,6 +6,8 @@ app.controller('cutCtrl', function ($scope, $http,video,notify) {
 	$scope.video = video; 
 	$scope.video = video; 
 	$scope.censuras = [];
 	$scope.censuras = [];
 
 
+	document.getElementById("video").setAttribute("src", $scope.video.file);
+
 	$scope.post = function() {
 	$scope.post = function() {
 		var data = {
 		var data = {
 					curso: $scope.curso,
 					curso: $scope.curso,

+ 0 - 1
front/views/cut.html

@@ -3,7 +3,6 @@
 	<div class="row">
 	<div class="row">
 		<div class="col-md-6">
 		<div class="col-md-6">
 			<video id="video" width="100%" controls preload>
 			<video id="video" width="100%" controls preload>
-				<source src="{{video.file}}" type="video/mp4">
 				Error. Video no soportado
 				Error. Video no soportado
 			</video>
 			</video>
 		</div>
 		</div>

+ 1 - 1
front/views/processed.html

@@ -19,7 +19,7 @@
 			{{::v.out_fname.split("/").slice(-1)[0]}}
 			{{::v.out_fname.split("/").slice(-1)[0]}}
 		</td>
 		</td>
 		<td>
 		<td>
-			<a ng-href="/upload/{{v._id}}">subir</a>
+			<a ng-href="/#/upload/{{v._id}}">subir</a>
 		</td>
 		</td>
 	</tr>
 	</tr>
 </table>
 </table>

+ 1 - 1
front/views/upload.html

@@ -21,7 +21,7 @@
 			</div>
 			</div>
 			<div class="form-group">
 			<div class="form-group">
 			    <label>Texto1</label>
 			    <label>Texto1</label>
-			    <input type="text" class="form-control" ng-model="texto1" maxlength="20">
+			    <input type="text" class="form-control" ng-model="texto1" maxlength="25">
 			</div>
 			</div>
 			<div class="form-group">
 			<div class="form-group">
 			    <label>Texto2</label>
 			    <label>Texto2</label>