commit 7ee1b9eb8ac014e6e1cbb9263adcdcc029fb0161 Author: Nathan Haug Date: Tue Mar 12 11:26:18 2013 -0700 dialog_settings to dialog_options. diff --git a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php index 0c293ab..230c865 100644 --- a/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php +++ b/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php @@ -15,7 +15,7 @@ class OpenDialogCommand implements CommandInterface { /** - * Stores dialog-specific settings passed directly to jQuery UI dialogs. + * Stores dialog-specific options passed directly to jQuery UI dialogs. * * @var array */ @@ -30,22 +30,22 @@ class OpenDialogCommand implements CommandInterface { * The title of the dialog. * @param string $html * String of HTML that will be placed in the dialog - * @param array $dialog_settings - * An array of settings to be passed to the dialog implementation. Any + * @param array $dialog_options + * An array of options to be passed to the dialog implementation. Any * jQuery UI option can be used. See http://api.jqueryui.com/dialog. * @param array|null $settings * An optional array of other settings that will be passed to the behavior. */ - public function __construct($selector, $title, $html, array $dialog_settings = array(), $settings = NULL) { - $dialog_settings += array('title' => $title); + public function __construct($selector, $title, $html, array $dialog_options = array(), $settings = NULL) { + $dialog_options += array('title' => $title); $this->selector = $selector; $this->html = $html; - $this->dialogOptions = $dialog_settings; + $this->dialogOptions = $dialog_options; $this->settings = $settings; } /** - * Returns the dialog settings. + * Returns the dialog options. * * @return array */ @@ -54,22 +54,22 @@ public function getdialogOptions() { } /** - * Sets the dialog settings array. + * Sets the dialog options array. * - * @param array $dialog_settings + * @param array $dialog_options * An array of keys passed to the Drupal.dialog javascript object. */ - public function setdialogOptions($dialog_settings) { - $this->dialogOptions = $dialog_settings; + public function setdialogOptions($dialog_options) { + $this->dialogOptions = $dialog_options; } /** - * Sets a single dialog setting value. + * Sets a single dialog option value. * * @param string $key - * Key of the dialog setting. + * Key of the dialog option. * @param mixed $value - * The value of the setting. + * The value of the option. */ public function setDialogOption($key, $value) { $this->dialogOptions[$key] = $value; diff --git a/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php b/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php index bfb67c5..d2b31f6 100644 --- a/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php +++ b/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php @@ -20,14 +20,14 @@ class OpenModalDialogCommand extends OpenDialogCommand { * The title of the dialog. * @param string $html * String of HTML that will be placed in the dialog - * @param array $dialog_settings + * @param array $dialog_options * An array of settings to be passed to the dialog implementation. Any * jQuery UI option can be used. See http://api.jqueryui.com/dialog. * @param array|null $settings * An optional array of other settings that will be passed to the behavior. */ - public function __construct($title, $html, array $dialog_settings = array(), $settings = NULL) { - $dialog_settings['modal'] = TRUE; - return parent::__construct('#drupal-modal', $title, $html, $dialog_settings, $settings); + public function __construct($title, $html, array $dialog_options = array(), $settings = NULL) { + $dialog_options['modal'] = TRUE; + return parent::__construct('#drupal-modal', $title, $html, $dialog_options, $settings); } }