Merge remote-tracking branch 'remotes/tcoulter/master' into pull-resq…

…uest Conflicts: antiscroll.js
Automattic · Nov 5, 2012 · 684899b · 684899b
2 parents 5504c58 + f7030d0
commit 684899b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/antiscroll.js b/antiscroll.js
@@ -38,6 +38,10 @@
     this.padding = undefined == this.options.padding ? 2 : this.options.padding;
 
     this.inner = this.el.find('.antiscroll-inner');
+    this.inner.css({
+        'width':  '+=' + (this.y ? scrollbarSize() : 0)
+      , 'height': '+=' + (this.x ? scrollbarSize() : 0)
+    });
 
     var cssMap = {};
     if (this.x) cssMap.width = '+=' + scrollbarSize();