Abstracted tag service. Fix tag bug

Author: JLiscom

.jshintrc

@@ -1,5 +1,5 @@
 {
-    "esversion":6,
+    "esversion":5,
     "node": true,
     "undef": true,
     "unused": true,
@@ -10,5 +10,5 @@
     "devel":true,
     "jquery":true,
     "jasmine": true,
-    "predef": [ "angular","alertify","", "PouchDB","inject","CodeMirror" ]
+    "predef": [ "angular","alertify","", "PouchDB","inject","CodeMirror"]
 }

openNote/controllers/folderController.js

@@ -3,13 +3,15 @@ openNote.controller("folderController", ["$scope",
     "$rootScope",
     "$location",
     "$routeParams",
+    "tagService",
     "storageService",
     "config",
     "$timeout",
     function($scope,
         $rootScope,
         $location,
         $routeParams,
+        tagService,
         storageService,
         config,
         $timeout) {
@@ -194,15 +196,17 @@ openNote.controller("folderController", ["$scope",
                         return;
 
                     var parentFolderID = $scope.currentFolder.parentFolderID;
-                    storageService.deleteFolder($scope.currentFolder, function() {
-                        $rootScope.$emit("reloadListView", {});
+                    tagService.deleteFolder($scope.currentFolder).then(function(){ // This needs to be done synchronously instead of an event because its possible for the storage service delete loop to get ahead and destoy the notes before the tag service has a change to delete them.
+                        storageService.deleteFolder($scope.currentFolder, function() {
+                            $rootScope.$emit("reloadListView", {});
 
-                        if (!parentFolderID)
-                            $location.url("/folder/");
-                        else
-                            $location.url("/folder/" + parentFolderID);
+                            if (!parentFolderID)
+                                $location.url("/folder/");
+                            else
+                                $location.url("/folder/" + parentFolderID);
 
-                        $scope.$apply();
+                            $scope.$apply();
+                        });
                     });
                 });
         };

openNote/controllers/noteController.js

@@ -86,9 +86,6 @@ openNote.controller("noteController", ["$scope",
          * Take us into edit mode
          */
         var activateEditMode = function() {
-            //FIXME
-
-
             $scope.editMode = true;
 
             if ($scope.note._id)
@@ -106,9 +103,16 @@ openNote.controller("noteController", ["$scope",
                 $scope.editor = CodeMirror.fromTextArea(document.getElementById("note-editor"), {
                     mode: "markdown",
                     theme: "material",
-                    lineNumbers: true
+                    lineNumbers: true,
+                    indentUnit: 4
                 });
 
+                // var resize = function() {
+                //     $(".CodeMirror").css({"height": ($(window).height()*0.75 )+ "px"});
+                // };
+                // window.onresize = resize;
+                // resize();
+
             });
 
         };

openNote/controllers/settings/databaseController.js

@@ -42,6 +42,7 @@ openNote.controller("databaseController", ["$scope",
 
                     storageService.destroyDatabase(function() {
                         $rootScope.$emit("reloadListView", {});
+                        $rootScope.$emit("tagsUpdated");
                         window.location.href = '#/';
                         $rootScope.$apply();
                         alertify.success("Database deleted");
@@ -54,6 +55,7 @@ openNote.controller("databaseController", ["$scope",
          */
         $scope.cleanOrphans = function() {
             storageService.cleanOrphans();
+            //TODO implement tagService.cleanOrphans()
             alertify.log("Finding and removing orphans");
         };