WIP

dist/sir-trevor.css

@@ -483,3 +483,7 @@ ul.st-text-block {
 
 .st-format-btn--Unlink {
   text-decoration: line-through; }
+
+.st-format-btn--Strikethrough {
+  text-decoration: line-through;
+  font-family: Arial; }

dist/sir-trevor.js

@@ -461,6 +461,7 @@
                .replace(/\[([^\]]+)\]\(([^\)]+)\)/g,"<a href='$2'>$1</a>")
                .replace(/([\W_]|^)(\*\*|__)(?=\S)([^\r]*?\S[\*_]*)\2([\W_]|$)/g, "$1<strong>$3</strong>$4")
                .replace(/([\W_]|^)(\*|_)(?=\S)([^\r\*_]*?\S)\2([\W_]|$)/g, "$1<em>$3</em>$4")
+               .replace(/(?:~~)([^*|_]+)(?:~~)/mg,"<strike>$1</strike>")
                .replace(/\n\n/g, "<br>");
 
     // Use custom formatters toHTML functions (if any exist)
@@ -496,7 +497,8 @@
                       .replace(/<\/?b>/g,"**")
                       .replace(/<\/?STRONG>/gi,"**")                   // Bold
                       .replace(/<\/?i>/g,"_")
-                      .replace(/<\/?EM>/gi,"_");                        // Italic
+                      .replace(/<\/?EM>/gi,"_")                        // Italics
+                      .replace(/<\/?strike>/gi,"~~");                  // Strike
 
     // Use custom formatters toMarkdown functions (if any exist)
     var formatName, format;
@@ -952,7 +954,14 @@
       };
     },
 
-    save: function() { this.toData(); },
+    save: function() {
+      this.toData();
+    },
+
+    saveAndReturnData: function() {
+      this.save();
+      return this.blockStorage;
+    },
 
     getData: function() {
       return this.blockStorage.data;
@@ -2032,6 +2041,13 @@
       text : "link"
     });
 
+    var Strikethrough = SirTrevor.Formatter.extend({
+      title: "strikethrough",
+      iconName: "strikethrough",
+      cmd: "strikeThrough",
+      text : "s"
+    });
+
     /*
       Create our formatters and add a static reference to them
     */
@@ -2040,6 +2056,7 @@
     SirTrevor.Formatters.Underline = new Underline();
     SirTrevor.Formatters.Link = new Link();
     SirTrevor.Formatters.Unlink = new UnLink();
+    SirTrevor.Formatters.Strikethrough = new Strikethrough();
 
   })();
   /* Marker */
@@ -2619,7 +2636,7 @@
       },
 
       saveBlockStateToStore: function(block) {
-        var store = block.save();
+        var store = block.saveAndReturnData();
         if(store && !_.isEmpty(store.data)) {
           SirTrevor.log("Adding data for block " + block.blockID + " to block store");
           this.store("add", this, { data: store });

spec/javascripts/units/to_html.spec.js

@@ -43,6 +43,13 @@ describe("toHTML", function(){
     expect(html).toBe("hello!<br>hello!");
   });
 
+  it("converts strikes to HTML", function(){
+    var markdown = "~~test strike~~",
+        html = SirTrevor.toHTML(markdown, "Text");
+
+    expect(html).toBe("<strike>test strike</strike>");
+  });
+
   it("doesn't mess up on links with _ in", function(){
     var markdown = "http://google.com/_ and this is_ more text http://google.com/_",
         html = SirTrevor.toHTML(markdown, "Text");

spec/javascripts/units/to_markdown.spec.js

@@ -28,6 +28,13 @@ describe("toMarkdown", function(){
     expect(markdown).toBe("testing\n\n\n\n");
   });
 
+  it("coverts strikes to newlines", function(){
+    var html = "<strike>testing</strike>",
+        markdown = SirTrevor.toMarkdown(html, "Text");
+
+    expect(markdown).toBe("~~testing~~");
+  });
+
   it("coverts br's to newlines", function(){
     var html = "testing<br>",
         markdown = SirTrevor.toMarkdown(html, "Text");

src/block.store.js

@@ -9,7 +9,14 @@ SirTrevor.BlockStore = {
     };
   },
 
-  save: function() { this.toData(); },
+  save: function() {
+    this.toData();
+  },
+
+  saveAndReturnData: function() {
+    this.save();
+    return this.blockStorage;
+  },
 
   getData: function() {
     return this.blockStorage.data;

src/formatters/base.js

@@ -52,6 +52,13 @@
     text : "link"
   });
 
+  var Strikethrough = SirTrevor.Formatter.extend({
+    title: "strikethrough",
+    iconName: "strikethrough",
+    cmd: "strikeThrough",
+    text : "s"
+  });
+
   /*
     Create our formatters and add a static reference to them
   */
@@ -60,5 +67,6 @@
   SirTrevor.Formatters.Underline = new Underline();
   SirTrevor.Formatters.Link = new Link();
   SirTrevor.Formatters.Unlink = new UnLink();
+  SirTrevor.Formatters.Strikethrough = new Strikethrough();
 
 })();

src/sass/format-bar.scss

@@ -58,4 +58,9 @@
 
 .st-format-btn--Unlink {
   text-decoration: line-through;
+}
+
+.st-format-btn--Strikethrough {
+  text-decoration: line-through;
+  font-family: Arial;
 }

src/sir-trevor-editor.js

@@ -296,7 +296,7 @@ SirTrevor.Editor = (function(){
     },
 
     saveBlockStateToStore: function(block) {
-      var store = block.save();
+      var store = block.saveAndReturnData();
       if(store && !_.isEmpty(store.data)) {
         SirTrevor.log("Adding data for block " + block.blockID + " to block store");
         this.store("add", this, { data: store });

src/to-html.js

@@ -5,6 +5,7 @@ SirTrevor.toHTML = function(markdown, type) {
              .replace(/\[([^\]]+)\]\(([^\)]+)\)/g,"<a href='$2'>$1</a>")
              .replace(/([\W_]|^)(\*\*|__)(?=\S)([^\r]*?\S[\*_]*)\2([\W_]|$)/g, "$1<strong>$3</strong>$4")
              .replace(/([\W_]|^)(\*|_)(?=\S)([^\r\*_]*?\S)\2([\W_]|$)/g, "$1<em>$3</em>$4")
+             .replace(/(?:~~)([^*|_]+)(?:~~)/mg,"<strike>$1</strike>")
              .replace(/\n\n/g, "<br>");
 
   // Use custom formatters toHTML functions (if any exist)

src/to-markdown.js

@@ -6,7 +6,8 @@ SirTrevor.toMarkdown = function(content, type) {
                     .replace(/<\/?b>/g,"**")
                     .replace(/<\/?STRONG>/gi,"**")                   // Bold
                     .replace(/<\/?i>/g,"_")
-                    .replace(/<\/?EM>/gi,"_");                        // Italic
+                    .replace(/<\/?EM>/gi,"_")                        // Italics
+                    .replace(/<\/?strike>/gi,"~~");                  // Strike
 
   // Use custom formatters toMarkdown functions (if any exist)
   var formatName, format;