Merge 5706c022f3d56d2240bf7942c7e122e017fa2bcb into 5f3a67dae25f8e855a2cf8a617cc116267223e02

This commit is contained in:
Michael Blakeney 2016-01-12 17:16:51 +00:00
commit 3d83a35a2b
8 changed files with 315 additions and 2065 deletions

2
.gitignore vendored
View File

@ -7,3 +7,5 @@ bower_components/
*.ipr *.ipr
*.iws *.iws
.idea/ .idea/
*.swp

View File

@ -1,5 +1,5 @@
/** /**
* simplemde v1.9.0 * simplemde v1.9.1
* Copyright Next Step Webs, Inc. * Copyright Next Step Webs, Inc.
* @link https://github.com/NextStepWebs/simplemde-markdown-editor * @link https://github.com/NextStepWebs/simplemde-markdown-editor
* @license MIT * @license MIT
@ -171,7 +171,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
} }
/* The fake, visible scrollbars. Used to force redraw during scrolling /* The fake, visible scrollbars. Used to force redraw during scrolling
before actuall scrolling happens, thus preventing shaking and before actual scrolling happens, thus preventing shaking and
flickering artifacts. */ flickering artifacts. */
.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
position: absolute; position: absolute;
@ -659,6 +659,3 @@ span.CodeMirror-selectedtext { background: none; }
.CodeMirror .CodeMirror-code .cm-strikethrough { .CodeMirror .CodeMirror-code .cm-strikethrough {
text-decoration: line-through; text-decoration: line-through;
} }
.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word) {
background: rgba(255, 0, 0, .15);
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

18
dist/simplemde.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "simplemde", "name": "simplemde",
"version": "1.9.0", "version": "1.9.1",
"description": "A simple, beautiful, and embeddable JavaScript Markdown editor. Features autosaving and spell checking.", "description": "A simple, beautiful, and embeddable JavaScript Markdown editor. Features autosaving and spell checking.",
"keywords": [ "keywords": [
"embeddable", "embeddable",
@ -22,7 +22,6 @@
}, },
"dependencies": { "dependencies": {
"codemirror": "codemirror/CodeMirror", "codemirror": "codemirror/CodeMirror",
"codemirror-spell-checker": "nextstepwebs/codemirror-spell-checker",
"marked": "0.3.5" "marked": "0.3.5"
}, },
"devDependencies": { "devDependencies": {
@ -42,26 +41,6 @@
"vinyl-source-stream": "^1.1.0", "vinyl-source-stream": "^1.1.0",
"vinyl-buffer": "*" "vinyl-buffer": "*"
}, },
"browserify": {
"transform": [
"browserify-shim"
]
},
"browser": {
"spell-checker": "./node_modules/codemirror-spell-checker/src/js/spell-checker.js",
"typo": "./node_modules/codemirror-spell-checker/src/js/typo.js"
},
"browserify-shim": {
"spell-checker": {
"depends": [
"typo:Typo",
"codemirror:CodeMirror"
]
},
"typo": {
"exports": "Typo"
}
},
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/NextStepWebs/simplemde-markdown-editor" "url": "https://github.com/NextStepWebs/simplemde-markdown-editor"

View File

@ -8,7 +8,6 @@ require("codemirror/mode/markdown/markdown.js");
require("codemirror/addon/mode/overlay.js"); require("codemirror/addon/mode/overlay.js");
require("codemirror/mode/gfm/gfm.js"); require("codemirror/mode/gfm/gfm.js");
require("codemirror/mode/xml/xml.js"); require("codemirror/mode/xml/xml.js");
require("spell-checker");
var marked = require("marked"); var marked = require("marked");
@ -1025,16 +1024,9 @@ SimpleMDE.prototype.render = function(el) {
}, false); }, false);
var mode, backdrop; var mode, backdrop;
if(options.spellChecker !== false) {
mode = "spell-checker";
backdrop = options.parsingConfig;
backdrop.name = "gfm";
backdrop.gitHubSpice = false;
} else {
mode = options.parsingConfig; mode = options.parsingConfig;
mode.name = "gfm"; mode.name = "gfm";
mode.gitHubSpice = false; mode.gitHubSpice = false;
}
this.codemirror = CodeMirror.fromTextArea(el, { this.codemirror = CodeMirror.fromTextArea(el, {
mode: mode, mode: mode,