Merge pull request diaspora#1 from Gosha/greentext

Use greentext format when formatting blockquotes
Gosha · Mar 31, 2014 · a39e9d6 · a39e9d6
2 parents 025422e + e1a995a
commit a39e9d6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -19,6 +19,15 @@ $(function() {
   textFormatter.markdownify = function markdownify(text){
     var converter = Markdown.getSanitizingConverter();
 
+    converter.hooks.chain("preConversion", function(text) {
+        return text
+        // Move lines immediatly following a quote another line down
+            .replace(/(>[^\r\n]*\r?\n)([^>])/g, "$1\r\n$2")
+        // Replace ">..." with ">\\>...<br>" and let markdown do the rest
+            .replace(/^>([^\r\n]*)(\r?\n|$)/gm, ">\\>$1<br>\r\n")
+        ;
+    });
+
     // punycode non-ascii chars in urls
     converter.hooks.chain("preConversion", function(text) {
 

diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
@@ -229,6 +229,12 @@ ul.as-selections
       :bottom 10px
 
 .stream_element
+
+  blockquote
+    :color #789922
+    :font-style normal
+    :margin-left 0
+
   a.author
     :font-weight bold
     :unicode-bidi bidi-override

diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss
@@ -79,6 +79,14 @@ h3 {
     font: {
       weight: normal; }; }
   padding: 0 !important; 
+
+  blockquote {
+    color: #789922;
+    font-style: normal;
+    margin-left: 0;
+    border-left: none;
+    padding-left: 0;
+  }
 }
 .shield{
   padding: 10px;

diff --git a/lib/diaspora/markdownify/html.rb b/lib/diaspora/markdownify/html.rb
@@ -8,6 +8,13 @@ def autolink(link, type)
         auto_link(link, :link => :urls, :html => { :target => "_blank" })
       end
 
+      def block_quote(text)
+        Rails.logger.info(text.dump)
+
+        ret = text.gsub(/(<p>|\n)(?=[^$])/, "&gt;")
+        "<blockquote>" + ret  + "</blockquote>"
+      end
+
     end
   end
 end