aboutsummaryrefslogtreecommitdiff
path: root/mod/tinymce
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-29 07:28:42 -0400
committerCash Costello <cash.costello@gmail.com>2011-06-29 07:28:42 -0400
commitb31332e3aa9b90ae3ee55e14ec7d568b3be5dd42 (patch)
treedc50eae0ce09bb97ee577ad4c5eb43d69e04bd54 /mod/tinymce
parentddf630c4b30a4264dfec23466b1c8dc8af886717 (diff)
downloadelgg-b31332e3aa9b90ae3ee55e14ec7d568b3be5dd42.tar.gz
elgg-b31332e3aa9b90ae3ee55e14ec7d568b3be5dd42.tar.bz2
Fixes #3537 using elgg.echo() for i18n of word count
Diffstat (limited to 'mod/tinymce')
-rw-r--r--mod/tinymce/views/default/js/tinymce.php4
-rw-r--r--mod/tinymce/views/default/tinymce/css.php3
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php
index d195cc871..55e0c7ae1 100644
--- a/mod/tinymce/views/default/js/tinymce.php
+++ b/mod/tinymce/views/default/js/tinymce.php
@@ -56,13 +56,13 @@ elgg.tinymce.init = function() {
//show the number of words
ed.onLoadContent.add(function(ed, o) {
var strip = (tinyMCE.activeEditor.getContent()).replace(/(&lt;([^&gt;]+)&gt;)/ig,"");
- var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' ';
+ var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' ';
tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text);
});
ed.onKeyUp.add(function(ed, e) {
var strip = (tinyMCE.activeEditor.getContent()).replace(/(&lt;([^&gt;]+)&gt;)/ig,"");
- var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' ';
+ var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' ';
tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text);
});
},
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index 5d008024f..b12cae82c 100644
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -26,3 +26,6 @@
-moz-border-radius: 4px;
border-radius: 4px;
}
+.mceLast .mceStatusbar {
+ padding-left: 5px;
+}