upgraded TinyMCE to 3.4.7

1 files changed, 27 insertions, 16 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 c4ec45303..45d88fe1b 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
@@ -66,9 +66,9 @@
 

 	window.Media = {

 		init : function() {

-			var html, editor;

+			var html, editor, self = this;

 

-			this.editor = editor = tinyMCEPopup.editor;

+			self.editor = editor = tinyMCEPopup.editor;

 

 			// Setup file browsers and color pickers

 			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

@@ -80,7 +80,7 @@
 			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');

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

 			if (html == "")

 				get("linklistrow").style.display = 'none';

 			else

@@ -104,11 +104,12 @@
 			if (isVisible('filebrowser_poster'))

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

 

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

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

 

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

-			this.dataToForm();

-			this.preview();

+			self.setDefaultDialogSettings(editor);

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

+			self.dataToForm();

+			self.preview();

 

 			updateColor('bgcolor_pick', 'bgcolor');

 		},

@@ -426,23 +427,33 @@
 		},

 

 		getMediaTypeHTML : function(editor) {

+			function option(media_type){

+				return '<option value="'+media_type+'">'+tinyMCEPopup.editor.translate("media_dlg."+media_type)+'</option>'

+			}

 			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>';

+			html += option("video");

+			html += option("audio");

+			html += option("flash");

+			html += option("quicktime");

+			html += option("shockwave");

+			html += option("windowsmedia");

+			html += option("realmedia");

+			html += option("iframe");

 

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

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

+				html += option('embeddedaudio');

 			}

 			

 			html += '</select>';

 			return html;

+		},

+

+		setDefaultDialogSettings : function(editor) {

+			var defaultDialogSettings = editor.getParam("media_dialog_defaults", {});

+			tinymce.each(defaultDialogSettings, function(v, k) {

+				setVal(k, v);

+			});

 		}

 	};