only force the message if the argument is explicit, not if it is set …

…globally

js/widgets/loader.js

@@ -135,9 +135,11 @@ define( [ "jquery",	"../jquery.mobile.core", "../jquery.mobile.widget" ], functi
 				}
 
 				// add the proper css given the options (theme, text, etc)
+				// Force text visibility if the second argument was supplied, or
+				// if the text was explicitly set in the object args
 				this.element.attr("class", loaderClass +
 					" ui-corner-all ui-body-" + theme +
-					" ui-loader-" + ( textVisible || message ? "verbose" : "default" ) +
+					" ui-loader-" + ( textVisible || msgText || theme.text ? "verbose" : "default" ) +
 					( loadSettings.textonly || textonly ? " ui-loader-textonly" : "" ) );
 
 				// TODO verify that jquery.fn.html is ok to use in both cases here

tests/unit/init/init_core.js

@@ -217,7 +217,7 @@
 			same($(".ui-loader > div.foo").length, 1, "loader has a custom html");
 		});
 
-		test( "page loading should always contain text when passed", function() {
+		test( "page loading should always contain text when passed as the second arg", function() {
 			$.mobile.loadingMessageTextVisible = false;
 
 			// simulate error call in navigation ajax error callback
@@ -226,6 +226,32 @@
 			same($(".ui-loader").text(), "foo serious", "loader has message regardless of global setting");
 		});
 
+		test( "page loading should always contain text when passed as an object prop", function() {
+			$.mobile.loadingMessageTextVisible = false;
+
+			// simulate error call in navigation ajax error callback
+			$.mobile.showPageLoadingMsg({ theme: "e", text: "foo serious second", textonly: true });
+
+			same($(".ui-loader").text(), "foo serious second", "loader has message regardless of global setting");
+		});
+
+		test( "page loading should not contain text when default is used and visible prop is false", function() {
+			$.mobile.loadingMessageTextVisible = false;
+
+			// simulate error call in navigation ajax error callback
+			$.mobile.showPageLoadingMsg({ theme: "e", textonly: true });
+
+			ok($(".ui-loader").hasClass("ui-loader-default"), "loader text is hidden");
+
+			$.mobile.hidePageLoadingMsg();
+
+			// simulate error call in navigation ajax error callback
+			$.mobile.showPageLoadingMsg( "e", undefined, true );
+
+			ok($(".ui-loader").hasClass("ui-loader-default"), "loader text is hidden");
+		});
+
+
 		test( "test the loading config object precedence", function() {
 			$.mobile.loadingMessage = "fozzle";
 			$.mobile.loadingMessageTheme = "x";