Hopefully a fix for jtsage#121

ghengeveld · Nov 19, 2011 · 980d9a5 · 980d9a5
1 parent 14b2ef4
commit 980d9a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/js/jquery.mobile.datebox.js b/js/jquery.mobile.datebox.js
@@ -1069,8 +1069,8 @@
 				.appendTo(focusedEl).buttonMarkup({icon: 'grid', iconpos: 'notext', corners:true, shadow:true})
 				.css({'vertical-align': 'middle', 'float': 'right'}),
 			thisPage = input.closest('.ui-page'),
-			pickPage = $("<div data-role='dialog' class='ui-dialog-datebox' data-theme='" + (o.forceInheritTheme === true ) ? thisTheme : o.pickPageTheme + "' >" +
-						"<div data-role='header' data-backbtn='false'>" +
+			pickPage = $("<div data-role='dialog' class='ui-dialog-datebox' data-theme='" + ((o.forceInheritTheme === false ) ? o.pickPageTheme : thisTheme ) + "' >" +
+						"<div data-role='header' data-backbtn='false' data-theme='a'>" +
 							"<div class='ui-title'>PlaceHolder</div>"+
 						"</div>"+
 						"<div data-role='content'></div>"+

diff --git a/tests/dev.html b/tests/dev.html
@@ -9,14 +9,15 @@
 
 	<!-- NOTE: Script load order is significant! -->
 
-	<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.min.js"></script> 
+	<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.4.min.js"></script> 
 	<script src="http://code.jquery.com/mobile/latest/jquery.mobile.min.js"></script>
 	<script type="text/javascript" src="http://dev.jtsage.com/jquery.mousewheel.min.js"></script>
 	<script type="text/javascript" src="http://dev.jtsage.com/cdn/datebox/latest/jquery.mobile.datebox.js"></script>
 	<script type="text/javascript" src="http://dev.jtsage.com/cdn/datebox/i8n/jquery.mobile.datebox.i8n.en-US.js"></script>
 
 	<script type="text/javascript">
 		jQuery.extend(jQuery.mobile.datebox.prototype.options, {
+			//useModal: true
 			//forceInheritTheme: true
 			//useDialogForceTrue: true
 		});
@@ -31,7 +32,7 @@ <h1>jQueryMobile - Dev Page</h1>
 	<div data-role="content">
 		<div data-role="fieldcontain">
 			<label for="lang1">calbox</label>
-			<input name="lang1" type="text" data-role="datebox" data-options='{"mode": "calbox"}' id="lang1" />
+			<input name="lang1" type="text" data-role="datebox" data-options='{"mode": "calbox", "useModal": true}' id="lang1" />
 		</div>
 		<div data-role="fieldcontain">
 			<label for="aa1">text comparison</label>