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

don't refresh menu when changing categories

Browse Source
This commit is contained in:
Athou
2013-03-22 23:54:52 +01:00
parent 38f893d976
commit 8a6f843604
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/commafeed/frontend/pages/home/HomePage.html
View File

@@ -9,7 +9,24 @@
</head> </head>
<body> <body>
<div ng-app="commafeed"> <div ng-app="commafeed">
<ng:view></ng:view> <div class="container-fluid">
<div class="row-fluid">
<div class="span2" ng-controller="CategoryTreeCtrl">
<div class="css-treeview">
<ul>
<category node="root" feed-click="feedClicked(id)"
category-click="categoryClicked(id)" selected-type="selectedType"
selected-id="selectedId"
format-category-name="formatCategoryName(category)"
format-feed-name="formatFeedName(feed)"> </category>
</ul>
</div>
</div>
<div class="span10">
<ng:view></ng:view>
</div>
</div>
</div>
</div> </div>
<script src="vendor/jquery/jquery-1.9.1.min.js"></script> <script src="vendor/jquery/jquery-1.9.1.min.js"></script>

10
src/main/webapp/js/controllers.js
View File

@@ -9,8 +9,10 @@ module.run(function($rootScope) {
module.controller('CategoryTreeCtrl', function($scope, $routeParams, $location, module.controller('CategoryTreeCtrl', function($scope, $routeParams, $location,
CategoryService) { CategoryService) {
$scope.selectedType = $routeParams._type; $scope.$on('$routeChangeSuccess', function() {
$scope.selectedId = $routeParams._id; $scope.selectedType = $routeParams._type;
$scope.selectedId = $routeParams._id;
});
$scope.root = CategoryService.get(); $scope.root = CategoryService.get();
@@ -48,10 +50,14 @@ module.controller('CategoryTreeCtrl', function($scope, $routeParams, $location,
} }
$scope.feedClicked = function(id) { $scope.feedClicked = function(id) {
$scope.selectedType = 'feed';
$scope.selectedId = id;
$location.path('/feeds/view/feed/' + id); $location.path('/feeds/view/feed/' + id);
}; };
$scope.categoryClicked = function(id) { $scope.categoryClicked = function(id) {
$scope.selectedType = 'category';
$scope.selectedId = id;
$location.path('/feeds/view/category/' + id); $location.path('/feeds/view/category/' + id);
}; };

49
src/main/webapp/templates/feeds.html
View File

@@ -1,37 +1,20 @@
<div class="container-fluid"> <div ng-controller="FeedListCtrl">
<div class="row-fluid"> <span>{{entryList.name}}</span><span
<div class="span2" ng-controller="CategoryTreeCtrl"> ng-show="selectedType == 'category'"> &#187;</span>
<div class="css-treeview"> <div class="accordion" id="feed-accordion">
<ul> <div class="accordion-group" ng-repeat="entry in entryList.entries">
<category node="root" feed-click="feedClicked(id)" <div class="accordion-heading">
category-click="categoryClicked(id)" selected-type="selectedType" <a class="accordion-toggle" data-toggle="collapse"
selected-id="selectedId" ng-click="markAsRead(entry)"
format-category-name="formatCategoryName(category)" ng-class="{unread: entry.read == false}"
format-feed-name="formatFeedName(feed)"> </category> data-parent="#feed-accordion" href="{{'#feed-body' + $index}}">
</ul> <span ng-show="selectedType == 'category'">{{entry.feedName}}
- </span>{{entry.title}} <span class="pull-right">{{entry.date}}</span>
</a>
</div>
<div id="{{'feed-body' + $index}}" class="accordion-body collapse">
<div class="accordion-inner" ng-bind-html="entry.content"></div>
</div> </div>
</div> </div>
<div class="span10" ng-controller="FeedListCtrl">
<span>{{entryList.name}}</span><span
ng-show="selectedType == 'category'"> &#187;</span>
<div class="accordion" id="feed-accordion">
<div class="accordion-group" ng-repeat="entry in entryList.entries">
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse"
ng-click="markAsRead(entry)"
ng-class="{unread: entry.read == false}"
data-parent="#feed-accordion" href="{{'#feed-body' + $index}}">
<span ng-show="selectedType == 'category'">{{entry.feedName}}
- </span>{{entry.title}} <span class="pull-right">{{entry.date}}</span>
</a>
</div>
<div id="{{'feed-body' + $index}}" class="accordion-body collapse">
<div class="accordion-inner" ng-bind-html="entry.content"></div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>