Update to TinyMCE 4.2.3

spohlenz · Aug 1, 2015 · f4b993c · f4b993c
1 parent 1c5718a
commit f4b993c
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 27 deletions.
diff --git a/app/assets/source/tinymce/tinymce.jquery.js b/app/assets/source/tinymce/tinymce.jquery.js
@@ -1,4 +1,4 @@
-// 4.2.2 (2015-07-22)
+// 4.2.3 (2015-07-30)
 
 /**
  * Compiled inline version. (Library mode)
@@ -214,6 +214,11 @@ define("tinymce/dom/EventUtils", [], function() {
 			event.isImmediatePropagationStopped = returnFalse;
 		}
 
+		// Add missing metaKey for IE 8
+		if (typeof event.metaKey == 'undefined') {
+			event.metaKey = false;
+		}
+
 		return event;
 	}
 
@@ -13444,7 +13449,7 @@ define("tinymce/dom/Selection", [
 				}
 
 				// WebKit egde case selecting images works better using setBaseAndExtent
-				if (!rng.collapsed && rng.startContainer == rng.endContainer && sel.setBaseAndExtent) {
+				if (!rng.collapsed && rng.startContainer == rng.endContainer && sel.setBaseAndExtent && !Env.ie) {
 					if (rng.endOffset - rng.startOffset < 2) {
 						if (rng.startContainer.hasChildNodes()) {
 							node = rng.startContainer.childNodes[rng.startOffset];
@@ -21245,7 +21250,7 @@ define("tinymce/ui/Control", [
 			self.settings = settings = Tools.extend({}, self.Defaults, settings);
 
 			// Initial states
-			self._id = settings.id || ("tinymce-" + (idCounter++));
+			self._id = settings.id || ('mceu_' + (idCounter++));
 			self._aria = {role: settings.role};
 			self._elmCache = {};
 			self.$ = $;
@@ -30833,15 +30838,15 @@ define("tinymce/EditorManager", [
 		 * @property minorVersion
 		 * @type String
 		 */
-		minorVersion: '2.2',
+		minorVersion: '2.3',
 
 		/**
 		 * Release date of TinyMCE build.
 		 *
 		 * @property releaseDate
 		 * @type String
 		 */
-		releaseDate: '2015-07-22',
+		releaseDate: '2015-07-30',
 
 		/**
 		 * Collection of editor instances.

diff --git a/app/assets/source/tinymce/tinymce.js b/app/assets/source/tinymce/tinymce.js
@@ -1,4 +1,4 @@
-// 4.2.2 (2015-07-22)
+// 4.2.3 (2015-07-30)
 
 /**
  * Compiled inline version. (Library mode)
@@ -214,6 +214,11 @@ define("tinymce/dom/EventUtils", [], function() {
 			event.isImmediatePropagationStopped = returnFalse;
 		}
 
+		// Add missing metaKey for IE 8
+		if (typeof event.metaKey == 'undefined') {
+			event.metaKey = false;
+		}
+
 		return event;
 	}
 
@@ -15459,7 +15464,7 @@ define("tinymce/dom/Selection", [
 				}
 
 				// WebKit egde case selecting images works better using setBaseAndExtent
-				if (!rng.collapsed && rng.startContainer == rng.endContainer && sel.setBaseAndExtent) {
+				if (!rng.collapsed && rng.startContainer == rng.endContainer && sel.setBaseAndExtent && !Env.ie) {
 					if (rng.endOffset - rng.startOffset < 2) {
 						if (rng.startContainer.hasChildNodes()) {
 							node = rng.startContainer.childNodes[rng.startOffset];
@@ -23260,7 +23265,7 @@ define("tinymce/ui/Control", [
 			self.settings = settings = Tools.extend({}, self.Defaults, settings);
 
 			// Initial states
-			self._id = settings.id || ("tinymce-" + (idCounter++));
+			self._id = settings.id || ('mceu_' + (idCounter++));
 			self._aria = {role: settings.role};
 			self._elmCache = {};
 			self.$ = $;
@@ -32848,15 +32853,15 @@ define("tinymce/EditorManager", [
 		 * @property minorVersion
 		 * @type String
 		 */
-		minorVersion: '2.2',
+		minorVersion: '2.3',
 
 		/**
 		 * Release date of TinyMCE build.
 		 *
 		 * @property releaseDate
 		 * @type String
 		 */
-		releaseDate: '2015-07-22',
+		releaseDate: '2015-07-30',
 
 		/**
 		 * Collection of editor instances.

diff --git a/lib/tinymce/rails/version.rb b/lib/tinymce/rails/version.rb
@@ -1,6 +1,6 @@
 module TinyMCE
   module Rails
-    VERSION = "4.2.2"
-    TINYMCE_VERSION = "4.2.2"
+    VERSION = "4.2.3"
+    TINYMCE_VERSION = "4.2.3"
   end
 end
diff --git a/vendor/assets/javascripts/tinymce/plugins/imagetools/plugin.js b/vendor/assets/javascripts/tinymce/plugins/imagetools/plugin.js
diff --git a/vendor/assets/javascripts/tinymce/skins/lightgray/skin.ie7.min.css b/vendor/assets/javascripts/tinymce/skins/lightgray/skin.ie7.min.css
diff --git a/vendor/assets/javascripts/tinymce/skins/lightgray/skin.min.css b/vendor/assets/javascripts/tinymce/skins/lightgray/skin.min.css
diff --git a/vendor/assets/javascripts/tinymce/tinymce.jquery.js b/vendor/assets/javascripts/tinymce/tinymce.jquery.js
diff --git a/vendor/assets/javascripts/tinymce/tinymce.js b/vendor/assets/javascripts/tinymce/tinymce.js