vendor/assets/javascripts/webshims/shims/dom-extend.js in webshims-rails-1.10.9 vs vendor/assets/javascripts/webshims/shims/dom-extend.js in webshims-rails-1.10.10
- old
+ new
@@ -10,18 +10,18 @@
if(!$.parseHTML){
webshims.error("Webshims needs jQuery 1.8+ to work properly. Please update your jQuery version or downgrade webshims.");
}
- if(webshims.cfg.extendNative == 1){
+ if(webshims.cfg.extendNative === 1){
webshims.warn("extendNative configuration will be set to false by default with next release. In case you rely on it set it to 'true' otherwise to 'false'. See http://bit.ly/16OOTQO");
}
if (!webshims.cfg.no$Switch) {
var switch$ = function(){
if (window.jQuery && (!window.$ || window.jQuery == window.$) && !window.jQuery.webshims) {
- webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly..");
+ webshims.error("jQuery was included more than once. Make sure to include it only once or try the $.noConflict(extreme) feature! Webshims and other Plugins might not work properly. Or set webshims.cfg.no$Switch to 'true'.");
if (window.$) {
window.$ = webshims.$;
}
window.jQuery = webshims.$;
}
@@ -559,10 +559,11 @@
this.height = docObserve.getHeight();
this.width = docObserve.getWidth();
setInterval(this.test, 600);
$(this.test);
webshims.ready('WINDOWLOAD', this.test);
+ $(document).on('updatelayout', this.handler);
$(window).bind('resize', this.handler);
(function(){
var oldAnimate = $.fn.animate;
var animationTimer;
@@ -606,11 +607,13 @@
shadowFocusElementData = $.data(opts.shadowFocusElement, dataID) || $.data(opts.shadowFocusElement, dataID, shadowFocusElementData);
}
$(nativeElem).on('remove', function(e){
if (!e.originalEvent) {
- $(shadowElem).remove();
+ setTimeout(function(){
+ $(shadowElem).remove();
+ }, 4);
}
});
nativeData.hasShadow = shadowElem;
shadowFocusElementData.nativeElement = shadowData.nativeElement = nativeElem;
@@ -1084,6 +1087,6 @@
addRole(footer, 'contentinfo');
}
}
});
-})(jQuery, document);
+})(webshims.$, document);