Browse Source

update

fixed english hashtag case dependency bug, expanding post by text
select bug, some style fixes
master
Hedgehog 11 years ago
parent
commit
a0242d87cb
  1. 6
      css/style.css
  2. 30
      jquery-emotions/jquery.emotions.js
  3. 1
      js/calm.js
  4. 2
      js/interface_common.js
  5. 1
      js/twister_actions.js

6
css/style.css

@ -344,7 +344,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
.userMenu li.userMenu-dhtindicator a { .userMenu li.userMenu-dhtindicator a {
display: inline-block; display: inline-block;
font: 12px/25px "Open Sans", sans-serif; font: 12px/25px "Open Sans", sans-serif;
padding: 0 0 0 45px; padding: 0 5px 0 41px;
width: 60px; width: 60px;
height: 25px; height: 25px;
opacity: .9; opacity: .9;
@ -353,7 +353,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
content: 'DHT:'; content: 'DHT:';
display: inline-block; display: inline-block;
position: absolute; position: absolute;
left: 10px; left: 8px;
width: 70px; width: 70px;
height: 25px; height: 25px;
} }
@ -1150,7 +1150,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
} }
.post-interactions .post-interactions
{ {
margin: 2px 10px 10px 60px; margin: -5px 10px 5px 60px;
text-align: right; text-align: right;
height: 25px; height: 25px;
} }

30
jquery-emotions/jquery.emotions.js

@ -33,28 +33,34 @@
"0:-)": "angel", "0:-)": "angel",
"o.O": "confused", "o.O": "confused",
"o_O": "confused", "o_O": "confused",
":'(": "cry",
"3:)": "devil", "3:)": "devil",
":(": "frown",
"=(": "frown",
":-(": "frown",
"8)": "glasses",
":D": "grin",
":-D": "grin",
">:(": "grumpy",
"<3": "heart", "<3": "heart",
":*": "kiss", ":*": "kiss",
":-)": "smile", ":-)": "smile",
":]": "smile", ":]": "smile",
":)": "smile",
"=)": "smile",
"(:": "smile",
"(-:": "smile",
"[:": "smile",
"(=": "smile",
"8|": "sunglasses", "8|": "sunglasses",
":p": "tongue",
":P": "tongue",
":/": "unsure", ":/": "unsure",
":\\": "unsure", ":\\": "unsure",
";)": "wink", ";)": "wink",
";-)": "wink", ";-)": "wink",
":'(": "cry", "(;": "wink",
">:(": "grumpy", "(-;": "wink"
":(": "frown",
"=(": "frown",
":-(": "frown",
"8)": "glasses",
":p": "tongue",
":P": "tongue",
":)": "smile",
"=)": "smile",
":D": "grin",
":-D": "grin"
} }
}, },
shortcode: function(eId){ shortcode: function(eId){

1
js/calm.js

@ -6,7 +6,6 @@ $(function(){
$('.post-text').on('click', 'a', function(e){ $('.post-text').on('click', 'a', function(e){
e.stopPropagation(); e.stopPropagation();
}); });
$('#showqr').on('click', function(){ $('#showqr').on('click', function(){
if($('#qrcode img')[0]) return; if($('#qrcode img')[0]) return;
var skey = document.getElementById('skey').innerText; var skey = document.getElementById('skey').innerText;

2
js/interface_common.js

@ -459,7 +459,7 @@ function initInterfaceCommon() {
$( ".userMenu-config-dropdown" ).bind( "click", dropDownMenu ); $( ".userMenu-config-dropdown" ).bind( "click", dropDownMenu );
$( ".config-menu" ).clickoutside( closeThis ); $( ".config-menu" ).clickoutside( closeThis );
$( ".module.post" ).bind( "click", function(e) { $( ".module.post" ).bind( "click", function(e) {
postExpandFunction(e,$(this)); }); if(window.getSelection() == 0)postExpandFunction(e,$(this)); });
$( ".post-area-new" ).bind( "click", function(e) { $( ".post-area-new" ).bind( "click", function(e) {
composeNewPost(e,$(this));} ); composeNewPost(e,$(this));} );
$( ".post-area-new" ).clickoutside( unfocusThis ); $( ".post-area-new" ).clickoutside( unfocusThis );

1
js/twister_actions.js

@ -191,6 +191,7 @@ function clearHashtagProcessed() {
} }
function requestHashtag(postboard,hashtag,resource) { 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", dhtget( hashtag, resource, "m",
function(args, data) { function(args, data) {
processHashtag(args.postboard, args.hashtag, data); processHashtag(args.postboard, args.hashtag, data);

Loading…
Cancel
Save