Skip to content

Commit 4068863

Browse files
tobiasnteirehotobiasnteireho
authored
Merge pull request #423 from CCALI/develop
10.2.1 release
2 parents b759fc1 + 2f5a6cc commit 4068863

File tree

7 files changed

+86
-59
lines changed

7 files changed

+86
-59
lines changed

‎index.dev.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
window.less = {async: true, fileSync: true};
3838
</script>
3939

40-
<script src=node_modules/steal/steal.production.js?v=1733931630154" cache-key="v" cache-version="1733931630154" main="a2jauthor/app"></script>
40+
<script src=node_modules/steal/steal.production.js?v=1738351887776" cache-key="v" cache-version="1738351887776" main="a2jauthor/app"></script>
4141
</body>
4242
</html>

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
window.less = {async: true, fileSync: true};
3838
</script>
3939

40-
<script src=node_modules/steal/steal.production.js?v=1733948585044" cache-key="v" cache-version="1733948585044" main="a2jauthor/app"></script>
40+
<script src=node_modules/steal/steal.production.js?v=1738613103503" cache-key="v" cache-version="1738613103503" main="a2jauthor/app"></script>
4141
</body>
4242
</html>

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "a2jauthor",
3-
"version": "10.2.0",
3+
"version": "10.2.1-1",
44
"description": "A2J Authoring App GUI.",
55
"license": "GNU AGPL v3.0",
66
"author": {
@@ -24,7 +24,7 @@
2424
},
2525
"dependencies": {
2626
"@caliorg/a2jdeps": "^7.1.7",
27-
"@caliorg/a2jviewer": "^8.4.0",
27+
"@caliorg/a2jviewer": "^8.4.1-1",
2828
"bit-tabs": "^2.0.0",
2929
"blueimp-file-upload": "^9.10.1",
3030
"bootstrap": "^3.4.1",

‎src/footer/footerVersion.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
const version = {
3-
number: '10.2.0',
4-
date: '2024-12-11'
3+
number: '10.2.1-1',
4+
date: '2025-02-03'
55
}
66

77
export default version

‎src/pages-tab/components/page-fields/page-fields.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ export const FieldVM = DefineMap.extend('FieldVM', {
123123
}
124124
},
125125

126+
get isDateType () {
127+
return this.type === constants.ftDateMDY
128+
},
129+
126130
get canRequire () {
127131
return pageFieldsHelpers.canRequire[this.type] !== false
128132
},
@@ -190,7 +194,7 @@ export const PageFieldsVM = DefineMap.extend('PageFieldsVM', {
190194
boundedDate.substr(2, 2)
191195
}
192196
}
193-
197+
194198
return textDate
195199
},
196200

@@ -201,7 +205,7 @@ export const PageFieldsVM = DefineMap.extend('PageFieldsVM', {
201205
mangleDateBound (el) {
202206
let str = el.value.split(',').join('')
203207
str = str.split('-').join('')
204-
208+
205209
str =
206210
str.substr(4, 2) + '/' +
207211
str.substr(6, 2) + '/' +

‎src/pages-tab/components/page-fields/page-fields.stache‎

Lines changed: 65 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -107,54 +107,77 @@
107107
</div>
108108
</div>
109109
{{#if(fieldVM.canMinMax)}}
110-
<div class="editspan form-group" name="min">
110+
{{#if(fieldVM.isDateType)}}
111+
<div class="editspan form-group" name="min">
111112

112-
<label class="control-label">Min Value:</label>
113-
<input class="form-control ui-widget editable"
114-
type="date" placeholder="min"
115-
id="min-date"
116-
pattern="TODAY|(?:^-(?=.*\d))|\d*"
117-
value="{{parseDateBound(fieldVM.field.min)}}"
118-
on:blur="fieldVM.field.min = mangleDateBound(scope.element)"
119-
{{ #eq(fieldVM.field.min, "TODAY")}} disabled {{/eq}}
120-
>
113+
<label class="control-label">Min Value:</label>
114+
<input class="form-control ui-widget editable"
115+
type="date" placeholder="min"
116+
id="min-date"
117+
pattern="TODAY|(?:^-(?=.*\d))|\d*"
118+
value="{{parseDateBound(fieldVM.field.min)}}"
119+
on:blur="fieldVM.field.min = mangleDateBound(scope.element)"
120+
{{ #eq(fieldVM.field.min, "TODAY")}} disabled {{/eq}}
121+
>
121122

122-
<div name="today-min">
123-
<div class="checkbox">
124-
<label>
125-
<input type="checkbox"
126-
{{ #eq(fieldVM.field.min, "TODAY")}} checked {{/eq}}
127-
on:blur="fieldVM.field.min = checktoToday(scope.element)"
128-
on:click="toggleDateBoundEnable('#min-date')"
129-
value:bind="fieldVM.field.min"
130-
value="TODAY"> TODAY
131-
</label>
123+
<div name="today-min">
124+
<div class="checkbox">
125+
<label>
126+
<input type="checkbox"
127+
{{ #eq(fieldVM.field.min, "TODAY")}} checked {{/eq}}
128+
on:blur="fieldVM.field.min = checktoToday(scope.element)"
129+
on:click="toggleDateBoundEnable('#min-date')"
130+
value:bind="fieldVM.field.min"
131+
value="TODAY"> TODAY
132+
</label>
133+
</div>
132134
</div>
133135
</div>
134-
</div>
135-
<div>
136-
<label class="control-label">Max Value:</label>
137-
<input class="form-control ui-widget editable"
138-
type="date" placeholder="max"
139-
id="max-date"
140-
value="{{parseDateBound(fieldVM.field.max)}}"
141-
pattern="TODAY|(?:^-(?=.*\d))|\d*"
142-
{{ #eq(fieldVM.field.max, "TODAY")}} disabled {{/eq}}
143-
on:blur="fieldVM.field.max = mangleDateBound(scope.element)"
144-
>
145-
<div name="today-max">
146-
<div class="checkbox">
147-
<label>
148-
<input type="checkbox"
149-
{{ #eq(fieldVM.field.max, "TODAY")}} checked {{/eq}}
150-
on:blur="fieldVM.field.max = checktoToday(scope.element)"
151-
on:click="toggleDateBoundEnable('#max-date')"
152-
value:bind="fieldVM.field.max"
153-
value="TODAY"> TODAY
154-
</label>
136+
<div>
137+
<label class="control-label">Max Value:</label>
138+
<input class="form-control ui-widget editable"
139+
type="date" placeholder="max"
140+
id="max-date"
141+
value="{{parseDateBound(fieldVM.field.max)}}"
142+
pattern="TODAY|(?:^-(?=.*\d))|\d*"
143+
{{ #eq(fieldVM.field.max, "TODAY")}} disabled {{/eq}}
144+
on:blur="fieldVM.field.max = mangleDateBound(scope.element)"
145+
>
146+
<div name="today-max">
147+
<div class="checkbox">
148+
<label>
149+
<input type="checkbox"
150+
{{ #eq(fieldVM.field.max, "TODAY")}} checked {{/eq}}
151+
on:blur="fieldVM.field.max = checktoToday(scope.element)"
152+
on:click="toggleDateBoundEnable('#max-date')"
153+
value:bind="fieldVM.field.max"
154+
value="TODAY"> TODAY
155+
</label>
156+
</div>
155157
</div>
156158
</div>
157-
</div>
159+
{{else}}
160+
<div class="editspan form-group" name="min">
161+
162+
<label class="control-label">Min Value:</label>
163+
<input class="form-control ui-widget editable"
164+
type="number" placeholder="min"
165+
id="min-number"
166+
value="{{fieldVM.field.min}}"
167+
on:blur="fieldVM.field.min = scope.element.value"
168+
169+
>
170+
</div>
171+
<div>
172+
<label class="control-label">Max Value:</label>
173+
<input class="form-control ui-widget editable"
174+
type="number" placeholder="max"
175+
id="max-number"
176+
value="{{fieldVM.field.max}}"
177+
on:blur="fieldVM.field.max = scope.element.value"
178+
>
179+
</div>
180+
{{/if}}
158181
{{/if}}
159182
{{#if(fieldVM.canList)}}
160183
<div name="listext" class="form-upload clearfix" style="padding-bottom: 15px;">

0 commit comments

Comments
 (0)