Listview: Remove countTheme and deprecated stuff

Author: Gabriel Schulhof

js/widgets/listview.js

@@ -15,7 +15,6 @@ $.widget( "mobile.listview", $.extend( {
 
 	options: {
 		theme: null,
-		countTheme: null, /* Deprecated in 1.4 */
 		dividerTheme: null,
 		icon: "carat-r",
 		splitIcon: "carat-r",
@@ -42,29 +41,6 @@ $.widget( "mobile.listview", $.extend( {
 		t.refresh( true );
 	},
 
-	// TODO: Remove in 1.5
-	_findFirstElementByTagName: function( ele, nextProp, lcName, ucName ) {
-		var dict = {};
-		dict[ lcName ] = dict[ ucName ] = true;
-		while ( ele ) {
-			if ( dict[ ele.nodeName ] ) {
-				return ele;
-			}
-			ele = ele[ nextProp ];
-		}
-		return null;
-	},
-	// TODO: Remove in 1.5
-	_addThumbClasses: function( containers ) {
-		var i, img, len = containers.length;
-		for ( i = 0; i < len; i++ ) {
-			img = $( this._findFirstElementByTagName( containers[ i ].firstChild, "nextSibling", "img", "IMG" ) );
-			if ( img.length ) {
-				$( this._findFirstElementByTagName( img[ 0 ].parentNode, "parentNode", "li", "LI" ) ).addClass( img.hasClass( "ui-li-icon" ) ? "ui-li-has-icon" : "ui-li-has-thumb" );
-			}
-		}
-	},
-
 	_getChildrenByTagName: function( ele, lcName, ucName ) {
 		var results = [],
 			dict = {};
@@ -91,9 +67,7 @@ $.widget( "mobile.listview", $.extend( {
 			ol = !!$.nodeName( $list[ 0 ], "ol" ),
 			start = $list.attr( "start" ),
 			itemClassDict = {},
-			countBubbles = $list.find( ".ui-li-count" ),
-			countTheme = getAttr( $list[ 0 ], "counttheme" ) || this.options.countTheme,
-			countThemeClass = countTheme ? "ui-body-" + countTheme : "ui-body-inherit";
+			countBubbles = $list.find( ".ui-li-count" );
 
 		if ( o.theme ) {
 			$list.addClass( "ui-group-theme-" + o.theme );
@@ -123,9 +97,6 @@ $.widget( "mobile.listview", $.extend( {
 					itemIcon = getAttr( item[ 0 ], "icon" );
 					icon = ( itemIcon === false ) ? false : ( itemIcon || o.icon );
 
-					// TODO: Remove in 1.5 together with links.js (links.js / .ui-link deprecated in 1.4)
-					a.removeClass( "ui-link" );
-
 					buttonClass = "ui-btn";
 
 					if ( itemTheme ) {
@@ -195,13 +166,6 @@ $.widget( "mobile.listview", $.extend( {
 		countBubbles.each( function() {
 			$( this ).closest( "li" ).addClass( "ui-li-has-count" );
 		});
-		if ( countThemeClass ) {
-			countBubbles.not( "[class*='ui-body-']" ).addClass( countThemeClass );
-		}
-
-		// Deprecated in 1.4. From 1.5 you have to add class ui-li-has-thumb or ui-li-has-icon to the LI.
-		this._addThumbClasses( li );
-		this._addThumbClasses( li.find( ".ui-btn" ) );
 
 		this._afterListviewRefresh();
 

tests/integration/listview/index.html

@@ -246,8 +246,6 @@ <h1>Basic List View</h1>
 			<li>Static LI with counter ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------<span class="ui-li-count">123</span></li>
 			<li>Static LI without counter ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</li>
 			<li><a href="#">Link LI with split button -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</a><a href="#">Split</a></li>
-			<li><a href="#"><img class="ui-li-icon">Link LI with icon -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</a></li>
-			<li><a href="#"><img>Link LI with thumb -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</a></li>
 		</ol>
 		</div>
 	</div>

tests/integration/listview/listview_core.js

@@ -92,8 +92,6 @@
 				ok( !items.eq( 4 ).hasClass( "ui-li-has-count"), "Fifth LI should NOT have ui-li-has-count class" );
 				ok( !items.eq( 4 ).find( "a" ).first().hasClass( "ui-icon-carat-r"), "Fifth LI A should NOT have ui-icon-carat-r class" );
 				ok( items.eq( 5 ).hasClass( "ui-li-has-alt"), "Sixth LI should have ui-li-has-alt class" );
-				ok( items.eq( 6 ).hasClass( "ui-li-has-icon"), "Seventh LI should have ui-li-has-icon class" );
-				ok( items.eq( 7 ).hasClass( "ui-li-has-thumb"), "Eight LI should have ui-li-has-thumb class" );
 				start();
 			}
 		]);
@@ -424,15 +422,6 @@
 		]);
 	});
 
-	test( "Refresh applies thumb styling", function(){
-		var ul = $('.ui-page-active ul');
-
-		ul.append("<li id='fiz'><img/></li>");
-		ok(!ul.find("#fiz").hasClass("ui-li-has-thumb"));
-		ul.listview('refresh');
-		ok(ul.find("#fiz").hasClass("ui-li-has-thumb"));
-	});
-
 	module( "Programmatically generated list items", {
 		setup: function(){
 			var label, item,