Skip to content

Commit

Permalink
Update to FontAwesome v4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josh18 committed May 15, 2014
1 parent afb17d6 commit 0597a88
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 8 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
TinyMCE FontAwesome Plugin
===========================

###### v1.0.0
###### v1.1.0

A plugin that lets you insert FontAwesome icons via TinyMCE.
A plugin that lets you insert FontAwesome icons via TinyMCE. Currently uses FontAwesome v4.1.0.


###Instructions
Expand All @@ -18,7 +18,7 @@ A plugin that lets you insert FontAwesome icons via TinyMCE.
...
extended_valid_elements: 'span[class]'
...
content_css: '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css';
content_css: '//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css';
...
toolbar: 'fontawesome';
...
Expand Down
81 changes: 77 additions & 4 deletions fontawesome (uncompressed)/plugin.min.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ tinymce.PluginManager.add('fontawesome', function (editor, url) {
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
Expand Down Expand Up @@ -220,7 +220,7 @@ tinymce.PluginManager.add('fontawesome', function (editor, url) {
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
Expand Down Expand Up @@ -371,7 +371,78 @@ tinymce.PluginManager.add('fontawesome', function (editor, url) {
[''],
[''],
[''],
['']
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
[''],
['']
];

function showDialog() {
Expand Down Expand Up @@ -401,7 +472,9 @@ tinymce.PluginManager.add('fontawesome', function (editor, url) {
gridHtml += '<tr>';

for (x = 0; x < width; x++) {
gridHtml += '<td><span class="fa">' + iconlist[y * width + x] + '</span></td>'
if (iconlist[y * width + x]) {
gridHtml += '<td><span class="fa">' + iconlist[y * width + x] + '</span></td>';
}
}

gridHtml += '</tr>';
Expand Down
2 changes: 1 addition & 1 deletion fontawesome/plugin.min.js
100644 → 100755

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

0 comments on commit 0597a88

Please sign in to comment.