Merge remote-tracking branch 'upstream/dev' into wiki

3 files changed, 0 insertions, 270 deletions

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
deleted file mode 100644
index 7b65e733c..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
deleted file mode 100644
index 6622f924a..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/**

- * 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() {

-	var DOM = tinymce.DOM;

-

-	tinymce.create('tinymce.plugins.FullScreenPlugin', {

-		init : function(ed, url) {

-			var t = this, s = {}, vp, posCss;

-

-			t.editor = ed;

-

-			// Register commands

-			ed.addCommand('mceFullScreen', function() {

-				var win, de = DOM.doc.documentElement;

-

-				if (ed.getParam('fullscreen_is_enabled')) {

-					if (ed.getParam('fullscreen_new_window'))

-						closeFullscreen(); // Call to close in new window

-					else {

-						DOM.win.setTimeout(function() {

-							tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);

-							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent());

-							tinyMCE.remove(ed);

-							DOM.remove('mce_fullscreen_container');

-							de.style.overflow = ed.getParam('fullscreen_html_overflow');

-							DOM.setStyle(DOM.doc.body, 'overflow', ed.getParam('fullscreen_overflow'));

-							DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));

-							tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings

-						}, 10);

-					}

-

-					return;

-				}

-

-				if (ed.getParam('fullscreen_new_window')) {

-					win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);

-					try {

-						win.resizeTo(screen.availWidth, screen.availHeight);

-					} catch (e) {

-						// Ignore

-					}

-				} else {

-					tinyMCE.oldSettings = tinyMCE.settings; // Store old settings

-					s.fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';

-					s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);

-					vp = DOM.getViewPort();

-					s.fullscreen_scrollx = vp.x;

-					s.fullscreen_scrolly = vp.y;

-

-					// Fixes an Opera bug where the scrollbars doesn't reappear

-					if (tinymce.isOpera && s.fullscreen_overflow == 'visible')

-						s.fullscreen_overflow = 'auto';

-

-					// Fixes an IE bug where horizontal scrollbars would appear

-					if (tinymce.isIE && s.fullscreen_overflow == 'scroll')

-						s.fullscreen_overflow = 'auto';

-

-					// Fixes an IE bug where the scrollbars doesn't reappear

-					if (tinymce.isIE && (s.fullscreen_html_overflow == 'visible' || s.fullscreen_html_overflow == 'scroll'))

-						s.fullscreen_html_overflow = 'auto'; 

-

-					if (s.fullscreen_overflow == '0px')

-						s.fullscreen_overflow = '';

-

-					DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');

-					de.style.overflow = 'hidden'; //Fix for IE6/7

-					vp = DOM.getViewPort();

-					DOM.win.scrollTo(0, 0);

-

-					if (tinymce.isIE)

-						vp.h -= 1;

-

-					// Use fixed position if it exists

-					if (tinymce.isIE6 || document.compatMode == 'BackCompat')

-						posCss = 'absolute;top:' + vp.y;

-					else

-						posCss = 'fixed;top:0';

-

-					n = DOM.add(DOM.doc.body, 'div', {

-						id : 'mce_fullscreen_container', 

-						style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});

-					DOM.add(n, 'div', {id : 'mce_fullscreen'});

-

-					tinymce.each(ed.settings, function(v, n) {

-						s[n] = v;

-					});

-

-					s.id = 'mce_fullscreen';

-					s.width = n.clientWidth;

-					s.height = n.clientHeight - 15;

-					s.fullscreen_is_enabled = true;

-					s.fullscreen_editor_id = ed.id;

-					s.theme_advanced_resizing = false;

-					s.save_onsavecallback = function() {

-						ed.setContent(tinyMCE.get(s.id).getContent());

-						ed.execCommand('mceSave');

-					};

-

-					tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {

-						s[k] = v;

-					});

-

-					if (s.theme_advanced_toolbar_location === 'external')

-						s.theme_advanced_toolbar_location = 'top';

-

-					t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);

-					t.fullscreenEditor.onInit.add(function() {

-						t.fullscreenEditor.setContent(ed.getContent());

-						t.fullscreenEditor.focus();

-					});

-

-					t.fullscreenEditor.render();

-

-					t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');

-					t.fullscreenElement.update();

-					//document.body.overflow = 'hidden';

-

-					t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {

-						var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;

-

-						// Get outer/inner size to get a delta size that can be used to calc the new iframe size

-						outerSize = fed.dom.getSize(fed.getContainer().firstChild);

-						innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);

-

-						fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);

-					});

-				}

-			});

-

-			// Register buttons

-			ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});

-

-			ed.onNodeChange.add(function(ed, cm) {

-				cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));

-			});

-		},

-

-		getInfo : function() {

-			return {

-				longname : 'Fullscreen',

-				author : 'Moxiecode Systems AB',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',

-				version : tinymce.majorVersion + "." + tinymce.minorVersion

-			};

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);

-})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
deleted file mode 100644
index ffe528e41..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-	<title></title>

-	<meta http-equiv="X-UA-Compatible" content="IE=edge" />

-	<script type="text/javascript" src="../../tiny_mce.js"></script>

-	<script type="text/javascript">

-		function patchCallback(settings, key) {

-			if (settings[key])

-				settings[key] = "window.opener." + settings[key];

-		}

-

-		var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;

-

-		// Clone array

-		for (var n in paSe)

-			settings[n] = paSe[n];

-

-		// Override options for fullscreen

-		for (var n in paSe.fullscreen_settings)

-			settings[n] = paSe.fullscreen_settings[n];

-

-		// Patch callbacks, make them point to window.opener

-		patchCallback(settings, 'urlconverter_callback');

-		patchCallback(settings, 'insertlink_callback');

-		patchCallback(settings, 'insertimage_callback');

-		patchCallback(settings, 'setupcontent_callback');

-		patchCallback(settings, 'save_callback');

-		patchCallback(settings, 'onchange_callback');

-		patchCallback(settings, 'init_instance_callback');

-		patchCallback(settings, 'file_browser_callback');

-		patchCallback(settings, 'cleanup_callback');

-		patchCallback(settings, 'execcommand_callback');

-		patchCallback(settings, 'oninit');

-

-		// Set options

-		delete settings.id;

-		settings['mode'] = 'exact';

-		settings['elements'] = 'fullscreenarea';

-		settings['add_unload_trigger'] = false;

-		settings['ask'] = false;

-		settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();

-		settings['fullscreen_is_enabled'] = true;

-		settings['fullscreen_editor_id'] = oeID;

-		settings['theme_advanced_resizing'] = false;

-		settings['strict_loading_mode'] = true;

-

-		settings.save_onsavecallback = function() {

-			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});

-			window.opener.tinyMCE.get(oeID).execCommand('mceSave');

-			window.close();

-		};

-

-		function unloadHandler(e) {

-			moveContent();

-		}

-

-		function moveContent() {

-			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());

-		}

-

-		function closeFullscreen() {

-			moveContent();

-			window.close();

-		}

-

-		function doParentSubmit() {

-			moveContent();

-

-			if (window.opener.tinyMCE.selectedInstance.formElement.form)

-				window.opener.tinyMCE.selectedInstance.formElement.form.submit();

-

-			window.close();

-

-			return false;

-		}

-

-		function render() {

-			var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;

-

-			e.value = window.opener.tinyMCE.get(oeID).getContent();

-

-			vp = dom.getViewPort();

-			settings.width = vp.w;

-			settings.height = vp.h - 15;

-

-			tinymce.dom.Event.add(window, 'resize', function() {

-				var vp = dom.getViewPort();

-

-				tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);

-			});

-

-			tinyMCE.init(settings);

-		}

-

-		// Add onunload

-		tinymce.dom.Event.add(window, "beforeunload", unloadHandler);

-	</script>

-</head>

-<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">

-<form onsubmit="doParentSubmit();">

-<textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>

-</form>

-

-<script type="text/javascript">

-	render();

-</script>

-

-</body>

-</html>