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

neo/NeoPlugin.php

@@ -83,6 +83,13 @@ public function init()
 		craft()->neo_relabel->pluginInit();
 	}
 
+	public function addTwigExtension()
+	{
+		Craft::import('plugins.neo.twigextensions.NeoTwigExtension');
+
+		return new NeoTwigExtension();
+	}
+
 	public function onBeforeInstall()
 	{
 		return $this->isCompatible();

neo/twigextensions/NeoTwigExtension.php

@@ -0,0 +1,22 @@
+<?php
+namespace Craft;
+
+class NeoTwigExtension extends \Twig_Extension
+{
+	public function getName()
+	{
+		return "Neo";
+	}
+
+	public function getTests()
+	{
+		return [
+			'neoblock' => new \Twig_Test_Method($this, 'isNeoBlock'),
+		];
+	}
+
+	public function isNeoBlock($value)
+	{
+		return $value instanceof Neo_BlockModel;
+	}
+}

src/configurator/Configurator.js

@@ -242,6 +242,11 @@ export default Garnish.Base.extend({
 		return this._items.find(item => item.$container.is($element))
 	},
 
+	getSelectedItem()
+	{
+		return this._items.find(item => item.isSelected())
+	},
+
 	selectItem(item, focusInput)
 	{
 		focusInput = (typeof focusInput === 'boolean' ? focusInput : true)
@@ -322,7 +327,10 @@ export default Garnish.Base.extend({
 			fieldLayout: fieldLayout
 		})
 
-		this.addItem(blockType)
+		const selected = this.getSelectedItem()
+		const index = selected ? selected.getSettings().getSortOrder() : -1
+
+		this.addItem(blockType, index)
 		this.selectItem(blockType)
 	},
 
@@ -340,7 +348,10 @@ export default Garnish.Base.extend({
 			settings: settings
 		})
 
-		this.addItem(group)
+		const selected = this.getSelectedItem()
+		const index = selected ? selected.getSettings().getSortOrder() : -1
+
+		this.addItem(group, index)
 		this.selectItem(group)
 	},
 

src/plugins/reasons/Renderer.js

@@ -1,3 +1,5 @@
+import $ from 'jquery'
+
 export default Renderer => class extends Renderer
 {
 	addEventListeners()
@@ -16,4 +18,59 @@ export default Renderer => class extends Renderer
 
 	addLivePreviewListeners() {}
 	removeLivePreviewListeners() {}
+
+	initToggleFields()
+	{
+		// Get all current fields
+		this.$fields = $(this.getFieldsSelector())
+
+		if(this.$fields.length === 0)
+		{
+			return false
+		}
+
+		// Get toggle field IDs
+		const toggleFieldIds = []
+		for(let fieldId in this.conditionals)
+		{
+			for(let i = 0; i < this.conditionals[fieldId].length; i++)
+			{
+				toggleFieldIds.push(this.conditionals[fieldId][i][0].fieldId)
+			}
+		}
+
+		// Loop over fields and add data-id attribute
+		const self = this
+		this.$fields.each(function()
+		{
+			const $field = $(this)
+
+			if($field.attr('id') === undefined)
+			{
+				return
+			}
+
+			const fieldHandle = $field.attr('id').split('-').slice(-2, -1)[0] || false
+			const fieldId = Craft.ReasonsPlugin.getFieldIdByHandle(fieldHandle)
+
+			if(fieldId)
+			{
+				$field.attr('data-id', fieldId)
+			}
+
+			// Is this a target field?
+			if(self.conditionals[fieldId])
+			{
+				$field.attr('data-target', 1)
+			}
+
+			// Is this a toggle field
+			if(toggleFieldIds.indexOf(parseInt(fieldId)) > -1)
+			{
+				$field.attr('data-toggle', 1)
+			}
+		})
+
+		return true
+	}
 }