Merge branch 'master' into 'master'

Master (pmarco) See merge request modulos-npm/foca-directivas!7

Merge branch 'master' into 'master'
Master (pmarco) See merge request modulos-npm/foca-directivas!7
Pablo Marco del Pont
2 parents 3771393739 0305c43bb1
Showing 3 changed files Show diff stats
src/js/escKey-directive.js
src/js/focus-directive.js
src/js/tecladoVirtual-directive.js
@@ -3,9 +3,9 @@ angular.module(&#39;focaDirectivas&#39;)
         return function(scope, element, attrs) {
             element.bind('keydown keypress', function(event) {
                 if(event.which === 27) { // 27 = esc key
-                    scope.$apply(function (){
+                    scope.$apply(function() {
                         scope.$eval(attrs.escKey);
-                    });        
+                    });
                 event.preventDefault();
                 }
             });
@@ -6,14 +6,14 @@ angular.module(&#39;focaDirectivas&#39;)
             }
         }
  
-        return {            
+        return {
             restrict: "A",
-            link: function (scope, element, attrs, ctrls) {
+            link: function(scope, element, attrs, ctrls) {
                 checkDirectivePrerequisites(attrs);
  
-                scope.$watch(attrs.focaFocus, function (currentValue, lastValue) {
+                scope.$watch(attrs.focaFocus, function(currentValue, lastValue) {
                     if(currentValue == true) {
-                        $timeout(function () {                                                
+                        $timeout(function() {
                             element.focus();
                         });
                     }
 angular.module('focaDirectivas')
     .directive('tecladoVirtual', function() {
-        return function( scope, elem, attrs ) {
-            elem.bind('blur', function() {                
-                scope.$emit('focus', false);           
+        return function(scope, elem, attrs) {
+            elem.bind('blur', function() {
+                scope.$emit('blur');
             });
             elem.bind('focus', function() {
-                scope.$emit('focus', true);
+                scope.$emit('focus');
             });
         };
     });
...	...	@@ -3,9 +3,9 @@ angular.module('focaDirectivas')
3	3	return function(scope, element, attrs) {
4	4	element.bind('keydown keypress', function(event) {
5	5	if(event.which === 27) { // 27 = esc key
6		- scope.$apply(function (){
	6	+ scope.$apply(function() {
7	7	scope.$eval(attrs.escKey);
8		- });
	8	+ });
9	9	event.preventDefault();
10	10	}
11	11	});
...	...	@@ -6,14 +6,14 @@ angular.module('focaDirectivas')
6	6	}
7	7	}
8	8
9		- return {
	9	+ return {
10	10	restrict: "A",
11		- link: function (scope, element, attrs, ctrls) {
	11	+ link: function(scope, element, attrs, ctrls) {
12	12	checkDirectivePrerequisites(attrs);
13	13
14		- scope.$watch(attrs.focaFocus, function (currentValue, lastValue) {
	14	+ scope.$watch(attrs.focaFocus, function(currentValue, lastValue) {
15	15	if(currentValue == true) {
16		- $timeout(function () {
	16	+ $timeout(function() {
17	17	element.focus();
18	18	});
19	19	}
1	1	angular.module('focaDirectivas')
2	2	.directive('tecladoVirtual', function() {
3		- return function( scope, elem, attrs ) {
4		- elem.bind('blur', function() {
5		- scope.$emit('focus', false);
	3	+ return function(scope, elem, attrs) {
	4	+ elem.bind('blur', function() {
	5	+ scope.$emit('blur');
6	6	});
7	7	elem.bind('focus', function() {
8		- scope.$emit('focus', true);
	8	+ scope.$emit('focus');
9	9	});
10	10	};
11	11	});