Merge pull request #5087 from opf/fix/24203/comments-wiki-syntax

[24203] Use div for comment wiki container
pull/5097/head
Oliver Günther 8 years ago committed by GitHub
commit 1bae92a931
  1. 2
      frontend/app/components/wp-activity/revision/revision-activity-directive.test.ts
  2. 2
      frontend/app/components/wp-activity/user/user-activity-directive.test.js
  3. 4
      frontend/app/templates/work_packages/activities/_user.html

@ -123,7 +123,7 @@ describe('revisionActivity Directive', function () {
describe('message', function () { describe('message', function () {
it('should render commit message', function () { it('should render commit message', function () {
var message = element.find('span.user-comment > span.message').html(); var message = element.find('.user-comment > span.message').html();
expect(message).to.eq(scope.activity.message.html); expect(message).to.eq(scope.activity.message.html);
}); });

@ -138,7 +138,7 @@ describe('userActivity Directive', function() {
describe('comment', function() { describe('comment', function() {
it('should render activity comment', function() { it('should render activity comment', function() {
var comment = element.find('span.user-comment > span.message > span').html(); var comment = element.find('.user-comment > span.message > span').html();
expect(comment).to.eq(scope.activity.comment.html); expect(comment).to.eq(scope.activity.comment.html);
}); });

@ -39,7 +39,7 @@
</accessible-by-keyboard> </accessible-by-keyboard>
</div> </div>
</div> </div>
<span class="user-comment wiki"> <div class="user-comment wiki">
<div ng-if="inEdit" class="inplace-edit"> <div ng-if="inEdit" class="inplace-edit">
<div class="user-comment--form inplace-edit--write-value"> <div class="user-comment--form inplace-edit--write-value">
<div class="textarea-wrapper" ng-class="{'-preview': isPreview}"> <div class="textarea-wrapper" ng-class="{'-preview': isPreview}">
@ -82,5 +82,5 @@
<span class="message" ng-bind-html="detail"/> <span class="message" ng-bind-html="detail"/>
</li> </li>
</ul> </ul>
</span> </div>
</div> </div>

Loading…
Cancel
Save