From 048f01305d6a63dab257a18bfc7fa9311162f640 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 5 Jun 2020 13:14:14 +0200 Subject: [PATCH] 2220 - Added clearDisabled param --- front/core/components/field/index.html | 2 +- front/core/components/field/index.js | 1 + front/core/components/field/index.spec.js | 24 +++++++++++++++++++++++ front/core/components/textarea/index.js | 1 + front/core/components/textarea/style.scss | 8 ++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 front/core/components/field/index.spec.js create mode 100644 front/core/components/textarea/style.scss diff --git a/front/core/components/field/index.html b/front/core/components/field/index.html index b1b78be667..bd13f46d6d 100644 --- a/front/core/components/field/index.html +++ b/front/core/components/field/index.html @@ -13,7 +13,7 @@
- diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js index 81fd4cc6a2..8d619e4a3d 100644 --- a/front/core/components/field/index.js +++ b/front/core/components/field/index.js @@ -203,6 +203,7 @@ ngModule.vnComponent('vnField', { type: '@?', autocomplete: '@?', placeholder: '@?', + clearDisabled: ' { + let $element; + let controller; + + beforeEach(ngModule('vnCore')); + + beforeEach(inject(($compile, $rootScope) => { + $element = $compile(``)($rootScope); + controller = $element.controller('vnTextfield'); + })); + + afterEach(() => { + $element.remove(); + }); + + // Remove this block + describe('clearDisabled binding', () => { + it(`should enable the show property`, () => { + controller.clearDisabled = true; + + expect(controller.clearDisabled).toEqual(true); + }); + }); +}); diff --git a/front/core/components/textarea/index.js b/front/core/components/textarea/index.js index 1954b12c61..f8965830e2 100644 --- a/front/core/components/textarea/index.js +++ b/front/core/components/textarea/index.js @@ -1,5 +1,6 @@ import ngModule from '../../module'; import Field from '../field'; +import './style.scss'; export default class Textarea extends Field { constructor($element, $scope, $compile) { diff --git a/front/core/components/textarea/style.scss b/front/core/components/textarea/style.scss new file mode 100644 index 0000000000..2da8ad4d44 --- /dev/null +++ b/front/core/components/textarea/style.scss @@ -0,0 +1,8 @@ +.vn-textarea { + & > .container { + & > .icons { + display: flex; + align-items: flex-start; + } + } +} \ No newline at end of file