vendor/assets/javascripts/webshims/shims/dom-extend.js in webshims-rails-1.14.3 vs vendor/assets/javascripts/webshims/shims/dom-extend.js in webshims-rails-1.14.4

- old
+ new

@@ -60,11 +60,11 @@ webshims.register('dom-extend', function($, webshims, window, document, undefined){ "use strict"; var supportHrefNormalized = !('hrefNormalized' in $.support) || $.support.hrefNormalized; var supportGetSetAttribute = !('getSetAttribute' in $.support) || $.support.getSetAttribute; var has = Object.prototype.hasOwnProperty; - webshims.assumeARIA = supportGetSetAttribute || Modernizr.canvas || Modernizr.video || Modernizr.boxsizing; + webshims.assumeARIA = true; if($('<input type="email" />').attr('type') == 'text' || $('<form />').attr('novalidate') === "" || ('required' in $('<input />')[0].attributes)){ webshims.error("IE browser modes are busted in IE10+. Please test your HTML/CSS/JS with a real IE version or at least IETester or similiar tools"); } @@ -79,19 +79,10 @@ if (window.$) { window.$ = webshims.$; } window.jQuery = webshims.$; } - if(webshims.M != Modernizr){ - webshims.error("Modernizr was included more than once. Make sure to include it only once! Webshims and other scripts might not work properly."); - for(var i in Modernizr){ - if(!(i in webshims.M)){ - webshims.M[i] = Modernizr[i]; - } - } - Modernizr = webshims.M; - } }; switch$(); setTimeout(switch$, 90); webshims.ready('DOM', switch$); $(switch$); @@ -416,11 +407,11 @@ var extendNativeValue = (function(){ var UNKNOWN = webshims.getPrototypeOf(document.createElement('foobar')); //see also: https://github.com/lojjic/PIE/issues/40 | https://prototype.lighthouseapp.com/projects/8886/tickets/1107-ie8-fatal-crash-when-prototypejs-is-loaded-with-rounded-cornershtc - var isExtendNativeSave = Modernizr.advancedObjectProperties && Modernizr.objectAccessor; + var isExtendNativeSave = webshims.support.advancedObjectProperties && webshims.support.objectAccessor; return function(nodeName, prop, desc){ var elem , elemProto; if( isExtendNativeSave && (elem = document.createElement(nodeName)) && (elemProto = webshims.getPrototypeOf(elem)) && UNKNOWN !== elemProto && ( !elem[prop] || !has.call(elem, prop) ) ){ var sup = elem[prop]; desc._supvalue = function(){ @@ -727,10 +718,10 @@ docObserve.handler({type: 'boxsizing'}); } }); } webshims.ready('WINDOWLOAD', this.test); - $(document).on('updatelayout.webshim pageinit popupafteropen panelbeforeopen tabsactivate collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel', this.handler); + $(document).on('updatelayout.webshim pageinit popupafteropen panelbeforeopen tabsactivate collapsibleexpand shown.bs.modal shown.bs.collapse slid.bs.carousel playerdimensionchange', this.handler); $(window).on('resize', this.handler); } } };