From 9febba7fb83957b6435e95872de5847004aa8f89 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 17 Oct 2014 12:56:13 -0300 Subject: [PATCH] comment_paragraph: change js method name to avoid conflict with comment_group plugin --- plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb | 2 +- plugins/comment_paragraph/public/comment_paragraph.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb b/plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb index 0d15840..9807376 100644 --- a/plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb +++ b/plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb @@ -5,7 +5,7 @@ class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro def self.configuration { :params => [], :skip_dialog => true, - :generator => 'makeCommentable();', + :generator => 'makeAllCommentable();', :js_files => 'comment_paragraph.js', :icon_path => '/plugins/comment_paragraph/images/balloons-comment.png', :css_files => 'comment_paragraph.css' } diff --git a/plugins/comment_paragraph/public/comment_paragraph.js b/plugins/comment_paragraph/public/comment_paragraph.js index abd636e..79c2daf 100644 --- a/plugins/comment_paragraph/public/comment_paragraph.js +++ b/plugins/comment_paragraph/public/comment_paragraph.js @@ -2,7 +2,7 @@ String.prototype.startsWith = function(needle){ return(this.indexOf(needle) == 0); }; -function makeCommentable() { +function makeAllCommentable() { var paragraphsTxt=""; var selectedTextCount=0; var notSelectedTextCount=0; @@ -54,4 +54,4 @@ function makeCommentable() { //Workaround necessary to post the body of the article tinymce.activeEditor.execCommand('mceInsertContent', false, " "); -} \ No newline at end of file +} -- libgit2 0.21.2