From 004a0b2849019b5460488d3ca41987aebf893638 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Thu, 15 Jul 2010 16:13:29 -0700
Subject: [PATCH] Fully operational ul and ol buttons.

---
 lib/gollum/frontend/public/css/editbar.css    |  8 ++
 .../frontend/public/javascript/gollum.js      | 97 +++++++++++++++----
 lib/gollum/frontend/templates/edit.mustache   | 10 +-
 3 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/lib/gollum/frontend/public/css/editbar.css b/lib/gollum/frontend/public/css/editbar.css
index e836ffb5..1696d48e 100644
--- a/lib/gollum/frontend/public/css/editbar.css
+++ b/lib/gollum/frontend/public/css/editbar.css
@@ -48,6 +48,14 @@
       background-position: 2px -1438px;
     }
 
+    #editbar .ul {
+      background-position: 2px -1366px;
+    }
+
+    #editbar .ol {
+      background-position: 2px -1078px;
+    }
+
   #editbar .tab {
     float: left;
     display: block;
diff --git a/lib/gollum/frontend/public/javascript/gollum.js b/lib/gollum/frontend/public/javascript/gollum.js
index a1b0d9a1..54ca6dc7 100644
--- a/lib/gollum/frontend/public/javascript/gollum.js
+++ b/lib/gollum/frontend/public/javascript/gollum.js
@@ -8,6 +8,15 @@ Gollum = {
     }
   },
 
+  prefixStrategy: function(prefix, content, newline) {
+    return {
+      type: 'prefixLine',
+      prefix: prefix,
+      content: content,
+      newline: newline
+    }
+  },
+
   enclose: function(el, format, kind) {
     var cfg = Gollum.Formats[format][kind]
     var sel = el.getSelectionRange()
@@ -17,17 +26,41 @@ Gollum = {
     } else {
       el.insertText(cfg.prefix + el.getSelectedText() + cfg.suffix, sel.start, sel.end, false)
     }
+  },
+
+  prefix: function(el, format, kind) {
+    var cfg = Gollum.Formats[format][kind]
+    var sel = el.getSelectionRange()
+    var cnt = el.getSelectedText()
+    var prefix = cfg.prefix
+    if (cfg.newline) {
+      el.setSelectionRange(sel.start - 1, sel.start)
+      var before = el.getSelectedText()
+      if (before != '\n') {
+        prefix = '\n' + prefix
+      }
+    }
+    if (sel.start == sel.end) {
+      el.insertText(prefix + cfg.content, sel.start, sel.start, false)
+      el.setSelectionRange(sel.start + prefix.length, sel.start + prefix.length + cfg.content.length)
+    } else {
+      el.insertText(prefix + cnt + '\n', sel.start, sel.end, false)
+    }
   }
 }
 
 Gollum.Formats = {
   asciidoc: {
     bold: Gollum.encloseStrategy('*', 'bold text', '*'),
-    italic: Gollum.encloseStrategy('_', 'italic text', '_')
+    italic: Gollum.encloseStrategy('_', 'italic text', '_'),
+    ul: Gollum.prefixStrategy('* ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('. ', 'Numbered list item', true)
   },
   creole: {
     bold: Gollum.encloseStrategy('**', 'bold text', '**'),
-    italic: Gollum.encloseStrategy('//', 'italic text', '//')
+    italic: Gollum.encloseStrategy('//', 'italic text', '//'),
+    ul: Gollum.prefixStrategy('* ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('# ', 'Numbered list item', true)
   },
   gollum: {
     link: Gollum.encloseStrategy('[[', 'Page Name', ']]'),
@@ -35,23 +68,33 @@ Gollum.Formats = {
   },
   markdown: {
     bold: Gollum.encloseStrategy('**', 'bold text', '**'),
-    italic: Gollum.encloseStrategy('*', 'italic text', '*')
+    italic: Gollum.encloseStrategy('*', 'italic text', '*'),
+    ul: Gollum.prefixStrategy('* ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('1. ', 'Numbered list item', true)
   },
   org: {
     bold: Gollum.encloseStrategy('*', 'bold text', '*'),
-    italic: Gollum.encloseStrategy('/', 'italic text', '/')
+    italic: Gollum.encloseStrategy('/', 'italic text', '/'),
+    ul: Gollum.prefixStrategy('* ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('1. ', 'Numbered list item', true)
   },
   pod: {
     bold: Gollum.encloseStrategy('B<', 'bold text', '>'),
-    italic: Gollum.encloseStrategy('I<', 'italic text', '>')
+    italic: Gollum.encloseStrategy('I<', 'italic text', '>'),
+    ul: Gollum.prefixStrategy('=item * ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('=item 1. ', 'Numbered list item', true)
   },
   rest: {
     bold: Gollum.encloseStrategy('**', 'bold text', '**'),
-    italic: Gollum.encloseStrategy('*', 'italic text', '*')
+    italic: Gollum.encloseStrategy('*', 'italic text', '*'),
+    ul: Gollum.prefixStrategy('* ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('1. ', 'Numbered list item', true)
   },
   rdoc: {
     bold: Gollum.encloseStrategy('*', 'bold text', '*'),
-    italic: Gollum.encloseStrategy('_', 'italic text', '_')
+    italic: Gollum.encloseStrategy('_', 'italic text', '_'),
+    ul: Gollum.prefixStrategy('* ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('1. ', 'Numbered list item', true)
   },
   roff: {
     bold: Gollum.encloseStrategy('\\fB', 'bold text', '\\fP'),
@@ -59,7 +102,9 @@ Gollum.Formats = {
   },
   textile: {
     bold: Gollum.encloseStrategy('*', 'bold text', '*'),
-    italic: Gollum.encloseStrategy('_', 'italic text', '_')
+    italic: Gollum.encloseStrategy('_', 'italic text', '_'),
+    ul: Gollum.prefixStrategy('* ', 'Bullet list item', true),
+    ol: Gollum.prefixStrategy('# ', 'Numbered list item', true)
   }
 }
 
@@ -72,18 +117,6 @@ $(function(){
 
   /* EditBar */
 
-  $('#editbar .bold').click(function() {
-    var el = $('#guides .write textarea')
-    var format = $('#guides .write select[name=format] option:selected').attr('value')
-    Gollum.enclose(el, format, 'bold')
-  })
-
-  $('#editbar .italic').click(function() {
-    var el = $('#guides .write textarea')
-    var format = $('#guides .write select[name=format] option:selected').attr('value')
-    Gollum.enclose(el, format, 'italic')
-  })
-
   $('#editbar .link').click(function() {
     var el = $('#guides .write textarea')
     var format = $('#guides .write select[name=format] option:selected').attr('value')
@@ -96,6 +129,30 @@ $(function(){
     Gollum.enclose(el, 'gollum', 'image')
   })
 
+  $('#editbar .bold').click(function() {
+    var el = $('#guides .write textarea')
+    var format = $('#guides .write select[name=format] option:selected').attr('value')
+    Gollum.enclose(el, format, 'bold')
+  })
+
+  $('#editbar .italic').click(function() {
+    var el = $('#guides .write textarea')
+    var format = $('#guides .write select[name=format] option:selected').attr('value')
+    Gollum.enclose(el, format, 'italic')
+  })
+
+  $('#editbar .ul').click(function() {
+    var el = $('#guides .write textarea')
+    var format = $('#guides .write select[name=format] option:selected').attr('value')
+    Gollum.prefix(el, format, 'ul')
+  })
+
+  $('#editbar .ol').click(function() {
+    var el = $('#guides .write textarea')
+    var format = $('#guides .write select[name=format] option:selected').attr('value')
+    Gollum.prefix(el, format, 'ol')
+  })
+
   $('#editbar .tab a').click(function() {
     if ($(this).hasClass("open")) {
       $(this).removeClass("open")
diff --git a/lib/gollum/frontend/templates/edit.mustache b/lib/gollum/frontend/templates/edit.mustache
index edb5472d..bf56ad6a 100644
--- a/lib/gollum/frontend/templates/edit.mustache
+++ b/lib/gollum/frontend/templates/edit.mustache
@@ -13,13 +13,17 @@
     </label>
     <label>
       <div id="editbar">
+        <div class="group group-separator">
+          <span title="Link" class="link button">Link</span>
+          <span title="Image" class="image button">Image</span>
+        </div>
         <div class="group group-separator">
           <span title="Bold" class="bold button">Bold</span>
           <span title="Italic" class="italic button">Italic</span>
         </div>
-        <div class="group">
-          <span title="Link" class="link button">Link</span>
-          <span title="Image" class="image button">Image</span>
+        <div class="group group-separator">
+          <span title="Unordered List" class="ul button">Unordered List</span>
+          <span title="Ordered List" class="ol button">Ordered List</span>
         </div>
         <div class="group">
           <span class="tab advanced">