burp_cms 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b712f7801fbe64d570dbb1ea9dbb6f68c4e3341
-  data.tar.gz: 76ecfcde61237cc7fd45740286c4a499040d1375
+  metadata.gz: 9b3ab2d42e551dca2a7c0ead3172deaba087cbd6
+  data.tar.gz: de9980ef7deae09191f1d14b44beda4ee3d5c13c
 SHA512:
-  metadata.gz: 58b7b567477a9cffb4b357bdb789417387d21b518bcf6a592c4677621889fda2d69d9bfa964d3e30a909a36c52a50ca79952d02d629532a5e2799e53b52a1210
-  data.tar.gz: 80341204cdb82686ef1c14c41b81d82982876aa9d3f9ad61ac584fcbe5faa651415cdd5d2d210b93e3487bc7090b2ea9425355d96a5e4fe0850131498443a563
+  metadata.gz: 8a125fff2696316d6b982fc57e9d5fd1f373f7f935d7f09992ef421daa9e13a4acdd49544671c8707dd096aaa8dfb810480b42512bc35822fe9f709cf1f9bf81
+  data.tar.gz: eab2f3e91d59e36fe3a239dd2f08f2a0e97db5ebf399897eacacb860d53b8469d0aaacc3d104eb4e7734da9b1dfbc2f66bd1a9008c08b9ffdafea07b441c15a0

data/app/assets/packages/burp/editing/js/content-decorator.js

@@ -1,5 +1,5 @@
 /*global
-  marked
+  marked markdown2Html
 */
 (function($) {
   
@@ -238,7 +238,8 @@
     },
     
     updateContent: function() {
-      var html = marked(this.markdown).replace(/\s+/g,' ');
+      var html = window.markdown2Html(this.markdown).replace(/\s+/g,' ');
+      
       if(this.lastHtml === html) {
         return;
       }

data/app/assets/packages/burp/editing/js/jquery.html2markdown.js

@@ -32,7 +32,7 @@ function Html2Markdown(value) {
   dom.append(value);
   
   dom.find("> hr").each(function() {
-    $(this).replaceWith("---");
+    $(this).replaceWith(getBeforePadding(this,"\n\n") + "---" + getAfterPadding(this,"\n\n"));
   });
   
   dom.find("em > strong").each(function() {
@@ -59,7 +59,8 @@ function Html2Markdown(value) {
     $(this).find('li').each(function() {
       $(this).replaceWith("- "+$(this).html()+getAfterPadding(this,"\n"));
     });
-    $(this).replaceWith(getBeforePadding(this,"\n\n")+$(this).html());
+    
+    $(this).replaceWith(getBeforePadding(this,"\n\n") + $(this).html() + getAfterPadding(this,"\n\n"));
   });
   
   dom.find("ol").each(function() {
@@ -92,12 +93,7 @@ function Html2Markdown(value) {
           $(this).replaceWith("_"+$(this).html()+"_"); 
         });
       
-        var newLine = "\n\n";
-        if($(this).next().length === 0) {
-          newLine = "";
-        }
-      
-        $(this).replaceWith(getBeforePadding(this,"\n\n")+hashes+" "+$.trim($(this).html()) + newLine); 
+        $(this).replaceWith(getBeforePadding(this,"\n\n")+hashes+" "+$.trim($(this).html()) + getAfterPadding(this,"\n\n")); 
       }
     });
   });

data/app/assets/packages/burp/editing/js/markdown-fix.js

@@ -0,0 +1,54 @@
+/*global
+  marked
+*/
+
+(function() {
+  
+  function includeForMarkdown(element) {
+    // Include text
+    if(element.nodeType === 3) {
+      return true;
+    } else if(element.nodeType === 1 && element.tagName.match(/^(b|big|i|small|tt|abbr|acronym|cite|code|dfn|em|kbd|strong|samp|var|a|bdo|br|img|map|object|q|script|span|sub|sup|button|input|label|select|textarea)$/i)) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  function mergeTextAndInlineNodes(nodes) {
+    var newArray = [];
+    $(nodes).each(function(index, element) {
+      var last = newArray.length-1;
+      if(includeForMarkdown(element)) {
+        var data = $("<div></div>").append(element).html();
+
+        if(typeof(newArray[last]) === 'string') {
+          newArray[last] = newArray[last] + data;
+        } else {
+          newArray.push(data);
+        }
+      } else {
+        newArray.push(element);
+      }
+    });
+    return newArray;
+  }
+
+  function toHtml(markdown) {
+
+    var elements = [];
+
+    $.each(mergeTextAndInlineNodes($("<div></div>").append(markdown).contents()), function(index, value) {
+      if(typeof(value) === "string") {
+        elements.push(marked(value));
+      } else {
+        elements.push(value);
+      }
+    });
+
+    return $("<div></div>").append(elements).html();
+  }
+  
+  window.markdown2Html = toHtml;
+  
+}());