1 From c5e658e96ae2b60731934f6cc0cb8cdf1e515698 Mon Sep 17 00:00:00 2001
2 From: Minkyeong Kim <minkyeong.kim@samsung.com>
3 Date: Fri, 1 Feb 2013 14:15:11 +0900
4 Subject: [PATCH] [JQM] performance tuning : remove jqmData
7 .../js/jquery.mobile.buttonMarkup.js | 26 +++++++++++---------
8 .../js/jquery.mobile.controlGroup.js | 4 +--
9 .../jquery-mobile-1.2.0/js/jquery.mobile.core.js | 8 ++++++
10 .../js/jquery.mobile.navigation.js | 12 ++++-----
11 .../jquery-mobile-1.2.0/js/widgets/collapsible.js | 26 ++++++++++----------
12 .../js/widgets/collapsibleSet.js | 6 ++---
13 libs/js/jquery-mobile-1.2.0/js/widgets/dialog.js | 2 +-
14 .../jquery-mobile-1.2.0/js/widgets/forms/button.js | 4 +--
15 .../jquery-mobile-1.2.0/js/widgets/forms/select.js | 6 ++---
16 .../jquery-mobile-1.2.0/js/widgets/forms/slider.js | 6 ++---
17 .../js/widgets/forms/textinput.js | 2 +-
18 .../js/widgets/listview.filter.js | 2 +-
19 libs/js/jquery-mobile-1.2.0/js/widgets/listview.js | 22 ++++++++---------
20 libs/js/jquery-mobile-1.2.0/js/widgets/popup.js | 4 +--
21 14 files changed, 70 insertions(+), 60 deletions(-)
23 diff --git a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.buttonMarkup.js b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.buttonMarkup.js
24 index 4d07961..7c17ba6 100644
25 --- a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.buttonMarkup.js
26 +++ b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.buttonMarkup.js
27 @@ -23,14 +23,14 @@ $.fn.buttonMarkup = function( options ) {
28 var el = $workingSet.eq( i ),
30 o = $.extend( {}, $.fn.buttonMarkup.defaults, {
31 - icon: options.icon !== undefined ? options.icon : ( e.getAttribute( prefix + "icon" ) || undefined ),
32 - iconpos: options.iconpos !== undefined ? options.iconpos : ( e.getAttribute( prefix + "iconpos" ) || undefined ),
33 - theme: options.theme !== undefined ? options.theme : e.getAttribute( prefix + "theme" ) || $.mobile.getInheritedTheme( el, $.fn.buttonMarkup.defaults["theme"] ),
34 - inline: options.inline !== undefined ? options.inline : /^true$/i.test( e.getAttribute( prefix + "inline" ) ),
35 - shadow: options.shadow !== undefined ? options.shadow : !/^false$/i.test( e.getAttribute( prefix + "shadow" ) ),
36 - corners: options.corners !== undefined ? options.corners : !/^false$/i.test( e.getAttribute( prefix + "corners" ) ),
37 - iconshadow: options.iconshadow !== undefined ? options.iconshadow : !/^false$/i.test( e.getAttribute( prefix + "iconshadow" ) ),
38 - mini: options.mini !== undefined ? options.mini : /^true$/i.test( e.getAttribute( prefix + "mini" ) )
39 + icon: options.icon !== undefined ? options.icon : $.mobile.getAttrFixed( e, prefix + "icon" ),
40 + iconpos: options.iconpos !== undefined ? options.iconpos : $.mobile.getAttrFixed( e, prefix + "iconpos" ),
41 + theme: options.theme !== undefined ? options.theme : $.mobile.getAttrFixed( e, prefix + "theme" ) || $.mobile.getInheritedTheme( el, $.fn.buttonMarkup.defaults["theme"] ),
42 + inline: options.inline !== undefined ? options.inline : $.mobile.getAttrFixed( e, prefix + "inline" ),
43 + shadow: options.shadow !== undefined ? options.shadow : $.mobile.getAttrFixed( e, prefix + "shadow" ),
44 + corners: options.corners !== undefined ? options.corners : $.mobile.getAttrFixed( e, prefix + "corners" ),
45 + iconshadow: options.iconshadow !== undefined ? options.iconshadow : $.mobile.getAttrFixed( e, prefix + "iconshadow" ),
46 + mini: options.mini !== undefined ? options.mini : $.mobile.getAttrFixed( e, prefix + "mini" )
50 @@ -43,9 +43,11 @@ $.fn.buttonMarkup = function( options ) {
54 - $.each( o, mapToDataAttr );
56 + e.setAttribute ( prefix + key, o[ key ])
59 - if ( e.getAttribute( prefix + "rel" ) === "popup" && el.attr( "href" ) ) {
60 + if ( $.mobile.getAttrFixed( e, prefix + "rel" ) === "popup" && el.attr( "href" ) ) {
61 e.setAttribute( "aria-haspopup", true );
62 e.setAttribute( "aria-owns", e.getAttribute( "href" ) );
64 @@ -82,12 +84,12 @@ $.fn.buttonMarkup = function( options ) {
65 buttonClass += o.corners ? " ui-btn-corner-all" : "";
67 // To distinguish real buttons
68 - if( el.jqmData("role") == "button" || e.tagName == "BUTTON" || e.tagName == "DIV" ){
69 + if( $.mobile.getAttrFixed( e, prefix + "role" ) == "button" || e.tagName == "BUTTON" || e.tagName == "DIV" ){
70 buttonClass += " ui-btn-box-" + o.theme;
73 /* TIZEN style markup */
74 - buttonStyle = el.jqmData("style");
75 + buttonStyle = $.mobile.getAttrFixed( e, prefix + "style" );
77 if ( buttonStyle == "circle" && !($(el).text().length > 0) ) {
78 /* style : no text, Icon only */
79 diff --git a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.controlGroup.js b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.controlGroup.js
80 index 9e72818..06c5312 100644
81 --- a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.controlGroup.js
82 +++ b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.controlGroup.js
83 @@ -20,10 +20,10 @@ $.fn.controlgroup = function( options ) {
84 return this.each(function() {
87 - direction: $el.jqmData( "type" ) || "vertical",
88 + direction: $.mobile.getAttrFixed( $el[0], "data-"+ $.mobile.ns + "type" ) || "vertical",
90 excludeInvisible: true,
91 - mini: $el.jqmData( "mini" )
92 + mini: $.mobile.getAttrFixed( $el[0], "data-"+ $.mobile.ns + "mini" )
94 grouplegend = $el.children( "legend" ),
95 groupheading = $el.children( ".ui-controlgroup-label" ),
96 diff --git a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.core.js b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.core.js
97 index 873293c..f8c3a2d 100644
98 --- a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.core.js
99 +++ b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.core.js
100 @@ -88,6 +88,14 @@ define( [ "jquery", "text!../version.txt" ], function( $, __version__ ) {
101 $window: $( window ),
102 $document: $( document ),
104 + getAttrFixed : function( e, key ) {
105 + var value = e.getAttribute( key );
107 + return value === "true" ? true :
108 + value === "false" ? false :
109 + value === null ? undefined : value;
112 // TODO might be useful upstream in jquery itself ?
115 diff --git a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.navigation.js b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.navigation.js
116 index 203557a..0a727b4 100644
117 --- a/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.navigation.js
118 +++ b/libs/js/jquery-mobile-1.2.0/js/jquery.mobile.navigation.js
119 @@ -1050,7 +1050,7 @@ define( [
120 activeIsInitialPage = urlHistory.activeIndex === 0,
122 pageTitle = document.title,
123 - isDialog = settings.role === "dialog" || toPage.jqmData( "role" ) === "dialog";
124 + isDialog = settings.role === "dialog" || $.mobile.getAttrFixed( toPage [0], "data-" + $.mobile.ns + "role" ) === "dialog";
126 // By default, we prevent changePage requests when the fromPage and toPage
127 // are the same element, but folks that generate content manually/dynamically
128 @@ -1300,8 +1300,8 @@ define( [
130 type: type && type.length && type.toLowerCase() || "get",
131 data: $this.serialize(),
132 - transition: $this.jqmData( "transition" ),
133 - reverse: $this.jqmData( "direction" ) === "reverse",
134 + transition: $.mobile.getAttrFixed( $this [0], "data-" + $.mobile.ns + "transition" ),
135 + reverse: $.mobile.getAttrFixed( $this [0], "data-" + $.mobile.ns + "direction" ) === "reverse",
139 @@ -1420,10 +1420,10 @@ define( [
143 - var transition = $link.jqmData( "transition" ),
144 - reverse = $link.jqmData( "direction" ) === "reverse" ||
145 + var transition = $.mobile.getAttrFixed( $link [0], "data-" + $.mobile.ns + "transition" ),
146 + reverse = $.mobile.getAttrFixed( $link [0], "data-" + $.mobile.ns + "direction" ) === "reverse" ||
147 // deprecated - remove by 1.0
148 - $link.jqmData( "back" ),
149 + $.mobile.getAttrFixed( $link [0], "data-" + $.mobile.ns + "back" ),
151 //this may need to be more specific as we use data-rel more
152 role = $link.attr( "data-" + $.mobile.ns + "rel" ) || undefined;
153 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/collapsible.js b/libs/js/jquery-mobile-1.2.0/js/widgets/collapsible.js
154 index 41492ca..ad1ca3b 100644
155 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/collapsible.js
156 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/collapsible.js
157 @@ -27,8 +27,8 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
159 collapsible = $el.addClass( "ui-collapsible" ),
160 collapsibleHeading = $el.children( o.heading ).first(),
161 - collapsedIcon = $el.jqmData( "collapsed-icon" ) || o.collapsedIcon,
162 - expandedIcon = $el.jqmData( "expanded-icon" ) || o.expandedIcon,
163 + collapsedIcon = $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "collapsed-icon" ) || o.collapsedIcon,
164 + expandedIcon = $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "expanded-icon" ) || o.expandedIcon,
165 collapsibleContent = collapsible.wrapInner( "<div class='ui-collapsible-content'></div>" ).children( ".ui-collapsible-content" ),
166 collapsibleSet = $el.closest( ":jqmData(role='collapsible-set')" ).addClass( "ui-collapsible-set" );
168 @@ -42,34 +42,34 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
169 if ( collapsibleSet.length ) {
170 // Inherit the theme from collapsible-set
172 - o.theme = collapsibleSet.jqmData( "theme" ) || $.mobile.getInheritedTheme( collapsibleSet, "c" );
173 + o.theme = $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "theme" ) || $.mobile.getInheritedTheme( collapsibleSet, "c" );
175 // Inherit the content-theme from collapsible-set
176 if ( !o.contentTheme ) {
177 - o.contentTheme = collapsibleSet.jqmData( "content-theme" );
178 + o.contentTheme = $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "content-theme" );
181 // Get the preference for collapsed icon in the set
182 if ( !o.collapsedIcon ) {
183 - o.collapsedIcon = collapsibleSet.jqmData( "collapsed-icon" );
184 + o.collapsedIcon = $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "collapsed-icon" );
186 // Get the preference for expanded icon in the set
187 if ( !o.expandedIcon ) {
188 - o.expandedIcon = collapsibleSet.jqmData( "expanded-icon" );
189 + o.expandedIcon = $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "expanded-icon" );
191 // Gets the preference icon position in the set
193 - o.iconPos = collapsibleSet.jqmData( "iconpos" );
194 + o.iconPos = $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "iconpos" );
196 // Inherit the preference for inset from collapsible-set or set the default value to ensure equalty within a set
197 - if ( collapsibleSet.jqmData( "inset" ) !== undefined ) {
198 - o.inset = collapsibleSet.jqmData( "inset" );
199 + if ( $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "inset" ) !== undefined ) {
200 + o.inset = $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "inset" );
204 // Gets the preference for mini in the set
206 - o.mini = collapsibleSet.jqmData( "mini" );
207 + o.mini = $.mobile.getAttrFixed( collapsibleSet[0], "data-" + $.mobile.ns + "mini" );
210 // get inherited theme if not a set and no theme has been set
211 @@ -84,8 +84,8 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
213 collapsibleContent.addClass( ( o.contentTheme ) ? ( "ui-body-" + o.contentTheme ) : "");
215 - collapsedIcon = $el.jqmData( "collapsed-icon" ) || o.collapsedIcon || "plus";
216 - expandedIcon = $el.jqmData( "expanded-icon" ) || o.expandedIcon || "minus";
217 + collapsedIcon = $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "collapsed-icon" ) || o.collapsedIcon || "plus";
218 + expandedIcon = $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "expanded-icon" ) || o.expandedIcon || "minus";
221 //drop heading in before content
222 @@ -99,7 +99,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
226 - iconpos: $el.jqmData( "iconpos" ) || o.iconPos || "left",
227 + iconpos: $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "iconpos" ) || o.iconPos || "left",
231 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/collapsibleSet.js b/libs/js/jquery-mobile-1.2.0/js/widgets/collapsibleSet.js
232 index 4c5a419..ebc762d 100644
233 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/collapsibleSet.js
234 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/collapsibleSet.js
235 @@ -23,11 +23,11 @@ $.widget( "mobile.collapsibleset", $.mobile.widget, {
237 // Inherit the content-theme from collapsible-set
238 if ( !o.contentTheme ) {
239 - o.contentTheme = $el.jqmData( "content-theme" );
240 + o.contentTheme = $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "content-theme" );
243 - if ( $el.jqmData( "inset" ) !== undefined ) {
244 - o.inset = $el.jqmData( "inset" );
245 + if ( $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "inset" ) !== undefined ) {
246 + o.inset = $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "inset" );
248 o.inset = o.inset !== undefined ? o.inset : true;
250 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/dialog.js b/libs/js/jquery-mobile-1.2.0/js/widgets/dialog.js
251 index d7a0795..9e390ef 100644
252 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/dialog.js
253 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/dialog.js
254 @@ -59,7 +59,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
255 var $target = $( event.target ).closest( event.type === "vclick" ? "a" : "form" ),
258 - if ( $target.length && !$target.jqmData( "transition" ) ) {
259 + if ( $target.length && !$.mobile.getAttrFixed( $target[0], "data-" + $.mobile.ns + "transition" ) ) {
261 active = $.mobile.urlHistory.getActive() || {};
263 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/button.js b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/button.js
264 index 7b0141b..fe6d81c 100644
265 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/button.js
266 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/button.js
267 @@ -25,8 +25,8 @@ $.widget( "mobile.button", $.mobile.widget, {
271 - inline = o.inline || $el.jqmData( "inline" ),
272 - mini = o.mini || $el.jqmData( "mini" ),
273 + inline = o.inline || $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "inline" ),
274 + mini = o.mini || $.mobile.getAttrFixed( $el[0], "data-" + $.mobile.ns + "mini" ),
278 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/select.js b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/select.js
279 index a8b0f9f..9c78a90 100644
280 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/select.js
281 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/select.js
282 @@ -89,9 +89,9 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
284 options = this.options,
286 - inline = options.inline || this.select.jqmData( "inline" ),
287 - mini = options.mini || this.select.jqmData( "mini" ),
288 - iconpos = options.icon ? ( options.iconpos || this.select.jqmData( "iconpos" ) ) : false,
289 + inline = options.inline || $.mobile.getAttrFixed( this.select[0], "data-" + $.mobile.ns + "inline" ),
290 + mini = options.mini || $.mobile.getAttrFixed( this.select[0], "data-" + $.mobile.ns + "mini" ),
291 + iconpos = options.icon ? ( options.iconpos || $.mobile.getAttrFixed( this.select[0], "data-" + $.mobile.ns + "iconpos" ) ) : false,
293 // IE throws an exception at options.item() function when
294 // there is no selected item
295 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js
296 index c6d4c9b..6729af7 100644
297 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js
298 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/slider.js
299 @@ -55,9 +55,9 @@ $.widget( "mobile.slider", $.mobile.widget, {
301 step = window.parseFloat( control.attr( "step" ) || 1 ),
303 - inlineClass = ( this.options.inline || control.jqmData( "inline" ) === true ) ? " ui-slider-inline" : "",
304 + inlineClass = ( this.options.inline || $.mobile.getAttrFixed( control[0], "data-" + $.mobile.ns + "inline" ) === true ) ? " ui-slider-inline" : "",
306 - miniClass = ( this.options.mini || control.jqmData( "mini" ) ) ? " ui-slider-mini" : "",
307 + miniClass = ( this.options.mini || $.mobile.getAttrFixed( control[0], "data-" + $.mobile.ns + "min" ) ) ? " ui-slider-mini" : "",
310 domHandle = document.createElement( 'a' ),
311 @@ -65,7 +65,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
312 domSlider = document.createElement( 'div' ),
313 slider = $( domSlider ),
315 - valuebg = control.jqmData( "highlight" ) !== false && cType !== "select" ? (function() {
316 + valuebg = $.mobile.getAttrFixed( control[0], "data-" + $.mobile.ns + "highlight" ) !== false && cType !== "select" ? (function() {
317 var bg = document.createElement('div');
318 bg.className = 'ui-slider-bg ' + $.mobile.activeBtnClass + ' ui-btn-corner-all';
319 return $( bg ).prependTo( slider );
320 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/textinput.js b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/textinput.js
321 index 075d35d..9a7765e 100644
322 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/forms/textinput.js
323 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/forms/textinput.js
324 @@ -25,7 +25,7 @@ $.widget( "mobile.textinput", $.mobile.widget, {
326 theme = o.theme || $.mobile.getInheritedTheme( this.element, "c" ),
327 themeclass = " ui-body-" + theme,
328 - mini = input.jqmData( "mini" ) === true,
329 + mini = $.mobile.getAttrFixed( input[0], "data-" + $.mobile.ns + "mini" ) === true,
330 miniclass = mini ? " ui-mini" : "",
333 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/listview.filter.js b/libs/js/jquery-mobile-1.2.0/js/widgets/listview.filter.js
334 index 0519b9a..b1ed1e4 100644
335 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/listview.filter.js
336 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/listview.filter.js
337 @@ -69,7 +69,7 @@ $.mobile.$document.delegate( ":jqmData(role='listview')", "listviewcreate", func
339 for ( var i = listItems.length - 1; i >= 0; i-- ) {
340 item = $( listItems[ i ] );
341 - itemtext = item.jqmData( "filtertext" ) || item.text();
342 + itemtext = $.mobile.getAttrFixed( item[0], "data-" + $.mobile.ns + "filtertext" ) || item.text();
344 if ( item.is( "li:jqmData(role=list-divider)" ) ) {
346 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/listview.js b/libs/js/jquery-mobile-1.2.0/js/widgets/listview.js
347 index e46f842..e0d68f7 100644
348 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/listview.js
349 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/listview.js
350 @@ -188,9 +188,9 @@ $.widget( "mobile.listview", $.mobile.widget, {
351 var o = this.options,
352 $list = this.element,
354 - dividertheme = $list.jqmData( "dividertheme" ) || o.dividerTheme,
355 - listsplittheme = $list.jqmData( "splittheme" ),
356 - listspliticon = $list.jqmData( "spliticon" ),
357 + dividertheme = $.mobile.getAttrFixed( $list[0], "data-" + $.mobile.ns + "dividertheme" ) || o.dividerTheme,
358 + listsplittheme = $.mobile.getAttrFixed( $list[0], "data-" + $.mobile.ns + "splittheme" ),
359 + listspliticon = $.mobile.getAttrFixed( $list[0], "data-" + $.mobile.ns + "spliticon" ),
360 li = this._getChildrenByTagName( $list[ 0 ], "li", "LI" ),
361 ol = !!$.nodeName( $list[ 0 ], "ol" ),
362 jsCount = !$.support.cssPseudoElement,
363 @@ -227,12 +227,12 @@ $.widget( "mobile.listview", $.mobile.widget, {
365 // If we're creating the element, we update it regardless
366 if ( create || !item.hasClass( "ui-li" ) ) {
367 - itemTheme = item.jqmData( "theme" ) || o.theme;
368 + itemTheme = $.mobile.getAttrFixed( item[0], "data-" + $.mobile.ns + "theme" ) || o.theme;
369 a = this._getChildrenByTagName( item[ 0 ], "a", "A" );
370 - var isDivider = ( item.jqmData( "role" ) === "list-divider" );
371 + var isDivider = ( $.mobile.getAttrFixed( item[0], "data-" + $.mobile.ns + "role" ) === "list-divider" );
373 if ( a.length && !isDivider ) {
374 - icon = item.jqmData( "icon" );
375 + icon = $.mobile.getAttrFixed( item[0], "data-" + $.mobile.ns + "icon" );
377 /* Remove auto populated right-arrow button. */
378 if ( icon === undefined ) {
379 @@ -258,8 +258,8 @@ $.widget( "mobile.listview", $.mobile.widget, {
380 itemClass += " ui-li-has-alt";
383 - splittheme = listsplittheme || last.jqmData( "theme" ) || o.splitTheme;
384 - linkIcon = last.jqmData( "icon" );
385 + splittheme = listsplittheme || $.mobile.getAttrFixed( last[0], "data-" + $.mobile.ns + "theme" ) || o.splitTheme;
386 + linkIcon = $.mobile.getAttrFixed( last[0], "data-" + $.mobile.ns + "icon" );
388 last.appendTo( item )
389 .attr( "title", last.getEncodedText() )
390 @@ -351,7 +351,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
392 .find( ".ui-li-count" ).each(function() {
393 $( this ).closest( "li" ).addClass( "ui-li-has-count" );
394 - }).addClass( "ui-btn-up-" + ( $list.jqmData( "counttheme" ) || this.options.countTheme) + " ui-btn-corner-all" );
395 + }).addClass( "ui-btn-up-" + ( $.mobile.getAttrFixed( $list[0], "data-" + $.mobile.ns + "counttheme" ) || this.options.countTheme) + " ui-btn-corner-all" );
397 // The idea here is to look at the first image in the list item
398 // itself, and any .ui-link-inherit element it may contain, so we
399 @@ -412,8 +412,8 @@ $.widget( "mobile.listview", $.mobile.widget, {
400 nodeEls = nodeElsFull.length ? nodeElsFull : $( "<span>" + $.trim(parent.contents()[ 0 ].nodeValue) + "</span>" ),
401 title = nodeEls.first().getEncodedText(),//url limits to first 30 chars of text
402 id = ( parentUrl || "" ) + "&" + $.mobile.subPageUrlKey + "=" + listId,
403 - theme = list.jqmData( "theme" ) || o.theme,
404 - countTheme = list.jqmData( "counttheme" ) || parentList.jqmData( "counttheme" ) || o.countTheme,
405 + theme = $.mobile.getAttrFixed( list[0], "data-" + $.mobile.ns + "theme" ) || o.theme,
406 + countTheme = $.mobile.getAttrFixed( list[0], "data-" + $.mobile.ns + "counttheme" ) || $.mobile.getAttrFixed( parentList[0], "data-" + $.mobile.ns + "counttheme" ) || o.countTheme,
409 //define hasSubPages for use in later removal
410 diff --git a/libs/js/jquery-mobile-1.2.0/js/widgets/popup.js b/libs/js/jquery-mobile-1.2.0/js/widgets/popup.js
411 index 13cb548..35d1933 100644
412 --- a/libs/js/jquery-mobile-1.2.0/js/widgets/popup.js
413 +++ b/libs/js/jquery-mobile-1.2.0/js/widgets/popup.js
414 @@ -873,8 +873,8 @@ define( [ "jquery",
415 popup.popup( "open", {
416 x: offset.left + $link.outerWidth() / 2,
417 y: offset.top + $link.outerHeight() / 2,
418 - transition: $link.jqmData( "transition" ),
419 - positionTo: $link.jqmData( "position-to" ),
420 + transition: $.mobile.getAttrFixed( $link[0], "data-" + $.mobile.ns + "transition" ),
421 + positionTo: $.mobile.getAttrFixed( $link[0], "data-" + $.mobile.ns + "position-to" ),