diff --git a/@salix/app/src/components/app/style.css b/@salix/app/src/components/app/style.css index ab39408df..b1b1925d6 100644 --- a/@salix/app/src/components/app/style.css +++ b/@salix/app/src/components/app/style.css @@ -2,6 +2,6 @@ vn-app { height: 100%; } -vn-app .main-view > * { +.main-view > * { height: 100%; } \ No newline at end of file diff --git a/@salix/core/src/button/button.js b/@salix/core/src/button/button.js index 9d49323de..f260ba1d3 100644 --- a/@salix/core/src/button/button.js +++ b/@salix/core/src/button/button.js @@ -8,7 +8,7 @@ export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME]; export function directive(resolve) { return { - require: 'E', + restrict: 'E', template: function(_, attr) { return resolve.getTemplate(_NAME, attr); } diff --git a/@salix/core/src/check/check.js b/@salix/core/src/check/check.js index bfa94cc94..3b634e6c8 100644 --- a/@salix/core/src/check/check.js +++ b/@salix/core/src/check/check.js @@ -9,10 +9,15 @@ export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME]; export function directive(resolve, normalizer) { return { - require: 'E', + restrict: 'E', template: function(_, attrs) { normalizer.normalize(attrs); return resolve.getTemplate(_NAME, attrs); + }, + link: function(scope, element, attrs) { + scope.$watch (attrs.model, () => { + element[0].firstChild.MaterialCheckbox.updateClasses_(); + }); } }; } diff --git a/@salix/core/src/combo/combo.js b/@salix/core/src/combo/combo.js index 3c29a815c..1ad766e3d 100644 --- a/@salix/core/src/combo/combo.js +++ b/@salix/core/src/combo/combo.js @@ -9,11 +9,16 @@ export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME]; export function directive(resolve, normalizer) { return { - require: 'E', + restrict: 'E', transclude: true, template: function(_, attrs) { - normalizer.normalize (attrs); + normalizer.normalize(attrs); return resolve.getTemplate(_NAME, attrs); + }, + link: function(scope, element, attrs) { + scope.$watch(attrs.model, () => { + element[0].firstChild.MaterialTextfield.updateClasses_(); + }); } }; } diff --git a/@salix/core/src/date-picker/date-picker.js b/@salix/core/src/date-picker/date-picker.js index 5e5ca2e4d..62d90a960 100644 --- a/@salix/core/src/date-picker/date-picker.js +++ b/@salix/core/src/date-picker/date-picker.js @@ -9,10 +9,15 @@ export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME]; export function directive(resolve, normalizer) { return { - require: 'E', + restrict: 'E', template: function(_, attrs) { - normalizer.normalize (attrs); + normalizer.normalize(attrs); return resolve.getTemplate(_NAME, attrs); + }, + link: function(scope, element, attrs) { + scope.$watch(attrs.model, () => { + element[0].firstChild.MaterialTextfield.updateClasses_(); + }); } }; } diff --git a/@salix/core/src/icon-button/icon-button.js b/@salix/core/src/icon-button/icon-button.js index 180eb1b28..4d52d39fd 100644 --- a/@salix/core/src/icon-button/icon-button.js +++ b/@salix/core/src/icon-button/icon-button.js @@ -8,7 +8,7 @@ export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME]; export function directive(resolve) { return { - require: 'E', + restrict: 'E', template: function(_, attr) { return resolve.getTemplate(_NAME, attr); } diff --git a/@salix/core/src/label/label.js b/@salix/core/src/label/label.js index fb59785d3..7165de658 100644 --- a/@salix/core/src/label/label.js +++ b/@salix/core/src/label/label.js @@ -8,7 +8,7 @@ export const NAME = util.getName(_NAME); directive.$inject =[resolveFactory.NAME]; export function directive (resolve){ return{ - require:'E', + restrict:'E', template: function(_,attr){ return resolve.getTemplate(_NAME, attr); } diff --git a/@salix/core/src/mdl-override.css b/@salix/core/src/mdl-override.css index c3d1d5f10..92797572e 100644 --- a/@salix/core/src/mdl-override.css +++ b/@salix/core/src/mdl-override.css @@ -18,9 +18,4 @@ .mdl-button--raised:hover { background-color: #ffa410; -} - -.mdl-textfield__label{ - top: 0px; - font-size: 12px; } \ No newline at end of file diff --git a/@salix/core/src/password/password.js b/@salix/core/src/password/password.js index 8acd37bdf..7a918b1d9 100644 --- a/@salix/core/src/password/password.js +++ b/@salix/core/src/password/password.js @@ -6,15 +6,19 @@ import * as util from '../util'; const _NAME = 'password'; export const NAME = util.getName(_NAME); -directive.$inject =[resolveFactory.NAME, normalizerFactory.NAME]; -export function directive (resolve, normalizer){ - return{ - require:'E', - template: function(_, attrs){ - normalizer.normalize (attrs); +directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME]; +export function directive(resolve, normalizer) { + return { + restrict: 'E', + template: function(_, attrs) { + normalizer.normalize(attrs); return resolve.getTemplate(_NAME, attrs); + }, + link: function(scope, element, attrs) { + scope.$watch(attrs.model, () => { + element[0].firstChild.MaterialTextfield.updateClasses_(); + }); } } } - _module.directive(NAME,directive); diff --git a/@salix/core/src/popover/popover.js b/@salix/core/src/popover/popover.js index 21d212315..8dc342017 100644 --- a/@salix/core/src/popover/popover.js +++ b/@salix/core/src/popover/popover.js @@ -11,7 +11,7 @@ export function directive(resolver) { template: function(_, attrs) { return resolver.getTemplate(_NAME, attrs); }, - controller: function () { + controller: function() { this.onClick = function (event) { event.stopPropagation(); } diff --git a/@salix/core/src/radio/radio.js b/@salix/core/src/radio/radio.js index b84ffce6e..a87fae678 100644 --- a/@salix/core/src/radio/radio.js +++ b/@salix/core/src/radio/radio.js @@ -5,14 +5,14 @@ import * as util from '../util'; const _NAME = 'radio'; export const NAME = util.getName(_NAME); -directive.$inject =[resolveFactory.NAME]; -export function directive (resolve){ +directive.$inject = [resolveFactory.NAME]; +export function directive(resolve) { return{ - require:'E', - template: function(_,attr){ - return resolve.getTemplate(_NAME, attr); + restrict: 'E', + template: function(_, attrs) { + return resolve.getTemplate(_NAME, attrs); } } } -_module.directive(NAME,directive); +_module.directive(NAME, directive); diff --git a/@salix/core/src/snackbar/snackbar.js b/@salix/core/src/snackbar/snackbar.js index b04571659..5fe867234 100644 --- a/@salix/core/src/snackbar/snackbar.js +++ b/@salix/core/src/snackbar/snackbar.js @@ -5,14 +5,14 @@ import * as util from '../util'; const _NAME = 'snackbar'; export const NAME = util.getName(_NAME); -directive.$inject =[resolveFactory.NAME]; -export function directive (resolve){ +directive.$inject = [resolveFactory.NAME]; +export function directive(resolve) { return{ - require:'E', - template: function(_,attr){ - return resolve.getTemplate(_NAME, attr); + restrict: 'E', + template: function(_, attrs) { + return resolve.getTemplate(_NAME, attrs); } } } -_module.directive(NAME,directive); +_module.directive(NAME, directive); diff --git a/@salix/core/src/spinner/spinner.js b/@salix/core/src/spinner/spinner.js index 768ff5a3f..08a3154dc 100644 --- a/@salix/core/src/spinner/spinner.js +++ b/@salix/core/src/spinner/spinner.js @@ -6,10 +6,10 @@ const _NAME = 'spinner'; export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME]; -export function directive (resolve){ +export function directive(resolve) { return{ restrict: 'E', - template: function(_, attrs){ + template: function(_, attrs) { return resolve.getTemplate(_NAME, attrs); } } diff --git a/@salix/core/src/submit/submit.js b/@salix/core/src/submit/submit.js index a13771944..115c9fb1c 100644 --- a/@salix/core/src/submit/submit.js +++ b/@salix/core/src/submit/submit.js @@ -8,7 +8,7 @@ export const NAME = util.getName(_NAME); directive.$inject =[resolveFactory.NAME]; export function directive (resolve){ return{ - require:'E', + restrict:'E', template: function(_,attr){ return resolve.getTemplate(_NAME, attr); } diff --git a/@salix/core/src/textfield/textfield.js b/@salix/core/src/textfield/textfield.js index 11bc336df..c49448f4a 100644 --- a/@salix/core/src/textfield/textfield.js +++ b/@salix/core/src/textfield/textfield.js @@ -9,10 +9,16 @@ export const NAME = util.getName(_NAME); directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME]; export function directive(resolve, normalizer) { return { - require: 'E', + restrict: 'E', template: function(_, attrs) { normalizer.normalize(attrs); return resolve.getTemplate(_NAME, attrs); + }, + link: function(scope, element, attrs) { + scope.$watch(attrs.model, () => { + element[0].firstChild.MaterialTextfield.updateClasses_(); + }); + scope.$on ('$destroy', () => console.log ('Destroyed!')); } }; } diff --git a/@salix/crud/src/client/basic-data/index.js b/@salix/crud/src/client/basic-data/index.js index 744647225..4f4a41754 100644 --- a/@salix/crud/src/client/basic-data/index.js +++ b/@salix/crud/src/client/basic-data/index.js @@ -10,10 +10,7 @@ export const COMPONENT = { }, controller: function($http) { $http.get('/client/api/SalesPeople').then( - json => { - this.sales = json.data; - console.log(this.sales); - }, + json => this.sales = json.data, json => console.error(json.data.error.message) ); this.submit = function() { diff --git a/@salix/crud/src/client/fiscal-data/index.js b/@salix/crud/src/client/fiscal-data/index.js index 0bd3e0a7b..7a84011b3 100644 --- a/@salix/crud/src/client/fiscal-data/index.js +++ b/@salix/crud/src/client/fiscal-data/index.js @@ -9,13 +9,6 @@ export const COMPONENT = { client: '<' }, controller: function($http) { - $http.get('/client/api/SalesPeople').then( - json => { - this.sales = json.data; - console.log(this.sales); - }, - json => console.error(json.data.error.message) - ); this.submit = function() { $http.put('/client/api/Clients', this.client).then( json => console.log(json.statusText), diff --git a/@salix/login/src/login/login.js b/@salix/login/src/login/login.js index c62a927db..2c3d93639 100644 --- a/@salix/login/src/login/login.js +++ b/@salix/login/src/login/login.js @@ -21,12 +21,10 @@ export const COMPONENT = else showMessage('Please insert your email and password'); }; - function onLoginOk (response) { setLoading(false); window.location = response.data.location +'?access_token='+ response.data.accessToken; } - function onLoginErr(response) { setLoading(false); self.model.password = ''; @@ -46,11 +44,9 @@ export const COMPONENT = showMessage(message); } - function $(id) { return document.getElementById(id); } - function setLoading(isLoading) { // FIXME: Al minimificar MaterialSpinner es undefined /* var spinner = $('spinner').firstChild.MaterialSpinner; @@ -60,7 +56,6 @@ export const COMPONENT = else spinner.stop(); */ } - function showMessage(message) { // FIXME: Al minimificar no muestra la barra var snackbar = $('snackbar').firstChild.MaterialSnackbar;