Permalink
Browse files

updating to 0.99

  • Loading branch information...
1 parent 5946193 commit 5ae32254c135d6a85bccb03ca0959994e0005337 @robert-hoffmann robert-hoffmann committed Nov 15, 2012
Showing with 3 additions and 6 deletions.
  1. +1 −0 dist/head.js
  2. +1 −0 dist/head.load.js
  3. +1 −6 src/load.js
View
1 dist/head.js
@@ -947,6 +947,7 @@
// event.type == 'load' && s.readyState = undefined
+
// !doc.documentMode is for IE6/7, IE8+ have documentMode
if (event.type === 'load' || (/loaded|complete/.test(ele.readyState) && (!doc.documentMode || doc.documentMode < 9))) {
// release event listeners
View
1 dist/head.load.js
@@ -487,6 +487,7 @@
// event.type == 'load' && s.readyState = undefined
+
// !doc.documentMode is for IE6/7, IE8+ have documentMode
if (event.type === 'load' || (/loaded|complete/.test(ele.readyState) && (!doc.documentMode || doc.documentMode < 9))) {
// release event listeners
View
7 src/load.js
@@ -487,14 +487,9 @@
// event.type == 'load' && s.readyState = undefined
-<<<<<<< HEAD
- // !doc.documentMode is for IE6/7, IE8+ have documentMode
- if (event.type === 'load' || (/loaded|complete/.test(ele.readyState) && (!doc.documentMode || doc.documentMode < 9))) {
-=======
// !doc.documentMode is for IE6/7, IE8+ have documentMode
- if (event.type === 'load' || (/loaded|complete/.test(s.readyState) && (!doc.documentMode || doc.documentMode < 9))) {
->>>>>>> a0d74928923f92d86696187705f70f36813f56ec
+ if (event.type === 'load' || (/loaded|complete/.test(ele.readyState) && (!doc.documentMode || doc.documentMode < 9))) {
// release event listeners
ele.onload = ele.onreadystatechange = ele.onerror = null;

0 comments on commit 5ae3225

Please sign in to comment.