First steps towards better readonly support

Author: mike-marcacci

dist/bootstrap-decorator.min.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

dist/schema-form.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

dist/schema-form.min.js

@@ -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>

src/directives/array.js

@@ -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>

src/directives/decorators/bootstrap/actions.html

@@ -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

src/directives/decorators/bootstrap/array.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">

src/directives/decorators/bootstrap/bootstrap-decorator.js

@@ -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>

src/directives/decorators/bootstrap/checkbox.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"