Merge pull request #1550 from opf/feature/api-work-package-descriptio…

…n-formatting API work package description/activity comments formatting
opf · Jul 10, 2014 · c9767d6 · c9767d6
2 parents 6d2fd5d + 3cbeb85
commit c9767d6
Show file tree

Hide file tree

Showing 57 changed files with 1,362 additions and 992 deletions.
diff --git a/app/assets/javascripts/work_packages.js.erb b/app/assets/javascripts/work_packages.js.erb
@@ -73,7 +73,7 @@ var WorkPackage = WorkPackage || {};
                 var user = content.attr('data-user');
 
                 text = text.trim().replace(/<pre>((.|\s)*?)<\/pre>/g, '[...]');
-                // remove blank lines generated by redmine textilizable
+                // remove blank lines generated by redmine format_text
                 text = text.replace(/^\s*$[\n\r]{1,}/gm, '');
 
                 var quotedText = "<%= ::I18n.t(:text_user_wrote, :value => "{{{user}}}", :locale => Setting.default_language.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" }) %>\n> ";