upgraded TinyMCE to 3.4.7

2 files changed, 15 insertions, 7 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
index 1cead6dfe..bb1869558 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
@@ -281,13 +281,21 @@ tinyMCEPopup.onInit.add(function() {
 function addKeyboardNavigation(){

 	var tableElm, cells, settings;

 

-	cells = tinyMCEPopup.dom.select(".charmaplink", "charmapgroup");

+	cells = tinyMCEPopup.dom.select("a.charmaplink", "charmapgroup");

 

 	settings ={

 		root: "charmapgroup",

 		items: cells

 	};

-

+	cells[0].tabindex=0;

+	tinyMCEPopup.dom.addClass(cells[0], "mceFocus");

+	if (tinymce.isGecko) {

+		cells[0].focus();		

+	} else {

+		setTimeout(function(){

+			cells[0].focus();

+		}, 100);

+	}

 	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);

 }

 

@@ -306,7 +314,7 @@ function renderCharMapHTML() {
 			previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';

 			html += ''

 				+ '<td class="charmap">'

-				+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'

+				+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + ' '+ tinyMCEPopup.editor.translate("advanced_dlg.charmap_usage")+'">'

 				+ charmap[i][1]

 				+ '</a></td>';

 			if ((cols+1) % charsPerRow == 0)

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
index 7decac5b4..f51e703b0 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
@@ -1,6 +1,6 @@
 tinyMCEPopup.requireLangPack();

 

-var detail = 50, strhex = "0123456789ABCDEF", i, isMouseDown = false, isMouseOver = false;

+var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;

 

 var colors = [

 	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",

@@ -266,10 +266,10 @@ function dechex(n) {
 }

 

 function computeColor(e) {

-	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;

+	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB, pos = tinyMCEPopup.dom.getPos(e.target);

 

-	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);

-	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);

+	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - pos.x : 0);

+	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - pos.y : 0);

 

 	partWidth = document.getElementById('colors').width / 6;

 	partDetail = detail / 2;