Merge branch 'release/2.4.2'

pull/53/head 2.4.2
Jeroen Akkerman 5 years ago
commit cd92cc441a

@ -1,5 +1,6 @@
language: node_js
node_js:
- '11' # EOL: June 2019
- '10' # EOL: April 2021
- '8' # EOL: December 2019
- '6' # EOL: April 2019

@ -281,9 +281,9 @@ strikethrough | toggleStrikethrough | Strikethrough<br>fa fa-strikethrough
heading | toggleHeadingSmaller | Heading<br>fa fa-header
heading-smaller | toggleHeadingSmaller | Smaller Heading<br>fa fa-header
heading-bigger | toggleHeadingBigger | Bigger Heading<br>fa fa-lg fa-header
heading-1 | toggleHeading1 | Big Heading<br>fa fa-header fa-header-x fa-header-1
heading-2 | toggleHeading2 | Medium Heading<br>fa fa-header fa-header-x fa-header-2
heading-3 | toggleHeading3 | Small Heading<br>fa fa-header fa-header-x fa-header-3
heading-1 | toggleHeading1 | Big Heading<br>fa fa-header header-1
heading-2 | toggleHeading2 | Medium Heading<br>fa fa-header header-2
heading-3 | toggleHeading3 | Small Heading<br>fa fa-header header-3
code | toggleCodeBlock | Code<br>fa fa-code
quote | toggleBlockquote | Quote<br>fa fa-quote-left
unordered-list | toggleUnorderedList | Generic List<br>fa fa-list-ul

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

789
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -1,6 +1,6 @@
{
"name": "easymde",
"version": "2.4.1",
"version": "2.4.2",
"description": "A simple, beautiful, and embeddable JavaScript Markdown editor that easy to use. Features include autosaving and spell checking.",
"keywords": [
"embeddable",
@ -16,7 +16,7 @@
"url": "https://github.com/ionaru/easy-markdown-editor/issues"
},
"dependencies": {
"codemirror": "^5.40.2",
"codemirror": "^5.41.0",
"codemirror-spell-checker": "1.1.2",
"marked": "^0.5.1"
},
@ -37,6 +37,6 @@
"url": "https://github.com/ionaru/easy-markdown-editor"
},
"scripts": {
"prepublish": "gulp"
"prepare": "gulp"
}
}

@ -149,7 +149,7 @@
margin: 0 6px;
}
.editor-toolbar i.fa-header-x:after {
.editor-toolbar button:after {
font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
font-size: 65%;
vertical-align: text-bottom;
@ -157,23 +157,23 @@
top: 2px;
}
.editor-toolbar i.fa-header-1:after {
.editor-toolbar button.heading-1:after {
content: "1";
}
.editor-toolbar i.fa-header-2:after {
.editor-toolbar button.heading-2:after {
content: "2";
}
.editor-toolbar i.fa-header-3:after {
.editor-toolbar button.heading-3:after {
content: "3";
}
.editor-toolbar i.fa-header-bigger:after {
.editor-toolbar button.heading-bigger:after {
content: "▲";
}
.editor-toolbar i.fa-header-smaller:after {
.editor-toolbar button.heading-smaller:after {
content: "▼";
}

@ -118,6 +118,7 @@ function fixShortcut(name) {
function createIcon(options, enableTooltips, shortcuts) {
options = options || {};
var el = document.createElement('button');
el.className = options.name;
enableTooltips = (enableTooltips == undefined) ? true : enableTooltips;
if (options.title && enableTooltips) {
@ -1170,31 +1171,31 @@ var toolbarBuiltInButtons = {
'heading-smaller': {
name: 'heading-smaller',
action: toggleHeadingSmaller,
className: 'fa fa-header fa-heading fa-header-x fa-header-smaller',
className: 'fa fa-header fa-heading header-smaller',
title: 'Smaller Heading'
},
'heading-bigger': {
name: 'heading-bigger',
action: toggleHeadingBigger,
className: 'fa fa-header fa-heading fa-header-x fa-header-bigger',
className: 'fa fa-header fa-heading header-bigger',
title: 'Bigger Heading'
},
'heading-1': {
name: 'heading-1',
action: toggleHeading1,
className: 'fa fa-header fa-heading fa-header-x fa-header-1',
className: 'fa fa-header fa-heading header-1',
title: 'Big Heading'
},
'heading-2': {
name: 'heading-2',
action: toggleHeading2,
className: 'fa fa-header fa-heading fa-header-x fa-header-2',
className: 'fa fa-header fa-heading header-2',
title: 'Medium Heading'
},
'heading-3': {
name: 'heading-3',
action: toggleHeading3,
className: 'fa fa-header fa-heading fa-header-x fa-header-3',
className: 'fa fa-header fa-heading header-3',
title: 'Small Heading'
},
'separator-1': {
@ -1655,11 +1656,23 @@ EasyMDE.prototype.autosave = function () {
console.log('EasyMDE: You must set a uniqueId to use the autosave feature');
return;
}
if (easyMDE.element.form != null && easyMDE.element.form != undefined) {
easyMDE.element.form.addEventListener('submit', function () {
localStorage.removeItem('smde_' + easyMDE.options.autosave.uniqueId);
});
if(this.options.autosave.binded !== true) {
if (easyMDE.element.form != null && easyMDE.element.form != undefined) {
easyMDE.element.form.addEventListener('submit', function () {
clearTimeout(easyMDE.autosaveTimeoutId);
easyMDE.autosaveTimeoutId = undefined;
localStorage.removeItem('smde_' + easyMDE.options.autosave.uniqueId);
// Restart autosaving in case the submit will be cancelled down the line
setTimeout(function() {
easyMDE.autosave();
}, easyMDE.options.autosave.delay || 10000);
});
}
this.options.autosave.binded = true;
}
if (this.options.autosave.loaded !== true) {

Loading…
Cancel
Save