From 86495bec7c0e6cbb6b7e8801f24535f4503107e8 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 23 Aug 2017 17:43:13 +0200
Subject: [PATCH 01/46] Restructure modal

---
 .../stylesheets/request-for-comments.css.scss      | 14 ++++++++++++++
 .../exercises/_comment_dialogcontent.html.slim     |  9 +++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 6448e6e7..63027531 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -64,3 +64,17 @@ p.comment {
   overflow: hidden;
   margin-bottom: 10px;
 }
+
+#otherComments {
+  h5 {
+    margin-top: 0px;
+  }
+}
+
+#myComment {
+  margin-bottom: 10px;
+
+  textarea {
+    resize: none;
+  }
+}
\ No newline at end of file
diff --git a/app/views/exercises/_comment_dialogcontent.html.slim b/app/views/exercises/_comment_dialogcontent.html.slim
index 4c78035a..988c5311 100644
--- a/app/views/exercises/_comment_dialogcontent.html.slim
+++ b/app/views/exercises/_comment_dialogcontent.html.slim
@@ -1,9 +1,10 @@
-h5 =t('exercises.implement.comment.addyours')
-
-textarea.form-control(style='resize:none;')
 #otherComments
   h5 =t('exercises.implement.comment.others')
   pre#otherCommentsTextfield
-p = ''
+
+#myComment
+  h5 =t('exercises.implement.comment.addyours')
+  textarea.form-control
+
 button#addCommentButton.btn.btn-block.btn-primary(type='button') =t('exercises.implement.comment.addCommentButton')
 button#removeAllButton.btn.btn-block.btn-warning(type='button') =t('exercises.implement.comment.removeAllOnLine')
\ No newline at end of file

From ce3bf525092812c150ba69a261744099bef5cbb0 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 23 Aug 2017 17:52:16 +0200
Subject: [PATCH 02/46] Remove old code

---
 app/views/request_for_comments/show.html.erb | 28 --------------------
 1 file changed, 28 deletions(-)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index ab60ef91..470dcf8f 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -82,7 +82,6 @@ also, all settings from the rails model needed for the editor configuration in t
 <script type="text/javascript">
 
   var solvedButton = $('#mark-as-solved-button');
-  var commentOnExerciseButton = $('#comment-exercise-button');
   var addCommentExerciseButton = $('#addCommentExerciseButton');
 
   var thankYouContainer = $('#thank-you-container');
@@ -219,12 +218,6 @@ also, all settings from the rails model needed for the editor configuration in t
 
       $.each(response, function(index, comment) {
         comment.className = 'code-ocean_comment';
-        // if we have tabs or carriage returns in the comment, just add the name and leave it as it is. otherwise: format!
-        if(comment.text.includes("\n") || comment.text.includes("\t")){
-          comment.text = comment.username + ": " + comment.text;
-        } else {
-          comment.text = comment.username + ": " + stringDivider(comment.text, 80, "\n");
-        }
       });
       session.setAnnotations(response);
     })
@@ -279,27 +272,6 @@ also, all settings from the rails model needed for the editor configuration in t
     jqxhr.fail(ajaxError);
   }
 
-  function createCommentOnExercise(file_id, row, editor, commenttext){
-      var jqxhr = $.ajax({
-          data: {
-              comment: {
-                  file_id: file_id,
-                  row: row,
-                  column: 0,
-                  text: commenttext,
-                  request_id: $('h4#exercise_caption').data('rfc-id')
-              }
-          },
-          dataType: 'json',
-          method: 'POST',
-          url:  "/comments"
-      });
-      jqxhr.done(function(response){
-          setAnnotations(editor, file_id);
-      });
-      jqxhr.fail(ajaxError);
-  }
-
   function handleSidebarClick(e) {
     var target  = e.domEvent.target;
     var editor =  e.editor;

From 8a2a4c2b519aec6760c14bf7f033cbfa07f4147a Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 23 Aug 2017 17:52:28 +0200
Subject: [PATCH 03/46] Add container for new comment visuals

---
 app/assets/stylesheets/request-for-comments.css.scss | 5 +++++
 app/views/exercises/_comment_dialogcontent.html.slim | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 63027531..562c02f4 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -69,6 +69,11 @@ p.comment {
   h5 {
     margin-top: 0px;
   }
+
+  .container {
+    min-height: 300px;
+    overflow-y: auto;
+  }
 }
 
 #myComment {
diff --git a/app/views/exercises/_comment_dialogcontent.html.slim b/app/views/exercises/_comment_dialogcontent.html.slim
index 988c5311..6018fbd0 100644
--- a/app/views/exercises/_comment_dialogcontent.html.slim
+++ b/app/views/exercises/_comment_dialogcontent.html.slim
@@ -1,6 +1,6 @@
 #otherComments
   h5 =t('exercises.implement.comment.others')
-  pre#otherCommentsTextfield
+  .container
 
 #myComment
   h5 =t('exercises.implement.comment.addyours')

From b9646b48571f4ac6aa13f593d68db0810bdd3677 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 23 Aug 2017 18:25:27 +0200
Subject: [PATCH 04/46] Refactor content creation

---
 app/views/request_for_comments/show.html.erb | 132 +++++++++++--------
 1 file changed, 75 insertions(+), 57 deletions(-)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 470dcf8f..92892b04 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -137,6 +137,7 @@ also, all settings from the rails model needed for the editor configuration in t
     currentEditor.getSession().setMode($(editor).data('mode'));
     currentEditor.getSession().setOption("useWorker", false);
 
+    currentEditor.annotationsByLine = {};
     setAnnotations(currentEditor, $(editor).data('file-id'));
     currentEditor.on("guttermousedown", handleSidebarClick);
   });
@@ -147,73 +148,90 @@ also, all settings from the rails model needed for the editor configuration in t
   }
 
   function preprocess(commentText) {
-      // sanitize comments to deal with XSS attacks:
-      commentText = $('div.sanitizer').text(commentText).html();
-      // display original line breaks:
-      return commentText.replace(/\n/g, '<br>');
+    // sanitize comments to deal with XSS attacks:
+    commentText = $('div.sanitizer').text(commentText).html();
+    // display original line breaks:
+    return commentText.replace(/\n/g, '<br>');
+  }
+
+  function clusterComments(comments) {
+    var clusters = {};
+    // comments need to be sorted to cluster them per line
+    comments.sort(function (a, b) {
+      return a.row - b.row;
+    });
+    while (comments.length > 0) {
+      // new cluster of comments
+      var cluster = [];
+      var clusterRow = comments[0].row;
+      // now collect all comments on this line
+      while (comments.length > 0 && comments[0].row === clusterRow) {
+          cluster.push(comments.shift());
+      }
+      // sort the comments by creation date
+      cluster = cluster.sort(function (a, b) {
+        return a.id - b.id;
+      });
+      clusters[clusterRow] = cluster;
+    }
+    return clusters;
+  }
+
+  function generateCommentHtmlContent(comments) {
+    var htmlContent = '';
+    comments.forEach(function(comment, index) {
+      if (index !== 0) {
+        htmlContent += '<div class="popover-divider"></div>'
+      }
+      htmlContent += '<p class="comment">';
+      htmlContent += '<div class="popover-header">' +
+        '<div class="popover-username">' + preprocess(comment.username) + '</div>' +
+        '<div class="popover-date">' + comment.date + '</div>';
+      if (comment.updated) {
+        htmlContent += '<div class="popover-updated">' +
+          '<i class="fa fa-pencil" aria-hidden="true"></i>' +
+          '<%= t('request_for_comments.comment_edited') %>' +
+          '</div>'
+      }
+      htmlContent += '</div>';
+      htmlContent += '<div class="popover-comment">' + preprocess(comment.text) + '</div>';
+      htmlContent += '</p>';
+    });
+    return htmlContent;
+  }
+
+  function buildPopover(fileid, line, htmlContent) {
+    // attach the popover to the ace sidebar (where the comment icon is displayed)
+    var icon = $('*[data-file-id="' + fileid + '"]')          // the editor for this file
+      .find('.ace_gutter > .ace_gutter-layer')                // the sidebar
+      .find('div:nth-child(' + (parseInt(line) + 1) + ')');   // the correct line
+    icon.popover({
+      content: htmlContent,
+      html: true, // necessary to style comments. XSS is not possible due to comment pre-processing (sanitizing)
+      trigger: 'hover',
+      container: 'body'
+    });
   }
 
   function setAnnotations(editor, fileid) {
     var session = editor.getSession();
 
     var jqrequest = $.ajax({
-        dataType: 'json',
-        method: 'GET',
-        url: '/comments',
-        data: {
-          file_id: fileid
-        }
+      dataType: 'json',
+      method: 'GET',
+      url: '/comments',
+      data: {
+        file_id: fileid
+      }
     });
 
     jqrequest.done(function(response){
-      // comments need to be sorted to cluster them per line
-      var comments = response.slice().sort(function (a, b) {
-          return a.row - b.row;
-      });
-      while (comments.length > 0) {
-        // new cluster of comments
-        var cluster = [];
-        var clusterRow = comments[0].row;
-        // now collect all comments on this line
-        while (comments.length > 0 && comments[0].row === clusterRow) {
-          cluster.push(comments.shift());
+      editor.annotationsByLine = clusterComments(response.slice());
+      for (var line in editor.annotationsByLine) {
+        if (editor.annotationsByLine.hasOwnProperty(line)) {
+          var htmlContent = generateCommentHtmlContent(editor.annotationsByLine[line]);
+          buildPopover(fileid, line, htmlContent);
         }
-        // sort the comments by creation date
-        cluster = cluster.sort(function (a, b) {
-            return a.id - b.id;
-        });
-
-        // build the markup for the current line's popover
-        var popupContent = '';
-        cluster.forEach(function(comment, index) {
-            if (index !== 0) {
-                popupContent += '<div class="popover-divider"></div>'
-            }
-            popupContent += '<p class="comment">';
-            popupContent += '<div class="popover-header">' +
-                '<div class="popover-username">' + preprocess(comment.username) + '</div>' +
-                '<div class="popover-date">' + comment.date + '</div>';
-            if (comment.updated) {
-                popupContent += '<div class="popover-updated">' +
-                    '<i class="fa fa-pencil" aria-hidden="true"></i>' +
-                    '<%= t('request_for_comments.comment_edited') %>' +
-                    '</div>'
-            }
-            popupContent += '</div>';
-            popupContent += '<div class="popover-comment">' + preprocess(comment.text) + '</div>';
-            popupContent += '</p>';
-        });
-
-        // attach the popover to the ace sidebar (where the comment icon is displayed)
-        var icon = $('*[data-file-id="' + fileid + '"]')          // the editor for this file
-                .find('.ace_gutter > .ace_gutter-layer')          // the sidebar
-                .find('div:nth-child(' + (clusterRow + 1) + ')'); // the correct line
-        icon.popover({
-          content: popupContent,
-          html: true, // necessary to style comments. XSS is not possible due to comment pre-processing (sanitizing)
-          trigger: 'hover',
-          container: 'body'
-        });
       }
 
       $.each(response, function(index, comment) {

From a8d801d3a74e411152cb12b500646834ce8a2057 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 23 Aug 2017 18:38:24 +0200
Subject: [PATCH 05/46] Show html formatted comments in modal

---
 .../stylesheets/request-for-comments.css.scss |  3 ++-
 app/views/request_for_comments/show.html.erb  | 21 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 562c02f4..08b02839 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -71,7 +71,8 @@ p.comment {
   }
 
   .container {
-    min-height: 300px;
+    width: 100%;
+    max-height: 300px;
     overflow-y: auto;
   }
 }
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 92892b04..b93f7594 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -137,7 +137,7 @@ also, all settings from the rails model needed for the editor configuration in t
     currentEditor.getSession().setMode($(editor).data('mode'));
     currentEditor.getSession().setOption("useWorker", false);
 
-    currentEditor.annotationsByLine = {};
+    currentEditor.commentVisualsByLine = {};
     setAnnotations(currentEditor, $(editor).data('file-id'));
     currentEditor.on("guttermousedown", handleSidebarClick);
   });
@@ -226,13 +226,13 @@ also, all settings from the rails model needed for the editor configuration in t
     });
 
     jqrequest.done(function(response){
-      editor.annotationsByLine = clusterComments(response.slice());
-      for (var line in editor.annotationsByLine) {
-        if (editor.annotationsByLine.hasOwnProperty(line)) {
-          var htmlContent = generateCommentHtmlContent(editor.annotationsByLine[line]);
-          buildPopover(fileid, line, htmlContent);
-        }
-      }
+      editor.commentVisualsByLine = {};
+      var clusters = clusterComments(response.slice());
+      $.each(clusters, function (line, cluster) {
+        var htmlContent = generateCommentHtmlContent(cluster);
+        editor.commentVisualsByLine[line] = htmlContent;
+        buildPopover(fileid, line, htmlContent);
+      });
 
       $.each(response, function(index, comment) {
         comment.className = 'code-ocean_comment';
@@ -302,10 +302,9 @@ also, all settings from the rails model needed for the editor configuration in t
     var commentModal = $('#comment-modal');
 
     if (hasCommentsInRow(editor, row)) {
-      var rowComments = getCommentsForRow(editor, row);
-      var comments = _.pluck(rowComments, 'text').join('\n');
+      var htmlContent = editor.commentVisualsByLine[row];
       commentModal.find('#otherComments').show();
-      commentModal.find('#otherCommentsTextfield').text(comments);
+      commentModal.find('#otherComments > .container').html(htmlContent);
     } else {
       commentModal.find('#otherComments').hide();
     }

From 9ed5b7cbb1c4412a7ddcbad1a52b9a710b43f985 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Thu, 24 Aug 2017 11:08:09 +0200
Subject: [PATCH 06/46] Cleanup UI

---
 app/assets/stylesheets/request-for-comments.css.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 08b02839..c5749ed8 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -72,12 +72,14 @@ p.comment {
 
   .container {
     width: 100%;
-    max-height: 300px;
+    max-height: 200px;
     overflow-y: auto;
+    border: 1px solid #cccccc;
   }
 }
 
 #myComment {
+  margin-top: 20px;
   margin-bottom: 10px;
 
   textarea {

From b64809c4b9cbc9429d468025d4dd531bebc89a63 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Thu, 24 Aug 2017 11:47:50 +0200
Subject: [PATCH 07/46] Return if comment can be edited by the current user

---
 app/controllers/comments_controller.rb | 1 +
 app/models/comment.rb                  | 2 +-
 app/views/comments/index.json.jbuilder | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 01dcd9d5..dfbb4f8d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -21,6 +21,7 @@ class CommentsController < ApplicationController
         comment.username = comment.user.displayname
         comment.date = comment.created_at.strftime('%d.%m.%Y %k:%M')
         comment.updated = (comment.created_at != comment.updated_at)
+        comment.editable = comment.user == current_user
       }
     else
       @comments = []
diff --git a/app/models/comment.rb b/app/models/comment.rb
index a5946ac9..de2a265b 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,7 +1,7 @@
 class Comment < ActiveRecord::Base
   # inherit the creation module: encapsulates that this is a polymorphic user, offers some aliases and makes sure that all necessary attributes are set.
   include Creation
-  attr_accessor :username, :date, :updated
+  attr_accessor :username, :date, :updated, :editable
 
   belongs_to :file, class_name: 'CodeOcean::File'
   belongs_to :user, polymorphic: true
diff --git a/app/views/comments/index.json.jbuilder b/app/views/comments/index.json.jbuilder
index 55dfac49..e42dd5bf 100644
--- a/app/views/comments/index.json.jbuilder
+++ b/app/views/comments/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@comments) do |comment|
-  json.extract! comment, :id, :user_id, :file_id, :row, :column, :text, :username, :date, :updated
+  json.extract! comment, :id, :user_id, :file_id, :row, :column, :text, :username, :date, :updated, :editable
   json.url comment_url(comment, format: :json)
 end

From 771793f32e006a144caef53310352520e9397b23 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Thu, 24 Aug 2017 11:48:26 +0200
Subject: [PATCH 08/46] Show edit and delete buttons for comments that can be
 edited by the user

---
 .../stylesheets/request-for-comments.css.scss     | 15 ++++++++++++++-
 app/views/request_for_comments/show.html.erb      | 10 ++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index c5749ed8..71f7a34a 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -65,9 +65,13 @@ p.comment {
   margin-bottom: 10px;
 }
 
+.popover-action-button {
+  display: none;
+}
+
 #otherComments {
   h5 {
-    margin-top: 0px;
+    margin-top: 0;
   }
 
   .container {
@@ -75,6 +79,15 @@ p.comment {
     max-height: 200px;
     overflow-y: auto;
     border: 1px solid #cccccc;
+
+    .popover-actions {
+      display: flex;
+
+      .popover-action-button {
+        display: block;
+        margin-right: 5px;
+      }
+    }
   }
 }
 
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index b93f7594..88f4181b 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -193,8 +193,14 @@ also, all settings from the rails model needed for the editor configuration in t
           '<%= t('request_for_comments.comment_edited') %>' +
           '</div>'
       }
-      htmlContent += '</div>';
-      htmlContent += '<div class="popover-comment">' + preprocess(comment.text) + '</div>';
+      htmlContent += '</div>' +
+          '<div class="popover-comment">' + preprocess(comment.text) + '</div>';
+      if (comment.editable) {
+        htmlContent += '<div class="popover-actions">' +
+            '<button class="popover-action-button btn btn-xs btn-warning" id="edit-' + comment.id + '"><%= t('shared.edit') %></button>' +
+            '<button class="popover-action-button btn btn-xs btn-danger" id="delete-' + comment.id + '"><%= t('shared.destroy') %></button>' +
+          '</div>';
+      }
       htmlContent += '</p>';
     });
     return htmlContent;

From 6aaa0f3bca3ead45869127b134867b0e14634a88 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Fri, 25 Aug 2017 18:15:02 +0200
Subject: [PATCH 09/46] Remove code to delete all comments on one line and
 restore default delete route for comments

---
 app/controllers/comments_controller.rb | 15 +++------------
 app/policies/comment_policy.rb         |  6 +-----
 config/routes.rb                       |  6 +-----
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index dfbb4f8d..90922fb1 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,5 +1,5 @@
 class CommentsController < ApplicationController
-  before_action :set_comment, only: [:show, :edit, :update, :destroy_by_id]
+  before_action :set_comment, only: [:show, :edit, :update, :destroy]
 
   # to disable authorization check: comment the line below back in
  # skip_after_action :verify_authorized
@@ -84,7 +84,8 @@ class CommentsController < ApplicationController
 
   # DELETE /comments/1
   # DELETE /comments/1.json
-  def destroy_by_id
+  def destroy
+    authorize!
     @comment.destroy
     respond_to do |format|
       format.html { head :no_content, notice: 'Comment was successfully destroyed.' }
@@ -92,16 +93,6 @@ class CommentsController < ApplicationController
     end
   end
 
-  def destroy
-    @comments = Comment.where(file_id: params[:file_id], row: params[:row], user: current_user)
-    @comments.each { |comment| authorize comment; comment.destroy }
-    respond_to do |format|
-      #format.html { redirect_to comments_url, notice: 'Comments were successfully destroyed.' }
-      format.html { head :no_content, notice: 'Comments were successfully destroyed.' }
-      format.json { head :no_content }
-    end
-  end
-
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_comment
diff --git a/app/policies/comment_policy.rb b/app/policies/comment_policy.rb
index 549c8438..3bdcdda0 100644
--- a/app/policies/comment_policy.rb
+++ b/app/policies/comment_policy.rb
@@ -12,14 +12,10 @@ class CommentPolicy < ApplicationPolicy
     everyone
   end
 
-  [:new?, :destroy?, :update?].each do |action|
+  [:new?, :destroy?, :update?, :edit?].each do |action|
     define_method(action) { admin? || author? }
   end
 
-  def edit?
-    admin?
-  end
-
   def index?
     everyone
   end
diff --git a/config/routes.rb b/config/routes.rb
index 65a8f56a..b0003895 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,11 +14,7 @@ Rails.application.routes.draw do
       post :set_thank_you_note
     end
   end
-  resources :comments, except: [:destroy] do
-    collection do
-      delete :destroy
-    end
-  end
+  resources :comments
   get '/my_request_for_comments', as: 'my_request_for_comments', to: 'request_for_comments#get_my_comment_requests'
   get '/my_rfc_activity', as: 'my_rfc_activity', to: 'request_for_comments#get_rfcs_with_my_comments'
 

From 3dd4cb440b5c2d0efc7b90a4e8918da0255f26ca Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Fri, 25 Aug 2017 18:15:55 +0200
Subject: [PATCH 10/46] Allow to delete single comments via UI

---
 .../stylesheets/request-for-comments.css.scss | 14 +++-
 app/views/request_for_comments/show.html.erb  | 83 +++++++++----------
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 71f7a34a..66171a7d 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -22,8 +22,9 @@
   display: none !important;
 }
 
-p.comment {
-  width: 400px;
+.comment {
+  width: 100%;
+  min-width: 200px;
 }
 
 .popover-header {
@@ -57,11 +58,19 @@ p.comment {
   margin-bottom: 10px;
 }
 
+.popover-comment-editor {
+  width: 100%;
+  height: auto;
+  background-color: inherit;
+  border-style: hidden;
+}
+
 .popover-divider {
   width: 100%;
   height: 1px;
   background-color: #008cba;
   overflow: hidden;
+  margin-top: 10px;
   margin-bottom: 10px;
 }
 
@@ -79,6 +88,7 @@ p.comment {
     max-height: 200px;
     overflow-y: auto;
     border: 1px solid #cccccc;
+    padding: 15px;
 
     .popover-actions {
       display: flex;
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 88f4181b..c1ffc1d7 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -180,10 +180,11 @@ also, all settings from the rails model needed for the editor configuration in t
   function generateCommentHtmlContent(comments) {
     var htmlContent = '';
     comments.forEach(function(comment, index) {
+      var commentText = preprocess(comment.text);
       if (index !== 0) {
         htmlContent += '<div class="popover-divider"></div>'
       }
-      htmlContent += '<p class="comment">';
+      htmlContent += '<div class="comment">';
       htmlContent += '<div class="popover-header">' +
         '<div class="popover-username">' + preprocess(comment.username) + '</div>' +
         '<div class="popover-date">' + comment.date + '</div>';
@@ -194,14 +195,15 @@ also, all settings from the rails model needed for the editor configuration in t
           '</div>'
       }
       htmlContent += '</div>' +
-          '<div class="popover-comment">' + preprocess(comment.text) + '</div>';
+          '<div class="popover-comment">' + commentText + '</div>' +
+          '<textarea class="hidden popover-comment-editor">' + commentText + '</textarea>';
       if (comment.editable) {
         htmlContent += '<div class="popover-actions">' +
-            '<button class="popover-action-button btn btn-xs btn-warning" id="edit-' + comment.id + '"><%= t('shared.edit') %></button>' +
-            '<button class="popover-action-button btn btn-xs btn-danger" id="delete-' + comment.id + '"><%= t('shared.destroy') %></button>' +
+            '<button class="popover-action-button action-edit btn btn-xs btn-warning" data-comment-id=' + comment.id + '><%= t('shared.edit') %></button>' +
+            '<button class="popover-action-button action-delete btn btn-xs btn-danger" data-comment-id=' + comment.id + '><%= t('shared.destroy') %></button>' +
           '</div>';
       }
-      htmlContent += '</p>';
+      htmlContent += '</div>';
     });
     return htmlContent;
   }
@@ -247,29 +249,15 @@ also, all settings from the rails model needed for the editor configuration in t
     })
   }
 
-  function hasCommentsInRow(editor, row){
-    return editor.getSession().getAnnotations().some(function(element) {
-      return element.row === row;
-    })
-  }
-
-  function getCommentsForRow(editor, row){
-    return editor.getSession().getAnnotations().filter(function(element) {
-      return element.row === row;
-    })
-  }
-
-  function deleteComment(file_id, row, editor) {
+  function deleteComment(commentId, editor, file_id, callback) {
     cleanupPopovers();
     var jqxhr = $.ajax({
       type: 'DELETE',
-      url: "/comments",
-      data: {
-        row: row,
-        file_id: file_id          }
+      url: "/comments/" + commentId
     });
-    jqxhr.done(function (response) {
+    jqxhr.done(function () {
       setAnnotations(editor, file_id);
+      callback();
     });
     jqxhr.fail(ajaxError);
   }
@@ -299,6 +287,7 @@ also, all settings from the rails model needed for the editor configuration in t
   function handleSidebarClick(e) {
     var target  = e.domEvent.target;
     var editor =  e.editor;
+    var fileid = $(editor.container).data('file-id');
 
     if (target.className.indexOf("ace_gutter-cell") == -1) return;
 
@@ -307,34 +296,42 @@ also, all settings from the rails model needed for the editor configuration in t
 
     var commentModal = $('#comment-modal');
 
-    if (hasCommentsInRow(editor, row)) {
-      var htmlContent = editor.commentVisualsByLine[row];
-      commentModal.find('#otherComments').show();
-      commentModal.find('#otherComments > .container').html(htmlContent);
+    var otherComments = commentModal.find('#otherComments');
+    var htmlContent = editor.commentVisualsByLine[row];
+    if (htmlContent) {
+      otherComments.show();
+      var container = otherComments.find('.container');
+      container.html(htmlContent);
+      var deleteButtons = container.find('.action-delete');
+      deleteButtons.each(function(index, button) {
+        $(button).on('click', function (event) {
+          var commentId = $(event.target).data('comment-id');
+          deleteComment(commentId, editor, fileid, function () {
+            var parent = $(button).parent().parent();
+            parent.siblings().first().remove(); // potential divider
+            parent.remove(); // the comment itself
+            if (container.html() === '') {
+              otherComments.hide();
+            }
+          });
+        });
+      });
     } else {
-      commentModal.find('#otherComments').hide();
+      otherComments.hide();
     }
 
-    commentModal.find('#addCommentButton').off('click');
-    commentModal.find('#removeAllButton').off('click');
-
-    commentModal.find('#addCommentButton').on('click', function(e){
-      var commenttext = commentModal.find('textarea').val();
-      var file_id = $(editor.container).data('file-id');
-
+    var addCommentButton = commentModal.find('#addCommentButton');
+    addCommentButton.off('click');
+    addCommentButton.on('click', function(){
+      var commentTextarea = commentModal.find('#myComment > textarea');
+      var commenttext = commentTextarea.val();
       if (commenttext !== "") {
-        createComment(file_id, row, editor, commenttext);
-        commentModal.find('textarea').val('') ;
+        createComment(fileid, row, editor, commenttext);
+        commentTextarea.val('') ;
         commentModal.modal('hide');
       }
     });
 
-    commentModal.find('#removeAllButton').on('click', function(e){
-      var file_id = $(editor.container).data('file-id');
-      deleteComment(file_id, row, editor);
-      commentModal.modal('hide');
-    });
-
     commentModal.modal('show');
   }
 

From 73ec4d090249e31867b5e9c8ea00711545a3168c Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Fri, 25 Aug 2017 18:31:47 +0200
Subject: [PATCH 11/46] Remove old delete all button

---
 app/views/exercises/_comment_dialogcontent.html.slim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/exercises/_comment_dialogcontent.html.slim b/app/views/exercises/_comment_dialogcontent.html.slim
index 6018fbd0..04ff3957 100644
--- a/app/views/exercises/_comment_dialogcontent.html.slim
+++ b/app/views/exercises/_comment_dialogcontent.html.slim
@@ -6,5 +6,4 @@
   h5 =t('exercises.implement.comment.addyours')
   textarea.form-control
 
-button#addCommentButton.btn.btn-block.btn-primary(type='button') =t('exercises.implement.comment.addCommentButton')
-button#removeAllButton.btn.btn-block.btn-warning(type='button') =t('exercises.implement.comment.removeAllOnLine')
\ No newline at end of file
+button#addCommentButton.btn.btn-block.btn-primary(type='button') =t('exercises.implement.comment.addCommentButton')
\ No newline at end of file

From bb79852e42d9864162b31d051df1668f0b575689 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Fri, 25 Aug 2017 18:33:39 +0200
Subject: [PATCH 12/46] Do not delete comment containers; replace them with
 success message. This also fixes a visual bug when deleting the last comment

---
 app/assets/stylesheets/request-for-comments.css.scss | 6 ++++++
 app/views/request_for_comments/show.html.erb         | 6 +-----
 config/locales/de.yml                                | 5 +++++
 config/locales/en.yml                                | 5 +++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 66171a7d..16acb580 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -90,6 +90,12 @@
     border: 1px solid #cccccc;
     padding: 15px;
 
+    .comment-removed {
+      margin-top: 20px;
+      margin-bottom: 20px;
+      font-style: italic;
+    }
+
     .popover-actions {
       display: flex;
 
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index c1ffc1d7..070e70de 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -308,11 +308,7 @@ also, all settings from the rails model needed for the editor configuration in t
           var commentId = $(event.target).data('comment-id');
           deleteComment(commentId, editor, fileid, function () {
             var parent = $(button).parent().parent();
-            parent.siblings().first().remove(); // potential divider
-            parent.remove(); // the comment itself
-            if (container.html() === '') {
-              otherComments.hide();
-            }
+            parent.html('<div class="comment-removed"><%= t('comments.deleted') %></div>');
           });
         });
       });
diff --git a/config/locales/de.yml b/config/locales/de.yml
index a8681878..8cdc4817 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -156,6 +156,9 @@ de:
       user_exercise_feedback:
         one: Feedback
         other: Feedback
+      comment:
+        one: Kommentar
+        other: Kommentare
     errors:
       messages:
         together: 'muss zusammen mit %{attribute} definiert werden'
@@ -584,4 +587,6 @@ de:
     estimated_time_20_to_30: "zwischen 20 und 30 Minuten"
     estimated_time_more_30: "mehr als 30 Minuten"
     working_time: "Geschätze Bearbeitungszeit für diese Aufgabe:"
+  comments:
+    deleted: "Gelöscht"
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f53f6485..50a15db4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -177,6 +177,9 @@ en:
       user_exercise_feedback:
         one: Feedback
         other: Feedback
+      comment:
+        one: Comment
+        other: Comments
     errors:
       messages:
         together: 'has to be set along with %{attribute}'
@@ -605,3 +608,5 @@ en:
     estimated_time_20_to_30: "between 20 and 30 minutes"
     estimated_time_more_30: "more than 30 minutes"
     working_time: "Estimated time working on this exercise:"
+  comments:
+    deleted: "Deleted"

From 889987f3ad51de0a84fc3a1d06265ee99095dabc Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Fri, 25 Aug 2017 18:46:04 +0200
Subject: [PATCH 13/46] Refactor styling

---
 .../stylesheets/request-for-comments.css.scss | 91 +++++++++----------
 app/views/request_for_comments/show.html.erb  | 20 ++--
 2 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 16acb580..5c1d9227 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -25,47 +25,51 @@
 .comment {
   width: 100%;
   min-width: 200px;
+
+  .comment-header {
+    width: 100%;
+    overflow: hidden;
+    padding-bottom: 10px;
+    margin: auto;
+
+    .comment-username {
+      font-weight: bold;
+      width: 60%;
+      float: left;
+    }
+
+    .comment-date {
+      text-align: right;
+      color: #008cba;
+      margin-left: 60%;
+      font-size: x-small;
+    }
+
+    .comment-updated {
+      text-align: right;
+      margin-left: 60%;
+      font-size: x-small;
+    }
+  }
+
+  .comment-content {
+    word-wrap: break-word;
+    margin-bottom: 10px;
+  }
+
+  .comment-editor {
+    width: 100%;
+    height: auto;
+    background-color: inherit;
+    border-style: hidden;
+  }
+
+  .comment-actions {
+    display: none;
+  }
 }
 
-.popover-header {
-  width: 100%;
-  overflow: hidden;
-  padding-bottom: 10px;
-  margin: auto;
-}
-
-.popover-username {
-  font-weight: bold;
-  width: 60%;
-  float: left;
-}
-
-.popover-date {
-  text-align: right;
-  color: #008cba;
-  margin-left: 60%;
-  font-size: x-small;
-}
-
-.popover-updated {
-  text-align: right;
-  margin-left: 60%;
-  font-size: x-small;
-}
-
-.popover-comment {
-  word-wrap: break-word;
-  margin-bottom: 10px;
-}
-
-.popover-comment-editor {
-  width: 100%;
-  height: auto;
-  background-color: inherit;
-  border-style: hidden;
-}
-
-.popover-divider {
+.comment-divider {
   width: 100%;
   height: 1px;
   background-color: #008cba;
@@ -74,10 +78,6 @@
   margin-bottom: 10px;
 }
 
-.popover-action-button {
-  display: none;
-}
-
 #otherComments {
   h5 {
     margin-top: 0;
@@ -96,11 +96,10 @@
       font-style: italic;
     }
 
-    .popover-actions {
+    .comment-actions {
       display: flex;
 
-      .popover-action-button {
-        display: block;
+      button {
         margin-right: 5px;
       }
     }
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 070e70de..c064695f 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -182,25 +182,25 @@ also, all settings from the rails model needed for the editor configuration in t
     comments.forEach(function(comment, index) {
       var commentText = preprocess(comment.text);
       if (index !== 0) {
-        htmlContent += '<div class="popover-divider"></div>'
+        htmlContent += '<div class="comment-divider"></div>'
       }
       htmlContent += '<div class="comment">';
-      htmlContent += '<div class="popover-header">' +
-        '<div class="popover-username">' + preprocess(comment.username) + '</div>' +
-        '<div class="popover-date">' + comment.date + '</div>';
+      htmlContent += '<div class="comment-header">' +
+        '<div class="comment-username">' + preprocess(comment.username) + '</div>' +
+        '<div class="comment-date">' + comment.date + '</div>';
       if (comment.updated) {
-        htmlContent += '<div class="popover-updated">' +
+        htmlContent += '<div class="comment-updated">' +
           '<i class="fa fa-pencil" aria-hidden="true"></i>' +
           '<%= t('request_for_comments.comment_edited') %>' +
           '</div>'
       }
       htmlContent += '</div>' +
-          '<div class="popover-comment">' + commentText + '</div>' +
-          '<textarea class="hidden popover-comment-editor">' + commentText + '</textarea>';
+          '<div class="comment-content">' + commentText + '</div>' +
+          '<textarea class="hidden comment-editor">' + commentText + '</textarea>';
       if (comment.editable) {
-        htmlContent += '<div class="popover-actions">' +
-            '<button class="popover-action-button action-edit btn btn-xs btn-warning" data-comment-id=' + comment.id + '><%= t('shared.edit') %></button>' +
-            '<button class="popover-action-button action-delete btn btn-xs btn-danger" data-comment-id=' + comment.id + '><%= t('shared.destroy') %></button>' +
+        htmlContent += '<div class="comment-actions">' +
+            '<button class="action-edit btn btn-xs btn-warning" data-comment-id=' + comment.id + '><%= t('shared.edit') %></button>' +
+            '<button class="action-delete btn btn-xs btn-danger" data-comment-id=' + comment.id + '><%= t('shared.destroy') %></button>' +
           '</div>';
       }
       htmlContent += '</div>';

From 9d7c751bbc0b538032a804d694fe95db4f0c9124 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Fri, 25 Aug 2017 18:53:48 +0200
Subject: [PATCH 14/46] Fix small inconsistency

---
 config/locales/de.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8cdc4817..295941a6 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -455,7 +455,7 @@ de:
     howto: |
       Um Kommentare zu einer Programmzeile hinzuzufügen, kann einfach auf die jeweilige Zeilennummer auf der linken Seite geklickt werden. <br>
       Es öffnet sich ein Textfeld, in dem der Kommentar eingetragen werden kann. <br>
-      Mit "Kommentieren" wird der Kommentar dann gesichert und taucht als Sprechblase neben der Zeile auf.
+      Mit "Kommentar abschicken" wird der Kommentar dann gesichert und taucht als Sprechblase neben der Zeile auf.
     howto_title: 'Anleitung:'
     index:
       get_my_comment_requests: Meine Kommentaranfragen

From 17fb22b9dfa29b37d8def4882ee606c699e67e00 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Thu, 31 Aug 2017 17:06:40 +0200
Subject: [PATCH 15/46] Add basic edit button functionality

---
 .../stylesheets/request-for-comments.css.scss |  2 +-
 app/views/request_for_comments/show.html.erb  | 49 ++++++++++++++-----
 config/locales/de.yml                         |  1 +
 config/locales/en.yml                         |  1 +
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 5c1d9227..e7ae7806 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -58,10 +58,10 @@
   }
 
   .comment-editor {
+    display: none;
     width: 100%;
     height: auto;
     background-color: inherit;
-    border-style: hidden;
   }
 
   .comment-actions {
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index c064695f..e8d91b1d 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -184,7 +184,7 @@ also, all settings from the rails model needed for the editor configuration in t
       if (index !== 0) {
         htmlContent += '<div class="comment-divider"></div>'
       }
-      htmlContent += '<div class="comment">';
+      htmlContent += '<div class="comment" data-comment-id=' + comment.id + '>';
       htmlContent += '<div class="comment-header">' +
         '<div class="comment-username">' + preprocess(comment.username) + '</div>' +
         '<div class="comment-date">' + comment.date + '</div>';
@@ -196,11 +196,11 @@ also, all settings from the rails model needed for the editor configuration in t
       }
       htmlContent += '</div>' +
           '<div class="comment-content">' + commentText + '</div>' +
-          '<textarea class="hidden comment-editor">' + commentText + '</textarea>';
+          '<textarea class="comment-editor">' + commentText + '</textarea>';
       if (comment.editable) {
         htmlContent += '<div class="comment-actions">' +
-            '<button class="action-edit btn btn-xs btn-warning" data-comment-id=' + comment.id + '><%= t('shared.edit') %></button>' +
-            '<button class="action-delete btn btn-xs btn-danger" data-comment-id=' + comment.id + '><%= t('shared.destroy') %></button>' +
+            '<button class="action-edit btn btn-xs btn-warning"><%= t('shared.edit') %></button>' +
+            '<button class="action-delete btn btn-xs btn-danger"><%= t('shared.destroy') %></button>' +
           '</div>';
       }
       htmlContent += '</div>';
@@ -302,16 +302,43 @@ also, all settings from the rails model needed for the editor configuration in t
       otherComments.show();
       var container = otherComments.find('.container');
       container.html(htmlContent);
+
       var deleteButtons = container.find('.action-delete');
-      deleteButtons.each(function(index, button) {
-        $(button).on('click', function (event) {
-          var commentId = $(event.target).data('comment-id');
-          deleteComment(commentId, editor, fileid, function () {
-            var parent = $(button).parent().parent();
-            parent.html('<div class="comment-removed"><%= t('comments.deleted') %></div>');
-          });
+      deleteButtons.on('click', function (event) {
+        var button = $(event.target);
+        var parent = $(button).parent().parent();
+        var commentId = parent.data('comment-id');
+
+        deleteComment(commentId, editor, fileid, function () {
+          parent.html('<div class="comment-removed"><%= t('comments.deleted') %></div>');
         });
       });
+
+      var editButtons = container.find('.action-edit');
+      editButtons.on('click', function (event) {
+        var button = $(event.target);
+        var parent = $(button).parent().parent();
+        var commentId = parent.data('comment-id');
+        var currentlyEditing = button.data('editing');
+
+        var deleteButton = parent.find('.action-delete');
+        var commentContent = parent.find('.comment-content');
+        var commentEditor = parent.find('textarea.comment-editor');
+
+        if (currentlyEditing) {
+          button.text('<%= t('shared.edit') %>');
+          button.data('editing', false);
+          deleteButton.show();
+          commentContent.show();
+          commentEditor.hide();
+        } else {
+          button.text('<%= t('comments.save_update') %>');
+          button.data('editing', true);
+          deleteButton.hide();
+          commentContent.hide();
+          commentEditor.show();
+        }
+      });
     } else {
       otherComments.hide();
     }
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 295941a6..82bd67b0 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -589,4 +589,5 @@ de:
     working_time: "Geschätze Bearbeitungszeit für diese Aufgabe:"
   comments:
     deleted: "Gelöscht"
+    save_update: "Speichern"
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 50a15db4..27fee7c7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -610,3 +610,4 @@ en:
     working_time: "Estimated time working on this exercise:"
   comments:
     deleted: "Deleted"
+    save_update: "Save"

From 00e727a3253b34c04df991ac3f628256ac97bdf3 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Thu, 31 Aug 2017 17:42:20 +0200
Subject: [PATCH 16/46] Actually update comments in the backend

---
 app/views/request_for_comments/show.html.erb | 33 +++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index e8d91b1d..a222fa7d 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -262,6 +262,24 @@ also, all settings from the rails model needed for the editor configuration in t
     jqxhr.fail(ajaxError);
   }
 
+  function updateComment(commentId, text, editor, file_id, callback) {
+    cleanupPopovers();
+    var jqxhr = $.ajax({
+      type: 'PATCH',
+      url: "/comments/" + commentId,
+      data: {
+        comment: {
+          text: text
+        }
+      }
+    });
+    jqxhr.done(function () {
+      setAnnotations(editor, file_id);
+      callback();
+    });
+    jqxhr.fail(ajaxError);
+  }
+
   function createComment(file_id, row, editor, commenttext){
     cleanupPopovers();
     var jqxhr = $.ajax({
@@ -324,13 +342,18 @@ also, all settings from the rails model needed for the editor configuration in t
         var deleteButton = parent.find('.action-delete');
         var commentContent = parent.find('.comment-content');
         var commentEditor = parent.find('textarea.comment-editor');
+        var commentUpdated = parent.find('.comment-updated');
 
         if (currentlyEditing) {
-          button.text('<%= t('shared.edit') %>');
-          button.data('editing', false);
-          deleteButton.show();
-          commentContent.show();
-          commentEditor.hide();
+          updateComment(commentId, commentEditor.val(), editor, fileid, function () {
+            button.text('<%= t('shared.edit') %>');
+            button.data('editing', false);
+            commentContent.text(commentEditor.val());
+            deleteButton.show();
+            commentContent.show();
+            commentEditor.hide();
+            commentUpdated.removeClass('hidden');
+          });
         } else {
           button.text('<%= t('comments.save_update') %>');
           button.data('editing', true);

From 178ec5c10d4cc4cfd172d43bdde4057b42ae639d Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Thu, 31 Aug 2017 17:42:38 +0200
Subject: [PATCH 17/46] Refactor comment template

---
 app/views/request_for_comments/show.html.erb | 37 +++++++++-----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index a222fa7d..11ae2512 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -184,26 +184,23 @@ also, all settings from the rails model needed for the editor configuration in t
       if (index !== 0) {
         htmlContent += '<div class="comment-divider"></div>'
       }
-      htmlContent += '<div class="comment" data-comment-id=' + comment.id + '>';
-      htmlContent += '<div class="comment-header">' +
-        '<div class="comment-username">' + preprocess(comment.username) + '</div>' +
-        '<div class="comment-date">' + comment.date + '</div>';
-      if (comment.updated) {
-        htmlContent += '<div class="comment-updated">' +
-          '<i class="fa fa-pencil" aria-hidden="true"></i>' +
-          '<%= t('request_for_comments.comment_edited') %>' +
-          '</div>'
-      }
-      htmlContent += '</div>' +
-          '<div class="comment-content">' + commentText + '</div>' +
-          '<textarea class="comment-editor">' + commentText + '</textarea>';
-      if (comment.editable) {
-        htmlContent += '<div class="comment-actions">' +
-            '<button class="action-edit btn btn-xs btn-warning"><%= t('shared.edit') %></button>' +
-            '<button class="action-delete btn btn-xs btn-danger"><%= t('shared.destroy') %></button>' +
-          '</div>';
-      }
-      htmlContent += '</div>';
+      htmlContent += '\
+        <div class="comment" data-comment-id=' + comment.id + '> \
+          <div class="comment-header"> \
+            <div class="comment-username">' + preprocess(comment.username) + '</div> \
+            <div class="comment-date">' + comment.date + '</div> \
+            <div class="comment-updated' + (comment.updated ? '' : ' hidden') + '"> \
+              <i class="fa fa-pencil" aria-hidden="true"></i> \
+              <%= t('request_for_comments.comment_edited') %> \
+            </div> \
+          </div> \
+          <div class="comment-content">' + commentText + '</div> \
+          <textarea class="comment-editor">' + commentText + '</textarea> \
+          <div class="comment-actions' + (comment.editable ? '' : ' hidden') + '"> \
+            <button class="action-edit btn btn-xs btn-warning"><%= t('shared.edit') %></button> \
+            <button class="action-delete btn btn-xs btn-danger"><%= t('shared.destroy') %></button> \
+          </div> \
+        </div>';
     });
     return htmlContent;
   }

From 8ce46d2cb8a648bc7a43128efcb8b7a728d10d50 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Tue, 5 Sep 2017 15:48:19 +0200
Subject: [PATCH 18/46] Add a custom jquery-ui library for minimal mouse
 interaction support

---
 app/assets/javascripts/application.js                 | 1 +
 vendor/assets/javascripts/jquery-ui.min.js            | 8 ++++++++
 vendor/assets/stylesheets/jquery-ui.min.css           | 6 ++++++
 vendor/assets/stylesheets/jquery-ui.structure.min.css | 5 +++++
 4 files changed, 20 insertions(+)
 create mode 100644 vendor/assets/javascripts/jquery-ui.min.js
 create mode 100644 vendor/assets/stylesheets/jquery-ui.min.css
 create mode 100644 vendor/assets/stylesheets/jquery-ui.structure.min.css

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ccf8ce15..533a8a9b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,6 +14,7 @@
 //
 //= require ace/ace
 //= require chosen.jquery.min
+//= require jquery-ui.min
 //= require d3
 //= require jquery.turbolinks
 //= require jquery_ujs
diff --git a/vendor/assets/javascripts/jquery-ui.min.js b/vendor/assets/javascripts/jquery-ui.min.js
new file mode 100644
index 00000000..e80d260c
--- /dev/null
+++ b/vendor/assets/javascripts/jquery-ui.min.js
@@ -0,0 +1,8 @@
+/*! jQuery UI - v1.12.1 - 2017-09-05
+* http://jqueryui.com
+* Includes: widget.js, data.js, disable-selection.js, scroll-parent.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/mouse.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){t.ui=t.ui||{},t.ui.version="1.12.1";var e=0,i=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var s,n,o=i.call(arguments,1),a=0,r=o.length;r>a;a++)for(s in o[a])n=o[a][s],o[a].hasOwnProperty(s)&&void 0!==n&&(e[s]=t.isPlainObject(n)?t.isPlainObject(e[s])?t.widget.extend({},e[s],n):t.widget.extend({},n):n);return e},t.widget.bridge=function(e,s){var n=s.prototype.widgetFullName||e;t.fn[e]=function(o){var a="string"==typeof o,r=i.call(arguments,1),l=this;return a?this.length||"instance"!==o?this.each(function(){var i,s=t.data(this,n);return"instance"===o?(l=s,!1):s?t.isFunction(s[o])&&"_"!==o.charAt(0)?(i=s[o].apply(s,r),i!==s&&void 0!==i?(l=i&&i.jquery?l.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+o+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+o+"'")}):l=void 0:(r.length&&(o=t.widget.extend.apply(null,[o].concat(r))),this.each(function(){var e=t.data(this,n);e?(e.option(o||{}),e._init&&e._init()):t.data(this,n,new s(o,this))})),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(i,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=e++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),i),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var s=!1;t(document).on("mouseup",function(){s=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!s){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,n=1===e.which,o="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),s=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,s=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),l=t.pageX,h=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(l=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(h=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(l=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(h=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,h=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((l-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,l=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(l=this.originalPageX),"x"===a.axis&&(h=this.originalPageY)),{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:l-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,l,h,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)l=s.snapElements[d].left-s.margins.left,h=l+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,l-g>_||m>h+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(l-_),r=g>=Math.abs(h-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(l-m),r=g>=Math.abs(h-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))
+},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,o=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&n(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(o=!0,!1):void 0}),o?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var n=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,l=a+e.helperProportions.height,h=i.offset.left,c=i.offset.top,u=h+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=h&&u>=r&&a>=c&&d>=l;case"intersect":return o+e.helperProportions.width/2>h&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>l-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,h,i.proportions().width);case"touch":return(a>=c&&d>=a||l>=c&&d>=l||c>a&&l>d)&&(o>=h&&u>=o||r>=h&&u>=r||h>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&n(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,o,a,r=n(e,this,this.options.tolerance,i),l=!r&&this.isover?"isout":r&&!this.isover?"isover":null;l&&(this.options.greedy&&(o=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===o}),a.length&&(s=t(a[0]).droppable("instance"),s.greedyChild="isover"===l)),s&&"isover"===l&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[l]=!0,this["isout"===l?"isover":"isout"]=!1,this["isover"===l?"_over":"_out"].call(this,i),s&&"isout"===l&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,l=this._change[o];return this._updatePrevProperties(),l?(i=l.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,l,h=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,l=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,h.animate||this.element.css(t.extend(a,{top:l,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!h.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&c&&(t.top=l-e.minHeight),n&&c&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,l={width:i.size.width-r,height:i.size.height-a},h=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(l,c&&h?{top:c,left:h}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,l=t(this).resizable("instance"),h=l.options,c=l.element,u=h.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(l.containerElement=t(d),/document/.test(u)||u===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=l._num(e.css("padding"+s))}),l.containerOffset=e.offset(),l.containerPosition=e.position(),l.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=l.containerOffset,n=l.containerSize.height,o=l.containerSize.width,a=l._hasScroll(d,"left")?d.scrollWidth:o,r=l._hasScroll(d)?d.scrollHeight:n,l.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,l=a.containerOffset,h=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=l),h.left<(a._helper?l.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-l.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?l.left:0),h.top<(a._helper?l.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-l.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?l.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-l.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-l.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,l="number"==typeof s.grid?[s.grid,s.grid]:s.grid,h=l[0]||1,c=l[1]||1,u=Math.round((n.width-o.width)/h)*h,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=l,_&&(p+=h),v&&(f+=c),g&&(p-=h),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-h)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-h>0?(i.size.width=p,i.position.left=a.left-u):(p=h-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,l=e.pageY;return o>r&&(i=r,r=o,o=i),a>l&&(i=l,l=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:l-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),h=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?h=!(c.left>r||o>c.right||c.top>l||a>c.bottom):"fit"===n.tolerance&&(h=c.left>o&&r>c.right&&c.top>a&&l>c.bottom),h?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;
+this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,l=r+t.height,h=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+h>r&&l>s+h,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&l>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],l=[],h=this._connectWith();if(h&&e)for(s=h.length-1;s>=0;s--)for(o=t(h[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&l.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(l.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=l.length-1;s>=0;s--)l[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,l,h,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,h=r.length;h>s;s++)l=t(r[s]),l.data(this.widgetName+"-item",a),c.push({item:l,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,l,h,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(l=this.items[s].item.offset()[a],h=!1,e[u]-l>this.items[s][r]/2&&(h=!0),n>Math.abs(e[u]-l)&&(n=Math.abs(e[u]-l),o=this.items[s],this.direction=h?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,l=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():l?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():l?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})});
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/jquery-ui.min.css b/vendor/assets/stylesheets/jquery-ui.min.css
new file mode 100644
index 00000000..9e4d953e
--- /dev/null
+++ b/vendor/assets/stylesheets/jquery-ui.min.css
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.12.1 - 2017-09-05
+* http://jqueryui.com
+* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/jquery-ui.structure.min.css b/vendor/assets/stylesheets/jquery-ui.structure.min.css
new file mode 100644
index 00000000..18ab6eb7
--- /dev/null
+++ b/vendor/assets/stylesheets/jquery-ui.structure.min.css
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.12.1 - 2017-09-05
+* http://jqueryui.com
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}
\ No newline at end of file

From 7bb77e5829549f73c80098312c5c0b77cedaffc2 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Tue, 5 Sep 2017 15:57:42 +0200
Subject: [PATCH 19/46] Make modal draggable

---
 app/views/request_for_comments/show.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 11ae2512..41bac9e5 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -81,6 +81,8 @@ also, all settings from the rails model needed for the editor configuration in t
 
 <script type="text/javascript">
 
+  $('.modal-content').draggable({handle: '.modal-header'});
+
   var solvedButton = $('#mark-as-solved-button');
   var addCommentExerciseButton = $('#addCommentExerciseButton');
 

From cded685f50ab1313a4f269b1adc64b6a9ba7821e Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Tue, 5 Sep 2017 16:04:50 +0200
Subject: [PATCH 20/46] Make modal resizable

---
 app/assets/stylesheets/request-for-comments.css.scss | 5 +++++
 app/views/request_for_comments/show.html.erb         | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index e7ae7806..801ee000 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -22,6 +22,11 @@
   display: none !important;
 }
 
+.modal-content {
+  min-height: 512px;
+  min-width: 360px;
+}
+
 .comment {
   width: 100%;
   min-width: 200px;
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 41bac9e5..a41c7921 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -81,7 +81,11 @@ also, all settings from the rails model needed for the editor configuration in t
 
 <script type="text/javascript">
 
-  $('.modal-content').draggable({handle: '.modal-header'});
+  $('.modal-content').draggable({
+    handle: '.modal-header'
+  }).resizable({
+    autoHide: true
+  });
 
   var solvedButton = $('#mark-as-solved-button');
   var addCommentExerciseButton = $('#addCommentExerciseButton');

From 2869c0d7b81c98f0410091f3fdd96f306a9049e6 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Tue, 5 Sep 2017 16:39:40 +0200
Subject: [PATCH 21/46] Allow modal content to grow

---
 .../stylesheets/request-for-comments.css.scss | 24 ++++++++++++++++++-
 .../_comment_dialogcontent.html.slim          |  3 +--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 801ee000..5f272825 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -25,6 +25,25 @@
 .modal-content {
   min-height: 512px;
   min-width: 360px;
+  max-height: 90vh;
+  display: flex;
+  flex-direction: column;
+
+  .modal-body {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+
+    #otherComments {
+      flex-grow: 1;
+      display: flex;
+      flex-direction: column;
+
+      .container {
+        flex-grow: 1;
+      }
+    }
+  }
 }
 
 .comment {
@@ -90,7 +109,6 @@
 
   .container {
     width: 100%;
-    max-height: 200px;
     overflow-y: auto;
     border: 1px solid #cccccc;
     padding: 15px;
@@ -118,4 +136,8 @@
   textarea {
     resize: none;
   }
+
+  button {
+    margin-top: 10px;
+  }
 }
\ No newline at end of file
diff --git a/app/views/exercises/_comment_dialogcontent.html.slim b/app/views/exercises/_comment_dialogcontent.html.slim
index 04ff3957..4eb59190 100644
--- a/app/views/exercises/_comment_dialogcontent.html.slim
+++ b/app/views/exercises/_comment_dialogcontent.html.slim
@@ -5,5 +5,4 @@
 #myComment
   h5 =t('exercises.implement.comment.addyours')
   textarea.form-control
-
-button#addCommentButton.btn.btn-block.btn-primary(type='button') =t('exercises.implement.comment.addCommentButton')
\ No newline at end of file
+  button#addCommentButton.btn.btn-block.btn-primary(type='button') =t('exercises.implement.comment.addCommentButton')
\ No newline at end of file

From b3cf7affa6181852712563b9d1d2c066bb24cb4a Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 6 Sep 2017 13:08:39 +0200
Subject: [PATCH 22/46] Add line number to modal title

---
 app/views/request_for_comments/show.html.erb | 1 +
 config/locales/de.yml                        | 1 +
 config/locales/en.yml                        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index a41c7921..77ad293d 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -314,6 +314,7 @@ also, all settings from the rails model needed for the editor configuration in t
 
     var row = e.getDocumentPosition().row;
     e.stop();
+    $('.modal-title').text('<%= t('request_for_comments.modal_title') %>'.replace('${line}', row + 1));
 
     var commentModal = $('#comment-modal');
 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 82bd67b0..3d362183 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -473,6 +473,7 @@ de:
     send_thank_you_note: "Senden"
     cancel_thank_you_note: "Nichts senden"
     comment_edited: "bearbeitet"
+    modal_title: "Einen Kommentar in Zeile ${line} hinzufügen"
   sessions:
     create:
       failure: Fehlerhafte E-Mail oder Passwort.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 27fee7c7..675e4358 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -494,6 +494,7 @@ en:
     send_thank_you_note: "Send"
     cancel_thank_you_note: "Don't send"
     comment_edited: "edited"
+    modal_title: "Add a comment to line ${line}"
   sessions:
     create:
       failure: Invalid email or password.

From cc5da9ccfccbfd445b20d1228d9a4f249e93fe13 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 6 Sep 2017 13:33:54 +0200
Subject: [PATCH 23/46] Only most recent comments in preview if there are more
 than three comments on one line

---
 .../stylesheets/request-for-comments.css.scss     |  7 ++++++-
 app/views/request_for_comments/show.html.erb      | 15 +++++++++++----
 config/locales/de.yml                             |  1 +
 config/locales/en.yml                             |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 5f272825..9810afb8 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -140,4 +140,9 @@
   button {
     margin-top: 10px;
   }
-}
\ No newline at end of file
+}
+
+.popover-footer {
+  color: #008cba;
+  margin-top: 10px;
+}
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 77ad293d..c8b8d3b9 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -211,7 +211,15 @@ also, all settings from the rails model needed for the editor configuration in t
     return htmlContent;
   }
 
-  function buildPopover(fileid, line, htmlContent) {
+  function buildPopover(fileid, line, comments) {
+    // only display the newest three comments in preview
+    var maxComments = 3;
+    var htmlContent = generateCommentHtmlContent(comments.reverse().slice(0, maxComments));
+    if (comments.length > maxComments) {
+      // add a hint that there are more comments than shown here
+      htmlContent += '<div class="popover-footer"><%= t('request_for_comments.click_for_more_comments') %></div>'
+        .replace('${numComments}', comments.length - maxComments);
+    }
     // attach the popover to the ace sidebar (where the comment icon is displayed)
     var icon = $('*[data-file-id="' + fileid + '"]')          // the editor for this file
       .find('.ace_gutter > .ace_gutter-layer')                // the sidebar
@@ -240,9 +248,8 @@ also, all settings from the rails model needed for the editor configuration in t
       editor.commentVisualsByLine = {};
       var clusters = clusterComments(response.slice());
       $.each(clusters, function (line, cluster) {
-        var htmlContent = generateCommentHtmlContent(cluster);
-        editor.commentVisualsByLine[line] = htmlContent;
-        buildPopover(fileid, line, htmlContent);
+        editor.commentVisualsByLine[line] = generateCommentHtmlContent(cluster);
+        buildPopover(fileid, line, cluster);
       });
 
       $.each(response, function(index, comment) {
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3d362183..3089d2cd 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -474,6 +474,7 @@ de:
     cancel_thank_you_note: "Nichts senden"
     comment_edited: "bearbeitet"
     modal_title: "Einen Kommentar in Zeile ${line} hinzufügen"
+    click_for_more_comments: "Klicken um ${numComments} weitere Kommentare zu sehen..."
   sessions:
     create:
       failure: Fehlerhafte E-Mail oder Passwort.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 675e4358..bc0737b8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -495,6 +495,7 @@ en:
     cancel_thank_you_note: "Don't send"
     comment_edited: "edited"
     modal_title: "Add a comment to line ${line}"
+    click_for_more_comments: "Click to view ${numComments} more comments..."
   sessions:
     create:
       failure: Invalid email or password.

From f628774995565ea0bf2e41082c33f8d9337762a9 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 6 Sep 2017 14:25:18 +0200
Subject: [PATCH 24/46] Add checkbox to subscribe to author's comments

---
 app/assets/stylesheets/request-for-comments.css.scss | 5 +++++
 app/views/exercises/_comment_dialogcontent.html.slim | 3 +++
 config/locales/de.yml                                | 1 +
 config/locales/en.yml                                | 1 +
 4 files changed, 10 insertions(+)

diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 9810afb8..e0ff5fa0 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -127,6 +127,11 @@
       }
     }
   }
+
+  input#subscribe {
+    margin-top: 5px;
+    margin-right: 5px;
+  }
 }
 
 #myComment {
diff --git a/app/views/exercises/_comment_dialogcontent.html.slim b/app/views/exercises/_comment_dialogcontent.html.slim
index 4eb59190..cdb7441e 100644
--- a/app/views/exercises/_comment_dialogcontent.html.slim
+++ b/app/views/exercises/_comment_dialogcontent.html.slim
@@ -1,6 +1,9 @@
 #otherComments
   h5 =t('exercises.implement.comment.others')
   .container
+  label
+    input#subscribe type='checkbox' title=t('request_for_comments.subscribe_to_author')
+    = t('request_for_comments.subscribe_to_author')
 
 #myComment
   h5 =t('exercises.implement.comment.addyours')
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3089d2cd..76a01d1f 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -475,6 +475,7 @@ de:
     comment_edited: "bearbeitet"
     modal_title: "Einen Kommentar in Zeile ${line} hinzufügen"
     click_for_more_comments: "Klicken um ${numComments} weitere Kommentare zu sehen..."
+    subscribe_to_author: "Bei neuen Kommentaren des Autors per E-Mail benachrichtigt werden"
   sessions:
     create:
       failure: Fehlerhafte E-Mail oder Passwort.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bc0737b8..8fde6821 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -496,6 +496,7 @@ en:
     comment_edited: "edited"
     modal_title: "Add a comment to line ${line}"
     click_for_more_comments: "Click to view ${numComments} more comments..."
+    subscribe_to_author: "Receive E-Mail notifications for new comments of the original author"
   sessions:
     create:
       failure: Invalid email or password.

From 5aa9edb209896172eeeb28629766d7954e54ef28 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 6 Sep 2017 15:16:47 +0200
Subject: [PATCH 25/46] Add subscription model and link it to RFC

---
 app/models/request_for_comment.rb             |  2 +
 app/models/subscription.rb                    |  4 ++
 .../20170906124500_create_subscriptions.rb    | 11 ++++
 db/schema.rb                                  | 51 ++++++++++++++++++-
 test/factories/subscriptions.rb               |  7 +++
 test/models/subscription_test.rb              |  7 +++
 6 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 app/models/subscription.rb
 create mode 100644 db/migrate/20170906124500_create_subscriptions.rb
 create mode 100644 test/factories/subscriptions.rb
 create mode 100644 test/models/subscription_test.rb

diff --git a/app/models/request_for_comment.rb b/app/models/request_for_comment.rb
index 22b39b39..193717c6 100644
--- a/app/models/request_for_comment.rb
+++ b/app/models/request_for_comment.rb
@@ -5,6 +5,8 @@ class RequestForComment < ActiveRecord::Base
   belongs_to :file, class_name: 'CodeOcean::File'
 
   has_many :comments, through: :submission
+  has_many :subscriptions
+  has_many :subscribers, through: :subscriptions, source: :user, source_type: ExternalUser
 
   scope :unsolved, -> { where(solved: [false, nil]) }
 
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
new file mode 100644
index 00000000..abe1b513
--- /dev/null
+++ b/app/models/subscription.rb
@@ -0,0 +1,4 @@
+class Subscription < ActiveRecord::Base
+  belongs_to :user, polymorphic: true
+  belongs_to :request_for_comment
+end
diff --git a/db/migrate/20170906124500_create_subscriptions.rb b/db/migrate/20170906124500_create_subscriptions.rb
new file mode 100644
index 00000000..5dba42ab
--- /dev/null
+++ b/db/migrate/20170906124500_create_subscriptions.rb
@@ -0,0 +1,11 @@
+class CreateSubscriptions < ActiveRecord::Migration
+  def change
+    create_table :subscriptions do |t|
+      t.belongs_to :user, polymorphic: true
+      t.references :request_for_comment
+      t.string :type
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 81693c1d..1b882e3d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170608141612) do
+ActiveRecord::Schema.define(version: 20170906124500) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -47,6 +47,30 @@ ActiveRecord::Schema.define(version: 20170608141612) do
     t.string   "oauth_secret", limit: 255
   end
 
+  create_table "error_template_attributes", force: :cascade do |t|
+    t.string   "key"
+    t.string   "regex"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+    t.text     "description"
+    t.boolean  "important"
+  end
+
+  create_table "error_template_attributes_templates", id: false, force: :cascade do |t|
+    t.integer "error_template_id",           null: false
+    t.integer "error_template_attribute_id", null: false
+  end
+
+  create_table "error_templates", force: :cascade do |t|
+    t.integer  "execution_environment_id"
+    t.string   "name"
+    t.string   "signature"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
+    t.text     "description"
+    t.text     "hint"
+  end
+
   create_table "errors", force: :cascade do |t|
     t.integer  "execution_environment_id"
     t.text     "message"
@@ -268,6 +292,22 @@ ActiveRecord::Schema.define(version: 20170608141612) do
     t.datetime "updated_at"
   end
 
+  create_table "structured_error_attributes", force: :cascade do |t|
+    t.integer  "structured_error_id"
+    t.integer  "error_template_attribute_id"
+    t.string   "value"
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
+    t.boolean  "match"
+  end
+
+  create_table "structured_errors", force: :cascade do |t|
+    t.integer  "error_template_id"
+    t.integer  "file_id"
+    t.datetime "created_at",        null: false
+    t.datetime "updated_at",        null: false
+  end
+
   create_table "submissions", force: :cascade do |t|
     t.integer  "exercise_id"
     t.float    "score"
@@ -281,6 +321,15 @@ ActiveRecord::Schema.define(version: 20170608141612) do
   add_index "submissions", ["exercise_id"], name: "index_submissions_on_exercise_id", using: :btree
   add_index "submissions", ["user_id"], name: "index_submissions_on_user_id", using: :btree
 
+  create_table "subscriptions", force: :cascade do |t|
+    t.integer  "user_id"
+    t.string   "user_type"
+    t.integer  "request_for_comment_id"
+    t.string   "type"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+  end
+
   create_table "tags", force: :cascade do |t|
     t.string   "name",       null: false
     t.datetime "created_at"
diff --git a/test/factories/subscriptions.rb b/test/factories/subscriptions.rb
new file mode 100644
index 00000000..11c5a67a
--- /dev/null
+++ b/test/factories/subscriptions.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :subscription do
+    user nil
+    request_for_comments nil
+    type ""
+  end
+end
diff --git a/test/models/subscription_test.rb b/test/models/subscription_test.rb
new file mode 100644
index 00000000..a045d1ea
--- /dev/null
+++ b/test/models/subscription_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SubscriptionTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From f77c7410e18158ad744db5a0f52c51a29692f33f Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 6 Sep 2017 16:18:44 +0200
Subject: [PATCH 26/46] Add subscription controller

---
 app/controllers/subscription_controller.rb    | 20 +++++++++++++++++++
 .../subscription_controller_test.rb           |  7 +++++++
 2 files changed, 27 insertions(+)
 create mode 100644 app/controllers/subscription_controller.rb
 create mode 100644 test/controllers/subscription_controller_test.rb

diff --git a/app/controllers/subscription_controller.rb b/app/controllers/subscription_controller.rb
new file mode 100644
index 00000000..afeedb9b
--- /dev/null
+++ b/app/controllers/subscription_controller.rb
@@ -0,0 +1,20 @@
+class SubscriptionController < ApplicationController
+
+  def authorize!
+    authorize(@submission || @submissions)
+  end
+  private :authorize!
+
+  def set_subscription
+    @subscription = Subscription.find(params[:id])
+    authorize!
+  end
+  private :set_subscription
+
+  def subscription_params
+    current_user_id = current_user.try(:id)
+    current_user_class_name = current_user.try(:class).try(:name)
+    params[:subscription].permit(:request_for_comment, :type).merge(user_id: current_user_id, user_type: current_user_class_name)
+  end
+  private :subscription_params
+end
diff --git a/test/controllers/subscription_controller_test.rb b/test/controllers/subscription_controller_test.rb
new file mode 100644
index 00000000..8dde0e19
--- /dev/null
+++ b/test/controllers/subscription_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SubscriptionControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 453d8fcb851031b9446f9014aecdf83de0ca9a71 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 6 Sep 2017 16:19:03 +0200
Subject: [PATCH 27/46] Remove subscribers attribute

---
 app/models/request_for_comment.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/request_for_comment.rb b/app/models/request_for_comment.rb
index 193717c6..bbdaf461 100644
--- a/app/models/request_for_comment.rb
+++ b/app/models/request_for_comment.rb
@@ -6,7 +6,6 @@ class RequestForComment < ActiveRecord::Base
 
   has_many :comments, through: :submission
   has_many :subscriptions
-  has_many :subscribers, through: :subscriptions, source: :user, source_type: ExternalUser
 
   scope :unsolved, -> { where(solved: [false, nil]) }
 

From 4baab7430c39a43391b9ab7c78beadb4fe685b49 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 07:06:55 +0200
Subject: [PATCH 28/46] push commenters to RFC model

---
 app/controllers/request_for_comments_controller.rb | 7 ++-----
 app/models/request_for_comment.rb                  | 8 ++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/request_for_comments_controller.rb b/app/controllers/request_for_comments_controller.rb
index fca5c99b..b55c3212 100644
--- a/app/controllers/request_for_comments_controller.rb
+++ b/app/controllers/request_for_comments_controller.rb
@@ -68,11 +68,8 @@ class RequestForCommentsController < ApplicationController
   def set_thank_you_note
     authorize!
     @request_for_comment.thank_you_note = params[:note]
-    commenters = []
-    @request_for_comment.comments.distinct.to_a.each {|comment|
-      commenters.append comment.user
-    }
-    commenters = commenters.uniq {|user| user.id}
+
+    commenters = @request_for_comment.commenters
     commenters.each {|commenter| UserMailer.send_thank_you_note(@request_for_comment, commenter).deliver_now}
 
     respond_to do |format|
diff --git a/app/models/request_for_comment.rb b/app/models/request_for_comment.rb
index bbdaf461..71a2fdd1 100644
--- a/app/models/request_for_comment.rb
+++ b/app/models/request_for_comment.rb
@@ -38,6 +38,14 @@ class RequestForComment < ActiveRecord::Base
     submission.files.map { |file| file.comments.size}.sum
   end
 
+  def commenters
+    commenters = []
+    comments.distinct.to_a.each {|comment|
+      commenters.append comment.user
+    }
+    commenters.uniq {|user| user.id}
+  end
+
   def to_s
     "RFC-" + self.id.to_s
   end

From 811fc72e1ecb7c84dd66a718f9976d3facf6eb03 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 07:07:06 +0200
Subject: [PATCH 29/46] Add mailer for subscriptions

---
 app/controllers/comments_controller.rb | 50 +++++++++++++++++++-------
 app/mailers/user_mailer.rb             |  8 +++++
 config/locales/de.yml                  | 37 +++++++++++++++++++
 config/locales/en.yml                  | 37 +++++++++++++++++++
 4 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 90922fb1..bc784e8f 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -51,12 +51,16 @@ class CommentsController < ApplicationController
   def create
     @comment = Comment.new(comment_params_without_request_id)
 
-    if comment_params[:request_id]
-      UserMailer.got_new_comment(@comment, RequestForComment.find(comment_params[:request_id]), current_user).deliver_now
-    end
-
     respond_to do |format|
       if @comment.save
+
+
+        if comment_params[:request_id]
+          request_for_comment = RequestForComment.find(comment_params[:request_id])
+          send_mail_to_author @comment, request_for_comment
+          send_mail_to_subscribers @comment, request_for_comment
+        end
+
         format.html { redirect_to @comment, notice: 'Comment was successfully created.' }
         format.json { render :show, status: :created, location: @comment }
       else
@@ -94,19 +98,39 @@ class CommentsController < ApplicationController
   end
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_comment
-      @comment = Comment.find(params[:id])
-    end
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_comment
+    @comment = Comment.find(params[:id])
+  end
 
   def comment_params_without_request_id
     comment_params.except :request_id
   end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def comment_params
-      #params.require(:comment).permit(:user_id, :file_id, :row, :column, :text)
-      # fuer production mode, damit böse menschen keine falsche user_id uebergeben:
-      params.require(:comment).permit(:file_id, :row, :column, :text, :request_id).merge(user_id: current_user.id, user_type: current_user.class.name)
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def comment_params
+    #params.require(:comment).permit(:user_id, :file_id, :row, :column, :text)
+    # fuer production mode, damit böse menschen keine falsche user_id uebergeben:
+    params.require(:comment).permit(:file_id, :row, :column, :text, :request_id).merge(user_id: current_user.id, user_type: current_user.class.name)
+  end
+
+  def send_mail_to_author(comment, request_for_comment)
+    if current_user != request_for_comment.user
+      UserMailer.got_new_comment(comment, request_for_comment, current_user).deliver_now
     end
+  end
+
+  def send_mail_to_subscribers(comment, request_for_comment)
+    request_for_comment.commenters.each do |commenter|
+      subscriptions = Subscription.where(
+          :request_for_comment_id => request_for_comment.id,
+          :user_id => commenter.id, :user_type => commenter.class.name)
+      subscriptions.each do |subscription|
+        if (subscription.type == 'author' and current_user == request_for_comment.user) or subscription.type == 'all'
+          UserMailer.got_new_comment_for_subscription(comment, request_for_comment, request_for_comment.user, current_user).deliver_now
+        end
+      end
+    end
+  end
 end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 180e9b33..1cf7e7a0 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -21,6 +21,14 @@ class UserMailer < ActionMailer::Base
     mail(subject: t('mailers.user_mailer.got_new_comment.subject', commenting_user_displayname: @commenting_user_displayname), to: request_for_comment.user.email)
   end
 
+  def got_new_comment_for_subscription(comment, request_for_comment, from_user, to_user)
+    @receiver_displayname = user.displayname
+    @author_displayname = from_user.displayname
+    @comment_text = comment.text
+    @rfc_link = request_for_comment_url(request_for_comment)
+    mail(subject: t('mailers.user_mailer.got_new_comment_for_subscription.subject', author_displayname: @author_displayname), to: to_user.email)
+  end
+
   def send_thank_you_note(request_for_comments, receiver)
     @receiver_displayname = receiver.displayname
     @author = request_for_comments.user.displayname
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 76a01d1f..ba98cba5 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -449,6 +449,43 @@ de:
           <br>
           This mail was automatically sent by CodeOcean. <br>
         subject: "%{author} sagt Danke!"
+      got_new_comment_for_subscription:
+        body: |
+          English version below <br>
+          _________________________<br>
+          <br>
+          Hallo %{receiver_displayname}, <br>
+          <br>
+          es gibt einen neuen Kommentar von %{author_displayname} zu einer Kommentaranfrage auf CodeOcean, die Sie aboniert haben. <br>
+          <br>
+          %{author_displayname} schreibt: %{comment_text}<br>
+          <br>
+          Sie finden ihre Kommentaranfrage hier: %{link_to_comment} <br>
+          <br>
+          Falls Sie beim Klick auf diesen Link eine Fehlermeldung erhalten, dass Sie nicht berechtigt wären diese Aktion auszuführen, öffnen Sie bitte eine beliebige Programmieraufgabe aus einem Kurs heraus und klicken den Link danach noch einmal.<br>
+          <br>
+          Eine Übersicht Ihrer Kommentaranfragen gibt es hier: %{link_my_comments} <br>
+          Alle Kommentaranfragen aller Benutzer finden Sie hier: %{link_all_comments} <br>
+          <br>
+          Diese Mail wurde automatisch von CodeOcean verschickt.<br>
+          <br>
+          _________________________<br>
+          <br>
+          Dear %{receiver_displayname}, <br>
+          <br>
+          you received a new comment from %{author_displayname} to a request for comments on CodeOcean that you have subscribed to. <br>
+          <br>
+          %{author_displayname} wrote: %{comment_text} <br>
+          <br>
+          You can find your request for comments here: %{link_to_comment} <br>
+          <br>
+          If you receive an error that you are not authorized to perform this action when clicking the link, please log-in through any course exercise beforehand and click the link again. <br>
+          <br>
+          An overview of all your comments can be accessed here: %{link_my_comments} <br>
+          All comments of all participants are available here: %{link_all_comments} <br>
+          <br>
+          This mail was automatically sent by CodeOcean. <br>
+        subject: "%{author_displayname} hat einen neuen Kommentar in einer Diskussion veröffentlicht, die Sie aboniert haben."
   request_for_comments:
     click_here: Zum Kommentieren auf die Seitenleiste klicken!
     comments: Kommentare
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8fde6821..b5af3476 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -470,6 +470,43 @@ en:
           <br>
           This mail was automatically sent by CodeOcean. <br>
         subject: "%{author} says thank you!"
+      got_new_comment_for_subscription:
+        body: |
+          English version below <br>
+          _________________________<br>
+          <br>
+          Hallo %{receiver_displayname}, <br>
+          <br>
+          es gibt einen neuen Kommentar von %{author_displayname} zu einer Kommentaranfrage auf CodeOcean, die Sie aboniert haben. <br>
+          <br>
+          %{author_displayname} schreibt: %{comment_text}<br>
+          <br>
+          Sie finden ihre Kommentaranfrage hier: %{link_to_comment} <br>
+          <br>
+          Falls Sie beim Klick auf diesen Link eine Fehlermeldung erhalten, dass Sie nicht berechtigt wären diese Aktion auszuführen, öffnen Sie bitte eine beliebige Programmieraufgabe aus einem Kurs heraus und klicken den Link danach noch einmal.<br>
+          <br>
+          Eine Übersicht Ihrer Kommentaranfragen gibt es hier: %{link_my_comments} <br>
+          Alle Kommentaranfragen aller Benutzer finden Sie hier: %{link_all_comments} <br>
+          <br>
+          Diese Mail wurde automatisch von CodeOcean verschickt.<br>
+          <br>
+          _________________________<br>
+          <br>
+          Dear %{receiver_displayname}, <br>
+          <br>
+          you received a new comment from %{author_displayname} to a request for comments on CodeOcean that you have subscribed to. <br>
+          <br>
+          %{author_displayname} wrote: %{comment_text} <br>
+          <br>
+          You can find your request for comments here: %{link_to_comment} <br>
+          <br>
+          If you receive an error that you are not authorized to perform this action when clicking the link, please log-in through any course exercise beforehand and click the link again. <br>
+          <br>
+          An overview of all your comments can be accessed here: %{link_my_comments} <br>
+          All comments of all participants are available here: %{link_all_comments} <br>
+          <br>
+          This mail was automatically sent by CodeOcean. <br>
+        subject: "%{author_displayname} has posted a new comment to a discussion you subscribed to on CodeOcean."
   request_for_comments:
     click_here: Click on this sidebar to comment!
     comments: Comments

From bb6c266b131533c72cc3813be40012dbdfcd2cd5 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 07:54:43 +0200
Subject: [PATCH 30/46] Rename subscription#type to subscription_type to avoid
 rails stumbling over polymorphism

---
 db/migrate/20170913054203_rename_subscription_type.rb | 5 +++++
 db/schema.rb                                          | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20170913054203_rename_subscription_type.rb

diff --git a/db/migrate/20170913054203_rename_subscription_type.rb b/db/migrate/20170913054203_rename_subscription_type.rb
new file mode 100644
index 00000000..76417921
--- /dev/null
+++ b/db/migrate/20170913054203_rename_subscription_type.rb
@@ -0,0 +1,5 @@
+class RenameSubscriptionType < ActiveRecord::Migration
+  def change
+    rename_column :subscriptions, :type, :subscription_type
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1b882e3d..db307885 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170906124500) do
+ActiveRecord::Schema.define(version: 20170913054203) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -325,7 +325,7 @@ ActiveRecord::Schema.define(version: 20170906124500) do
     t.integer  "user_id"
     t.string   "user_type"
     t.integer  "request_for_comment_id"
-    t.string   "type"
+    t.string   "subscription_type"
     t.datetime "created_at",             null: false
     t.datetime "updated_at",             null: false
   end

From 954917d5a06daa83b5604106896238a4bbc27caf Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 07:55:00 +0200
Subject: [PATCH 31/46] Add routes for subscriptions

---
 config/routes.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/routes.rb b/config/routes.rb
index b0003895..3d4f6d38 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,6 +21,8 @@ Rails.application.routes.draw do
   delete '/comment_by_id', to: 'comments#destroy_by_id'
   put '/comments', to: 'comments#update'
 
+  resources :subscriptions
+
   root to: 'application#welcome'
 
   namespace :admin do

From 2d1830edecee214ca3c1bfac888d0b24b55642a9 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 07:55:15 +0200
Subject: [PATCH 32/46] Add subscription policy

---
 app/policies/subscription_policy.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/policies/subscription_policy.rb

diff --git a/app/policies/subscription_policy.rb b/app/policies/subscription_policy.rb
new file mode 100644
index 00000000..8b2259f7
--- /dev/null
+++ b/app/policies/subscription_policy.rb
@@ -0,0 +1,5 @@
+class SubscriptionPolicy < ApplicationPolicy
+  def create?
+    everyone
+  end
+end

From 0557255d74344a8d44c7b6b1d4b8aa299c558ed3 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 07:55:33 +0200
Subject: [PATCH 33/46] Fix attribute name

---
 app/controllers/comments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index bc784e8f..a58273b3 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -127,7 +127,7 @@ class CommentsController < ApplicationController
           :request_for_comment_id => request_for_comment.id,
           :user_id => commenter.id, :user_type => commenter.class.name)
       subscriptions.each do |subscription|
-        if (subscription.type == 'author' and current_user == request_for_comment.user) or subscription.type == 'all'
+        if (subscription.subscription_type == 'author' and current_user == request_for_comment.user) or subscription.subscription_type == 'all'
           UserMailer.got_new_comment_for_subscription(comment, request_for_comment, request_for_comment.user, current_user).deliver_now
         end
       end

From b69bb9866f25261ae1c8fa41d63157abc6405047 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 07:56:02 +0200
Subject: [PATCH 34/46] Add controller logic for subscription#create

---
 app/controllers/subscription_controller.rb   | 20 ------------
 app/controllers/subscriptions_controller.rb  | 33 ++++++++++++++++++++
 app/views/request_for_comments/show.html.erb | 28 +++++++++++++++++
 3 files changed, 61 insertions(+), 20 deletions(-)
 delete mode 100644 app/controllers/subscription_controller.rb
 create mode 100644 app/controllers/subscriptions_controller.rb

diff --git a/app/controllers/subscription_controller.rb b/app/controllers/subscription_controller.rb
deleted file mode 100644
index afeedb9b..00000000
--- a/app/controllers/subscription_controller.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class SubscriptionController < ApplicationController
-
-  def authorize!
-    authorize(@submission || @submissions)
-  end
-  private :authorize!
-
-  def set_subscription
-    @subscription = Subscription.find(params[:id])
-    authorize!
-  end
-  private :set_subscription
-
-  def subscription_params
-    current_user_id = current_user.try(:id)
-    current_user_class_name = current_user.try(:class).try(:name)
-    params[:subscription].permit(:request_for_comment, :type).merge(user_id: current_user_id, user_type: current_user_class_name)
-  end
-  private :subscription_params
-end
diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
new file mode 100644
index 00000000..6bfdb1b1
--- /dev/null
+++ b/app/controllers/subscriptions_controller.rb
@@ -0,0 +1,33 @@
+class SubscriptionsController < ApplicationController
+
+  def authorize!
+    authorize(@subscription || @subscriptions)
+  end
+  private :authorize!
+
+  # POST /subscriptions.json
+  def create
+    @subscription = Subscription.new(subscription_params)
+    respond_to do |format|
+      if @subscription.save
+        format.json { render json: @subscription, status: :created }
+      else
+        format.json { render json: @subscription.errors, status: :unprocessable_entity }
+      end
+    end
+    authorize!
+  end
+
+  def set_subscription
+    @subscription = Subscription.find(params[:id])
+    authorize!
+  end
+  private :set_subscription
+
+  def subscription_params
+    current_user_id = current_user.try(:id)
+    current_user_class_name = current_user.try(:class).try(:name)
+    params[:subscription].permit(:request_for_comments, :subscription_type).merge(user_id: current_user_id, user_type: current_user_class_name)
+  end
+  private :subscription_params
+end
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index c8b8d3b9..17b27f07 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -312,6 +312,24 @@ also, all settings from the rails model needed for the editor configuration in t
     jqxhr.fail(ajaxError);
   }
 
+  function subscribeToRFC(subscriptionType, checkbox){
+    var jqxhr = $.ajax({
+      data: {
+        subscription: {
+          request_for_comments_id: $('h4#exercise_caption').data('rfc-id'),
+          subscription_type: subscriptionType
+        }
+      },
+      dataType: 'json',
+      method: 'POST',
+      url:  "/subscriptions.json"
+    });
+    jqxhr.fail(function() {
+      checkbox.prop('checked', false);
+      ajaxError(arguments);
+    });
+  }
+
   function handleSidebarClick(e) {
     var target  = e.domEvent.target;
     var editor =  e.editor;
@@ -377,6 +395,16 @@ also, all settings from the rails model needed for the editor configuration in t
       otherComments.hide();
     }
 
+    var subscribeCheckbox = commentModal.find('#subscribe');
+    subscribeCheckbox.off('change');
+    subscribeCheckbox.on('change', function() {
+      if (this.checked) {
+        subscribeToRFC('author', $(this));
+      } else {
+        // unsubscribe
+      }
+    });
+
     var addCommentButton = commentModal.find('#addCommentButton');
     addCommentButton.off('click');
     addCommentButton.on('click', function(){

From 6bf7aee948278e1186a06f46b16604c1c92ac631 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 08:22:37 +0200
Subject: [PATCH 35/46] Fix create parameter naming

---
 app/controllers/subscriptions_controller.rb  | 2 +-
 app/views/request_for_comments/show.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index 6bfdb1b1..63630fd1 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -27,7 +27,7 @@ class SubscriptionsController < ApplicationController
   def subscription_params
     current_user_id = current_user.try(:id)
     current_user_class_name = current_user.try(:class).try(:name)
-    params[:subscription].permit(:request_for_comments, :subscription_type).merge(user_id: current_user_id, user_type: current_user_class_name)
+    params[:subscription].permit(:request_for_comment_id, :subscription_type).merge(user_id: current_user_id, user_type: current_user_class_name)
   end
   private :subscription_params
 end
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 17b27f07..8f80e2d5 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -316,7 +316,7 @@ also, all settings from the rails model needed for the editor configuration in t
     var jqxhr = $.ajax({
       data: {
         subscription: {
-          request_for_comments_id: $('h4#exercise_caption').data('rfc-id'),
+          request_for_comment_id: $('h4#exercise_caption').data('rfc-id'),
           subscription_type: subscriptionType
         }
       },

From 3f40a6f29cb3491bf2dadc3a367257e940b83b2d Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 08:28:13 +0200
Subject: [PATCH 36/46] Remove whitespace

---
 app/controllers/comments_controller.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index a58273b3..3094e4d3 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -53,8 +53,6 @@ class CommentsController < ApplicationController
 
     respond_to do |format|
       if @comment.save
-
-
         if comment_params[:request_id]
           request_for_comment = RequestForComment.find(comment_params[:request_id])
           send_mail_to_author @comment, request_for_comment

From ead4f290b35e9654a687896c922814d8b59be960 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 08:28:27 +0200
Subject: [PATCH 37/46] Fix typo

---
 app/mailers/user_mailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 1cf7e7a0..33f6e69c 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -22,7 +22,7 @@ class UserMailer < ActionMailer::Base
   end
 
   def got_new_comment_for_subscription(comment, request_for_comment, from_user, to_user)
-    @receiver_displayname = user.displayname
+    @receiver_displayname = to_user.displayname
     @author_displayname = from_user.displayname
     @comment_text = comment.text
     @rfc_link = request_for_comment_url(request_for_comment)

From a2b7cf6ddaf359c5409cc04fa64d413287ee4692 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 08:28:38 +0200
Subject: [PATCH 38/46] Add user mailer template

---
 app/views/user_mailer/got_new_comment_for_subscription.html.slim | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 app/views/user_mailer/got_new_comment_for_subscription.html.slim

diff --git a/app/views/user_mailer/got_new_comment_for_subscription.html.slim b/app/views/user_mailer/got_new_comment_for_subscription.html.slim
new file mode 100644
index 00000000..f4d82b4d
--- /dev/null
+++ b/app/views/user_mailer/got_new_comment_for_subscription.html.slim
@@ -0,0 +1 @@
+== t('mailers.user_mailer.got_new_comment_for_subscription.body', receiver_displayname: @receiver_displayname, link_to_comment: link_to(@rfc_link, @rfc_link), author_displayname: @author_displayname, comment_text: @comment_text, link_my_comments: link_to(t('request_for_comments.index.get_my_comment_requests'), my_request_for_comments_url), link_all_comments: link_to(t('request_for_comments.index.all'), request_for_comments_url) )

From 217239e076252e593e64e26b26672b95eeafa137 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 09:56:33 +0200
Subject: [PATCH 39/46] Rollback schema changes from different branch

---
 db/schema.rb | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index db307885..c31baf1c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -47,30 +47,6 @@ ActiveRecord::Schema.define(version: 20170913054203) do
     t.string   "oauth_secret", limit: 255
   end
 
-  create_table "error_template_attributes", force: :cascade do |t|
-    t.string   "key"
-    t.string   "regex"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-    t.text     "description"
-    t.boolean  "important"
-  end
-
-  create_table "error_template_attributes_templates", id: false, force: :cascade do |t|
-    t.integer "error_template_id",           null: false
-    t.integer "error_template_attribute_id", null: false
-  end
-
-  create_table "error_templates", force: :cascade do |t|
-    t.integer  "execution_environment_id"
-    t.string   "name"
-    t.string   "signature"
-    t.datetime "created_at",               null: false
-    t.datetime "updated_at",               null: false
-    t.text     "description"
-    t.text     "hint"
-  end
-
   create_table "errors", force: :cascade do |t|
     t.integer  "execution_environment_id"
     t.text     "message"
@@ -292,22 +268,6 @@ ActiveRecord::Schema.define(version: 20170913054203) do
     t.datetime "updated_at"
   end
 
-  create_table "structured_error_attributes", force: :cascade do |t|
-    t.integer  "structured_error_id"
-    t.integer  "error_template_attribute_id"
-    t.string   "value"
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
-    t.boolean  "match"
-  end
-
-  create_table "structured_errors", force: :cascade do |t|
-    t.integer  "error_template_id"
-    t.integer  "file_id"
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
-  end
-
   create_table "submissions", force: :cascade do |t|
     t.integer  "exercise_id"
     t.float    "score"

From 0e8df9d738871dd026e92c63c1e2e0f77d835025 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 09:57:31 +0200
Subject: [PATCH 40/46] Fix typo

---
 config/locales/de.yml | 4 ++--
 config/locales/en.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index ba98cba5..cb8c02cf 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -456,7 +456,7 @@ de:
           <br>
           Hallo %{receiver_displayname}, <br>
           <br>
-          es gibt einen neuen Kommentar von %{author_displayname} zu einer Kommentaranfrage auf CodeOcean, die Sie aboniert haben. <br>
+          es gibt einen neuen Kommentar von %{author_displayname} zu einer Kommentaranfrage auf CodeOcean, die Sie abonniert haben. <br>
           <br>
           %{author_displayname} schreibt: %{comment_text}<br>
           <br>
@@ -485,7 +485,7 @@ de:
           All comments of all participants are available here: %{link_all_comments} <br>
           <br>
           This mail was automatically sent by CodeOcean. <br>
-        subject: "%{author_displayname} hat einen neuen Kommentar in einer Diskussion veröffentlicht, die Sie aboniert haben."
+        subject: "%{author_displayname} hat einen neuen Kommentar in einer Diskussion veröffentlicht, die Sie abonniert haben."
   request_for_comments:
     click_here: Zum Kommentieren auf die Seitenleiste klicken!
     comments: Kommentare
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b5af3476..b89d88d2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -477,7 +477,7 @@ en:
           <br>
           Hallo %{receiver_displayname}, <br>
           <br>
-          es gibt einen neuen Kommentar von %{author_displayname} zu einer Kommentaranfrage auf CodeOcean, die Sie aboniert haben. <br>
+          es gibt einen neuen Kommentar von %{author_displayname} zu einer Kommentaranfrage auf CodeOcean, die Sie abonniert haben. <br>
           <br>
           %{author_displayname} schreibt: %{comment_text}<br>
           <br>

From cea27814175c165ef4fcf970c9d0be10dd4a4454 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 11:57:34 +0200
Subject: [PATCH 41/46] Implement unsubscribe route to delete subscriptions

---
 app/controllers/subscriptions_controller.rb | 28 +++++++++++++++++++++
 app/policies/subscription_policy.rb         | 13 ++++++++++
 config/locales/de.yml                       |  3 +++
 config/locales/en.yml                       |  3 +++
 config/routes.rb                            |  6 ++++-
 5 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index 63630fd1..3e6fbac9 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -18,6 +18,34 @@ class SubscriptionsController < ApplicationController
     authorize!
   end
 
+  # DELETE /subscriptions/1
+  # DELETE /subscriptions/1.json
+  def destroy
+    begin
+      @subscription = Subscription.find(params[:id])
+    rescue
+      skip_authorization
+      respond_to do |format|
+        format.html { redirect_to request_for_comments_url, alert: t('subscriptions.subscription_not_existent') }
+        format.json { head :internal_server_error }
+      end
+    else
+      authorize!
+      rfc = @subscription.try(:request_for_comment)
+      if @subscription.destroy
+        respond_to do |format|
+          format.html { redirect_to request_for_comment_url(rfc), notice: t('subscriptions.successfully_unsubscribed') }
+          format.json { head :destroyed }
+        end
+      else
+        respond_to do |format|
+          format.html { redirect_to request_for_comment_url(rfc), :flash => { :danger => t('shared.message_failure') } }
+          format.json { head :internal_server_error }
+        end
+      end
+    end
+  end
+
   def set_subscription
     @subscription = Subscription.find(params[:id])
     authorize!
diff --git a/app/policies/subscription_policy.rb b/app/policies/subscription_policy.rb
index 8b2259f7..289bd5ac 100644
--- a/app/policies/subscription_policy.rb
+++ b/app/policies/subscription_policy.rb
@@ -2,4 +2,17 @@ class SubscriptionPolicy < ApplicationPolicy
   def create?
     everyone
   end
+
+  def destroy?
+    author? || admin?
+  end
+
+  def show_error?
+    everyone
+  end
+
+  def author?
+    @user == @record.user
+  end
+  private :author?
 end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cb8c02cf..f0c00da1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -630,4 +630,7 @@ de:
   comments:
     deleted: "Gelöscht"
     save_update: "Speichern"
+  subscriptions:
+    successfully_unsubscribed: "Ihr Abonnement für weitere Kommentare auf dieser Kommentaranfrage wurde erfolgreich beendet."
+    subscription_not_existent: "Das Abonnement, von dem Sie sich abmelden wollen, existiert nicht."
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b89d88d2..1db04d05 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -651,3 +651,6 @@ en:
   comments:
     deleted: "Deleted"
     save_update: "Save"
+  subscriptions:
+    successfully_unsubscribed: "You successfully unsubscribed from this Request for Comment"
+    subscription_not_existent: "The subscription you want to unsubscribe from does not exist."
diff --git a/config/routes.rb b/config/routes.rb
index 3d4f6d38..eb243464 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,7 +21,11 @@ Rails.application.routes.draw do
   delete '/comment_by_id', to: 'comments#destroy_by_id'
   put '/comments', to: 'comments#update'
 
-  resources :subscriptions
+  resources :subscriptions do
+    member do
+      get :unsubscribe, to: 'subscriptions#destroy'
+    end
+  end
 
   root to: 'application#welcome'
 

From 995c22ba8a953cdc3c629d37d0106d2064acb8d4 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 14:22:00 +0200
Subject: [PATCH 42/46] Fix json response status codes

---
 app/controllers/subscriptions_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index 3e6fbac9..21321caf 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -27,7 +27,7 @@ class SubscriptionsController < ApplicationController
       skip_authorization
       respond_to do |format|
         format.html { redirect_to request_for_comments_url, alert: t('subscriptions.subscription_not_existent') }
-        format.json { head :internal_server_error }
+        format.json { render json: {message: t('subscriptions.subscription_not_existent')}, status: :not_found }
       end
     else
       authorize!
@@ -35,12 +35,12 @@ class SubscriptionsController < ApplicationController
       if @subscription.destroy
         respond_to do |format|
           format.html { redirect_to request_for_comment_url(rfc), notice: t('subscriptions.successfully_unsubscribed') }
-          format.json { head :destroyed }
+          format.json { render json: {message: t('subscriptions.successfully_unsubscribed')}, status: :ok}
         end
       else
         respond_to do |format|
           format.html { redirect_to request_for_comment_url(rfc), :flash => { :danger => t('shared.message_failure') } }
-          format.json { head :internal_server_error }
+          format.json { render json: {message: t('shared.message_failure')}, status: :internal_server_error}
         end
       end
     end

From b1f790dcdecc790d67808478745caf6f7f1f3c47 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 14:22:46 +0200
Subject: [PATCH 43/46] Implement subscribe and unsubscribe

---
 .../_comment_dialogcontent.html.slim          |  2 +-
 app/views/request_for_comments/show.html.erb  | 32 +++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/views/exercises/_comment_dialogcontent.html.slim b/app/views/exercises/_comment_dialogcontent.html.slim
index cdb7441e..29fb8208 100644
--- a/app/views/exercises/_comment_dialogcontent.html.slim
+++ b/app/views/exercises/_comment_dialogcontent.html.slim
@@ -2,7 +2,7 @@
   h5 =t('exercises.implement.comment.others')
   .container
   label
-    input#subscribe type='checkbox' title=t('request_for_comments.subscribe_to_author')
+    input#subscribe type='checkbox' title=t('request_for_comments.subscribe_to_author') data-subscription=Subscription.where(user: current_user, request_for_comment_id: @request_for_comment.id).try(:first).try(:id)
     = t('request_for_comments.subscribe_to_author')
 
 #myComment
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 8f80e2d5..579cf081 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -313,6 +313,7 @@ also, all settings from the rails model needed for the editor configuration in t
   }
 
   function subscribeToRFC(subscriptionType, checkbox){
+    checkbox.attr("disabled", true);
     var jqxhr = $.ajax({
       data: {
         subscription: {
@@ -324,9 +325,33 @@ also, all settings from the rails model needed for the editor configuration in t
       method: 'POST',
       url:  "/subscriptions.json"
     });
-    jqxhr.fail(function() {
+    jqxhr.done(function(subscription) {
+      checkbox.data('subscription', subscription.id);
+      checkbox.attr("disabled", false);
+    });
+    jqxhr.fail(function(response) {
       checkbox.prop('checked', false);
-      ajaxError(arguments);
+      checkbox.attr("disabled", false);
+      ajaxError(response);
+    });
+  }
+
+  function unsubscribeFromRFC(checkbox) {
+    checkbox.attr("disabled", true);
+    var subscriptionId = checkbox.data('subscription');
+    var jqxhr = $.ajax({
+      url:  '/subscriptions/' + subscriptionId + '/unsubscribe.json'
+    });
+    jqxhr.done(function(response) {
+      checkbox.prop('checked', false);
+      checkbox.data('subscription', null);
+      checkbox.attr("disabled", false);
+      $.flash.success({text: response.message});
+    });
+    jqxhr.fail(function(response) {
+      checkbox.prop('checked', true);
+      checkbox.attr("disabled", false);
+      ajaxError(response);
     });
   }
 
@@ -396,12 +421,13 @@ also, all settings from the rails model needed for the editor configuration in t
     }
 
     var subscribeCheckbox = commentModal.find('#subscribe');
+    subscribeCheckbox.prop('checked', subscribeCheckbox.data('subscription'));
     subscribeCheckbox.off('change');
     subscribeCheckbox.on('change', function() {
       if (this.checked) {
         subscribeToRFC('author', $(this));
       } else {
-        // unsubscribe
+        unsubscribeFromRFC($(this));
       }
     });
 

From 85928361cb7c728d3117de516ba1abb55f75829d Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 14:37:10 +0200
Subject: [PATCH 44/46] Add unsubscribe link to emails and cleanup user mailer

---
 app/controllers/comments_controller.rb                 |  2 +-
 app/mailers/user_mailer.rb                             |  9 +++++----
 .../got_new_comment_for_subscription.html.slim         |  8 +++++++-
 config/locales/de.yml                                  | 10 ++++------
 config/locales/en.yml                                  | 10 ++++------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 3094e4d3..bfc0fc77 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -126,7 +126,7 @@ class CommentsController < ApplicationController
           :user_id => commenter.id, :user_type => commenter.class.name)
       subscriptions.each do |subscription|
         if (subscription.subscription_type == 'author' and current_user == request_for_comment.user) or subscription.subscription_type == 'all'
-          UserMailer.got_new_comment_for_subscription(comment, request_for_comment, request_for_comment.user, current_user).deliver_now
+          UserMailer.got_new_comment_for_subscription(comment, subscription, current_user).deliver_now
         end
       end
     end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 33f6e69c..8022ee84 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -21,12 +21,13 @@ class UserMailer < ActionMailer::Base
     mail(subject: t('mailers.user_mailer.got_new_comment.subject', commenting_user_displayname: @commenting_user_displayname), to: request_for_comment.user.email)
   end
 
-  def got_new_comment_for_subscription(comment, request_for_comment, from_user, to_user)
-    @receiver_displayname = to_user.displayname
+  def got_new_comment_for_subscription(comment, subscription, from_user)
+    @receiver_displayname = subscription.user.displayname
     @author_displayname = from_user.displayname
     @comment_text = comment.text
-    @rfc_link = request_for_comment_url(request_for_comment)
-    mail(subject: t('mailers.user_mailer.got_new_comment_for_subscription.subject', author_displayname: @author_displayname), to: to_user.email)
+    @rfc_link = request_for_comment_url(subscription.request_for_comment)
+    @unsubscribe_link = unsubscribe_subscription_url(subscription)
+    mail(subject: t('mailers.user_mailer.got_new_comment_for_subscription.subject', author_displayname: @author_displayname), to: subscription.user.email)
   end
 
   def send_thank_you_note(request_for_comments, receiver)
diff --git a/app/views/user_mailer/got_new_comment_for_subscription.html.slim b/app/views/user_mailer/got_new_comment_for_subscription.html.slim
index f4d82b4d..b9e1a179 100644
--- a/app/views/user_mailer/got_new_comment_for_subscription.html.slim
+++ b/app/views/user_mailer/got_new_comment_for_subscription.html.slim
@@ -1 +1,7 @@
-== t('mailers.user_mailer.got_new_comment_for_subscription.body', receiver_displayname: @receiver_displayname, link_to_comment: link_to(@rfc_link, @rfc_link), author_displayname: @author_displayname, comment_text: @comment_text, link_my_comments: link_to(t('request_for_comments.index.get_my_comment_requests'), my_request_for_comments_url), link_all_comments: link_to(t('request_for_comments.index.all'), request_for_comments_url) )
+== t('mailers.user_mailer.got_new_comment_for_subscription.body',
+        receiver_displayname: @receiver_displayname, link_to_comment: link_to(@rfc_link, @rfc_link),
+        unsubscribe_link: link_to(@unsubscribe_link, @unsubscribe_link),
+        author_displayname: @author_displayname,
+        comment_text: @comment_text,
+        link_my_comments: link_to(t('request_for_comments.index.get_my_comment_requests'), my_request_for_comments_url),
+        link_all_comments: link_to(t('request_for_comments.index.all'), request_for_comments_url) )
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f0c00da1..d5b8bb87 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -460,12 +460,11 @@ de:
           <br>
           %{author_displayname} schreibt: %{comment_text}<br>
           <br>
-          Sie finden ihre Kommentaranfrage hier: %{link_to_comment} <br>
+          Sie finden die Kommentaranfrage hier: %{link_to_comment} <br>
           <br>
           Falls Sie beim Klick auf diesen Link eine Fehlermeldung erhalten, dass Sie nicht berechtigt wären diese Aktion auszuführen, öffnen Sie bitte eine beliebige Programmieraufgabe aus einem Kurs heraus und klicken den Link danach noch einmal.<br>
           <br>
-          Eine Übersicht Ihrer Kommentaranfragen gibt es hier: %{link_my_comments} <br>
-          Alle Kommentaranfragen aller Benutzer finden Sie hier: %{link_all_comments} <br>
+          Wenn Sie keine weiteren Benachrichtigungen zu dieser Anfrage erhalten möchten, klicken Sie bitte hier: %{unsubscribe_link}
           <br>
           Diese Mail wurde automatisch von CodeOcean verschickt.<br>
           <br>
@@ -477,12 +476,11 @@ de:
           <br>
           %{author_displayname} wrote: %{comment_text} <br>
           <br>
-          You can find your request for comments here: %{link_to_comment} <br>
+          You can find the request for comments here: %{link_to_comment} <br>
           <br>
           If you receive an error that you are not authorized to perform this action when clicking the link, please log-in through any course exercise beforehand and click the link again. <br>
           <br>
-          An overview of all your comments can be accessed here: %{link_my_comments} <br>
-          All comments of all participants are available here: %{link_all_comments} <br>
+          If you don't want to be notified about further comments, please click here: %{unsubscribe_link}
           <br>
           This mail was automatically sent by CodeOcean. <br>
         subject: "%{author_displayname} hat einen neuen Kommentar in einer Diskussion veröffentlicht, die Sie abonniert haben."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1db04d05..1ad6a9f4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -481,12 +481,11 @@ en:
           <br>
           %{author_displayname} schreibt: %{comment_text}<br>
           <br>
-          Sie finden ihre Kommentaranfrage hier: %{link_to_comment} <br>
+          Sie finden die Kommentaranfrage hier: %{link_to_comment} <br>
           <br>
           Falls Sie beim Klick auf diesen Link eine Fehlermeldung erhalten, dass Sie nicht berechtigt wären diese Aktion auszuführen, öffnen Sie bitte eine beliebige Programmieraufgabe aus einem Kurs heraus und klicken den Link danach noch einmal.<br>
           <br>
-          Eine Übersicht Ihrer Kommentaranfragen gibt es hier: %{link_my_comments} <br>
-          Alle Kommentaranfragen aller Benutzer finden Sie hier: %{link_all_comments} <br>
+          Wenn Sie keine weiteren Benachrichtigungen zu dieser Anfrage erhalten möchten, klicken Sie bitte hier: %{unsubscribe_link}
           <br>
           Diese Mail wurde automatisch von CodeOcean verschickt.<br>
           <br>
@@ -498,12 +497,11 @@ en:
           <br>
           %{author_displayname} wrote: %{comment_text} <br>
           <br>
-          You can find your request for comments here: %{link_to_comment} <br>
+          You can find the request for comments here: %{link_to_comment} <br>
           <br>
           If you receive an error that you are not authorized to perform this action when clicking the link, please log-in through any course exercise beforehand and click the link again. <br>
           <br>
-          An overview of all your comments can be accessed here: %{link_my_comments} <br>
-          All comments of all participants are available here: %{link_all_comments} <br>
+          If you don't want to be notified about further comments, please click here: %{unsubscribe_link}
           <br>
           This mail was automatically sent by CodeOcean. <br>
         subject: "%{author_displayname} has posted a new comment to a discussion you subscribed to on CodeOcean."

From 374f21592dbf5cb7338ebc7db5fed0f2173c1ea0 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 13 Sep 2017 14:41:09 +0200
Subject: [PATCH 45/46] Don't send mail to original author if they subscribe to
 their own RFC

---
 app/controllers/comments_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index bfc0fc77..948f3e5b 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -126,7 +126,9 @@ class CommentsController < ApplicationController
           :user_id => commenter.id, :user_type => commenter.class.name)
       subscriptions.each do |subscription|
         if (subscription.subscription_type == 'author' and current_user == request_for_comment.user) or subscription.subscription_type == 'all'
-          UserMailer.got_new_comment_for_subscription(comment, subscription, current_user).deliver_now
+          if subscription.user != current_user
+            UserMailer.got_new_comment_for_subscription(comment, subscription, current_user).deliver_now
+          end
         end
       end
     end

From 3253fc4bc35200dbdd1370c7edabea6aba22478a Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 20 Sep 2017 16:07:42 +0200
Subject: [PATCH 46/46] Create popovers on demand on gutter elements to prevent
 element recycling messing it up

---
 app/views/request_for_comments/show.html.erb | 112 ++++++++-----------
 1 file changed, 47 insertions(+), 65 deletions(-)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 579cf081..83741a87 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -146,13 +146,9 @@ also, all settings from the rails model needed for the editor configuration in t
     currentEditor.commentVisualsByLine = {};
     setAnnotations(currentEditor, $(editor).data('file-id'));
     currentEditor.on("guttermousedown", handleSidebarClick);
+    currentEditor.on("guttermousemove", showPopover);
   });
 
-  function cleanupPopovers() {
-    // remove all possible popovers
-    $('.editor > .ace_gutter > .ace_gutter-layer > .ace_gutter-cell').popover('destroy');
-  }
-
   function preprocess(commentText) {
     // sanitize comments to deal with XSS attacks:
     commentText = $('div.sanitizer').text(commentText).html();
@@ -160,29 +156,6 @@ also, all settings from the rails model needed for the editor configuration in t
     return commentText.replace(/\n/g, '<br>');
   }
 
-  function clusterComments(comments) {
-    var clusters = {};
-    // comments need to be sorted to cluster them per line
-    comments.sort(function (a, b) {
-      return a.row - b.row;
-    });
-    while (comments.length > 0) {
-      // new cluster of comments
-      var cluster = [];
-      var clusterRow = comments[0].row;
-      // now collect all comments on this line
-      while (comments.length > 0 && comments[0].row === clusterRow) {
-          cluster.push(comments.shift());
-      }
-      // sort the comments by creation date
-      cluster = cluster.sort(function (a, b) {
-        return a.id - b.id;
-      });
-      clusters[clusterRow] = cluster;
-    }
-    return clusters;
-  }
-
   function generateCommentHtmlContent(comments) {
     var htmlContent = '';
     comments.forEach(function(comment, index) {
@@ -211,23 +184,19 @@ also, all settings from the rails model needed for the editor configuration in t
     return htmlContent;
   }
 
-  function buildPopover(fileid, line, comments) {
+  function buildPopover(comments, where) {
     // only display the newest three comments in preview
     var maxComments = 3;
     var htmlContent = generateCommentHtmlContent(comments.reverse().slice(0, maxComments));
     if (comments.length > maxComments) {
       // add a hint that there are more comments than shown here
       htmlContent += '<div class="popover-footer"><%= t('request_for_comments.click_for_more_comments') %></div>'
-        .replace('${numComments}', comments.length - maxComments);
+        .replace('${numComments}', String(comments.length - maxComments));
     }
-    // attach the popover to the ace sidebar (where the comment icon is displayed)
-    var icon = $('*[data-file-id="' + fileid + '"]')          // the editor for this file
-      .find('.ace_gutter > .ace_gutter-layer')                // the sidebar
-      .find('div:nth-child(' + (parseInt(line) + 1) + ')');   // the correct line
-    icon.popover({
+    where.popover({
       content: htmlContent,
       html: true, // necessary to style comments. XSS is not possible due to comment pre-processing (sanitizing)
-      trigger: 'hover',
+      trigger: 'manual', // can only be triggered by $(where).popover('show' | 'hide')
       container: 'body'
     });
   }
@@ -245,22 +214,20 @@ also, all settings from the rails model needed for the editor configuration in t
     });
 
     jqrequest.done(function(response){
-      editor.commentVisualsByLine = {};
-      var clusters = clusterComments(response.slice());
-      $.each(clusters, function (line, cluster) {
-        editor.commentVisualsByLine[line] = generateCommentHtmlContent(cluster);
-        buildPopover(fileid, line, cluster);
-      });
-
       $.each(response, function(index, comment) {
         comment.className = 'code-ocean_comment';
       });
       session.setAnnotations(response);
+    });
+  }
+
+  function getCommentsForRow(editor, row){
+    return editor.getSession().getAnnotations().filter(function(element) {
+      return element.row === row;
     })
   }
 
   function deleteComment(commentId, editor, file_id, callback) {
-    cleanupPopovers();
     var jqxhr = $.ajax({
       type: 'DELETE',
       url: "/comments/" + commentId
@@ -273,7 +240,6 @@ also, all settings from the rails model needed for the editor configuration in t
   }
 
   function updateComment(commentId, text, editor, file_id, callback) {
-    cleanupPopovers();
     var jqxhr = $.ajax({
       type: 'PATCH',
       url: "/comments/" + commentId,
@@ -291,7 +257,6 @@ also, all settings from the rails model needed for the editor configuration in t
   }
 
   function createComment(file_id, row, editor, commenttext){
-    cleanupPopovers();
     var jqxhr = $.ajax({
       data: {
         comment: {
@@ -306,7 +271,7 @@ also, all settings from the rails model needed for the editor configuration in t
       method: 'POST',
       url:  "/comments"
     });
-    jqxhr.done(function(response){
+    jqxhr.done(function(){
       setAnnotations(editor, file_id);
     });
     jqxhr.fail(ajaxError);
@@ -355,13 +320,45 @@ also, all settings from the rails model needed for the editor configuration in t
     });
   }
 
+  var lastRow = null;
+  var lastTarget = null;
+  function showPopover(e) {
+    var target  = e.domEvent.target;
+    var row = e.getDocumentPosition().row;
+
+    if (target.className.indexOf('ace_gutter-cell') === -1 || lastRow === row) {
+      return;
+    }
+    if (lastTarget === target) {
+      // sometimes the row gets updated before the DOM event target, so we need to wait for it to change
+      return;
+    }
+    lastRow = row;
+
+    var editor = e.editor;
+    var comments = getCommentsForRow(editor, row);
+    buildPopover(comments, $(target));
+    lastTarget = target;
+
+    $(target).popover('show');
+    $(target).on('mouseleave', function () {
+      $(this).off('mouseleave');
+      $(this).popover('destroy');
+    });
+  }
+
+  $('.ace_gutter').on('mouseleave', function () {
+    lastRow = null;
+    lastTarget = null;
+  });
+
   function handleSidebarClick(e) {
     var target  = e.domEvent.target;
+    if (target.className.indexOf('ace_gutter-cell') === -1) return;
+
     var editor =  e.editor;
     var fileid = $(editor.container).data('file-id');
 
-    if (target.className.indexOf("ace_gutter-cell") == -1) return;
-
     var row = e.getDocumentPosition().row;
     e.stop();
     $('.modal-title').text('<%= t('request_for_comments.modal_title') %>'.replace('${line}', row + 1));
@@ -369,7 +366,7 @@ also, all settings from the rails model needed for the editor configuration in t
     var commentModal = $('#comment-modal');
 
     var otherComments = commentModal.find('#otherComments');
-    var htmlContent = editor.commentVisualsByLine[row];
+    var htmlContent = generateCommentHtmlContent(getCommentsForRow(editor, row));
     if (htmlContent) {
       otherComments.show();
       var container = otherComments.find('.container');
@@ -454,19 +451,4 @@ also, all settings from the rails model needed for the editor configuration in t
     });
   }
 
-
-  function stringDivider(str, width, spaceReplacer) {
-    if (str.length>width) {
-      var p=width;
-      for (;p>0 && str[p]!=' ';p--) {
-      }
-      if (p>0) {
-        var left = str.substring(0, p);
-        var right = str.substring(p+1);
-        return left + spaceReplacer + stringDivider(right, width, spaceReplacer);
-      }
-    }
-    return str;
-  }
-
 </script>