Reintegrate merge cacheimp -> trunk.

[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 f83d3b5de87cb9698a2087ef1d30ba684c21217f..0cf354ff19df9bf0142047a11260dc439466753c 100644 (file)
--- a/forum/skins/default/media/js/osqa.main.js
+++ b/forum/skins/default/media/js/osqa.main.js
@@ -71,6 +71,10 @@ var response_commands = {
         });\r
     },\r
 \r
         });\r
     },\r
 \r

+    award_points: function(id) {\r
+        alert('ok');\r
+    },\r
+\r

     insert_comment: function(post_id, comment_id, comment, username, profile_url, delete_url, edit_url, convert_url) {\r
         var $container = $('#comments-container-' + post_id);\r
         var skeleton = $('#new-comment-skeleton-' + post_id).html().toString();\r
     insert_comment: function(post_id, comment_id, comment, username, profile_url, delete_url, edit_url, convert_url) {\r
         var $container = $('#comments-container-' + post_id);\r
         var skeleton = $('#new-comment-skeleton-' + post_id).html().toString();\r


@@ -121,6 +125,10 @@ 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
+        $.copy(url);\r

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


@@ -201,6 +209,9 @@ function show_dialog (extern) {
     if ((options.event.pageY + options.dim.h) > ($(window).height() + $(window).scrollTop())) {\r
         top_position_change = options.dim.h\r
     }\r
     if ((options.event.pageY + options.dim.h) > ($(window).height() + $(window).scrollTop())) {\r
         top_position_change = options.dim.h\r
     }\r

+    if ((options.event.pageX + options.dim.w) > ($(window).width() + $(window).scrollLeft())) {\r
+        left_position_change = options.dim.w\r
+    }\r

     \r
     $dialog.animate({\r
         top: "-=" + top_position_change,\r
     \r
     $dialog.animate({\r
         top: "-=" + top_position_change,\r


@@ -556,8 +567,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