Merge pull request #51 from derralf/dropdown-bugfix

Fix dropdown fields

_config/config.yml

@@ -4,6 +4,7 @@ BootstrapForm:
   bootstrap_included: false
   jquery_included: false
   bootstrap_form_included: false
+  bootstrap_select_included: false
   inline_fields:
     - CheckboxField
     - FormAction

code/BootstrapDropdownField.php

@@ -1,39 +1,28 @@
 <?php
 
+/**
+ * Defines a FormField that uses the bootstrap-select JS plugin for making
+ * dropdown fields nice.
+ *
+ */
 class BootstrapDropdownField extends DropdownField {
-	protected $optionsList;
 
-	public function __construct($name, $title = NULL, $options = array(), $value = NULL) {
-		parent::__construct($name, $title,$options, $value);
-		$this->optionsList = $options;
 
-		return $this;
-	}
-
-	public function setOptions($opts) {
-		$this->optionsList = $opts;
-
-		return $this;
-	}
 
-	public function getOptions() {
-		$options = ArrayList::create();
-		$selectedValue = $this->Value();
-		foreach ($this->optionsList as $val => $label) {
-			$isSelected = $selectedValue == (string) $val;
-			$options->push(ArrayData::create(array(
-				'Label' => $label,
-				'Value' => $val,
-				'Selected' => $isSelected
-			)));
+	/**
+	 * Builds the form field, sets default attributes, and includes JS
+	 *
+	 * @param array $attributes The attributes to include on the formfield
+	 * @return SSViewer
+	 */
+	public function FieldHolder($attributes = array ()) {
+		if(!Config::inst()->get('BootstrapForm', 'bootstrap_select_included')) {
+			$current_locale = (class_exists('Translatable')) ? Translatable::get_current_locale() : i18n::get_locale();
+			Requirements::javascript(BOOTSTRAP_FORMS_DIR."/javascript/bootstrap-select/js/bootstrap-select.min.js");
+			Requirements::javascript(BOOTSTRAP_FORMS_DIR."/javascript/bootstrap-select/js/i18n/defaults-{$current_locale}.js");
+			Requirements::css(BOOTSTRAP_FORMS_DIR."/javascript/bootstrap-select/css/bootstrap-select.min.css");
 		}
-
-		return $options;
-	}
-
-	public function Field($attributes = array()) {
-		Requirements::javascript(BOOTSTRAP_FORMS_DIR . "/javascript/bootstrap_forms.js");
-
-		return $this->renderWith('BootstrapDropdownField');
+		$this->addExtraClass('selectpicker');
+		return parent::FieldHolder($attributes);
 	}
 }

code/ChosenDropdownField.php

@@ -38,12 +38,20 @@ public function setSearchThreshold($num) {
 	 * @return SSViewer
 	 */
 	public function FieldHolder($attributes = array ()) {
-		Requirements::javascript(FRAMEWORK_DIR."/admin/thirdparty/chosen/chosen/chosen.jquery.js");
-		Requirements::css(FRAMEWORK_DIR."/admin/thirdparty/chosen/chosen/chosen.css");
+
+		if(!Config::inst()->get('BootstrapForm', 'jquery_included')) {
+			Requirements::javascript(THIRDPARTY_DIR."/jquery/jquery.js");
+			Requirements::javascript(FRAMEWORK_DIR."/admin/thirdparty/chosen/chosen/chosen.jquery.js");
+			Requirements::css(FRAMEWORK_DIR."/admin/thirdparty/chosen/chosen/chosen.css");
+		} else {
+			Requirements::javascript(BOOTSTRAP_FORMS_DIR."/javascript/chosen/chosen.jquery.js");
+			Requirements::css(BOOTSTRAP_FORMS_DIR."/javascript/chosen/chosen.css");
+		}
+
 		$this->addExtraClass('chosen');
 		if(!$this->getAttribute('data-search-threshold')) {
 			$this->setSearchThreshold(self::$default_search_threshold);
 		}
 		return parent::FieldHolder($attributes);
 	}
-}
+}