From 9fbacb17e3d4e1a82ee2f51c1643d8ca6a043af4 Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Tue, 14 Apr 2015 23:03:55 +0200
Subject: [PATCH] Affichage du Markdown dans les messages

---
 bower.json                             | 3 ++-
 public/js/controllers/ForumConvCtrl.js | 2 +-
 public/views/forumConv.html            | 3 +--
 public/views/index.html                | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index b4dd52d..9673bab 100644
--- a/bower.json
+++ b/bower.json
@@ -10,6 +10,7 @@
     "bootswatch-dist": "3.3.4-cerulean",
     "jsencrypt": "~2.1.0",
     "remarkable-bootstrap-notify": "~3.0.2",
-    "ng-sortable": "~1.2.0"
+    "ng-sortable": "~1.2.0",
+    "angular-markdown-directive": "~0.3.1"
   }
 }
diff --git a/public/js/controllers/ForumConvCtrl.js b/public/js/controllers/ForumConvCtrl.js
index c2f78d6..b6a21cd 100644
--- a/public/js/controllers/ForumConvCtrl.js
+++ b/public/js/controllers/ForumConvCtrl.js
@@ -1,4 +1,4 @@
-angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ'])
+angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ', 'ngSanitize', 'btford.markdown'])
     .controller('ForumConvCtrl', function ($scope, $routeParams, SessionServ, ApiServ) {
         $scope.messs = [];
         $scope.conv = {};
diff --git a/public/views/forumConv.html b/public/views/forumConv.html
index 19ed623..dc39958 100644
--- a/public/views/forumConv.html
+++ b/public/views/forumConv.html
@@ -12,8 +12,7 @@
                 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer
             </button>
         </div>
-        <div class="panel-body">
-            {{ mess.content }}
+        <div class="panel-body" btf-markdown="mess.content">
         </div>
     </div>
     <div class="form-group" ng-if="session.canAddMess">
diff --git a/public/views/index.html b/public/views/index.html
index 00846a7..0191ad0 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -19,6 +19,9 @@
     <script src="libs/ladda/js/spin.js"></script>
     <script src="libs/ladda/js/ladda.js"></script>
     <script src="libs/angular-ladda/dist/angular-ladda.min.js"></script>
+    <script src="libs/angular-sanitize/angular-sanitize.min.js"></script>
+    <script src="libs/showdown/compressed/Showdown.min.js"></script>
+    <script src="libs/angular-markdown-directive/markdown.js"></script>
     <script src="libs/ng-sortable/dist/ng-sortable.min.js"></script>
     <script src="js/services/NotifyServ.js"></script>
     <script src="js/services/ApiServ.js"></script>
--
libgit2 0.21.2