Merge branch 'AI3205-comment-paragraph' into stable

Victor Costa
2 parents 2c842799 dca72624
Showing 2 changed files with 28 additions and 5 deletions Show diff stats
plugins/comment_paragraph/public/comment_paragraph_macro.js
plugins/comment_paragraph/public/style.css
@@ -49,6 +49,8 @@ jQuery(document).ready(function($) {
   rangy.init();
   cssApplier = rangy.createCssClassApplier("commented-area", {normalize: false});
+  cssApplierSelected = rangy.createCssClassApplier("commented-area-selected", {normalize: false});
+
   //Add marked text bubble
   $("body").append('\
       <a id="comment-bubble">\
@@ -83,11 +85,14 @@ jQuery(document).ready(function($) {
     $('#comment-paragraph-plugin_' + paragraph).find('.side-comments-counter').click();
   });
-  function hideAllSelectedAreasExcept(clickedParagraph){
+  function hideAllSelectedAreasExcept(clickedParagraph, areaClass) {
+    if(!areaClass) {
+      areaClass = '.commented-area';
+    }
     $(".comment_paragraph").each(function(){
       paragraph = $(this).closest('.comment-paragraph-plugin').data('paragraph');
       if(paragraph != clickedParagraph){
-        $(this).find(".commented-area").contents().unwrap();
+        $(this).find(areaClass).contents().unwrap();
         $(this).html($(this).html()); //XXX: workaround to prevent creation of text nodes
       }
     });
@@ -103,6 +108,14 @@ jQuery(document).ready(function($) {
     return text;
   }
+  function clearSelection() {
+    if ( document.selection ) {
+      document.selection.empty();
+    } else if ( window.getSelection ) {
+      window.getSelection().removeAllRanges();
+    }
+  }
+
   function setCommentBubblePosition(posX, posY) {
     $("#comment-bubble").css({
       top: (posY - 80),
@@ -164,10 +177,12 @@ jQuery(document).ready(function($) {
       form.find('input.selected_content').val(selected_content)
     }
     rootElement.focus();
-    cssApplier.toggleSelection();
+    cssApplierSelected.toggleSelection();
+    clearSelection();
+
     //set a one time handler to prevent multiple selections
     var fn = function() {
-      hideAllSelectedAreasExcept();
+      hideAllSelectedAreasExcept(null, '.commented-area-selected');
       $('.comment-paragraph-plugin').off('mousedown', '.comment_paragraph', fn);
     }
     $('.comment-paragraph-plugin').on('mousedown', '.comment_paragraph', fn);
@@ -32,16 +32,24 @@ div.article-comments-list-more{
   font-weight: bold;
 }
-.commented-area {
+.comment-paragraph-plugin .commented-area {
   background-color: lightseagreen;
+  color: white;
+}
+
+.comment-paragraph-plugin .commented-area-selected {
+  background-color: rgb(255, 86, 86);
+  color: white;
 }
 .comment_paragraph ::selection {
   background: lightseagreen; /* WebKit/Blink Browsers */
+  color: white;
 }
 .comment_paragraph ::-moz-selection {
   background: lightseagreen; /* Gecko Browsers */
+  color: white;
 }
 .comment_paragraph{