garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

trust enclosure urls

Browse Source
This commit is contained in:
Athou
2013-11-12 11:35:22 +01:00
parent 1937944f7e
commit 28eaab7f7d
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/webapp/js/filters.js
View File

@@ -22,12 +22,18 @@ module.filter('escape', function() {
return encodeURIComponent; return encodeURIComponent;
}); });
module.filter('unsafe', ['$sce', function($sce) { module.filter('trustHtml', ['$sce', function($sce) {
return function(val) { return function(val) {
return $sce.trustAsHtml(val); return $sce.trustAsHtml(val);
}; };
}]); }]);
module.filter('trustUrl', ['$sce', function($sce) {
return function(val) {
return $sce.trustAsResourceUrl(val);
};
}]);
module.filter('highlight', function() { module.filter('highlight', function() {
return function(html, keywords) { return function(html, keywords) {
if (keywords) { if (keywords) {

2
src/main/webapp/templates/_toolbar.html
View File

@@ -82,6 +82,6 @@
</div> </div>
</div> </div>
<div spinner shown="loading"></div> <div spinner shown="loading"></div>
<span ng-if="!MobileService.mobile" ng-bind-html="ServerService.announcement | unsafe"></span> <span ng-if="!MobileService.mobile" ng-bind-html="ServerService.announcement | trustHtml"></span>
</div> </div>
</div> </div>

14
src/main/webapp/templates/feeds.view.html
View File

@@ -29,7 +29,7 @@
{{entry.feedName}} {{entry.feedName}}
</span> </span>
<span class="entry-date">{{entry.date | entryDate}}</span> <span class="entry-date">{{entry.date | entryDate}}</span>
<span class="entry-name" ng-class="{shrink: true, rtl: entry.rtl}" ng-bind-html="entry.title | unsafe | highlight:keywords"></span> <span class="entry-name" ng-class="{shrink: true, rtl: entry.rtl}" ng-bind-html="entry.title | trustHtml | highlight:keywords"></span>
</a> </a>
<a href="{{entry.url}}" target="_blank" class="entry-external-link" ng-click="mark(entry, true)"> <a href="{{entry.url}}" target="_blank" class="entry-external-link" ng-click="mark(entry, true)">
<i class="icon-external-link"></i> <i class="icon-external-link"></i>
@@ -39,7 +39,7 @@
ng-mouseup="bodyClicked(entry, $event)" ng-class="{rtl: entry.rtl}"> ng-mouseup="bodyClicked(entry, $event)" ng-class="{rtl: entry.rtl}">
<div class="entry-header"> <div class="entry-header">
<div class="entry-title"> <div class="entry-title">
<a href="{{entry.url}}" target="_blank" ng-bind-html="entry.title | unsafe | highlight:keywords"></a> <a href="{{entry.url}}" target="_blank" ng-bind-html="entry.title | trustHtml | highlight:keywords"></a>
<div class="entry-subtitle"> <div class="entry-subtitle">
<span class="entry-source" ng-if="selectedType == 'category'"> <span class="entry-source" ng-if="selectedType == 'category'">
<span class="entry-source-prefix">${view.entry_source}</span> <span class="entry-source-prefix">${view.entry_source}</span>
@@ -56,18 +56,18 @@
</div> </div>
<div class="entry-body-content"> <div class="entry-body-content">
<div ng-bind-html="entry.content | unsafe | highlight:keywords"></div> <div ng-bind-html="entry.content | trustHtml | highlight:keywords"></div>
<div class="entry-enclosure" ng-if="entry.enclosureType"> <div class="entry-enclosure" ng-if="entry.enclosureType">
<video controls ng-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0"> <video controls ng-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" /> <source ng-src="{{entry.enclosureUrl | trustUrl}}" type="{{entry.enclosureType}}" />
</video> </video>
<audio controls ng-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0"> <audio controls ng-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0">
<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" /> <source ng-src="{{entry.enclosureUrl | trustUrl}}" type="{{entry.enclosureType}}" />
</audio> </audio>
<div ng-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0"> <div ng-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0">
<img ng-src="{{entry.enclosureUrl}}" /> <img ng-src="{{entry.enclosureUrl | trustUrl}}" />
</div> </div>
<a href="{{entry.enclosureUrl}}" target="_blank" ng-if="entry.enclosureType" download> ${global.download} </a> <a ng-href="{{entry.enclosureUrl | trustUrl}}" target="_blank" ng-if="entry.enclosureType" download> ${global.download} </a>
</div> </div>
</div> </div>
<div class="entry-buttons form-horizontal"> <div class="entry-buttons form-horizontal">