Download as
Browse Code »

Commit d1cd13c2924d5ebec47d98a925c8cca585cb31c6

Authored by Victor Costa
2 parents 45deacbe 9febba7f
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'AI3205-comment-paragraph' into stable

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb
  Diff comments   View file @d1cd13c
@@ -5,7 +5,7 @@ class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro @@ -5,7 +5,7 @@ class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro
5 def self.configuration 5 def self.configuration
6 { :params => [], 6 { :params => [],
7 :skip_dialog => true, 7 :skip_dialog => true,
8 - :generator => 'makeCommentable();', 8 + :generator => 'makeAllCommentable();',
9 :js_files => 'comment_paragraph.js', 9 :js_files => 'comment_paragraph.js',
10 :icon_path => '/plugins/comment_paragraph/images/balloons-comment.png', 10 :icon_path => '/plugins/comment_paragraph/images/balloons-comment.png',
11 :css_files => 'comment_paragraph.css' } 11 :css_files => 'comment_paragraph.css' }
plugins/comment_paragraph/public/comment_paragraph.js
  Diff comments   View file @d1cd13c
@@ -2,7 +2,7 @@ String.prototype.startsWith = function(needle){ @@ -2,7 +2,7 @@ String.prototype.startsWith = function(needle){
2 return(this.indexOf(needle) == 0); 2 return(this.indexOf(needle) == 0);
3 }; 3 };
4 4
5 -function makeCommentable() { 5 +function makeAllCommentable() {
6 var paragraphsTxt=""; 6 var paragraphsTxt="";
7 var selectedTextCount=0; 7 var selectedTextCount=0;
8 var notSelectedTextCount=0; 8 var notSelectedTextCount=0;
@@ -54,4 +54,4 @@ function makeCommentable() { @@ -54,4 +54,4 @@ function makeCommentable() {
54 54
55 //Workaround necessary to post the body of the article 55 //Workaround necessary to post the body of the article
56 tinymce.activeEditor.execCommand('mceInsertContent', false, " "); 56 tinymce.activeEditor.execCommand('mceInsertContent', false, " ");
57 -}  
58 \ No newline at end of file 57 \ No newline at end of file
  58 +}