Accordion: Fixed back-compat for icons.headerSelected when icons opti…

…on is null.
pjw91 · Nov 16, 2011 · e5464f8 · e5464f8
1 parent f0f54e3
commit e5464f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/demos/accordion/custom-icons.html b/demos/accordion/custom-icons.html
@@ -20,7 +20,7 @@
 			icons: icons
 		});
 		$( "#toggle" ).button().toggle(function() {
-			$( "#accordion" ).accordion( "option", "icons", false );
+			$( "#accordion" ).accordion( "option", "icons", null );
 		}, function() {
 			$( "#accordion" ).accordion( "option", "icons", icons );
 		});

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
@@ -628,8 +628,10 @@ if ( $.uiBackCompat !== false ) {
 
 		var _createIcons = prototype._createIcons;
 		prototype._createIcons = function() {
-			this.options.icons.activeHeader = this.options.icons.activeHeader ||
-				this.options.icons.headerSelected;
+			if ( this.options.icons ) {
+				this.options.icons.activeHeader = this.options.icons.activeHeader ||
+					this.options.icons.headerSelected;
+			}
 			_createIcons.call( this );
 		};
 	}( jQuery, jQuery.ui.accordion.prototype ) );