Merge branch 'Fox-Working'

Author: JLiscom

Gruntfile.js

@@ -1,6 +1,14 @@
 module.exports = function(grunt) {
 	//Initializing the configuration object
 	    grunt.initConfig({
+			compress: {
+				main: {
+					options: {
+						archive: "version.zip"
+					},
+					src: ["OpenNote/**/*"]
+				}
+			},
 			jshint: {
 				options:{
 				},
@@ -138,6 +146,7 @@ module.exports = function(grunt) {
 	    grunt.loadNpmTasks("grunt-karma");
 	    grunt.loadNpmTasks("grunt-shell");
 	    grunt.loadNpmTasks("grunt-manifest");
+		grunt.loadNpmTasks("grunt-contrib-compress");
 
 	//Task definition
 	    //css

OpenNote/openNote/controllers/folderController.js

@@ -188,14 +188,14 @@ openNote.controller("folderController", function(	$scope,
 				if(!confirm)
 					return;
 
-				var parrentFolderID = $scope.currentFolder.parrentFolderID;
+				var parentFolderID = $scope.currentFolder.parentFolderID;
 				storageService.deleteFolder($scope.currentFolder, function(){
 					$rootScope.$emit("reloadListView", {});
 
-					if(!parrentFolderID)
+					if(!parentFolderID)
 						$location.url("/folder/");
 					else
-						$location.url("/folder/"+parrentFolderID);
+						$location.url("/folder/"+parentFolderID);
 
 					$scope.$apply();
 				});
@@ -206,7 +206,7 @@ openNote.controller("folderController", function(	$scope,
 	 * Listen to changed folder events to see if its the current open folder
 	 */
 	$rootScope.$on("changedFolder", function(event, request) {
-	    if(request.folder.parrentFolderID==$scope.currentFolder.id || $scope.currentFolder.id==request.oldParrentFolderID){//does the change effect us?
+	    if(request.folder.parentFolderID==$scope.currentFolder.id || $scope.currentFolder.id==request.oldparentFolderID){//does the change effect us?
 	    	$scope.loadCurrentFolder();//reload
 	    }
     });
@@ -236,9 +236,8 @@ openNote.controller("folderController", function(	$scope,
 			$scope.currentFolderContents=results.rows;
 
 			//Do they have anything to display?
-				if(!$scope.currentFolder._id && !$scope.currentFolderContents){
+				if(!$scope.currentFolder._id && !$scope.currentFolderContents.length)
 					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. If you need to pull your remote notes <a href='#/settings/database'>click here</a>.");
-				}
 
 			$scope.$apply();
 		});

OpenNote/openNote/openNote.config.js

@@ -7,7 +7,7 @@ openNote.value("config", {
 	 * Get current version
 	 */
 	getVersion: function(){
-		return "17.02.00";
+		return "17.02.01";
 	},
 
 	/**

OpenNote/openNote/services/storageService.js

@@ -154,18 +154,17 @@ openNote.service("storageService", function ($rootScope) {
 	 * @param  folder - the folder doc to delete
 	 * @param callback - callback when the given folder has been removed
 	 */
-	this.deleteFolder = function(folder,callback){
-		self.loadFolderContents(folder.id, function (results) {
+	this.deleteFolder = function(folder,callback){//TODO test
+		self.loadFolderContents(folder._id, function (results) {
 			results.rows.filter(self.noteFilter).forEach(function(note){
 				localDatabase.remove(note.doc);
 			});
 
 			results.rows.filter(self.folderFilter).forEach(function(subFolder){
 				self.deleteFolder(subFolder);
 			});
+			localDatabase.remove(folder).then(callback);
 		});
-
-		localDatabase.remove(folder.doc).then(callback);
 	};
 
 

OpenNote/openNote/services/tagService.js

@@ -1,17 +1,21 @@
 openNote.service("tagService", function ($rootScope,storageService) {
     var service = this;
-    var tagRegex = /(?:\ |^|\n)(#[^\ <\n]*)/ig;
+    var tagRegex = /(?:\ |^|\n|>)(#[^\ <\n]*)/ig;
 
     /**
      * Bind handlers to the root scope
      */
     this.bindHandlers = function(){
         $rootScope.$on("noteSaved", function(event, note) {
             deleteTagsFromMap(note._id,function(){
-                var results = note.note.match(tagRegex);
-                if(!results||!results.length)
+                var matches;
+                var output = [];
+                while ((matches = tagRegex.exec(note.note)))
+                    output.push(matches[1]);
+
+                if(!output.length)
                     return;
-                addTagsToMap(results,note._id);
+                addTagsToMap(output,note._id);
             });
         });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OpenNote",
-  "version": "17.02.00",
+  "version": "17.02.01",
   "description": "",
   "main": "Gruntfile.js",
   "author": "Jacob Liscom",
@@ -13,6 +13,7 @@
     "grunt-cli": "^0.1.13",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-compress": "^1.1.1",
     "grunt-karma": "^0.8.3",
     "phantomjs": "^1.9.7-5",
     "karma-phantomjs-launcher": "^0.1.4",