silverorange · gauthierm · Jul 27, 2017 · Dec 30, 2017 · Dec 31, 2017 · Dec 31, 2017
diff --git a/Swat/SwatAbstractOverlay.php b/Swat/SwatAbstractOverlay.php
@@ -49,19 +49,7 @@ abstract class SwatAbstractOverlay extends SwatInputControl implements SwatState
     public function __construct($id = null)
     {
         parent::__construct($id);
-
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('dom', 'event', 'container'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-abstract-overlay.js'
-        );
-
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-z-index-manager.js'
-        );
     }
 
     // }}}

diff --git a/Swat/SwatAccordion.php b/Swat/SwatAccordion.php
@@ -43,14 +43,7 @@ class SwatAccordion extends SwatNoteBook
     public function __construct($id = null)
     {
         parent::__construct($id);
-
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('yahoo', 'dom', 'event', 'animation'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addStyleSheet('packages/swat/styles/swat-accordion.css');
-        $this->addJavaScript('packages/swat/javascript/swat-accordion.js');
     }
 
     // }}}

diff --git a/Swat/SwatActions.php b/Swat/SwatActions.php
@@ -79,26 +79,6 @@ class SwatActions extends SwatControl implements SwatUIParent
      */
     private $selector;
 
-    // }}}
-    // {{{ public function __construct()
-
-    /**
-     * Creates a new actions list
-     *
-     * @param string $id a non-visible unique id for this widget.
-     *
-     * @see SwatWidget::__construct()
-     */
-    public function __construct($id = null)
-    {
-        parent::__construct($id);
-
-        $yui = new SwatYUI(array('dom', 'event', 'animation'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-        $this->addJavaScript('packages/swat/javascript/swat-actions.js');
-        $this->addStyleSheet('packages/swat/styles/swat-actions.css');
-    }
-
     // }}}
     // {{{ public function init()
 

diff --git a/Swat/SwatButton.php b/Swat/SwatButton.php
@@ -116,11 +116,6 @@ class SwatButton extends SwatInputControl
     public function __construct($id = null)
     {
         parent::__construct($id);
-
-        $yui = new SwatYUI(array('dom', 'event', 'animation'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-        $this->addJavaScript('packages/swat/javascript/swat-button.js');
-
         $this->requires_id = true;
     }
 
@@ -365,36 +360,19 @@ protected function getJavaScriptClass()
      */
     protected function getInlineJavaScript()
     {
-        $show_processing_throbber = $this->show_processing_throbber
-            ? 'true'
-            : 'false';
+        $options = [
+            'show_processing_throbber' => $this->show_processing_throbber,
+            'processing_message' => $this->processing_throbber_message,
+            'confirmation_message' => $this->confirmation_message,
+        ];
 
-        $javascript = sprintf(
-            "var %s_obj = new %s('%s', %s);",
+        $javascript = sprintf("var %s_obj = new %s(%s, %s);",
             $this->id,
             $this->getJavaScriptClass(),
-            $this->id,
-            $show_processing_throbber
+            SwatString::quoteJavaScriptString($this->id),
+            json_encode($options)
         );
 
-        if ($this->show_processing_throbber) {
-            $javascript .= sprintf(
-                "\n%s_obj.setProcessingMessage(%s);",
-                $this->id,
-                SwatString::quoteJavaScriptString(
-                    $this->processing_throbber_message
-                )
-            );
-        }
-
-        if ($this->confirmation_message !== null) {
-            $javascript .= sprintf(
-                "\n%s_obj.setConfirmationMessage(%s);",
-                $this->id,
-                SwatString::quoteJavaScriptString($this->confirmation_message)
-            );
-        }
-
         return $javascript;
     }
 

diff --git a/Swat/SwatCalendar.php b/Swat/SwatCalendar.php
@@ -41,17 +41,7 @@ class SwatCalendar extends SwatControl
     public function __construct($id = null)
     {
         parent::__construct($id);
-
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('dom', 'container'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addStyleSheet('packages/swat/styles/swat-calendar.css');
-        $this->addJavaScript('packages/swat/javascript/swat-calendar.js');
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-z-index-manager.js'
-        );
     }
 
     // }}}

diff --git a/Swat/SwatCascadeFlydown.php b/Swat/SwatCascadeFlydown.php
@@ -55,13 +55,7 @@ class SwatCascadeFlydown extends SwatFlydown
     public function __construct($id = null)
     {
         parent::__construct($id);
-
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addJavaScript('packages/swat/javascript/swat-cascade.js');
     }
 
     // }}}

diff --git a/Swat/SwatChangeOrder.php b/Swat/SwatChangeOrder.php
@@ -55,15 +55,6 @@ public function __construct($id = null)
     {
         parent::__construct($id);
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('dom', 'event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addStyleSheet('packages/swat/styles/swat-change-order.css');
-        $this->addJavaScript('packages/swat/javascript/swat-change-order.js');
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-z-index-manager.js'
-        );
     }
 
     // }}}

diff --git a/Swat/SwatCheckAll.php b/Swat/SwatCheckAll.php
@@ -73,9 +73,6 @@ public function __construct($id = null)
     {
         parent::__construct($id);
         $this->title = Swat::_('Select All');
-        $yui = new SwatYUI(array('event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-        $this->addJavaScript('packages/swat/javascript/swat-check-all.js');
     }
 
     // }}}

diff --git a/Swat/SwatCheckboxCellRenderer.php b/Swat/SwatCheckboxCellRenderer.php
@@ -90,12 +90,6 @@ public function __construct()
 
         $this->makePropertyStatic('id');
 
-        $yui = new SwatYUI(array('dom'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-checkbox-cell-renderer.js'
-        );
-
         // auto-generate an id to use if no id is set
         $this->id = $this->getUniqueId();
     }

diff --git a/Swat/SwatCheckboxEntryList.php b/Swat/SwatCheckboxEntryList.php
@@ -54,32 +54,6 @@ class SwatCheckboxEntryList extends SwatCheckboxList
      */
     protected $entry_widgets = array();
 
-    // }}}
-    // {{{ public function __construct()
-
-    /**
-     * Creates a new checkbox entry list
-     *
-     * @param string $id a non-visible unique id for this widget.
-     *
-     * @see SwatCheckboxList::__construct()
-     */
-    public function __construct($id = null)
-    {
-        parent::__construct($id);
-
-        $yui = new SwatYUI(array('dom', 'event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-checkbox-entry-list.js'
-        );
-
-        $this->addStyleSheet(
-            'packages/swat/styles/swat-checkbox-entry-list.css'
-        );
-    }
-
     // }}}
     // {{{ public function display()
 

diff --git a/Swat/SwatCheckboxList.php b/Swat/SwatCheckboxList.php
@@ -66,10 +66,6 @@ public function __construct($id = null)
     {
         parent::__construct($id);
         $this->requires_id = true;
-        $yui = new SwatYUI(array('event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-        $this->addJavaScript('packages/swat/javascript/swat-checkbox-list.js');
-        $this->addStyleSheet('packages/swat/styles/swat.css');
     }
 
     // }}}

diff --git a/Swat/SwatDateEntry.php b/Swat/SwatDateEntry.php
@@ -128,10 +128,6 @@ public function __construct($id = null)
         $this->setValidRange(-20, 20);
 
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-        $this->addJavaScript('packages/swat/javascript/swat-date-entry.js');
     }
 
     // }}}

diff --git a/Swat/SwatDetailsView.php b/Swat/SwatDetailsView.php
@@ -48,23 +48,6 @@ class SwatDetailsView extends SwatControl implements SwatUIParent
      */
     private $fields_by_id = array();
 
-    // }}}
-    // {{{ public function __construct()
-
-    /**
-     * Creates a new details view
-     *
-     * @param string $id a non-visible unique id for this widget.
-     *
-     * @see SwatWidget::__construct()
-     */
-    public function __construct($id = null)
-    {
-        parent::__construct($id);
-
-        $this->addStyleSheet('packages/swat/styles/swat-details-view.css');
-    }
-
     // }}}
     // {{{ public function init()
 

diff --git a/Swat/SwatDisclosure.php b/Swat/SwatDisclosure.php
@@ -39,12 +39,6 @@ public function __construct($id = null)
     {
         parent::__construct($id);
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('dom', 'animation'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addJavaScript('packages/swat/javascript/swat-disclosure.js');
-        $this->addStyleSheet('packages/swat/styles/swat-disclosure.css');
     }
 
     // }}}

diff --git a/Swat/SwatFieldset.php b/Swat/SwatFieldset.php
@@ -53,13 +53,7 @@ class SwatFieldset extends SwatDisplayableContainer implements SwatTitleable
     public function __construct($id = null)
     {
         parent::__construct($id);
-
         $this->requires_id = true;
-
-        // JavaScript for IE peekaboo hack
-        $yui = new SwatYUI(array('event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-        $this->addJavaScript('packages/swat/javascript/swat-fieldset.js');
     }
 
     // }}}

diff --git a/Swat/SwatForm.php b/Swat/SwatForm.php
@@ -256,8 +256,6 @@ public function __construct($id = null)
         }
 
         $this->requires_id = true;
-
-        $this->addJavaScript('packages/swat/javascript/swat-form.js');
     }
 
     // }}}
@@ -325,13 +323,6 @@ public function display()
         $this->displayHiddenFields();
         $form_tag->close();
 
-        if ($this->connection_close_uri != '') {
-            $yui = new SwatYUI(array('event'));
-            $this->html_head_entry_set->addEntrySet(
-                $yui->getHtmlHeadEntrySet()
-            );
-        }
-
         Swat::displayInlineJavaScript($this->getInlineJavaScript());
     }
 

diff --git a/Swat/SwatFrameDisclosure.php b/Swat/SwatFrameDisclosure.php
@@ -9,23 +9,6 @@
  */
 class SwatFrameDisclosure extends SwatDisclosure
 {
-    // {{{ public function __construct()
-
-    /**
-     * Creates a new frame disclosure container
-     *
-     * @param string $id a non-visible unique id for this widget.
-     *
-     * @see SwatWidget::__construct()
-     */
-    public function __construct($id = null)
-    {
-        parent::__construct($id);
-
-        $this->addStyleSheet('packages/swat/styles/swat-frame-disclosure.css');
-    }
-
-    // }}}
     // {{{ public function display()
 
     /**

diff --git a/Swat/SwatGroupedFlydown.php b/Swat/SwatGroupedFlydown.php
@@ -24,8 +24,16 @@ class SwatGroupedFlydown extends SwatTreeFlydown
      *
      * @throws SwatException if the tree more than 3 levels deep.
      */
-    public function setTree(SwatTreeFlydownNode $tree)
+    public function setTree($tree)
     {
+        if (!$tree instanceof SwatTreeFlydownNode) {
+            throw new SwatInvalidClassException(
+                'Tree must be an intance of SwatDataTreeNode.',
+                0,
+                $tree
+            );
+        }
+
         $this->checkTree($tree);
         parent::setTree($tree);
     }

diff --git a/Swat/SwatImageCropper.php b/Swat/SwatImageCropper.php
@@ -142,13 +142,7 @@ class SwatImageCropper extends SwatInputControl
     public function __construct($id = null)
     {
         parent::__construct($id);
-
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('imagecropper'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addJavaScript('packages/swat/javascript/swat-image-cropper.js');
     }
 
     // }}}

diff --git a/Swat/SwatImagePreviewDisplay.php b/Swat/SwatImagePreviewDisplay.php
@@ -153,24 +153,7 @@ class SwatImagePreviewDisplay extends SwatImageDisplay
     public function __construct($id = null)
     {
         parent::__construct($id);
-
         $this->requires_id = true;
-
-        $yui = new SwatYUI(array('dom', 'event'));
-        $this->html_head_entry_set->addEntrySet($yui->getHtmlHeadEntrySet());
-
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-z-index-manager.js'
-        );
-
-        $this->addJavaScript(
-            'packages/swat/javascript/swat-image-preview-display.js'
-        );
-
-        $this->addStyleSheet(
-            'packages/swat/styles/swat-image-preview-display.css'
-        );
-
         $this->title = Swat::_('View Larger Image');
     }