diff --git a/static/js/chat-page.js b/static/js/chat-page.js index 3f655aa..ecebc8f 100644 --- a/static/js/chat-page.js +++ b/static/js/chat-page.js @@ -355,17 +355,12 @@ new Vue({ init:function(){ var _this=this; this.initCss(); - $("#app").click(function(){ - clearTimeout(titleTimer); - document.title = originTitle; - }); $('body').click(function(){ - clearTimeout(titleTimer); - document.title = originTitle; - + clearFlashTitle(); $('.faceBox').hide(); }); window.onfocus = function () { + clearFlashTitle(); window.parent.postMessage({type:"focus"},"*"); if(_this.socketClosed){ return; diff --git a/static/js/functions.js b/static/js/functions.js index 781f837..9f9343b 100644 --- a/static/js/functions.js +++ b/static/js/functions.js @@ -41,22 +41,31 @@ function notify(title, options, callback) { },5000); } } -var titleTimer,titleNum=0; +var titleTimer=0; +var titleNum=0; var originTitle = document.title; function flashTitle() { - titleNum++; - if (titleNum == 3) { - titleNum = 1; - } - if (titleNum == 1) { - document.title = '【】' + originTitle; - } - if (titleNum == 2) { - document.title = '【你有一条消息】' + originTitle; + if(titleTimer!=0){ + return; } - titleTimer = setTimeout("flashTitle()", 500); -} + titleTimer = setInterval(function(){ + titleNum++; + if (titleNum == 3) { + titleNum = 1; + } + if (titleNum == 1) { + document.title = '【】' + originTitle; + } + if (titleNum == 2) { + document.title = '【new message】' + originTitle; + } + }, 500); +} +function clearFlashTitle() { + clearInterval(titleTimer); + document.title = originTitle; +} var faceTitles = ["[微笑]", "[嘻嘻]", "[哈哈]", "[可爱]", "[可怜]", "[挖鼻]", "[吃惊]", "[害羞]", "[挤眼]", "[闭嘴]", "[鄙视]", "[爱你]", "[泪]", "[偷笑]", "[亲亲]", "[生病]", "[太开心]", "[白眼]", "[右哼哼]", "[左哼哼]", "[嘘]", "[衰]", "[委屈]", "[吐]", "[哈欠]", "[抱抱]", "[怒]", "[疑问]", "[馋嘴]", "[拜拜]", "[思考]", "[汗]", "[困]", "[睡]", "[钱]", "[失望]", "[酷]", "[色]", "[哼]", "[鼓掌]", "[晕]", "[悲伤]", "[抓狂]", "[黑线]", "[阴险]", "[怒骂]", "[互粉]", "[心]", "[伤心]", "[猪头]", "[熊猫]", "[兔子]", "[ok]", "[耶]", "[good]", "[NO]", "[赞]", "[来]", "[弱]", "[草泥马]", "[神马]", "[囧]", "[浮云]", "[给力]", "[围观]", "[威武]", "[奥特曼]", "[礼物]", "[钟]", "[话筒]", "[蜡烛]", "[蛋糕]"]; function placeFace() { var faces=[];