remove dubious # hrefs

[irc/quakenet/qwebirc.git] / js / ui / frontends / qui.js

diff --git a/js/ui/frontends/qui.js b/js/ui/frontends/qui.js
index 57846b0e02c83d5c36c8a1ed3982c14bef8a6966..948cd2dd65eb3d4a5cd3e0d55478c043d812d5b1 100644 (file)
--- a/js/ui/frontends/qui.js
+++ b/js/ui/frontends/qui.js
@@ -41,16 +41,25 @@ qwebirc.ui.QUI = new Class({
     this.reflow = this.qjsui.reflow.bind(this.qjsui);
     
     this.tabs.addEvent("mousewheel", function(x) {
-      if(this.sideTabs)
-        return;
-
       var event = new Event(x);
+      var up, down;
+      if(this.sideTabs) {
+        var p = this.qjsui.left;
+
+        /* don't scroll if we're scrollable */
+        if(p.getScrollSize().y > p.clientHeight)
+          return;
 
-      /* up */
-      if(event.wheel > 0) {
+        up = event.wheel < 0;
+        down = event.wheel > 0;
+      } else {
+        up = event.wheel > 0;
+        down = event.wheel < 0;
+      }
+
+      if(up) {
         this.nextWindow();
-      } else if(event.wheel < 0) {
-        /* down */
+      } else if(down) {
         this.prevWindow();
       }
       event.stop();
@@ -331,11 +340,12 @@ qwebirc.ui.QUI.JSUI = new Class({
     var docsize = this.sizer.getSize();
     
     var mheight = (docsize.y - topsize.y - bottomsize.y - topicsize.y);
-    var mwidth = (docsize.x - rightsize.x);
+    var mwidth = (docsize.x - rightsize.x - leftsize.x);
 
     left.setStyle("top", topsize.y);
     topic.setStyle("top", topsize.y);
     topic.setStyle("left", leftsize.x);
+    topic.setStyle("width", docsize.x - leftsize.x);
     
     middle.setStyle("top", (topsize.y + topicsize.y));
     middle.setStyle("left", leftsize.x);
@@ -371,7 +381,7 @@ qwebirc.ui.QUI.Window = new Class({
   initialize: function(parentObject, client, type, name, identifier) {
     this.parent(parentObject, client, type, name, identifier);
 
-    this.tab = new Element("a", {"href": "#"});
+    this.tab = new Element("a");
     this.tab.addClass("tab");
     this.tab.addEvent("focus", function() { this.blur() }.bind(this.tab));;
 
@@ -507,7 +517,6 @@ qwebirc.ui.QUI.Window = new Class({
       var e2 = new Element("a");
       e.appendChild(e2);
 
-      e2.href = "#";
       e2.set("text", "- " + x.text);
 
       e2.addEvent("focus", function() { this.blur() }.bind(e2));
@@ -547,8 +556,6 @@ qwebirc.ui.QUI.Window = new Class({
     
     var e = new Element("a");
     qwebirc.ui.insertAt(position, this.nicklist, e);
-    
-    e.href = "#";
     var span = new Element("span");
     if(this.parentObject.uiOptions.NICK_COLOURS) {
       var colour = realNick.toHSBColour(this.client);