v2.2.2

linkesch · Feb 27, 2016 · d02646e · d02646e
1 parent fe002ea
commit d02646e
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,9 @@
 
+2.2.2 / 2016-02-27
+==================
+
+  * Fix serializing html with embed codes containing scripts
+
 2.2.1 / 2016-02-05
 ==================
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "medium-editor-insert-plugin",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "jQuery insert plugin for MediumEditor",
   "main": [
     "dist/js/medium-editor-insert-plugin.js",

diff --git a/dist/css/medium-editor-insert-plugin-frontend.css b/dist/css/medium-editor-insert-plugin-frontend.css
@@ -1,5 +1,5 @@
 /*! 
- * medium-editor-insert-plugin v2.2.1 - jQuery insert plugin for MediumEditor
+ * medium-editor-insert-plugin v2.2.2 - jQuery insert plugin for MediumEditor
  *
  * https://github.com/orthes/medium-editor-insert-plugin
  * 

diff --git a/dist/css/medium-editor-insert-plugin-frontend.min.css b/dist/css/medium-editor-insert-plugin-frontend.min.css
diff --git a/dist/css/medium-editor-insert-plugin.css b/dist/css/medium-editor-insert-plugin.css
@@ -1,5 +1,5 @@
 /*! 
- * medium-editor-insert-plugin v2.2.1 - jQuery insert plugin for MediumEditor
+ * medium-editor-insert-plugin v2.2.2 - jQuery insert plugin for MediumEditor
  *
  * https://github.com/orthes/medium-editor-insert-plugin
  * 

diff --git a/dist/css/medium-editor-insert-plugin.min.css b/dist/css/medium-editor-insert-plugin.min.css
diff --git a/dist/js/medium-editor-insert-plugin.js b/dist/js/medium-editor-insert-plugin.js
@@ -1,5 +1,5 @@
 /*! 
- * medium-editor-insert-plugin v2.2.1 - jQuery insert plugin for MediumEditor
+ * medium-editor-insert-plugin v2.2.2 - jQuery insert plugin for MediumEditor
  *
  * https://github.com/orthes/medium-editor-insert-plugin
  * 
@@ -274,6 +274,12 @@ this["MediumInsert"]["Templates"]["src/js/templates/images-toolbar.hbs"] = Handl
 
             $data.find('.medium-insert-buttons').remove();
 
+            // Restore original embed code from embed wrapper attribute value.
+            $data.find('[data-embed-code]').each(function() {
+                var $this = $(this);
+                $this.html($this.attr('data-embed-code'));
+            });
+
             data[key].value = $data.html();
         });
 
@@ -1063,10 +1069,25 @@ this["MediumInsert"]["Templates"]["src/js/templates/images-toolbar.hbs"] = Handl
             success: function(data) {
                 var html = data && data.html;
 
-                if (data && !data.html && data.type === 'photo' && data.url) {
+                if (data && !html && data.type === 'photo' && data.url) {
                     html = '<img src="' + data.url + '" alt="">';
                 }
 
+                if (!html) {
+                    // Prevent render empty embed.
+                    $.proxy(that, 'convertBadEmbed', url)();
+                    return;
+                }
+
+                if (html && html.indexOf('</script>') > -1) {
+                    // Store embed code with <script> tag inside wrapper attribute value.
+                    // Make nice attribute value escaping using jQuery.
+                    var $div = $('<div>')
+                        .attr('data-embed-code', html)
+                        .html(html);
+                    html = $('<div>').append($div).html();
+                }
+
                 $.proxy(that, 'embed', html)();
             },
             error: function(jqXHR, textStatus, errorThrown) {

diff --git a/dist/js/medium-editor-insert-plugin.min.js b/dist/js/medium-editor-insert-plugin.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medium-editor-insert-plugin",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "jQuery insert plugin for MediumEditor",
   "license": "MIT",
   "homepage": "https://github.com/orthes/medium-editor-insert-plugin",