Download as
Browse Code »

Commit 326c7f69138bb3643d0b61d2af94cc76707aefa4

Authored by JoenioCosta
1 parent 74259fdc
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @326c7f6
... ... @@ -22,7 +22,7 @@ module LanguageHelper
22 22 if code == current
23 23 content_tag('strong', name)
24 24 else
25   - link_to(name, :lang => code)
  25 + link_to(name, params.merge(:lang => code))
26 26 end
27 27 end.join(' — ')
28 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
  Diff comments   View file @326c7f6
... ... @@ -130,7 +130,7 @@ TinyMCE_Popup.prototype = {
130 130 window.resizeBy(0, 10);
131 131 return;
132 132 }
133   -
  133 +
134 134 if (this.isWindow) {
135 135 doc = document;
136 136 body = doc.body;
... ... @@ -181,6 +181,13 @@ TinyMCE_Popup.prototype = {
181 181 // Resize window
182 182 // tinyMCE.debug(tinyMCE.getWindowArg('mce_width') + "," + tinyMCE.getWindowArg('mce_height') + " - " + dx + "," + dy);
183 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 192 // Hide iframe and show wrapper
186 193 body.style.margin = oldMargin;
... ...