update auxilary files and readme with 2.7.0

5 years ago · d317873fb0
parent ff0db2000a
commit d317873fb0
7 changed files with 428 additions and 384 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,32 +1,33 @@
 language: node_js
 node_js:
+  - '12' # EOL: April 2022
  - '11' # EOL: June 2019
  - '10' # EOL: April 2021
  - '8' # EOL: December 2019
  - '6' # EOL: April 2019
-script:
-  - npm run prepare
-  - npm run test:types
-before_deploy:
-  - if [ "$TRAVIS_BRANCH" = master ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then npm version prerelease --no-git-tag-version --preid "$TRAVIS_BUILD_NUMBER"; fi
-deploy:
-  - provider: npm
-    email: info@saturnserver.org
-    api_key:
-      secure: rp4P11u0Vvz6iTkC1uj9LfNVOJASnTjffpqpe9lhuC/php7+fdoYvZ4e1EwKj2RVbi7YNqZE6w+Y6fsxZk72N4RGVO6HROm6gNv2wl+qk0B1XwciONO9y5FhTcdZrsq5Vx5WdoZThs5CSkXpvtHiavAnAt1ufYjqKGBZOENdxJ40kkn9WdQG2WvG7iZWDlDpDoqof2uO9k89d2UuTG5DKAoMpN+4UH0Fr0gV0u11IcBeH7rlSo2btlMaMsSO9Nb10Zf1rC0USHfyrui/BKvVGeRh7FASYrHwjqt4bwqzKZlP5bZ4zGIPMYXXsGLcidxIvSsNIRp7cgkWvsywe8cIi5XzaM48afWsbMUfMgXi9BDNjK7vBiuPBnGWYS3ylJZn/7SvMuqsoj4De5GWrCJ5pTsEKD5yw5+iqQv7v2ZYhuN7/tTSoEy/BOMdN43zWquJp57LXkyFQ9esGoI0bfeYojV2BvcpwY/UFS27e/9bH+RBlXsLfP0kEtosVGZ6i3AuUKtsYOxo4QZSI4yHtP7fKsoCoJIvpW3hcWjrnI8N7IC18/KihsUByuMgDgTTXXtDKxLbNVjbiVvFJeuClwe1oc1uusY1v/EkNpGDFZX5zFEVv3zC76NaLB75kCUN3gGC0RRFk0J9i3k8qa42TLjbOqvxgRxOEtVeRxowBNrymIQ=
-    tag: next
-    skip_cleanup: true
-    on:
-      node: 10
-      branch: master
-      repo: Ionaru/easy-markdown-editor
-  - provider: npm
-    email: info@saturnserver.org
-    api_key:
-      secure: rp4P11u0Vvz6iTkC1uj9LfNVOJASnTjffpqpe9lhuC/php7+fdoYvZ4e1EwKj2RVbi7YNqZE6w+Y6fsxZk72N4RGVO6HROm6gNv2wl+qk0B1XwciONO9y5FhTcdZrsq5Vx5WdoZThs5CSkXpvtHiavAnAt1ufYjqKGBZOENdxJ40kkn9WdQG2WvG7iZWDlDpDoqof2uO9k89d2UuTG5DKAoMpN+4UH0Fr0gV0u11IcBeH7rlSo2btlMaMsSO9Nb10Zf1rC0USHfyrui/BKvVGeRh7FASYrHwjqt4bwqzKZlP5bZ4zGIPMYXXsGLcidxIvSsNIRp7cgkWvsywe8cIi5XzaM48afWsbMUfMgXi9BDNjK7vBiuPBnGWYS3ylJZn/7SvMuqsoj4De5GWrCJ5pTsEKD5yw5+iqQv7v2ZYhuN7/tTSoEy/BOMdN43zWquJp57LXkyFQ9esGoI0bfeYojV2BvcpwY/UFS27e/9bH+RBlXsLfP0kEtosVGZ6i3AuUKtsYOxo4QZSI4yHtP7fKsoCoJIvpW3hcWjrnI8N7IC18/KihsUByuMgDgTTXXtDKxLbNVjbiVvFJeuClwe1oc1uusY1v/EkNpGDFZX5zFEVv3zC76NaLB75kCUN3gGC0RRFk0J9i3k8qa42TLjbOqvxgRxOEtVeRxowBNrymIQ=
-    skip_cleanup: true
-    on:
-      node: 10
-      branch: master
-      tags: true
-      repo: Ionaru/easy-markdown-editor
+
+jobs:
+  include:
+    - stage: deploy
+      node_js: "lts/*"
+      script: skip
+      before_deploy: if [ "$TRAVIS_BRANCH" = master ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then npm version prerelease --no-git-tag-version --preid "$TRAVIS_BUILD_NUMBER"; fi
+      deploy:
+        - provider: npm
+          email: info@saturnserver.org
+          api_key:
+            secure: rp4P11u0Vvz6iTkC1uj9LfNVOJASnTjffpqpe9lhuC/php7+fdoYvZ4e1EwKj2RVbi7YNqZE6w+Y6fsxZk72N4RGVO6HROm6gNv2wl+qk0B1XwciONO9y5FhTcdZrsq5Vx5WdoZThs5CSkXpvtHiavAnAt1ufYjqKGBZOENdxJ40kkn9WdQG2WvG7iZWDlDpDoqof2uO9k89d2UuTG5DKAoMpN+4UH0Fr0gV0u11IcBeH7rlSo2btlMaMsSO9Nb10Zf1rC0USHfyrui/BKvVGeRh7FASYrHwjqt4bwqzKZlP5bZ4zGIPMYXXsGLcidxIvSsNIRp7cgkWvsywe8cIi5XzaM48afWsbMUfMgXi9BDNjK7vBiuPBnGWYS3ylJZn/7SvMuqsoj4De5GWrCJ5pTsEKD5yw5+iqQv7v2ZYhuN7/tTSoEy/BOMdN43zWquJp57LXkyFQ9esGoI0bfeYojV2BvcpwY/UFS27e/9bH+RBlXsLfP0kEtosVGZ6i3AuUKtsYOxo4QZSI4yHtP7fKsoCoJIvpW3hcWjrnI8N7IC18/KihsUByuMgDgTTXXtDKxLbNVjbiVvFJeuClwe1oc1uusY1v/EkNpGDFZX5zFEVv3zC76NaLB75kCUN3gGC0RRFk0J9i3k8qa42TLjbOqvxgRxOEtVeRxowBNrymIQ=
+          tag: next
+          skip_cleanup: true
+          on:
+            branch: master
+            repo: Ionaru/easy-markdown-editor
+        - provider: npm
+          email: info@saturnserver.org
+          api_key:
+            secure: rp4P11u0Vvz6iTkC1uj9LfNVOJASnTjffpqpe9lhuC/php7+fdoYvZ4e1EwKj2RVbi7YNqZE6w+Y6fsxZk72N4RGVO6HROm6gNv2wl+qk0B1XwciONO9y5FhTcdZrsq5Vx5WdoZThs5CSkXpvtHiavAnAt1ufYjqKGBZOENdxJ40kkn9WdQG2WvG7iZWDlDpDoqof2uO9k89d2UuTG5DKAoMpN+4UH0Fr0gV0u11IcBeH7rlSo2btlMaMsSO9Nb10Zf1rC0USHfyrui/BKvVGeRh7FASYrHwjqt4bwqzKZlP5bZ4zGIPMYXXsGLcidxIvSsNIRp7cgkWvsywe8cIi5XzaM48afWsbMUfMgXi9BDNjK7vBiuPBnGWYS3ylJZn/7SvMuqsoj4De5GWrCJ5pTsEKD5yw5+iqQv7v2ZYhuN7/tTSoEy/BOMdN43zWquJp57LXkyFQ9esGoI0bfeYojV2BvcpwY/UFS27e/9bH+RBlXsLfP0kEtosVGZ6i3AuUKtsYOxo4QZSI4yHtP7fKsoCoJIvpW3hcWjrnI8N7IC18/KihsUByuMgDgTTXXtDKxLbNVjbiVvFJeuClwe1oc1uusY1v/EkNpGDFZX5zFEVv3zC76NaLB75kCUN3gGC0RRFk0J9i3k8qa42TLjbOqvxgRxOEtVeRxowBNrymIQ=
+          skip_cleanup: true
+          on:
+            branch: master
+            repo: Ionaru/easy-markdown-editor
+            tags: true
--- a/README.md
+++ b/README.md
@ -143,6 +143,7 @@ easyMDE.value('New input for **EasyMDE**');
  - **strikethrough**: If set to `false`, will not process GFM strikethrough syntax. Defaults to `true`.
  - **underscoresBreakWords**: If set to `true`, let underscores be a delimiter for separating words. Defaults to `false`.
 - **placeholder**: If set, displays a custom placeholder message.
+- **previewClass**: A string or array of strings that will be applied to the preview screen when activated. Defaults to `"editor-preview"`.
 - **previewRender**: Custom function for parsing the plaintext Markdown and returning HTML. Used when user previews.
 - **promptURLs**: If set to `true`, a JS alert window appears asking for the link or image URL. Defaults to `false`.
 - **promptTexts**: Customize the text used to prompt for URLs.
@ -220,6 +221,10 @@ var editor = new EasyMDE({
 		underscoresBreakWords: true,
 	},
 	placeholder: "Type here...",
+	
+	previewClass: "my-custom-styling",
+	previewClass: ["my-custom-styling", "more-custom-styling"],
+	
 	previewRender: function(plainText) {
 		return customMarkdownParser(plainText); // Returns HTML from a custom parser
 	},
--- a/gulpfile.js
+++ b/gulpfile.js
@ -31,7 +31,7 @@ function scripts() {
    return browserify({entries: './src/js/easymde.js', standalone: 'EasyMDE'}).bundle()
        .pipe(source('easymde.min.js'))
        .pipe(buffer())
-        .pipe(terser())
+        // .pipe(terser())  // TODO enable to minify output
        .pipe(header(banner, {pkg: pkg}))
        .pipe(gulp.dest('./dist/'));
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "easymde",
-    "version": "2.5.1",
+    "version": "2.7.0",
    "description": "A simple, beautiful, and embeddable JavaScript Markdown editor that easy to use. Features include autosaving and spell checking.",
    "files": [
        "dist/**/*",
@ -18,34 +18,30 @@
    "types": "types/easymde.d.ts",
    "license": "MIT",
    "author": "Jeroen Akkerman",
-    "bugs": {
-        "url": "https://github.com/ionaru/easy-markdown-editor/issues"
-    },
    "dependencies": {
-        "codemirror": "^5.43.0",
+        "codemirror": "^5.48.0",
        "codemirror-spell-checker": "1.1.2",
-        "marked": "^0.6.1"
+        "marked": "^0.7.0"
    },
    "devDependencies": {
-        "@types/codemirror": "0.0.72",
-        "browserify": "^16.2.3",
-        "gulp": "^4.0.0",
-        "gulp-clean-css": "^4.0.0",
+        "@types/codemirror": "0.0.76",
+        "browserify": "^16.3.0",
+        "gulp": "^4.0.2",
+        "gulp-clean-css": "^4.2.0",
        "gulp-concat": "^2.6.1",
-        "gulp-eslint": "^5.0.0",
+        "gulp-eslint": "^6.0.0",
        "gulp-header": "^2.0.7",
        "gulp-rename": "^1.4.0",
-        "gulp-uglify": "^3.0.1",
-        "typescript": "^3.3.3",
+        "gulp-terser": "^1.2.0",
+        "gulp-uglify": "^3.0.2",
+        "typescript": "^3.5.3",
        "vinyl-buffer": "^1.0.0",
        "vinyl-source-stream": "^2.0.0"
    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/ionaru/easy-markdown-editor"
-    },
+    "repository": "github:Ionaru/easy-markdown-editor",
    "scripts": {
        "prepare": "gulp",
+        "test": "npm run test:types",
        "test:types": "tsc --project types/tsconfig.json"
    }
 }
--- a/src/css/easymde.css
+++ b/src/css/easymde.css
@ -213,14 +213,12 @@
    content: 'characters: '
 }

-.editor-preview {
-    padding: 10px;
+.editor-preview-full {
    position: absolute;
    width: 100%;
    height: 100%;
    top: 0;
    left: 0;
-    background: #fafafa;
    z-index: 7;
    overflow: auto;
    display: none;
@ -228,13 +226,11 @@
 }

 .editor-preview-side {
-    padding: 10px;
    position: fixed;
    bottom: 0;
    width: 50%;
    top: 50px;
    right: 0;
-    background: #fafafa;
    z-index: 9;
    overflow: auto;
    display: none;
@ -251,21 +247,22 @@
    display: block
 }

-.editor-preview > p,
-.editor-preview-side > p {
+.editor-preview {
+    padding: 10px;
+    background: #fafafa;
+}
+
+.editor-preview > p {
    margin-top: 0
 }

-.editor-preview pre,
-.editor-preview-side pre {
+.editor-preview pre {
    background: #eee;
    margin-bottom: 10px;
 }

 .editor-preview table td,
-.editor-preview table th,
-.editor-preview-side table td,
-.editor-preview-side table th {
+.editor-preview table th {
    border: 1px solid #ddd;
    padding: 5px;
 }
--- a/src/js/easymde.js
+++ b/src/js/easymde.js
@ -903,6 +903,7 @@ function _replaceSelection(cm, active, startEnd, url) {
    Object.assign(startPoint, cm.getCursor('start'));
    Object.assign(endPoint, cm.getCursor('end'));
    if (url) {
+        start = start.replace('#url#', url);
        end = end.replace('#url#', url);
    }
    if (active) {