From a0242d87cbb2bfba0c500b4d995b420f36fce801 Mon Sep 17 00:00:00 2001
From: Hedgehog <goresares@gmail.com>
Date: Wed, 19 Mar 2014 23:20:40 +0400
Subject: [PATCH] update

fixed english hashtag case dependency bug, expanding post by text
select bug, some style fixes
---
 css/style.css                      |  6 +++---
 jquery-emotions/jquery.emotions.js | 30 ++++++++++++++++++------------
 js/calm.js                         |  1 -
 js/interface_common.js             |  2 +-
 js/twister_actions.js              |  1 +
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/css/style.css b/css/style.css
index bb8a33b..86038dc 100644
--- a/css/style.css
+++ b/css/style.css
@@ -344,7 +344,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
 .userMenu li.userMenu-dhtindicator a {
     display: inline-block;
     font: 12px/25px "Open Sans", sans-serif;
-    padding: 0 0 0 45px;
+    padding: 0 5px 0 41px;
     width: 60px;
     height: 25px;
     opacity: .9;
@@ -353,7 +353,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
     content: 'DHT:';
     display: inline-block;
     position: absolute;
-    left: 10px;
+    left: 8px;
     width: 70px;
     height: 25px;
 }
@@ -1150,7 +1150,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
 }
 .post-interactions
 {
-    margin: 2px 10px 10px 60px;
+    margin: -5px 10px 5px 60px;
     text-align: right;
     height: 25px;
 }
diff --git a/jquery-emotions/jquery.emotions.js b/jquery-emotions/jquery.emotions.js
index ed78c63..b91c78f 100644
--- a/jquery-emotions/jquery.emotions.js
+++ b/jquery-emotions/jquery.emotions.js
@@ -33,28 +33,34 @@
                 "0:-)": "angel",
                 "o.O": "confused",
                 "o_O": "confused",
+                ":'(": "cry",
                 "3:)": "devil",
+                ":(": "frown",
+                "=(": "frown",
+                ":-(": "frown",
+                "8)": "glasses",
+                ":D": "grin",
+                ":-D": "grin",
+                ">:(": "grumpy",
                 "<3": "heart",
                 ":*": "kiss",
                 ":-)": "smile",
                 ":]": "smile",
+                ":)": "smile",
+                "=)": "smile",
+                "(:": "smile",
+                "(-:": "smile",
+                "[:": "smile",
+                "(=": "smile",
                 "8|": "sunglasses",
+                ":p": "tongue",
+                ":P": "tongue",
                 ":/": "unsure",
                 ":\\": "unsure",
                 ";)": "wink",
                 ";-)": "wink",
-                ":'(": "cry",
-                ">:(": "grumpy",
-                ":(": "frown",
-                "=(": "frown",
-                ":-(": "frown",
-                "8)": "glasses",
-                ":p": "tongue",
-                ":P": "tongue",
-                ":)": "smile",
-                "=)": "smile",
-                ":D": "grin",
-                ":-D": "grin"
+                "(;": "wink",
+                "(-;": "wink"
             }
         },
         shortcode: function(eId){
diff --git a/js/calm.js b/js/calm.js
index b4545bf..391d6ef 100644
--- a/js/calm.js
+++ b/js/calm.js
@@ -6,7 +6,6 @@ $(function(){
 	$('.post-text').on('click', 'a', function(e){
 		e.stopPropagation();
 	});
-
 	$('#showqr').on('click', function(){
 			if($('#qrcode img')[0]) return;
          	var skey = document.getElementById('skey').innerText;
diff --git a/js/interface_common.js b/js/interface_common.js
index 2741d08..a33d443 100644
--- a/js/interface_common.js
+++ b/js/interface_common.js
@@ -459,7 +459,7 @@ function initInterfaceCommon() {
     $( ".userMenu-config-dropdown" ).bind( "click", dropDownMenu );
     $( ".config-menu" ).clickoutside( closeThis );
     $( ".module.post" ).bind( "click", function(e) {
-        postExpandFunction(e,$(this)); });
+        if(window.getSelection() == 0)postExpandFunction(e,$(this)); });
     $( ".post-area-new" ).bind( "click", function(e) {
         composeNewPost(e,$(this));} );
     $( ".post-area-new" ).clickoutside( unfocusThis );
diff --git a/js/twister_actions.js b/js/twister_actions.js
index 168f12e..37db743 100644
--- a/js/twister_actions.js
+++ b/js/twister_actions.js
@@ -191,6 +191,7 @@ function clearHashtagProcessed() {
 }
 
 function requestHashtag(postboard,hashtag,resource) {
+    if(/[a-z]/i.test(hashtag))hashtag = hashtag.toLowerCase(); //hed//fix english hashtag case dependentcy bug
     dhtget( hashtag, resource, "m",
            function(args, data) {
                processHashtag(args.postboard, args.hashtag, data);