diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2014-06-24 18:54:51 -0400 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2014-06-24 18:54:51 -0400 |
| commit | 93e29d0efd008e7aaa5b5244c8bbfd3913eac6c4 (patch) | |
| tree | 81f72cbae8a211a0a71b9b9b572757e898cae8d5 | |
| parent | 557046a95fb06174f6a4b8f6f9f92c6719604f52 (diff) | |
| parent | 050c61a79f2a58772a3d749c0a29d6e8fd2c34ef (diff) | |
Merge branch 'master' of /pichat/repo
| -rw-r--r-- | static/js/pichat.js | 2 | ||||
| -rw-r--r-- | static/js/pichat2.js | 2 | ||||
| -rw-r--r-- | static/js/src/userlist.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/static/js/pichat.js b/static/js/pichat.js index 2cee712..f678cc1 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -2248,7 +2248,7 @@ function linkReplaceWithoutImage(url){ return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>" } -var MUTES = localStorage['mutes']['nick']; +var MUTES = localStorage['mutes'] || {}; $(".mute").live("click", function(){ $(this).removeClass("mute"); $(this).addClass("unmute"); diff --git a/static/js/pichat2.js b/static/js/pichat2.js index 2cee712..f678cc1 100644 --- a/static/js/pichat2.js +++ b/static/js/pichat2.js @@ -2248,7 +2248,7 @@ function linkReplaceWithoutImage(url){ return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>" } -var MUTES = localStorage['mutes']['nick']; +var MUTES = localStorage['mutes'] || {}; $(".mute").live("click", function(){ $(this).removeClass("mute"); $(this).addClass("unmute"); diff --git a/static/js/src/userlist.js b/static/js/src/userlist.js index 7ca4344..9851ad8 100644 --- a/static/js/src/userlist.js +++ b/static/js/src/userlist.js @@ -1,4 +1,4 @@ -var MUTES = localStorage['mutes']['nick']; +var MUTES = localStorage['mutes'] || {}; $(".mute").live("click", function(){ $(this).removeClass("mute"); $(this).addClass("unmute"); |