Merge remote-tracking branch 'upstream/pull/2697'

[rails.git] / vendor / assets / javascripts / html5shiv.js

diff --git a/vendor/assets/javascripts/html5shiv.js b/vendor/assets/javascripts/html5shiv.js
index 77dace490002a1cdcb2dd91e9a5583673bd38e16..45ea723dd58206fe80a847b259b035927dcd7623 100644 (file)
--- a/vendor/assets/javascripts/html5shiv.js
+++ b/vendor/assets/javascripts/html5shiv.js
@@ -1,10 +1,10 @@
 /**
 /**

-* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed

 */
 ;(function(window, document) {
 /*jshint evil:true */
   /** version */
 */
 ;(function(window, document) {
 /*jshint evil:true */
   /** version */

-  var version = '3.7.2';
+  var version = '3.7.3';

 
   /** Preset options */
   var options = window.html5 || {};
 
   /** Preset options */
   var options = window.html5 || {};


@@ -121,7 +121,7 @@
    * returns a shived element for the given nodeName and document
    * @memberOf html5
    * @param {String} nodeName name of the element
    * 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.
+   * @param {Document|DocumentFragment} ownerDocument The context document.

    * @returns {Object} The shived element.
    */
   function createElement(nodeName, ownerDocument, data){
    * @returns {Object} The shived element.
    */
   function createElement(nodeName, ownerDocument, data){


@@ -319,4 +319,8 @@
   // shiv the document
   shivDocument(document);
 
   // shiv the document
   shivDocument(document);
 

-}(this, document));
+  if(typeof module == 'object' && module.exports){
+    module.exports = html5;
+  }
+
+}(typeof window !== "undefined" ? window : this, document));