diff --git a/js/widgets/loader.js b/js/widgets/loader.js
index dd5c501d26c..37ac1b7a590 100644
--- a/js/widgets/loader.js
+++ b/js/widgets/loader.js
@@ -3,7 +3,11 @@
//>>label: Loading Message
//>>group: Widgets
-define( [ "jquery", "../core", "../widget" ], function( jQuery ) {
+define( [
+ "jquery",
+ "../helpers",
+ "../defaults",
+ "../widget" ], function( jQuery ) {
//>>excludeEnd("jqmBuildExclude");
(function( $ ) {
@@ -114,8 +118,11 @@ define( [ "jquery", "../core", "../widget" ], function( jQuery ) {
this.element.find( "h1" ).text( message );
}
- // attach the loader to the DOM
- this.element.appendTo( $.mobile.pageContainer );
+ // If the pagecontainer widget has been defined we may use the :mobile-pagecontainer
+ // and attach to the element on which the pagecontainer widget has been defined. If not,
+ // we attach to the body.
+ this.element.appendTo( $.mobile.pagecontainer ?
+ $( ":mobile-pagecontainer" ) : $( "body" ) );
// check that the loader is visible
this.checkLoaderPosition();
@@ -131,8 +138,8 @@ define( [ "jquery", "../core", "../widget" ], function( jQuery ) {
this.element.removeClass( "ui-loader-fakefix" );
}
- $.mobile.window.unbind( "scroll", this.fakeFixLoader );
- $.mobile.window.unbind( "scroll", this.checkLoaderPosition );
+ this.window.unbind( "scroll", this.fakeFixLoader );
+ this.window.unbind( "scroll", this.checkLoaderPosition );
}
});
diff --git a/tests/unit/individual-modules/loader-tests.html b/tests/unit/individual-modules/loader-tests.html
new file mode 100644
index 00000000000..1fd78df841c
--- /dev/null
+++ b/tests/unit/individual-modules/loader-tests.html
@@ -0,0 +1,36 @@
+
+
+
+
+
+ jQuery Mobile Loader Test Suite
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/unit/individual-modules/loader_core.js b/tests/unit/individual-modules/loader_core.js
new file mode 100644
index 00000000000..cda0588714a
--- /dev/null
+++ b/tests/unit/individual-modules/loader_core.js
@@ -0,0 +1,10 @@
+test( "Loader attaches to DOM when running individually", function() {
+ var loader = $.mobile.loading( "show" );
+
+ deepEqual( $.contains( document, loader[ 0 ] ), true,
+ "Document contains the loader after it is shown" );
+
+ deepEqual( loader.is( ":visible" ), true, "Loader is visible when shown" );
+
+ $.mobile.loading( "hide" );
+});