X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0fa0566b62e7ac7fe389821e48bba5507758c4df..493f5c31bcaf9f89774a9ab5489581ca4729d4a6:/forum/skins/default/media/js/osqa.main.js

diff --git a/forum/skins/default/media/js/osqa.main.js b/forum/skins/default/media/js/osqa.main.js
index 993407b..17de794 100644
--- a/forum/skins/default/media/js/osqa.main.js
+++ b/forum/skins/default/media/js/osqa.main.js
@@ -2,6 +2,7 @@
  * We do not want the CSRF protection enabled for the AJAX post requests, it causes only trouble.
  * Get the csrftoken cookie and pass it to the X-CSRFToken HTTP request property.
  */
+
 $('html').ajaxSend(function(event, xhr, settings) {
     function getCookie(name) {
         var cookieValue = null;
@@ -18,10 +19,12 @@ $('html').ajaxSend(function(event, xhr, settings) {
         }
         return cookieValue;
     }
-    if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
-        // Only send the token to relative URLs i.e. locally.
-        xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
-    }
+    try {
+        if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
+            // Only send the token to relative URLs i.e. locally.
+            xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
+        }
+    } catch (e) {}
 });
 
 var response_commands = {
@@ -113,7 +116,7 @@ var response_commands = {
                 .replace(new RegExp('%EDIT_URL%', 'g'), edit_url)
                 .replace(new RegExp('%CONVERT_URL%', 'g'), convert_url);
 
-        $container.append(skeleton);
+        $container.prepend(skeleton);
 
         // Show the convert comment to answer tool only if the current comment can be converted
         if (can_convert == true) {
@@ -328,7 +331,8 @@ function process_ajax_response(data, evt, callback) {
     if (!data.success && data['error_message'] != undefined) {
         show_message(evt, data.error_message, function() {if (callback) callback(true);});
         end_command(false);
-    } else if (typeof data['commands'] != undefined){
+    }
+    if (typeof data['commands'] != undefined){
         for (var command in data.commands) {
             response_commands[command].apply(null, data.commands[command])
 
@@ -364,7 +368,28 @@ function end_command(success) {
     }
 }
 
+var comment_box_cursor_position = 0;
+function canned_comment(post_id, comment) {
+    textarea = $('#comment-' + post_id + '-form textarea')
+
+    // Get the text from the beginning to the caret
+    textarea_start = textarea.val().substr(0, comment_box_cursor_position)
+
+    // Get the text from the caret to the end
+    textarea_end = textarea.val().substr(comment_box_cursor_position, textarea.val().length)
+
+    textarea.val(textarea_start + comment + textarea_end);
+}
+
 $(function() {
+    $('textarea.commentBox').bind('keydown keyup mousedown mouseup mousemove', function(evt) {
+        comment_box_cursor_position = $(this).caret().start;
+    });
+
+    $('textarea.commentBox').blur(function() {
+        //alert(comment_box_cursor_position);
+    });
+
     $('a.ajax-command').live('click', function(evt) {
         if (running) return false;
 
@@ -572,7 +597,7 @@ $(function() {
                 }
 
                 start_command();
-                $.post($form.attr('action'), $form.serialize(), function(data) {
+                $.post($form.attr('action'), post_data, function(data) {
                     process_ajax_response(data, evt, function(error) {
                         if (!error) {
                             cleanup_form();
@@ -585,6 +610,14 @@ $(function() {
                 return false;
             });
 
+            // Submit comment with CTRL + Enter
+            $textarea.keydown(function(e) {
+                if (e.ctrlKey && e.keyCode == 13 && !$button.attr('disabled')) {
+                    // console.log('submit');
+                    $(this).parent().find('input.comment-submit').click();
+                }
+            });
+
             $cancel.click(function(event) {
                 if (confirm("You will lose all of your changes in this comment.  Do you still wish to proceed?")){
                     if (comment_in_form) {
@@ -728,7 +761,7 @@ function pickedTags(){
                 tag_link.attr('rel','tag');
                 tag_link.attr('href', scriptUrl + $.i18n._('tags/') + tagname + '/');
                 tag_link.html(tagname);
-                var del_link = $('<img></img>');
+                var del_link = $('<img />');
                 del_link.addClass('delete-icon');
                 del_link.attr('src', mediaUrl('media/images/close-small-dark.png'));