Commit 326c7f69138bb3643d0b61d2af94cc76707aefa4
1 parent
74259fdc
Exists in
master
and in
22 other branches
ActionItem458: fixing resize of tiny mce popups in gecko
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2040 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
9 additions
and
2 deletions
Show diff stats
app/helpers/language_helper.rb
@@ -22,7 +22,7 @@ module LanguageHelper | @@ -22,7 +22,7 @@ module LanguageHelper | ||
22 | if code == current | 22 | if code == current |
23 | content_tag('strong', name) | 23 | content_tag('strong', name) |
24 | else | 24 | else |
25 | - link_to(name, :lang => code) | 25 | + link_to(name, params.merge(:lang => code)) |
26 | end | 26 | end |
27 | end.join(' — ') | 27 | end.join(' — ') |
28 | 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.')) | 28 | 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.')) |
public/javascripts/tiny_mce/tiny_mce_popup.js
@@ -130,7 +130,7 @@ TinyMCE_Popup.prototype = { | @@ -130,7 +130,7 @@ TinyMCE_Popup.prototype = { | ||
130 | window.resizeBy(0, 10); | 130 | window.resizeBy(0, 10); |
131 | return; | 131 | return; |
132 | } | 132 | } |
133 | - | 133 | + |
134 | if (this.isWindow) { | 134 | if (this.isWindow) { |
135 | doc = document; | 135 | doc = document; |
136 | body = doc.body; | 136 | body = doc.body; |
@@ -181,6 +181,13 @@ TinyMCE_Popup.prototype = { | @@ -181,6 +181,13 @@ TinyMCE_Popup.prototype = { | ||
181 | // Resize window | 181 | // Resize window |
182 | // tinyMCE.debug(tinyMCE.getWindowArg('mce_width') + "," + tinyMCE.getWindowArg('mce_height') + " - " + dx + "," + dy); | 182 | // tinyMCE.debug(tinyMCE.getWindowArg('mce_width') + "," + tinyMCE.getWindowArg('mce_height') + " - " + dx + "," + dy); |
183 | window.resizeBy(dx, dy); | 183 | window.resizeBy(dx, dy); |
184 | + // | ||
185 | + // http://tinymce.moxiecode.com/punbb/viewtopic.php?id=2866 | ||
186 | + /*/ Gecko workaround | ||
187 | + if (tinyMCE.isGecko) | ||
188 | + window.resizeBy(dx + 40, dy); | ||
189 | + else | ||
190 | + window.resizeBy(dx, dy); */ | ||
184 | 191 | ||
185 | // Hide iframe and show wrapper | 192 | // Hide iframe and show wrapper |
186 | body.style.margin = oldMargin; | 193 | body.style.margin = oldMargin; |