isolate form fix

sandrotaje · Jun 4, 2018 · c1fb0b1 · c1fb0b1
1 parent c45d63b
commit c1fb0b1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/dist/angular-uikit.min.js b/dist/angular-uikit.min.js
diff --git a/dist/index.html b/dist/index.html
@@ -45,9 +45,13 @@ <h1 class="uk-article-title">Sortable</h1>
 
     <article class="uk-article">
         <h1 class="uk-article-title">JSON Table Form</h1>
-        <uk-ng-json-table-form model="vm.jsonTableModel" structure="vm.structure" can-reorder="true" submit-on-enter="true" read-only="true"></uk-ng-json-table-form>
+        <form name="form" ng-submit="save(mt.machineType)">
+            <uk-ng-json-table-form model="vm.jsonTableModel" structure="vm.structure" can-reorder="true" submit-on-enter="true" read-only="false"></uk-ng-json-table-form>
+            {{form.$valid}}
+        </form>
+
 
-        {{vm.jsonTableModel | json}}
+        <!-- {{vm.jsonTableModel | json}} -->
     </article>
 
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js"></script>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-uikit",
-  "version": "1.3.16",
+  "version": "1.3.17",
   "description": "Angular Uikit binding",
   "main": "./dist/angular-uikit.min.js",
   "scripts": {

diff --git a/src/angular-uikit.js b/src/angular-uikit.js
@@ -24,29 +24,27 @@ angular.module('angularUikit', [])
                 if (!ctrl) {
                     return;
                 }
-    
+
                 // Do a copy of the controller
                 var ctrlCopy = {};
                 angular.copy(ctrl, ctrlCopy);
-    
+
                 // Get the parent of the form
                 var parent = elm.parent().controller('form');
                 // Remove parent link to the controller
                 parent.$removeControl(ctrl);
-    
+
                 // Replace form controller with a "isolated form"
-                var isolatedFormCtrl = {
-                    $setValidity: function (validationToken, isValid, control) {
-                        ctrlCopy.$setValidity(validationToken, isValid, control);
-                        parent.$setValidity(validationToken, true, ctrl);
-                    },
-                    $setDirty: function () {
-                        elm.removeClass('ng-pristine').addClass('ng-dirty');
-                        ctrl.$dirty = true;
-                        ctrl.$pristine = false;
-                    },
+                ctrl.$setValidity = function (validationToken, isValid, control) {
+                    ctrlCopy.$setValidity(validationToken, isValid, control);
+                    parent.$setValidity(validationToken, true, ctrl);
+                };
+                ctrl.$setDirty = function () {
+                    elm.removeClass('ng-pristine').addClass('ng-dirty');
+                    ctrl.$dirty = true;
+                    ctrl.$pristine = false;
                 };
-                angular.extend(ctrl, isolatedFormCtrl);
             }
         };
-    }]);;
+    }]);
+;