Skip to content

Commit ac2af4f

Browse files
committed
Copy right
1 parent e61dfcc commit ac2af4f

File tree

7 files changed

+266
-277
lines changed

7 files changed

+266
-277
lines changed

OpenNote/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959

6060
<!-- Directives -->
6161
<script src="openNote/directives/randomFadeInDirective.js"></script>
62+
<script src="openNote/directives/fadeOutDirective.js"></script>
6263

6364
<!-- Controllers -->
6465
<script src="openNote/controllers/folderController.js"></script>
@@ -76,5 +77,7 @@
7677
<div class="col-lg-2 col-md-3 col-sm-4 hidden-xs" ng-include="'openNote/partials/listPartial.html'"></div>
7778

7879
<div class="col-lg-10 col-md-9 col-sm-8" ng-view data-intro="{{helpContent.viewArea}}"> </div>
80+
81+
<div id="copyRight" class="col-xs-12 fadeOutDirective">&#169; 2015 Jacob Liscom</div>
7982
</body>
8083
</html>

OpenNote/openNote.appcache

Lines changed: 90 additions & 123 deletions
Large diffs are not rendered by default.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
*randomly fade in element to have a wave effect
3+
*/
4+
openNote.directive("fadeOutDirective", function($timeout,config) {
5+
return {
6+
restrict: "C",//class
7+
link: function(scope, element, attrs) {
8+
element.stop().fadeTo(10000,0);
9+
}
10+
};
11+
});

OpenNote/openNote/openNote.js

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
/**
2-
* @author - Jake Liscom
2+
* @author - Jake Liscom
33
* @project - OpenNote
44
*/
55

66
//Module Declaration
77
var openNote = angular.module("openNote", [ "ngRoute",
8-
"ngResource",
9-
"ngSanitize",
10-
"ngAnimate",
8+
"ngResource",
9+
"ngSanitize",
10+
"ngAnimate",
1111
"ui.tree",
1212
"ngFileUpload"]);
1313

1414
/**
1515
* Used to redirect users to login if their token has expired
1616
* Runs on every route
1717
*/
18-
openNote.run(function ( $rootScope,
19-
$location,
20-
userService,
21-
config,
18+
openNote.run(function ( $rootScope,
19+
$location,
20+
userService,
21+
config,
2222
serverConfigService,
2323
$http){
24-
24+
2525
$rootScope.helpContent=config.getHelpContent();
26-
27-
$rootScope.$on("$routeChangeStart", function (event) {
26+
27+
$rootScope.$on("$routeChangeStart", function (event) {
2828
//server config values
2929
serverConfigService.getConfig().then(function(config){
3030
if(!config)
3131
alertify.error("Connection to service failed");
3232
else
3333
$rootScope.serverConfig=config;
3434
}); //attach server config to root scope
35-
36-
//Initial entry after if logged in
35+
36+
//Initial entry after if logged in
3737
if(!$rootScope.showMenu && !$rootScope.showSideBar)//make sure we only fade in/run once
38-
$rootScope.$emit("init");
38+
$rootScope.$emit("init");
3939
});
40-
40+
4141
/**
4242
* Refresh token
4343
*/
@@ -50,36 +50,36 @@ openNote.run(function ( $rootScope,
5050
}).catch(function(error){
5151
alertify.error("Refreshed token failed");
5252
});
53-
53+
5454
};
55-
56-
55+
56+
5757
/**
5858
* Initialize app and start fade in
5959
*/
6060
$rootScope.$on("init",function(){
6161
userService.useAPITokenHeader();//use token
62-
62+
6363
$rootScope.showMenu=true;
6464
$rootScope.showSideBar=true;
65-
65+
6666
//options for humans
67-
$rootScope.showHelpButton = config.showHelpButton();
68-
67+
$rootScope.showHelpButton = config.showHelpButton();
68+
6969
//Check for updates
7070
$http.get(config.getUpdateURL()).then(
7171
function(response){//Successful
7272
if(response.data.version!=config.getVersion())
7373
alertify.log("<a href='"+response.data.updateURL+"' target='_blank'>"+response.data.updateText+"</a>", "", 0);
7474
}
7575
);
76-
76+
7777
//Setup auto login interval
7878
if(userService.getUsername() && !$rootScope.autoLogInInterval){
7979
tokenRefresh();
8080
$rootScope.autoLogInInterval=setInterval(tokenRefresh, 1800000);
8181
};
8282
});
83-
84-
85-
});
83+
84+
85+
});
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*Fade In*/
2-
.fadeIn.ng-hide-add,
2+
.fadeIn.ng-hide-add,
33
.fadeIn.ng-hide-remove,
44
.fadeIn.ng-enter,
55
.fadeIn.ng-leave{
66
transition:all 2s;
77
display: block;
88
}
9-
9+
1010
.fadeIn.ng-hide-add.ng-hide-add-active,
1111
.fadeIn.ng-hide-remove,
1212
.fadeIn.ng-leave-active {
1313
opacity:0;
1414
}
15-
15+
1616
.fadeIn.ng-hide-add,
1717
.fadeIn.ng-hide-remove.ng-hide-remove-active,
1818
.fadeIn.ng-enter-active{
1919
opacity:1;
20-
}
20+
}

0 commit comments

Comments
 (0)