From aa1c5764592c6bd8e09fb19c22465e2c7889bfc0 Mon Sep 17 00:00:00 2001 From: Davi Ferreira Date: Fri, 12 Jun 2015 23:35:42 +0200 Subject: [PATCH 1/2] Get ready for MediumEditor 5 --- bower.json | 2 +- demo/index.html | 24 +++++++++++++----------- package.json | 4 ++-- src/js/plugin.js | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/bower.json b/bower.json index b8caa43..1554fc1 100644 --- a/bower.json +++ b/bower.json @@ -35,7 +35,7 @@ "CHANGES.md" ], "dependencies": { - "medium-editor": "4.11.1", + "medium-editor": "5.0.0-alpha.0", "normalize.css": "3.0.3" } } diff --git a/demo/index.html b/demo/index.html index 3464815..1226408 100644 --- a/demo/index.html +++ b/demo/index.html @@ -52,19 +52,21 @@

MediumEditor Tables

diff --git a/package.json b/package.json index d296852..4ca17a7 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "grunt-jscs": "1.8.0", "grunt-sass": "1.0.0", "grunt-template-jasmine-istanbul": "0.3.3", - "load-grunt-config": "^0.17.1", + "load-grunt-config": "0.17.1", "time-grunt": "1.2.1" }, "scripts": { @@ -47,6 +47,6 @@ "start": "open ./demo/index.html" }, "dependencies": { - "medium-editor": "4.11.1" + "medium-editor": "5.0.0-alpha.0" } } diff --git a/src/js/plugin.js b/src/js/plugin.js index 82dc09a..8406c27 100644 --- a/src/js/plugin.js +++ b/src/js/plugin.js @@ -26,7 +26,7 @@ MediumEditorTable.prototype = { this.table.insert(rows, columns); this.hideForm(); }.bind(this), - ownerDocument: this.base.options.ownerDocument, + ownerDocument: this.document, rows: this.options.rows, columns: this.options.columns }); From 601a6cdee35f44718f7427fd0610b3ce7b0d5465 Mon Sep 17 00:00:00 2001 From: Davi Ferreira Date: Thu, 18 Jun 2015 23:55:13 +0200 Subject: [PATCH 2/2] Upgrade medium-editor dependency --- bower.json | 2 +- demo/css/demo.css | 1 + demo/index.html | 4 ++-- package.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 1554fc1..dbc5d75 100644 --- a/bower.json +++ b/bower.json @@ -35,7 +35,7 @@ "CHANGES.md" ], "dependencies": { - "medium-editor": "5.0.0-alpha.0", + "medium-editor": "5.0.0", "normalize.css": "3.0.3" } } diff --git a/demo/css/demo.css b/demo/css/demo.css index 49d0b5f..666350e 100644 --- a/demo/css/demo.css +++ b/demo/css/demo.css @@ -15,6 +15,7 @@ body { p:first-child { margin-top: 0; } + p:last-child { margin-bottom: 0; } diff --git a/demo/index.html b/demo/index.html index 1226408..2b6b112 100644 --- a/demo/index.html +++ b/demo/index.html @@ -12,7 +12,7 @@ + href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" /> MediumEditor Tables }, toolbar: { buttons: [ - 'h1', + 'h2', 'bold', 'italic', 'unorderedlist', diff --git a/package.json b/package.json index 4ca17a7..5bdadda 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,6 @@ "start": "open ./demo/index.html" }, "dependencies": { - "medium-editor": "5.0.0-alpha.0" + "medium-editor": "5.0.0" } }