Skip to content

Commit 1c9097a

Browse files
JLiscomJLiscom
committed
https://github.com/FoxUSA/OpenNote/issues/77
Updated Angular dependencies
1 parent f4b8cc6 commit 1c9097a

File tree

9 files changed

+50
-44
lines changed

9 files changed

+50
-44
lines changed

‎OpenNote/bower.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"dependencies": {
99
"jquery": "2.0.3",
1010
"bootstrap": "3.1.1",
11-
"angular": "1.2.16",
12-
"angular-route": "1.2.16",
13-
"angular-resource": "1.2.16",
14-
"angular-sanitize": "1.2.16",
15-
"angular-animate": "1.2.16",
16-
"angular-mocks": "1.2.16",
11+
"angular": "1.2.21",
12+
"angular-route": "1.2.21",
13+
"angular-resource": "1.2.21",
14+
"angular-sanitize": "1.2.21",
15+
"angular-animate": "1.2.21",
16+
"angular-mocks": "1.2.21",
1717
"ckeditor": "ckeditor/ckeditor-releases#full/4.4.x",
1818
"angular-ui-tree": "2.1.2",
1919
"alertify": "0.3.10",

‎OpenNote/index.html‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@
4242
<script src="openNote/openNote.js" type="text/javascript"></script>
4343
<script src="openNote/openNote.config.js" type="text/javascript"></script>
4444
<script src="openNote/router.js" type="text/javascript"></script>
45-
46-
<!-- Controllers -->
47-
<script src="openNote/controllers/loginController.js" type="text/javascript"></script>
48-
<script src="openNote/controllers/folderController.js" type="text/javascript"></script>
49-
<script src="openNote/controllers/noteController.js" type="text/javascript"></script>
50-
<script src="openNote/controllers/listController.js" type="text/javascript"></script>
51-
<script src="openNote/controllers/searchController.js" type="text/javascript"></script>
5245

5346
<!-- Services -->
5447
<script src="openNote/services/userService.js" type="text/javascript"></script>
@@ -62,8 +55,12 @@
6255
<script src="openNote/factories/folderFactory.js" type="text/javascript"></script>
6356
<script src="openNote/factories/noteFactory.js" type="text/javascript"></script>
6457

65-
<!-- Animations -->
66-
<script src="openNote/animations/waveAnimation.js" type="text/javascript"></script>
58+
<!-- Controllers -->
59+
<script src="openNote/controllers/loginController.js" type="text/javascript"></script>
60+
<script src="openNote/controllers/folderController.js" type="text/javascript"></script>
61+
<script src="openNote/controllers/noteController.js" type="text/javascript"></script>
62+
<script src="openNote/controllers/listController.js" type="text/javascript"></script>
63+
<script src="openNote/controllers/searchController.js" type="text/javascript"></script>
6764

6865
</head>
6966
<body>

‎OpenNote/openNote/animations/waveAnimation.js‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎OpenNote/openNote/controllers/folderController.js‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11

2-
openNote.controller("folderController", function($scope, $rootScope, $location, $routeParams, folderFactory, config) {
2+
openNote.controller("folderController", function( $scope,
3+
$rootScope,
4+
$location,
5+
$routeParams,
6+
folderFactory,
7+
config,
8+
$timeout) {
39
$rootScope.buttons = [];
410
$scope.folderEditMode = false;
511
$scope.currentFolder = new folderFactory();
@@ -54,12 +60,14 @@ openNote.controller("folderController", function($scope, $rootScope, $location,
5460
/**
5561
* Load folder contents
5662
*/
57-
$scope.currentFolder.$get({id:$routeParams.id}).then(function(data){
58-
//Do they have anything to display?
59-
if($scope.currentFolder.id==null && $scope.currentFolder.foldersInside.length==0){
60-
$scope.currentFolder.name=null;//resets title
61-
alertify.alert("It looks like you dont have any folders. You can create one using the \"New Folder\" button in the top right of the page.");
62-
}
63+
$timeout(function(){
64+
$scope.currentFolder.$get({id:$routeParams.id}).then(function(data){
65+
//Do they have anything to display?
66+
if($scope.currentFolder.id==null && $scope.currentFolder.foldersInside.length==0){
67+
$scope.currentFolder.name=null;//resets title
68+
alertify.alert("It looks like you dont have any folders. You can create one using the \"New Folder\" button in the top right of the page.");
69+
}
70+
});
6371
});
6472

6573
/**

‎OpenNote/openNote/controllers/listController.js‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* Control
88
*/
9-
openNote.controller("listController", function($scope, $rootScope, folderFactory) {
9+
openNote.controller("listController", function($scope, $rootScope, folderFactory, $timeout) {
1010
$scope.data = new folderFactory();
1111

1212
/**
@@ -43,7 +43,11 @@ openNote.controller("listController", function($scope, $rootScope, folderFactory
4343
* Load list view
4444
*/
4545
$rootScope.$on("reloadListView", function(event, args) {
46-
$scope.data.$get({levels:100, includeNotes: false});
46+
$scope.data.$get({levels:100, includeNotes: false}).then(function(result){
47+
$scope.treeBuffer = 0;
48+
$scope.data=result;
49+
increaseTreeBuffer();
50+
});
4751
});
4852

4953
/**
@@ -95,4 +99,16 @@ openNote.controller("listController", function($scope, $rootScope, folderFactory
9599
}
96100
}
97101
};
102+
103+
/**
104+
* Render list slowly
105+
*/
106+
var increaseTreeBuffer = function(){
107+
if($scope.treeBuffer<=100) {
108+
$scope.treeBuffer++;
109+
$timeout(increaseTreeBuffer, 100);
110+
}
111+
else
112+
$rootScope.$emit("listLoaded", {});//Tell the world we are done
113+
}
98114
});

‎OpenNote/openNote/directives/randomFadeInDirective.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ openNote.directive("randomFadeInDirective", function($timeout,config) {
55
return {
66
restrict: "C",//class
77
link: function(scope, element, attrs) {
8-
$timeout(function(){
9-
element.fadeIn(config.fadeSpeedLong());
10-
},500);//give everything time to load
8+
element.hide().fadeIn(config.fadeSpeedLong());
119
}
1210
};
1311
});

‎OpenNote/openNote/partials/folderPartial.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
</div>
99

10-
<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden waveAnimation box folder jstree-draggable" ng-click="loadFolder(folder);">
10+
<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden randomFadeInDirective box folder jstree-draggable" ng-click="loadFolder(folder);">
1111
<h4>
1212
{{folder.name}}
1313
</h4>
@@ -17,7 +17,7 @@ <h4>
1717
</p>
1818
</div>
1919

20-
<div ng-Repeat="note in currentFolder.notesInside" class="box waveAnimation note startHidden jstree-draggable" ng-click="loadNote(note);">
20+
<div ng-Repeat="note in currentFolder.notesInside" class="box randomFadeInDirective note startHidden jstree-draggable" ng-click="loadNote(note);">
2121
<h4>
2222
{{note.title}}
2323
</h4>

‎OpenNote/openNote/partials/searchPartial.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</div>
3434

3535
<div class="folderPartial">
36-
<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden waveAnimation box folder jstree-draggable" ng-click="loadFolder(folder);">
36+
<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden randomFadeInDirective box folder jstree-draggable" ng-click="loadFolder(folder);">
3737
<h4>
3838
{{folder.name}}
3939
</h4>

‎OpenNote/openNote/partials/treePartial.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
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" ui-tree-node ng-include="'openNote/partials/treePartial.html'" data-collapsed="!node.collapsed"></li>
6+
<li ng-repeat="folder in folder.foldersInside | limitTo: treeBuffer" ui-tree-node ng-include="'openNote/partials/treePartial.html'" data-collapsed="!node.collapsed"></li>
77
</ol>

0 commit comments

Comments
 (0)