diff --git a/plugins/comment_paragraph/public/comment_paragraph.js b/plugins/comment_paragraph/public/comment_paragraph.js
index b30729e..1ca7767 100644
--- a/plugins/comment_paragraph/public/comment_paragraph.js
+++ b/plugins/comment_paragraph/public/comment_paragraph.js
@@ -16,7 +16,7 @@ function makeCommentable() {
//Wraps the paragraph using the chosen class
jQuery('#article_body_ifr').contents().find('body').children('p').each(function( index ) {
text = jQuery(this).html().trim();
- if(text!="" && text!="
"){
+ if(text!="" && text!=" " && text!="
"){
paragraphsTxt+='
' + text + '
'
}
});
diff --git a/plugins/comment_paragraph/public/comment_paragraph_macro.js b/plugins/comment_paragraph/public/comment_paragraph_macro.js
index 3c0a9c2..e0dbe3a 100644
--- a/plugins/comment_paragraph/public/comment_paragraph_macro.js
+++ b/plugins/comment_paragraph/public/comment_paragraph_macro.js
@@ -1,20 +1,32 @@
var comment_paragraph_anchor;
var lastParagraph = [];
var lastSelectedArea = [];
+var sideCommentForm=null;
function getIdCommentParagraph(paragraphId){
var idx = paragraphId.lastIndexOf('_');
return paragraphId.substring(idx+1, paragraphId.length)
}
+function moveCommentsToTheSide(paragraphId, mouseX, mouseY){
+ $ = jQuery;
+ var element = sideCommentForm;
+ //element.detach();
+ if ( $('body #side_comment_form').size == 0){
+ $('body').append(element);
+ }
+ element.css({top: mouseY-50, left: $( window ).width()-490, position:'absolute'});
+}
+
jQuery(document).ready(function($) {
rangy.init();
cssApplier = rangy.createCssClassApplier("commented-area", {normalize: false});
+
//Add marked text bubble
$("body").append('\
');
$("#comment-bubble").hide();
//Undo previous highlight from the paragraph
@@ -30,55 +42,65 @@ jQuery(document).ready(function($) {
});
$('#comment-bubble').mouseleave(function(){
- this.hide();
- $("#comment-bubble").css({top: 0, left: 0, position:'absolute'});
+ //this.hide();
+ $("#comment-bubble").css({top: 0, left: 0, position:'absolute'});
});
//highlight area from the paragraph
$('.comment_paragraph').mouseup(function(event){
- var paragraphId = getIdCommentParagraph($(this)[0].id);
- var currentMousePos = { x: -1, y: -1 };
- currentMousePos.x = event.pageX;
- currentMousePos.y = event.pageY;
- $("#comment-bubble").css({top: event.pageY-100, left: event.pageX-70, position:'absolute'});
- $("#comment-bubble").data("paragraphId", paragraphId)
- var url = $('#link_to_ajax_comments_' + paragraphId).data('url');
- $("#comment-bubble").data("url", url)
- $("#comment-bubble").show();
- var rootElement = $(this).get(0);
- lastParagraph[paragraphId] = rootElement.innerHTML;
- var selObj = rangy.getSelection();
- var selected_area = rangy.serializeSelection(selObj, true,rootElement);
- cssApplier.toggleSelection();
- lastSelectedArea[paragraphId] = selected_area;
- form = jQuery(this).parent().find('form');
- if (form.find('input.selected_area').length === 0){
- jQuery('').attr({
- class: 'selected_area',
- type: 'hidden',
- name: 'comment[comment_paragraph_selected_area]',
- value: selected_area
- }).appendTo(form)
- }else{
- form.find('input.selected_area').val(selected_area)
- }
- rootElement.focus();
+ var paragraphId = getIdCommentParagraph($(this)[0].id);
+ var currentMousePos = { x: -1, y: -1 };
+ currentMousePos.x = event.pageX;
+ currentMousePos.y = event.pageY;
+ $("#comment-bubble").css({top: event.pageY-100, left: event.pageX-70, position:'absolute'});
+ $("#comment-bubble").data("paragraphId", paragraphId)
+ var url = $('#link_to_ajax_comments_' + paragraphId).data('url');
+ $("#comment-bubble").data("url", url)
+ $("#comment-bubble").show();
+ var rootElement = $(this).get(0);
+ lastParagraph[paragraphId] = rootElement.innerHTML;
+ var selObj = rangy.getSelection();
+ var selected_area = rangy.serializeSelection(selObj, true,rootElement);
+ cssApplier.toggleSelection();
+ lastSelectedArea[paragraphId] = selected_area;
+ form = jQuery(this).parent().find('form');
+ if (form.find('input.selected_area').length === 0){
+ jQuery('').attr({
+ class: 'selected_area',
+ type: 'hidden',
+ name: 'comment[comment_paragraph_selected_area]',
+ value: selected_area
+ }).appendTo(form)
+ }else{
+ form.find('input.selected_area').val(selected_area)
+ }
+ rootElement.focus();
});
+
+
+
- $('#comment-bubble').click(function(){
- this.hide();
+ $('#comment-bubble').click(function(event){
+ // this.hide();
$("#comment-bubble").css({top: 0, left: 0, position:'absolute'});
var url = $("#comment-bubble").data('url');
var paragraphId = $("#comment-bubble").data("paragraphId");
- console.log(url);
+
$('.comments_list_toggle_paragraph_' + paragraphId).show();
$.ajax({
dataType: "script",
url: url
}).done(function() {
- var button = jQuery('#page-comment-form-' + paragraphId + ' a')[0];
- button.click();
- window.location="#page-comment-form-" + paragraphId;
+
+ var button = jQuery('#page-comment-form-' + paragraphId + ' a')[0];
+ button.click();
+// window.location="#page-comment-form-" + paragraphId;
+ //Move comments
+ sideCommentForm = $('#side_comment_form');
+ sideCommentForm.hide();
+ sideCommentForm = $('.comment_form').first();
+ sideCommentForm.attr("id",'side_comment_form');
+ moveCommentsToTheSide(paragraphId, event.pageX, event.pageY);
});
});
diff --git a/plugins/comment_paragraph/public/style.css b/plugins/comment_paragraph/public/style.css
index 3b705e3..d78080e 100644
--- a/plugins/comment_paragraph/public/style.css
+++ b/plugins/comment_paragraph/public/style.css
@@ -24,10 +24,11 @@ div.article-comments-list-more{
background-color: #FFFF66;
}
-::selection {
+.comment_paragraph ::selection {
background: #FFFF66; /* WebKit/Blink Browsers */
}
-::-moz-selection {
+
+.comment_paragraph ::-moz-selection {
background: #FFFF66; /* Gecko Browsers */
}
@@ -57,4 +58,4 @@ div.article-comments-list-more{
border-color: #075698 transparent;
display: block;
width: 0;
-}
\ No newline at end of file
+}
--
libgit2 0.21.2