From b01a7d77bd74efd873aaf4af3693c96209cefb2c Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Fri, 6 Sep 2019 15:42:10 -0400
Subject: [PATCH] Additional updates to InputfieldToggle

---
 .../Inputfield/InputfieldSelect.module        |   4 +-
 .../InputfieldToggle/InputfieldToggle.css     |  10 +-
 .../InputfieldToggle/InputfieldToggle.js      | 163 ++++++++++++------
 .../InputfieldToggle/InputfieldToggle.min.js  |   2 +-
 .../InputfieldToggle/InputfieldToggle.module  | 156 ++++++++---------
 5 files changed, 195 insertions(+), 140 deletions(-)

diff --git a/wire/modules/Inputfield/InputfieldSelect.module b/wire/modules/Inputfield/InputfieldSelect.module
index 25529c31..61814d26 100644
--- a/wire/modules/Inputfield/InputfieldSelect.module
+++ b/wire/modules/Inputfield/InputfieldSelect.module
@@ -608,7 +608,9 @@ class InputfieldSelect extends Inputfield {
 			}
 
 			$selected = $this->isOptionSelected($value) ? " selected='selected'" : '';
-			$attrs = $this->getOptionAttributesString($value);
+			$attrs = $this->getOptionAttributes($value);
+			unset($attrs['selected'], $attrs['checked'], $attrs['value']);
+			$attrs = $this->getOptionAttributesString($attrs);
 			$out .= 
 				"<option$selected $attrs value='" . htmlspecialchars($value, ENT_QUOTES, "UTF-8") . "'>" . 
 				$this->entityEncode($label) . 
diff --git a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.css b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.css
index 5da8e41c..6213e45d 100644
--- a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.css
+++ b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.css
@@ -19,6 +19,7 @@
 	text-align: center;
 	padding: 8px 16px;
 	margin-right: -1px;
+	margin-left: 0;
 	border: 1px solid rgba(0,0,0,0.1);
 	font-size: 16px; 
 }
@@ -27,10 +28,10 @@
 	cursor: pointer;
 }
 
-.InputfieldToggleGroup input:checked + label {
+.InputfieldToggleGroup label.InputfieldToggleCurrent, /* JS */
+.InputfieldToggleGroup input:checked + label { /* non-JS */
 	background-color: #999;
 	color: #fff;
-	box-shadow: none;
 }
 
 .InputfieldToggleGroup label:first-of-type {
@@ -41,3 +42,8 @@
 	border-radius: 0 4px 4px 0;
 }
 
+.InputfieldToggleHelper {
+	display: none !important;
+}
+
+
diff --git a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.js b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.js
index b43612a7..3c48365f 100644
--- a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.js
+++ b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.js
@@ -1,84 +1,139 @@
+/**
+ * Initialize InputfieldToggle Inputfields
+ * 
+ */
 function InputfieldToggleInit() {
 
 	// this becomes true when we are in a click event, used to avoid double calls to handler
-	var isClick = false; 
+	var isClick = false;
+	
+	// classes for checked input and label
+	var inputCheckedClass = 'InputfieldToggleChecked';
+	var labelCheckedClass = 'InputfieldToggleCurrent'; 
+
+	// get <label> element for given <input>
+	function getLabelFromInput($input) {
+		var $label = $input.next('label');
+		if(!$label.length) $label = $input.parent('label');
+		if(!$label.length) $label = $('label[for=' + $input.attr('id') + ']'); 
+		return $label;
+	}
+
+	// get <input> element for given <label>
+	function getInputFromLabel($label) {
+		var $input = $label.prev('input'); // toggle buttons
+		if(!$input.length) $input = $label.find('input'); // radios
+		if(!$input.length) $input = $('input[id=' + $label.attr('for') + ']');
+		return $input;
+	}
 
 	// event handler for labels/inputs in a .InputfieldToggleUseDeselect container
 	function toggleInputEvent($input) {
 
-		var cls = 'InputfieldToggleChecked';
-		
 		// allow for labels as prev sibling of input or label as parent element of input
-		// var $label = $input.prev('label').length ? $input.prev('label') : $input.closest('label');
-		var $prevInput = $input.closest('.Inputfield').find('input.' + cls);
-		// var $prevLabel = $prevInput.prev('label').length ? $prevInput.prev('label') : $prevInput.closest('label');
+		var $label = getLabelFromInput($input);
+		var $prevInput = $input.closest('.Inputfield').find('input.' + inputCheckedClass);
+		var $prevLabel = $prevInput.length ? getLabelFromInput($prevInput) : null; 
 
 		// check of another item was clicked when an existing selection was in place
 		if($prevInput.length && $prevInput.attr('id') != $input.attr('id')) {
 			// remove our custom class from existing selection
-			$prevInput.removeClass(cls).removeAttr('checked');
+			$prevInput.removeClass(inputCheckedClass).removeAttr('checked');
+			if($prevLabel) $prevLabel.removeClass(labelCheckedClass);
 		}
 
 		// check if clicked input was already checked
-		if($input.hasClass(cls) && $input.closest('.InputfieldToggleUseDeselect').length) {
+		if($input.hasClass(inputCheckedClass) && $input.closest('.InputfieldToggleUseDeselect').length) {
 			// if clicked input was already checked, now make it un-checked
-			$input.removeAttr('checked').removeClass(cls);
+			$input.removeAttr('checked').removeClass(inputCheckedClass);
+			$label.removeClass(labelCheckedClass);
 			// if this de-select was the first selection in the request, it's necessary to remove
 			// the checked attribute again a short while later for some reason
 			setTimeout(function() { $input.removeAttr('checked') }, 100);
 		} else {
 			// input was just checked (and wasn't before), so add our checked class to the input
-			// $input.attr('checked', 'checked').addClass(cls);
-			$input.addClass(cls);
+			$input.attr('checked', 'checked').prop('checked', 'checked');
+			$input.addClass(inputCheckedClass);
+			$label.addClass(labelCheckedClass);
+			$input.trigger('change');
 		}
 	}
-	
-	$(document).on('change', '.InputfieldToggle input', function() {
-		// change event for de-selectable radios
-		if(isClick) return false;
-		toggleInputEvent($(this));
 
-	}).on('click', '.InputfieldToggle label:not(.InputfieldHeader)', function() {
-		// click event for de-selectable radios
-		if(isClick) return false;
-		var $label = $(this);
-		var $input = $label.prev('input.InputfieldToggleChecked'); // toggle buttons
-		if(!$input.length) $input = $label.children('input.InputfieldToggleChecked'); // radios
-		if(!$input.length) return;
-		isClick = true;
-		toggleInputEvent($input);
-		setTimeout(function() { isClick = false; }, 200);
-	}); 
-	
-	// button style for default toggle button group
-	// inherit colors from existing inputs and buttons
-	var $button = $('button.ui-button:eq(0)');
-	var $input = $('.InputfieldForm input[type=text]:eq(0)');
-	if($button.length && $input.length) {
-		var onBgcolor, onColor, offBgcolor, offColor, borderColor, style;
-		onBgcolor = $button.css('background-color');
-		onColor = $button.css('color');
-		offBgcolor = $input.css('background-color');
-		offColor = $input.css('color');
-		borderColor = $input.css('border-color');
-		style =
-			"<style type='text/css'>" +
-				'.InputfieldToggleGroup label { ' + 
-					'background-color: ' + offBgcolor + '; ' + 
-					'color: ' + offColor + ';' + 
-					'border-color: ' + borderColor + ';' + 
-				'} ' + 
-				'.InputfieldToggleGroup input:checked + label { ' +
-					'background-color: ' + onBgcolor + '; ' +
-					'color: ' + onColor + ';' +
-					'border-color: ' + onBgcolor + '; ' + 
-				'} ' +
-			"</style>";
-			
-		$('body').append(style);
+	function initEvents() {
+		$(document).on('change', '.InputfieldToggle input', function() {
+			// change event for de-selectable radios
+			if(isClick) return false;
+			toggleInputEvent($(this));
+
+		}).on('click', '.InputfieldToggle label:not(.InputfieldHeader)', function(event) {
+			// click event for de-selectable radios
+			if(isClick) return false;
+			var $label = $(this);
+			var $input = getInputFromLabel($label);
+			if(!$input.length) return;
+			isClick = true;
+			toggleInputEvent($input);
+			setTimeout(function() { isClick = false; }, 200);
+			if($input.closest('.InputfieldToggleGroup').length) return false;
+		});
 	}
+	
+	function initColors() {
+		
+		var $button = $('.InputfieldToggleHelper > button');
+		var $input = $('.InputfieldToggleHelper > input');
+		
+		if(!$button.length) $button = $('.InputfieldForm button.ui-priority-secondary:eq(0)');
+		if(!$button.length) $button = $('.InputfieldForm button.ui-button:eq(0)');
+		if(!$button.length) $button = $('.InputfieldForm button[type=submit]'); 
+		if(!$input.length) $input = $('.InputfieldForm input[type=text]:eq(0)');
+		if(!$button.length || !$input.length) return;
+		
+		InputfieldToggleSetColors({
+			onBg: $button.css('background-color'),
+			on: $button.css('color'),
+			offBg: $input.css('background-color'),
+			off: $input.css('color'),
+			border: $input.css('border-bottom-color')
+		});
+	}
+	
+	initEvents();
+	initColors();
 }
 
+/**
+ * Set custom colors for InputfieldToggle elements
+ *
+ */
+function InputfieldToggleSetColors(customColors) {
+	var colors = { on: '', onBg: '', off: '', offBg: '', border: '', hoverBg: '', hover: '' }
+	$.extend(colors, customColors);
+	if(!colors.hoverBg && colors.onBg) {
+		colors.hoverBg = colors.onBg.replace('rgb(', 'rgba(').replace(')', ',.2)');
+		if(!colors.hover) colors.hover = colors.off;
+	}
+	var style =
+		"<style type='text/css'>" +
+		'.InputfieldToggleGroup label { ' +
+			(colors.offBg ? 'background-color: ' + colors.offBg + '; ' : '') +
+			(colors.off ? 'color: ' + colors.off + ';' : '') +
+			(colors.border ? 'border-color: ' + colors.border + ';' : '') +
+		'} ' +
+		'.InputfieldToggleGroup label.InputfieldToggleCurrent, ' + 
+		'.InputfieldToggleGroup input:checked + label { ' +
+			(colors.onBg ? 'background-color: ' + colors.onBg + '; ' : '') +
+			(colors.on ? 'color: ' + colors.on + ';' : '') +
+			(colors.onBg ? 'border-color: ' + colors.onBg + '; ' : '') +
+		'} ' +
+		'.InputfieldToggleGroup label:not(.InputfieldToggleCurrent):hover,' + 
+		'.InputfieldToggleGroup input:not(:checked) + label:not(.InputfieldToggleCurrent):hover { ' +
+			(colors.hoverBg ? 'background-color: ' + colors.hoverBg + '; ' : '') +
+			(colors.hover ? 'color: ' + colors.hover + '; ' : '') +
+		'}' +
+		"</style>";
+	$('head').append(style);
+}
 
 jQuery(document).ready(function($) {
 	InputfieldToggleInit();
diff --git a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.min.js b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.min.js
index c8712430..0e3d5767 100644
--- a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.min.js
+++ b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.min.js
@@ -1 +1 @@
-function InputfieldToggleInit(){var isClick=false;function toggleInputEvent($input){var cls="InputfieldToggleChecked";var $prevInput=$input.closest(".Inputfield").find("input."+cls);if($prevInput.length&&$prevInput.attr("id")!=$input.attr("id")){$prevInput.removeClass(cls).removeAttr("checked")}if($input.hasClass(cls)&&$input.closest(".InputfieldToggleUseDeselect").length){$input.removeAttr("checked").removeClass(cls);setTimeout(function(){$input.removeAttr("checked")},100)}else{$input.addClass(cls)}}$(document).on("change",".InputfieldToggle input",function(){if(isClick)return false;toggleInputEvent($(this))}).on("click",".InputfieldToggle label:not(.InputfieldHeader)",function(){if(isClick)return false;var $label=$(this);var $input=$label.prev("input.InputfieldToggleChecked");if(!$input.length)$input=$label.children("input.InputfieldToggleChecked");if(!$input.length)return;isClick=true;toggleInputEvent($input);setTimeout(function(){isClick=false},200)});var $button=$("button.ui-button:eq(0)");var $input=$(".InputfieldForm input[type=text]:eq(0)");if($button.length&&$input.length){var onBgcolor,onColor,offBgcolor,offColor,borderColor,style;onBgcolor=$button.css("background-color");onColor=$button.css("color");offBgcolor=$input.css("background-color");offColor=$input.css("color");borderColor=$input.css("border-color");style="<style type='text/css'>"+".InputfieldToggleGroup label { "+"background-color: "+offBgcolor+"; "+"color: "+offColor+";"+"border-color: "+borderColor+";"+"} "+".InputfieldToggleGroup input:checked + label { "+"background-color: "+onBgcolor+"; "+"color: "+onColor+";"+"border-color: "+onBgcolor+"; "+"} "+"</style>";$("body").append(style)}}jQuery(document).ready(function($){InputfieldToggleInit()});
\ No newline at end of file
+function InputfieldToggleInit(){var isClick=false;var inputCheckedClass="InputfieldToggleChecked";var labelCheckedClass="InputfieldToggleCurrent";function getLabelFromInput($input){var $label=$input.next("label");if(!$label.length)$label=$input.parent("label");if(!$label.length)$label=$("label[for="+$input.attr("id")+"]");return $label}function getInputFromLabel($label){var $input=$label.prev("input");if(!$input.length)$input=$label.find("input");if(!$input.length)$input=$("input[id="+$label.attr("for")+"]");return $input}function toggleInputEvent($input){var $label=getLabelFromInput($input);var $prevInput=$input.closest(".Inputfield").find("input."+inputCheckedClass);var $prevLabel=$prevInput.length?getLabelFromInput($prevInput):null;if($prevInput.length&&$prevInput.attr("id")!=$input.attr("id")){$prevInput.removeClass(inputCheckedClass).removeAttr("checked");if($prevLabel)$prevLabel.removeClass(labelCheckedClass)}if($input.hasClass(inputCheckedClass)&&$input.closest(".InputfieldToggleUseDeselect").length){$input.removeAttr("checked").removeClass(inputCheckedClass);$label.removeClass(labelCheckedClass);setTimeout(function(){$input.removeAttr("checked")},100)}else{$input.attr("checked","checked").prop("checked","checked");$input.addClass(inputCheckedClass);$label.addClass(labelCheckedClass);$input.trigger("change")}}function initEvents(){$(document).on("change",".InputfieldToggle input",function(){if(isClick)return false;toggleInputEvent($(this))}).on("click",".InputfieldToggle label:not(.InputfieldHeader)",function(event){if(isClick)return false;var $label=$(this);var $input=getInputFromLabel($label);if(!$input.length)return;isClick=true;toggleInputEvent($input);setTimeout(function(){isClick=false},200);if($input.closest(".InputfieldToggleGroup").length)return false})}function initColors(){var $button=$(".InputfieldToggleHelper > button");var $input=$(".InputfieldToggleHelper > input");if(!$button.length)$button=$(".InputfieldForm button.ui-priority-secondary:eq(0)");if(!$button.length)$button=$(".InputfieldForm button.ui-button:eq(0)");if(!$button.length)$button=$(".InputfieldForm button[type=submit]");if(!$input.length)$input=$(".InputfieldForm input[type=text]:eq(0)");if(!$button.length||!$input.length)return;InputfieldToggleSetColors({onBg:$button.css("background-color"),on:$button.css("color"),offBg:$input.css("background-color"),off:$input.css("color"),border:$input.css("border-bottom-color")})}initEvents();initColors()}function InputfieldToggleSetColors(customColors){var colors={on:"",onBg:"",off:"",offBg:"",border:"",hoverBg:"",hover:""};$.extend(colors,customColors);if(!colors.hoverBg&&colors.onBg){colors.hoverBg=colors.onBg.replace("rgb(","rgba(").replace(")",",.2)");if(!colors.hover)colors.hover=colors.off}var style="<style type='text/css'>"+".InputfieldToggleGroup label { "+(colors.offBg?"background-color: "+colors.offBg+"; ":"")+(colors.off?"color: "+colors.off+";":"")+(colors.border?"border-color: "+colors.border+";":"")+"} "+".InputfieldToggleGroup label.InputfieldToggleCurrent, "+".InputfieldToggleGroup input:checked + label { "+(colors.onBg?"background-color: "+colors.onBg+"; ":"")+(colors.on?"color: "+colors.on+";":"")+(colors.onBg?"border-color: "+colors.onBg+"; ":"")+"} "+".InputfieldToggleGroup label:not(.InputfieldToggleCurrent):hover,"+".InputfieldToggleGroup input:not(:checked) + label:not(.InputfieldToggleCurrent):hover { "+(colors.hoverBg?"background-color: "+colors.hoverBg+"; ":"")+(colors.hover?"color: "+colors.hover+"; ":"")+"}"+"</style>";$("head").append(style)}jQuery(document).ready(function($){InputfieldToggleInit()});
\ No newline at end of file
diff --git a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.module b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.module
index c89080fa..79bf65f1 100644
--- a/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.module
+++ b/wire/modules/Inputfield/InputfieldToggle/InputfieldToggle.module
@@ -9,6 +9,7 @@
  * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
  * https://processwire.com
  *
+ * @property int|string $value Integer value when selection is made or blank string when no selection
  * @property int $labelType Label type to use, see the labelType constants (default=labelTypeYes)
  * @property int $valueType Type of value for methods that ask for it (use one of the valueType constants)
  * @property string $yesLabel Custom yes/on label
@@ -91,12 +92,12 @@ class InputfieldToggle extends Inputfield {
 	protected $allLabels = array();
 
 	/**
-	 * Manually added options of [ value => label ]
+	 * Manually added custom options of [ value => label ]
 	 * 
 	 * @var array
 	 * 
 	 */
-	protected $options = array();
+	protected $customOptions = array();
 
 	/**
 	 * Construct and set default settings
@@ -114,6 +115,11 @@ class InputfieldToggle extends Inputfield {
 		$this->set('useDeselect', 0); 
 		$this->set('defaultOption', 'none');
 		$this->set('inputfieldClass', '0');
+	
+		$this->set('settings', array(
+			'inputCheckedClass' => '', 
+			'labelCheckedClass' => '',
+		));
 
 		$this->attr('value', self::valueUnknown);
 
@@ -140,8 +146,8 @@ class InputfieldToggle extends Inputfield {
 		$value = $this->val();
 		if($value === self::valueUnknown) return true;
 		if(is_int($value)) {
-			if($this->hasOptions()) {
-				if(isset($this->options[$value])) return false;
+			if($this->hasCustomOptions()) {
+				if(isset($this->customOptions[$value])) return false;
 			} else {
 				if($value > -1) return false;
 			}
@@ -153,21 +159,28 @@ class InputfieldToggle extends Inputfield {
 	/**
 	 * Sanitize the value to be one ofthe constants: valueYes, valueNo, valueOther, valueUnknown
 	 * 
-	 * @param string|int $value
+	 * @param string|int $value Value to sanitize
+	 * @param bool $getName Get internal name of value rather than value? (default=false)
 	 * @return int|string
 	 * 
 	 */
-	public function sanitizeValue($value) {
+	public function sanitizeValue($value, $getName = false) {
 	
-		if($value === null) return self::valueUnknown;
-		if(is_bool($value)) return $value ? self::valueYes  : self::valueNo;
+		if($value === null) {
+			return $getName ? 'unknown' : self::valueUnknown;
+		}
+		
+		if(is_bool($value)) {
+			if($getName) return $value ? 'yes' : 'no';
+			return $value ? self::valueYes : self::valueNo;
+		}
 		
 		$intValue = strlen("$value") && ctype_digit("$value") ? (int) $value : '';
 		$strValue = strtolower("$value");
 		
-		if($this->hasOptions()) { 
+		if($this->hasCustomOptions()) { 
 			if($intValue !== '') $value = $intValue;
-			$value = isset($this->options[$value]) ? $value : self::valueUnknown;
+			$value = isset($this->customOptions[$value]) ? $value : self::valueUnknown;
 				
 		} else if($intValue === self::valueNo || $intValue === self::valueYes) {
 			$value = $intValue;
@@ -200,6 +213,18 @@ class InputfieldToggle extends Inputfield {
 			$value = self::valueUnknown; // blank string
 		}
 		
+		if($getName && !$this->hasCustomOptions()) {
+			if($value === self::valueUnknown) {
+				$value = 'unknown';
+			} else if($value === self::valueYes) {
+				$value = 'yes';
+			} else if($value === self::valueNo) {
+				$value = 'no';
+			} else if($value === self::valueOther) {
+				$value = 'other';
+			}
+		}
+		
 		return $value;
 	}
 
@@ -228,7 +253,7 @@ class InputfieldToggle extends Inputfield {
 		
 		$class = $this->getSetting('inputfieldClass');
 		if(empty($class) || $class === $this->className()) {
-			if($this->wire('adminTheme') == 'AdminThemeDefault') {
+			if(false && $this->wire('adminTheme') == 'AdminThemeDefault') {
 				// clicking toggles jumps to top of page on AdminThemeDefault for some reason
 				// even if JS click events are canceled, so use radios instead
 				$class = 'InputfieldRadios'; 
@@ -325,10 +350,21 @@ class InputfieldToggle extends Inputfield {
 		} else {
 			$out = $this->renderToggle();
 		}
-	
+
 		// hidden input to indicate presence when no selection is made (like with radios)
-		$out .= "<input type='hidden' name='_{$this->name}_' value='1' />";
 		
+		/** @var InputfieldButton $btn */
+		$button = $this->wire('modules')->get('InputfieldButton');
+		$button->setSecondary(true);
+		$button->val('1');
+		$button->removeAttr('name');
+		
+		$input = $this->wire('modules')->get('InputfieldText');
+		$input->attr('name', "_{$this->name}_");
+		$input->val(1);
+		
+		$out .= "<div class='InputfieldToggleHelper'>" . $input->render() . $button->render() . "</div>";
+
 		return $out;
 	}
 	
@@ -347,11 +383,12 @@ class InputfieldToggle extends Inputfield {
 		
 		foreach($this->getOptions() as $value => $label) {
 			$checked = "$checkedValue" === "$value" ? "checked " : "";
-			$class = $checked ? 'InputfieldToggleChecked' : '';
+			$inputClass = $checked ? 'InputfieldToggleChecked' : '';
+			$labelClass = $checked ? 'InputfieldToggleCurrent' : '';
 			$label = $this->formatLabel($label);
 			$out .= 
-				"<input type='radio' id='{$id}_$value' name='$name' class='$class' value='$value' $checked/>" . 
-                "<label for='{$id}_$value'><span class='pw-no-select'>$label</span></label>";
+				"<input type='radio' id='{$id}_$value' name='$name' class='$inputClass' value='$value' $checked/>" . 
+                "<label for='{$id}_$value' class='$labelClass'><span class='pw-no-select'>$label</span></label>";
 		}
 	
 		return
@@ -376,9 +413,9 @@ class InputfieldToggle extends Inputfield {
 		if($value === null && $input["_{$this->name}_"] === null) {
 			// input was not rendered in the submitted post, so should be ignored
 
-		} else if($this->hasOptions()) {
+		} else if($this->hasCustomOptions()) {
 			// custom options
-			if(isset($this->options[$value])) $this->val($value);
+			if(isset($this->customOptions[$value])) $this->val($value);
 			
 		} else if($intValue === self::valueYes || $intValue === self::valueNo) {
 			// yes or no selected
@@ -530,14 +567,15 @@ class InputfieldToggle extends Inputfield {
 	 */
 	public function getValueLabel($value = null, $labelType = null, $language = null) {
 		
-		if($value !== null && $labelType === null && $this->hasOptions()) {
+		if($value === null) $value = $this->val();
+	
+		if($this->hasCustomOptions()) {
 			// get custom defined option label from addOption() call (API usage only)
-			if(isset($this->options[$value])) return $this->options[$value];
+			return isset($this->customOptions[$value]) ? $this->customOptions[$value] : self::valueUnknown;
 		}
 		
 		$labels = $this->getLabels($labelType, $language);
 		
-		if($value === null) $value = $this->attr('value');
 		if($value === null || $value === self::valueUnknown) return $labels['unknown'];
 		if(is_bool($value)) return $value ? $labels['yes'] : $labels['no'];
 		
@@ -548,54 +586,6 @@ class InputfieldToggle extends Inputfield {
 		return $labels['unknown'];
 	}
 
-	/**
-	 * Get label used for yes/on option
-	 * 
-	 * @param int|null $labelType Specify labelType constant or omit for selected label type. 
-	 * @param Language|int|string $language
-	 * @return string
-	 * 
-	 */
-	protected function getYesLabel($labelType = null, $language = null) {
-		return $this->getValueLabel(self::valueYes, $labelType, $language);
-	}
-
-	/**
-	 * Get label used for no/off option
-	 *
-	 * @param int|null $labelType Specify labelType constant or omit for selected label type.
-	 * @param Language|int|string $language
-	 * @return string
-	 *
-	 */
-	protected function getNoLabel($labelType = null, $language = null) {
-		return $this->getValueLabel(self::valueNo, $labelType, $language);
-	}
-
-	/**
-	 * Get label used for 3rd/other option
-	 *
-	 * @param int|null $labelType Specify labelType constant or omit for selected label type.
-	 * @param Language|int|string $language
-	 * @return string
-	 *
-	 */
-	protected function getOtherLabel($labelType = null, $language = null) {
-		return $this->getValueLabel(self::valueOther, $labelType, $language);
-	}
-
-	/**
-	 * Get label used for unknown/no-selection option
-	 *
-	 * @param int|null $labelType Specify labelType constant or omit for selected label type.
-	 * @param Language|int|string $language
-	 * @return string
-	 *
-	 */
-	protected function getUnknownLabel($labelType = null, $language = null) {
-		return $this->getValueLabel(self::valueUnknown, $labelType, $language);
-	}
-
 	/**
 	 * Format label for HTML output (entity encode, etc.)
 	 * 
@@ -622,7 +612,7 @@ class InputfieldToggle extends Inputfield {
 	 */
 	public function getOptions() {
 		// use custom options instead if any have been set from an addOption() call
-		if($this->hasOptions()) return $this->options;
+		if($this->hasCustomOptions()) return $this->customOptions;
 		// use built in toggle options
 		$options = array();
 		$values = $this->useReverse ? array(self::valueNo, self::valueYes) : array(self::valueYes, self::valueNo);
@@ -650,7 +640,7 @@ class InputfieldToggle extends Inputfield {
 			throw new WireException('The addOption() method is not available for FieldtypeToggle');
 		}
 		if($label === null) $label = $value;
-		$this->options[$value] = $label;
+		$this->customOptions[$value] = $label;
 		return $this;
 	}
 
@@ -669,7 +659,7 @@ class InputfieldToggle extends Inputfield {
 	 * 
 	 */
 	public function setOptions(array $options) {
-		$this->options = array();
+		$this->customOptions = array();
 		foreach($options as $key => $value) {
 			$this->addOption($key, $value);
 		}
@@ -682,8 +672,8 @@ class InputfieldToggle extends Inputfield {
 	 * @return bool
 	 * 
 	 */
-	protected function hasOptions() {
-		return !$this->hasFieldtype && count($this->options) > 0;
+	protected function hasCustomOptions() {
+		return count($this->customOptions) > 0;
 	}
 
 	/**
@@ -747,7 +737,7 @@ class InputfieldToggle extends Inputfield {
 			if($labelType == self::labelTypeCustom) {
 				$label = $this->_('Custom');
 			} else {
-				$label = $this->getYesLabel($labelType) . '/' . $this->getNoLabel($labelType);
+				$label = $this->getValueLabel(self::valueYes, $labelType) . '/' . $this->getValueLabel(self::valueNo, $labelType);
 			}
 			$f->addOption($labelType, $label);
 		}
@@ -808,15 +798,17 @@ class InputfieldToggle extends Inputfield {
 		$fieldset->add($f);
 		
 		$customStates = array(
-			'yesLabel' => $this->_('Yes/On'),
-			'noLabel' => $this->_('No/Off'),
+			'yesLabel' => $this->_('yes/on'),
+			'noLabel' => $this->_('no/off'),
 		);
+		
+		$labelFor = $this->_('Label for “%s” option');
 
 		/** @var InputfieldText $f */
 		foreach($customStates as $name => $label) {
 			$f = $modules->get('InputfieldText');
 			$f->attr('name', $name);
-			$f->label = sprintf($this->_('Label for “%s” option'), $label);
+			$f->label = sprintf($labelFor, $label);
 			$f->showIf = 'labelType=' . self::labelTypeCustom;
 			$f->val($this->get($name));
 			$f->columnWidth = 50;
@@ -833,7 +825,7 @@ class InputfieldToggle extends Inputfield {
 		/** @var InputfieldText $f */
 		$f = $modules->get('InputfieldText');
 		$f->attr('name', 'otherLabel');
-		$f->label = sprintf($this->_('Label for 3rd “other” option'));
+		$f->label = sprintf($labelFor, $this->_('other'));
 		$f->showIf = 'useOther=1';
 		$f->val($this->get('otherLabel'));
 		if($languages) {
@@ -849,9 +841,9 @@ class InputfieldToggle extends Inputfield {
 		$f->set('inputfieldClass', $this->inputfieldClass);
 		$f->attr('name', 'defaultOption'); 
 		$f->label = $this->_('Default selected option');
-		$f->addOption('yes', $this->getYesLabel());
-		$f->addOption('no', $this->getNoLabel());
-		if($this->useOther) $f->addOption('other', $this->getOtherLabel());
+		$f->addOption('yes', $this->getValueLabel(self::valueYes));
+		$f->addOption('no', $this->getValueLabel(self::valueNo));
+		if($this->useOther) $f->addOption('other', $this->getValueLabel(self::valueOther));
 		$f->addOption('none', $this->_('No selection'));
 		$f->val($this->defaultOption);
 		$f->addClass('InputfieldToggle', 'wrapClass');