Merge branch 'readonly' of https://github.com/mike-marcacci/angular-schema-form into mike-marcacci-readonly

davidlgj · davidlgj · commit 90e0343f9200 · 2014-10-03T13:17:03.000+02:00
diff --git a/bower.json b/bower.json
@@ -29,17 +29,22 @@
     "coverage"
   ],
   "dependencies": {
-    "angular": ">= 1.2",
+    "angular": ">= 1.3.0-rc.3",
     "tv4": "~1.0.15",
     "angular-sanitize": ">= 1.2",
     "objectpath": "~1.0.4"
   },
   "devDependencies": {
     "angular-ui-ace": "bower",
     "angular-schema-form-datepicker": ">= 0.1.0",
+    "angular-schema-form-colorpicker": ">= 0.1.0",
     "jquery": "~2.1.1",
     "angular-mocks": ">= 1.2",
-    "angular-schema-form-colorpicker": ">= 0.1.0",
-    "tx-tinymce": ">= 0.0.5"
+    "tx-tinymce": ">= 0.0.5",
+    "angular-ui-sortable": "~0.12.11",
+    "bootstrap-vertical-tabs": "~1.2.0"
+  },
+  "resolutions": {
+    "angular": ">= 1.3.0-rc.3"
   }
 }
diff --git a/dist/bootstrap-decorator.min.js b/dist/bootstrap-decorator.min.js
diff --git a/dist/schema-form.js b/dist/schema-form.js
@@ -586,7 +586,6 @@ angular.module('schemaForm').provider('schemaForm',
   };
 
   var fieldset = function(name, schema, options) {
-
     if (schema.type === 'object') {
       var f   = stdFormObj(name, schema, options);
       f.type  = 'fieldset';
@@ -640,7 +639,8 @@ angular.module('schemaForm').provider('schemaForm',
         path: arrPath,
         required: required || false,
         lookup: options.lookup,
-        ignore: options.ignore
+        ignore: options.ignore,
+        global: options.global
       })];
 
       return f;
@@ -769,13 +769,13 @@ angular.module('schemaForm').provider('schemaForm',
 
         //if it's a type with items, merge 'em!
         if (obj.items) {
-          obj.items = service.merge(schema, obj.items, ignore);
+          obj.items = service.merge(schema, obj.items, ignore, options);
         }
 
         //if its has tabs, merge them also!
         if (obj.tabs) {
           angular.forEach(obj.tabs, function(tab) {
-            tab.items = service.merge(schema, tab.items, ignore);
+            tab.items = service.merge(schema, tab.items, ignore, options);
           });
         }
 
@@ -984,8 +984,16 @@ angular.module('schemaForm').directive('sfArray', ['sfSelect', 'schemaForm', 'sf
             // section. Unless there is just one.
             var subForm = form.items[0];
             if (form.items.length > 1) {
-              subForm = {type: 'section', items: form.items};
+              subForm = {
+                type: 'section',
+                items: form.items.map(function(item){
+                  item.ngModelOptions = form.ngModelOptions;
+                  item.readonly = form.readonly;
+                  return item;
+                })
+              };
             }
+
           }
 
           // We ceate copies of the form on demand, caching them for
diff --git a/dist/schema-form.min.js b/dist/schema-form.min.js
diff --git a/examples/bootstrap-example.html b/examples/bootstrap-example.html
@@ -82,7 +82,7 @@ <h3>Schema</h3>
 
 <script type="text/javascript" src="../dist/schema-form.js"></script>
 <script type="text/javascript" src="../dist/bootstrap-decorator.min.js"></script>
-<script type="text/javascript" src="../dist/bootstrap-datepicker.min.js"></script>
+<script type="text/javascript" src="../bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js"></script>
 <script type="text/javascript" src="../bower_components/angular-schema-form-colorpicker/bootstrap-colorpicker.min.js"></script>
 
 <!-- <script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>
diff --git a/src/directives/array.js b/src/directives/array.js
@@ -46,8 +46,16 @@ angular.module('schemaForm').directive('sfArray', ['sfSelect', 'schemaForm', 'sf
             // section. Unless there is just one.
             var subForm = form.items[0];
             if (form.items.length > 1) {
-              subForm = {type: 'section', items: form.items};
+              subForm = {
+                type: 'section',
+                items: form.items.map(function(item){
+                  item.ngModelOptions = form.ngModelOptions;
+                  item.readonly = form.readonly;
+                  return item;
+                })
+              };
             }
+
           }
 
           // We ceate copies of the form on demand, caching them for
diff --git a/src/directives/decorators/bootstrap/actions.html b/src/directives/decorators/bootstrap/actions.html
@@ -6,6 +6,7 @@
          ng-if="item.type === 'submit'">
   <button ng-repeat-end class="btn {{ item.style || 'btn-default' }}"
           type="button"
+          ng-disabled="form.readonly"
           ng-if="item.type !== 'submit'"
           ng-click="buttonClick($event,item)">{{item.title}}</button>
 </div>
diff --git a/src/directives/decorators/bootstrap/array.html b/src/directives/decorators/bootstrap/array.html
@@ -2,7 +2,8 @@
   <h3 ng-show="form.title && form.notitle !== true">{{ form.title }}</h3>
   <ol class="list-group" ng-model="modelArray" ui-sortable>
     <li class="list-group-item" ng-repeat="item in modelArray track by $index">
-      <button ng-click="deleteFromArray($index)"
+      <button ng-hide="form.readonly"
+              ng-click="deleteFromArray($index)"
               style="position: relative; z-index: 20;"
               type="button" class="close pull-right">
               <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
@@ -11,7 +12,8 @@ <h3 ng-show="form.title && form.notitle !== true">{{ form.title }}</h3>
     </li>
   </ol>
   <div class="clearfix" style="padding: 15px;">
-    <button ng-click="appendToArray()"
+    <button ng-hide="form.readonly"
+            ng-click="appendToArray()"
             type="button"
             class="btn {{ form.style.add || 'btn-default' }} pull-right">
       <i class="glyphicon glyphicon-plus"></i>
diff --git a/src/directives/decorators/bootstrap/bootstrap-decorator.js b/src/directives/decorators/bootstrap/bootstrap-decorator.js
@@ -23,11 +23,11 @@ angular.module('schemaForm').config(['schemaFormDecoratorsProvider', function(de
     help: base + 'help.html',
     'default': base + 'default.html'
   }, [
-    function(form) {
-      if (form.readonly && form.key && form.type !== 'fieldset') {
-        return base + 'readonly.html';
-      }
-    }
+    // function(form) {
+    //   if (form.readonly && form.key && form.type !== 'fieldset') {
+    //     return base + 'readonly.html';
+    //   }
+    // }
   ]);
 
   //manual use directives
diff --git a/src/directives/decorators/bootstrap/checkbox.html b/src/directives/decorators/bootstrap/checkbox.html
@@ -2,6 +2,7 @@
   <label>
     <input type="checkbox"
            sf-changed="form"
+           ng-disabled="form.readonly"
            ng-model="$$value$$"
            ng-model-options="form.ngModelOptions"
            schema-validate="form">
diff --git a/src/directives/decorators/bootstrap/checkboxes.html b/src/directives/decorators/bootstrap/checkboxes.html
@@ -3,6 +3,7 @@
   <div class="checkbox" ng-repeat="val in titleMapValues track by $index" >
     <label>
       <input type="checkbox"
+             ng-disabled="form.readonly"
              sf-changed="form"
              ng-model="titleMapValues[$index]">
       <span ng-bind-html="form.titleMap[$index].name"></span>
diff --git a/src/directives/decorators/bootstrap/default.html b/src/directives/decorators/bootstrap/default.html
@@ -9,6 +9,7 @@
          class="form-control"
          ng-model-options="form.ngModelOptions"
          ng-model="$$value$$"
+         ng-disabled="form.readonly"
          schema-validate="form">
   <span ng-if="form.feedback !== false"
         class="form-control-feedback"
diff --git a/src/directives/decorators/bootstrap/radio-buttons.html b/src/directives/decorators/bootstrap/radio-buttons.html
@@ -9,6 +9,7 @@
       <input type="radio"
              sf-changed="form"
              style="display: none;"
+             ng-disabled="form.readonly"
              ng-model="$$value$$"
              ng-model-options="form.ngModelOptions"
              ng-value="item.value">
diff --git a/src/directives/decorators/bootstrap/radios-inline.html b/src/directives/decorators/bootstrap/radios-inline.html
@@ -4,6 +4,7 @@
       <label class="radio-inline" ng-repeat="item in form.titleMap" >
       <input type="radio"
              sf-changed="form"
+             ng-disabled="form.readonly"
              ng-model="$$value$$"
              ng-value="item.value">
       <span ng-bind-html="item.name"></span>
diff --git a/src/directives/decorators/bootstrap/radios.html b/src/directives/decorators/bootstrap/radios.html
@@ -4,6 +4,7 @@
     <label>
       <input type="radio"
              sf-changed="form"
+             ng-disabled="form.readonly"
              ng-model="$$value$$"
              ng-model-options="form.ngModelOptions"
              ng-value="item.value">
diff --git a/src/directives/decorators/bootstrap/select.html b/src/directives/decorators/bootstrap/select.html
@@ -4,6 +4,7 @@
   </label>
   <select ng-model="$$value$$"
           ng-model-options="form.ngModelOptions"
+          ng-disabled="form.readonly"
           sf-changed="form"
           class="form-control"
           schema-validate="form"
diff --git a/src/directives/decorators/bootstrap/submit.html b/src/directives/decorators/bootstrap/submit.html
@@ -2,9 +2,11 @@
   <input type="submit"
          class="btn {{ form.style || 'btn-primary' }}"
          value="{{form.title}}"
+         ng-disabled="form.readonly"
          ng-if="form.type === 'submit'">
   <button class="btn {{ form.style || 'btn-default' }}"
           type="button"
           ng-click="buttonClick($event,form)"
+          ng-disabled="form.readonly"
           ng-if="form.type !== 'submit'">{{form.title}}</button>
 </div>
diff --git a/src/directives/decorators/bootstrap/tabarray.html b/src/directives/decorators/bootstrap/tabarray.html
@@ -10,7 +10,7 @@
           ng-class="{active: selected.tab === $index}">
           <a href="#">{{evalExpr(form.title,{'$index':$index, value: item}) || $index}}</a>
       </li>
-      <li ng-click="$event.preventDefault() || (selected.tab = appendToArray().length - 1)">
+      <li ng-hide="form.readonly" ng-click="$event.preventDefault() || (selected.tab = appendToArray().length - 1)">
         <a href="#">
           <i class="glyphicon glyphicon-plus"></i>
           {{ form.add || 'Add'}}
@@ -28,7 +28,8 @@
            <sf-decorator form="copyWithIndex($index)"></sf-decorator>
 
 
-           <button ng-click="selected.tab = deleteFromArray($index).length - 1"
+           <button ng-hide="form.readonly"
+                   ng-click="selected.tab = deleteFromArray($index).length - 1"
                    type="button"
                    class="btn {{ form.style.remove || 'btn-default' }} pull-right">
              <i class="glyphicon glyphicon-trash"></i>
@@ -46,7 +47,7 @@
           ng-class="{active: selected.tab === $index}">
           <a href="#">{{evalExpr(form.title,{'$index':$index, value: item}) || $index}}</a>
       </li>
-      <li ng-click="$event.preventDefault() || appendToArray()">
+      <li ng-hide="form.readonly" ng-click="$event.preventDefault() || appendToArray()">
         <a href="#">
           <i class="glyphicon glyphicon-plus"></i>
           {{ form.add || 'Add'}}
diff --git a/src/directives/decorators/bootstrap/tabs.html b/src/directives/decorators/bootstrap/tabs.html
@@ -1,6 +1,7 @@
 <div ng-init="selected = { tab: 0 }">
   <ul class="nav nav-tabs" style="margin-bottom: 15px">
     <li ng-repeat="tab in form.tabs"
+        ng-disabled="form.readonly"
         ng-click="$event.preventDefault() || (selected.tab = $index)"
         ng-class="{active: selected.tab === $index}">
         <a href="#">{{ tab.title }}</a>
@@ -9,6 +10,7 @@
 
   <div class="tab-content">
     <div class="tab-pane"
+         ng-disabled="form.readonly"
          ng-repeat="tab in form.tabs"
          ng-show="selected.tab === $index"
          ng-class="{active: selected.tab === $index}">
diff --git a/src/directives/decorators/bootstrap/textarea.html b/src/directives/decorators/bootstrap/textarea.html
@@ -3,6 +3,7 @@
   <textarea class="form-control"
             sf-changed="form"
             placeholder="{{form.placeholder}}"
+            ng-disabled="form.readonly"
             ng-model="$$value$$"
             ng-model-options="form.ngModelOptions"
             schema-validate="form"></textarea>
diff --git a/src/services/schema-form.js b/src/services/schema-form.js
@@ -147,7 +147,6 @@ angular.module('schemaForm').provider('schemaForm',
   };
 
   var fieldset = function(name, schema, options) {
-
     if (schema.type === 'object') {
       var f   = stdFormObj(name, schema, options);
       f.type  = 'fieldset';
@@ -201,7 +200,8 @@ angular.module('schemaForm').provider('schemaForm',
         path: arrPath,
         required: required || false,
         lookup: options.lookup,
-        ignore: options.ignore
+        ignore: options.ignore,
+        global: options.global
       })];
 
       return f;
@@ -330,13 +330,13 @@ angular.module('schemaForm').provider('schemaForm',
 
         //if it's a type with items, merge 'em!
         if (obj.items) {
-          obj.items = service.merge(schema, obj.items, ignore);
+          obj.items = service.merge(schema, obj.items, ignore, options);
         }
 
         //if its has tabs, merge them also!
         if (obj.tabs) {
           angular.forEach(obj.tabs, function(tab) {
-            tab.items = service.merge(schema, tab.items, ignore);
+            tab.items = service.merge(schema, tab.items, ignore, options);
           });
         }
 
