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

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
JoenioCosta
1 parent 74259fdc
Showing 2 changed files with 9 additions and 2 deletions Show diff stats
app/helpers/language_helper.rb
public/javascripts/tiny_mce/tiny_mce_popup.js
@@ -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(' &mdash; ')
       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.'))
@@ -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;
	@@ -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.'))