API CHANGE Removed 'showdropdown' option from TimeField, use custom l…

…ibraries instead
silverstripe · Oct 7, 2011 · 585a8bc · 585a8bc
1 parent aa60201
commit 585a8bc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 180 deletions.
diff --git a/css/TimeField_dropdown.css b/css/TimeField_dropdown.css
diff --git a/forms/TimeField.php b/forms/TimeField.php
@@ -2,9 +2,7 @@
 require_once 'Zend/Date.php';
 
 /**
- * Form field to display editable time values in an <input type="text">
+ * Form field to display editable time values in an <input type="text"> field. 
- * field. Can optionally display a dropdown with predefined time ranges
- * through `setConfig('showdropdown', true)`.
  * 
  * # Configuration
  * 
@@ -13,23 +11,19 @@
  *    through {@link Zend_Locale_Format::getTimeFormat()}.
  * - 'use_strtotime' (boolean): Accept values in PHP's built-in strtotime() notation, in addition
  *    to the format specified in `timeformat`. Example inputs: 'now', '11pm', '23:59:59'.
- * - 'showdropdown': Show a dropdown with suggested date values.
- *    CAUTION: The dropdown does not support localization.
  * 
  * # Localization
  * 
  * See {@link DateField}
  * 
  * @todo Timezone support
- * @todo 'showdropdown' localization
  *
  * @package forms
  * @subpackage fields-datetime
  */
 class TimeField extends TextField {
 
 	protected $config = array(
-		'showdropdown' => false,
 		'timeformat' => 'HH:mm:ss',
 		'use_strtotime' => true,
 		'datavalueformat' => 'HH:mm:ss'
@@ -59,33 +53,6 @@ function __construct($name, $title = null, $value = ""){
 		parent::__construct($name,$title,$value);
 	}
 
-	function Field() {
-		$html = parent::Field();
-
-		$html = $this->FieldDriver($html);
-
-		return $html;
-	}
-
-	/**
-	 * Internal volatile API.
-	 * 
-	 * @see DateField->FieldDriver()
-	 */
-	protected function FieldDriver($html) {
-		if($this->getConfig('showdropdown')) {
-			Requirements::javascript(THIRDPARTY_DIR . '/behaviour/behaviour.js');
-			Requirements::javascript(SAPPHIRE_DIR . '/javascript/TimeField_dropdown.js');
-			Requirements::css(SAPPHIRE_DIR . '/css/TimeField_dropdown.css');
-
-			$html .= sprintf('<img class="timeIcon" src="sapphire/images/clock-icon.gif" id="%s-icon"/>', $this->id());
-			$html .= sprintf('<div class="dropdownpopup" id="%s-dropdowntime"></div>', $this->id());
-			$html = '<div class="dropdowntime">' . $html . '</div>';
-		}
-
-		return $html;
-	}
-
 	/**
 	 * Sets the internal value to ISO date format.
 	 * 

diff --git a/javascript/TimeField_dropdown.js b/javascript/TimeField_dropdown.js