Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Porter <slug@qwebirc.org>2010-04-24 15:47:06 (GMT)
committer Chris Porter <slug@qwebirc.org>2010-04-24 15:47:06 (GMT)
commit0d83cb6deee4a1ba13dcf6f835cfb814b0736ed0 (patch)
tree41d5006aa217679d3c40bd189dc58df83b149e1b
parent7743ebc4bb11ce2e2e66461adee84b0aaea251a9 (diff)
Don't steal focus if we're inside an iframe.
-rw-r--r--js/ui/panes/connect.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/ui/panes/connect.js b/js/ui/panes/connect.js
index 3c5fc3a..9f8b539 100644
--- a/js/ui/panes/connect.js
+++ b/js/ui/panes/connect.js
@@ -84,6 +84,9 @@ qwebirc.ui.ConfirmBox = function(parentElement, callback, initialNickname, initi
td.appendChild(auth);
auth.addEvent("click", qwebirc.ui.AuthLogin);
}
+
+ if(!window != window.top)
+ yes.focus();
}
qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initialChannels, networkName) {
@@ -233,7 +236,8 @@ qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initial
nick.set("value", initialNickname);
chan.set("value", initialChannels);
- nick.focus();
+ if(!window != window.top)
+ nick.focus();
}
qwebirc.ui.authShowHide = function(checkbox, authRow, usernameBox, usernameRow, passwordRow) {