Merge remote-tracking branch 'refs/remotes/origin/dev'

spicywebau · Jun 27, 2016 · f72c007 · f72c007
2 parents d1ce058 + 60745dc
commit f72c007
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog
 
+#### v1.3.1
+- `Fixed` Fixed incompatibility with PHP 5.5 and below introduced in `1.3.0`
+- `Fixed` Fixed bug where leaving editing an element would always show the confirm dialog, regardless if anything changed
+- `Fixed` Minor UI fix with field-less tabs on child blocks having incorrect background color
+
 #### v1.3.0
 - `Added` Added ability to duplicate blocks
 - `Added` Added ability to have blank tabs in block type field layouts

diff --git a/neo/NeoPlugin.php b/neo/NeoPlugin.php
@@ -22,7 +22,7 @@ public function getDescription()
 
 	public function getVersion()
 	{
-		return '1.3.0';
+		return '1.3.1';
 	}
 
 	public function getCraftMinimumVersion()

diff --git a/neo/fieldtypes/NeoFieldType.php b/neo/fieldtypes/NeoFieldType.php
@@ -736,7 +736,8 @@ private function _prepareInputHtml($id, $name, $settings, $value, $static = fals
 	 */
 	private function _getBlockHtml(Neo_BlockTypeModel $blockType, Neo_BlockModel $block = null, $namespace = '', $static = false)
 	{
-		$hasErrors = $block ? !empty($block->getAllErrors()) : false;
+		$errors = $block ? $block->getAllErrors() : [];
+		$hasErrors = !empty($errors);
 		$fullNamespace = craft()->templates->namespaceInputName($namespace, craft()->templates->getNamespace());
 
 		$cacheKey = implode(':', ['neoblock',

diff --git a/neo/resources/main.js b/neo/resources/main.js
diff --git a/neo/resources/main.js.map b/neo/resources/main.js.map
diff --git a/neo/twigextensions/NeoTwigExtension.php b/neo/twigextensions/NeoTwigExtension.php
@@ -16,7 +16,7 @@ public function getName()
 	public function getTests()
 	{
 		return [
-			'neoblock' => new \Twig_Test_Method($this, 'isNeoBlock'),
+			new \Twig_SimpleTest('neoblock', [$this, 'isNeoBlock']),
 		];
 	}
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "craft-neo",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "A Matrix-like field type that uses existing fields",
   "main": "webpack.config.js",
   "scripts": {

diff --git a/src/input/Input.js b/src/input/Input.js
@@ -120,6 +120,7 @@ export default Garnish.Base.extend({
 				bInfo.id = Block.getNewId()
 			}
 
+			bInfo.modified = false
 			bInfo.namespace = [...this._templateNs, bInfo.id]
 			bInfo.blockType = new BlockType({
 				id: blockType.getId(),

diff --git a/src/input/styles/input.scss b/src/input/styles/input.scss
@@ -217,6 +217,10 @@
 			> .ni_block_body > .ni_block_children {
 				background-color: white;
 			}
+
+			> .ni_block_topbar > .ni_block_topbar_item.tabs .tab.is-selected.is-blank {
+				border-bottom-color: white;
+			}
 		}
 
 		&.is-contracted {