From ec14cd6beefc8b5d304a23a3a869d9e555dfdbcc Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 7 Mar 2015 11:20:54 +1100
Subject: [PATCH] Updates for new input preset /form field API

---
 modules/backend/assets/js/october-min.js        |  3 ++-
 modules/backend/assets/js/october.triggerapi.js |  3 +++
 modules/cms/classes/page/fields.yaml            | 14 ++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index aca096f16..cd9e5315b 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -69,7 +69,8 @@ if($.oc===undefined)
 $.oc={}
 $.oc.escapeHtmlString=function(string){var htmlEscapes={'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#x27;','/':'&#x2F;'},htmlEscaper=/[&<>"'\/]/g
 return(''+string).replace(htmlEscaper,function(match){return htmlEscapes[match];})}
-+function($){"use strict";var TriggerOn=function(element,options){var $el=this.$el=$(element);this.options=options||{};if(this.options.triggerCondition===false)
++function($){"use strict";var TriggerOn=function(element,options){var $el=this.$el=$(element);this.options=options||{};if(this.options.triggerType!==false&&this.options.triggerAction===false)this.options.triggerAction=this.options.triggerType
+if(this.options.triggerCondition===false)
 throw new Error('Trigger condition is not specified.')
 if(this.options.trigger===false)
 throw new Error('Trigger selector is not specified.')
diff --git a/modules/backend/assets/js/october.triggerapi.js b/modules/backend/assets/js/october.triggerapi.js
index 498d8fdab..7ae3fedaa 100644
--- a/modules/backend/assets/js/october.triggerapi.js
+++ b/modules/backend/assets/js/october.triggerapi.js
@@ -36,6 +36,9 @@
 
         this.options = options || {};
 
+        // @deprecated remove if year >= 2016
+        if (this.options.triggerType !== false && this.options.triggerAction === false) this.options.triggerAction = this.options.triggerType
+
         if (this.options.triggerCondition === false)
             throw new Error('Trigger condition is not specified.')
 
diff --git a/modules/cms/classes/page/fields.yaml b/modules/cms/classes/page/fields.yaml
index ec53667b3..fecdfc487 100644
--- a/modules/cms/classes/page/fields.yaml
+++ b/modules/cms/classes/page/fields.yaml
@@ -14,10 +14,9 @@ fields:
         span: right
         placeholder: /
         label: cms::lang.editor.url
-        attributes:
-            data-input-preset: 'input[name="settings[title]"]'
-            data-input-preset-type: url
-            data-input-preset-closest-parent: form
+        preset:
+            field: settings[title]
+            type: url
 
     toolbar:
         type: partial
@@ -32,10 +31,9 @@ tabs:
             tab: cms::lang.editor.settings
             span: left
             label: cms::lang.editor.filename
-            attributes:
-                data-input-preset: 'input[name="settings[title]"]'
-                data-input-preset-type: file
-                data-input-preset-closest-parent: form
+            preset:
+                field: settings[title]
+                type: file
 
         settings[layout]:
             tab: cms::lang.editor.settings