Permalink
Browse files

Update to TinyMCE 3.5

  • Loading branch information...
1 parent 77bb34f commit b7a1a8cf1c872c2b8efe8334a5d61734e0e2a0c8 @spohlenz committed May 10, 2012
@@ -1,6 +1,6 @@
module TinyMCE
module Rails
- VERSION = "3.5b3"
- TINYMCE_VERSION = "3.5b3"
+ VERSION = "3.5"
+ TINYMCE_VERSION = "3.5"
end
end

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -22,15 +22,15 @@
init : function(ed, url) {
var t = this;
- // Internet Explorer has built-in automatic linking
- if (tinyMCE.isIE)
- return;
-
// Add a key down handler
- ed.onKeyDown.add(function(ed, e) {
+ ed.onKeyDown.addToTop(function(ed, e) {
if (e.keyCode == 13)
return t.handleEnter(ed);
- });
+ });
+
+ // Internet Explorer has built-in automatic linking for most cases
+ if (tinyMCE.isIE)
+ return;
ed.onKeyPress.add(function(ed, e) {
if (e.which == 41)

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -79,7 +79,7 @@
vp.h -= 1;
// Use fixed position if it exists
- if (tinymce.isIE6)
+ if (tinymce.isIE6 || document.compatMode == 'BackCompat')
posCss = 'absolute;top:' + vp.y;
else
posCss = 'fixed;top:0';
Oops, something went wrong.

0 comments on commit b7a1a8c

Please sign in to comment.