diff options
author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-04 20:59:33 -0700 |
---|---|---|
committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-04 20:59:33 -0700 |
commit | 2be122cb5032567e88bb926b8aac250fd488cf68 (patch) | |
tree | d8900899a18f29d39c39380bec119823f38f34e5 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js | |
parent | 34a7e57ef205362d6c093fa7234ca38977560bea (diff) | |
download | elgg-2be122cb5032567e88bb926b8aac250fd488cf68.tar.gz elgg-2be122cb5032567e88bb926b8aac250fd488cf68.tar.bz2 |
Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js')
-rw-r--r-- | mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js index 6c9a3ead2..e94743bae 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js @@ -91,11 +91,11 @@ t.block = 1;
setTimeout(function() {
+ if (!ed.destroyed) {
var tc = t._getCount(ed);
-
tinymce.DOM.setHTML(t.id, tc.toString());
-
setTimeout(function() {t.block = 0;}, 2000);
+ }
}, 1);
},
|