Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.

1 files changed, 125 insertions, 26 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
index 30ad65617..c4ec45303 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -8,6 +8,33 @@
 		return document.getElementById(id);

 	}

 

+	function clone(obj) {

+		var i, len, copy, attr;

+

+		if (null == obj || "object" != typeof obj)

+			return obj;

+

+		// Handle Array

+		if ('length' in obj) {

+			copy = [];

+

+			for (i = 0, len = obj.length; i < len; ++i) {

+				copy[i] = clone(obj[i]);

+			}

+

+			return copy;

+		}

+

+		// Handle Object

+		copy = {};

+		for (attr in obj) {

+			if (obj.hasOwnProperty(attr))

+				copy[attr] = clone(obj[attr]);

+		}

+

+		return copy;

+	}

+

 	function getVal(id) {

 		var elm = get(id);

 

@@ -20,17 +47,18 @@
 		return elm.value;

 	}

 

-	function setVal(id, value) {

+	function setVal(id, value, name) {

 		if (typeof(value) != 'undefined') {

 			var elm = get(id);

 

 			if (elm.nodeName == "SELECT")

 				selectByValue(document.forms[0], id, value);

 			else if (elm.type == "checkbox") {

-				if (typeof(value) == 'string')

-					elm.checked = value.toLowerCase() === 'true' ? true : false;

-				else

-					elm.checked = !!value;

+				if (typeof(value) == 'string') {

+					value = value.toLowerCase();

+					value = (!name && value === 'true') || (name && value === name.toLowerCase());

+				}

+				elm.checked = !!value;

 			} else

 				elm.value = value;

 		}

@@ -46,8 +74,10 @@
 			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

 			get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');

 			get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

-			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource1','video_altsource1','media','media');

-			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource2','video_altsource2','media','media');

+			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource1','video_altsource1','media','media');

+			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');

+			get('audio_altsource1_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource1','audio_altsource1','media','media');

+			get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');

 			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');

 

 			html = this.getMediaListHTML('medialist', 'src', 'media', 'media');

@@ -59,18 +89,28 @@
 			if (isVisible('filebrowser'))

 				get('src').style.width = '230px';

 

-			if (isVisible('filebrowser_altsource1'))

+			if (isVisible('video_filebrowser_altsource1'))

 				get('video_altsource1').style.width = '220px';

 

-			if (isVisible('filebrowser_altsource2'))

+			if (isVisible('video_filebrowser_altsource2'))

 				get('video_altsource2').style.width = '220px';

 

+			if (isVisible('audio_filebrowser_altsource1'))

+				get('audio_altsource1').style.width = '220px';

+

+			if (isVisible('audio_filebrowser_altsource2'))

+				get('audio_altsource2').style.width = '220px';

+

 			if (isVisible('filebrowser_poster'))

 				get('video_poster').style.width = '220px';

 

-			this.data = tinyMCEPopup.getWindowArg('data');

+			editor.dom.setOuterHTML(get('media_type'), this.getMediaTypeHTML(editor));

+

+			this.data = clone(tinyMCEPopup.getWindowArg('data'));

 			this.dataToForm();

 			this.preview();

+

+			updateColor('bgcolor_pick', 'bgcolor');

 		},

 

 		insert : function() {

@@ -88,7 +128,7 @@
 		},

 

 		moveStates : function(to_form, field) {

-			var data = this.data, editor = this.editor, data = this.data,

+			var data = this.data, editor = this.editor,

 				mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;

 

 			defaultStates = {

@@ -136,7 +176,7 @@
 

 						if (type == 'global')

 							list = data;

-						else if (type == 'video') {

+						else if (type == 'video' || type == 'audio') {

 							list = data.video.attrs;

 

 							if (!list && !to_form)

@@ -146,12 +186,12 @@
 

 						if (list) {

 							if (to_form) {

-								setVal(formItemName, list[name]);

+								setVal(formItemName, list[name], type == 'video' || type == 'audio' ? name : '');

 							} else {

 								delete list[name];

 

 								value = getVal(formItemName);

-								if (type == 'video' && value === true)

+								if ((type == 'video' || type == 'audio') && value === true)

 									value = name;

 

 								if (defaultStates[formItemName]) {

@@ -184,7 +224,7 @@
 					setVal('media_type', data.type);

 				}

 

-				if (data.type == "video") {

+				if (data.type == "video" || data.type == "audio") {

 					if (!data.video.sources)

 						data.video.sources = [];

 

@@ -194,11 +234,13 @@
 

 			// Hide all fieldsets and show the one active

 			get('video_options').style.display = 'none';

+			get('audio_options').style.display = 'none';

 			get('flash_options').style.display = 'none';

 			get('quicktime_options').style.display = 'none';

 			get('shockwave_options').style.display = 'none';

 			get('windowsmedia_options').style.display = 'none';

 			get('realmedia_options').style.display = 'none';

+			get('embeddedaudio_options').style.display = 'none';

 

 			if (get(data.type + '_options'))

 				get(data.type + '_options').style.display = 'block';

@@ -210,7 +252,9 @@
 			setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');

 			setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');

 			setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');

-			setOptions('video', 'poster,autoplay,loop,preload,controls');

+			setOptions('video', 'poster,autoplay,loop,muted,preload,controls');

+			setOptions('audio', 'autoplay,loop,preload,controls');

+			setOptions('embeddedaudio', 'autoplay,loop,controls');

 			setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');

 

 			if (to_form) {

@@ -225,12 +269,23 @@
 					src = data.video.sources[2];

 					if (src)

 						setVal('video_altsource2', src.src);

+                } else if (data.type == 'audio') {

+                    if (data.video.sources[0])

+                        setVal('src', data.video.sources[0].src);

+                    

+                    src = data.video.sources[1];

+                    if (src)

+                        setVal('audio_altsource1', src.src);

+                    

+                    src = data.video.sources[2];

+                    if (src)

+                        setVal('audio_altsource2', src.src);

 				} else {

 					// Check flash vars

 					if (data.type == 'flash') {

 						tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {

 							if (value == '$url')

-								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;

+								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src || '';

 						});

 					}

 

@@ -238,7 +293,18 @@
 				}

 			} else {

 				src = getVal("src");

-	

+

+				// YouTube *NEW*

+				if (src.match(/youtu.be\/[a-z1-9.-_]+/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+

 				// YouTube

 				if (src.match(/youtube.com(.+)v=([^&]+)/)) {

 					data.width = 425;

@@ -273,12 +339,25 @@
 					src = getVal("video_altsource2");

 					if (src)

 						data.video.sources[2] = {src : src};

+                } else if (data.type == 'audio') {

+                    if (!data.video.sources)

+                        data.video.sources = [];

+                    

+                    data.video.sources[0] = {src : src};

+                    

+                    src = getVal("audio_altsource1");

+                    if (src)

+                        data.video.sources[1] = {src : src};

+                    

+                    src = getVal("audio_altsource2");

+                    if (src)

+                        data.video.sources[2] = {src : src};

 				} else

 					data.params.src = src;

 

 				// Set default size

-				setVal('width', data.width || 320);

-				setVal('height', data.height || 240);

+                setVal('width', data.width || (data.type == 'audio' ? 300 : 320));

+                setVal('height', data.height || (data.type == 'audio' ? 32 : 240));

 			}

 		},

 

@@ -296,7 +375,7 @@
 				this.panel = 'source';

 			} else {

 				if (this.panel == 'source') {

-					this.data = this.editor.plugins.media.htmlToData(getVal('source'));

+					this.data = clone(this.editor.plugins.media.htmlToData(getVal('source')));

 					this.dataToForm();

 					this.panel = '';

 				}

@@ -307,16 +386,16 @@
 		},

 

 		beforeResize : function() {

-			this.width = parseInt(getVal('width') || "320", 10);

-			this.height = parseInt(getVal('height') || "240", 10);

+            this.width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);

+            this.height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);

 		},

 

 		changeSize : function(type) {

 			var width, height, scale, size;

 

 			if (get('constrain').checked) {

-				width = parseInt(getVal('width') || "320", 10);

-				height = parseInt(getVal('height') || "240", 10);

+                width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);

+                height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);

 

 				if (type == 'width') {

 					this.height = Math.round((width / this.width) * height);

@@ -344,6 +423,26 @@
 			}

 

 			return "";

+		},

+

+		getMediaTypeHTML : function(editor) {

+			var html = "";

+			html += '<select id="media_type" name="media_type" onchange="Media.formToData(\'type\');">';

+			html += '<option value="video">HTML5 Video</option>';

+			html += '<option value="audio">HTML5 Audio</option>';

+			html += '<option value="flash">Flash</option>';

+			html += '<option value="quicktime">QuickTime</option>';

+			html += '<option value="shockwave">Shockwave</option>';

+			html += '<option value="windowsmedia">Windows Media</option>';

+			html += '<option value="realmedia">Real Media</option>';

+			html += '<option value="iframe">Iframe</option>';

+

+			if (editor.getParam('media_embedded_audio', false)) {

+				html += '<option value="embeddedaudio">Embedded Audio</option>';

+			}

+			

+			html += '</select>';

+			return html;

 		}

 	};

 

@@ -351,4 +450,4 @@
 	tinyMCEPopup.onInit.add(function() {

 		Media.init();

 	});

-})();
\ No newline at end of file
+})();