vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

directives: add optional placeholder for markdown

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-02-23 16:43:59 -05:00
parent d6af389f21
commit 498d0af6a4
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/directives/repo-list-grid.html
View file

@ -32,7 +32,7 @@
<i ng-class="repository.is_starred ? 'starred fa fa-star' : 'fa fa-star-o'" class="star-icon" ng-click="toggleStar({repository: repository})"></i> <i ng-class="repository.is_starred ? 'starred fa fa-star' : 'fa fa-star-o'" class="star-icon" ng-click="toggleStar({repository: repository})"></i>
</div> </div>
</div> </div>
<div class="description markdown-view" content="repository.description" first-line-only="true"></div> <div class="description markdown-view" content="repository.description" first-line-only="true" placeholder-needed="true"></div>
</div> </div>
</div> </div>
</div> </div>

6
static/js/directives/ui/markdown-view.js
View file

@ -10,12 +10,14 @@ angular.module('quay').directive('markdownView', function () {
restrict: 'C', restrict: 'C',
scope: { scope: {
'content': '=content', 'content': '=content',
'firstLineOnly': '=firstLineOnly' 'firstLineOnly': '=firstLineOnly',
'placeholderNeeded': '=placeholderNeeded'
}, },
controller: function($scope, $element, $sce, UtilService) { controller: function($scope, $element, $sce, UtilService) {
$scope.getMarkedDown = function(content, firstLineOnly) { $scope.getMarkedDown = function(content, firstLineOnly) {
if (firstLineOnly) { if (firstLineOnly) {
return $sce.trustAsHtml(UtilService.getFirstMarkdownLineAsText(content)); console.log($scope.placeholderNeeded);
return $sce.trustAsHtml(UtilService.getFirstMarkdownLineAsText(content, $scope.placeholderNeeded));
} }
return $sce.trustAsHtml(UtilService.getMarkedDown(content)); return $sce.trustAsHtml(UtilService.getMarkedDown(content));
}; };

11
static/js/services/util-service.js
View file

@ -10,11 +10,16 @@ angular.module('quay').factory('UtilService', ['$sanitize', function($sanitize)
}; };
utilService.getMarkedDown = function(string) { utilService.getMarkedDown = function(string) {
return Markdown.getSanitizingConverter().makeHtml(string || ''); return html = Markdown.getSanitizingConverter().makeHtml(string || '');
}; };
utilService.getFirstMarkdownLineAsText = function(commentString) { utilService.getFirstMarkdownLineAsText = function(commentString, placeholderNeeded) {
if (!commentString) { return ''; } if (!commentString) {
if (placeholderNeeded) {
return '<p style="visibility:hidden">placeholder</p>';
}
return '';
}
var lines = commentString.split('\n'); var lines = commentString.split('\n');
var MARKDOWN_CHARS = { var MARKDOWN_CHARS = {