Translate textareas and add placeholders back

lcpriest · Nov 13, 2018 · c5a621b · c5a621b
1 parent cd36416
commit c5a621b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/addon/components/form-field.js b/addon/components/form-field.js
@@ -130,15 +130,6 @@ const FormFieldComponent = Component.extend(TranslatedInput, {
     return get(this, 'modelName') || guidFor(get(this, 'object'));
   },
 
-  getModelName() {
-    let formName = get(this, 'form');
-    let modelName = get(this, 'object.modelName');
-    let constructorName = get(this, 'object.constructor.modelName');
-    let changesetConstructorName = get(this, 'object._content.constructor.modelName');
-
-    return formName || modelName || constructorName || changesetConstructorName;
-  },
-
   value: computed('rawValue', function() {
     let serializeValue = getWithDefault(this, 'serializeValue', (value) => value);
     return serializeValue(get(this, 'rawValue'));

diff --git a/addon/components/form-fields/text-field.js b/addon/components/form-fields/text-field.js
@@ -1,12 +1,13 @@
 import Ember from 'ember';
 import layout from '../../templates/components/form-fields/text-field';
+import TranslatedInput from '../../mixins/translated-input';
 
 const {
   Component,
   set
 } = Ember;
 
-const TextFieldComponent = Component.extend({
+const TextFieldComponent = Component.extend(TranslatedInput, {
   tagName: '',
   layout,
 

diff --git a/addon/components/form-fields/textarea-field.js b/addon/components/form-fields/textarea-field.js
@@ -1,12 +1,13 @@
 import Ember from 'ember';
 import layout from '../../templates/components/form-fields/textarea-field';
+import TranslatedInput from '../../mixins/translated-input';
 
 const {
   Component,
   set
 } = Ember;
 
-const TextareaFieldComponent = Component.extend({
+const TextareaFieldComponent = Component.extend(TranslatedInput, {
   tagName: '',
   layout,
 

diff --git a/addon/mixins/translated-input.js b/addon/mixins/translated-input.js
@@ -12,6 +12,20 @@ const {
 
 export default Mixin.create({
   intl: service(),
+  config: service('ember-form-for/config'),
+
+  modelName: computed('form', 'object.{modelName,constructor.modelName,_content.constructor.modelName}', function() {
+    return this.getModelName();
+  }),
+
+  getModelName() {
+    let formName = get(this, 'form');
+    let modelName = get(this, 'object.modelName');
+    let constructorName = get(this, 'object.constructor.modelName');
+    let changesetConstructorName = get(this, 'object._content.constructor.modelName');
+
+    return formName || modelName || constructorName || changesetConstructorName;
+  },
 
   labelText: computed('propertyName', 'label', function() {
     let intl = get(this, 'intl');

diff --git a/addon/templates/components/form-fields/hidden-field.hbs b/addon/templates/components/form-fields/hidden-field.hbs
@@ -31,7 +31,7 @@
       minlength=minlength
       multiple=multiple
       pattern=pattern
-      placeholder=placeholderText
+      placeholder=placeholder
       readonly=readonly
       required=required
       size=size

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-form-for-intl",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Build \"Data Down Actions Up\" forms, with good default markup and built-in accessibility support",
   "keywords": [
     "ember-addon"