Skip to content

Commit 7635af9

Browse files
committed
Tree view bug fix
1 parent 992e90c commit 7635af9

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

OpenNote/openNote/controllers/listController.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
*/
99
openNote.controller("listController", function( $scope,
1010
$rootScope,
11-
folderFactory,
12-
$timeout) {
11+
folderFactory,
12+
$timeout,
13+
userService) {
1314
$scope.data = new folderFactory();
1415

1516
/**
@@ -106,11 +107,14 @@ openNote.controller("listController", function( $scope,
106107
*/
107108
var increaseTreeBuffer = function(){
108109
if($scope.treeBuffer<=100) {
109-
//console.log(
110-
$scope.treeBuffer++;//);
111-
$timeout(increaseTreeBuffer, 100);
110+
$scope.treeBuffer++;
111+
$timeout(increaseTreeBuffer, 500);
112112
}
113113
else
114114
$rootScope.$emit("listLoaded", {});//Tell the world we are done
115115
}
116+
117+
//Load the lists initially
118+
if(userService.hasValidToken())
119+
$rootScope.$emit("reloadListView");
116120
});

OpenNote/openNote/openNote.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ openNote.run(function ( $rootScope,
6060
*/
6161
$rootScope.$on("init",function(){
6262
userService.useAPITokenHeader();//use token
63-
64-
/*$rootScope.$on("$viewContentLoaded",function(){//wait for page to load before requesting list view
65-
$rootScope.$emit("reloadListView"); //send an event to tell the list view to reload
66-
});*/
67-
63+
6864
$rootScope.showMenu=true;
6965
$rootScope.showSideBar=true;
7066

OpenNote/openNote/partials/listPartial.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
<div id="folderList">
33
<div ui-tree="options" id="tree-root">
44
<ol ui-tree-nodes="" ng-model="data.foldersInside" >
5-
<li ng-repeat="folder in data.foldersInside" ui-tree-node ng-include="'openNote/partials/treePartial.html'" data-collapsed="!node.collapsed"></li>
5+
<li ng-repeat="folder in data.foldersInside"
6+
ui-tree-node
7+
ng-include="'openNote/partials/treePartial.html'"
8+
data-collapsed="!node.collapsed"></li>
69
</ol>
710
</div>
811
</div>

OpenNote/openNote/partials/treePartial.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
<a data-nodrag href="#/folder/{{folder.id}}">{{folder.name}}</a>
44
</div>
55
<ol ui-tree-nodes="" ng-model="folder.foldersInside" ng-class="{hidden: collapsed}">
6-
<li ng-repeat="folder in folder.foldersInside | limitTo: treeBuffer" ui-tree-node ng-include="'openNote/partials/treePartial.html'" data-collapsed="!node.collapsed"></li>
6+
<li ng-repeat="folder in folder.foldersInside | limitTo: treeBuffer"
7+
ui-tree-node
8+
ng-include="'openNote/partials/treePartial.html'"
9+
data-collapsed="!node.collapsed"></li>
710
</ol>

0 commit comments

Comments
 (0)