Merge pull request #238 from dongilbert/bugfix-JForm

Clean up Form Package
joomla · Oct 22, 2013 · 8562f00 · 8562f00
2 parents 355a001 + b9f7aa3
commit 8562f00
Show file tree

Hide file tree

Showing 14 changed files with 260 additions and 819 deletions.
diff --git a/src/Joomla/Form/Field/Combo.php b/src/Joomla/Form/Field/Combo.php
diff --git a/src/Joomla/Form/Field/Language.php b/src/Joomla/Form/Field/Language.php
@@ -8,7 +8,6 @@
 
 namespace Joomla\Form;
 
-use Joomla\Html\Html;
 use Joomla\Language\LanguageHelper;
 
 /**

diff --git a/src/Joomla/Form/Field/Password.php b/src/Joomla/Form/Field/Password.php
@@ -8,8 +8,6 @@
 
 namespace Joomla\Form;
 
-use Joomla\Html\Html;
-
 /**
  * Form Field class for the Joomla Framework.
  * Text field for passwords
@@ -44,24 +42,9 @@ protected function getInput()
 		$auto		= ((string) $this->element['autocomplete'] == 'off') ? ' autocomplete="off"' : '';
 		$readonly	= ((string) $this->element['readonly'] == 'true') ? ' readonly="readonly"' : '';
 		$disabled	= ((string) $this->element['disabled'] == 'true') ? ' disabled="disabled"' : '';
-		$meter		= ((string) $this->element['strengthmeter'] == 'true');
-		$threshold	= $this->element['threshold'] ? (int) $this->element['threshold'] : 66;
 
 		$script = '';
 
-		if ($meter)
-		{
-			Html::_('script', 'system/passwordstrength.js', true, true);
-			$script = '<script type="text/javascript">new Form.PasswordStrength("' . $this->id . '",
-				{
-					threshold: ' . $threshold . ',
-					onUpdate: function(element, strength, threshold) {
-						element.set("data-passwordstrength", strength);
-					}
-				}
-			);</script>';
-		}
-
 		return '<input type="password" name="' . $this->name . '" id="' . $this->id . '"' .
 			' value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"' .
 			$auto . $class . $readonly . $disabled . $size . $maxLength . '/>' . $script;

diff --git a/src/Joomla/Form/Field/Sql.php b/src/Joomla/Form/Field/Sql.php
diff --git a/src/Joomla/Form/Field/Timezone.php b/src/Joomla/Form/Field/Timezone.php
@@ -8,8 +8,7 @@
 
 namespace Joomla\Form;
 
-use Joomla\Factory;
-use Joomla\Html\Html;
+use Joomla\Form\Html\Select;
 
 /**
  * Form Field class for the Joomla Framework.
@@ -46,15 +45,6 @@ protected function getGroups()
 	{
 		$groups = array();
 
-		$keyField = $this->element['key_field'] ? (string) $this->element['key_field'] : 'id';
-		$keyValue = $this->form->getValue($keyField);
-
-		// If the timezone is not set use the server setting.
-		if (strlen($this->value) == 0 && empty($keyValue))
-		{
-			$this->value = Factory::getConfig()->get('offset');
-		}
-
 		// Get the list of time zones from the server.
 		$zones = \DateTimeZone::listIdentifiers();
 
@@ -82,7 +72,7 @@ protected function getGroups()
 				// Only add options where a locale exists.
 				if (!empty($locale))
 				{
-					$groups[$group][$zone] = Html::_('select.option', $zone, str_replace('_', ' ', $locale), 'value', 'text', false);
+					$groups[$group][$zone] = Select::option($zone, str_replace('_', ' ', $locale), 'value', 'text', false);
 				}
 			}
 		}