Johannes Zellner 11 лет назад
Родитель
Сommit
49660bdec8
5 измененных файлов с 25 добавлено и 21 удалено
  1. 1 1
      bower.json
  2. 5 7
      public/index.css
  3. 8 9
      public/index.html
  4. 5 2
      public/index.js
  5. 6 2
      src/things.js

+ 1 - 1
bower.json

@@ -19,6 +19,6 @@
     "angular": "~1.4.8",
     "angular": "~1.4.8",
     "bootstrap": "~3.3.6",
     "bootstrap": "~3.3.6",
     "bootstrap-material-design": "~0.5.2",
     "bootstrap-material-design": "~0.5.2",
-    "angular-markdown-directive": "~0.3.1"
+    "angular-marked": "~1.0.1"
   }
   }
 }
 }

+ 5 - 7
public/index.css

@@ -11,14 +11,12 @@
 	position: relative;
 	position: relative;
 }
 }
 
 
-.thing-title {
-	width: auto;
-	position: absolute;
-	right: 20px;
-	top: 15px;
-}
-
 .thing-title-date {
 .thing-title-date {
 	font-size: 12px;
 	font-size: 12px;
 	text-align: right;
 	text-align: right;
 }
 }
+
+.thing-title-date,.btn {
+	margin: 0;
+	margin-right: 30px;
+}

+ 8 - 9
public/index.html

@@ -15,9 +15,8 @@
 <script type="text/javascript" src="/bootstrap-material-design/dist/js/ripples.min.js"></script>
 <script type="text/javascript" src="/bootstrap-material-design/dist/js/ripples.min.js"></script>
 
 
 <script type="text/javascript" src="/angular/angular.min.js"></script>
 <script type="text/javascript" src="/angular/angular.min.js"></script>
-<script type="text/javascript" src="/angular-sanitize/angular-sanitize.min.js"></script>
-<script type="text/javascript" src="/showdown/compressed/Showdown.min.js"></script>
-<script type="text/javascript" src="/angular-markdown-directive/markdown.js"></script>
+<script type="text/javascript" src="/marked/marked.min.js"></script>
+<script type="text/javascript" src="/angular-marked/dist/angular-marked.min.js"></script>
 
 
 <link rel="stylesheet" href="/index.css"/>
 <link rel="stylesheet" href="/index.css"/>
 <script type="text/javascript" src="/index.js"></script>
 <script type="text/javascript" src="/index.js"></script>
@@ -62,16 +61,16 @@
   </div>
   </div>
   <div class="row">
   <div class="row">
     <div class="col-md-12">
     <div class="col-md-12">
-      <div class="well thing" ng-repeat="thing in things">
+      <div class="well well-sm thing" ng-repeat="thing in things">
         <div class="container thing-title">
         <div class="container thing-title">
           <div class="row">
           <div class="row">
-            <div class="col-md-12 thing-title-date">{{thing.createdAt | prettyDateOffset}}</div>
-          </div>
-          <div class="row">
-            <div class="col-md-1 col-md-offset-11"><button class="btn btn-xs btn-block btn-default" ng-click="deleteThing(thing._id)">delete</button></div>
+            <div class="col-md-12 thing-title-date">
+              {{thing.createdAt | prettyDateOffset}}
+              <button class="btn btn-xs btn-default" ng-click="deleteThing(thing._id)">delete</button>
+            </div>
           </div>
           </div>
         </div>
         </div>
-        <div btf-markdown="thing.content"></div>
+        <div marked="thing.content"></div>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>

+ 5 - 2
public/index.js

@@ -5,10 +5,13 @@
 'use strict';
 'use strict';
 
 
 var app = angular.module('app', [
 var app = angular.module('app', [
-    'ngSanitize',
-    'btford.markdown'
+    'hc.marked'
 ]);
 ]);
 
 
+app.config(['markedProvider', function (markedProvider) {
+    markedProvider.setOptions({gfm: true});
+}]);
+
 app.controller('MainController', function ($scope, $http, $timeout) {
 app.controller('MainController', function ($scope, $http, $timeout) {
 
 
     $scope.things = [];
     $scope.things = [];

+ 6 - 2
src/things.js

@@ -60,8 +60,12 @@ function get(req, res, next) {
 function add(req, res, next) {
 function add(req, res, next) {
     console.log('add', req.body);
     console.log('add', req.body);
 
 
-    var tags = req.body.content.match(/\B#([^ ]+)/g);
-    if (tags === null) tags = [];
+    var lines = req.body.content.split('\n');
+    var tags = [];
+
+    lines.forEach(function (line) {
+        tags = tags.concat(line.match(/\B#([^ ]+)/g));
+    });
 
 
     var doc = {
     var doc = {
         content: req.body.content,
         content: req.body.content,