Resolves OSQA-723. Incorrect variable name.

[osqa.git] / 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 d95e4e0523a1f8005f34a1b78029652dcf1a0b48..6bd0969f563aac8d27e5880cc9452ab74e476abc 100644 (file)
--- a/forum/skins/default/media/js/osqa.main.js
+++ b/forum/skins/default/media/js/osqa.main.js
@@ -1,3 +1,30 @@
+/**\r
+ * We do not want the CSRF protection enabled for the AJAX post requests, it causes only trouble.\r
+ * Get the csrftoken cookie and pass it to the X-CSRFToken HTTP request property.\r
+ */\r
+\r
+$('html').ajaxSend(function(event, xhr, settings) {\r
+    function getCookie(name) {\r
+        var cookieValue = null;\r
+        if (document.cookie && document.cookie != '') {\r
+            var cookies = document.cookie.split(';');\r
+            for (var i = 0; i < cookies.length; i++) {\r
+                var cookie = jQuery.trim(cookies[i]);\r
+                // Does this cookie string begin with the name we want?\r
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {\r
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));\r
+                    break;\r
+                }\r
+            }\r
+        }\r
+        return cookieValue;\r
+    }\r
+    if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {\r
+        // Only send the token to relative URLs i.e. locally.\r
+        xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));\r
+    }\r
+});\r
+\r

 var response_commands = {\r
     refresh_page: function() {\r
         window.location.reload(true)\r
 var response_commands = {\r
     refresh_page: function() {\r
         window.location.reload(true)\r


@@ -75,7 +102,7 @@ var response_commands = {
         alert('ok');\r
     },\r
 \r
         alert('ok');\r
     },\r
 \r

-    insert_comment: function(post_id, comment_id, comment, username, profile_url, delete_url, edit_url, convert_url) {\r
+    insert_comment: function(post_id, comment_id, comment, username, profile_url, delete_url, edit_url, convert_url, can_convert) {\r

         var $container = $('#comments-container-' + post_id);\r
         var skeleton = $('#new-comment-skeleton-' + post_id).html().toString();\r
 \r
         var $container = $('#comments-container-' + post_id);\r
         var skeleton = $('#new-comment-skeleton-' + post_id).html().toString();\r
 \r


@@ -89,6 +116,11 @@ var response_commands = {
 \r
         $container.append(skeleton);\r
 \r
 \r
         $container.append(skeleton);\r
 \r

+        // Show the convert comment to answer tool only if the current comment can be converted\r
+        if (can_convert == true) {\r
+            $('#comment-' + comment_id + '-convert').show();\r
+        }\r
+\r

         $('#comment-' + comment_id).slideDown('slow');\r
     },\r
 \r
         $('#comment-' + comment_id).slideDown('slow');\r
     },\r
 \r


@@ -100,12 +132,12 @@ var response_commands = {
     },\r
 \r
     mark_deleted: function(post_type, post_id) {\r
     },\r
 \r
     mark_deleted: function(post_type, post_id) {\r

-        if (post_type == 'answer') {\r
-            var $answer = $('#answer-container-' + post_id);\r
-            $answer.addClass('deleted');\r
-        } else {\r
+        if (post_type == 'question') {\r

             var $container = $('#question-table');\r
             $container.addClass('deleted');\r
             var $container = $('#question-table');\r
             $container.addClass('deleted');\r

+        } else {\r
+            var $el = $('#' + post_type + '-container-' + post_id);\r
+            $el.addClass('deleted');\r

         }\r
     },\r
 \r
         }\r
     },\r
 \r


@@ -125,6 +157,9 @@ var response_commands = {
 \r
     set_subscription_status: function(text) {\r
         $('.subscription-status').html(text);\r
 \r
     set_subscription_status: function(text) {\r
         $('.subscription-status').html(text);\r

+    },\r
+\r
+    copy_url: function(url) {\r

     }\r
 }\r
 \r
     }\r
 }\r
 \r


@@ -146,11 +181,17 @@ function show_dialog (extern) {
         yes_callback: default_close_function,\r
         no_text: messages.cancel,\r
         show_no: false,\r
         yes_callback: default_close_function,\r
         no_text: messages.cancel,\r
         show_no: false,\r

-        close_on_clickoutside: false\r
+        close_on_clickoutside: false,\r
+        copy: false\r

     }\r
 \r
     $.extend(options, extern);\r
 \r
     }\r
 \r
     $.extend(options, extern);\r
 \r

+    var copy_id = '';\r
+    if (options.copy) {\r
+        copy_id = ' id="copy_clip_button"'\r
+    }\r
+\r

     if (options.event != undefined) {\r
         options.pos = {x: options.event.pageX, y: options.event.pageY};\r
     }\r
     if (options.event != undefined) {\r
         options.pos = {x: options.event.pageX, y: options.event.pageY};\r
     }\r


@@ -162,8 +203,7 @@ function show_dialog (extern) {
         html += '<button class="dialog-no">' + options.no_text + '</button>';\r
     }\r
 \r
         html += '<button class="dialog-no">' + options.no_text + '</button>';\r
     }\r
 \r

-    html += '<button class="dialog-yes">' + options.yes_text + '</button>'\r
-            + '</div></div>';\r
+    html += '<button class="dialog-yes"' + copy_id + '>' + options.yes_text + '</button>' + '</div></div>';\r

 \r
     $dialog = $(html);\r
     $('body').append($dialog);\r
 \r
     $dialog = $(html);\r
     $('body').append($dialog);\r


@@ -269,7 +309,12 @@ function load_prompt(evt, el, url) {
                     process_ajax_response(data, evt);\r
                 }, 'json');\r
             },\r
                     process_ajax_response(data, evt);\r
                 }, 'json');\r
             },\r

-            show_no: true\r
+            show_no: true,\r
+            copy: false\r
+        }\r
+\r
+        if (el.hasClass('copy')) {\r
+            $.extend(doptions, { yes_text : 'Copy', copy: true});\r

         }\r
 \r
         if (!el.is('.centered')) {\r
         }\r
 \r
         if (!el.is('.centered')) {\r


@@ -320,23 +365,47 @@ function end_command(success) {
     }\r
 }\r
 \r
     }\r
 }\r
 \r

+var comment_box_cursor_position = 0;\r
+function canned_comment(post_id, comment) {\r
+    textarea = $('#comment-' + post_id + '-form textarea')\r
+\r
+    // Get the text from the beginning to the caret\r
+    textarea_start = textarea.val().substr(0, comment_box_cursor_position)\r
+\r
+    // Get the text from the caret to the end\r
+    textarea_end = textarea.val().substr(comment_box_cursor_position, textarea.val().length)\r
+\r
+    textarea.val(textarea_start + comment + textarea_end);\r
+}\r
+\r

 $(function() {\r
 $(function() {\r

+    $('textarea.commentBox').bind('keydown keyup mousedown mouseup mousemove', function(evt) {\r
+        comment_box_cursor_position = $(this).caret().start;\r
+    });\r
+\r
+    $('textarea.commentBox').blur(function() {\r
+        //alert(comment_box_cursor_position);\r
+    });\r
+\r

     $('a.ajax-command').live('click', function(evt) {\r
         if (running) return false;\r
 \r
     $('a.ajax-command').live('click', function(evt) {\r
         if (running) return false;\r
 \r

-        $('.context-menu-dropdown').slideUp('fast');\r
-\r

         var el = $(this);\r
 \r
         var el = $(this);\r
 \r

+        var ajax_url = el.attr('href')\r
+        ajax_url = ajax_url + "?nocache=" + new Date().getTime()\r
+\r
+        $('.context-menu-dropdown').slideUp('fast');\r
+\r

         if (el.is('.withprompt')) {\r
         if (el.is('.withprompt')) {\r

-            load_prompt(evt, el, el.attr('href'));\r
+            load_prompt(evt, el, ajax_url);\r

         } else if(el.is('.confirm')) {\r
             var doptions = {\r
                 html: messages.confirm,\r
                 extra_class: 'confirm',\r
                 yes_callback: function() {\r
                     start_command();\r
         } else if(el.is('.confirm')) {\r
             var doptions = {\r
                 html: messages.confirm,\r
                 extra_class: 'confirm',\r
                 yes_callback: function() {\r
                     start_command();\r

-                    $.getJSON(el.attr('href'), function(data) {\r
+                    $.getJSON(ajax_url, function(data) {\r

                         process_ajax_response(data, evt);\r
                         $dialog.fadeOut('fast', function() {\r
                             $dialog.remove();\r
                         process_ajax_response(data, evt);\r
                         $dialog.fadeOut('fast', function() {\r
                             $dialog.remove();\r


@@ -354,7 +423,7 @@ $(function() {
             var $dialog = show_dialog(doptions);\r
         } else {\r
             start_command();\r
             var $dialog = show_dialog(doptions);\r
         } else {\r
             start_command();\r

-            $.getJSON(el.attr('href'), function(data) {\r
+            $.getJSON(ajax_url, function(data) {\r

                 process_ajax_response(data, evt);\r
             });\r
         }\r
                 process_ajax_response(data, evt);\r
             });\r
         }\r


@@ -525,7 +594,7 @@ $(function() {
                 }\r
 \r
                 start_command();\r
                 }\r
 \r
                 start_command();\r

-                $.post($form.attr('action'), post_data, function(data) {\r
+                $.post($form.attr('action'), $form.serialize(), function(data) {\r

                     process_ajax_response(data, evt, function(error) {\r
                         if (!error) {\r
                             cleanup_form();\r
                     process_ajax_response(data, evt, function(error) {\r
                         if (!error) {\r
                             cleanup_form();\r


@@ -563,8 +632,8 @@ $(function() {
         var $previewer = $('#previewer');\r
         var $container = $('#editor-metrics');\r
 \r
         var $previewer = $('#previewer');\r
         var $container = $('#editor-metrics');\r
 \r

-        var initial_whitespace_rExp = /^[^A-Za-z0-9]+/gi;\r
-        var non_alphanumerics_rExp = rExp = /[^A-Za-z0-9]+/gi;\r
+        var initial_whitespace_rExp = /^[^A-Za-zА-Яа-я0-9]+/gi;\r
+        var non_alphanumerics_rExp = rExp = /[^A-Za-zА-Яа-я0-9]+/gi;\r

         var editor_interval = null;\r
 \r
         $editor.focus(function() {\r
         var editor_interval = null;\r
 \r
         $editor.focus(function() {\r


@@ -681,7 +750,7 @@ function pickedTags(){
                 tag_link.attr('rel','tag');\r
                 tag_link.attr('href', scriptUrl + $.i18n._('tags/') + tagname + '/');\r
                 tag_link.html(tagname);\r
                 tag_link.attr('rel','tag');\r
                 tag_link.attr('href', scriptUrl + $.i18n._('tags/') + tagname + '/');\r
                 tag_link.html(tagname);\r

-                var del_link = $('<img></img>');\r
+                var del_link = $('<img />');\r

                 del_link.addClass('delete-icon');\r
                 del_link.attr('src', mediaUrl('media/images/close-small-dark.png'));\r
 \r
                 del_link.addClass('delete-icon');\r
                 del_link.attr('src', mediaUrl('media/images/close-small-dark.png'));\r
 \r