Skip to content

Commit

Permalink
Merge pull request #10 from yabwe/medium-editor-v5
Browse files Browse the repository at this point in the history
Get ready for MediumEditor 5
  • Loading branch information
daviferreira committed Jun 18, 2015
2 parents 0c5829d + 601a6cd commit 7b261ff
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"CHANGES.md"
],
"dependencies": {
"medium-editor": "4.11.1",
"medium-editor": "5.0.0",
"normalize.css": "3.0.3"
}
}
1 change: 1 addition & 0 deletions demo/css/demo.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ body {

p:first-child {
margin-top: 0; }

p:last-child {
margin-bottom: 0; }

Expand Down
26 changes: 14 additions & 12 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet"
href="../bower_components/normalize.css/normalize.css" />
<link rel="stylesheet"
href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" />
href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" />
<link rel="stylesheet"
href="http://fonts.googleapis.com/css?family=Roboto:400,400italic,700,700italic" />
<link rel="stylesheet"
Expand Down Expand Up @@ -52,19 +52,21 @@ <h1>MediumEditor Tables</h1>
<script type="text/javascript" charset="utf-8">
var editor = new MediumEditor('.editable', {
buttonLabels: 'fontawesome',
buttons: [
'header1',
'bold',
'italic',
'unorderedlist',
'orderedlist',
'table'
],
extensions: {
'table': new MediumEditorTable()
table: new MediumEditorTable()
},
staticToolbar: true,
stickyToolbar: true
toolbar: {
buttons: [
'h2',
'bold',
'italic',
'unorderedlist',
'orderedlist',
'table'
],
static: true,
sticky: true
}
});
</script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -47,6 +47,6 @@
"start": "open ./demo/index.html"
},
"dependencies": {
"medium-editor": "4.11.1"
"medium-editor": "5.0.0"
}
}
2 changes: 1 addition & 1 deletion src/js/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down

0 comments on commit 7b261ff

Please sign in to comment.