Merge branch 'hotfix/v1.0.13'

ShoppinPal · Aug 19, 2017 · ef8474f · ef8474f
2 parents 8d32391 + 8f22544
commit ef8474f
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 27 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "materializecss-autocomplete",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "angularjs autocomplete",
   "main": [
     "dist/js/materializecss-autocomplete.min.js",

diff --git a/demo/client/lib/js/materializecss-autocomplete.js b/demo/client/lib/js/materializecss-autocomplete.js
@@ -1,4 +1,4 @@
-/* materializecss-autocomplete - v1.0.12 - 2017-08-18 */(function () {
+/* materializecss-autocomplete - v1.0.13 - 2017-08-19 */(function () {
     'use strict';
     angular.module('material.autocomplete', ['material.autocomplete.templates'])
         .run(['$templateCache', '$compile', '$rootScope', function ($templateCache, $compile, $rootScope) {
@@ -147,6 +147,7 @@ angular.module('material.autocomplete.templates', []).run(['$templateCache', fun
 
         $timeout(function () {
             self.parentForm = $scope.parentForm;
+            self.immediateParentForm = $scope.immediateParentForm;
         }, 20);
 
 
@@ -335,13 +336,17 @@ angular.module('material.autocomplete.templates', []).run(['$templateCache', fun
             }
             if(self.checkError()) {
                 self.parentForm.$setValidity('selection', false);
-                self.immediateParentForm.$setValidity('selection', false);
-                self.immediateParentForm[self.inputFieldName].$setValidity('selection', false);
+                if(self.immediateParentForm) {
+                    self.immediateParentForm.$setValidity('selection', false);
+                    self.immediateParentForm[self.inputFieldName].$setValidity('selection', false);
+                }
             }
             else {
                 self.parentForm.$setValidity('selection', true);
-                self.immediateParentForm.$setValidity('selection', true);
-                self.immediateParentForm[self.inputFieldName].$setValidity('selection', true);
+                if(self.immediateParentForm) {
+                    self.immediateParentForm.$setValidity('selection', true);
+                    self.immediateParentForm[self.inputFieldName].$setValidity('selection', true);
+                }
             }
         };
 

diff --git a/demo/client/lib/js/materializecss-autocomplete.min.js b/demo/client/lib/js/materializecss-autocomplete.min.js
diff --git a/demo/client/lib/js/materializecss-autocomplete.min.js.map b/demo/client/lib/js/materializecss-autocomplete.min.js.map
diff --git a/dist/js/materializecss-autocomplete.js b/dist/js/materializecss-autocomplete.js
@@ -1,4 +1,4 @@
-/* materializecss-autocomplete - v1.0.12 - 2017-08-18 */(function () {
+/* materializecss-autocomplete - v1.0.13 - 2017-08-19 */(function () {
     'use strict';
     angular.module('material.autocomplete', ['material.autocomplete.templates'])
         .run(['$templateCache', '$compile', '$rootScope', function ($templateCache, $compile, $rootScope) {
@@ -147,6 +147,7 @@ angular.module('material.autocomplete.templates', []).run(['$templateCache', fun
 
         $timeout(function () {
             self.parentForm = $scope.parentForm;
+            self.immediateParentForm = $scope.immediateParentForm;
         }, 20);
 
 
@@ -335,13 +336,17 @@ angular.module('material.autocomplete.templates', []).run(['$templateCache', fun
             }
             if(self.checkError()) {
                 self.parentForm.$setValidity('selection', false);
-                self.immediateParentForm.$setValidity('selection', false);
-                self.immediateParentForm[self.inputFieldName].$setValidity('selection', false);
+                if(self.immediateParentForm) {
+                    self.immediateParentForm.$setValidity('selection', false);
+                    self.immediateParentForm[self.inputFieldName].$setValidity('selection', false);
+                }
             }
             else {
                 self.parentForm.$setValidity('selection', true);
-                self.immediateParentForm.$setValidity('selection', true);
-                self.immediateParentForm[self.inputFieldName].$setValidity('selection', true);
+                if(self.immediateParentForm) {
+                    self.immediateParentForm.$setValidity('selection', true);
+                    self.immediateParentForm[self.inputFieldName].$setValidity('selection', true);
+                }
             }
         };
 

diff --git a/dist/js/materializecss-autocomplete.min.js b/dist/js/materializecss-autocomplete.min.js
diff --git a/dist/js/materializecss-autocomplete.min.js.map b/dist/js/materializecss-autocomplete.min.js.map
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "materializecss-autocomplete",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "angularjs autocomplete",
   "main": "dist/js/materializecss-autocomplete.min.js",
   "style": "dist/css/materializecss-autocomplete.min.css",

diff --git a/src/js/autocomplete.controller.js b/src/js/autocomplete.controller.js
@@ -6,6 +6,7 @@
 
         $timeout(function () {
             self.parentForm = $scope.parentForm;
+            self.immediateParentForm = $scope.immediateParentForm;
         }, 20);
 
 
@@ -194,13 +195,17 @@
             }
             if(self.checkError()) {
                 self.parentForm.$setValidity('selection', false);
-                self.immediateParentForm.$setValidity('selection', false);
-                self.immediateParentForm[self.inputFieldName].$setValidity('selection', false);
+                if(self.immediateParentForm) {
+                    self.immediateParentForm.$setValidity('selection', false);
+                    self.immediateParentForm[self.inputFieldName].$setValidity('selection', false);
+                }
             }
             else {
                 self.parentForm.$setValidity('selection', true);
-                self.immediateParentForm.$setValidity('selection', true);
-                self.immediateParentForm[self.inputFieldName].$setValidity('selection', true);
+                if(self.immediateParentForm) {
+                    self.immediateParentForm.$setValidity('selection', true);
+                    self.immediateParentForm[self.inputFieldName].$setValidity('selection', true);
+                }
             }
         };