TinyMCE: upgrade to 4.4.1, changelog: https://www.tinymce.com/docs/changelog/#version441-july262016.

See #37427.
Fixes #37476.
Built from https://develop.svn.wordpress.org/trunk@38155


git-svn-id: http://core.svn.wordpress.org/trunk@38096 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/js/tinymce/plugins/fullscreen/plugin.js

@@ -117,7 +117,7 @@ tinymce.PluginManager.add('fullscreen', function(editor) {
 
 	editor.addMenuItem('fullscreen', {
 		text: 'Fullscreen',
-		shortcut: 'Meta+Alt+F',
+		shortcut: 'Ctrl+Shift+F',
 		selectable: true,
 		onClick: function() {
 			toggleFullscreen();
@@ -135,7 +135,7 @@ tinymce.PluginManager.add('fullscreen', function(editor) {
 
 	editor.addButton('fullscreen', {
 		tooltip: 'Fullscreen',
-		shortcut: 'Meta+Alt+F',
+		shortcut: 'Ctrl+Alt+F',
 		onClick: toggleFullscreen,
 		onPostRender: function() {
 			var self = this;

wp-includes/js/tinymce/plugins/fullscreen/plugin.min.js

@@ -1 +1 @@
-tinymce.PluginManager.add("fullscreen",function(a){function b(){var a,b,c=window,d=document,e=d.body;return e.offsetWidth&&(a=e.offsetWidth,b=e.offsetHeight),c.innerWidth&&c.innerHeight&&(a=c.innerWidth,b=c.innerHeight),{w:a,h:b}}function c(){var a=tinymce.DOM.getViewPort();return{x:a.x,y:a.y}}function d(a){scrollTo(a.x,a.y)}function e(){function e(){m.setStyle(p,"height",b().h-(o.clientHeight-p.clientHeight))}var n,o,p,q,r=document.body,s=document.documentElement;l=!l,o=a.getContainer(),n=o.style,p=a.getContentAreaContainer().firstChild,q=p.style,l?(k=c(),f=q.width,g=q.height,q.width=q.height="100%",i=n.width,j=n.height,n.width=n.height="",m.addClass(r,"mce-fullscreen"),m.addClass(s,"mce-fullscreen"),m.addClass(o,"mce-fullscreen"),m.bind(window,"resize",e),e(),h=e):(q.width=f,q.height=g,i&&(n.width=i),j&&(n.height=j),m.removeClass(r,"mce-fullscreen"),m.removeClass(s,"mce-fullscreen"),m.removeClass(o,"mce-fullscreen"),m.unbind(window,"resize",h),d(k)),a.fire("FullscreenStateChanged",{state:l})}var f,g,h,i,j,k,l=!1,m=tinymce.DOM;return a.settings.inline?void 0:(a.on("init",function(){a.addShortcut("Ctrl+Shift+F","",e)}),a.on("remove",function(){h&&m.unbind(window,"resize",h)}),a.addCommand("mceFullScreen",e),a.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Meta+Alt+F",selectable:!0,onClick:function(){e(),a.focus()},onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})},context:"view"}),a.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Meta+Alt+F",onClick:e,onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})}}),{isFullscreen:function(){return l}})});
+tinymce.PluginManager.add("fullscreen",function(a){function b(){var a,b,c=window,d=document,e=d.body;return e.offsetWidth&&(a=e.offsetWidth,b=e.offsetHeight),c.innerWidth&&c.innerHeight&&(a=c.innerWidth,b=c.innerHeight),{w:a,h:b}}function c(){var a=tinymce.DOM.getViewPort();return{x:a.x,y:a.y}}function d(a){scrollTo(a.x,a.y)}function e(){function e(){m.setStyle(p,"height",b().h-(o.clientHeight-p.clientHeight))}var n,o,p,q,r=document.body,s=document.documentElement;l=!l,o=a.getContainer(),n=o.style,p=a.getContentAreaContainer().firstChild,q=p.style,l?(k=c(),f=q.width,g=q.height,q.width=q.height="100%",i=n.width,j=n.height,n.width=n.height="",m.addClass(r,"mce-fullscreen"),m.addClass(s,"mce-fullscreen"),m.addClass(o,"mce-fullscreen"),m.bind(window,"resize",e),e(),h=e):(q.width=f,q.height=g,i&&(n.width=i),j&&(n.height=j),m.removeClass(r,"mce-fullscreen"),m.removeClass(s,"mce-fullscreen"),m.removeClass(o,"mce-fullscreen"),m.unbind(window,"resize",h),d(k)),a.fire("FullscreenStateChanged",{state:l})}var f,g,h,i,j,k,l=!1,m=tinymce.DOM;return a.settings.inline?void 0:(a.on("init",function(){a.addShortcut("Ctrl+Shift+F","",e)}),a.on("remove",function(){h&&m.unbind(window,"resize",h)}),a.addCommand("mceFullScreen",e),a.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Ctrl+Shift+F",selectable:!0,onClick:function(){e(),a.focus()},onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})},context:"view"}),a.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Ctrl+Alt+F",onClick:e,onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})}}),{isFullscreen:function(){return l}})});

wp-includes/js/tinymce/plugins/lists/plugin.js

@@ -613,6 +613,9 @@ tinymce.PluginManager.add('lists', function(editor) {
 				var hasCompatibleStyle = function (sib) {
 					var sibStyle = dom.getStyle(sib, 'list-style-type');
 					var detailStyle = detail ? detail['list-style-type'] : '';
+
+					detailStyle = detailStyle === null ? '' : detailStyle;
+
 					return sibStyle === detailStyle;
 				};
 

wp-includes/js/tinymce/plugins/paste/plugin.js

@@ -268,12 +268,12 @@ define("tinymce/pasteplugin/SmartPaste", [
 	};
 
 	var isImageUrl = function (url) {
-		return isAbsoluteUrl(url) && /.(gif|jpe?g|jpng)$/.test(url);
+		return isAbsoluteUrl(url) && /.(gif|jpe?g|png)$/.test(url);
 	};
 
 	var createImage = function (editor, url, pasteHtml) {
 		editor.undoManager.extra(function () {
-			pasteHtml(url);
+			pasteHtml(editor, url);
 		}, function () {
 			editor.insertContent('<img src="' + url + '">');
 		});
@@ -283,7 +283,7 @@ define("tinymce/pasteplugin/SmartPaste", [
 
 	var createLink = function (editor, url, pasteHtml) {
 		editor.undoManager.extra(function () {
-			pasteHtml(url);
+			pasteHtml(editor, url);
 		}, function () {
 			editor.execCommand('mceInsertLink', false, url);
 		});
@@ -299,29 +299,33 @@ define("tinymce/pasteplugin/SmartPaste", [
 		return isImageUrl(html) ? createImage(editor, html, pasteHtml) : false;
 	};
 
-	var insertContent = function (editor, html) {
+	var pasteHtml = function (editor, html) {
-		var pasteHtml = function (html) {
+		editor.insertContent(html, {
-			editor.insertContent(html, {
+			merge: editor.settings.paste_merge_formats !== false,
-				merge: editor.settings.paste_merge_formats !== false,
+			paste: true
-				paste: true
+		});
-			});
 
-			return true;
+		return true;
-		};
+	};
-
-		var fallback = function (editor, html) {
-			pasteHtml(html);
-		};
 
+	var smartInsertContent = function (editor, html) {
 		Tools.each([
 			linkSelection,
 			insertImage,
-			fallback
+			pasteHtml
 		], function (action) {
 			return action(editor, html, pasteHtml) !== true;
 		});
 	};
 
+	var insertContent = function (editor, html) {
+		if (editor.settings.smart_paste === false) {
+			pasteHtml(editor, html);
+		} else {
+			smartInsertContent(editor, html);
+		}
+	};
+
 	return {
 		isImageUrl: isImageUrl,
 		isAbsoluteUrl: isAbsoluteUrl,

wp-includes/js/tinymce/themes/inlite/theme.js

@@ -592,8 +592,13 @@ define('tinymce/inlite/core/UrlType', [
 		return /^www\.|\.(com|org|edu|gov|uk|net|ca|de|jp|fr|au|us|ru|ch|it|nl|se|no|es|mil)$/i.test(href.trim());
 	};
 
+	var isAbsolute = function (href) {
+		return /^https?:\/\//.test(href.trim());
+	};
+
 	return {
-		isDomainLike: isDomainLike
+		isDomainLike: isDomainLike,
+		isAbsolute: isAbsolute
 	};
 });
 
@@ -658,7 +663,7 @@ define('tinymce/inlite/ui/Forms', [
 	};
 
 	var convertLinkToAbsolute = function (editor, href) {
-		return UrlType.isDomainLike(href) ? askAboutPrefix(editor, href) : Promise.resolve(href);
+		return !UrlType.isAbsolute(href) && UrlType.isDomainLike(href) ? askAboutPrefix(editor, href) : Promise.resolve(href);
 	};
 
 	var createQuickLinkForm = function (editor, hide) {
@@ -767,36 +772,27 @@ define('tinymce/inlite/core/Measure', [
 		};
 	};
 
+	var measureElement = function (elm) {
+		var clientRect = elm.getBoundingClientRect();
+
+		return toAbsolute({
+			x: clientRect.left,
+			y: clientRect.top,
+			w: Math.max(elm.clientWidth, elm.offsetWidth),
+			h: Math.max(elm.clientHeight, elm.offsetHeight)
+		});
+	};
+
 	var getElementRect = function (editor, elm) {
-		var pos, targetRect, root;
+		return measureElement(elm);
-
-		pos = DOM.getPos(editor.getContentAreaContainer());
-		targetRect = editor.dom.getRect(elm);
-		root = editor.dom.getRoot();
-
-		// Adjust targetPos for scrolling in the editor
-		if (root.nodeName == 'BODY') {
-			targetRect.x -= root.ownerDocument.documentElement.scrollLeft || root.scrollLeft;
-			targetRect.y -= root.ownerDocument.documentElement.scrollTop || root.scrollTop;
-		}
-
-		targetRect.x += pos.x;
-		targetRect.y += pos.y;
-
-		// We need to use these instead of the rect values since the style
-		// size properites might not be the same as the real size for a table
-		targetRect.w = elm.clientWidth > 0 ? elm.clientWidth : elm.offsetWidth;
-		targetRect.h = elm.clientHeight > 0 ? elm.clientHeight : elm.offsetHeight;
-
-		return targetRect;
 	};
 
 	var getPageAreaRect = function (editor) {
-		return DOM.getRect(editor.getElement().ownerDocument.body);
+		return measureElement(editor.getElement().ownerDocument.body);
 	};
 
 	var getContentAreaRect = function (editor) {
-		return toAbsolute(DOM.getRect(editor.getContentAreaContainer() || editor.getBody()));
+		return measureElement(editor.getContentAreaContainer() || editor.getBody());
 	};
 
 	var getSelectionRect = function (editor) {
@@ -927,138 +923,103 @@ define('tinymce/inlite/ui/Panel', [
 	'tinymce/inlite/core/Measure',
 	'tinymce/inlite/core/Layout'
 ], function (Tools, Factory, DOM, Toolbar, Forms, Measure, Layout) {
-	var DEFAULT_TEXT_SELECTION_ITEMS = 'bold italic | quicklink h2 h3 blockquote';
+	return function () {
-	var DEFAULT_INSERT_TOOLBAR_ITEMS = 'quickimage quicktable';
+		var DEFAULT_TEXT_SELECTION_ITEMS = 'bold italic | quicklink h2 h3 blockquote';
-	var panel, currentRect;
+		var DEFAULT_INSERT_TOOLBAR_ITEMS = 'quickimage quicktable';
+		var panel, currentRect;
 
-	var createToolbars = function (editor, toolbars) {
+		var createToolbars = function (editor, toolbars) {
-		return Tools.map(toolbars, function (toolbar) {
+			return Tools.map(toolbars, function (toolbar) {
-			return Toolbar.create(editor, toolbar.id, toolbar.items);
+				return Toolbar.create(editor, toolbar.id, toolbar.items);
-		});
-	};
-
-	var getTextSelectionToolbarItems = function (settings) {
-		var value = settings.selection_toolbar;
-		return value ? value : DEFAULT_TEXT_SELECTION_ITEMS;
-	};
-
-	var getInsertToolbarItems = function (settings) {
-		var value = settings.insert_toolbar;
-		return value ? value : DEFAULT_INSERT_TOOLBAR_ITEMS;
-	};
-
-	var create = function (editor, toolbars) {
-		var items, settings = editor.settings;
-
-		items = createToolbars(editor, toolbars);
-		items = items.concat([
-			Toolbar.create(editor, 'text', getTextSelectionToolbarItems(settings)),
-			Toolbar.create(editor, 'insert', getInsertToolbarItems(settings)),
-			Forms.createQuickLinkForm(editor, hide)
-		]);
-
-		return Factory.create({
-			type: 'floatpanel',
-			role: 'dialog',
-			classes: 'tinymce tinymce-inline arrow',
-			ariaLabel: 'Inline toolbar',
-			layout: 'flex',
-			direction: 'column',
-			align: 'stretch',
-			autohide: false,
-			autofix: true,
-			fixed: true,
-			border: 1,
-			items: items,
-			oncancel: function() {
-				editor.focus();
-			}
-		});
-	};
-
-	var showPanel = function (panel) {
-		if (panel) {
-			panel.show();
-		}
-	};
-
-	var movePanelTo = function (panel, pos) {
-		panel.moveTo(pos.x, pos.y);
-	};
-
-	var togglePositionClass = function (panel, relPos) {
-		relPos = relPos ? relPos.substr(0, 2) : '';
-
-		Tools.each({
-			t: 'down',
-			b: 'up',
-			c: 'center'
-		}, function(cls, pos) {
-			panel.classes.toggle('arrow-' + cls, pos === relPos.substr(0, 1));
-		});
-
-		if (relPos === 'cr') {
-			panel.classes.toggle('arrow-left', true);
-			panel.classes.toggle('arrow-right', false);
-		} else if (relPos === 'cl') {
-			panel.classes.toggle('arrow-left', true);
-			panel.classes.toggle('arrow-right', true);
-		} else {
-			Tools.each({
-				l: 'left',
-				r: 'right'
-			}, function(cls, pos) {
-				panel.classes.toggle('arrow-' + cls, pos === relPos.substr(1, 1));
 			});
-		}
+		};
-	};
 
-	var showToolbar = function (panel, id) {
+		var getTextSelectionToolbarItems = function (settings) {
-		var toolbars = panel.items().filter('#' + id);
+			var value = settings.selection_toolbar;
+			return value ? value : DEFAULT_TEXT_SELECTION_ITEMS;
+		};
 
-		if (toolbars.length > 0) {
+		var getInsertToolbarItems = function (settings) {
-			toolbars[0].show();
+			var value = settings.insert_toolbar;
-			panel.reflow();
+			return value ? value : DEFAULT_INSERT_TOOLBAR_ITEMS;
-		}
+		};
-	};
 
-	var showPanelAt = function (panel, id, editor, targetRect) {
+		var create = function (editor, toolbars) {
-		var contentAreaRect, panelRect, result, userConstainHandler;
+			var items, settings = editor.settings;
 
-		showPanel(panel);
+			items = createToolbars(editor, toolbars);
-		panel.items().hide();
+			items = items.concat([
-		showToolbar(panel, id);
+				Toolbar.create(editor, 'text', getTextSelectionToolbarItems(settings)),
+				Toolbar.create(editor, 'insert', getInsertToolbarItems(settings)),
+				Forms.createQuickLinkForm(editor, hide)
+			]);
 
-		userConstainHandler = editor.settings.inline_toolbar_position_handler;
+			return Factory.create({
-		contentAreaRect = Measure.getContentAreaRect(editor);
+				type: 'floatpanel',
-		panelRect = DOM.getRect(panel.getEl());
+				role: 'dialog',
+				classes: 'tinymce tinymce-inline arrow',
+				ariaLabel: 'Inline toolbar',
+				layout: 'flex',
+				direction: 'column',
+				align: 'stretch',
+				autohide: false,
+				autofix: true,
+				fixed: true,
+				border: 1,
+				items: items,
+				oncancel: function() {
+					editor.focus();
+				}
+			});
+		};
 
-		if (id === 'insert') {
+		var showPanel = function (panel) {
-			result = Layout.calcInsert(targetRect, contentAreaRect, panelRect);
+			if (panel) {
-		} else {
+				panel.show();
-			result = Layout.calc(targetRect, contentAreaRect, panelRect);
+			}
-		}
+		};
 
-		if (result) {
+		var movePanelTo = function (panel, pos) {
-			panelRect = result.rect;
+			panel.moveTo(pos.x, pos.y);
-			currentRect = targetRect;
+		};
-			movePanelTo(panel, Layout.userConstrain(userConstainHandler, targetRect, contentAreaRect, panelRect));
 
-			togglePositionClass(panel, result.position);
+		var togglePositionClass = function (panel, relPos) {
-		} else {
+			relPos = relPos ? relPos.substr(0, 2) : '';
-			hide(panel);
-		}
-	};
 
-	var hasFormVisible = function () {
+			Tools.each({
-		return panel.items().filter('form:visible').length > 0;
+				t: 'down',
-	};
+				b: 'up',
+				c: 'center'
+			}, function(cls, pos) {
+				panel.classes.toggle('arrow-' + cls, pos === relPos.substr(0, 1));
+			});
 
-	var showForm = function (editor, id) {
+			if (relPos === 'cr') {
-		if (panel) {
+				panel.classes.toggle('arrow-left', true);
-			panel.items().hide();
+				panel.classes.toggle('arrow-right', false);
-			showToolbar(panel, id);
+			} else if (relPos === 'cl') {
+				panel.classes.toggle('arrow-left', true);
+				panel.classes.toggle('arrow-right', true);
+			} else {
+				Tools.each({
+					l: 'left',
+					r: 'right'
+				}, function(cls, pos) {
+					panel.classes.toggle('arrow-' + cls, pos === relPos.substr(1, 1));
+				});
+			}
+		};
 
+		var showToolbar = function (panel, id) {
+			var toolbars = panel.items().filter('#' + id);
+
+			if (toolbars.length > 0) {
+				toolbars[0].show();
+				panel.reflow();
+			}
+		};
+
+		var showPanelAt = function (panel, id, editor, targetRect) {
 			var contentAreaRect, panelRect, result, userConstainHandler;
 
 			showPanel(panel);
@@ -1069,59 +1030,96 @@ define('tinymce/inlite/ui/Panel', [
 			contentAreaRect = Measure.getContentAreaRect(editor);
 			panelRect = DOM.getRect(panel.getEl());
 
-			result = Layout.calc(currentRect, contentAreaRect, panelRect);
+			if (id === 'insert') {
+				result = Layout.calcInsert(targetRect, contentAreaRect, panelRect);
+			} else {
+				result = Layout.calc(targetRect, contentAreaRect, panelRect);
+			}
 
 			if (result) {
 				panelRect = result.rect;
-				movePanelTo(panel, Layout.userConstrain(userConstainHandler, currentRect, contentAreaRect, panelRect));
+				currentRect = targetRect;
+				movePanelTo(panel, Layout.userConstrain(userConstainHandler, targetRect, contentAreaRect, panelRect));
 
 				togglePositionClass(panel, result.position);
+			} else {
+				hide(panel);
 			}
-		}
+		};
-	};
 
-	var show = function (editor, id, targetRect, toolbars) {
+		var hasFormVisible = function () {
-		if (!panel) {
+			return panel.items().filter('form:visible').length > 0;
-			panel = create(editor, toolbars);
+		};
-			panel.renderTo(document.body).reflow().moveTo(targetRect.x, targetRect.y);
-			editor.nodeChanged();
-		}
 
-		showPanelAt(panel, id, editor, targetRect);
+		var showForm = function (editor, id) {
-	};
+			if (panel) {
+				panel.items().hide();
+				showToolbar(panel, id);
 
-	var hide = function () {
+				var contentAreaRect, panelRect, result, userConstainHandler;
-		if (panel) {
-			panel.hide();
-		}
-	};
 
-	var focus = function () {
+				showPanel(panel);
-		if (panel) {
+				panel.items().hide();
-			panel.find('toolbar:visible').eq(0).each(function (item) {
+				showToolbar(panel, id);
-				item.focus(true);
-			});
-		}
-	};
 
-	var remove = function () {
+				userConstainHandler = editor.settings.inline_toolbar_position_handler;
-		if (panel) {
+				contentAreaRect = Measure.getContentAreaRect(editor);
-			panel.remove();
+				panelRect = DOM.getRect(panel.getEl());
-			panel = null;
-		}
-	};
 
-	var inForm = function () {
+				result = Layout.calc(currentRect, contentAreaRect, panelRect);
-		return panel && panel.visible() && hasFormVisible();
-	};
 
-	return {
+				if (result) {
-		show: show,
+					panelRect = result.rect;
-		showForm: showForm,
+					movePanelTo(panel, Layout.userConstrain(userConstainHandler, currentRect, contentAreaRect, panelRect));
-		inForm: inForm,
+
-		hide: hide,
+					togglePositionClass(panel, result.position);
-		focus: focus,
+				}
-		remove: remove
+			}
+		};
+
+		var show = function (editor, id, targetRect, toolbars) {
+			if (!panel) {
+				panel = create(editor, toolbars);
+				panel.renderTo(document.body).reflow().moveTo(targetRect.x, targetRect.y);
+				editor.nodeChanged();
+			}
+
+			showPanelAt(panel, id, editor, targetRect);
+		};
+
+		var hide = function () {
+			if (panel) {
+				panel.hide();
+			}
+		};
+
+		var focus = function () {
+			if (panel) {
+				panel.find('toolbar:visible').eq(0).each(function (item) {
+					item.focus(true);
+				});
+			}
+		};
+
+		var remove = function () {
+			if (panel) {
+				panel.remove();
+				panel = null;
+			}
+		};
+
+		var inForm = function () {
+			return panel && panel.visible() && hasFormVisible();
+		};
+
+		return {
+			show: show,
+			showForm: showForm,
+			inForm: inForm,
+			hide: hide,
+			focus: focus,
+			remove: remove
+		};
 	};
 });
 
@@ -1238,13 +1236,13 @@ define('tinymce/inlite/ui/Buttons', [
 		}
 	};
 
-	var addToEditor = function (editor) {
+	var addToEditor = function (editor, panel) {
 		editor.addButton('quicklink', {
 			icon: 'link',
 			tooltip: 'Insert/Edit link',
 			stateSelector: 'a[href]',
 			onclick: function () {
-				Panel.showForm(editor, 'quicklink');
+				panel.showForm(editor, 'quicklink');
 			}
 		});
 
@@ -1266,7 +1264,7 @@ define('tinymce/inlite/ui/Buttons', [
 			icon: 'table',
 			tooltip: 'Insert table',
 			onclick: function () {
-				Panel.hide();
+				panel.hide();
 				Actions.insertTable(editor, 2, 2);
 			}
 		});
@@ -1591,11 +1589,16 @@ define('tinymce/inlite/Theme', [
 		return result && result.rect ? result : null;
 	};
 
-	var togglePanel = function (editor) {
+	var togglePanel = function (editor, panel) {
 		var toggle = function () {
 			var toolbars = getToolbars(editor);
 			var result = findMatchResult(editor, toolbars);
-			result ? Panel.show(editor, result.id, result.rect, toolbars) : Panel.hide();
+
+			if (result) {
+				panel.show(editor, result.id, result.rect, toolbars);
+			} else {
+				panel.hide();
+			}
 		};
 
 		return function () {
@@ -1605,28 +1608,28 @@ define('tinymce/inlite/Theme', [
 		};
 	};
 
-	var ignoreWhenFormIsVisible = function (f) {
+	var ignoreWhenFormIsVisible = function (panel, f) {
 		return function () {
-			if (!Panel.inForm()) {
+			if (!panel.inForm()) {
 				f();
 			}
 		};
 	};
 
-	var bindContextualToolbarsEvents = function (editor) {
+	var bindContextualToolbarsEvents = function (editor, panel) {
-		var throttledTogglePanel = Delay.throttle(togglePanel(editor), 0);
+		var throttledTogglePanel = Delay.throttle(togglePanel(editor, panel), 0);
-		var throttledTogglePanelWhenNotInForm = Delay.throttle(ignoreWhenFormIsVisible(togglePanel(editor)), 0);
+		var throttledTogglePanelWhenNotInForm = Delay.throttle(ignoreWhenFormIsVisible(panel, togglePanel(editor, panel)), 0);
 
-		editor.on('blur hide ObjectResizeStart', Panel.hide);
+		editor.on('blur hide ObjectResizeStart', panel.hide);
 		editor.on('click', throttledTogglePanel);
 		editor.on('nodeChange mouseup', throttledTogglePanelWhenNotInForm);
 		editor.on('ResizeEditor ResizeWindow keyup', throttledTogglePanel);
-		editor.on('remove', Panel.remove);
+		editor.on('remove', panel.remove);
 
-		editor.shortcuts.add('Alt+F10', '', Panel.focus);
+		editor.shortcuts.add('Alt+F10', '', panel.focus);
 	};
 
-	var overrideLinkShortcut = function (editor) {
+	var overrideLinkShortcut = function (editor, panel) {
 		editor.shortcuts.remove('meta+k');
 		editor.shortcuts.add('meta+k', '', function () {
 			var toolbars = getToolbars(editor);
@@ -1635,17 +1638,17 @@ define('tinymce/inlite/Theme', [
 			]);
 
 			if (result) {
-				Panel.show(editor, result.id, result.rect, toolbars);
+				panel.show(editor, result.id, result.rect, toolbars);
 			}
 		});
 	};
 
-	var renderInlineUI = function (editor) {
+	var renderInlineUI = function (editor, panel) {
 		var skinName = editor.settings.skin || 'lightgray';
 
 		SkinLoader.load(editor, skinName, function () {
-			bindContextualToolbarsEvents(editor);
+			bindContextualToolbarsEvents(editor, panel);
-			overrideLinkShortcut(editor);
+			overrideLinkShortcut(editor, panel);
 		});
 
 		return {};
@@ -1656,10 +1659,12 @@ define('tinymce/inlite/Theme', [
 	};
 
 	ThemeManager.add('inlite', function (editor) {
-		Buttons.addToEditor(editor);
+		var panel = new Panel();
+
+		Buttons.addToEditor(editor, panel);
 
 		var renderUI = function () {
-			return editor.inline ? renderInlineUI(editor) : fail('inlite theme only supports inline mode.');
+			return editor.inline ? renderInlineUI(editor, panel) : fail('inlite theme only supports inline mode.');
 		};
 
 		return {

wp-includes/js/tinymce/themes/modern/theme.js

@@ -848,7 +848,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 		// Add statusbar if needed
 		if (settings.statusbar !== false) {
 			panel.add({type: 'panel', name: 'statusbar', classes: 'statusbar', layout: 'flow', border: '1 0 0 0', ariaRoot: true, items: [
-				{type: 'elementpath'},
+				{type: 'elementpath', editor: editor},
 				resizeHandleCtrl
 			]});
 		}

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta4-38154';
+$wp_version = '4.6-beta4-38155';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
@@ -18,7 +18,7 @@ $wp_db_version = 37965;
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '4400-20160711';
+$tinymce_version = '4401-20160726';
 
 /**
  * Holds the required PHP version