Skip to content
This repository has been archived by the owner on Sep 11, 2020. It is now read-only.

Commit

Permalink
v2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
linkesch committed Apr 19, 2016
1 parent e19bf31 commit 288cc42
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 19 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2.3.1 / 2016-04-19
==================

* Fix UMD dependencies (#314)
* Fix extending editor's functions (#310, #316)

2.3.0 / 2016-04-12
==================
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "medium-editor-insert-plugin",
"version": "2.3.0",
"version": "2.3.1",
"description": "jQuery insert plugin for MediumEditor",
"homepage": "http://linkesch.com/medium-editor-insert-plugin",
"main": [
Expand Down
2 changes: 1 addition & 1 deletion dist/css/medium-editor-insert-plugin-frontend.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* medium-editor-insert-plugin v2.3.0 - jQuery insert plugin for MediumEditor
* medium-editor-insert-plugin v2.3.1 - jQuery insert plugin for MediumEditor
*
* http://linkesch.com/medium-editor-insert-plugin
*
Expand Down
2 changes: 1 addition & 1 deletion dist/css/medium-editor-insert-plugin-frontend.min.css

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

2 changes: 1 addition & 1 deletion dist/css/medium-editor-insert-plugin.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* medium-editor-insert-plugin v2.3.0 - jQuery insert plugin for MediumEditor
* medium-editor-insert-plugin v2.3.1 - jQuery insert plugin for MediumEditor
*
* http://linkesch.com/medium-editor-insert-plugin
*
Expand Down
2 changes: 1 addition & 1 deletion dist/css/medium-editor-insert-plugin.min.css

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

34 changes: 24 additions & 10 deletions dist/js/medium-editor-insert-plugin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* medium-editor-insert-plugin v2.3.0 - jQuery insert plugin for MediumEditor
* medium-editor-insert-plugin v2.3.1 - jQuery insert plugin for MediumEditor
*
* http://linkesch.com/medium-editor-insert-plugin
*
Expand All @@ -9,24 +9,28 @@

(function (factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery'], factory);
define(['jquery', 'handlebars', 'medium-editor', 'blueimp-file-upload', 'jquery-sortable'], factory);
} else if (typeof module === 'object' && module.exports) {
module.exports = function( root, jQuery ) {
if ( jQuery === undefined ) {
if ( typeof window !== 'undefined' ) {
jQuery = require('jquery');
Handlebars = require('handlebars');
MediumEditor = require('medium-editor');
}
else {
jQuery = require('jquery')(root);
Handlebars = require('handlebars')(root);
MediumEditor = require('medium-editor')(root);
}
}
factory(jQuery);
factory(jQuery, Handlebars, MediumEditor);
return jQuery;
};
} else {
factory(jQuery);
factory(jQuery, Handlebars, MediumEditor);
}
}(function ($) {
}(function ($, Handlebars, MediumEditor) {

this["MediumInsert"] = this["MediumInsert"] || {};
this["MediumInsert"]["Templates"] = this["MediumInsert"]["Templates"] || {};
Expand Down Expand Up @@ -216,9 +220,15 @@ this["MediumInsert"]["Templates"]["src/js/templates/images-toolbar.hbs"] = Handl

// Extend editor's functions
if (this.options && this.options.editor) {
this.options.editor._serialize = this.options.editor.serialize;
this.options.editor._destroy = this.options.editor.destroy;
this.options.editor._setup = this.options.editor.setup;
if (this.options.editor._serialize === undefined) {
this.options.editor._serialize = this.options.editor.serialize;
}
if (this.options.editor._destroy === undefined) {
this.options.editor._destroy = this.options.editor.destroy;
}
if (this.options.editor._setup === undefined) {
this.options.editor._setup = this.options.editor.setup;
}
this.options.editor._hideInsertButtons = this.hideButtons;

this.options.editor.serialize = this.editorSerialize;
Expand Down Expand Up @@ -317,7 +327,9 @@ this["MediumInsert"]["Templates"]["src/js/templates/images-toolbar.hbs"] = Handl

Core.prototype.editorDestroy = function () {
$.each(this.elements, function (key, el) {
$(el).data('plugin_' + pluginName).disable();
if ($(el).data('plugin_' + pluginName) instanceof Core) {
$(el).data('plugin_' + pluginName).disable();
}
});

this._destroy();
Expand All @@ -333,7 +345,9 @@ this["MediumInsert"]["Templates"]["src/js/templates/images-toolbar.hbs"] = Handl
this._setup();

$.each(this.elements, function (key, el) {
$(el).data('plugin_' + pluginName).enable();
if ($(el).data('plugin_' + pluginName) instanceof Core) {
$(el).data('plugin_' + pluginName).enable();
}
});
};

Expand Down
6 changes: 3 additions & 3 deletions dist/js/medium-editor-insert-plugin.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": "medium-editor-insert-plugin",
"version": "2.3.0",
"version": "2.3.1",
"description": "jQuery insert plugin for MediumEditor",
"main": "dist/js/medium-editor-insert-plugin.js",
"homepage": "http://linkesch.com/medium-editor-insert-plugin",
Expand Down

0 comments on commit 288cc42

Please sign in to comment.