fix autoclosing issue

This commit is contained in:
Jeremie Panzer
2013-03-26 12:10:19 +01:00
parent 17eb642cc7
commit 654cee9a1f
3 changed files with 24 additions and 22 deletions

View File

@@ -45,28 +45,28 @@
margin-top: 80px; margin-top: 80px;
} }
#feed-accordion .entry .entry-heading a { #feed-accordion .entry-heading {
padding: 6px 0px; padding: 6px 0px;
}
#feed-accordion .entry-heading.open {
background-color: #EBEBEB; background-color: #EBEBEB;
} }
#feed-accordion .entry .entry-heading a.collapsed { #feed-accordion .entry-heading.closed:hover {
background-color: #FFF;
}
#feed-accordion .entry .entry-heading a.collapsed:hover {
background-color: #EBEBEB; background-color: #EBEBEB;
} }
#feed-accordion .entry .entry-heading a { #feed-accordion a.accordion-toggle {
color: black; color: black;
display: block; display: block;
padding: 0px;
} }
#feed-accordion .entry .entry-heading a:hover { #feed-accordion a.accordion-toggle:hover {
text-decoration: none; text-decoration: none;
} }
#feed-accordion .entry .entry-heading .unread { #feed-accordion a.accordion-toggle .unread {
font-weight: bold; font-weight: bold;
} }

View File

@@ -158,4 +158,9 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http,
}); });
} }
}; };
$scope.toggle = function(entry) {
$scope.current = entry;
$scope.mark(entry, true);
}
}); });

View File

@@ -3,17 +3,14 @@
<span>{{entryList.name}}</span><span <span>{{entryList.name}}</span><span
ng-show="selectedType == 'category'"> &#187;</span> ng-show="selectedType == 'category'"> &#187;</span>
<div id="feed-accordion" infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy" infinite-scroll-distance="1"> <div id="feed-accordion" infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy" infinite-scroll-distance="1">
<div ng-repeat="entry in entryList.entries" class="entry accordion-group"> <accordion close-others="true">
<div class="entry-heading"> <accordion-group ng-repeat="entry in entryList.entries" class="entry">
<a class="accordion-toggle collapsed" data-toggle="collapse" <accordion-heading>
ng-click="mark(entry, true)" <div class="entry-heading" ng-click="toggle(entry)" ng-class="{unread: entry.read == false, open: current == entry, closed: current != entry}">
ng-class="{unread: entry.read == false}" <span ng-show="selectedType == 'category'">{{entry.feedName}}
data-parent="#feed-accordion" href="{{'#feed-body' + $index}}"> - </span>{{entry.title}} <span class="pull-right">{{entry.date}}</span>
<span ng-show="selectedType == 'category'">{{entry.feedName}} </div>
- </span>{{entry.title}} <span class="pull-right">{{entry.date}}</span> </accordion-heading>
</a>
</div>
<div id="{{'feed-body' + $index}}" class="collapse">
<div> <div>
<div> <div>
<h4> <h4>
@@ -22,8 +19,8 @@
</div> </div>
<div ng-bind-html="entry.content"></div> <div ng-bind-html="entry.content"></div>
</div> </div>
</div> </accordion-group>
</div> </accordion>
<div class="no-entries" ng-show="entryList.entries.length == 0">"{{entryList.name}}" has no unread items.</div> <div class="no-entries" ng-show="entryList.entries.length == 0">"{{entryList.name}}" has no unread items.</div>
<div ng-show="busy">Loading data...</div> <div ng-show="busy">Loading data...</div>
</div> </div>