X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/dc1231b7312fbdca99e9e887cc2bb35a28f85cdc..refs/tags/wordpress-4.4:/wp-includes/js/tinymce/themes/modern/theme.js

diff --git a/wp-includes/js/tinymce/themes/modern/theme.js b/wp-includes/js/tinymce/themes/modern/theme.js
index f94e37d3..774f0122 100644
--- a/wp-includes/js/tinymce/themes/modern/theme.js
+++ b/wp-includes/js/tinymce/themes/modern/theme.js
@@ -41,8 +41,8 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			function bindSelectorChanged() {
 				var selection = editor.selection;
 
-				if (itemName == "bullist") {
-					selection.selectorChanged('ul > li', function(state, args) {
+				function setActiveItem(name) {
+					return function(state, args) {
 						var nodeName, i = args.parents.length;
 
 						while (i--) {
@@ -52,23 +52,16 @@ tinymce.ThemeManager.add('modern', function(editor) {
 							}
 						}
 
-						item.active(state && nodeName == "UL");
-					});
+						item.active(state && nodeName == name);
+					};
 				}
 
-				if (itemName == "numlist") {
-					selection.selectorChanged('ol > li', function(state, args) {
-						var nodeName, i = args.parents.length;
-
-						while (i--) {
-							nodeName = args.parents[i].nodeName;
-							if (nodeName == "OL" || nodeName == "UL") {
-								break;
-							}
-						}
+				if (itemName == "bullist") {
+					selection.selectorChanged('ul > li', setActiveItem("UL"));
+				}
 
-						item.active(state && nodeName == "OL");
-					});
+				if (itemName == "numlist") {
+					selection.selectorChanged('ol > li', setActiveItem("OL"));
 				}
 
 				if (item.settings.stateSelector) {
@@ -552,7 +545,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			return null;
 		}
 
-		editor.on('click keyup blur', function() {
+		editor.on('click keyup', function() {
 			// Needs to be delayed to avoid Chrome img focus out bug
 			window.setTimeout(function() {
 				var match;
@@ -570,6 +563,8 @@ tinymce.ThemeManager.add('modern', function(editor) {
 			}, 0);
 		});
 
+		editor.on('blur hide', hideAllContextToolbars);
+
 		editor.on('ObjectResizeStart', function() {
 			var match = findFrontMostMatch(editor.selection.getNode());