summaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-09-03 21:03:39 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-09-03 21:03:39 -0400
commit622122468f565bfb1c52245affd07413c6aecca6 (patch)
treeddeb6cd30be6698ef0fcf539dc9920fe19e1cf7f /static
parent5215fa49a2c64d7c015e638f72bd7c4b280b0beb (diff)
sostler prod commit
Diffstat (limited to 'static')
-rwxr-xr-xstatic/css/dump.css21
-rw-r--r--static/js/pichat.js12
2 files changed, 18 insertions, 15 deletions
diff --git a/static/css/dump.css b/static/css/dump.css
index f37d525..1449167 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -304,6 +304,10 @@ display:none;
.thumb {
cursor:pointer;
}
+ .thumb{
+display:inline-block;
+
+}
img.chat-thumb {
cursor:pointer;
@@ -333,7 +337,7 @@ img.chat-thumb {
.buttons{
cursor:pointer;
-
+display:inline-block;
}
.buttons .share {
opacity: 0.8;
@@ -345,15 +349,15 @@ img.chat-thumb {
/*padding-left: 20px;*/
}
img.thumb {
- position: absolute;
+bottom:10px;
image-rendering: -moz-crisp-edges;
- margin-left: 0px;
- margin-top: 0px;
- height: 27px;
- width: 27px;
+
+position:absolute;
+
+
+
left:110px;
- bottom: 9px;
- display: block;
+ display: inline-block;
}
.thumb.favorite {
@@ -1633,6 +1637,7 @@ width:600px;
width:auto;
text-overflow: ellipsis-word;
padding: 18px;
+ padding-bottom:7px;
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
text-transform: uppercase;
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 7611edb..ef45935 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -440,11 +440,7 @@ function isDuplicateMessage(m) {
function refresh() {
var onSuccess = function(json) {
try {
- if (json.v && (typeof Version == 'undefined' || Version != json.v)) {
- location.reload();
- }
-
- Timestamp = json.timestamp;
+ Timestamp = json.timestamp;
$.map(json.messages, function(msg){ MessageContentCache[msg.msg_id.toString()] = msg.content })
@@ -624,7 +620,7 @@ function initChatThumb(){
$(this).attr("src", Imgs.chatThumb);
$(this).stop().animate(Anim.chatThumb, 'fast');
} else {
- $(this).stop().animate(Anim.chatThumbTiny, 'fast', 'swing',
+ $(this).delay(600).stop().animate(Anim.chatThumbTiny, 'fast', 'swing',
function(){
$(this).attr("src", Imgs.chatThumbDot)
$(this).animate(Anim.chatThumb, 0)
@@ -634,6 +630,7 @@ function initChatThumb(){
})
}
+
function paletteToChat(img){
var chatText = $("#msgInput").val()
if (chatText.length && chatText[chatText.length - 1] != " ")
@@ -1214,7 +1211,8 @@ var HasFocus = true;
function onFocus() {
HasFocus = true;
UnseenMsgCounter = 0;
- $('title').text(OrigTitle);
+ // Courtesy http://stackoverflow.com/questions/2952384/changing-the-window-title-when-focussing-the-window-doesnt-work-in-chrome
+ window.setTimeout(function () { $('title').text(OrigTitle); }, 100);
}
function onBlur() {