X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..a9fa37e08fa731c7bd108a175c24876823bc071b:/wp-includes/js/tinymce/plugins/media/plugin.js

diff --git a/wp-includes/js/tinymce/plugins/media/plugin.js b/wp-includes/js/tinymce/plugins/media/plugin.js
index 10d4b0b8..21a2c8cf 100644
--- a/wp-includes/js/tinymce/plugins/media/plugin.js
+++ b/wp-includes/js/tinymce/plugins/media/plugin.js
@@ -14,11 +14,13 @@
 
 tinymce.PluginManager.add('media', function(editor, url) {
 	var urlPatterns = [
-		{regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$1'},
-		{regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 425, h: 350, url: '//www.youtube.com/embed/$2'},
-		{regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc'},
-		{regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "//player.vimeo.com/video/$2?title=0&byline=0"},
-		{regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: '//maps.google.com/maps/ms?msid=$2&output=embed"'}
+		{regex: /youtu\.be\/([\w\-.]+)/, type: 'iframe', w: 560, h: 314, url: '//www.youtube.com/embed/$1', allowFullscreen: true},
+		{regex: /youtube\.com(.+)v=([^&]+)/, type: 'iframe', w: 560, h: 314, url: '//www.youtube.com/embed/$2', allowFullscreen: true},
+		{regex: /youtube.com\/embed\/([a-z0-9\-_]+)/i, type: 'iframe', w: 560, h: 314, url: '//www.youtube.com/embed/$1', allowFullscreen: true},
+		{regex: /vimeo\.com\/([0-9]+)/, type: 'iframe', w: 425, h: 350, url: '//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc', allowfullscreen: true},
+		{regex: /vimeo\.com\/(.*)\/([0-9]+)/, type: "iframe", w: 425, h: 350, url: "//player.vimeo.com/video/$2?title=0&byline=0", allowfullscreen: true},
+		{regex: /maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/, type: 'iframe', w: 425, h: 350, url: '//maps.google.com/maps/ms?msid=$2&output=embed"', allowFullscreen: false},
+		{regex: /dailymotion\.com\/video\/([^_]+)/, type: 'iframe', w: 480, h: 270, url: '//www.dailymotion.com/embed/video/$1', allowFullscreen: true}
 	];
 
 	var embedChange = (tinymce.Env.ie && tinymce.Env.ie <= 8) ? 'onChange' : 'onInput';
@@ -265,6 +267,7 @@ tinymce.PluginManager.add('media', function(editor, url) {
 
 				data.source1 = url;
 				data.type = pattern.type;
+				data.allowFullscreen = pattern.allowFullscreen;
 				data.width = data.width || pattern.w;
 				data.height = data.height || pattern.h;
 			}
@@ -288,7 +291,8 @@ tinymce.PluginManager.add('media', function(editor, url) {
 			});
 
 			if (data.type == "iframe") {
-				html += '<iframe src="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '"></iframe>';
+				var allowFullscreen = data.allowFullscreen ? ' allowFullscreen="1"' : '';
+				html += '<iframe src="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '"' + allowFullscreen + '></iframe>';
 			} else if (data.source1mime == "application/x-shockwave-flash") {
 				html += '<object data="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '" type="application/x-shockwave-flash">';
 
@@ -394,7 +398,7 @@ tinymce.PluginManager.add('media', function(editor, url) {
 			return html;
 		}
 
-		var writer = new tinymce.html.Writer();
+		var writer = new tinymce.html.Writer(), blocked;
 
 		new tinymce.html.SaxParser({
 			validate: false,
@@ -414,6 +418,8 @@ tinymce.PluginManager.add('media', function(editor, url) {
 			},
 
 			start: function(name, attrs, empty) {
+				blocked = true;
+
 				if (name == 'script' || name == 'noscript') {
 					return;
 				}
@@ -422,13 +428,18 @@ tinymce.PluginManager.add('media', function(editor, url) {
 					if (attrs[i].name.indexOf('on') === 0) {
 						return;
 					}
+
+					if (attrs[i].name == 'style') {
+						attrs[i].value = editor.dom.serializeStyle(editor.dom.parseStyle(attrs[i].value), name);
+					}
 				}
 
 				writer.start(name, attrs, empty);
+				blocked = false;
 			},
 
 			end: function(name) {
-				if (name == 'script' || name == 'noscript') {
+				if (blocked) {
 					return;
 				}
 
@@ -602,6 +613,86 @@ tinymce.PluginManager.add('media', function(editor, url) {
 		}
 	});
 
+	function retainAttributesAndInnerHtml(sourceNode, targetNode) {
+		var attrName, attrValue, attribs, ai, innerHtml;
+
+		// Prefix all attributes except width, height and style since we
+		// will add these to the placeholder
+		attribs = sourceNode.attributes;
+		ai = attribs.length;
+		while (ai--) {
+			attrName = attribs[ai].name;
+			attrValue = attribs[ai].value;
+
+			if (attrName !== "width" && attrName !== "height" && attrName !== "style") {
+				if (attrName == "data" || attrName == "src") {
+					attrValue = editor.convertURL(attrValue, attrName);
+				}
+
+				targetNode.attr('data-mce-p-' + attrName, attrValue);
+			}
+		}
+
+		// Place the inner HTML contents inside an escaped attribute
+		// This enables us to copy/paste the fake object
+		innerHtml = sourceNode.firstChild && sourceNode.firstChild.value;
+		if (innerHtml) {
+			targetNode.attr("data-mce-html", escape(innerHtml));
+			targetNode.firstChild = null;
+		}
+	}
+
+	function createPlaceholderNode(node) {
+		var placeHolder, name = node.name;
+
+		placeHolder = new tinymce.html.Node('img', 1);
+		placeHolder.shortEnded = true;
+
+		retainAttributesAndInnerHtml(node, placeHolder);
+
+		placeHolder.attr({
+			width: node.attr('width') || "300",
+			height: node.attr('height') || (name == "audio" ? "30" : "150"),
+			style: node.attr('style'),
+			src: tinymce.Env.transparentSrc,
+			"data-mce-object": name,
+			"class": "mce-object mce-object-" + name
+		});
+
+		return placeHolder;
+	}
+
+	function createPreviewNode(node) {
+		var previewWrapper, previewNode, shimNode, name = node.name;
+
+		previewWrapper = new tinymce.html.Node('span', 1);
+		previewWrapper.attr({
+			contentEditable: 'false',
+			style: node.attr('style'),
+			"data-mce-object": name,
+			"class": "mce-preview-object mce-object-" + name
+		});
+
+		retainAttributesAndInnerHtml(node, previewWrapper);
+
+		previewNode = new tinymce.html.Node(name, 1);
+		previewNode.attr({
+			src: node.attr('src'),
+			allowfullscreen: node.attr('allowfullscreen'),
+			width: node.attr('width') || "300",
+			height: node.attr('height') || (name == "audio" ? "30" : "150"),
+			frameborder: '0'
+		});
+
+		shimNode = new tinymce.html.Node('span', 1);
+		shimNode.attr('class', 'mce-shim');
+
+		previewWrapper.append(previewNode);
+		previewWrapper.append(shimNode);
+
+		return previewWrapper;
+	}
+
 	editor.on('preInit', function() {
 		// Make sure that any messy HTML is retained inside these
 		var specialElements = editor.schema.getSpecialElements();
@@ -619,9 +710,8 @@ tinymce.PluginManager.add('media', function(editor, url) {
 		});
 
 		// Converts iframe, video etc into placeholder images
-		editor.parser.addNodeFilter('iframe,video,audio,object,embed,script', function(nodes, name) {
-			var i = nodes.length, ai, node, placeHolder, attrName, attrValue, attribs, innerHtml;
-			var videoScript;
+		editor.parser.addNodeFilter('iframe,video,audio,object,embed,script', function(nodes) {
+			var i = nodes.length, node, placeHolder, videoScript;
 
 			while (i--) {
 				node = nodes[i];
@@ -629,6 +719,10 @@ tinymce.PluginManager.add('media', function(editor, url) {
 					continue;
 				}
 
+				if (node.parent.attr('data-mce-object')) {
+					continue;
+				}
+
 				if (node.name == 'script') {
 					videoScript = getVideoScriptMatch(node.attr('src'));
 					if (!videoScript) {
@@ -636,9 +730,6 @@ tinymce.PluginManager.add('media', function(editor, url) {
 					}
 				}
 
-				placeHolder = new tinymce.html.Node('img', 1);
-				placeHolder.shortEnded = true;
-
 				if (videoScript) {
 					if (videoScript.width) {
 						node.attr('width', videoScript.width.toString());
@@ -649,47 +740,19 @@ tinymce.PluginManager.add('media', function(editor, url) {
 					}
 				}
 
-				// Prefix all attributes except width, height and style since we
-				// will add these to the placeholder
-				attribs = node.attributes;
-				ai = attribs.length;
-				while (ai--) {
-					attrName = attribs[ai].name;
-					attrValue = attribs[ai].value;
-
-					if (attrName !== "width" && attrName !== "height" && attrName !== "style") {
-						if (attrName == "data" || attrName == "src") {
-							attrValue = editor.convertURL(attrValue, attrName);
-						}
-
-						placeHolder.attr('data-mce-p-' + attrName, attrValue);
-					}
-				}
-
-				// Place the inner HTML contents inside an escaped attribute
-				// This enables us to copy/paste the fake object
-				innerHtml = node.firstChild && node.firstChild.value;
-				if (innerHtml) {
-					placeHolder.attr("data-mce-html", escape(innerHtml));
-					placeHolder.firstChild = null;
+				if (node.name == 'iframe' && editor.settings.media_live_embeds !== false && tinymce.Env.ceFalse) {
+					placeHolder = createPreviewNode(node);
+				} else {
+					placeHolder = createPlaceholderNode(node);
 				}
 
-				placeHolder.attr({
-					width: node.attr('width') || "300",
-					height: node.attr('height') || (name == "audio" ? "30" : "150"),
-					style: node.attr('style'),
-					src: tinymce.Env.transparentSrc,
-					"data-mce-object": name,
-					"class": "mce-object mce-object-" + name
-				});
-
 				node.replace(placeHolder);
 			}
 		});
 
 		// Replaces placeholder images with real elements for video, object, iframe etc
 		editor.serializer.addAttributeFilter('data-mce-object', function(nodes, name) {
-			var i = nodes.length, node, realElm, ai, attribs, innerHtml, innerNode, realElmName;
+			var i = nodes.length, node, realElm, ai, attribs, innerHtml, innerNode, realElmName, className;
 
 			while (i--) {
 				node = nodes[i];
@@ -702,10 +765,18 @@ tinymce.PluginManager.add('media', function(editor, url) {
 
 				// Add width/height to everything but audio
 				if (realElmName != "audio" && realElmName != "script") {
-					realElm.attr({
-						width: node.attr('width'),
-						height: node.attr('height')
-					});
+					className = node.attr('class');
+					if (className && className.indexOf('mce-preview-object') !== -1) {
+						realElm.attr({
+							width: node.firstChild.attr('width'),
+							height: node.firstChild.attr('height')
+						});
+					} else {
+						realElm.attr({
+							width: node.attr('width'),
+							height: node.attr('height')
+						});
+					}
 				}
 
 				realElm.attr({
@@ -741,6 +812,16 @@ tinymce.PluginManager.add('media', function(editor, url) {
 		});
 	});
 
+	editor.on('click keyup', function() {
+		var selectedNode = editor.selection.getNode();
+
+		if (selectedNode && editor.dom.hasClass(selectedNode, 'mce-preview-object')) {
+			if (editor.dom.getAttrib(selectedNode, 'data-mce-selected')) {
+				selectedNode.setAttribute('data-mce-selected', '2');
+			}
+		}
+	});
+
 	editor.on('ObjectSelected', function(e) {
 		var objectType = e.target.getAttribute('data-mce-object');
 
@@ -769,7 +850,7 @@ tinymce.PluginManager.add('media', function(editor, url) {
 	editor.addButton('media', {
 		tooltip: 'Insert/edit video',
 		onclick: showDialog,
-		stateSelector: ['img[data-mce-object=video]', 'img[data-mce-object=iframe]']
+		stateSelector: ['img[data-mce-object]', 'span[data-mce-object]']
 	});
 
 	editor.addMenuItem('media', {
@@ -779,4 +860,20 @@ tinymce.PluginManager.add('media', function(editor, url) {
 		context: 'insert',
 		prependToContext: true
 	});
+
+	editor.on('setContent', function() {
+		// TODO: This shouldn't be needed there should be a way to mark bogus
+		// elements so they are never removed except external save
+		editor.$('span.mce-preview-object').each(function(index, elm) {
+			var $elm = editor.$(elm);
+
+			if ($elm.find('span.mce-shim', elm).length === 0) {
+				$elm.append('<span class="mce-shim"></span>');
+			}
+		});
+	});
+
+	editor.addCommand('mceMedia', showDialog);
+
+	this.showDialog = showDialog;
 });