Added proper formatting when several lines are selected

boards/mdx_neboard.py

@@ -1,189 +1,198 b''
 from django.core.urlresolvers import reverse
 import markdown
 from markdown.inlinepatterns import Pattern
 from markdown.util import etree
 import boards
 
 __author__ = 'neko259'
 
 
 AUTOLINK_PATTERN = r'(https?://\S+)'
 QUOTE_PATTERN = r'^(?<!>)(>[^>].+)$'
 REFLINK_PATTERN = r'((>>)(\d+))'
 SPOILER_PATTERN = r'%%(.+)%%'
 COMMENT_PATTERN = r'^(//(.+))'
 STRIKETHROUGH_PATTERN = r'~(.+)~'
 
 
 class TextFormatter():
     """
     An interface for formatter that can be used in the text format panel
     """
 
     name = ''
 
     # Left and right tags for the button preview
     preview_left = ''
     preview_right = ''
 
     # Left and right characters for the textarea input
     format_left = ''
     format_right = ''
 
 
 class AutolinkPattern(Pattern):
     def handleMatch(self, m):
         link_element = etree.Element('a')
         href = m.group(2)
         link_element.set('href', href)
         link_element.text = href
 
         return link_element
 
 
 class QuotePattern(Pattern, TextFormatter):
     name = ''
     preview_left = '<span class="quote">&gt; '
     preview_right = '</span>'
 
     format_left = '&gt;'
 
     def handleMatch(self, m):
         quote_element = etree.Element('span')
         quote_element.set('class', 'quote')
         quote_element.text = m.group(2)
 
         return quote_element
 
 
 class ReflinkPattern(Pattern):
     def handleMatch(self, m):
         post_id = m.group(4)
 
         posts = boards.models.Post.objects.filter(id=post_id)
         if posts.count() > 0:
             ref_element = etree.Element('a')
 
             post = posts[0]
             if not post.is_opening():
                 link = reverse(boards.views.thread, kwargs={
                     'post_id': post.thread_new.get_opening_post().id})\
                        + '#' + post_id
             else:
                 link = reverse(boards.views.thread, kwargs={'post_id': post_id})
 
             ref_element.set('href', link)
             ref_element.text = m.group(2)
 
             return ref_element
 
 
 class SpoilerPattern(Pattern, TextFormatter):
     name = 's'
     preview_left = '<span class="spoiler">'
     preview_right = '</span>'
 
     format_left = '%%'
     format_right = '%%'
 
     def handleMatch(self, m):
         quote_element = etree.Element('span')
         quote_element.set('class', 'spoiler')
         quote_element.text = m.group(2)
 
         return quote_element
 
 
 class CommentPattern(Pattern, TextFormatter):
     name = ''
     preview_left = '<span class="comment">// '
     preview_right = '</span>'
 
     format_left = '//'
 
     def handleMatch(self, m):
         quote_element = etree.Element('span')
         quote_element.set('class', 'comment')
         quote_element.text = '//' + m.group(3)
 
         return quote_element
 
 
 class StrikeThroughPattern(Pattern, TextFormatter):
     name = 's'
     preview_left = '<span class="strikethrough">'
     preview_right = '</span>'
 
     format_left = '~'
     format_right = '~'
 
     def handleMatch(self, m):
         quote_element = etree.Element('span')
         quote_element.set('class', 'strikethrough')
         quote_element.text = m.group(2)
 
         return quote_element
 
 
 class ItalicPattern(TextFormatter):
     name = 'i'
     preview_left = '<i>'
     preview_right = '</i>'
 
     format_left = '_'
     format_right = '_'
 
 
 class BoldPattern(TextFormatter):
     name = 'b'
     preview_left = '<b>'
     preview_right = '</b>'
 
     format_left = '__'
     format_right = '__'
 
 
+class CodePattern(TextFormatter):
+    name = 'code'
+    preview_left = '<code>'
+    preview_right = '</code>'
+
+    format_left = '    '
+
+
 class NeboardMarkdown(markdown.Extension):
     def extendMarkdown(self, md, md_globals):
         self._add_neboard_patterns(md)
         self._delete_patterns(md)
 
     def _delete_patterns(self, md):
         del md.parser.blockprocessors['quote']
 
         del md.inlinePatterns['image_link']
         del md.inlinePatterns['image_reference']
 
     def _add_neboard_patterns(self, md):
         autolink = AutolinkPattern(AUTOLINK_PATTERN, md)
         quote = QuotePattern(QUOTE_PATTERN, md)
         reflink = ReflinkPattern(REFLINK_PATTERN, md)
         spoiler = SpoilerPattern(SPOILER_PATTERN, md)
         comment = CommentPattern(COMMENT_PATTERN, md)
         strikethrough = StrikeThroughPattern(STRIKETHROUGH_PATTERN, md)
 
         md.inlinePatterns[u'autolink_ext'] = autolink
         md.inlinePatterns[u'spoiler'] = spoiler
         md.inlinePatterns[u'strikethrough'] = strikethrough
         md.inlinePatterns[u'comment'] = comment
         md.inlinePatterns[u'reflink'] = reflink
         md.inlinePatterns[u'quote'] = quote
 
 
 def makeExtension(configs=None):
     return NeboardMarkdown(configs=configs)
 
 neboard_extension = makeExtension()
 
 
 def markdown_extended(markup):
     return markdown.markdown(markup, [neboard_extension], safe_mode=True)
 
 formatters = [
     QuotePattern,
     SpoilerPattern,
     ItalicPattern,
     BoldPattern,
     CommentPattern,
     StrikeThroughPattern,
+    CodePattern,
 ]

boards/static/js/panel.js

@@ -1,42 +1,116 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
+/**
+ * Add the desired characters to the start and end of selection.
+ * @param start Start (left) text
+ * @param end End (right) text
+ * @returns {boolean}
+ */
 function addMarkToMsg(start, end) {
+    if (end.length == 0) {
+        return addTextToEachLineOfSelection(start);
+    }
+
     var textarea = document.getElementsByTagName('textarea')[0];
     if(!textarea) return;
     if( document.selection ) {
         textarea.focus();
         sel = document.selection.createRange();
         sel.text = start + sel.text + end;
     } else if(textarea.selectionStart || textarea.selectionStart == '0') {
         textarea.focus();
         var startPos = textarea.selectionStart;
         var endPos = textarea.selectionEnd;
         textarea.value = textarea.value.substring(0, startPos) + start + textarea.value.substring(startPos, endPos) + end + textarea.value.substring( endPos, textarea.value.length );
     } else {
         textarea.value += start + end;
     }
     return false;
+}
+
+/**
+ * Add text to the beginning of each selected line. Partially selected lines
+ * are included
+ * @param textToAdd
+ * @returns {*}
+ */
+function addTextToEachLineOfSelection(textToAdd) {
+    var editor, end, newValue, start, value, _ref, _ref1;
+    editor = document.getElementsByTagName('textarea')[0];
+    _ref = [editor.selectionStart, editor.selectionEnd], start = _ref[0], end = _ref[1];
+    if (start == null) {
+        return;
+    }
+    if (start === end) {
+        return;
+    }
+    console.log("Selection range: start=" + start + " end=" + end);
+    value = editor.value;
+    _ref1 = getLinesRange(start, end, value), start = _ref1[0], end = _ref1[1];
+    newValue = replaceLines(start, end, value, textToAdd);
+    return editor.value = newValue;
+}
+
+function replaceLines(start, end, value, textToAdd) {
+    var line, replacedText, text;
+    text = value.slice(start, end);
+    replacedText = ((function() {
+        var _i, _len, _ref, _results;
+        _ref = text.split("\n");
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+            line = _ref[_i];
+            _results.push(textToAdd + line);
+        }
+        return _results;
+    })()).join("\n");
+    return replaceSubstring(start, end, value, replacedText);
+}
+
+function replaceSubstring(start, end, string, replacingString) {
+    return string.slice(0, start) + replacingString + string.slice(end);
+}
+
+function getLinesRange(start, end, value) {
+    var i, rangeEnd, rangeStart, _i, _j, _ref, _ref1;
+    if (value[start] === "\n") {
+        start = start - 1;
+    }
+    _ref = [start, end], rangeStart = _ref[0], rangeEnd = _ref[1];
+    for (i = _i = start; start <= 0 ? _i <= 0 : _i >= 0; i = start <= 0 ? ++_i : --_i) {
+        if (value[i] === "\n") {
+            break;
+        }
+        rangeStart = i;
+    }
+    for (i = _j = end, _ref1 = value.length; end <= _ref1 ? _j < _ref1 : _j > _ref1; i = end <= _ref1 ? ++_j : --_j) {
+        if (value[i] === "\n") {
+            break;
+        }
+        rangeEnd = i;
+    }
+    return [rangeStart, rangeEnd];
 }
  No newline at end of file