Changeset 8266

Timestamp:

12/04/07 04:28:27 (1 year ago)

Author:

andrew

Message:

Change document.viewport.getDimensions to exclude scrollbars in all cases. Closes #10148, #9288. [Nick Stackenburg]

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/dom.js (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (4 diffs)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Change document.viewport.getDimensions to exclude scrollbars in all cases. Closes #10148, #9288. [Nick Stackenburg]
-
-* Add logic to Element#getStyle in Opera that fixes inaccurate reporting of computed 'width' and 'height' properties. [Andrew Dupont]

spinoffs/prototype/trunk/src/dom.js

@@ -1205 +1205 @@
-  getDimensions: function() {
-    var dimensions = { };
+    var B = Prototype.Browser;
-    $w('width height').each(function(d) {
-      var D = d.capitalize();
-self['inner' + D] || 
-(document.documentElement['client' + D] || document.body['client' + D])
+(B.WebKit && !document.evaluate) ? self['inner' + D] :
+ (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D]
-    });
-    return dimensions;

spinoffs/prototype/trunk/test/unit/dom.html

@@ -82 +82 @@
-
-    #notInlineAbsoluted { position: absolute; }
+    
+    #elementToViewportDimensions {
+      position: absolute;
+      top: 0;
+      left: 0;
+      height: 10px;
+      width: 10px;
+      background: #000;
+    }
-    
-    /* for scroll test on really big screens */
@@ -372 +381 @@
-</div>
-
+<div id='elementToViewportDimensions' style='display: none'></div>
+
-<!-- Tests follow -->
-<script type="text/javascript" language="javascript" charset="utf-8">
@@ -400 +411 @@
-    orangeJuice: function(element) { return "orange juice"; }
-  });
+  
+  // Based on properties check from http://www.quirksmode.org/viewport/compatibility.html
+  var documentViewportProperties = {
+    properties : [
+      'self.pageXOffset', 'self.pageYOffset',
+      'self.screenX', 'self.screenY',
+      'self.innerHeight', 'self.innerWidth',
+      'self.outerHeight', 'self.outerWidth',
+      'self.screen.height', 'self.screen.width',
+      'self.screen.availHeight', 'self.screen.availWidth',
+      'self.screen.availTop', 'self.screen.availLeft',
+      'self.screen.Top', 'self.screen.Left', 
+      'self.screenTop', 'self.screenLeft',
+      'document.body.clientHeight', 'document.body.clientWidth',
+      'document.body.scrollHeight', 'document.body.scrollWidth',
+      'document.body.scrollLeft', 'document.body.scrollTop',
+      'document.body.offsetHeight', 'document.body.offsetWidth',
+      'document.body.offsetTop', 'document.body.offsetLeft'
+    ].inject([], function(properties, prop) {
+      if(!self.screen && prop.include('self.screen')) return;
+      if (!document.body && prop.include('document.body')) return;
+      properties.push(prop);
+      if (prop.include('.body') && document.documentElement)
+        properties.push(prop.sub('.body', '.documentElement'));
+      return properties;
+    }),
+
+    inspect : function() {
+      var props = [];
+      this.properties.each(function(prop) {
+        if (eval(prop)) props[prop] = eval(prop);
+      });
+      return props;
+    }
+  };
-
-  new Test.Unit.Runner({
@@ -1569 +1615 @@
-    }},
-    
+    testElementToViewportDimensionsDoesNotAffectDocumentProperties: function() {with(this) {
+      // No properties on the document should be affected when resizing
+      // an absolute positioned(0,0) element to viewport dimensions
+      var vd = document.viewport.getDimensions();
+
+      var before = documentViewportProperties.inspect();
+      $('elementToViewportDimensions').setStyle({ height: vd.height + 'px', width: vd.width + 'px' }).show();
+      var after = documentViewportProperties.inspect();
+      $('elementToViewportDimensions').hide();
+
+      documentViewportProperties.properties.each(function(prop) {
+        assertEqual(before[prop], after[prop], prop + ' was affected');
+      });         
+    }},
+
-    testViewportScrollOffsets: function() {with(this) {
-      preservingBrowserDimensions(function() {