diff --git a/.gitignore b/.gitignore index e0c27dee9d..d3afec1d95 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules spliting.js build npm-debug.log +debug.log diff --git a/.vscode/settings.json b/.vscode/settings.json index 7197067d15..b88a6ec8c8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,5 @@ { // Carácter predeterminado de final de línea. "files.eol": "\n", - "vsicons.presets.angular": true + "vsicons.presets.angular": false } \ No newline at end of file diff --git a/client/core/src/icon-button/icon-button.mdl.html b/client/core/src/icon-button/icon-button.mdl.html index bee2a4aafd..3b8763a59e 100644 --- a/client/core/src/icon-button/icon-button.mdl.html +++ b/client/core/src/icon-button/icon-button.mdl.html @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/client/core/src/label/label.mdl.js b/client/core/src/label/label.mdl.js index 8b656127c4..0f66320d73 100644 --- a/client/core/src/label/label.mdl.js +++ b/client/core/src/label/label.mdl.js @@ -14,7 +14,7 @@ export function factory() { default: { text: DEFAULT_TEXT } - } + }; } _module.factory(NAME, factory); diff --git a/client/core/src/mdl-override.css b/client/core/src/mdl-override.css index 63b8ab01e1..b29cc68d95 100644 --- a/client/core/src/mdl-override.css +++ b/client/core/src/mdl-override.css @@ -1,12 +1,10 @@ .mdl-textfield { width: 100%; } - /* TODO: No utilizar !important */ .mdl-button { font-weight: bolder; color: #ffa410; - } .mdl-button--colored { color: white !important; diff --git a/client/core/src/textfield/style.css b/client/core/src/textfield/style.css new file mode 100644 index 0000000000..78137af7ce --- /dev/null +++ b/client/core/src/textfield/style.css @@ -0,0 +1,11 @@ +.mdl-chip__action{ + position: absolute; + top: 0px; + right: -6px; + margin: 22px 0px; + visibility: hidden; +} + +.material-icons{ + font-size: 18px; +} \ No newline at end of file diff --git a/client/core/src/textfield/textfield.js b/client/core/src/textfield/textfield.js index c08d4cb2b1..09a61ead97 100644 --- a/client/core/src/textfield/textfield.js +++ b/client/core/src/textfield/textfield.js @@ -2,12 +2,13 @@ import {module as _module} from '../module'; import * as resolveFactory from '../lib/resolveDefaultComponents'; import * as normalizerFactory from '../lib/inputAttrsNormalizer'; import * as util from '../lib/util'; +require('./style.css'); const _NAME = 'textfield'; export const NAME = util.getName(_NAME); -directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME]; -export function directive(resolve, normalizer) { +directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME, '$parse']; +export function directive(resolve, normalizer, $parse) { return { restrict: 'E', template: function(_, attrs) { @@ -21,6 +22,36 @@ export function directive(resolve, normalizer) { mdlField.updateClasses_(); }); componentHandler.upgradeElement(element[0].firstChild); + + scope.clickClear = function(model) { + setTimeout(() => { + scope.$apply(function() { + $parse(model).assign(scope, ""); + }); + }); + }; + scope.onFocusInput = function(model, event) { + var buttonClear = event.target.parentNode.querySelector("button"); + checkModelValue(buttonClear, model); + }; + scope.onBlurInput = function(event) { + var buttonClear = event.target.parentNode.querySelector("button"); + setTimeout(() => { + buttonClear.style.visibility = "hidden"; + }, 80); + }; + element.on('input', function() { + var buttonClear = this.querySelector("button"); + var model = this.querySelector("input").value; + checkModelValue(buttonClear, model); + }); + + function checkModelValue(buttonClear, model) { + if (model !== undefined && model !== "") + buttonClear.style.visibility = "visible"; + else + buttonClear.style.visibility = "hidden"; + } } }; } diff --git a/client/core/src/textfield/textfield.mdl.html b/client/core/src/textfield/textfield.mdl.html index 1367b95575..f88b599493 100644 --- a/client/core/src/textfield/textfield.mdl.html +++ b/client/core/src/textfield/textfield.mdl.html @@ -5,6 +5,12 @@ name="*[name]*" ng-model="*[model]*" vn-validation="*[rule]*" - *[enabled]*/> + *[enabled]* + ng-focus="onFocusInput(*[model]*, $event)" + ng-blur="onBlurInput($event)" + /> + diff --git a/client/salix/src/components/main-menu/main-menu.html b/client/salix/src/components/main-menu/main-menu.html index dff65a946a..d1f3184c8d 100644 --- a/client/salix/src/components/main-menu/main-menu.html +++ b/client/salix/src/components/main-menu/main-menu.html @@ -9,7 +9,16 @@ --> -