Changeset 4039

Timestamp:

12/06/07 04:15:53 (1 year ago)

Author:

kswedberg

Message:

cluetip: added clickThrough option to allow click to go to page, even if href and tipAttribute are equal. fixed a bug where a variable was improperly nested in an if statement

Location:

trunk/plugins/cluetip

Files:

• jquery.cluetip.js (modified) (5 diffs)
• jquery.dimensions.js (modified) (1 diff)

trunk/plugins/cluetip/jquery.cluetip.js

@@ -1 +1 @@
 /*
  * jQuery clueTip plugin
- * Version 0.9.3.2  (12/06/2007)
+ * Version 0.9.3.2  (12/05/2007)
  * @requires jQuery v1.1.1+
  * @requires Dimensions plugin 
@@ -175 +175 @@
             posX = mouseX + lOffset;
           }
-          var pY = posX < 0 ? event.pageY + tOffset : event.pageY;
         }
+        var pY = posX < 0 ? event.pageY + tOffset : event.pageY;
         $cluetip.css({left: (posX > 0 && opts.positionBy != 'bottomTop') ? posX : (mouseX + (tipWidth/2) > winWidth) ? winWidth/2 - tipWidth/2 : Math.max(mouseX - (tipWidth/2),0)});
       }
@@ -350 +350 @@
 -------------------------------------- */
   // activate by click
-      if (opts.activation == 'click'||opts.activation == 'toggle') {
-
+      if ( (/click|toggle/).test(opts.activation) ) {
         $this.click(function(event) {
           if ($cluetip.is(':hidden') || !$(this).is('.cluetip-clicked')) {
@@ -376 +375 @@
       } else {
         $this.click(function() {
-          if ($this.attr('href') && $this.attr('href') == tipAttribute) {
+          if ($this.attr('href') && $this.attr('href') == tipAttribute && !opts.clickThrough) {
             return false;
           }
@@ -453 +452 @@
     activation:       'hover',  // set to 'click' to force user to click to show clueTip
                                 // set to 'focus' to show on focus of a form element and hide on blur
+    clickThrough:     false,    // if true, and activation is not 'click', then clicking on link will take user to the link's href,
+                                // even if href and tipAttribute are equal
     tracking:         false,    // if true, clueTip will track mouse movement
     closePosition:    'top',    // location of close text for sticky cluetips; can be 'top' or 'bottom' or 'title'

trunk/plugins/cluetip/jquery.dimensions.js

@@ -41 +41 @@
             if ( $.browser.opera || ($.browser.safari && parseInt($.browser.version) > 520) )
                 return self.innerHeight - (($(document).height() > self.innerHeight) ? getScrollbarWidth() : 0);
+
             else if ( $.browser.safari )
                 return self.innerHeight;
             else
-                return $.boxModel && document.documentElement.clientHeight || document.body.clientHeight;
-        
+          //return $.boxModel && Math.min(document.documentElement.clientHeight,document.body.clientHeight);
+            return $.boxModel && document.documentElement.clientHeight || document.body.clientHeight;
         if ( this[0] == document ) 
             return Math.max( ($.boxModel && document.documentElement.scrollHeight || document.body.scrollHeight), document.body.offsetHeight );