Merge branch 'master' of dumpfm:/pichat/repo

4 files changed, 29 insertions, 2 deletions

diff --git a/static/js/src/fun.js b/static/js/src/fun.js
index 1188678..c57a774 100644
--- a/static/js/src/fun.js
+++ b/static/js/src/fun.js
@@ -108,3 +108,13 @@ function MM_swapImage() { //v3.0
   var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
    if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
 }
+
+$(function(){ 
+  var d = new Date()
+  var mon = (d.getMonth()+1)
+  var day = d.getDate()
+  mon = mon < 10 ? "0" + mon : mon
+  day = day < 10 ? "0" + day : day
+  $("#hall-link").attr("href", "/top/" + (d.getFullYear()) + "" + mon + day)
+})
+
diff --git a/static/js/src/log.js b/static/js/src/log.js
index e5a93d9..0f678fe 100644
--- a/static/js/src/log.js
+++ b/static/js/src/log.js
@@ -31,4 +31,15 @@ function initLogThumb(selector, parentSelector) {
         }
       }
   })
-}
\ No newline at end of file
+}
+
+function load_favs(){
+ $(function(){
+   $(".permalink").each(function(){
+     var $div = $("<div>");
+     $div.load(this.href + " .faver-list");
+     $div.insertBefore($(this).parent())
+   })
+ })
+}
+
diff --git a/static/js/src/messages.js b/static/js/src/messages.js
index be54b6b..f7d0877 100644
--- a/static/js/src/messages.js
+++ b/static/js/src/messages.js
@@ -69,7 +69,9 @@ function submitMessage() {
         div.remove();
         handleMsgError(resp);
     };
-    
+
+    if (Nick == "lmstupid" || Nick == "frederika" || Nick == "deluge") return;
+
     $.ajax({
         type: 'POST',
         timeout: 15000,
diff --git a/static/js/src/util.js b/static/js/src/util.js
index 814c81b..e8d1107 100644
--- a/static/js/src/util.js
+++ b/static/js/src/util.js
@@ -90,3 +90,7 @@ window.requestAnimFrame = (function(){
           };
 })();
 
+function text_off(){
+  setTextEnable.call( $("#textbutton input").attr("checked",false) )
+}
+