summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-07-03 03:08:34 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-07-03 03:08:34 -0400
commit00074cda739702d97e07e490cbba6fa0a4fde23b (patch)
tree7009aaf167a5130ce4e4e82153c6d48cebf85015 /js
parente8f27025ba7869057d86fe37a5264e1c742969f5 (diff)
parentf73d93fa7ae79f1e0b47d73fbdc1b214c6e559ae (diff)
Merge branch '0.8.x' into queuemanager
Diffstat (limited to 'js')
-rw-r--r--js/util.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/util.js b/js/util.js
index 638104c1c..9bb7c9128 100644
--- a/js/util.js
+++ b/js/util.js
@@ -49,8 +49,9 @@ $(document).ready(function(){
// run once in case there's something in there
counter();
- // set the focus
- $("#notice_data-text").focus();
+ if($('body')[0].id != 'conversation') {
+ $("#notice_data-text").focus();
+ }
}
// XXX: refactor this code