# HG changeset patch
# User Dustin Demuth <dustin@intevation.de>
# Date 1426758961 -3600
# Node ID 060a4f66de084e74ed1a1e88af99a6bbf3be6ffa
# Parent  40834912929e1e7692cbdf004d8bb2c3fe653788# Parent  74cc7f086d8364d34852514a350bb1d220448568
merged

diff -r 74cc7f086d83 -r 060a4f66de08 app/view/widget/base/ComboBox.js
--- a/app/view/widget/base/ComboBox.js	Thu Mar 19 10:07:39 2015 +0100
+++ b/app/view/widget/base/ComboBox.js	Thu Mar 19 10:56:01 2015 +0100
@@ -35,6 +35,7 @@
             typeAhead: this.typeAhead,
             minChars: this.minChars,
             multiSelect: this.multiSelect,
+            editable: this.editable || false,
             msgTarget: 'none',
             tpl: this.tpl
         }, {
diff -r 74cc7f086d83 -r 060a4f66de08 app/view/widget/base/TextField.js
--- a/app/view/widget/base/TextField.js	Thu Mar 19 10:07:39 2015 +0100
+++ b/app/view/widget/base/TextField.js	Thu Mar 19 10:56:01 2015 +0100
@@ -21,7 +21,8 @@
             flex: 1,
             name: this.name,
             msgTarget: 'none',
-            maxLength: this.maxLength,
+            maxLength: this.maxLength || 1000,
+            enforceMaxLength: this.enforceMaxLength || true,
             fieldLabel: this.fieldLabel,
             labelWidth: this.labelWidth,
             listeners: this.listeners