Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit 8cecf0d

Browse files
author
Gabriel Schulhof
committed
[widgets] Moving references to widget instances to the new namespaced key
1 parent 245e5ae commit 8cecf0d

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

js/jquery.mobile.core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ define( [ "jquery", "text!../version.txt" ], function( $, __version__ ) {
193193
closestPageData: function( $target ) {
194194
return $target
195195
.closest( ':jqmData(role="page"), :jqmData(role="dialog")' )
196-
.data( "page" );
196+
.data( "mobile-page" );
197197
},
198198

199199
enhanceable: function( $set ) {

js/jquery.mobile.navigation.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -552,10 +552,10 @@ define( [
552552

553553
if ( fromPage ) {
554554
//trigger before show/hide events
555-
fromPage.data( "page" )._trigger( "beforehide", null, { nextPage: toPage } );
555+
fromPage.data( "mobile-page" )._trigger( "beforehide", null, { nextPage: toPage } );
556556
}
557557

558-
toPage.data( "page" )._trigger( "beforeshow", null, { prevPage: fromPage || $( "" ) } );
558+
toPage.data( "mobile-page" )._trigger( "beforeshow", null, { prevPage: fromPage || $( "" ) } );
559559

560560
//clear page loader
561561
$.mobile.hidePageLoadingMsg();
@@ -572,11 +572,11 @@ define( [
572572

573573
//trigger show/hide events
574574
if ( fromPage ) {
575-
fromPage.data( "page" )._trigger( "hide", null, { nextPage: toPage } );
575+
fromPage.data( "mobile-page" )._trigger( "hide", null, { nextPage: toPage } );
576576
}
577577

578578
//trigger pageshow, define prevPage as either fromPage or empty jQuery obj
579-
toPage.data( "page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } );
579+
toPage.data( "mobile-page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } );
580580
});
581581

582582
return promise;
@@ -649,7 +649,7 @@ define( [
649649
var page = $( this );
650650

651651
// when dom caching is not enabled or the page is embedded bind to remove the page on hide
652-
if ( !page.data( "page" ).options.domCache &&
652+
if ( !page.data( "mobile-page" ).options.domCache &&
653653
page.is( ":jqmData(external-page='true')" ) ) {
654654

655655
page.bind( 'pagehide.remove', function() {

js/widgets/forms/select.custom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ define( [
559559

560560
// issue #3894 - core doesn't trigger events on disabled delegates
561561
$( document ).bind( "selectmenubeforecreate", function( event ) {
562-
var selectmenuWidget = $( event.target ).data( "selectmenu" );
562+
var selectmenuWidget = $( event.target ).data( "mobile-selectmenu" );
563563

564564
if ( !selectmenuWidget.options.nativeMenu &&
565565
selectmenuWidget.element.parents( ":jqmData(role='popup')" ).length === 0 ) {

js/widgets/listview.autodividers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $.mobile.listview.prototype.options.autodividersSelector = function( elt ) {
2424
$( document ).delegate( "ul,ol", "listviewcreate", function() {
2525

2626
var list = $( this ),
27-
listview = list.data( "listview" );
27+
listview = list.data( "mobile-listview" );
2828

2929
if ( !listview || !listview.options.autodividers ) {
3030
return;

js/widgets/listview.filter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $.mobile.listview.prototype.options.filterCallback = defaultFilterCallback;
2222
$( document ).delegate( "ul, ol", "listviewcreate", function() {
2323

2424
var list = $( this ),
25-
listview = list.data( "listview" );
25+
listview = list.data( "mobile-listview" );
2626

2727
if ( !listview.options.filter ) {
2828
return;

js/widgets/listview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
347347
// and aren't embedded
348348
if ( hasSubPages &&
349349
parentPage.is( ":jqmData(external-page='true')" ) &&
350-
parentPage.data( "page" ).options.domCache === false ) {
350+
parentPage.data( "mobile-page" ).options.domCache === false ) {
351351

352352
var newRemove = function( e, ui ) {
353353
var nextPage = ui.nextPage, npURL,

js/widgets/page.sections.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $.mobile.page.prototype.options.contentTheme = null;
2020
// on which it depends
2121
$( document ).bind( "pagecreate", function( e ) {
2222
var $page = $( e.target ),
23-
o = $page.data( "page" ).options,
23+
o = $page.data( "mobile-page" ).options,
2424
pageRole = $page.jqmData( "role" ),
2525
pageTheme = o.theme;
2626

js/widgets/popup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ define( [ "jquery",
838838
popup = $( $.mobile.path.parseUrl($link.attr( "href" )).hash, scope[0] ),
839839
offset;
840840

841-
if ( popup.data( "popup" ) ) {
841+
if ( popup.data( "mobile-popup" ) ) {
842842
offset = $link.offset();
843843
popup.popup( "open", {
844844
x: offset.left + $link.outerWidth() / 2,

0 commit comments

Comments
 (0)