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 7571a4b52ade1f64b1488fc6bb410de612e43726..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
+    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
@@ -121,6 +125,10 @@ var response_commands = {
 \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
@@ -185,10 +193,29 @@ function show_dialog (extern) {
         top: options.pos.y,\r
         left: options.pos.x\r
     });\r
-\r
+    \r
+    top_position_change = (options.dim.h / 2)\r
+    left_position_change = (options.dim.w / 2)\r
+    \r
+    new_top_position = options.pos.y - top_position_change\r
+    new_left_position = options.pos.x - left_position_change\r
+    \r
+    if (new_left_position < 0) {\r
+        left_position_change = 0\r
+    }\r
+    if (($(window).scrollTop() - new_top_position) > 0) {\r
+        top_position_change = 0\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: "-=" + (options.dim.h / 2),\r
-        left: "-=" + (options.dim.w / 2),\r
+        top: "-=" + top_position_change,\r
+        left: "-=" + left_position_change,\r
         width: options.dim.w,\r
         height: options.dim.h\r
     }, 200, function() {\r
@@ -540,8 +567,8 @@ $(function() {
         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
@@ -660,7 +687,7 @@ function pickedTags(){
                 tag_link.html(tagname);\r
                 var del_link = $('<img></img>');\r
                 del_link.addClass('delete-icon');\r
-                del_link.attr('src', mediaUrl('/media/images/close-small-dark.png'));\r
+                del_link.attr('src', mediaUrl('media/images/close-small-dark.png'));\r
 \r
                 setupTagDeleteEvents(del_link, to_target, tagname, reason, true);\r
 \r