Fixed tag bug. Tags were getting confused with MD headers

JLiscom · JLiscom · commit 6278d6e0e713 · 2017-12-08T20:47:19.000-07:00
diff --git a/build/webpack.common.config.js b/build/webpack.common.config.js
@@ -1,7 +1,7 @@
 const glob = require("glob");
 
 module.exports = {
-    entry: glob.sync("./openNote/**/*.js"),
+    entry: glob.sync("./openNote/**/*.js"),//Emulate loading all them sequentually via script tags as one did in 2015
     output: {
         filename: "./openNote.bundle.js"
     },
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html ng-app="openNote"> <!-- manifest="openNote.appcache" -->
+<html ng-app="openNote" manifest="openNote.appcache" -->
 	<head>
 		<meta charset="UTF-8">
 		<meta name="description" content="description">
@@ -11,14 +11,11 @@
 
 		<title>OpenNote</title>
 
-		<!--[if IE]>
-			<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-		<![endif]-->
-
 		<!-- Style -->
 			<link rel="stylesheet" type="text/css" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
 			<link rel="stylesheet" href="node_modules/alertify/themes/alertify.core.css">
 			<link rel="stylesheet" href="node_modules/codemirror/lib/codemirror.css">
+			<link rel="stylesheet" href="node_modules/codemirror/theme/material.css">
 
 			<!-- Theme -->
 				<link rel="stylesheet" type="text/css" href="openNote/style/invert/light/alertify.css">
@@ -34,6 +31,6 @@
 		<div id="menu" class="ng-hide fadeIn" ng-show="showMenu" ng-include="'openNote/partials/navBarPartial.html'"></div>
 		<div class="col-lg-2 col-md-3 col-sm-4 col-xs-12" ng-include="'openNote/partials/tagListPartial.html'"></div>
 		<div class="col-lg-10 col-md-9 col-sm-8 col-xs-12" ng-view>	</div>
-		<div id="copyRight" class="col-xs-12 fadeOutDirective">&#169; 2017 Jacob Liscom - Version {{version}}</div>
+		<div id="copyRight" class="col-xs-12 fadeOutDirective">&#169; 2018 Jacob Liscom - Version {{version}}</div>
 	</body>
 </html>
diff --git a/openNote/controllers/noteController.js b/openNote/controllers/noteController.js
@@ -97,7 +97,7 @@ openNote.controller("noteController", function($scope,
         $timeout(function() {//trick to wait for page to rerender with text area
             $scope.editor = CodeMirror.fromTextArea(document.getElementById("note-editor"), {
                 mode: "markdown",
-                //theme: "material", FIXME
+                theme: "material",
                 lineNumbers: true
             });
 
diff --git a/openNote/services/tagService.js b/openNote/services/tagService.js
@@ -1,7 +1,7 @@
 import openNote from "../openNote.js";
 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
@@ -21,7 +21,7 @@ openNote.service("tagService", function ($rootScope,storageService) {
         });
 
         $rootScope.$on("noteDeleted", function(event, note) {
-            deleteTagsFromMap(note._id);
+            deleteTagsFromMap(note._id,function(){});
         });
     };
 
diff --git a/openNote/style/invert/style.less b/openNote/style/invert/style.less
@@ -160,6 +160,7 @@ img {
 }
 
 
+
 .box{
 	width: 250px;
 	height: 150px;
@@ -298,3 +299,8 @@ img {
 		color: @copyRightColor;
 		padding-left: 50px;
 	}
+
+// Note partial
+.notePartial .CodeMirror{
+	border-radius:0 0 4px 4px;/*round the corners*/
+}

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ img {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`
	`163`	`+`
`163`	`164`	`.box{`
`164`	`165`	`width: 250px;`
`165`	`166`	`height: 150px;`
`@@ -298,3 +299,8 @@ img {`
`298`	`299`	`color: @copyRightColor;`
`299`	`300`	`padding-left: 50px;`
`300`	`301`	`}`
	`302`	`+`
	`303`	`+// Note partial`
	`304`	`+.notePartial .CodeMirror{`
	`305`	`+ border-radius:0 0 4px 4px;/round the corners/`
	`306`	`+}`