Browse files

Merge branch 'MauriceG-patch-8'

  • Loading branch information...
2 parents cc20cf9 + 911ff69 commit 0c5d2797a4ac338605cb0637aea0d45db36c8a52 @johnbender johnbender committed Oct 18, 2011
Showing with 44 additions and 2 deletions.
  1. +1 −0 js/jquery.mobile.forms.select.custom.js
  2. +43 −2 tests/unit/select/select_core.js
View
1 js/jquery.mobile.forms.select.custom.js
@@ -346,6 +346,7 @@
self.menuType = "page";
self.menuPageContent.append( self.list );
+ self.menuPage.find("div .ui-title").text(self.label.text());
$.mobile.changePage( self.menuPage, {
transition: $.mobile.defaultDialogTransition
});
View
45 tests/unit/select/select_core.js
@@ -336,8 +336,49 @@
$.mobile.page.prototype.options.keepNative = "select.should-be-native";
- // not testing the positive case here since's it's obviously tested elsewhere
+ // not testing the positive case here since's it's obviously tested elsewhere
test( "select elements in the keepNative set shouldn't be enhanced", function() {
- ok( !$("#keep-native").parent().is("div.ui-btn") );
+ ok( !$("#keep-native").parent().is("div.ui-btn") );
+ });
+
+ asyncTest( "dialog size select title should match the label", function() {
+ var $select = $( "#select-choice-many-1" ),
+ $label = $select.parent().siblings( "label" ),
+ $button = $select.siblings( "a" );
+
+ $.testHelper.pageSequence([
+ function() {
+ $button.click();
+ },
+
+ function() {
+ same($.mobile.activePage.find( ".ui-title" ).text(), $label.text());
+ window.history.back();
+ },
+
+ start
+ ]);
+ });
+
+ asyncTest( "dialog size select title should match the label when changed after the dialog markup is added to the DOM", function() {
+ var $select = $( "#select-choice-many-1" ),
+ $label = $select.parent().siblings( "label" ),
+ $button = $select.siblings( "a" );
+
+ $label.text( "foo" );
+
+ $.testHelper.pageSequence([
+ function() {
+ $label.text( "foo" );
+ $button.click();
+ },
+
+ function() {
+ same($.mobile.activePage.find( ".ui-title" ).text(), $label.text());
+ window.history.back();
+ },
+
+ start
+ ]);
});
})(jQuery);

0 comments on commit 0c5d279

Please sign in to comment.