Merge branch 'feature/strict-markdown'

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## Version 1.3.1
+
+**Features:**
+
+* Respect the new (Kirby 2.1) strict markdown mode
+
+**Special Thanks:**
+
+* @shoesforindustry for bringing this to my attention
+
 ## Version 1.3.0
 
 **Features:**

assets/css/visualmarkdown.css

@@ -1,7 +1,7 @@
 /**
  * Visual Markdown Editor Field for Kirby 2
  *
- * @version   1.3.0
+ * @version   1.3.1
  * @author    Jonas Döbertin <[email protected]>
  * @copyright Jonas Döbertin <[email protected]>
  * @link      https://github.com/JonasDoebertin/kirby-visual-markdown

assets/js/kirbytags-mode.js

@@ -1,7 +1,7 @@
 /**
  * Visual Markdown Editor Field for Kirby 2
  *
- * @version   1.3.0
+ * @version   1.3.1
  * @author    Jonas Döbertin <[email protected]>
  * @copyright Jonas Döbertin <[email protected]>
  * @link      https://github.com/JonasDoebertin/kirby-visual-markdown

assets/js/visualmarkdowneditor.js

@@ -1,7 +1,7 @@
 /**
  * Visual Markdown Editor Field for Kirby 2
  *
- * @version   1.3.0
+ * @version   1.3.1
  * @author    Jonas Döbertin <[email protected]>
  * @copyright Jonas Döbertin <[email protected]>
  * @link      https://github.com/JonasDoebertin/kirby-visual-markdown
@@ -29,6 +29,7 @@ var VisualMarkdownEditor = function($, $element, options) {
         toolbar: true,
         header1: 'h1',
         header2: 'h2',
+        kirbytext: true,
         codemirror: {
             theme:          'visualmarkdown',
             tabSize:        4,
@@ -83,10 +84,18 @@ var VisualMarkdownEditor = function($, $element, options) {
             self.insertBefore('* ', 2);
         },
         link: function () {
-            self.insertAround('(link: http:// text: ', ')');
+            if(self.options.kirbytext) {
+                self.insertAround('(link: http:// text: ', ')');
+            } else {
+                self.insertAround('[', '](http://)');
+            }
         },
         image: function () {
-            self.insertBefore('(image: filename.jpg)');
+            if(self.options.kirbytext) {
+                self.insertBefore('(image: filename.jpg)');
+            } else {
+                self.insertBefore('![alt text](http://)');
+            }
         },
         line: function() {
             self.insert('****');

assets/js/visualmarkdownfield.js

@@ -1,7 +1,7 @@
 /**
  * Visual Markdown Editor Field for Kirby 2
  *
- * @version   1.3.0
+ * @version   1.3.1
  * @author    Jonas Döbertin <[email protected]>
  * @copyright Jonas Döbertin <[email protected]>
  * @link      https://github.com/JonasDoebertin/kirby-visual-markdown
@@ -27,10 +27,11 @@ var VisualMarkdownField = function($, $field) {
     this.editor = null;
 
     this.options = {
-        toolbar: $field.data('toolbar'),
-        header1: $field.data('header1'),
-        header2: $field.data('header2'),
-        tools:   $field.data('tools').split(',')
+        toolbar:   $field.data('toolbar'),
+        header1:   $field.data('header1'),
+        header2:   $field.data('header2'),
+        tools:     $field.data('tools').split(','),
+        kirbytext: $field.data('kirbytext')
     };
 
     /**

markdown.php

@@ -2,7 +2,7 @@
 /**
  * Visual Markdown Editor Field for Kirby 2
  *
- * @version   1.3.0
+ * @version   1.3.1
  * @author    Jonas Döbertin <[email protected]>
  * @copyright Jonas Döbertin <[email protected]>
  * @link      https://github.com/JonasDoebertin/kirby-visual-markdown
@@ -279,11 +279,12 @@ public function input()
         $input->removeAttr('value');
         $input->html($this->value() ?: false);
         $input->data(array(
-            'field'   => 'markdownfield',
-            'toolbar' => ($this->toolbar) ? 'true' : 'false',
-            'tools'   => implode(',', $this->tools),
-            'header1' => $this->header1,
-            'header2' => $this->header2,
+            'field'     => 'markdownfield',
+            'toolbar'   => ($this->toolbar) ? 'true' : 'false',
+            'tools'     => implode(',', $this->tools),
+            'header1'   => $this->header1,
+            'header2'   => $this->header2,
+            'kirbytext' => (c::get('panel.kirbytext', true)) ? 'true' : 'false',
         ));
 
         // Set up wrapping element