From 3631792046947cad66ea2b7cb172d63ae64c576c Mon Sep 17 00:00:00 2001
From: aFarkas <info@corrupt-system.de>
Date: Sun, 24 Jun 2012 16:17:46 +0200
Subject: [PATCH] defineProperty approach for IE8 fixes Issue #70

---
 src/html5shiv-printshiv.js   | 147 +++++--------------
 src/html5shiv.js             | 147 +++++--------------
 test/data/iframed-tests.html | 103 -------------
 test/html5shiv.html          |  71 ---------
 test/unit/tests.js           | 277 -----------------------------------
 5 files changed, 78 insertions(+), 667 deletions(-)
 delete mode 100644 test/data/iframed-tests.html
 delete mode 100644 test/html5shiv.html
 delete mode 100644 test/unit/tests.js

diff --git a/src/html5shiv-printshiv.js b/src/html5shiv-printshiv.js
index ef76808..4ffe22f 100644
--- a/src/html5shiv-printshiv.js
+++ b/src/html5shiv-printshiv.js
@@ -1,15 +1,9 @@
-/*! HTML5 Shiv v3.6RC1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
+/*! HTML5 Shiv v3.6IE8specialRC1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
 ;(function(window, document) {
 /*jshint evil:true */
   /** Preset options */
   var options = window.html5 || {};
 
-  /** Used to skip problem elements */
-  var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
-
-  /** Not all elements can be cloned in IE (this list can be shortend) **/
-  var saveClones = /^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i;
-
   /** Detect whether the browser supports default html5 styles */
   var supportsHtml5Styles;
 
@@ -31,17 +25,8 @@
         a.innerHTML = '<xyz></xyz>';
         //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
         supportsHtml5Styles = ('hidden' in a);
-
-        supportsUnknownElements = a.childNodes.length == 1 || (function() {
-          // assign a false positive if unable to shiv
-          (document.createElement)('a');
-          var frag = document.createDocumentFragment();
-          return (
-            typeof frag.cloneNode == 'undefined' ||
-            typeof frag.createDocumentFragment == 'undefined' ||
-            typeof frag.createElement == 'undefined'
-          );
-        }());
+        // assign a false positive if unable to shiv
+        supportsUnknownElements = a.childNodes.length == 1 || !a.document || !Object.defineProperty;
     } catch(e) {
       supportsHtml5Styles = true;
       supportsUnknownElements = true;
@@ -93,65 +78,14 @@
     return data;
   }
 
-  /**
-   * returns a shived element for the given nodeName and document
-   * @memberOf html5
-   * @param {String} nodeName name of the element
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived element.
-   */
-  function createElement(nodeName, ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createElement(nodeName);
-    }
-    if (!data) {
-        data = getExpandoData(ownerDocument);
-    }
-    var node;
-
-    if (data.cache[nodeName]) {
-        node = data.cache[nodeName].cloneNode();
-    } else if (saveClones.test(nodeName)) {
-        node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
-    } else {
-        node = data.createElem(nodeName);
-    }
-
-    // Avoid adding some elements to fragments in IE < 9 because
-    // * Attributes like `name` or `type` cannot be set/changed once an element
-    //   is inserted into a document/fragment
-    // * Link elements with `src` attributes that are inaccessible, as with
-    //   a 403 response, will cause the tab/window to crash
-    // * Script elements appended to fragments will execute when their `src`
-    //   or `text` property is set
-    return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node;
-  }
 
-  /**
-   * returns a shived DocumentFragment for the given document
-   * @memberOf html5
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived DocumentFragment.
-   */
-  function createDocumentFragment(ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createDocumentFragment();
-    }
-    data = data || getExpandoData(ownerDocument);
-    var clone = data.frag.cloneNode(),
-        i = 0,
-        elems = getElements(),
-        l = elems.length;
-    for(;i<l;i++){
-        clone.createElement(elems[i]);
-    }
-    return clone;
+  function defineProperty(obj, prop, desc){
+    var ret;
+    try {
+        ret = Object.getOwnPropertyDescriptor(obj, prop);
+        Object.defineProperty(obj, prop, desc);
+    } catch(er){}
+    return ret;
   }
 
   /**
@@ -161,33 +95,34 @@
    * @param {Object} data of the document.
    */
   function shivMethods(ownerDocument, data) {
-    if (!data.cache) {
-        data.cache = {};
-        data.createElem = ownerDocument.createElement;
-        data.createFrag = ownerDocument.createDocumentFragment;
-        data.frag = data.createFrag();
+    var win = ownerDocument.parentWindow || ownerDocument.defaultView;
+    var elements = getElements();
+    var innerDesc;
+
+    for(var i = 0, len = elements.length; i < len; i++){
+        ownerDocument.createElement(elements[i]);
+    } 
+
+    if (win && win.Element && !data.shivedInner && html5.shivMethods) {
+        data.shivedInner = true;
+        innerDesc = defineProperty(win.Element.prototype, 'innerHTML', {
+            set: function(content){
+                var elem = this;
+                var shived;
+                if (!elem.canHaveChildren || elem.document == ownerDocument || !html5.shivMethods) {
+                    return innerDesc.set.apply(elem, arguments);
+                }
+                shived = {};
+                innerDesc.set.call(elem, content.replace(/<(\w+)/g, function (m, m1) {
+                    if (!shived[m1]) {
+                        shived[m1] = true;
+                        elem.document.createElement(m1);
+                    }
+                    return m;
+                 }));
+            }
+        });
     }
-
-
-    ownerDocument.createElement = function(nodeName) {
-      //abort shiv
-      if (!html5.shivMethods) {
-          return data.createElem(nodeName);
-      }
-      return createElement(nodeName, ownerDocument, data);
-    };
-
-    ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
-      'var n=f.cloneNode(),c=n.createElement;' +
-      'h.shivMethods&&(' +
-        // unroll the `createElement` calls
-        getElements().join().replace(/\w+/g, function(nodeName) {
-          data.createElem(nodeName);
-          data.frag.createElement(nodeName);
-          return 'c("' + nodeName + '")';
-        }) +
-      ');return n}'
-    )(html5, data.frag);
   }
 
   /*--------------------------------------------------------------------------*/
@@ -269,12 +204,8 @@
 
     // shivs the document according to the specified `html5` object options
     'shivDocument': shivDocument,
-
-    //creates a shived element
-    createElement: createElement,
-
-    //creates a shived documentFragment
-    createDocumentFragment: createDocumentFragment
+    
+    'defineProperty': defineProperty
   };
 
   /*--------------------------------------------------------------------------*/
diff --git a/src/html5shiv.js b/src/html5shiv.js
index 4d90c94..0773f43 100644
--- a/src/html5shiv.js
+++ b/src/html5shiv.js
@@ -1,15 +1,9 @@
-/*! HTML5 Shiv v3.6RC1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
+/*! HTML5 Shiv v3.6IE8specialRC1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed */
 ;(function(window, document) {
 /*jshint evil:true */
   /** Preset options */
   var options = window.html5 || {};
 
-  /** Used to skip problem elements */
-  var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
-
-  /** Not all elements can be cloned in IE (this list can be shortend) **/
-  var saveClones = /^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i;
-
   /** Detect whether the browser supports default html5 styles */
   var supportsHtml5Styles;
 
@@ -31,17 +25,8 @@
         a.innerHTML = '<xyz></xyz>';
         //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
         supportsHtml5Styles = ('hidden' in a);
-
-        supportsUnknownElements = a.childNodes.length == 1 || (function() {
-          // assign a false positive if unable to shiv
-          (document.createElement)('a');
-          var frag = document.createDocumentFragment();
-          return (
-            typeof frag.cloneNode == 'undefined' ||
-            typeof frag.createDocumentFragment == 'undefined' ||
-            typeof frag.createElement == 'undefined'
-          );
-        }());
+        // assign a false positive if unable to shiv
+        supportsUnknownElements = a.childNodes.length == 1 || !a.document || !Object.defineProperty;
     } catch(e) {
       supportsHtml5Styles = true;
       supportsUnknownElements = true;
@@ -93,65 +78,14 @@
     return data;
   }
 
-  /**
-   * returns a shived element for the given nodeName and document
-   * @memberOf html5
-   * @param {String} nodeName name of the element
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived element.
-   */
-  function createElement(nodeName, ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createElement(nodeName);
-    }
-    if (!data) {
-        data = getExpandoData(ownerDocument);
-    }
-    var node;
-
-    if (data.cache[nodeName]) {
-        node = data.cache[nodeName].cloneNode();
-    } else if (saveClones.test(nodeName)) {
-        node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
-    } else {
-        node = data.createElem(nodeName);
-    }
-
-    // Avoid adding some elements to fragments in IE < 9 because
-    // * Attributes like `name` or `type` cannot be set/changed once an element
-    //   is inserted into a document/fragment
-    // * Link elements with `src` attributes that are inaccessible, as with
-    //   a 403 response, will cause the tab/window to crash
-    // * Script elements appended to fragments will execute when their `src`
-    //   or `text` property is set
-    return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node;
-  }
 
-  /**
-   * returns a shived DocumentFragment for the given document
-   * @memberOf html5
-   * @param {Document} ownerDocument The context document.
-   * @returns {Object} The shived DocumentFragment.
-   */
-  function createDocumentFragment(ownerDocument, data){
-    if (!ownerDocument) {
-        ownerDocument = document;
-    }
-    if(supportsUnknownElements){
-        return ownerDocument.createDocumentFragment();
-    }
-    data = data || getExpandoData(ownerDocument);
-    var clone = data.frag.cloneNode(),
-        i = 0,
-        elems = getElements(),
-        l = elems.length;
-    for(;i<l;i++){
-        clone.createElement(elems[i]);
-    }
-    return clone;
+  function defineProperty(obj, prop, desc){
+    var ret;
+    try {
+        ret = Object.getOwnPropertyDescriptor(obj, prop);
+        Object.defineProperty(obj, prop, desc);
+    } catch(er){}
+    return ret;
   }
 
   /**
@@ -161,33 +95,34 @@
    * @param {Object} data of the document.
    */
   function shivMethods(ownerDocument, data) {
-    if (!data.cache) {
-        data.cache = {};
-        data.createElem = ownerDocument.createElement;
-        data.createFrag = ownerDocument.createDocumentFragment;
-        data.frag = data.createFrag();
+    var win = ownerDocument.parentWindow || ownerDocument.defaultView;
+    var elements = getElements();
+    var innerDesc;
+
+    for(var i = 0, len = elements.length; i < len; i++){
+        ownerDocument.createElement(elements[i]);
+    } 
+
+    if (win && win.Element && !data.shivedInner && html5.shivMethods) {
+        data.shivedInner = true;
+        innerDesc = defineProperty(win.Element.prototype, 'innerHTML', {
+            set: function(content){
+                var elem = this;
+                var shived;
+                if (!elem.canHaveChildren || elem.document == ownerDocument || !html5.shivMethods) {
+                    return innerDesc.set.apply(elem, arguments);
+                }
+                shived = {};
+                innerDesc.set.call(elem, content.replace(/<(\w+)/g, function (m, m1) {
+                    if (!shived[m1]) {
+                        shived[m1] = true;
+                        elem.document.createElement(m1);
+                    }
+                    return m;
+                 }));
+            }
+        });
     }
-
-
-    ownerDocument.createElement = function(nodeName) {
-      //abort shiv
-      if (!html5.shivMethods) {
-          return data.createElem(nodeName);
-      }
-      return createElement(nodeName, ownerDocument, data);
-    };
-
-    ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
-      'var n=f.cloneNode(),c=n.createElement;' +
-      'h.shivMethods&&(' +
-        // unroll the `createElement` calls
-        getElements().join().replace(/\w+/g, function(nodeName) {
-          data.createElem(nodeName);
-          data.frag.createElement(nodeName);
-          return 'c("' + nodeName + '")';
-        }) +
-      ');return n}'
-    )(html5, data.frag);
   }
 
   /*--------------------------------------------------------------------------*/
@@ -269,12 +204,8 @@
 
     // shivs the document according to the specified `html5` object options
     'shivDocument': shivDocument,
-
-    //creates a shived element
-    createElement: createElement,
-
-    //creates a shived documentFragment
-    createDocumentFragment: createDocumentFragment
+    
+    'defineProperty': defineProperty
   };
 
   /*--------------------------------------------------------------------------*/
diff --git a/test/data/iframed-tests.html b/test/data/iframed-tests.html
deleted file mode 100644
index 9ffb8a5..0000000
--- a/test/data/iframed-tests.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!doctype html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>iframe tests</title>
-		
-		
-		<style>
-			body {
-				background: url(body-crash.jpg) no-repeat -999px -999px;
-			}
-			article {
-				border: 2px solid #8C8;
-			}
-		</style>
-		<script>
-			(function(){
-				window.querys = {};
-				var name;
-				var search= location.search.replace('?', '');
-				if(search){
-					search = search.split('&');
-					for(var i = 0; i < search.length; i++){
-						name = search[i].split('=');
-						querys[name[0]] = true;
-					}
-				}
-			})();
-		</script>
-		<script>
-			if(querys.disableMethodsBefore){
-				if(!window.html5){
-					window.html5 = {};
-				}
-				window.html5.shivMethods = false;
-			}
-			if(querys.disableCSS){
-				if(!window.html5){
-					window.html5 = {};
-				}
-				window.html5.shivCSS = false;
-			}
-			if(querys.addUnknownBefore){
-				if(!window.html5){
-					window.html5 = {};
-				}
-				window.html5.elements = 'abcxyz abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video';
-			}
-			
-			
-			if(!querys.noEmbed){
-				document.write('<script src="..\/..\/src\/html5shiv-printshiv.js"><\/script>');
-			}
-		</script>
-		<script>
-		
-			if(querys.disableMethodsAfter){
-				window.html5.shivMethods = false;
-			}
-			
-			if(querys.addUnknownAfter){
-				window.html5.elements = 'abcxyz abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video';
-				html5.shivDocument(document);
-			}
-		</script>
-		
-	</head>
-	<body>
-		<div id="qunit-fixture">
-			<abcxyz>
-				<div class="inside"></div>
-			</abcxyz>
-			<article>
-				<div class="inside"></div>
-			</article>
-			<aside>
-				<div class="inside"></div>
-			</aside>
-			<figcaption>
-				<div class="inside"></div>
-			</figcaption>
-			<figure>
-				<div class="inside"></div>
-			</figure>
-			<footer>
-				<div class="inside"></div>
-			</footer>
-			<header>
-				<div class="inside"></div>
-			</header>
-			<hgroup>
-				<div class="inside"></div>
-			</hgroup>
-			<nav>
-				<div class="inside"></div>
-			</nav>
-			<section>
-				<div class="inside"></div>
-			</section>
-			
-		</div>
-	</body>
-</html>
\ No newline at end of file
diff --git a/test/html5shiv.html b/test/html5shiv.html
deleted file mode 100644
index 28e20c0..0000000
--- a/test/html5shiv.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!doctype html>
-<html lang="en" dir="ltr" id="html">
-	<head>
-		<meta charset="utf-8">
-		<title>html5shiv Test Suite</title>
-		<style>
-			body {
-				background: url(data/body-crash.jpg) no-repeat -999px -999px;
-			}
-			article {
-				border: 2px solid #8C8;
-			}
-		</style>
-		<link rel="stylesheet" media="screen" href="qunit/qunit.css">
-		<script src="../src/html5shiv-printshiv.js"></script>
-		
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.js"></script>
-		
-		<script src="qunit/qunit.js"></script>
-		
-		<script src="unit/tests.js"></script>
-	</head>
-	<body id="body">
-		<h1 id="qunit-header">html5shiv Test Suite</h1>
-		<h2 id="qunit-banner"></h2>
-		<div id="qunit-testrunner-toolbar"></div>
-		<h2 id="qunit-userAgent"></h2>
-		<ol id="qunit-tests"></ol>
-		
-		<iframe class="test-frame" src="data/iframed-tests.html?disableMethodsBefore"></iframe>
-		<iframe class="test-frame" src="data/iframed-tests.html?disableMethodsAfter"></iframe>
-		<iframe class="test-frame" src="data/iframed-tests.html?addUnknownBefore"></iframe>
-		<iframe class="test-frame" src="data/iframed-tests.html?addUnknownAfter"></iframe>
-		<iframe class="test-frame" src="data/iframed-tests.html?disableCSS"></iframe>
-		<iframe class="test-frame" src="data/iframed-tests.html?noEmbed"></iframe>
-		
-		
-		<div id="qunit-fixture">
-			<abcxyz>
-				<div class="inside"></div>
-			</abcxyz>
-			<article>
-				<div class="inside"></div>
-			</article>
-			<aside>
-				<div class="inside"></div>
-			</aside>
-			<figcaption>
-				<div class="inside"></div>
-			</figcaption>
-			<figure>
-				<div class="inside"></div>
-			</figure>
-			<footer>
-				<div class="inside"></div>
-			</footer>
-			<header>
-				<div class="inside"></div>
-			</header>
-			<hgroup>
-				<div class="inside"></div>
-			</hgroup>
-			<nav>
-				<div class="inside"></div>
-			</nav>
-			<section>
-				<div class="inside"></div>
-			</section>
-		</div>
-	</body>
-</html>
\ No newline at end of file
diff --git a/test/unit/tests.js b/test/unit/tests.js
deleted file mode 100644
index e900bf2..0000000
--- a/test/unit/tests.js
+++ /dev/null
@@ -1,277 +0,0 @@
-(function(){
-
-module("html5shiv tests");
-var blockElements  = "article,aside,figcaption,figure,footer,header,hgroup,nav,section".split(',');
-
-var testEnv = [
-	{
-		doc: document,
-		initialShivMethods: html5.shivMethods,
-		html5: html5,
-		name: 'default'
-	}
-];
-
-
-var shivTests = function(fn, env){
-	if(!env){
-		env = testEnv[0];
-	}
-	env.html5.shivMethods = true;
-	fn();
-	env.html5.shivMethods = env.initialShivMethods;
-};
-
-var envTest = function(name, fn, frames){
-	if(!frames){
-		frames = ['default'];
-	}
-	asyncTest(name, function(){
-		$.each(testEnv, function(i, env){
-			if($.inArray(env.name, frames) != -1){
-				fn(env);
-			}
-		});
-		if(testEnv.length > 1){
-			start();
-		} else {
-			initIframes();
-		}
-	});
-	
-};
-
-QUnit.reset = function() {
-	$.each(testEnv, function(i, env){
-		$('#qunit-fixture', env.doc).html(env.fixture);
-	});
-};
-
-
-var initIframes = function(){
-	if(testEnv.length > 1){return;}
-	testEnv[0].fixture = $('#qunit-fixture').html();
-	
-	$('iframe.test-frame').each(function(){
-		var win = this.contentWindow;
-		if($('#qunit-fixture', win.document).length){
-			testEnv.push({
-				doc: win.document,
-				html5: win.html5,
-				initialShivMethods: (win.html5 || {}).shivMethods,
-				fixture: $('#qunit-fixture', win.document).html(),
-				name: this.src.split('?')[1]
-			});
-		}
-	});
-	if(testEnv.length > 1){
-		start();
-	} else {
-		setTimeout(initIframes, 30);
-	}
-};
-
-
-$(initIframes);
-
-
-envTest("display block tests", function(env){
-	$.each(blockElements, function(i, elem){
-		equals($(elem, env.doc).css('display'), 'block', elem +" has display: block");
-	});
-
-}, ['default', 'disableMethodsBefore']);
-
-envTest("test html5.createElement/html5.createDocumentFragment", function(env){
-	var doc5 = html5;
-	if(env.html5){
-		doc5 = env.html5;
-		env.html5.shivMethods = false;
-	}
-	html5.shivMethods = false;
-	
-	var fragDiv =  doc5.createElement('div', env.doc);
-	var frag = doc5.createDocumentFragment(env.doc);
-	var markText = "with these words highlighted";
-	var div = $( doc5.createElement('div', env.doc) ).html('<section><article><mark>s</mark></article>?</section>').appendTo(env.doc.getElementById('qunit-fixture'));
-	
-	fragDiv.innerHTML = '<section>This native javascript sentence is in a green box <mark>'+markText+'</mark>?</section>';
-	
-	frag.appendChild(fragDiv);
-	fragDiv.innerHTML += '<article>This native javascript sentence is also in a green box <mark>'+markText+'</mark>?</article>';
-	
-	env.doc.getElementById('qunit-fixture').appendChild(frag);
-	
-	equals($('section article > mark', div).length, 1, "found mark in section > article");
-	equals($('section > mark', fragDiv).html(), markText, "innerHTML getter equals innerHTML setter");
-	equals($('article', fragDiv).css('borderTopWidth'), '2px', "article has a 2px border");
-	
-	if(env.html5){
-		env.html5.shivMethods = env.initialShivMethods;
-	}
-	html5.shivMethods = true;
-}, ['disableMethodsBefore', 'disableMethodsAfter']);
-
-
-if(!html5.supportsUnknownElements){
-
-	envTest("config shivMethods test", function(env){
-		var div = $('<div/>', env.doc).html('<section><article><mark></mark></article>?</section>').appendTo(env.doc.getElementById('qunit-fixture'));
-		equals($('section article > mark', div).length, (env.html5.shivMethods) ? 1 : 0, "found/no found mark in section > article");
-	}, ['default', 'disableMethodsBefore', 'disableMethodsAfter']);
-	
-	envTest("config shivCSS test", function(env){
-		$.each(blockElements, function(i, elem){
-			equals($(elem, env.doc).css('display'), 'inline', elem +" has display: inline if unshived");
-		});
-		env.html5.shivCSS = true;
-		env.html5.shivDocument();
-		$.each(blockElements, function(i, elem){
-			equals($(elem, env.doc).css('display'), 'block', elem +" has display: block. after reshiving");
-		});
-	}, ['disableCSS']);
-}
-
-envTest("config add elements test", function(env){
-	var value = $.trim($('abcxyz', env.doc).html());
-	ok((html5.supportsUnknownElements || env.html5.elements.indexOf('abcxyz') !== -1) ? value : !value, "unknownelement has one/none div inside: "+ value);
-}, ['default', 'disableMethodsBefore', 'addUnknownBefore', 'addUnknownAfter']);
-
-envTest("parsing tests", function(env){
-	$.each(blockElements, function(i, elem){
-		equals($(elem +' div.inside', env.doc).length, 1, elem +" has a div inside");
-	});	
-}, ['default', 'disableMethodsBefore']);
-
-envTest("style test", function(env){
-	var article = $('article', env.doc);
-	equals(article.css('borderTopWidth'), '2px', "article has a 2px border");
-}, ['default', 'disableMethodsBefore']);
-
-if (!html5.supportsUnknownElements) {
-	envTest("shiv different document", function(env){
-		var markText = "with these words highlighted3";
-		var markup = '<section><article>This jQuery 1.6.4 sentence is in a green box <mark>' + markText + '</mark></article>?</section>';
-		
-		var div = $('<div/>', env.doc).html(markup).appendTo(env.doc.getElementById('qunit-fixture'));
-		equals($('section article > mark', div).length, 0, "document is not shived");
-		
-		html5.shivDocument(env.doc);
-		
-		div = $('<div/>', env.doc).html(markup).appendTo(env.doc.getElementById('qunit-fixture'));
-		equals($('section article > mark', div).length, 1, "document is shived");
-		equals($('article', div).css('borderTopWidth'), '2px', "article has a 2px border");
-		
-	}, ['noEmbed']);
-}
-	
-envTest("createElement/innerHTML test", function(env){
-	shivTests(
-		function(){
-			var div = env.doc.createElement('div');
-			var text = "This native javascript sentence is in a green box <mark>with these words highlighted</mark>?";
-			div.innerHTML = '<section id="section">'+ text +'</section>';
-			env.doc.getElementById('qunit-fixture').appendChild(div);
-			equals($('#section', env.doc).html(), text, "innerHTML getter equals innerHTML setter");
-			equals($('#section mark', env.doc).length, 1, "section has a mark element inside");
-		},
-		env
-	);
-}, ['default', 'disableMethodsBefore']);
-
-envTest("createElement/createDocumentFragment/innerHTML test", function(env){
-	shivTests(
-		function(){
-			var div = env.doc.createElement('div');
-			var frag = env.doc.createDocumentFragment();
-			var markText = "with these words highlighted";
-			div.innerHTML = '<section>This native javascript sentence is in a green box <mark>'+markText+'</mark>?</section>';
-			frag.appendChild(div);
-			div.innerHTML += '<article>This native javascript sentence is also in a green box <mark>'+markText+'</mark>?</article>';
-			env.doc.getElementById('qunit-fixture').appendChild(frag);
-			equals($('section > mark', div).html(), markText, "innerHTML getter equals innerHTML setter");
-			equals($('article', div).css('borderTopWidth'), '2px', "article has a 2px border");
-		},
-		env
-	);
-}, ['default', 'disableMethodsBefore']);
-
-
-envTest("createDocumentFragment/cloneNode/innerHTML test", function(env){
-	shivTests(
-		function(){
-			var frag = env.doc.createDocumentFragment();
-			var fragDiv = env.doc.createElement('div');
-			
-			var markText = "with these words highlighted2";
-			var fragDivClone;
-			frag.appendChild(fragDiv);
-			
-			fragDiv.innerHTML = '<div><article>This native javascript sentence is also in a green box <mark>'+markText+'</mark>?</article></div>';
-			
-			fragDivClone = fragDiv.cloneNode(true);
-			
-			env.doc.getElementById('qunit-fixture').appendChild(fragDivClone);
-			equals($('mark', env.doc).html(), markText, "innerHTML getter equals innerHTML setter");
-		},
-		env
-	);
-}, ['default', 'addUnknownAfter']);
-
-test("form test", function() {
-	shivTests(
-		function(){
-			var form = document.createElement('form');
-			var select = document.createElement('select');
-			var input = document.createElement('input');
-			var button = document.createElement('button');
-			var option = document.createElement('option');
-			var markText = "with these words highlighted2";
-			
-			form.setAttribute('action', 'some/path');
-			form.setAttribute('name', 'formName');
-			form.target = '_blank';
-			select.name = 'selectName';
-			option.value = '1.value';
-			button.setAttribute('type', 'submit');
-			input.type = 'submit';
-			
-			form.innerHTML = '<article>This native javascript sentence is also in a green box <mark>'+markText+'</mark>?</article>';
-			
-			
-			form.appendChild(select);
-			form.appendChild(button);
-			form.appendChild(input);
-			
-			
-			
-			if(select.add){
-				select.add(option);
-			} else {
-				select.appendChild(option);
-			}
-			document.getElementById('qunit-fixture').appendChild(form);
-			
-			equals($('select option', form).val(), '1.value', "select has one option with value");
-			equals($('article > mark', form).html(), markText, "innerHTML getter equals innerHTML setter");
-			equals($('article', form).css('borderTopWidth'), '2px', "article has a 2px border");
-		}
-	);
-});
-
-envTest("jQuery test", function(env){
-	shivTests(
-		function(){
-			var markText = "with these words highlighted3";
-			var div = $('<div/>', env.doc).html('<section><article>This jQuery 1.6.4 sentence is in a green box <mark>'+markText+'</mark></article>?</section>').appendTo(env.doc.getElementById('qunit-fixture'));
-			equals($('article > mark', div).html(), markText, "innerHTML getter equals innerHTML setter");
-			equals($('article', div).css('borderTopWidth'), '2px', "article has a 2px border");
-		},
-		env
-	);
-});
-
-
-
-
-})();