[Git][noosfero/noosfero][stable-1.8] Merge branch 'image_modal_edit_article' into 'master'
Rodrigo Souto
gitlab at mg.gitlab.com
Thu Jul 6 16:26:15 BRT 2017
Rodrigo Souto pushed to branch stable-1.8 at Noosfero / noosfero
Commits:
ca77a786 by Rodrigo Souto at 2017-07-06T19:26:08+00:00
Merge branch 'image_modal_edit_article' into 'master'
Fix bug in zoom in image modal
See merge request !1276
- - - - -
1 changed file:
- public/javascripts/article.js
Changes:
=====================================
public/javascripts/article.js
=====================================
--- a/public/javascripts/article.js
+++ b/public/javascripts/article.js
@@ -96,7 +96,7 @@ jQuery(function($) {
var html_selector = $item.attr('data-item');
var name = $item.attr('title');
var img = $item.find(html_selector).find('img').attr('src');
- noosfero.modal.html(zoom_dialog_html(img), {
+ noosfero.modal.html(zoom_dialog_html($item.attr('title'), img), {
scrolling: false,
});
return false;
@@ -212,7 +212,7 @@ jQuery(function($) {
$("#article_published_true").click(show_hide_privacy_options);
$(".custom_privacy_option").click(show_hide_token_input);
- //Workaround to pointer-events:none CSS3
+ //Workaround to pointer-events:none CSS3
$('a.disabled').click(function(e){
e.preventDefault();
return false;
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/ca77a7869d11a58ef5c21eb7ef4d0660f5da8a2e
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/ca77a7869d11a58ef5c21eb7ef4d0660f5da8a2e
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170706/0576b6bc/attachment-0001.html>
More information about the Noosfero-dev
mailing list