summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <Raydiation@users.noreply.github.com>2014-07-30 11:22:44 +0200
committerBernhard Posselt <Raydiation@users.noreply.github.com>2014-07-30 11:22:44 +0200
commit713b71a33ca0521417504aaa4fb90c93805a4a55 (patch)
treebf25a31e1ae74f25d38da8196cdef0ab85320028 /js
parent8251981a398a489b82cca87d1b0140bffaab6956 (diff)
Revert "Fix audio tag and basic video enclosure support"
Diffstat (limited to 'js')
-rw-r--r--js/app/directives/audio.coffee4
-rw-r--r--js/app/directives/video.coffee44
-rw-r--r--js/public/app.js56
3 files changed, 4 insertions, 100 deletions
diff --git a/js/app/directives/audio.coffee b/js/app/directives/audio.coffee
index 719adc282..3d6d94062 100644
--- a/js/app/directives/audio.coffee
+++ b/js/app/directives/audio.coffee
@@ -34,8 +34,8 @@ angular.module('News').directive 'newsAudio', ->
'<a ng-href="{{ src|trustUrl }}" class="button" ng-show="cantPlay()" ' +
'ng-transclude></a>'
link: (scope, elm, attrs) ->
- source = elm.children('audio').children('source')[0]
- cantPlay = !document.createElement('audio').canPlayType(attrs['type']);
+ source = elm.children().children('source')[0]
+ cantPlay = false
source.addEventListener 'error', ->
scope.$apply ->
cantPlay = true
diff --git a/js/app/directives/video.coffee b/js/app/directives/video.coffee
deleted file mode 100644
index cf7454f84..000000000
--- a/js/app/directives/video.coffee
+++ /dev/null
@@ -1,44 +0,0 @@
-###
-
-ownCloud - News
-
-@author Bernhard Posselt
-@copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-License as published by the Free Software Foundation; either
-version 3 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-You should have received a copy of the GNU Affero General Public
-License along with this library. If not, see <http://www.gnu.org/licenses/>.
-
-###
-
-angular.module('News').directive 'newsVideo', ->
- directive =
- restrict: 'E'
- scope:
- src: '@'
- type: '@'
- transclude: true
- template: '' +
- '<video controls="controls" preload="none" ng-hide="cantPlay()">' +
- '<source ng-src="{{ src|trustUrl }}">' +
- '</video>' +
- '<a ng-href="{{ src|trustUrl }}" class="button" ng-show="cantPlay()" ' +
- 'ng-transclude></a>'
- link: (scope, elm, attrs) ->
- source = elm.children('video').children('source')[0]
- cantPlay = !document.createElement('video').canPlayType(attrs['type']);
- source.addEventListener 'error', ->
- scope.$apply ->
- cantPlay = true
-
- scope.cantPlay = -> cantPlay
-
diff --git a/js/public/app.js b/js/public/app.js
index fcdf6934e..c1c2363be 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -105,60 +105,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
template: '' + '<audio controls="controls" preload="none" ng-hide="cantPlay()">' + '<source ng-src="{{ src|trustUrl }}">' + '</audio>' + '<a ng-href="{{ src|trustUrl }}" class="button" ng-show="cantPlay()" ' + 'ng-transclude></a>',
link: function(scope, elm, attrs) {
var cantPlay, source;
- source = elm.children('audio').children('source')[0];
- cantPlay = !document.createElement('audio').canPlayType(attrs['type']);
- source.addEventListener('error', function() {
- return scope.$apply(function() {
- return cantPlay = true;
- });
- });
- return scope.cantPlay = function() {
- return cantPlay;
- };
- }
- };
- });
-
-}).call(this);
-
-// Generated by CoffeeScript 1.6.3
-/*
-
-ownCloud - News
-
-@author Bernhard Posselt
-@copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-License as published by the Free Software Foundation; either
-version 3 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-You should have received a copy of the GNU Affero General Public
-License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-(function() {
- angular.module('News').directive('newsVideo', function() {
- var directive;
- return directive = {
- restrict: 'E',
- scope: {
- src: '@',
- type: '@'
- },
- transclude: true,
- template: '' + '<video controls="controls" preload="none" ng-hide="cantPlay()">' + '<source ng-src="{{ src|trustUrl }}">' + '</video>' + '<a ng-href="{{ src|trustUrl }}" class="button" ng-show="cantPlay()" ' + 'ng-transclude></a>',
- link: function(scope, elm, attrs) {
- var cantPlay, source;
- source = elm.children('video').children('source')[0];
- cantPlay = !document.createElement('video').canPlayType(attrs['type']);
+ source = elm.children().children('source')[0];
+ cantPlay = false;
source.addEventListener('error', function() {
return scope.$apply(function() {
return cantPlay = true;