Skip to content

Commit

Permalink
Merge pull request jhollingworth#233 from shaunfreeman/dev
Browse files Browse the repository at this point in the history
added H4-H6 heading support
  • Loading branch information
jhollingworth committed Apr 29, 2013
2 parents 82404ac + 1fe5b0a commit 283bb8f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.DS_Store
.c9revisions
.c9revisions
/*.project
3 changes: 3 additions & 0 deletions .settings/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/*.jsdtscope
/*.eclipse.wst.jsdt.ui.superType.container
/*.eclipse.wst.jsdt.ui.superType.name
11 changes: 10 additions & 1 deletion src/bootstrap-wysihtml5.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h1' tabindex='-1'>" + locale.font_styles.h1 + "</a></li>" +
"<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h2' tabindex='-1'>" + locale.font_styles.h2 + "</a></li>" +
"<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3' tabindex='-1'>" + locale.font_styles.h3 + "</a></li>" +
"<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h4'>" + locale.font_styles.h4 + "</a></li>" +
"<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h5'>" + locale.font_styles.h5 + "</a></li>" +
"<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h6'>" + locale.font_styles.h6 + "</a></li>" +
"</ul>" +
"</li>";
},
Expand Down Expand Up @@ -420,6 +423,9 @@
"h1": {},
"h2": {},
"h3": {},
"h4": {},
"h5": {},
"h6": {},
"blockquote": {},
"u": 1,
"img": {
Expand Down Expand Up @@ -458,7 +464,10 @@
normal: "Normal text",
h1: "Heading 1",
h2: "Heading 2",
h3: "Heading 3"
h3: "Heading 3",
h4: "Heading 4",
h5: "Heading 5",
h6: "Heading 6"
},
emphasis: {
bold: "Bold",
Expand Down

0 comments on commit 283bb8f

Please sign in to comment.