Merge pull request madrobby#1069 from thiagopnts/master

Fix error in offset call on IE10
LEV7n · Jan 29, 2015 · a9184b2 · a9184b2
2 parents 08230d8 + d920bee
commit a9184b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/zepto.js b/src/zepto.js
@@ -678,6 +678,8 @@ var Zepto = (function() {
         $this.css(props)
       })
       if (!this.length) return null
+      if (!$.contains(document.documentElement, this[0]))
+        return {top: 0, left: 0}
       var obj = this[0].getBoundingClientRect()
       return {
         left: obj.left + window.pageXOffset,

diff --git a/test/zepto.html b/test/zepto.html
@@ -1095,6 +1095,7 @@ <h1>Zepto Core unit tests</h1>
         t.assertNull($('#doesnotexist').offset())
         var el = $('#some_element')
         t.assertIdentical(el, el.offset({}))
+        t.assertSame($('<div>').offset(), {left: 0, top: 0})
       },
 
       testWidth: function(t){