Skip to content

Commit

Permalink
Merge pull request #361 from NextStepWebs/development
Browse files Browse the repository at this point in the history
Fix broken dependency
  • Loading branch information
WesCossick authored Jun 14, 2016
2 parents 00e0f69 + 1471a4e commit 6abda7a
Show file tree
Hide file tree
Showing 7 changed files with 253 additions and 217 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simplemde",
"version": "1.11.1",
"version": "1.11.2",
"homepage": "https://github.com/NextStepWebs/simplemde-markdown-editor",
"authors": [
"Wes Cossick <https://wescossick.com>"
Expand Down
2 changes: 1 addition & 1 deletion debug/simplemde.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* simplemde v1.11.1
* simplemde v1.11.2
* Copyright Next Step Webs, Inc.
* @link https://github.com/NextStepWebs/simplemde-markdown-editor
* @license MIT
Expand Down
222 changes: 120 additions & 102 deletions debug/simplemde.debug.js

Large diffs are not rendered by default.

220 changes: 119 additions & 101 deletions debug/simplemde.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* simplemde v1.11.1
* simplemde v1.11.2
* Copyright Next Step Webs, Inc.
* @link https://github.com/NextStepWebs/simplemde-markdown-editor
* @license MIT
Expand Down Expand Up @@ -1833,107 +1833,125 @@ function isnan (val) {

}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"base64-js":1,"ieee754":15,"isarray":16}],4:[function(require,module,exports){
/* globals CodeMirror */
// Use strict mode (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode)
"use strict";


// Requires
var Typo = require("typo-js");


// Initialize data globally to reduce memory consumption
var num_loaded = 0;
var aff_loading = false;
var dic_loading = false;
var aff_data = "";
var dic_data = "";
var typo;


CodeMirror.defineMode("spell-checker", function(config) {
// Load AFF/DIC data
if(!aff_loading) {
aff_loading = true;
var xhr_aff = new XMLHttpRequest();
xhr_aff.open("GET", "https://cdn.jsdelivr.net/codemirror.spell-checker/latest/en_US.aff", true);
xhr_aff.onload = function() {
if(xhr_aff.readyState === 4 && xhr_aff.status === 200) {
aff_data = xhr_aff.responseText;
num_loaded++;

if(num_loaded == 2) {
typo = new Typo("en_US", aff_data, dic_data, {
platform: "any"
});
}
}
};
xhr_aff.send(null);
}

if(!dic_loading) {
dic_loading = true;
var xhr_dic = new XMLHttpRequest();
xhr_dic.open("GET", "https://cdn.jsdelivr.net/codemirror.spell-checker/latest/en_US.dic", true);
xhr_dic.onload = function() {
if(xhr_dic.readyState === 4 && xhr_dic.status === 200) {
dic_data = xhr_dic.responseText;
num_loaded++;

if(num_loaded == 2) {
typo = new Typo("en_US", aff_data, dic_data, {
platform: "any"
});
}
}
};
xhr_dic.send(null);
}


// Define what separates a word
var rx_word = "!\"#$%&()*+,-./:;<=>?@[\\]^_`{|}~ ";


// Create the overlay and such
var overlay = {
token: function(stream) {
var ch = stream.peek();
var word = "";

if(rx_word.includes(ch)) {
stream.next();
return null;
}

while((ch = stream.peek()) != null && !rx_word.includes(ch)) {
word += ch;
stream.next();
}

if(typo && !typo.check(word))
return "spell-error"; // CSS class: cm-spell-error

return null;
}
};

var mode = CodeMirror.getMode(
config, config.backdrop || "text/plain"
);

return CodeMirror.overlayMode(mode, overlay, true);
});


// Because some browsers don't support this functionality yet
if(!String.prototype.includes) {
String.prototype.includes = function() {
"use strict";
return String.prototype.indexOf.apply(this, arguments) !== -1;
};
// Use strict mode (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode)
"use strict";


// Requires
var Typo = require("typo-js");


// Create function
function CodeMirrorSpellChecker(options) {
// Initialize
options = options || {};


// Verify
if(typeof options.codeMirrorInstance !== "function" || typeof options.codeMirrorInstance.defineMode !== "function") {
console.log("CodeMirror Spell Checker: You must provide an instance of CodeMirror via the option `codeMirrorInstance`");
return;
}


// Because some browsers don't support this functionality yet
if(!String.prototype.includes) {
String.prototype.includes = function() {
"use strict";
return String.prototype.indexOf.apply(this, arguments) !== -1;
};
}


// Define the new mode
options.codeMirrorInstance.defineMode("spell-checker", function(config) {
// Load AFF/DIC data
if(!CodeMirrorSpellChecker.aff_loading) {
CodeMirrorSpellChecker.aff_loading = true;
var xhr_aff = new XMLHttpRequest();
xhr_aff.open("GET", "https://cdn.jsdelivr.net/codemirror.spell-checker/latest/en_US.aff", true);
xhr_aff.onload = function() {
if(xhr_aff.readyState === 4 && xhr_aff.status === 200) {
CodeMirrorSpellChecker.aff_data = xhr_aff.responseText;
CodeMirrorSpellChecker.num_loaded++;

if(CodeMirrorSpellChecker.num_loaded == 2) {
CodeMirrorSpellChecker.typo = new Typo("en_US", CodeMirrorSpellChecker.aff_data, CodeMirrorSpellChecker.dic_data, {
platform: "any"
});
}
}
};
xhr_aff.send(null);
}

if(!CodeMirrorSpellChecker.dic_loading) {
CodeMirrorSpellChecker.dic_loading = true;
var xhr_dic = new XMLHttpRequest();
xhr_dic.open("GET", "https://cdn.jsdelivr.net/codemirror.spell-checker/latest/en_US.dic", true);
xhr_dic.onload = function() {
if(xhr_dic.readyState === 4 && xhr_dic.status === 200) {
CodeMirrorSpellChecker.dic_data = xhr_dic.responseText;
CodeMirrorSpellChecker.num_loaded++;

if(CodeMirrorSpellChecker.num_loaded == 2) {
CodeMirrorSpellChecker.typo = new Typo("en_US", CodeMirrorSpellChecker.aff_data, CodeMirrorSpellChecker.dic_data, {
platform: "any"
});
}
}
};
xhr_dic.send(null);
}


// Define what separates a word
var rx_word = "!\"#$%&()*+,-./:;<=>?@[\\]^_`{|}~ ";


// Create the overlay and such
var overlay = {
token: function(stream) {
var ch = stream.peek();
var word = "";

if(rx_word.includes(ch)) {
stream.next();
return null;
}

while((ch = stream.peek()) != null && !rx_word.includes(ch)) {
word += ch;
stream.next();
}

if(CodeMirrorSpellChecker.typo && !CodeMirrorSpellChecker.typo.check(word))
return "spell-error"; // CSS class: cm-spell-error

return null;
}
};

var mode = options.codeMirrorInstance.getMode(
config, config.backdrop || "text/plain"
);

return options.codeMirrorInstance.overlayMode(mode, overlay, true);
});
}


// Initialize data globally to reduce memory consumption
CodeMirrorSpellChecker.num_loaded = 0;
CodeMirrorSpellChecker.aff_loading = false;
CodeMirrorSpellChecker.dic_loading = false;
CodeMirrorSpellChecker.aff_data = "";
CodeMirrorSpellChecker.dic_data = "";
CodeMirrorSpellChecker.typo;


// Export
module.exports = CodeMirrorSpellChecker;
},{"typo-js":18}],5:[function(require,module,exports){
// CodeMirror, copyright (c) by Marijn Haverbeke and others
// Distributed under an MIT license: http://codemirror.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion dist/simplemde.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions dist/simplemde.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simplemde",
"version": "1.11.1",
"version": "1.11.2",
"description": "A simple, beautiful, and embeddable JavaScript Markdown editor. Features autosaving and spell checking.",
"keywords": [
"embeddable",
Expand Down

0 comments on commit 6abda7a

Please sign in to comment.