Merge pull request #67 from JonasDoebertin/develop

Merge 1.5.0

Author: JonasDoebertin

.gitattributes

@@ -1,5 +1,6 @@
 /bin export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
+/.jsbeatifyrc export-ignore
 /.jshintrc export-ignore
 /.scrutinizer.yml export-ignore

.jsbeautifyrc

@@ -0,0 +1,16 @@
+{
+    "js": {
+        "indent_size": 4,
+        "indent_char": " ",
+        "indent_level": 0,
+        "indent_with_tabs": false,
+        "preserve_newlines": true,
+        "max_preserve_newlines": 2,
+        "space_in_paren": false,
+        "space_after_anon_function": true,
+        "brace_style": "end-expand",
+        "space_before_conditional": true,
+        "end_with_newline": true,
+        "jslint_happy": true
+    }
+}

AUTHORS

@@ -1,6 +1,8 @@
 List of Visual Markdown Editor contributors. Updated before every release.
 
+alkin kasap
 Andreas Nymark
+Jonas Dbertin
 Jonas Döbertin
 malvese
 Martin

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## Version 1.5.0
+
+**Features:**
+
+* Smarter header toggling
+* Smarter list toggling
+
+**Changes:**
+
+* Drop support for Kirby 2.1 and below
+* Drop support for PHP 5.3 and below
+* Only enable fixed toolbar if field is focused
+* Updated to CodeMirror 5.8
+
+**Bugfixes**
+
+* More compatible way of getting the current panel language
+
 ## Version 1.4.0
 
 **Features:**

PLUGIN_INFO.md

@@ -12,6 +12,11 @@ If you like what I'm doing for the community and you want to support further dev
 
 *Cheers, Jonas*
 
+## Requirements
+
+* **Kirby 2.2 or above**
+* **PHP 5.4 or above**
+
 ## Installation
 
 ### Copy & Pasting

README.md

@@ -19,6 +19,11 @@ If you like what I'm doing for the community and you want to support further dev
 
 *Cheers, Jonas*
 
+## Requirements
+
+* **Kirby 2.2 or above**
+* **PHP 5.4 or above**
+
 ## Installation
 
 ### Copy & Pasting

assets/css/codemirror-5.5.0.css renamed to assets/css/codemirror-5.8.0.css

@@ -41,19 +41,21 @@
 
 /* CURSOR */
 
-.CodeMirror div.CodeMirror-cursor {
+.CodeMirror-cursor {
   border-left: 1px solid black;
+  border-right: none;
+  width: 0;
 }
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
+.cm-fat-cursor .CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
 }
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
+.cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
 
@@ -82,7 +84,7 @@
 }
 
 /* Can style cursor different in overwrite (non-insert) mode */
-div.CodeMirror-overwrite div.CodeMirror-cursor {}
+.CodeMirror-overwrite .CodeMirror-cursor {}
 
 .cm-tab { display: inline-block; text-decoration: inherit; }
 
@@ -284,19 +286,19 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   overflow: hidden;
   visibility: hidden;
 }
-.CodeMirror-measure pre { position: static; }
 
-.CodeMirror div.CodeMirror-cursor {
-  position: absolute;
-  border-right: none;
-  width: 0;
-}
+.CodeMirror-cursor { position: absolute; }
+.CodeMirror-measure pre { position: static; }
 
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
   z-index: 3;
 }
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
 }

assets/css/visualmarkdown.css

@@ -1,7 +1,7 @@
 /**
  * Visual Markdown Editor Field for Kirby 2
  *
- * @version   1.3.4
+ * @version   1.5.0
  * @author    Jonas Döbertin <hello@jd-powered.net>
  * @copyright Jonas Döbertin <hello@jd-powered.net>
  * @link      https://github.com/JonasDoebertin/kirby-visual-markdown
@@ -177,12 +177,11 @@
     margin: 0;
     padding: 0;
     position: relative;
-    z-index: 100;
 }
 
 .markdownfield-wrapper .visualmarkdown-toolbar-fixed {
     position: fixed;
-    top: 0;
+    top: 48px;
     z-index: 999;
 }
 
@@ -242,6 +241,7 @@
             width: 12em;
             background: #ffffff;
             box-shadow: 0 2px 5px rgba(0,0,0,.3), 0 0 15px rgba(0,0,0,.2);
+            z-index: 100;
         }
 
         .markdownfield-wrapper .visualmarkdown-toolbar li:hover ul {
@@ -409,6 +409,7 @@
         top: 0;
         left: 0;
         right: 0;
+        z-index: 100;
     }
 
     .markdownfield-wrapper-fullscreen .CodeMirror {

assets/js/codemirror-compressed-5.5.0.min.js

@@ -1,7 +1,7 @@
 /**
  * Visual Markdown Editor Field for Kirby 2
  *
- * @version   1.3.4
+ * @version   1.5.0
  * @author    Jonas Döbertin <hello@jd-powered.net>
  * @copyright Jonas Döbertin <hello@jd-powered.net>
  * @link      https://github.com/JonasDoebertin/kirby-visual-markdown
@@ -13,7 +13,7 @@
  *
  * @since 1.3.0
  */
-CodeMirror.defineMode('kirbytext', function(config, modeConfig) {
+CodeMirror.defineMode('kirbytext', function (config, modeConfig) {
     'use strict';
 
     var states = {
@@ -23,13 +23,12 @@ CodeMirror.defineMode('kirbytext', function(config, modeConfig) {
             {
                 regex: /[^\]]\((?=[a-z0-9]+:)/i,
                 token: 'kirbytext-open',
-                next:  'attribute'
-            },
-            {
+                next: 'attribute'
+            }, {
                 regex: /\((?=[a-z0-9]+:)/i,
-                sol:   true,
+                sol: true,
                 token: 'kirbytext-open',
-                next:  'attribute'
+                next: 'attribute'
             }
         ],
 
@@ -38,13 +37,13 @@ CodeMirror.defineMode('kirbytext', function(config, modeConfig) {
             {
                 regex: /[a-z0-9]+: ?(?!\/\/)/i,
                 token: 'kirbytext-attribute',
-                next:  'value'
+                next: 'value'
             },
             // Match a Kirbytext tags closing bracket
             {
                 regex: /\)/,
                 token: 'kirbytext-close',
-                next:  'start'
+                next: 'start'
             }
         ],
 
@@ -53,12 +52,11 @@ CodeMirror.defineMode('kirbytext', function(config, modeConfig) {
             {
                 regex: /[^\)]+? (?=(?:[a-z0-9]+:))/i,
                 token: 'kirbytext-value',
-                next:  'attribute'
-            },
-            {
+                next: 'attribute'
+            }, {
                 regex: /[^\)]+?(?=\))/i,
                 token: 'kirbytext-value',
-                next:  'attribute'
+                next: 'attribute'
             },
         ],
         meta: {}