Upgraded TinyMCE to 3.3.8.

application/assets/js/tiny_mce/langs/en.js

@@ -90,7 +90,9 @@ desc:"Edit CSS Style"
 paste:{
 paste_text_desc:"Paste as Plain Text",
 paste_word_desc:"Paste from Word",
-selectall_desc:"Select All"
+selectall_desc:"Select All",
+plaintext_mode_sticky:"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.",
+plaintext_mode:"Paste is now in plain text mode. Click again to toggle back to regular paste mode."
 },
 paste_dlg:{
 text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
@@ -121,8 +123,8 @@ cell:"Cell"
 },
 autosave:{
 unload_msg:"The changes you made will be lost if you navigate away from this page.",
-restore_content: "Restore auto-saved content",
-warning_message: "If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?"
+restore_content:"Restore auto-saved content.",
+warning_message:"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?."
 },
 fullscreen:{
 desc:"Toggle fullscreen mode"
@@ -154,16 +156,15 @@ no_mpell:"No misspellings found."
 pagebreak:{
 desc:"Insert page break."
 },
-advlist : {
-	types : 'Types',
-	def : 'Default',
-	lower_alpha : "Lower alpha",
-	lower_greek : "Lower greek",
-	lower_roman : "Lower roman",
-	upper_alpha : "Upper alpha",
-	upper_roman : "Upper roman",
-	circle : "Circle",
-	disc : "Disc",
-	square : "Square"
-}
-}});
+advlist:{
+types:"Types",
+def:"Default",
+lower_alpha:"Lower alpha",
+lower_greek:"Lower greek",
+lower_roman:"Lower roman",
+upper_alpha:"Upper alpha",
+upper_roman:"Upper roman",
+circle:"Circle",
+disc:"Disc",
+square:"Square"
+}}});

application/assets/js/tiny_mce/plugins/autoresize/editor_plugin_src.js

@@ -59,37 +59,39 @@
 			// Define minimum height
 			t.autoresize_min_height = ed.getElement().offsetHeight;
 
-			// Things to do when the editor is ready
-			ed.onInit.add(function(ed, l) {
-				// Show throbber until content area is resized properly
-				ed.setProgressState(true);
-				t.throbbing = true;
-
-				// Hide scrollbars
-				ed.getBody().style.overflowY = "hidden";
-			});
-
 			// Add appropriate listeners for resizing content area
 			ed.onChange.add(resize);
 			ed.onSetContent.add(resize);
 			ed.onPaste.add(resize);
 			ed.onKeyUp.add(resize);
 			ed.onPostRender.add(resize);
 
-			ed.onLoadContent.add(function(ed, l) {
-				resize();
+			if (ed.getParam('autoresize_on_init', true)) {
+				// Things to do when the editor is ready
+				ed.onInit.add(function(ed, l) {
+					// Show throbber until content area is resized properly
+					ed.setProgressState(true);
+					t.throbbing = true;
 
-				// Because the content area resizes when its content CSS loads,
-				// and we can't easily add a listener to its onload event,
-				// we'll just trigger a resize after a short loading period
-				setTimeout(function() {
+					// Hide scrollbars
+					ed.getBody().style.overflowY = "hidden";
+				});
+
+				ed.onLoadContent.add(function(ed, l) {
 					resize();
 
-					// Disable throbber
-					ed.setProgressState(false);
-					t.throbbing = false;
-				}, 1250);
-			});
+					// Because the content area resizes when its content CSS loads,
+					// and we can't easily add a listener to its onload event,
+					// we'll just trigger a resize after a short loading period
+					setTimeout(function() {
+						resize();
+
+						// Disable throbber
+						ed.setProgressState(false);
+						t.throbbing = false;
+					}, 1250);
+				});
+			}
 
 			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
 			ed.addCommand('mceAutoResize', resize);

application/assets/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js

@@ -27,7 +27,7 @@
 		 * @param {string} url Absolute URL to where the plugin is located.
 		 */
 		init : function(ed) {
-			var t = this;
+			var t = this, lastRng;
 
 			t.editor = ed;
 
@@ -42,13 +42,33 @@
 
 			ed.onContextMenu.add(function(ed, e) {
 				if (!e.ctrlKey) {
+					// Restore the last selection since it was removed
+					if (lastRng)
+						ed.selection.setRng(lastRng);
+
 					t._getMenu(ed).showMenu(e.clientX, e.clientY);
-					Event.add(ed.getDoc(), 'click', hide);
+					Event.add(ed.getDoc(), 'click', function(e) {
+						hide(ed, e);
+					});
 					Event.cancel(e);
 				}
 			});
 
-			function hide() {
+			ed.onRemove.add(function() {
+				if (t._menu)
+					t._menu.removeAll();
+			});
+
+			function hide(ed, e) {
+				lastRng = null;
+
+				// Since the contextmenu event moves
+				// the selection we need to store it away
+				if (e && e.button == 2) {
+					lastRng = ed.selection.getRng();
+					return;
+				}
+
 				if (t._menu) {
 					t._menu.removeAll();
 					t._menu.destroy();

application/assets/js/tiny_mce/plugins/fullpage/editor_plugin_src.js

@@ -85,6 +85,10 @@
 		_setContent : function(ed, o) {
 			var t = this, sp, ep, c = o.content, v, st = '';
 
+			// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate
+			if (o.format == 'raw' && t.head)
+				return;
+
 			if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))
 				return;