Skip to content

Commit 177b47a

Browse files
FoxUSAFoxUSA
committed
Merge pull request #95 from FoxUSA/Fox-Working
Fox working
2 parents e621465 + 0741f2a commit 177b47a

File tree

17 files changed

+823
-21
lines changed

17 files changed

+823
-21
lines changed

‎Doc/screenShots/OpenNote.png‎

277 KB
Loading

‎Doc/screenShots/OpenNoteHome.png‎

3.28 KB
Loading

‎Doc/screenShots/login.png‎

6.85 KB
Loading

‎Doc/screenShots/plants.png‎

19 KB
Loading

‎Gruntfile.js‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ module.exports = function(grunt) {
1414
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
1515
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
1616
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
17-
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
17+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
18+
19+
"OpenNote/openNote/style/simplicity/dark/style.css": "OpenNote/openNote/style/simplicity/style.less",
20+
"OpenNote/openNote/style/simplicity/dark/note.css": "OpenNote/openNote/style/simplicity/note.less",
21+
"OpenNote/openNote/style/simplicity/dark/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
22+
"OpenNote/openNote/style/simplicity/dark/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
1823

1924
}
2025
},
@@ -29,7 +34,12 @@ module.exports = function(grunt) {
2934
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
3035
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
3136
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
32-
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
37+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
38+
39+
"OpenNote/openNote/style/simplicity/light/style.css": "OpenNote/openNote/style/simplicity/style.less",
40+
"OpenNote/openNote/style/simplicity/light/note.css": "OpenNote/openNote/style/simplicity/note.less",
41+
"OpenNote/openNote/style/simplicity/light/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
42+
"OpenNote/openNote/style/simplicity/light/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
3343
}
3444
},
3545
prodDark: {
@@ -44,7 +54,13 @@ module.exports = function(grunt) {
4454
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
4555
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
4656
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
47-
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
57+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
58+
59+
"OpenNote/openNote/style/simplicity/dark/style.css": "OpenNote/openNote/style/simplicity/style.less",
60+
"OpenNote/openNote/style/simplicity/dark/note.css": "OpenNote/openNote/style/simplicity/note.less",
61+
"OpenNote/openNote/style/simplicity/dark/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
62+
"OpenNote/openNote/style/simplicity/dark/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
63+
4864
}
4965
},
5066
prodLight: {
@@ -59,7 +75,12 @@ module.exports = function(grunt) {
5975
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
6076
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
6177
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
62-
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
78+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
79+
80+
"OpenNote/openNote/style/simplicity/light/style.css": "OpenNote/openNote/style/simplicity/style.less",
81+
"OpenNote/openNote/style/simplicity/light/note.css": "OpenNote/openNote/style/simplicity/note.less",
82+
"OpenNote/openNote/style/simplicity/light/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
83+
"OpenNote/openNote/style/simplicity/light/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
6384
}
6485
}
6586
},

‎OpenNote/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<body>
7070
<div id="menu" class="ng-hide fadeIn" ng-show="showMenu" ng-include="'openNote/partials/navBarPartial.html'"></div>
7171

72-
<div class="col-lg-2 col-md-3 col-sm-4" ng-include="'openNote/partials/listPartial.html'"></div>
72+
<div class="col-lg-2 col-md-3 col-sm-4 hidden-xs" ng-include="'openNote/partials/listPartial.html'"></div>
7373

7474
<div class="col-lg-10 col-md-9 col-sm-8" ng-view data-intro="{{helpContent.viewArea}}"> </div>
7575
</body>

‎OpenNote/openNote/controllers/folderController.js‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ openNote.controller("folderController", function( $scope,
1515
$rootScope.buttons.push({
1616
text: "New note",
1717
action: function(){
18-
$scope.fadeOutFolders(function(){
18+
$scope.fadeOutFoldersAndNotes(function(){
1919
$location.url("/note/").search("folderID",$scope.currentFolder.id);
2020
});
2121
},
@@ -81,13 +81,24 @@ openNote.controller("folderController", function( $scope,
8181
/**
8282
* fade out all folders
8383
*/
84-
$scope.fadeOutFolders = function(callback){
85-
if($scope.currentFolder.foldersInside !=null && $scope.currentFolder.foldersInside.length>0)
86-
$(".folder").fadeOut(config.fadeSpeedShort(),function(){
84+
$scope.fadeOutFoldersAndNotes = function(callback){
85+
if( ( $scope.currentFolder.foldersInside !=null
86+
&& $scope.currentFolder.foldersInside.length>0)
87+
|| ( $scope.currentFolder.notesInside !=null
88+
&& $scope.currentFolder.notesInside.length>0)){
89+
90+
$(".note").fadeTo(config.fadeSpeedShort(),0,function(){
91+
$scope.$apply(function(){
92+
callback();
93+
});
94+
});
95+
96+
$(".folder").fadeTo(config.fadeSpeedShort(),0,function(){
8797
$scope.$apply(function(){
8898
callback();
8999
});
90100
});
101+
}
91102
else
92103
callback();
93104
};
@@ -97,7 +108,7 @@ openNote.controller("folderController", function( $scope,
97108
* @param folder- the folder to load
98109
*/
99110
$scope.loadFolder = function(folder){
100-
$scope.fadeOutFolders(function(){
111+
$scope.fadeOutFoldersAndNotes(function(){
101112
$location.url("/folder/"+folder.id);
102113
});
103114
};
@@ -107,7 +118,7 @@ openNote.controller("folderController", function( $scope,
107118
* @param note - load a note
108119
*/
109120
$scope.loadNote = function(note){
110-
$scope.fadeOutFolders(function(){
121+
$scope.fadeOutFoldersAndNotes(function(){
111122
$location.url("/note/"+note.id);
112123
});
113124
};

‎OpenNote/openNote/directives/randomFadeInDirective.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ openNote.directive("randomFadeInDirective", function($timeout,config) {
55
return {
66
restrict: "C",//class
77
link: function(scope, element, attrs) {
8-
element.hide().fadeIn(config.fadeSpeedLong());
8+
element.hide().stop().fadeTo(config.fadeSpeedLong(),1);
99
}
1010
};
1111
});

‎OpenNote/openNote/openNote.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ openNote.value("config", {
77
* Get current version
88
*/
99
getVersion: function(){
10-
return "14.07.01";
10+
return "14.07.02";
1111
},
1212

1313
/**
@@ -21,7 +21,7 @@ openNote.value("config", {
2121
* http path to backend rest service
2222
*/
2323
servicePath: function(){
24-
return "./Service";
24+
return "./Service/service.php";
2525
},
2626

2727
/**

‎OpenNote/openNote/openNote.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ openNote.run(function ( $rootScope,
5454
if(event!=null)
5555
event.preventDefault();
5656

57-
$rootScope.entryURL=url;
57+
if(url!=null && url.trim()!="" && url.trim()!="/"&& url.trim()!="#/")
58+
$rootScope.entryURL=url;
59+
else
60+
$rootScope.entryURL=null;
61+
5862
$location.path("/");
5963
}
6064

0 commit comments

Comments
 (0)