From f9eebad7921009965550ee4327b757baba8a59f8 Mon Sep 17 00:00:00 2001
From: Tobias Engelmann <T.O.B.B.E@web.de>
Date: Wed, 1 Feb 2017 23:14:55 +0100
Subject: [PATCH 1/2] Add new fieldtype: email pulldown. Required for
 Bixie/pagekit-formmaker#18

---
 app/fieldtypes.vue                         |  1 +
 fieldtypes/emailpulldown/emailpulldown.vue | 53 ++++++++++++++++++++++
 fieldtypes/emailpulldown/index.php         | 12 +++++
 3 files changed, 66 insertions(+)
 create mode 100644 fieldtypes/emailpulldown/emailpulldown.vue
 create mode 100644 fieldtypes/emailpulldown/index.php

diff --git a/app/fieldtypes.vue b/app/fieldtypes.vue
index c3b13d9..07f90f1 100644
--- a/app/fieldtypes.vue
+++ b/app/fieldtypes.vue
@@ -34,6 +34,7 @@
             'checkbox': require(`../fieldtypes/checkbox/checkbox.vue`),
             'dob': require(`../fieldtypes/dob/dob.vue`),
             'email': require(`../fieldtypes/email/email.vue`),
+            'emailpulldown': require(`../fieldtypes/emailpulldown/emailpulldown.vue`),
             'htmlcode': require(`../fieldtypes/htmlcode/htmlcode.vue`),
             'map': require(`../fieldtypes/map/map.vue`),
             'pulldown': require(`../fieldtypes/pulldown/pulldown.vue`),
diff --git a/fieldtypes/emailpulldown/emailpulldown.vue b/fieldtypes/emailpulldown/emailpulldown.vue
new file mode 100644
index 0000000..d19a0db
--- /dev/null
+++ b/fieldtypes/emailpulldown/emailpulldown.vue
@@ -0,0 +1,53 @@
+<template>
+
+    <div :class="classes(['uk-form-row'], field.data.classSfx)">
+        <label :for="fieldid" class="uk-form-label" v-show="!field.data.hide_label">{{ fieldLabel | trans }}
+            <a v-if="field.data.help_text && field.data.help_show == 'tooltip_icon'"
+               class="uk-icon-info uk-icon-hover uk-margin-small-top uk-float-right"
+               :title="field.data.help_text" data-uk-tooltip="{delay: 100}"></a>
+        </label>
+
+        <div class="uk-form-controls">
+
+            <select class="uk-form-width-large"
+                    :name="fieldid"
+                    v-bind="{id: fieldid, size:field.data.size > 1 ? field.data.size : false}"
+                    v-model="inputValue"
+                    v-validate:required="fieldRequired">
+                <option v-for="option in field.options" :value="option.value">{{ option.text }}</option>
+            </select>
+
+            <p v-if="field.data.help_text && field.data.help_show == 'block'"
+               class="uk-form-help-block">{{{field.data.help_text}}}</p>
+
+            <p class="uk-form-help-block uk-text-danger" v-show="fieldInvalid(form)">{{ fieldRequiredMessage }}</p>
+        </div>
+    </div>
+
+</template>
+
+<script>
+
+    module.exports = {
+
+        mixins: [BixieFieldtypeMixin],
+
+        settings: {},
+
+        appearance: {
+            'size': {
+                type: 'number',
+                label: 'Size',
+                attrs: {'class': 'uk-form-width-small uk-text-right', 'min': 1}
+            }
+        },
+
+        data: function () {
+            return {
+                fieldid: _.uniqueId('formmakerfield_')
+            };
+        }
+
+    };
+
+</script>
\ No newline at end of file
diff --git a/fieldtypes/emailpulldown/index.php b/fieldtypes/emailpulldown/index.php
new file mode 100644
index 0000000..26ef278
--- /dev/null
+++ b/fieldtypes/emailpulldown/index.php
@@ -0,0 +1,12 @@
+<?php
+return [
+    'id' => 'emailpulldown',
+    'label' => __('Email Pulldown'),
+    'config' => [
+        'hasOptions' => 1,
+        'optionTypeEmail' => 1,
+        'required' => -1,
+        'size' => 1,
+        'placeholder' => ''
+    ]
+];
\ No newline at end of file

From e8737e5cb923af083917297c89ae875e263ad5dd Mon Sep 17 00:00:00 2001
From: Tobias Engelmann <T.O.B.B.E@web.de>
Date: Sun, 5 Feb 2017 22:48:40 +0100
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1681e3f..0f9d56c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+WIP
+
+- Add new field type: email pulldown
+
 1.0.4 (December 7, 2016)
 
 - Add version cache breaker