3 files changed, 46 insertions, 8 deletions

diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php
index 9809aa841..344d71b14 100644
--- a/mod/tinymce/views/default/js/tinymce.php
+++ b/mod/tinymce/views/default/js/tinymce.php
@@ -38,7 +38,8 @@ elgg.tinymce.init = function() {
 		mode : "specific_textareas",
 		editor_selector : "elgg-input-longtext",
 		theme : "advanced",
-		plugins : "spellchecker,autosave,fullscreen,paste",
+		language : "<?php echo tinymce_get_site_language(); ?>",
+		plugins : "lists,spellchecker,autosave,fullscreen,paste,inlinepopups",
 		relative_urls : false,
 		remove_script_host : false,
 		document_base_url : elgg.config.wwwroot,
@@ -50,24 +51,52 @@ elgg.tinymce.init = function() {
 		theme_advanced_statusbar_location : "bottom",
 		theme_advanced_resizing : true,
 		theme_advanced_path : true,
+		width : "100%",
 		extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|style],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
 		setup : function(ed) {
 			//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);
 			});
+
+			ed.onInit.add(function(ed) {
+				// prevent Firefox from dragging/dropping files into editor
+				if (tinymce.isGecko) {
+					tinymce.dom.Event.add(ed.getBody().parentNode, "drop", function(e) {
+						if (e.dataTransfer.files.length > 0) {
+							e.preventDefault();
+						}
+					});
+				}
+			});
+
 		},
-		content_css: elgg.config.wwwroot + 'mod/tinymce/tinymce_content.css'
+		content_css: elgg.config.wwwroot + 'mod/tinymce/css/elgg_tinymce.css'
 	});
 
+	// work around for IE/TinyMCE bug where TinyMCE loses insert carot
+	if ($.browser.msie) {
+		$(".embed-control").live('hover', function() {
+			var classes = $(this).attr('class');
+			var embedClass = classes.split(/[, ]+/).pop();
+			var textAreaId = embedClass.substr(embedClass.indexOf('embed-control-') + "embed-control-".length);
+
+			if (window.tinyMCE) {
+				var editor = window.tinyMCE.get(textAreaId);
+				if (elgg.tinymce.bookmark == null) {
+					elgg.tinymce.bookmark = editor.selection.getBookmark(2);
+				}
+			}
+		});
+	}
 }
 
-elgg.register_hook_handler('init', 'system', elgg.tinymce.init);
\ No newline at end of file
+elgg.register_hook_handler('init', 'system', elgg.tinymce.init);
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;
+}
diff --git a/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php b/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php
index d5513cef1..a861a4035 100644
--- a/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php
+++ b/mod/tinymce/views/default/tinymce/embed_custom_insert_js.php
@@ -1,8 +1,14 @@
 	if (window.tinyMCE) {
 		var editor = window.tinyMCE.get(textAreaId);
-		
+
 		if (editor) {
+
+			// work around for IE/TinyMCE bug where TinyMCE loses insert carot
+			if ($.browser.msie) {
+				editor.focus();
+				editor.selection.moveToBookmark(elgg.tinymce.bookmark);
+			}
+
 			editor.execCommand("mceInsertContent", true, content);
 		}
 	}
-	
\ No newline at end of file