[Git][noosfero/noosfero][master-1.x] 2 commits: [CommentParagraph] Changes iframe selector

[Rodrigo Souto]

Rodrigo Souto pushed to branch master-1.x at Noosfero / noosfero


Commits:
5905a8f5 by Gabriel Silva at 2018-06-08T18:04:45Z
[CommentParagraph] Changes iframe selector

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
dd1a50b1 by Rodrigo Souto at 2018-06-08T20:40:01Z
Merge branch 'comment-macros' into 'master-1.x'

[CommentParagraph] Changes iframe selector

See merge request noosfero/noosfero!1522
- - - - -


1 changed file:

- plugins/comment_paragraph/public/macro/allow_comment.js


Changes:

=====================================
plugins/comment_paragraph/public/macro/allow_comment.js
=====================================
--- a/plugins/comment_paragraph/public/macro/allow_comment.js
+++ b/plugins/comment_paragraph/public/macro/allow_comment.js
@@ -17,7 +17,7 @@ function makeCommentable() {
   var start = $(tinyMCE.activeEditor.selection.getStart()).closest(TARGETS);
   var end = $(tinyMCE.activeEditor.selection.getEnd()).closest(TARGETS);
 
-  var text = $('#article_body_ifr').contents().find('*');
+  var text = $('.mce-tinymce iframe').contents().find('*');
   var selection = text.slice(text.index(start), text.index(end) + 1);
   var wasWrapped = unwrapSelection(selection)
 
@@ -31,7 +31,7 @@ function makeCommentable() {
 }
 
 function makeAllCommentable() {
-  var text = $('#article_body_ifr').contents().find('*');
+  var text = $('.mce-tinymce iframe').contents().find('*');
   var selection = text.find(TARGETS);
 
   var wasWrapped = unwrapSelection(selection);



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/c6a8d8f431eef38fb30d4356190910d920a977a0...dd1a50b1c70729235a24615c77c2cb9260f3cff7

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/c6a8d8f431eef38fb30d4356190910d920a977a0...dd1a50b1c70729235a24615c77c2cb9260f3cff7
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/20180608/64c660dd/attachment.html>