self.setOption ~> that.update

source/Ox.UI/js/Panel/Ox.CollapsePanel.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /*@
-Ox.CollapsePanel <f:Ox.Panel> CollapsePanel Object
+Ox.CollapsePanel <f:Ox.Element> CollapsePanel Object
     ([options[, self]]) -> <o> CollapsePanel Object
     options <o> Options object
         collapsed <b|false> collapsed state
@@ -14,7 +14,7 @@ Ox.CollapsePanel <f:Ox.Panel> CollapsePanel Object
 Ox.CollapsePanel = function(options, self) {
 
     self = self || {};
-    var that = Ox.Panel({}, self)
+    var that = Ox.Element({}, self)
             .defaults({
                 animate: true,
                 collapsed: false,
@@ -23,7 +23,18 @@ Ox.CollapsePanel = function(options, self) {
                 title: ''
             })
             .options(options)
-            .addClass('OxCollapsePanel');
+            .update({
+                collapsed: function() {
+                    // will be toggled again in toggleCollapsed
+                    self.options.collapsed = !self.options.collapsed;
+                    self.$button.toggle();
+                    toggleCollapsed();
+                },
+                title: function() {
+                    self.$title.html(self.options.title);
+                }
+            })
+            .addClass('OxPanel OxCollapsePanel');
 
     self.$titlebar = Ox.Bar({
             orientation: 'horizontal',
@@ -106,21 +117,6 @@ Ox.CollapsePanel = function(options, self) {
         });
     }
 
-    /*@
-    setOption <f> setOption
-        (key, value) -> <u> set key to value
-    @*/
-    self.setOption = function(key, value) {
-        if (key == 'collapsed') {
-            // will be toggled again in toggleCollapsed
-            self.options.collapsed = !self.options.collapsed;
-            self.$button.toggle();
-            toggleCollapsed();
-        } else if (key == 'title') {
-            self.$title.html(self.options.title);
-        }
-    };
-
     /*@
     update <f> Update panel when in collapsed state
     @*/

source/Ox.UI/js/Panel/Ox.Panel.js

@@ -1,15 +0,0 @@
-'use strict';
-
-/*@
-Ox.Panel <f:Ox.Element> Panel Object
-    ([options[, self]]) -> <f> Panel Object
-    options <o> Options object
-    self    <o> shared private variable
-@*/
-
-Ox.Panel = function(options, self) {
-    self = self || {};
-    var that = Ox.Element({}, self)
-            .addClass('OxPanel');
-    return that;
-};