Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-04-08 00:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MauriceG-patch-8'

Browse source
This commit is contained in:
John Bender 2011-10-18 09:39:48 -07:00
commit 0c5d2797a4
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/jquery.mobile.forms.select.custom.js
View file

@ -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
});

45
tests/unit/select/select_core.js
View file

@ -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);