Merge lp:~cjohnston/launchpad/fix-word-break into lp:launchpad

[Chris Johnston]

Fix word-break not working in FF, add a newline between code and ICs in emails, default publish inline comments True.

- fixes word-break not working in FF
- add a new line between code and ICs in emails
- Remove a few trailing whitespaces
- Set publish inline comments to true by default

[Celso Providelo (cprov)]

Thanks for working on this.

I have only on minor comment about replacing L.insert(0,...) for a append(''); extend(...); append('')

Once that's done we can land it.

review: Approve

=== modified file 'lib/lp/app/javascript/inlineedit/assets/skins/sam/editor-skin.css'
--- lib/lp/app/javascript/inlineedit/assets/skins/sam/editor-skin.css	2014-04-09 19:58:33 +0000
+++ lib/lp/app/javascript/inlineedit/assets/skins/sam/editor-skin.css	2014-05-13 01:31:25 +0000
@@ -224,7 +224,7 @@
   font-family: Ubuntu,"Bitstream Vera Sans","DejaVu Sans",Tahoma,sans-serif;
   font-size: 12px;
   padding: 0 12px 0;
-  word-break: break-word;
+  word-break: break-all;
 }
 
 .inline-comment>div { line-height: 25px; }

=== modified file 'lib/lp/code/browser/codereviewcomment.py'
--- lib/lp/code/browser/codereviewcomment.py	2014-04-04 05:23:48 +0000
+++ lib/lp/code/browser/codereviewcomment.py	2014-05-13 01:31:25 +0000
@@ -259,7 +259,7 @@
             comment = self.reply_to.as_quoted_email
         else:
             comment = ''
-        return {'comment': comment}
+        return {'comment': comment, 'publish_inline_comments': True}
 
     def setUpFields(self):
         super(CodeReviewCommentAddView, self).setUpFields()

=== modified file 'lib/lp/code/mail/codereviewcomment.py'
--- lib/lp/code/mail/codereviewcomment.py	2014-04-01 02:14:58 +0000
+++ lib/lp/code/mail/codereviewcomment.py	2014-05-13 01:31:25 +0000
@@ -177,7 +177,9 @@
         result_lines.append('> {0}'.format(diff_lines[i]))
         comment = comments.get(str(i))
         if comment is not None:
+            result_lines.append('')
             result_lines.extend(comment.splitlines())
+            result_lines.append('')
 
     result_text = '\n'.join(result_lines)
 

=== modified file 'lib/lp/code/mail/tests/test_codereviewcomment.py'
--- lib/lp/code/mail/tests/test_codereviewcomment.py	2014-03-26 19:29:20 +0000
+++ lib/lp/code/mail/tests/test_codereviewcomment.py	2014-05-13 01:31:25 +0000
@@ -247,7 +247,7 @@
         comment = self.makeCommentWithInlineComments(
             inline_comments={'1': u'Is this from Planet Earth\xa9 ?'})
         mailer = CodeReviewCommentMailer.forCreation(comment)
-        commenter = comment.branch_merge_proposal.registrant 
+        commenter = comment.branch_merge_proposal.registrant
         ctrl = mailer.generateEmail(
             commenter.preferredemail.email, commenter)
 
@@ -257,11 +257,13 @@
             '',
             '> --- yvo/yc/pbqr/vagresnprf/qvss.cl      '
             '2009-10-01 13:25:12 +0000',
+            '',
             u'Is this from Planet Earth\xa9 ?',
+            '',
             '> +++ yvo/yc/pbqr/vagresnprf/qvss.cl      '
             '2010-02-02 15:48:56 +0000'
         ]
-        self.assertEqual(expected_lines, ctrl.body.splitlines()[1:7])
+        self.assertEqual(expected_lines, ctrl.body.splitlines()[1:9])
 
     def test_generateEmailWithInlineComments_feature_disabled(self):
         """Inline comments are not considered if the flag is not enabled."""
@@ -270,7 +272,7 @@
         content = 'CoNtEnT'
         comment = self.makeCommentWithInlineComments(content=content)
         mailer = CodeReviewCommentMailer.forCreation(comment)
-        commenter = comment.branch_merge_proposal.registrant 
+        commenter = comment.branch_merge_proposal.registrant
         ctrl = mailer.generateEmail(
             commenter.preferredemail.email, commenter)
         # Only the comment content (footer is ignored) is included in
@@ -425,7 +427,7 @@
     def test_section_header_and_footer(self):
         # The inline comments section starts with a 4-lines header
         # (empty lines and title) and ends with an empty line.
-        section = self.getSection({}).splitlines() 
+        section = self.getSection({}).splitlines()
         header = section[:5]
         self.assertEqual(
             ['',
@@ -452,7 +454,7 @@
             self.getSection(comments).splitlines()[4:8])
 
     def test_multi_line_comment(self):
-        # Inline comments with multiple lines are rendered appropriately. 
+        # Inline comments with multiple lines are rendered appropriately.
         comments = {'1': 'Foo\nBar'}
         self.assertEqual(
             ['> +++ bar\t1969-12-31 19:00:00.000000000 -0500',