Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4e10482

Browse files
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # package.json # src/material-decorator.js # src/material/actions-trcl.html # src/material/actions.html # src/material/card-content.html # src/material/card.html # src/material/fieldset.html # src/material/help.html # src/module.js # webpack.config.js
2 parents 26b8aac + 7e5446f commit 4e10482

14 files changed

+18
-44
lines changed

‎src/angular-schema-form-material-templates.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/material-decorator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function materialDecoratorConfig(
8484
tabs: { template: tabsTemplate, builder: [ sfField, mdTabs, condition ] },
8585
tabarray: { template: tabarrayTemplate, builder: arrays },
8686
textarea: { template: textareaTemplate, builder: defaults.concat(textarea) },
87-
switch: { template: switchTemplate, builder: defaults.concat(mdSwitch) }
87+
'switch': { template: switchTemplate, builder: defaults.concat(mdSwitch) }
8888
});
8989

9090
function sfLayout(args) {

‎src/material/array.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="schema-form-array {{form.htmlClass}}"
1+
<div class="schema-form-array {{::form.htmlClass}}"
22
sf-field-model="sf-new-array"
33
sf-new-array>
44
<label class="control-label" ng-show="showTitle()">{{ form.title }}</label>
@@ -7,7 +7,7 @@
77
sf-field-model="ng-repeat"
88
ng-repeat="item in modelArray track by $index"
99
schema-form-array-items
10-
class="{{form.fieldHtmlClass}}">
10+
class="{{::form.fieldHtmlClass}}">
1111
<md-button flex="none" flex-order="2"
1212
type="button"
1313
ng-hide="form.readonly || form.remove === null"

‎src/material/autocomplete.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="form-group {{form.htmlClass}} schema-form-select"
1+
<div class="form-group {{::form.htmlClass}} schema-form-select"
22
ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false}"
33
sf-messages sf-layout>
44
<md-autocomplete flex

‎src/material/chips.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="form-group schema-form-chips {{form.htmlClass}}"
1+
<div class="form-group schema-form-chips {{::form.htmlClass}}"
22
ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false}">
33
<md-chips sf-field-model readonly="form.readonly" flex
44
placeholder="{{::form.title}}">

‎src/material/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
type="{{::form.type}}"
88
step="any"
99
sf-changed="form"
10-
placeholder="{{form.placeholder}}"
10+
placeholder="{{::form.placeholder}}"
1111
id="{{::form.key|sfCamelKey}}"
1212
ng-class="::form.fieldHtmlClass"
1313
sf-type-parser="form.schema"

‎src/material/fieldset-trcl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<fieldset ng-disabled="form.readonly" class="standard {{form.htmlClass}}" flex>
1+
<fieldset ng-disabled="form.readonly" class="standard {{::form.htmlClass}}" flex>
22
<legend ng-show="form.title">{{ form.title }}</legend>
33
<div ng-transclude></div>
44
</fieldset>

‎src/material/radio-buttons.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="form-group schema-form-radiobuttons {{form.htmlClass}}"
1+
<div class="form-group schema-form-radiobuttons {{::form.htmlClass}}"
22
ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}" sf-layout sf-messages>
33
<div>
44
<label class="control-label" ng-show="showTitle()">{{form.title}}</label>
@@ -10,7 +10,7 @@
1010
sf-field-model="replaceAll"
1111
ng-model="$$value$$"
1212
sf-changed="form"
13-
class="radio {{form.fieldHtmlClass}}"
13+
class="radio {{::form.fieldHtmlClass}}"
1414
ng-class="{'md-primary': ($$value$$ == item.value)}"
1515
ng-disabled="form.readonly"
1616
ng-model-options="form.ngModelOptions"

‎src/material/radios-inline.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<div class="form-group schema-form-radios-inline {{form.htmlClass}}"
1+
<div class="form-group schema-form-radios-inline {{::form.htmlClass}}"
22
ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}" sf-layout sf-messages>
33
<label class="control-label" ng-show="showTitle()">{{form.title}}</label>
44
<md-radio-group layout="row"
55
sf-field-model="replaceAll"
66
ng-model="$$value$$"
7-
class="{{form.fieldHtmlClass}}"
7+
class="{{::form.fieldHtmlClass}}"
88
ng-class="{ active: item.value === $$value$$ }"
99
sf-changed="form"
1010
schema-validate="form"

‎src/material/radios.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="form-group schema-form-radios {{form.htmlClass}}"
1+
<div class="form-group schema-form-radios {{::form.htmlClass}}"
22
ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
33
<label class="control-label" ng-show="showTitle()" aria-label="{{form.title}}" layout="row">{{form.title}} {{form.titleMap | json}}</label>
44
<div>
@@ -9,7 +9,7 @@
99
sf-layout sf-messages>
1010
<md-radio-button ng-repeat="item in form.titleMap"
1111
ng-value="item.value"
12-
class="{{form.fieldHtmlClass}}"
12+
class="{{::form.fieldHtmlClass}}"
1313
sf-field-model="ng-class"
1414
ng-class="{ active: item.value === $$value$$ }">
1515
<span ng-bind-html="item.name"></span>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /