Skip to content

Commit

Permalink
Affichage du Markdown dans les messages
Browse files Browse the repository at this point in the history
Fix #3
  • Loading branch information
GeoffreyFrogeye committed Apr 14, 2015
1 parent 7b12922 commit 9fbacb1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion public/js/controllers/ForumConvCtrl.js
Original file line number Diff line number Diff line change
@@ -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 = {};
Expand Down
3 changes: 1 addition & 2 deletions public/views/forumConv.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ <h1>{{ conv.titre }}</h1>
<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">
Expand Down
3 changes: 3 additions & 0 deletions public/views/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 9fbacb1

Please sign in to comment.