#99 tags complete

Author: JLiscom

OpenNote/index.html

@@ -61,6 +61,7 @@
 
 				<!-- Controllers -->
 					<script src="openNote/controllers/folderController.js"></script>
+					<script src="openNote/controllers/tagController.js"></script>
 					<script src="openNote/controllers/noteController.js"></script>
 					<script src="openNote/controllers/tagListController.js"></script>
 					<script src="openNote/controllers/searchController.js"></script>

OpenNote/openNote/controllers/noteController.js

@@ -96,32 +96,6 @@ openNote.controller("noteController", function(	$scope,
 		});
 	};
 
-	//Load or new
-		if(!$routeParams.id){//new
-			$scope.note._id = null;
-			$scope.note.parentFolderID = $location.search().folderID;
-			$scope.note.title = "Note Title";
-
-			activateEditMode();
-			$(".notePartial").fadeIn(config.fadeSpeedLong());
-		}
-		else{
-			/**
-			 * Load note
-			 */
-			storageService.database().get($routeParams.id).then(function(doc){
-				$scope.note=doc;
-				$(".notePartial").fadeIn(config.fadeSpeedLong());
-
-				//Add buttons
-					$rootScope.buttons.push(upButton($scope.note.parentFolderID));
-					$rootScope.buttons.push(copyButton($scope.note));
-					$rootScope.buttons.push(editButton());
-
-				$scope.$apply();
-			});
-		}
-
 	/**
 	 * Save a note
 	 */
@@ -172,6 +146,7 @@ openNote.controller("noteController", function(	$scope,
 				var folderID = $scope.note.parentFolderID;//need to keep track of this because we are about to delete it
 				$(".notePartial").fadeOut(config.fadeSpeedShort());
 				storageService.database().remove($scope.note).then(function(){
+					$rootScope.$emit("noteDeleted",$scope.note);
 					detachWindowUnload();
 					alertify.success("Note Deleted"); //all done. close the notify dialog
 					$location.url("/folder/"+folderID);
@@ -221,4 +196,30 @@ openNote.controller("noteController", function(	$scope,
 	var detachWindowUnload = function(){
 		window.onbeforeunload = null;
 	};
+
+	//Load or new
+		if(!$routeParams.id){//new
+			$scope.note._id = null;
+			$scope.note.parentFolderID = $location.search().folderID;
+			$scope.note.title = "Note Title";
+
+			activateEditMode();
+			$(".notePartial").fadeIn(config.fadeSpeedLong());
+		}
+		else{
+			/**
+			 * Load note
+			 */
+			storageService.database().get($routeParams.id).then(function(doc){
+				$scope.note=doc;
+				$(".notePartial").fadeIn(config.fadeSpeedLong());
+
+				//Add buttons
+					$rootScope.buttons.push(upButton($scope.note.parentFolderID));
+					$rootScope.buttons.push(copyButton($scope.note));
+					$rootScope.buttons.push(editButton());
+
+				$scope.$apply();
+			});
+		}
 });

OpenNote/openNote/controllers/tagListController.js

@@ -9,6 +9,7 @@
 openNote.controller("tagListController", function(	$scope,
 													$rootScope,
 													tagService,
+													$location,
 													storageService) {
 	$scope.tags = [];
 
@@ -22,6 +23,14 @@ openNote.controller("tagListController", function(	$scope,
 		});
 	};
 
+	/**
+	 * Open a tag
+	 * @param tag - Tag to open
+	 */
+	$scope.openTag = function(tag){
+		$location.url("/tag/"+encodeURIComponent(tag));
+	};
+
 	/**
      * Move key
 	 * @param request.destFolder -

OpenNote/openNote/partials/tagListPartial.html

@@ -6,7 +6,8 @@
 	<div>
 		 <h4>Tags</h4>
 		 <ul class=" list-unstyled">
-			 <li ng-repeat="tag in tags" class="startHidden randomFadeInDirective">{{tag}}</li>
+			 <li ng-repeat="tag in tags" class="startHidden randomFadeInDirective" ng-click="openTag(tag);">{{tag}}</li>
+			 <li ng-if="!tags || !tags.length" class="startHidden randomFadeInDirective">No tags found. Add a # to a note to add a tag.</li>
 		 </ul>
 	</div>
 </div>

OpenNote/openNote/router.js

@@ -6,6 +6,11 @@ openNote.config(function($routeProvider){
                 controller: "folderController",
                 templateUrl: "openNote/partials/folderPartial.html",
             })
+		.when("/tag/:tag",
+            {
+                controller: "tagController",
+                templateUrl: "openNote/partials/tagPartial.html",
+            })
         .when("/note/:id?",
             {
                 controller: "noteController",
@@ -32,4 +37,4 @@ openNote.config(function($routeProvider){
                 templateUrl: "openNote/partials/settings/legacyPartial.html"
             })
 		.otherwise({ redirectTo: "/folder" });
-});
+});

OpenNote/openNote/services/tagService.js

@@ -14,6 +14,10 @@ openNote.service("tagService", function ($rootScope,storageService) {
                 addTagsToMap(results,note._id);
             });
         });
+
+        $rootScope.$on("noteDeleted", function(event, note) {
+            deleteTagsFromMap(note._id);
+        });
     };
 
     /**

OpenNote/openNote/style/invert/style.less

@@ -94,7 +94,7 @@ input:focus, select:focus, textarea:focus, button:focus {
 }
 
 #folderTitleBar{
-	padding: 15px 0px;
+	padding: 0px 0px 15px 0px;
 	overflow: hidden;
 	font-size: 18px;