diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 0e79ca6c4e..24a276885b 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -586,6 +586,8 @@ }, 50); } + event.stopPropagation(); + event.preventDefault(); return false; }, diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index c8a4e3ea25..378d3f5ffc 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2483,9 +2483,10 @@ var AppInfo = {}; document.addEventListener('WebComponentsReady', function () { - setTimeout(onWebComponentsReady, 300); + var delay = $.browser.mobile ? 500 : 300; + setTimeout(onWebComponentsReady, delay); }); - require(['bower_components/webcomponentsjs/webcomponents-lite.js']); + require(['bower_components/webcomponentsjs/webcomponents-lite.min.js']); } })(); diff --git a/dashboard-ui/thirdparty/jquery.unveil-custom.js b/dashboard-ui/thirdparty/jquery.unveil-custom.js index f4d82fbd1a..51499d365b 100644 --- a/dashboard-ui/thirdparty/jquery.unveil-custom.js +++ b/dashboard-ui/thirdparty/jquery.unveil-custom.js @@ -129,25 +129,29 @@ images = remaining; if (!images.length) { - Events.off(document, 'scroll.' + eventNamespace); - Events.off(window, 'resize.' + eventNamespace); - - if (parents.length) { - Events.off($(parents), 'scroll.' + eventNamespace, unveil); - } + document.removeEventListener('scroll', unveil); + window.removeEventListener('resize', unveil); + bindEvent(parents, 'removeEventListener', 'scroll', unveil); } } - Events.on(document, 'scroll.' + eventNamespace, unveil); - Events.on(window, 'resize.' + eventNamespace, unveil); + document.addEventListener('scroll', unveil); + window.addEventListener('resize', unveil); if (parents.length) { - Events.on($(parents), 'scroll.' + eventNamespace, unveil); + bindEvent(parents, 'addEventListener', 'scroll', unveil); } unveil(); } + function bindEvent(elems, method, name, fn) { + + for (var i = 0, length = elems.length; i < length; i++) { + elems[i][method](name, fn); + } + } + function fillImages(elems) { for (var i = 0, length = elems.length; i < length; i++) {