Changeset 5905 in subversion

Timestamp:

Feb 25, 2012 10:20:36 AM (15 months ago)

Author:

thomasb

Message:

Make popups disapear when clicking on an iframe; adapt IE hacks (#1488354)

Location:

trunk/roundcubemail/skins/larry

Files:

• ie7hacks.css (modified) (1 diff)
• iehacks.css (modified) (1 diff)
• ui.js (modified) (3 diffs)

trunk/roundcubemail/skins/larry/ie7hacks.css

@@ -60 +60 @@
 ul.toolbarmenu li a {
         width: 140px;
+}
+
+.dropbutton .dropbuttontip {
+        right: 0;
 }
 

trunk/roundcubemail/skins/larry/iehacks.css

@@ -129 +129 @@
 }
 
-#mailboxlist li.mailbox.selected .unreadcount {
+#mailboxlist li.mailbox.selected > a .unreadcount {
         filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005d76', endColorstr='#004558', GradientType=0);
 }

trunk/roundcubemail/skins/larry/ui.js

@@ -174 +174 @@
     $('.tabbed').each(function(idx, elem){ init_tabs(elem); })
 
-    $(document.body).bind('mouseup', function(e){
-      var config, obj, target = e.target;
-      for (var id in popups) {
-        obj = popups[id];
-        config = popupconfig[id];
-        if (obj.is(':visible')
-          && target.id != id+'link'
-          && !config.toggle
-          && (!config.editable || !target_overlaps(target, obj.get(0)))
-          && (!config.sticky || !rcube_mouse_is_over(e, obj.get(0)))
-        ) {
-          var myid = id+'';
-          window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
-        }
-      }
-    })
+    $(document.body).bind('mouseup', body_mouseup)
     .bind('keyup', function(e){
       if (e.keyCode == 27) {
@@ -199 +184 @@
     });
 
+    $('iframe').load(function(e){
+      // this = iframe
+      var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
+      $(doc).mouseup(body_mouseup);
+    })
+    .contents().mouseup(body_mouseup);
+
     $(window).resize(function(e) {
       // check target due to bugs in jquery
@@ -205 +197 @@
       if (e.target == window) resize();
     });
+  }
+
+  /**
+   * Handler for mouse-up events on the document body.
+   * This will close all open popup menus
+   */
+  function body_mouseup(e)
+  {
+    var config, obj, target = e.target;
+    for (var id in popups) {
+      obj = popups[id];
+      config = popupconfig[id];
+      if (obj.is(':visible')
+        && target.id != id+'link'
+        && !config.toggle
+        && (!config.editable || !target_overlaps(target, obj.get(0)))
+        && (!config.sticky || !rcube_mouse_is_over(e, obj.get(0)))
+      ) {
+        var myid = id+'';
+        window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
+      }
+    }
   }