accordion: all classes added should have a 'ui-' prefix (fixes #3705)

2 files changed, 5 insertions, 5 deletions

diff --git a/themes/base/ui.accordion.css b/themes/base/ui.accordion.css
index 3d977ae02..7af23c4e5 100644
--- a/themes/base/ui.accordion.css
+++ b/themes/base/ui.accordion.css
@@ -2,7 +2,7 @@
 ----------------------------------*/
 .ui-accordion-group {margin-bottom: 1px;}
 .ui-accordion-header { cursor: pointer; position: relative;  }
-.selected .ui-accordion-header { border-bottom: 0; }
+.ui-accordion-selected .ui-accordion-header { border-bottom: 0; }
 .ui-accordion .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
 .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
 .ui-accordion-content-wrap { border-top: 0; margin-top: -1px; position: relative; top: 1px; }
diff --git a/ui/ui.accordion.js b/ui/ui.accordion.js
index 42ed3e3bd..cfae8d295 100644
--- a/ui/ui.accordion.js
+++ b/ui/ui.accordion.js
@@ -24,7 +24,7 @@ $.widget("ui.accordion", {
 					options.active = current;
 				} else {
 					options.active = current.parent().parent().prev();
-					current.addClass("current");
+					current.addClass("ui-accordion-current");
 				}
 			}
 		}
@@ -38,7 +38,7 @@ $.widget("ui.accordion", {
 		headers.next().wrap("<div></div>").addClass("ui-accordion-content").parent().addClass("ui-accordion-content-wrap ui-helper-reset ui-widget-content ui-corner-bottom");
 
 		var active = options.active = findActive(headers, options.active).toggleClass("ui-state-default").toggleClass("ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");
-		active.parent().addClass("selected");
+		active.parent().addClass(options.selectedClass);
 		$("<span/>").addClass("ui-icon " + this.options.icons.header).prependTo(headers);
 		active.find(".ui-icon").toggleClass(this.options.icons.header).toggleClass(this.options.icons.headerSelected);
 
@@ -86,7 +86,7 @@ $.widget("ui.accordion", {
 	destroy: function() {
 		this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role").unbind(".accordion");
 		$.removeData(this.element[0], "accordion");
-		var groups = this.element.children().removeClass("ui-accordion-group selected");
+		var groups = this.element.children().removeClass("ui-accordion-group "+this.options.selectedClass);
 		var headers = this.options.headers.unbind(".accordion").removeClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-corner-top")
 			.removeAttr("role").removeAttr("aria-expanded").removeAttr("tabindex");
 		headers.find("a").removeAttr("tabindex");
@@ -354,7 +354,7 @@ $.extend($.ui.accordion, {
 			return this.href.toLowerCase() == location.href.toLowerCase();
 		},
 		running: 0,
-		selectedClass: "selected"
+		selectedClass: "ui-accordion-selected"
 	},
 	animations: {
 		slide: function(options, additions) {