X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/93c313ff9d33d0efa64f8149fae2b108146dd237..f58a11f6c1d78b0d78abc9a7e21471e6efbbbf54:/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 8f785e3..0122c25 100644
--- a/forum/skins/default/media/js/osqa.main.js
+++ b/forum/skins/default/media/js/osqa.main.js
@@ -104,7 +104,7 @@ var response_commands = {
         alert('ok');
     },
 
-    insert_comment: function(post_id, comment_id, comment, username, profile_url, delete_url, edit_url, convert_url, can_convert) {
+    insert_comment: function(post_id, comment_id, comment, username, profile_url, delete_url, edit_url, convert_url, can_convert, show_latest_comments_first) {
         var $container = $('#comments-container-' + post_id);
         var skeleton = $('#new-comment-skeleton-' + post_id).html().toString();
 
@@ -115,8 +115,11 @@ var response_commands = {
                 .replace(new RegExp('%DELETE_URL%', 'g'), delete_url)
                 .replace(new RegExp('%EDIT_URL%', 'g'), edit_url)
                 .replace(new RegExp('%CONVERT_URL%', 'g'), convert_url);
-
-        $container.append(skeleton);
+        if (show_latest_comments_first) {
+            $container.prepend(skeleton);
+        } else {
+            $container.append(skeleton);
+        }
 
         // Show the convert comment to answer tool only if the current comment can be converted
         if (can_convert == true) {
@@ -170,7 +173,7 @@ function show_dialog (extern) {
         $diag.fadeOut('fast', function() {
             $diag.remove();
         });
-    }
+    };
 
     var options = {
         extra_class: '',
@@ -198,7 +201,7 @@ function show_dialog (extern) {
         options.pos = {x: options.event.pageX, y: options.event.pageY};
     }
 
-    var html = '<div class="dialog ' + options.extra_class + '" style="display: none;">'
+    var html = '<div class="dialog ' + options.extra_class + '" style="display: none; z-index: 999;">'
              + '<div class="dialog-content">' + options.html + '</div><div class="dialog-buttons">';
 
     if (options.show_no) {
@@ -207,7 +210,8 @@ function show_dialog (extern) {
 
     html += '<button class="dialog-yes"' + copy_id + '>' + options.yes_text + '</button>' + '</div></div>';
 
-    $dialog = $(html);
+    var $dialog = $(html);
+
     $('body').append($dialog);
     var message = $('.dialog-content')[0];
     message.style.visibility = "hidden";
@@ -260,14 +264,20 @@ function show_dialog (extern) {
         message.style.visibility = "visible";
     });
 
-    $dialog.find('.dialog-no').click(function() {
-        default_close_function($dialog);
-    });
-
     $dialog.find('.dialog-yes').click(function() {
         options.yes_callback($dialog);
     });
 
+    if (options.hasOwnProperty("no_callback")) {
+        $dialog.find('.dialog-no:first-child').click(function() {
+            options.no_callback($dialog);
+        });
+    } else {
+        $dialog.find('.dialog-no:first-child').click(function() {
+            default_close_function($dialog);
+        });
+    }
+
     if (options.close_on_clickoutside) {
         $dialog.one('clickoutside', function() {
             default_close_function($dialog);
@@ -331,7 +341,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])
 
@@ -609,6 +620,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) {