Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

middle-clicking on the feed in the category tree opens its website

Browse Source
This commit is contained in:
MageFroh
2013-07-01 22:36:20 +01:00
parent 65dd0ec8bd
commit a2ccd0d682
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/webapp/js/directives.js
View File

@@ -257,16 +257,24 @@ module.directive('category', [ function() {
return label; return label;
}; };
$scope.feedClicked = function(id) { $scope.feedClicked = function(id, event) {
MobileService.toggleLeftMenu(); // Could be called by a middle click
if ($scope.selectedType == 'feed' if (!event || (!event.ctrlKey && event.which == 1)) {
&& id == $scope.selectedId) { MobileService.toggleLeftMenu();
$scope.$emit('emitReload'); if ($scope.selectedType == 'feed'
} else { && id == $scope.selectedId) {
$state.transitionTo('feeds.view', { $scope.$emit('emitReload');
_type : 'feed', } else {
_id : id $state.transitionTo('feeds.view', {
}); _type : 'feed',
_id : id
});
}
if (event) {
event.preventDefault();
event.stopPropagation();
}
} }
}; };

5
src/main/webapp/templates/_category.html
View File

@@ -34,7 +34,8 @@
<div class="pull-right" ng-click="showFeedDetails(feed)"> <div class="pull-right" ng-click="showFeedDetails(feed)">
<i class="icon-wrench config pointer"></i> <i class="icon-wrench config pointer"></i>
</div> </div>
<a ng-click="feedClicked(feed.id)" class="feed-link" <a ng-click="feedClicked(feed.id, $event)" class="feed-link"
href="{{feed.feedLink}}" target="_blank"
ng-class="{error: feed.message && feed.errorCount > 10, selected: (feed.id == selectedId && selectedType == 'feed') }"> ng-class="{error: feed.message && feed.errorCount > 10, selected: (feed.id == selectedId && selectedType == 'feed') }">
<favicon url="feed.iconUrl" /> <favicon url="feed.iconUrl" />
<span ng-class="{unread: feed.unread}"> <span ng-class="{unread: feed.unread}">
@@ -47,4 +48,4 @@
</a> </a>
</li> </li>
</ul> </ul>
</li> </li>