r3511 committed - Update accordion for new widget factory.
Revision: 3511
Author: scott.gonzalez
Date: Tue Dec 22 19:45:50 2009
Log: Update accordion for new widget factory.
http://code.google.com/p/jquery-ui/source/detail?r=3511
Modified:
/branches/dev/tests/unit/accordion/accordion_core.js
/branches/dev/tests/unit/accordion/accordion_options.js
/branches/dev/tests/unit/testsuite.js
/branches/dev/ui/jquery.ui.accordion.js
=======================================
--- /branches/dev/tests/unit/accordion/accordion_core.js Tue Sep 15
01:33:28 2009
+++ /branches/dev/tests/unit/accordion/accordion_core.js Tue Dec 22
19:45:50 2009
@@ -5,7 +5,7 @@
(function($) {
-jQuery.ui.accordion.defaults.animated = false;
+$.ui.accordion.prototype.options.animated = false;
function state(accordion) {
var args = $.makeArray(arguments).slice(1);
=======================================
--- /branches/dev/tests/unit/accordion/accordion_options.js Fri Dec 18
02:49:36 2009
+++ /branches/dev/tests/unit/accordion/accordion_options.js Tue Dec 22
19:45:50 2009
@@ -138,7 +138,7 @@
icons: false
});
icons(false);
- list.accordion("option", "icons", $.ui.accordion.defaults.icons);
+ list.accordion("option", "icons", $.ui.accordion.prototype.options.icons);
icons(true);
list.accordion("option", "icons", false);
icons(false);
=======================================
--- /branches/dev/tests/unit/testsuite.js Tue Sep 22 00:54:11 2009
+++ /branches/dev/tests/unit/testsuite.js Tue Dec 22 19:45:50 2009
@@ -3,8 +3,7 @@
function testWidgetDefaults(widget, defaults) {
var pluginDefaults = $.extend({},
- $.widget.defaults,
- $.ui[widget].defaults
+ $.ui[widget].prototype.options
);
// ensure that all defualts have the correct value
=======================================
--- /branches/dev/ui/jquery.ui.accordion.js Wed Dec 16 17:44:16 2009
+++ /branches/dev/ui/jquery.ui.accordion.js Tue Dec 22 19:45:50 2009
@@ -14,7 +14,24 @@
(function($) {
$.widget("ui.accordion", {
-
+ options: {
+ active: 0,
+ animated: 'slide',
+ autoHeight: true,
+ clearStyle: false,
+ collapsible: false,
+ event: "click",
+ fillSpace: false,
+ header: "> li > :first-child,> :not(li):even",
+ icons: {
+ header: "ui-icon-triangle-1-e",
+ headerSelected: "ui-icon-triangle-1-s"
+ },
+ navigation: false,
+ navigationFilter: function() {
+ return this.href.toLowerCase() == location.href.toLowerCase();
+ }
+ },
_init: function() {
var o = this.options, self = this;
@@ -422,24 +439,6 @@
$.extend($.ui.accordion, {
version: "@VERSION",
- defaults: {
- active: 0,
- animated: 'slide',
- autoHeight: true,
- clearStyle: false,
- collapsible: false,
- event: "click",
- fillSpace: false,
- header: "> li > :first-child,> :not(li):even",
- icons: {
- header: "ui-icon-triangle-1-e",
- headerSelected: "ui-icon-triangle-1-s"
- },
- navigation: false,
- navigationFilter: function() {
- return this.href.toLowerCase() == location.href.toLowerCase();
- }
- },
animations: {
slide: function(options, additions) {
options = $.extend({
--