Skip to content

Commit 390aae4

Browse files
author
Gabriel Schulhof
committed
Listview: Rename classes ui-li-* to ui-listview-item-*
1 parent 1225ed2 commit 390aae4

File tree

18 files changed

+105
-105
lines changed

18 files changed

+105
-105
lines changed

‎css/structure/jquery.mobile.forms.select.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
border-bottom-width: 0;
129129
}
130130

131-
.ui-selectmenu .ui-btn.ui-li-divider {
131+
.ui-selectmenu .ui-btn.ui-listview-item-divider {
132132
cursor: default;
133133
}
134134

‎css/structure/jquery.mobile.listview.css

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
position: relative;
2424
overflow: visible;
2525
}
26-
.ui-listview > .ui-li-static,
27-
.ui-listview > .ui-li-divider,
26+
.ui-listview > .ui-listview-item-static,
27+
.ui-listview > .ui-listview-item-divider,
2828
.ui-listview > li > a.ui-btn {
2929
margin: 0;
3030
display: block;
@@ -37,20 +37,20 @@
3737
.ui-listview > li > .ui-btn:focus {
3838
z-index: 1;
3939
}
40-
.ui-listview > .ui-li-static,
41-
.ui-listview > .ui-li-divider,
40+
.ui-listview > .ui-listview-item-static,
41+
.ui-listview > .ui-listview-item-divider,
4242
.ui-listview > li > a.ui-btn {
4343
border-width: 1px 0 0 0;
4444
border-style: solid;
4545
}
46-
.ui-listview-inset > .ui-li-static,
47-
.ui-listview-inset > .ui-li-divider,
46+
.ui-listview-inset > .ui-listview-item-static,
47+
.ui-listview-inset > .ui-listview-item-divider,
4848
.ui-listview-inset > li > a.ui-btn {
4949
border-right-width: 1px;
5050
border-left-width: 1px;
5151
}
52-
.ui-listview > .ui-li-static.ui-last-child,
53-
.ui-listview > .ui-li-divider.ui-last-child,
52+
.ui-listview > .ui-listview-item-static.ui-last-child,
53+
.ui-listview > .ui-listview-item-divider.ui-last-child,
5454
.ui-listview > li.ui-last-child > a.ui-btn {
5555
border-bottom-width: 1px;
5656
}
@@ -76,7 +76,7 @@
7676
-webkit-border-bottom-left-radius: inherit;
7777
border-bottom-left-radius: inherit;
7878
}
79-
.ui-listview > li.ui-li-has-alt > a.ui-btn {
79+
.ui-listview > li.ui-listview-item-has-alt > a.ui-btn {
8080
-webkit-border-top-right-radius: 0;
8181
border-top-right-radius: 0;
8282
-webkit-border-bottom-right-radius: 0;
@@ -106,32 +106,32 @@
106106
-webkit-border-radius: inherit;
107107
border-radius: inherit;
108108
}
109-
.ui-listview > .ui-li-static {
109+
.ui-listview > .ui-listview-item-static {
110110
padding: .7em 1em;
111111
}
112-
.ui-listview > .ui-li-divider {
112+
.ui-listview > .ui-listview-item-divider {
113113
padding: .5em 1.143em;
114114
font-size: 14px;
115115
font-weight: bold;
116116
cursor: default;
117117
outline: 0; /* Dividers in custom selectmenus have tabindex */
118118
}
119119
.ui-listview > .ui-li-has-count > .ui-btn,
120-
.ui-listview > .ui-li-static.ui-li-has-count,
121-
.ui-listview > .ui-li-divider.ui-li-has-count {
120+
.ui-listview > .ui-listview-item-static.ui-li-has-count,
121+
.ui-listview > .ui-listview-item-divider.ui-li-has-count {
122122
padding-right: 2.8125em;
123123
}
124124
.ui-listview > .ui-li-has-count > .ui-btn-icon-right {
125125
padding-right: 4.6875em;
126126
}
127127
.ui-listview > .ui-li-has-thumb > .ui-btn,
128-
.ui-listview > .ui-li-static.ui-li-has-thumb {
128+
.ui-listview > .ui-listview-item-static.ui-li-has-thumb {
129129
min-height: 3.625em;
130130
padding-left: 6.25em;
131131
}
132132
/* ui-li-has-icon deprecated in 1.4. TODO: remove in 1.5 */
133133
.ui-listview > .ui-li-has-icon > .ui-btn,
134-
.ui-listview > .ui-li-static.ui-li-has-icon {
134+
.ui-listview > .ui-listview-item-static.ui-li-has-icon {
135135
min-height: 1.25em;
136136
padding-left: 2.5em;
137137
}
@@ -202,11 +202,11 @@
202202
margin: 0;
203203
text-align: right;
204204
}
205-
.ui-listview > li.ui-li-has-alt > .ui-btn {
205+
.ui-listview > li.ui-listview-item-has-alt > .ui-btn {
206206
margin-right: 2.5em;
207207
border-right-width: 0;
208208
}
209-
.ui-listview > li.ui-li-has-alt > .ui-btn + .ui-btn {
209+
.ui-listview > li.ui-listview-item-has-alt > .ui-btn + .ui-btn {
210210
position: absolute;
211211
width: 2.5em;
212212
height: 100%;
@@ -221,22 +221,22 @@
221221
padding: 0;
222222
z-index: 2;
223223
}
224-
.ui-listview-inset > li.ui-li-has-alt > .ui-btn + .ui-btn {
224+
.ui-listview-inset > li.ui-listview-item-has-alt > .ui-btn + .ui-btn {
225225
border-right-width: 1px;
226226
}
227-
.ui-listview > li.ui-li-has-alt > .ui-btn + .ui-btn:focus {
227+
.ui-listview > li.ui-listview-item-has-alt > .ui-btn + .ui-btn:focus {
228228
z-index: 3;
229229
}
230230
ol.ui-listview,
231-
ol.ui-listview > .ui-li-divider {
231+
ol.ui-listview > .ui-listview-item-divider {
232232
counter-reset: listnumbering;
233233
}
234234
ol.ui-listview > li > .ui-btn,
235-
ol.ui-listview > li.ui-li-static {
235+
ol.ui-listview > li.ui-listview-item-static {
236236
vertical-align: middle;
237237
}
238238
ol.ui-listview > li > .ui-btn:first-child:before,
239-
ol.ui-listview > li.ui-li-static:before,
239+
ol.ui-listview > li.ui-listview-item-static:before,
240240
ol.ui-listview > li.ui-field-contain > label:before,
241241
ol.ui-listview > li.ui-field-contain > .ui-controlgroup-label:before {
242242
display: inline-block;

‎demos/_assets/css/jqm-demos.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
}
197197
.jqm-demos .jqm-list .ui-btn,
198198
.jqm-demos .jqm-list .ui-btn:visited,
199-
.jqm-demos .jqm-list .ui-li-divider {
199+
.jqm-demos .jqm-list .ui-listview-item-divider {
200200
font-family: 'Open Sans', sans-serif;
201201
font-weight: 300;
202202
text-shadow: none !important;
@@ -208,15 +208,15 @@
208208
.jqm-demos .jqm-list .ui-btn.ui-btn-active {
209209
color: #fff;
210210
}
211-
.jqm-demos .jqm-list .ui-li-divider {
211+
.jqm-demos .jqm-list .ui-listview-item-divider {
212212
color: #3eb249;
213213
}
214214

215215
/* Navmenu */
216216
.jqm-navmenu-panel .ui-listview > li .ui-collapsible-heading {
217217
margin: 0;
218218
}
219-
.jqm-navmenu-panel .ui-collapsible.ui-li-static {
219+
.jqm-navmenu-panel .ui-collapsible.ui-listview-item-static {
220220
padding: 0;
221221
border: none !important;
222222
}

‎demos/backbone-requirejs/backbone-require.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h1>Vehicles</h1>
7171

7272
<% _.each( collection.toJSON(), function( category, id ) { %>
7373

74-
<li class="ui-li-static">
74+
<li class="ui-listview-item-static">
7575
<%= category.type %>
7676
</li>
7777

‎demos/listview-autodividers-linkbar/autodividers-linkbar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $.mobile.document.on( "pagecreate", "#demo-page", function(){
44
$.mobile.document.on( "click", "#sorter li", function() {
55
var top,
66
letter = $( this ).text(),
7-
divider = $( "#sortedList" ).find( "li.ui-li-divider:contains(" + letter + ")" );
7+
divider = $( "#sortedList" ).find( "li.ui-listview-item-divider:contains(" + letter + ")" );
88

99
if ( divider.length > 0 ) {
1010
top = divider.offset().top;
@@ -14,9 +14,9 @@ $.mobile.document.on( "pagecreate", "#demo-page", function(){
1414
}
1515
});
1616
$( "#sorter li" ).hover(function() {
17-
$( this ).addClass( "ui-btn" ).removeClass( "ui-li-static" );
17+
$( this ).addClass( "ui-btn" ).removeClass( "ui-listview-item-static" );
1818
}, function() {
19-
$( this ).removeClass( "ui-btn" ).addClass( "ui-li-static" );
19+
$( this ).removeClass( "ui-btn" ).addClass( "ui-listview-item-static" );
2020
});
2121
});
2222
$( function(){

‎demos/listview-collapsible-item-flat/index.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
<script src="../_assets/js/"></script>
1313
<script src="../../js/"></script>
1414
<style id="collapsible-list-item-style-flat">
15-
.ui-li-static.ui-collapsible > .ui-collapsible-heading {
15+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-heading {
1616
margin: 0;
1717
}
1818

19-
.ui-li-static.ui-collapsible {
19+
.ui-listview-item-static.ui-collapsible {
2020
padding: 0;
2121
}
2222

23-
.ui-li-static.ui-collapsible > .ui-collapsible-heading > .ui-btn {
23+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-heading > .ui-btn {
2424
border-top-width: 0;
2525
}
2626

27-
.ui-li-static.ui-collapsible > .ui-collapsible-heading.ui-collapsible-heading-collapsed > .ui-btn,
28-
.ui-li-static.ui-collapsible > .ui-collapsible-content {
27+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-heading.ui-collapsible-heading-collapsed > .ui-btn,
28+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content {
2929
border-bottom-width: 0;
3030
}
3131
</style>

‎demos/listview-collapsible-item-indented/index.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,47 @@
1313
<script src="../../js/"></script>
1414
<style id="collapsible-list-item-style">
1515
/* Basic settings */
16-
.ui-li-static.ui-collapsible {
16+
.ui-listview-item-static.ui-collapsible {
1717
padding: 0;
1818
}
1919

20-
.ui-li-static.ui-collapsible > .ui-collapsible-content > .ui-listview,
21-
.ui-li-static.ui-collapsible > .ui-collapsible-heading {
20+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content > .ui-listview,
21+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-heading {
2222
margin: 0;
2323
}
2424

25-
.ui-li-static.ui-collapsible > .ui-collapsible-content {
25+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content {
2626
padding-top: 0;
2727
padding-bottom: 0;
2828
padding-right: 0;
2929
border-bottom-width: 0;
3030
}
3131

3232
/* collapse vertical borders */
33-
.ui-li-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li.ui-last-child,
34-
.ui-li-static.ui-collapsible.ui-collapsible-collapsed > .ui-collapsible-heading > a.ui-btn {
33+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li.ui-last-child,
34+
.ui-listview-item-static.ui-collapsible.ui-collapsible-collapsed > .ui-collapsible-heading > a.ui-btn {
3535
border-bottom-width: 0;
3636
}
3737

38-
.ui-li-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li.ui-first-child,
39-
.ui-li-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li.ui-first-child > a.ui-btn,
40-
.ui-li-static.ui-collapsible > .ui-collapsible-heading > a.ui-btn {
38+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li.ui-first-child,
39+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li.ui-first-child > a.ui-btn,
40+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-heading > a.ui-btn {
4141
border-top-width: 0;
4242
}
4343

4444
/* Remove right borders */
45-
.ui-li-static.ui-collapsible > .ui-collapsible-heading > a.ui-btn,
46-
.ui-li-static.ui-collapsible > .ui-collapsible-content > .ui-listview > .ui-li-static,
47-
.ui-li-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li > a.ui-btn,
48-
.ui-li-static.ui-collapsible > .ui-collapsible-content {
45+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-heading > a.ui-btn,
46+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content > .ui-listview > .ui-listview-item-static,
47+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content > .ui-listview > li > a.ui-btn,
48+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content {
4949
border-right-width: 0;
5050
}
5151

5252
/* Remove left borders */
5353
/* Here, we need class ui-listview-outer to identify the outermost listview */
54-
.ui-listview-outer > .ui-li-static.ui-collapsible .ui-li-static.ui-collapsible.ui-collapsible,
55-
.ui-listview-outer > .ui-li-static.ui-collapsible > .ui-collapsible-heading > a.ui-btn,
56-
.ui-li-static.ui-collapsible > .ui-collapsible-content {
54+
.ui-listview-outer > .ui-listview-item-static.ui-collapsible .ui-listview-item-static.ui-collapsible.ui-collapsible,
55+
.ui-listview-outer > .ui-listview-item-static.ui-collapsible > .ui-collapsible-heading > a.ui-btn,
56+
.ui-listview-item-static.ui-collapsible > .ui-collapsible-content {
5757
border-left-width: 0;
5858
}
5959
</style>

‎demos/panel-styling/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
.ui-listview > li .ui-collapsible-heading {
3737
margin: 0;
3838
}
39-
.ui-collapsible.ui-li-static {
39+
.ui-collapsible.ui-listview-item-static {
4040
padding: 0;
4141
border: none !important;
4242
}

‎demos/swipe-list/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ function confirmAndDelete( listitem, transition ) {
115115
border-bottom-width: 1px;
116116
}
117117
/* Hide the delete button on touch devices */
118-
ul.touch li.ui-li-has-alt a.delete {
118+
ul.touch li.ui-listview-item-has-alt a.delete {
119119
display: none;
120120
}
121-
ul.touch li.ui-li-has-alt a.ui-btn {
121+
ul.touch li.ui-listview-item-has-alt a.ui-btn {
122122
margin-right:0;
123123
}
124124
/* Styling for the popup */

‎demos/theme-classic/theme-classic.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ html head + body .ui-body-e.ui-focus {
13051305
}
13061306

13071307
/* Unset background gradient */
1308-
.ui-li-static,
1308+
.ui-listview-item-static,
13091309
.ui-collapsible-content,
13101310
.ui-input-text,
13111311
.ui-input-search,

‎external/jquery-ui/tabs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ return $.widget( "ui.tabs", {
287287
return this.active;
288288
case "ui-tabs-nav":
289289
return this.tablist;
290-
case "ui-tab"
290+
case "ui-tab":
291291
return this.tabs;
292292
case "ui-tabs-anchor":
293293
return this.anchors;

‎js/widgets/filterable.backcompat.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var replaceSetOptions = function( self, orig ) {
1919
self._syncTextInputOptions( options );
2020
};
2121
},
22-
rDividerListItem = /(^|\s)ui-li-divider(\s|$)/,
22+
rDividerListItem = /(^|\s)ui-listview-item-divider(\s|$)/,
2323
origDefaultFilterCallback = $.mobile.filterable.prototype.options.filterCallback;
2424

2525
// Override the default filter callback with one that does not hide list dividers

‎js/widgets/forms/select.custom.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ define( [
2121
//>>excludeEnd("jqmBuildExclude");
2222
(function( $, undefined ) {
2323

24-
var unfocusableItemSelector = ".ui-disabled,.ui-state-disabled,.ui-li-divider,.ui-screen-hidden,:jqmData(role='placeholder')",
24+
var unfocusableItemSelector = ".ui-disabled,.ui-state-disabled,.ui-listview-item-divider,.ui-screen-hidden,:jqmData(role='placeholder')",
2525
goToAdjacentItem = function( item, target, direction ) {
2626
var adjacent = item[ direction + "All" ]()
2727
.not( unfocusableItemSelector )
@@ -164,7 +164,7 @@ $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
164164
// We need to grab the clicked item the hard way, because the list may have been rebuilt
165165
if ( this.isMultiple ) {
166166
this.select.trigger( "change" );
167-
this.list.find( "li:not(.ui-li-divider)" ).eq( newIndex )
167+
this.list.find( "li:not(.ui-listview-item-divider)" ).eq( newIndex )
168168
.find( "a" ).first().focus();
169169
}
170170
else {
@@ -265,7 +265,7 @@ $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
265265
"focusin": "_handleListFocus",
266266
"focusout": "_handleListFocus",
267267
"keydown": "_handleListKeydown",
268-
"click li:not(.ui-disabled,.ui-state-disabled,.ui-li-divider)": "_handleListItemClick"
268+
"click li:not(.ui-disabled,.ui-state-disabled,.ui-listview-item-divider)": "_handleListItemClick"
269269
});
270270

271271
// button refocus ensures proper height calculation
@@ -326,7 +326,7 @@ $.widget( "mobile.selectmenu", $.mobile.selectmenu, {
326326
self.setButtonText();
327327
self.setButtonCount();
328328

329-
self.list.find( "li:not(.ui-li-divider)" )
329+
self.list.find( "li:not(.ui-listview-item-divider)" )
330330
.find( "a" ).removeClass( $.mobile.activeBtnClass ).end()
331331
.attr( "aria-selected", false )
332332
.each(function( i ) {

‎js/widgets/listview.hidedividers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define( [ "jquery", "./listview" ], function( jQuery ) {
66
//>>excludeEnd("jqmBuildExclude");
77
(function( $, undefined ) {
88

9-
var rdivider = /(^|\s)ui-li-divider($|\s)/,
9+
var rdivider = /(^|\s)ui-listview-item-divider($|\s)/,
1010
rhidden = /(^|\s)ui-screen-hidden($|\s)/;
1111

1212
$.widget( "mobile.listview", $.mobile.listview, {

0 commit comments

Comments
 (0)