Skip to content

Commit 0c7d9ca

Browse files
JLiscomJLiscom
committed
Merge branch 'Fox-Working'
2 parents 262d5dd + 7312f23 commit 0c7d9ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+860
-1503
lines changed

‎.jshintrc‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"undef": true,
3+
"unused": true,
4+
"mocha": true,
5+
"strict": false,
6+
"browser": true,
7+
"couch": true,
8+
"devel":true,
9+
"jquery":true,
10+
"jasmine": true,
11+
"predef": [ "angular","alertify","", "PouchDB", "CKEDITOR","inject" ],
12+
"globals":{"openNote":true}
13+
}

‎Gruntfile.js‎

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
module.exports = function(grunt) {
22
//Initializing the configuration object
33
grunt.initConfig({
4+
jshint: {
5+
options:{
6+
},
7+
all: [ "**/*.js*",//Order matters
8+
"!node_modules/**",
9+
"!OpenNote/bower_components/**"]
10+
},
411
//Style
512
less: {
613
devDark: {
@@ -14,13 +21,7 @@ module.exports = function(grunt) {
1421
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
1522
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
1623
"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",
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"
23-
24+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
2425
}
2526
},
2627
devLight: {
@@ -34,12 +35,7 @@ module.exports = function(grunt) {
3435
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
3536
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
3637
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.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"
38+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
4339
}
4440
},
4541
prodDark: {
@@ -54,13 +50,7 @@ module.exports = function(grunt) {
5450
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
5551
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
5652
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.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-
53+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
6454
}
6555
},
6656
prodLight: {
@@ -75,12 +65,7 @@ module.exports = function(grunt) {
7565
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
7666
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
7767
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.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"
68+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
8469
}
8570
}
8671
},
@@ -141,12 +126,13 @@ module.exports = function(grunt) {
141126
"**/*.png",
142127
"**/*.jpg"
143128
],
144-
dest: "openNote/openNote.appcache"
129+
dest: "OpenNote/openNote.appcache"
145130
}
146131
}
147132
});
148133

149134
//Plugin loading
135+
grunt.loadNpmTasks("grunt-contrib-jshint");
150136
grunt.loadNpmTasks("grunt-contrib-less");
151137
grunt.loadNpmTasks("grunt-contrib-watch");
152138
grunt.loadNpmTasks("grunt-karma");
@@ -162,10 +148,10 @@ module.exports = function(grunt) {
162148
// you can run individual command using the plug-in command syntax suck as manifest:generate or shell:clean
163149
grunt.registerTask("build", ["shell:bowerInstall", "buildDevCSS", "manifest:generate"]);
164150
grunt.registerTask("default", ["build"]);
165-
grunt.registerTask("deploy", ["shell:clean", "shell:bowerInstall", "buildProdCSS", "manifest:generate", "shell:phpPackage"]);
151+
grunt.registerTask("deploy", ["shell:clean", "shell:bowerInstall", "buildProdCSS", "manifest:generate"]);
166152

167153
//testing
168154
grunt.registerTask("devmode", ["karma:unit", "watch"]);
169-
grunt.registerTask("test", ["karma:travis"])
170-
grunt.registerTask("ci", ["build","karma:travis"])
155+
grunt.registerTask("test", ["karma:travis"]);
156+
grunt.registerTask("ci", ["build","jshint:all","karma:travis"]);
171157
};

‎License‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014 Jacob Liscom
3+
Copyright (c) 2017 Jacob Liscom
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎OpenNote.Test/karma.conf.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ module.exports = function(config){
99
"OpenNote/bower_components/angular-resource/angular-resource.js",
1010
"OpenNote/bower_components/angular-sanitize/angular-sanitize.js",
1111
"OpenNote/bower_components/angular-animate/angular-animate.js",
12-
"OpenNote/bower_components/angular-ui-tree/dist/angular-ui-tree.js",
13-
"OpenNote/bower_components/ng-file-upload/ng-file-upload-shim.min.js",
14-
"OpenNote/bower_components/ng-file-upload/ng-file-upload.min.js",
1512
"OpenNote/bower_components/pouchdb/dist/pouchdb.min.js",
1613
"OpenNote/bower_components/jquery/jquery.js",
1714
"OpenNote/openNote/openNote.js",
@@ -22,15 +19,12 @@ module.exports = function(config){
2219
frameworks: ["jasmine"],
2320
browsers : ["Firefox"],
2421
plugins : [
25-
"karma-junit-reporter",
26-
"karma-chrome-launcher",
27-
"karma-firefox-launcher",
2822
"karma-phantomjs-launcher",
2923
"karma-jasmine"
3024
],
3125
junitReporter : {
3226
outputFile: "test_out/unit.xml",
3327
suite: "unit"
34-
}
35-
})
36-
}
28+
}
29+
});
30+
};

‎OpenNote.Test/unit/folder.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var createFolder = function(id,parentFolderID, name){
33
"_id": id,
44
"parentFolderID": parentFolderID,
55
"name": name
6-
}
6+
};
77
};
88

99
//TODO storageService save folder twice
@@ -12,57 +12,57 @@ describe("folderController", function() {
1212
var $scope;
1313
var createController;
1414
var $rootScope;
15-
15+
1616
//load openNote module
1717
beforeEach(module("openNote"));
18-
18+
1919
/**
2020
* Setup the folder controller
2121
*/
2222
beforeEach(inject(function($controller, $rootScope){
2323
$scope = $rootScope.$new();
2424
this.$rootScope=$rootScope;
25-
25+
2626
$rootScope.helpContent={
2727
newNoteButton: "",
2828
newFolderButton: "",
2929
findButton: ""
3030
};
31-
31+
3232
$rootScope.buttons=[];
33-
33+
3434
/**
3535
* Factory to create mock controller
3636
*/
3737
createController = function(scope, rootScope, location, routeParams, storageService, config, timeout){
38-
return $controller("folderController",
39-
{$scope:scope},
40-
{$rootScope:rootScope},
41-
{$location:location},
42-
{$routeParams: routeParams},
43-
{storageService: storageService},
38+
return $controller("folderController",
39+
{$scope:scope},
40+
{$rootScope:rootScope},
41+
{$location:location},
42+
{$routeParams: routeParams},
43+
{storageService: storageService},
4444
{config:config},
4545
{$timeout:timeout}
4646
);
47-
}
47+
};
4848
}));
49-
49+
5050
it("should not show folder edit buttons if current folder is home", inject(function($location, config, $timeout) {//inject location and config
51-
var folderController = createController($scope, $rootScope, $location, [], null, config, $timeout);
51+
createController($scope, $rootScope, $location, [], null, config, $timeout);
5252
$scope.currentFolder = createFolder(null,null,null);
53-
53+
5454
expect($scope.folderEditMode).toEqual(false);
5555
$scope.activateFolderEditMode();//simulate title click
5656
expect($scope.folderEditMode).toEqual(false);
57-
57+
5858
}));
59-
59+
6060
it("should show folder edit buttons if current folder is not home", inject(function($location, config, $timeout) {//inject location and config
61-
var folderController = createController($scope, $rootScope, $location, [], null, config, $timeout);
61+
createController($scope, $rootScope, $location, [], null, config, $timeout);
6262
$scope.currentFolder = createFolder(123,null,"Not Home");
63-
63+
6464
expect($scope.folderEditMode).toEqual(false);
6565
$scope.activateFolderEditMode();//simulate title click
66-
expect($scope.folderEditMode).toEqual(true);
67-
}));
68-
});
66+
expect($scope.folderEditMode).toEqual(true);
67+
}));
68+
});

‎OpenNote/.project‎

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

‎OpenNote/bower.json‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
{
2-
"name": "OpenNote",
2+
"name": "opennote",
33
"authors": [
44
"Jacob Liscom <https://github.com/FoxUSA>"
55
],
66
"description": "A note taking software",
7-
"version": "15.07.0",
7+
"version": "17.02.0",
88
"dependencies": {
99
"jquery": "2.1.4",
10-
"bootstrap": "3.3.4",
11-
"angular": "1.3.15",
12-
"angular-route": "1.3.15",
13-
"angular-resource": "1.3.15",
14-
"angular-sanitize": "1.3.15",
15-
"angular-animate": "1.3.15",
16-
"angular-mocks": "1.3.15",
17-
"ckeditor": "ckeditor/ckeditor-releases#full/4.4.x",
18-
"angular-ui-tree": "2.4.0",
10+
"bootstrap": "^3.3.6",
11+
"angular": "^1.5.5",
12+
"angular-route": "^1.5.5",
13+
"angular-resource": "^1.5.5",
14+
"angular-sanitize": "^1.5.5",
15+
"angular-animate": "^1.5.5",
16+
"angular-mocks": "^1.5.5",
17+
"ckeditor": "ckeditor/ckeditor-releases#full/4.5.x",
1918
"alertify": "0.3.10",
2019
"intro.js": "0.8.0",
21-
"pouchdb": "3.4.0",
22-
"ng-file-upload": "4.0.0"
20+
"pouchdb": "^5.3.2"
2321
}
2422
}

‎OpenNote/index.html‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
<!-- Style -->
1919
<link rel="stylesheet" type="text/css" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
20-
<link rel="stylesheet" href="bower_components/angular-ui-tree/dist/angular-ui-tree.min.css">
2120
<link rel="stylesheet" href="bower_components/alertify/themes/alertify.core.css">
2221

2322
<!-- Theme -->
@@ -30,21 +29,18 @@
3029
<!-- Scripts -->
3130
<script src="bower_components/jquery/dist/jquery.min.js"></script>
3231
<script src="bower_components/pouchdb/dist/pouchdb.min.js"></script>
32+
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
3333

3434
<!-- Angular and the gang -->
3535
<script src="bower_components/angular/angular.js"></script>
3636
<script src="bower_components/angular-animate/angular-animate.min.js"></script>
3737
<script src="bower_components/angular-resource/angular-resource.min.js"></script>
3838
<script src="bower_components/angular-route/angular-route.min.js"></script>
3939
<script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
40-
<script src="bower_components/angular-ui-tree/dist/angular-ui-tree.min.js" ></script>
41-
<script src="bower_components/ng-file-upload/ng-file-upload-shim.min.js"></script> <!-- for no html5 browsers support -->
42-
<script src="bower_components/ng-file-upload/ng-file-upload.min.js"></script>
4340

4441
<script src="bower_components/intro.js/minified/intro.min.js"></script>
4542
<script src="bower_components/alertify/alertify.min.js"></script>
4643
<script src="bower_components/ckeditor/ckeditor.js"></script>
47-
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
4844

4945
<!-- Main Open Note Scripts -->
5046
<script src="openNote/openNote.js"></script>
@@ -56,15 +52,17 @@
5652
<script src="openNote/services/serverConfigService.js"></script>
5753
<script src="openNote/services/storageService.js"></script>
5854
<script src="openNote/services/legacyImportService.js"></script>
55+
<script src="openNote/services/tagService.js"></script>
5956

6057
<!-- Directives -->
6158
<script src="openNote/directives/randomFadeInDirective.js"></script>
6259
<script src="openNote/directives/fadeOutDirective.js"></script>
6360

6461
<!-- Controllers -->
6562
<script src="openNote/controllers/folderController.js"></script>
63+
<script src="openNote/controllers/tagController.js"></script>
6664
<script src="openNote/controllers/noteController.js"></script>
67-
<script src="openNote/controllers/listController.js"></script>
65+
<script src="openNote/controllers/tagListController.js"></script>
6866
<script src="openNote/controllers/searchController.js"></script>
6967
<script src="openNote/controllers/settings/settingsController.js"></script>
7068
<script src="openNote/controllers/settings/databaseController.js"></script>
@@ -74,10 +72,10 @@
7472
<body>
7573
<div id="menu" class="ng-hide fadeIn" ng-show="showMenu" ng-include="'openNote/partials/navBarPartial.html'"></div>
7674

77-
<div class="col-lg-2 col-md-3 col-sm-4 hidden-xs" ng-include="'openNote/partials/listPartial.html'"></div>
75+
<div class="col-lg-2 col-md-3 col-sm-4 col-xs-12" ng-include="'openNote/partials/tagListPartial.html'"></div>
7876

79-
<div class="col-lg-10 col-md-9 col-sm-8" ng-view data-intro="{{helpContent.viewArea}}"> </div>
77+
<div class="col-lg-10 col-md-9 col-sm-8 col-xs-12" ng-view data-intro="{{helpContent.viewArea}}"> </div>
8078

81-
<div id="copyRight" class="col-xs-12 fadeOutDirective">&#169; 2015 Jacob Liscom</div>
79+
<div id="copyRight" class="col-xs-12 fadeOutDirective">&#169; 2016 Jacob Liscom - Version {{version}}</div>
8280
</body>
8381
</html>

0 commit comments

Comments
 (0)