upgraded TinyMCE to 3.4.7

1 files changed, 4 insertions, 4 deletions

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;