From 326c7f69138bb3643d0b61d2af94cc76707aefa4 Mon Sep 17 00:00:00 2001 From: JoenioCosta Date: Tue, 17 Jun 2008 20:35:29 +0000 Subject: [PATCH] ActionItem458: fixing resize of tiny mce popups in gecko --- app/helpers/language_helper.rb | 2 +- public/javascripts/tiny_mce/tiny_mce_popup.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/helpers/language_helper.rb b/app/helpers/language_helper.rb index 92025a9..5072f6c 100644 --- a/app/helpers/language_helper.rb +++ b/app/helpers/language_helper.rb @@ -22,7 +22,7 @@ module LanguageHelper if code == current content_tag('strong', name) else - link_to(name, :lang => code) + link_to(name, params.merge(:lang => code)) end end.join(' — ') content_tag('div', languages, :id => 'language-chooser', :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')) diff --git a/public/javascripts/tiny_mce/tiny_mce_popup.js b/public/javascripts/tiny_mce/tiny_mce_popup.js index eecad28..7378b25 100755 --- a/public/javascripts/tiny_mce/tiny_mce_popup.js +++ b/public/javascripts/tiny_mce/tiny_mce_popup.js @@ -130,7 +130,7 @@ TinyMCE_Popup.prototype = { window.resizeBy(0, 10); return; } - + if (this.isWindow) { doc = document; body = doc.body; @@ -181,6 +181,13 @@ TinyMCE_Popup.prototype = { // Resize window // tinyMCE.debug(tinyMCE.getWindowArg('mce_width') + "," + tinyMCE.getWindowArg('mce_height') + " - " + dx + "," + dy); window.resizeBy(dx, dy); + // + // http://tinymce.moxiecode.com/punbb/viewtopic.php?id=2866 + /*/ Gecko workaround + if (tinyMCE.isGecko) + window.resizeBy(dx + 40, dy); + else + window.resizeBy(dx, dy); */ // Hide iframe and show wrapper body.style.margin = oldMargin; -- libgit2 0.21.2