X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftiny_mce%2Fplugins%2Ffullpage%2Feditor_plugin_src.js;h=a2c9df898708b3b160ee1582761c3c79e397aa24;hb=1ff5766f84fac1d651d3fcb18cb500555f1ad302;hp=146d3c2d3839023eb3638f4f9b900fef45cd5559;hpb=e155c0ab03b1dd135e594d991804df0f32b54a36;p=citadel.git

diff --git a/webcit/tiny_mce/plugins/fullpage/editor_plugin_src.js b/webcit/tiny_mce/plugins/fullpage/editor_plugin_src.js
index 146d3c2d3..a2c9df898 100644
--- a/webcit/tiny_mce/plugins/fullpage/editor_plugin_src.js
+++ b/webcit/tiny_mce/plugins/fullpage/editor_plugin_src.js
@@ -1,5 +1,11 @@
-/*
- * Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 (function() {
@@ -79,6 +85,13 @@
 		_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;
+
 			// Parse out head, body and footer
 			c = c.replace(/<(\/?)BODY/gi, '<$1body');
 			sp = c.indexOf('<body');
@@ -130,10 +143,11 @@
 		_getContent : function(ed, o) {
 			var t = this;
 
-			o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);
+			if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))
+				o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);
 		}
 	});
 
 	// Register plugin
 	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);
-})();
+})();
\ No newline at end of file