Download as
Browse Code »

Commit a7c845cea1e0e383b21fd24e7c8392de4936b5a0

Authored by Leandro Santos
2 parents aa9dccef daa97893
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'master' of gitlab.com:participa/noosfero

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
public/javascripts/application.js
  Diff comments   View file @a7c845c
@@ -1064,7 +1064,7 @@ jQuery(document).ready(function(){ @@ -1064,7 +1064,7 @@ jQuery(document).ready(function(){
1064 function apply_zoom_to_images(zoom_text) { 1064 function apply_zoom_to_images(zoom_text) {
1065 jQuery(function($) { 1065 jQuery(function($) {
1066 $(window).load( function() { 1066 $(window).load( function() {
1067 - $('#article .article-body img').each( function(index) { 1067 + $('#article .article-body img:not(.disable-zoom)').each( function(index) {
1068 var original = original_image_dimensions($(this).attr('src')); 1068 var original = original_image_dimensions($(this).attr('src'));
1069 if ($(this).width() < original['width'] || $(this).height() < original['height']) { 1069 if ($(this).width() < original['width'] || $(this).height() < original['height']) {
1070 $(this).wrap('<div class="zoomable-image" />'); 1070 $(this).wrap('<div class="zoomable-image" />');