diff --git a/src/css/structure/modules/infragistics.ui.shared.css b/src/css/structure/modules/infragistics.ui.shared.css index 03cf560f2..e6641ece6 100644 --- a/src/css/structure/modules/infragistics.ui.shared.css +++ b/src/css/structure/modules/infragistics.ui.shared.css @@ -471,4 +471,13 @@ visibility:hidden; .ui-hidden-phone { display: none !important } +} +/* Scroll measurement helper - used by $.ig.util.getScrollWidth/getScrollHeight */ +.ui-ig-scroll-measure { + width: 100px; + height: 100px; + position: absolute; + top: -10000px; + left: -10000px; + overflow: scroll; } \ No newline at end of file diff --git a/src/js/infragistics.loader.js b/src/js/infragistics.loader.js index 7e17344f9..35d5dc71c 100644 --- a/src/js/infragistics.loader.js +++ b/src/js/infragistics.loader.js @@ -245,7 +245,10 @@ $.ig.dependencies = [ scripts: [ "$path$/modules/infragistics.ui.scroll.js" ], locale: [ "$localePath$/infragistics.ui.scroll-$locale$.js" ], group: $.ig.loaderClass.locale.miscGroup, - css: [ "$path$/structure/modules/infragistics.ui.scroll.css" ], + css: [ + "$path$/structure/modules/infragistics.ui.shared.css", + "$path$/structure/modules/infragistics.ui.scroll.css" + ], description: $.ig.loaderClass.locale.descriptions.scrollDescription }, { @@ -1727,7 +1730,10 @@ $.ig.dependencies = [ dependency: [ { name: "igWidget" } ], scripts: [ "$path$/modules/infragistics.ui.layoutmanager.js" ], group: $.ig.loaderClass.locale.layoutGroup, - css: [ "$path$/structure/modules/infragistics.ui.layout.css" ], + css: [ + "$path$/structure/modules/infragistics.ui.shared.css", + "$path$/structure/modules/infragistics.ui.layout.css" + ], description: $.ig.loaderClass.locale.descriptions.layoutManagerDescription }, { @@ -1789,7 +1795,10 @@ $.ig.dependencies = [ scripts: [ "$path$/modules/infragistics.ui.splitter.js" ], locale: [ "$localePath$/infragistics.ui.splitter-$locale$.js" ], group: $.ig.loaderClass.locale.layoutGroup, - css: [ "$path$/structure/modules/infragistics.ui.splitter.css" ], + css: [ + "$path$/structure/modules/infragistics.ui.shared.css", + "$path$/structure/modules/infragistics.ui.splitter.css" + ], description: $.ig.loaderClass.locale.descriptions.splitterDescription }, { diff --git a/src/js/modules/infragistics.util.jquery.js b/src/js/modules/infragistics.util.jquery.js index 65ed4ba5e..32053d3eb 100644 --- a/src/js/modules/infragistics.util.jquery.js +++ b/src/js/modules/infragistics.util.jquery.js @@ -1112,8 +1112,7 @@ // Returns the width of the vertical scrollbar $.ig.util.getScrollWidth = function () { - var el = $('
') + var el = $("").addClass("ui-ig-scroll-measure") .appendTo($(document.body)), scrollWidth; scrollWidth = el[ 0 ].offsetWidth - el[ 0 ].clientWidth; el.remove(); @@ -1122,8 +1121,7 @@ // Returns the height of the horizontal scrollbar $.ig.util.getScrollHeight = function () { - var el = $('') + var el = $("").addClass("ui-ig-scroll-measure") .appendTo($(document.body)), scrollHeight; scrollHeight = el[ 0 ].offsetHeight - el[ 0 ].clientHeight; el.remove();