Merge pull request #7 from supercool/develop

1.3.1
verbb · Jan 9, 2015 · 7fffb47 · 7fffb47
2 parents dbd40ce + 0b9cdac
commit 7fffb47
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 64 deletions.
diff --git a/buttonbox/ButtonBoxPlugin.php b/buttonbox/ButtonBoxPlugin.php
@@ -20,7 +20,7 @@ public function getName()
 
   public function getVersion()
   {
-    return '1.3';
+    return '1.3.1';
   }
 
   public function getDeveloper()
@@ -30,7 +30,7 @@ public function getDeveloper()
 
   public function getDeveloperUrl()
   {
-    return 'http://www.supercooldesign.co.uk';
+    return 'http://plugins.supercooldesign.co.uk';
   }
 
 }
diff --git a/buttonbox/fieldtypes/ButtonBox_ColoursFieldType.php b/buttonbox/fieldtypes/ButtonBox_ColoursFieldType.php
@@ -10,9 +10,6 @@
  * @link      http://www.supercooldesign.co.uk
  */
 
-/**
- *
- */
 class ButtonBox_ColoursFieldType extends BaseOptionsFieldType
 {
 	/**
@@ -57,10 +54,10 @@ public function getInputHtml($name, $value)
 
 
 	/**
-	* @inheritDoc BaseElementFieldType::getSettingsHtml()
-	*
-	* @return string|null
-	*/
+	 * @inheritDoc BaseElementFieldType::getSettingsHtml()
+	 *
+	 * @return string|null
+	 */
 	public function getSettingsHtml()
 	{
 		$options = $this->getOptions();
@@ -74,22 +71,6 @@ public function getSettingsHtml()
 					'value'     => '',
 					'cssColour' => ''
 				)
-				// array(
-				// 	'label'     => 'Green',
-				// 	'value'     => 'green',
-				// 	'cssColour' => '#328d7e',
-				// 	'default'   => true
-				// ),
-				// array(
-				// 	'label'     => 'Navy',
-				// 	'value'     => 'navy',
-				// 	'cssColour' => '#17333a'
-				// ),
-				// array(
-				// 	'label'     => 'Brown',
-				// 	'value'     => 'brown',
-				// 	'cssColour' => '#818b80'
-				// )
 			);
 		}
 
@@ -133,26 +114,50 @@ public function getSettingsHtml()
 	// =========================================================================
 
 	/**
-	* @inheritDoc BaseOptionsFieldType::getOptionsSettingsLabel()
-	*
-	* @return string
-	*/
+	 * @inheritDoc BaseOptionsFieldType::getOptionsSettingsLabel()
+	 *
+	 * @return string
+	 */
 	protected function getOptionsSettingsLabel()
 	{
 		return Craft::t('Colour Options');
 	}
 
 
 	/**
-	* @inheritDoc BaseSavableComponentType::defineSettings()
-	*
-	* @return array
-	*/
+	 * @inheritDoc BaseSavableComponentType::defineSettings()
+	 *
+	 * @return array
+	 */
 	protected function defineSettings()
 	{
 		return array(
 			'options' => array(AttributeType::Mixed, 'default' => array())
 		);
 	}
 
+
+	/**
+	 * Returns the default field value.
+	 *
+	 * @return array|string|null
+	 */
+	protected function getDefaultValue()
+	{
+
+		foreach ($this->getOptions() as $option)
+		{
+
+			if ( !empty($option['default']) )
+			{
+				return $option['value'];
+			}
+
+		}
+
+		return $this->getOptions()[0]['value'];
+
+	}
+
+
 }
diff --git a/buttonbox/fieldtypes/ButtonBox_TextSizeFieldType.php b/buttonbox/fieldtypes/ButtonBox_TextSizeFieldType.php
@@ -10,9 +10,6 @@
  * @link      http://www.supercooldesign.co.uk
  */
 
-/**
- *
- */
 class ButtonBox_TextSizeFieldType extends BaseOptionsFieldType
 {
 	/**
@@ -57,10 +54,10 @@ public function getInputHtml($name, $value)
 
 
 	/**
-	* @inheritDoc BaseElementFieldType::getSettingsHtml()
-	*
-	* @return string|null
-	*/
+	 * @inheritDoc BaseElementFieldType::getSettingsHtml()
+	 *
+	 * @return string|null
+	 */
 	public function getSettingsHtml()
 	{
 		$options = $this->getOptions();
@@ -74,22 +71,6 @@ public function getSettingsHtml()
 					'value' => '',
 					'pxVal' => ''
 				)
-				// array(
-				// 	'label' => 'Medium',
-				// 	'value' => 'medium',
-				// 	'pxVal' => '16',
-				// 	'default' => true
-				// ),
-				// array(
-				// 	'label' => 'Large',
-				// 	'value' => 'large',
-				// 	'pxVal' => '24'
-				// ),
-				// array(
-				// 	'label' => 'Mega',
-				// 	'value' => 'mega',
-				// 	'pxVal' => '36'
-				// )
 			);
 		}
 
@@ -132,26 +113,50 @@ public function getSettingsHtml()
 	// =========================================================================
 
 	/**
-	* @inheritDoc BaseOptionsFieldType::getOptionsSettingsLabel()
-	*
-	* @return string
-	*/
+	 * @inheritDoc BaseOptionsFieldType::getOptionsSettingsLabel()
+	 *
+	 * @return string
+	 */
 	protected function getOptionsSettingsLabel()
 	{
 		return Craft::t('Text Size Options');
 	}
 
 
 	/**
-	* @inheritDoc BaseSavableComponentType::defineSettings()
-	*
-	* @return array
-	*/
+	 * @inheritDoc BaseSavableComponentType::defineSettings()
+	 *
+	 * @return array
+	 */
 	protected function defineSettings()
 	{
 		return array(
 			'options' => array(AttributeType::Mixed, 'default' => array())
 		);
 	}
 
+
+	/**
+	 * Returns the default field value.
+	 *
+	 * @return array|string|null
+	 */
+	protected function getDefaultValue()
+	{
+
+		foreach ($this->getOptions() as $option)
+		{
+
+			if ( !empty($option['default']) )
+			{
+				return $option['value'];
+			}
+
+		}
+
+		return $this->getOptions()[0]['value'];
+
+	}
+
+
 }
diff --git a/release-notes.json b/release-notes.json
@@ -1,4 +1,14 @@
 [
+	{
+		"version" : "1.3.1",
+		"date"    : "9-1-2015",
+		"notes"   : [
+			{
+				"type"    : "fixed",
+				"message" : "Fixed a bug where fancy options fields (text size and colours) were not showing if there was no default option selected."
+			}
+		]
+	},
 	{
 		"version" : "1.3",
 		"date"    : "3-12-2014",