Changeset 5313

Timestamp:

Apr 16, 2010, 8:36:35 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1483: The "Display long text=On click" option doens't work in Internet explorer 8

The problem was that IE no longer provides size information for hidden parts of the document. We used to hide the document while checking the texts because performance was very bad otherwise. The performance issue has partly been improved by first checking all texts and then fixing them in a separate step instead of fixing each text immediately as it is found, but performance in IE is still about 5 times slower than in Firefox.

File:

• branches/2.15-stable/www/include/scripts/main.js (modified) (2 diffs)

branches/2.15-stable/www/include/scripts/main.js

@@ -2770 +2770 @@
   {
     this.tags = Main.getElementsByTagAndClassName(tagName, className);
-    if (this.tags.length > 300) 
-    {
-      this.checkAllDelayed();
-      return;
-    }
-    if (Browser.isIE)
-    {
-      document.body.style.display = 'none';
-    }
     for (var i = 0; i < this.tags.length; i++)
     {
       this.checkTag(this.tags[i]);
     }
-    if (Browser.isIE)
-    {
-      document.body.style.display = 'block';
-    }
-  }
-  
-  this.checkAllDelayed = function()
-  {
-    var self = this;
-    var f = function()
-    {
-      if (self.checkNextTag()) setTimeout(f, 5);
-    };
-    setTimeout(f, 5);
-  }
-  
-  this.checkNextTag = function()
-  {
-    if (this.tags.length <= this.nextTag) return false;
-    this.checkTag(this.tags[this.nextTag]);
-    this.nextTag++;
-    return true;
+    for (var i = 0; i < this.tags.length; i++)
+    {
+      this.fixTag(this.tags[i]);
+    }
   }
   
@@ -2811 +2784 @@
     var isWidthOverflowed = tag.clientWidth < tag.scrollWidth;
     var isHeightOverflowed = tag.clientHeight +5 < tag.scrollHeight;
-    var isOverflowed = isWidthOverflowed || isHeightOverflowed;
-    
+    //alert("checkTag: " + tag + ':' + ':' + tag.clientWidth + ':' + tag.scrollWidth + ':' + tag.clientHeight + ':' + tag.scrollHeight);
+    tag.isWidthOverflowed = isWidthOverflowed;
+    tag.isHeightOverflowed = isHeightOverflowed;
+    tag.isOverflowed = isWidthOverflowed || isHeightOverflowed;
+  }
+  
+  this.fixTag = function(tag)
+  {
     var className = 'constrained';
-    if (isOverflowed)
+    if (tag.isOverflowed)
     {
       className += ' overflowed';
-      tag.isWidthOverflowed = isWidthOverflowed;
-      tag.isHeightOverflowed = isHeightOverflowed;
       var self = this;
       var onClickListener = function() { self.showOverflowedText(tag); };