Merge branch 'master' of https://github.com/eromba/jquery-mobile into eromba-master

This commit is contained in:
John Bender 2011-12-09 11:50:15 -08:00
commit 2b49d382d8
3 changed files with 21 additions and 6 deletions

View file

@ -24,7 +24,7 @@ $.mobile.page.prototype.options.degradeInputs = {
//auto self-init widgets
$( document ).bind( "pagecreate create", function( e ){
var page = $(e.target).closest(':jqmData(role="page")').data("page"), options;
var page = $(e.target).closest(':jqmData(role="page"),:jqmData(role="dialog")').data("page"), options;
if( !page ) {
return;

View file

@ -14,15 +14,23 @@
var degradeInputs = $.mobile.page.prototype.options.degradeInputs;
expect( degradeInputs.length );
// Initialize dialog page
$.mobile.changePage($('#dialog'));
$.mobile.changePage($('#page'));
$.each(degradeInputs, function( oldType, newType ) {
if (newType === false) {
newType = oldType;
}
$('#test-container').html('<input type="' + oldType + '" />').trigger("create");
$('#page-test-container').html('<input type="' + oldType + '" />').trigger("create");
same($('#test-container input').attr("type"), newType);
same($('#page-test-container input').attr("type"), newType);
$('#dialog-test-container').html('<input type="' + oldType + '" />').trigger("create");
same($('#dialog-test-container input').attr("type"), newType);
});
});

View file

@ -25,11 +25,18 @@
<ol id="qunit-tests">
</ol>
<div id="foo" data-nstest-role="page">
<div id="page" data-nstest-role="page">
<input id="not-to-be-degraded" type="range" data-nstest-role="nojs" />
<div id="test-container">
<div id="page-test-container">
</div>
</div>
<div id="dialog" data-nstest-role="dialog">
<div id="dialog-test-container">
</div>
</div>