removing q dependency, resolving build error Lazy undefined in unit tests

Author: nelsonomuto

app/index.html

@@ -61,7 +61,6 @@
 
         <!-- build:js scripts/modules.js -->
         <script src="bower_components/lazy.js/lazy.js"></script>
-        <script src="bower_components/lazy.js/lazy.browser.js"></script>
         <script src="bower_components/angular-resource/angular-resource.js"></script>
         <script src="bower_components/angular-cookies/angular-cookies.js"></script>
         <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>

app/scripts/directives/customvalidation/customValidations.js

@@ -2,7 +2,7 @@ angular_ui_form_validations = (function(){
 
     var customValidations, createValidationFormatterLink, customValidationsModule, getValidationPriorityIndex, getValidationAttributeValue,
         getValidatorByAttribute, getCustomTemplate, customTemplates, isCurrentlyDisplayingAnErrorMessageInATemplate,
-        currentlyDisplayedTemplate, dynamicallyDefinedValidation, defaultFieldIsValidSuccessFn;        
+        currentlyDisplayedTemplate, dynamicallyDefinedValidation, defaultFieldIsValidSuccessFn, $q, $timeout, $log;        
 
     customTemplates = [];
 
@@ -21,8 +21,7 @@ angular_ui_form_validations = (function(){
         },
         validator: function (errorMessageElement, val, attr, element, model, modelCtrl, scope) {
             var valid, hydrateDynamicallyDefinedValidation, scopeValidations, 
-                setErrorIdentifier, setValidity, validatorArgs;
-
+                setErrorIdentifier, setValidity, validatorArgs, deferred;
             validatorArgs = arguments;
             scopeValidations = scope[attr];
 
@@ -174,8 +173,11 @@ angular_ui_form_validations = (function(){
         return index;
     };
 
-    createValidationFormatterLink = function (formatterArgs, templateRetriever, $q, $timeout, $log) {
-        
+    createValidationFormatterLink = function (formatterArgs, templateRetriever, q, timeout, log) {
+        $q = q;
+        $timeout = timeout;
+        $log = log;
+
         return function($scope, $element, $attrs, ngModelController) {
             var customErrorMessage, errorMessage, errorMessageElement, modelName, model, propertyName, runCustomValidations, validationAttributeValue, customErrorTemplate;
             $timeout(function() {
@@ -325,39 +327,39 @@ angular_ui_form_validations = (function(){
                         if(! currentlyDisplayingAnErrorMessage) {
                             $element.siblings('.CustomValidationError.'+ formatterArgs.customValidationAttribute + '.' + propertyName + 'property:first')
                                 .toggle(!isValid);
-                        } else if(! isCurrentlyDisplayingAnErrorMessageInATemplate($element)){ 
+                        } else if(! isCurrentlyDisplayingAnErrorMessageInATemplate($element)){
                             currentErrorMessageValidator = getValidatorByAttribute(currentErrorMessage.attr('data-custom-validation-attribute'));
                             currentErrorMessageIsStale = currentErrorMessageValidator(errorMessageElement.clone(), value, $attrs[currentErrorMessage.attr('data-custom-validation-attribute')], $element, model, ngModelController, $scope);
-                            
+
                             currentErrorMessagePriorityIndex = parseInt(currentErrorMessage.attr('data-custom-validation-priorityIndex'), 10);
                             currentErrorMessageIsOfALowerPriority = currentErrorMessagePriorityIndex >= getValidationPriorityIndex(formatterArgs.customValidationAttribute);
-                            
+
                             if (currentErrorMessageIsStale || (!currentErrorMessageIsStale && currentErrorMessageIsOfALowerPriority && !isValid)) {
                                 currentErrorMessage.hide();
                                 $element.siblings('.CustomValidationError.'+ formatterArgs.customValidationAttribute + '.' + propertyName + 'property:first')
-                                    .toggle(!isValid);                        
-                            }                      
+                                    .toggle(!isValid);
+                            }
                         }
 
                         if(isCurrentlyDisplayingAnErrorMessageInATemplate($element)) {
                             currentErrorMessageValidator = getValidatorByAttribute(currentErrorMessage.attr('data-custom-validation-attribute'));
                             currentErrorMessageIsStale = currentErrorMessageValidator(
                                 errorMessageElement,
-                                value, 
-                                getValidationAttributeValue($attrs[currentErrorMessage.attr('data-custom-validation-attribute')]), 
+                                value,
+                                getValidationAttributeValue($attrs[currentErrorMessage.attr('data-custom-validation-attribute')]),
                                 $element, model, ngModelController
                             );
-                            
+
                             currentErrorMessagePriorityIndex = parseInt(currentErrorMessage.attr('data-custom-validation-priorityIndex'), 10);
                             currentErrorMessageIsOfALowerPriority = currentErrorMessagePriorityIndex >= getValidationPriorityIndex(formatterArgs.customValidationAttribute);
-                            
-                            if (currentErrorMessageIsStale || (!currentErrorMessageIsStale && currentErrorMessageIsOfALowerPriority && !isValid 
+
+                            if (currentErrorMessageIsStale || (!currentErrorMessageIsStale && currentErrorMessageIsOfALowerPriority && !isValid
                                 && currentlyDisplayedTemplate.children().attr('class').indexOf(formatterArgs.customValidationAttribute) === -1)) {
                                 currentErrorMessage.hide();
                                 $element.siblings('.CustomValidationError.'+ formatterArgs.customValidationAttribute + '.' + propertyName + 'property:first')
-                                    .toggle(!isValid);                              
+                                    .toggle(!isValid);
                                 $scope.$broadcast('errorMessageToggled');
-                            }                      
+                            }
                         }
 
                         $scope.$broadcast('customValidationComplete', customValidationBroadcastArg);

app/scripts/directives/customvalidationtypes/customValidationTypes.js

@@ -1,7 +1,7 @@
 (function(){
     var extendCustomValidations = angular.module('directives.customvalidation.customValidationTypes', [
         'directives.customvalidation.customValidations'
-    ])
+    ]);
 
     getValidationAttributeValue = angular_ui_form_validations.getValidationAttributeValue;
 

bower.json

@@ -14,8 +14,7 @@
     "angular-sanitize": "~1.2.0",
     "angular-route": "~1.2.0",
     "angular-bootstrap": "~0.7.0",
-    "angular-template-retriever": "*",
-    "q": "~2.0.0"
+    "angular-template-retriever": "*"
   },
   "devDependencies": {
     "angular-mocks": "~1.2.0",

karma.conf.js

@@ -11,6 +11,7 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
+      'app/bower_components/lazy.js/lazy.js',
       'app/bower_components/jquery/jquery.js',
       'app/bower_components/angular/angular.js',
       'app/bower_components/angular-mocks/angular-mocks.js',