Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.

1 files changed, 5 insertions, 6 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
index 4328f4b11..956fbea99 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
@@ -53,7 +53,7 @@
 				if (e.target.nodeName == 'IMG')

 					ed.selection.select(e.target);

 

-				t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageX);

+				t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageY);

 				Event.add(ed.getDoc(), 'click', function(e) {

 					hide(ed, e);

 				});

@@ -111,19 +111,18 @@
 		},

 

 		_getMenu : function(ed) {

-			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;

+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p;

 

 			if (m) {

 				m.removeAll();

 				m.destroy();

 			}

 

-			p1 = DOM.getPos(ed.getContentAreaContainer());

-			p2 = DOM.getPos(ed.getContainer());

+			p = DOM.getPos(ed.getContentAreaContainer());

 

 			m = ed.controlManager.createDropMenu('contextmenu', {

-				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),

-				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),

+				offset_x : p.x + ed.getParam('contextmenu_offset_x', 0),

+				offset_y : p.y + ed.getParam('contextmenu_offset_y', 0),

 				constrain : 1,

 				keyboard_focus: true

 			});