X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/493f5c31bcaf9f89774a9ab5489581ca4729d4a6..0bd53bfd0a08e9949651ec35bf22048db8e740d9:/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 17de794..55a3f1e 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.prepend(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: '',
@@ -194,11 +197,18 @@ function show_dialog (extern) {
         copy_id = ' id="copy_clip_button"'
     }
 
-    if (options.event != undefined) {
+    if (options.event != undefined && options.event.pageX != undefined && options.event.pageY != undefined) {
         options.pos = {x: options.event.pageX, y: options.event.pageY};
+    } else if (options.event.currentTarget != undefined) {
+        var el = jQuery("#" + options.event.currentTarget.id);
+        var position = el.offset();
+        options.pos = {
+            x: position.left,
+            y: position.top
+        }
     }
 
-    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 +217,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 +271,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);
@@ -426,8 +443,14 @@ $(function() {
             var $dialog = show_dialog(doptions);
         } else {
             start_command();
-            $.getJSON(ajax_url, function(data) {
-                process_ajax_response(data, evt);
+            $.ajax({
+                url: ajax_url,
+                type: "POST",
+                dataType: "json",
+                contentType: "application/json; charset=utf-8",
+                success: function(data) {
+                    process_ajax_response(data, evt);
+                }
             });
         }
 
@@ -708,14 +731,15 @@ function pickedTags(){
         var deleteTagLocally = function(){
             from_target[tagname].remove();
             delete from_target[tagname];
+            $(".tags.interesting").trigger('contentchanged');
         };
+
         if (send_ajax){
             sendAjax(tagname,reason,'remove',deleteTagLocally);
         }
         else {
             deleteTagLocally();
         }
-
     };
 
     var setupTagDeleteEvents = function(obj,tag_store,tagname,reason,send_ajax){
@@ -772,6 +796,8 @@ function pickedTags(){
                 to_tag_container.append(new_tag);
 
                 to_target[tagname] = new_tag;
+
+                to_tag_container.trigger('contentchanged');
             });
         }
     };