empower-container 0.1.2 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +240 -236
- package/package.json +5 -2
- package/src/main/DatetimeFormatter.js +24 -21
- package/src/main/DatetimeFormatter.tsx +7 -4
- package/src/main/Information.js +13 -15
- package/src/main/Information.tsx +40 -36
- package/src/main/MenuBar.d.ts +0 -1
- package/src/main/MenuBar.js +26 -22
- package/src/main/MenuBar.tsx +41 -37
- package/src/main/Modal.d.ts +1 -0
- package/src/main/Modal.js +5 -5
- package/src/main/Modal.tsx +7 -10
- package/src/main/assets/Asset.d.ts +1 -0
- package/src/main/assets/Asset.js +5 -1
- package/src/main/assets/Asset.tsx +9 -0
- package/src/main/inputs/Input.d.ts +0 -1
- package/src/main/inputs/Input.js +0 -1
- package/src/main/inputs/Input.tsx +0 -1
- package/src/main/inputs/Select.d.ts +0 -1
- package/src/main/inputs/Select.js +3 -3
- package/src/main/inputs/Select.tsx +3 -3
- package/src/main/tsconfig.common.json +2 -1
- package/src/main/tsconfig.json +1 -0
- package/src/sample/App.d.ts +0 -1
- package/src/sample/App.js +1 -1
- package/src/sample/App.tsx +2 -1
- package/src/sample/TestMenuBar.js +24 -4
- package/src/sample/TestMenuBar.tsx +40 -10
- package/src/scss/components/_modal.scss +41 -30
- package/src/scss/elements/_button.scss +1 -3
- package/src/scss/elements/_popover.scss +6 -38
- package/src/scss/foundation/_mixins.scss +0 -2
- package/src/scss/foundation/_typography.scss +0 -4
- package/src/scss/library/_information.scss +68 -0
- package/{dist/scss/library/input.scss → src/scss/library/_input.scss} +0 -2
- package/{dist/scss/library/menubar.scss → src/scss/library/_menubar.scss} +0 -2
- package/{dist/scss/library/select.scss → src/scss/library/_select.scss} +0 -4
- package/src/scss/style.scss +21 -5
- package/dist/assets/Asset.d.ts +0 -14
- package/dist/assets/Asset.js +0 -43
- package/dist/assets/Asset.tsx +0 -66
- package/dist/assets/icons/icon-check-white-sm.svg +0 -3
- package/dist/assets/images/icon-arrowdown-graydark.svg +0 -3
- package/dist/assets/images/icon-arrowleft-graydark.svg +0 -3
- package/dist/assets/images/icon-arrowright-graydark.svg +0 -3
- package/dist/assets/images/icon-arrowup-graydark.svg +0 -3
- package/dist/assets/images/icon-check-graydark.svg +0 -3
- package/dist/cjs/DatetimeFormatter.d.ts +0 -3
- package/dist/cjs/DatetimeFormatter.js +0 -386
- package/dist/cjs/Information.d.ts +0 -10
- package/dist/cjs/Information.js +0 -64
- package/dist/cjs/MenuBar.d.ts +0 -25
- package/dist/cjs/MenuBar.js +0 -534
- package/dist/cjs/Modal.d.ts +0 -32
- package/dist/cjs/Modal.js +0 -32
- package/dist/cjs/assets/Asset.d.ts +0 -14
- package/dist/cjs/assets/Asset.js +0 -28
- package/dist/cjs/constants/Constant.d.ts +0 -15
- package/dist/cjs/constants/Constant.js +0 -35
- package/dist/cjs/index.d.ts +0 -3
- package/dist/cjs/index.js +0 -10
- package/dist/cjs/inputs/Input.d.ts +0 -26
- package/dist/cjs/inputs/Input.js +0 -107
- package/dist/cjs/inputs/InputSelectionHandler.d.ts +0 -3
- package/dist/cjs/inputs/InputSelectionHandler.js +0 -36
- package/dist/cjs/inputs/Select.d.ts +0 -29
- package/dist/cjs/inputs/Select.js +0 -403
- package/dist/esm/DatetimeFormatter.d.ts +0 -3
- package/dist/esm/DatetimeFormatter.js +0 -382
- package/dist/esm/Information.d.ts +0 -10
- package/dist/esm/Information.js +0 -36
- package/dist/esm/MenuBar.d.ts +0 -25
- package/dist/esm/MenuBar.js +0 -529
- package/dist/esm/Modal.d.ts +0 -32
- package/dist/esm/Modal.js +0 -27
- package/dist/esm/assets/Asset.d.ts +0 -14
- package/dist/esm/assets/Asset.js +0 -25
- package/dist/esm/constants/Constant.d.ts +0 -15
- package/dist/esm/constants/Constant.js +0 -32
- package/dist/esm/index.d.ts +0 -3
- package/dist/esm/index.js +0 -3
- package/dist/esm/inputs/Input.d.ts +0 -26
- package/dist/esm/inputs/Input.js +0 -105
- package/dist/esm/inputs/InputSelectionHandler.d.ts +0 -3
- package/dist/esm/inputs/InputSelectionHandler.js +0 -31
- package/dist/esm/inputs/Select.d.ts +0 -29
- package/dist/esm/inputs/Select.js +0 -399
- package/dist/scss/components/_index.scss +0 -1
- package/dist/scss/components/_modal.scss +0 -55
- package/dist/scss/elements/_button.scss +0 -109
- package/dist/scss/elements/_index.scss +0 -2
- package/dist/scss/elements/_popover.scss +0 -40
- package/dist/scss/foundation/_colors.scss +0 -60
- package/dist/scss/foundation/_index.scss +0 -5
- package/dist/scss/foundation/_mixins.scss +0 -43
- package/dist/scss/foundation/_normalize.scss +0 -204
- package/dist/scss/foundation/_settings.scss +0 -36
- package/dist/scss/foundation/_typography.scss +0 -99
- package/dist/scss/library/_index.scss +0 -3
- package/dist/scss/style.scss +0 -8
- package/src/scss/components/_index.scss +0 -1
- package/src/scss/foundation/_index.scss +0 -5
- package/src/scss/library/_index.scss +0 -3
- package/src/scss/library/input.scss +0 -39
- package/src/scss/library/menubar.scss +0 -227
- package/src/scss/library/select.scss +0 -262
package/README.md
CHANGED
@@ -5,132 +5,134 @@
|
|
5
5
|
|
6
6
|
|
7
7
|
## 1) Menubar
|
8
|
-
|
9
|
-
```
|
8
|
+
### Implementation
|
9
|
+
```js
|
10
10
|
import { MenuBar } from 'empoower-container';
|
11
11
|
```
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
12
|
+
### Options
|
13
|
+
|
14
|
+
```js
|
15
|
+
config: {
|
16
|
+
title: 'Test Title',
|
17
|
+
icon: SVG_REQUEST,
|
18
|
+
showInfo: true,
|
19
|
+
iconType: ['check', "back", 'standard']
|
20
|
+
}
|
21
|
+
```
|
22
|
+
```js
|
23
|
+
button {
|
24
|
+
show: true
|
25
|
+
actions: [{
|
26
|
+
class: 'button',
|
27
|
+
label: "Submit",
|
28
|
+
action: "readytosubmit", // string optional
|
29
|
+
icon: SVG_SUBMIT
|
30
|
+
}]
|
31
|
+
}
|
32
|
+
```
|
33
|
+
```js
|
34
|
+
buttonFooter: {
|
35
|
+
show: true,
|
36
|
+
actions: [{
|
24
37
|
class: 'button',
|
25
38
|
label: "Submit",
|
26
|
-
action: "
|
27
|
-
icon: SVG_SUBMIT
|
28
|
-
|
29
|
-
}
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
39
|
+
action: "footer-submit", // string optional
|
40
|
+
icon: SVG_SUBMIT,
|
41
|
+
show: true
|
42
|
+
}]
|
43
|
+
}
|
44
|
+
```
|
45
|
+
```js
|
46
|
+
pagination: {
|
47
|
+
show: true,
|
48
|
+
hideSummary: false,
|
49
|
+
counter: 10,
|
50
|
+
perPage: 10,
|
51
|
+
page: 1,
|
52
|
+
total: 35,
|
53
|
+
}
|
54
|
+
```
|
55
|
+
```js
|
56
|
+
pivot: {
|
57
|
+
show: true,
|
58
|
+
selected: 'all',
|
59
|
+
actions: [
|
60
|
+
{
|
61
|
+
label: "All",
|
62
|
+
value: "all", // string optional
|
63
|
+
},
|
64
|
+
{
|
65
|
+
label: "Pending",
|
66
|
+
value: "pending", // string optional
|
67
|
+
},
|
68
|
+
{
|
69
|
+
label: "Approved",
|
70
|
+
value: "approved", // string optional
|
71
|
+
},
|
72
|
+
{
|
73
|
+
label: "Rejected",
|
74
|
+
value: "rejected", // string optional
|
75
|
+
},
|
76
|
+
{
|
77
|
+
label: "Cancelled",
|
78
|
+
value: "cancelled", // string optional
|
79
|
+
},
|
80
|
+
]
|
81
|
+
}
|
82
|
+
```
|
83
|
+
```js
|
84
|
+
dropdown: {
|
85
|
+
show: true,
|
86
|
+
title: 'File Test',
|
87
|
+
type: 'date-picker-monthly',
|
88
|
+
selection: {
|
89
|
+
startDate: "Feb 2021",
|
90
|
+
endDate: "Feb 2021",
|
42
91
|
},
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
{
|
65
|
-
label: "Pending",
|
66
|
-
value: "pending", // string optional
|
67
|
-
},
|
68
|
-
{
|
69
|
-
label: "Approved",
|
70
|
-
value: "approved", // string optional
|
71
|
-
},
|
72
|
-
{
|
73
|
-
label: "Rejected",
|
74
|
-
value: "rejected", // string optional
|
75
|
-
},
|
76
|
-
{
|
77
|
-
label: "Cancelled",
|
78
|
-
value: "cancelled", // string optional
|
79
|
-
},
|
80
|
-
]
|
81
|
-
}
|
82
|
-
___
|
83
|
-
|
84
|
-
dropdown: {
|
85
|
-
show: true,
|
86
|
-
title: 'File Test',
|
87
|
-
type: 'date-picker-monthly',
|
88
|
-
selection: {
|
89
|
-
startDate: "Feb 2021",
|
90
|
-
endDate: "Feb 2021",
|
92
|
+
}
|
93
|
+
```
|
94
|
+
```js
|
95
|
+
search: {
|
96
|
+
show: true,
|
97
|
+
value: ''
|
98
|
+
}
|
99
|
+
```
|
100
|
+
```js
|
101
|
+
undoButton: {
|
102
|
+
show: false,
|
103
|
+
isFooter: true,
|
104
|
+
actions: [
|
105
|
+
{
|
106
|
+
class: 'button disabled',
|
107
|
+
show: true,
|
108
|
+
label: "Submit",
|
109
|
+
action: "submit",
|
110
|
+
icon: SVG_SUBMIT,
|
111
|
+
timer: 3,
|
112
|
+
disabled: true
|
91
113
|
},
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
timer: 3,
|
112
|
-
disabled: true
|
113
|
-
},
|
114
|
-
{
|
115
|
-
show: true,
|
116
|
-
label: "Undo Request",
|
117
|
-
action: "undo-request", // string optional
|
118
|
-
icon: SVG_UNDO
|
119
|
-
},
|
120
|
-
]
|
121
|
-
}
|
122
|
-
|
123
|
-
___
|
124
|
-
check: {
|
125
|
-
disabled: false,
|
126
|
-
selected: 0,
|
127
|
-
total: 1
|
128
|
-
}
|
129
|
-
___
|
130
|
-
info: 'Sample Information'
|
114
|
+
{
|
115
|
+
show: true,
|
116
|
+
label: "Undo Request",
|
117
|
+
action: "undo-request",
|
118
|
+
icon: SVG_UNDO
|
119
|
+
},
|
120
|
+
]
|
121
|
+
}
|
122
|
+
```
|
123
|
+
```js
|
124
|
+
check: {
|
125
|
+
disabled: false,
|
126
|
+
selected: 0,
|
127
|
+
total: 1
|
128
|
+
}
|
129
|
+
```
|
130
|
+
```js
|
131
|
+
info: 'Sample Information'
|
132
|
+
```
|
131
133
|
### Usage
|
132
134
|
|
133
|
-
```
|
135
|
+
```html
|
134
136
|
<MenuBar
|
135
137
|
config={menubar.config}
|
136
138
|
button={menubar.button}
|
@@ -152,135 +154,137 @@ ___
|
|
152
154
|
|
153
155
|
|
154
156
|
## 2) Modal
|
155
|
-
|
156
|
-
```
|
157
|
+
### Implementation
|
158
|
+
```js
|
157
159
|
import { Modal } from 'empoower-container';
|
158
160
|
```
|
159
161
|
### Options
|
162
|
+
|
160
163
|
show: false,
|
161
164
|
hideMenuBar: false, //optional
|
162
165
|
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
166
|
+
```js
|
167
|
+
config: {
|
168
|
+
title: 'Test Title',
|
169
|
+
icon: SVG_REQUEST,
|
170
|
+
showInfo: true,
|
171
|
+
iconType: ['standard', 'close'],
|
172
|
+
modalSize: 'lg'
|
173
|
+
}
|
174
|
+
```
|
175
|
+
```js
|
176
|
+
button {
|
177
|
+
show: true
|
178
|
+
actions: [{
|
179
|
+
class: 'button',
|
180
|
+
label: "Submit",
|
181
|
+
action: "readytosubmit", // string optional
|
182
|
+
icon: SVG_SUBMIT
|
183
|
+
}]
|
184
|
+
}
|
185
|
+
```
|
186
|
+
```js
|
187
|
+
buttonFooter: {
|
188
|
+
show: true,
|
189
|
+
actions: [{
|
174
190
|
class: 'button',
|
175
191
|
label: "Submit",
|
176
|
-
action: "
|
177
|
-
icon: SVG_SUBMIT
|
178
|
-
|
179
|
-
}
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
+
action: "footer-submit", // string optional
|
193
|
+
icon: SVG_SUBMIT,
|
194
|
+
show: true
|
195
|
+
}]
|
196
|
+
},
|
197
|
+
```
|
198
|
+
```js
|
199
|
+
pagination: {
|
200
|
+
show: true,
|
201
|
+
hideSummary: false,
|
202
|
+
counter: 10,
|
203
|
+
perPage: 10,
|
204
|
+
page: 1,
|
205
|
+
total: 35,
|
206
|
+
}
|
207
|
+
```
|
208
|
+
```js
|
209
|
+
pivot: {
|
210
|
+
show: true,
|
211
|
+
selected: 'all',
|
212
|
+
actions: [
|
213
|
+
{
|
214
|
+
label: "All",
|
215
|
+
value: "all", // string optional
|
216
|
+
},
|
217
|
+
{
|
218
|
+
label: "Pending",
|
219
|
+
value: "pending", // string optional
|
220
|
+
},
|
221
|
+
{
|
222
|
+
label: "Approved",
|
223
|
+
value: "approved", // string optional
|
224
|
+
},
|
225
|
+
{
|
226
|
+
label: "Rejected",
|
227
|
+
value: "rejected", // string optional
|
228
|
+
},
|
229
|
+
{
|
230
|
+
label: "Cancelled",
|
231
|
+
value: "cancelled", // string optional
|
232
|
+
},
|
233
|
+
]
|
234
|
+
}
|
235
|
+
```
|
236
|
+
```js
|
237
|
+
dropdown: {
|
238
|
+
show: true,
|
239
|
+
title: 'File Test',
|
240
|
+
type: 'date-picker-monthly',
|
241
|
+
selection: {
|
242
|
+
startDate: "Feb 2021",
|
243
|
+
endDate: "Feb 2021",
|
192
244
|
},
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
{
|
215
|
-
label: "Pending",
|
216
|
-
value: "pending", // string optional
|
217
|
-
},
|
218
|
-
{
|
219
|
-
label: "Approved",
|
220
|
-
value: "approved", // string optional
|
221
|
-
},
|
222
|
-
{
|
223
|
-
label: "Rejected",
|
224
|
-
value: "rejected", // string optional
|
225
|
-
},
|
226
|
-
{
|
227
|
-
label: "Cancelled",
|
228
|
-
value: "cancelled", // string optional
|
229
|
-
},
|
230
|
-
]
|
231
|
-
}
|
232
|
-
___
|
233
|
-
|
234
|
-
dropdown: {
|
235
|
-
show: true,
|
236
|
-
title: 'File Test',
|
237
|
-
type: 'date-picker-monthly',
|
238
|
-
selection: {
|
239
|
-
startDate: "Feb 2021",
|
240
|
-
endDate: "Feb 2021",
|
245
|
+
}
|
246
|
+
```
|
247
|
+
```js
|
248
|
+
search: {
|
249
|
+
show: true,
|
250
|
+
value: ''
|
251
|
+
}
|
252
|
+
```
|
253
|
+
```js
|
254
|
+
undoButton: {
|
255
|
+
show: false,
|
256
|
+
isFooter: true,
|
257
|
+
actions: [
|
258
|
+
{
|
259
|
+
class: 'button disabled',
|
260
|
+
show: true,
|
261
|
+
label: "Submit",
|
262
|
+
action: "submit", // string optional
|
263
|
+
icon: SVG_SUBMIT,
|
264
|
+
timer: 3,
|
265
|
+
disabled: true
|
241
266
|
},
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
___
|
251
|
-
undoButton: {
|
252
|
-
show: false,
|
253
|
-
isFooter: true,
|
254
|
-
actions: [
|
255
|
-
{
|
256
|
-
class: 'button disabled',
|
257
|
-
show: true,
|
258
|
-
label: "Submit",
|
259
|
-
action: "submit", // string optional
|
260
|
-
icon: SVG_SUBMIT,
|
261
|
-
timer: 3,
|
262
|
-
disabled: true
|
263
|
-
},
|
264
|
-
{
|
265
|
-
show: true,
|
266
|
-
label: "Undo Request",
|
267
|
-
action: "undo-request", // string optional
|
268
|
-
icon: SVG_UNDO
|
269
|
-
},
|
270
|
-
]
|
271
|
-
}
|
272
|
-
|
273
|
-
___
|
274
|
-
check: {
|
275
|
-
disabled: false,
|
276
|
-
selected: 0,
|
277
|
-
total: 1
|
278
|
-
}
|
279
|
-
___
|
280
|
-
info: 'Sample Information'
|
281
|
-
|
282
|
-
### Usage
|
267
|
+
{
|
268
|
+
show: true,
|
269
|
+
label: "Undo Request",
|
270
|
+
action: "undo-request", // string optional
|
271
|
+
icon: SVG_UNDO
|
272
|
+
},
|
273
|
+
]
|
274
|
+
}
|
283
275
|
```
|
276
|
+
```js
|
277
|
+
check: {
|
278
|
+
disabled: false,
|
279
|
+
selected: 0,
|
280
|
+
total: 1
|
281
|
+
}
|
282
|
+
```
|
283
|
+
```js
|
284
|
+
info: 'Sample Information'
|
285
|
+
```
|
286
|
+
### Usage
|
287
|
+
```html
|
284
288
|
<Modal
|
285
289
|
config={menubar.config}
|
286
290
|
button={menubar.button}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "empower-container",
|
3
|
-
"version": "0.1.
|
3
|
+
"version": "0.1.5",
|
4
4
|
"private": false,
|
5
5
|
"main": "./dist/cjs/index.js",
|
6
6
|
"module": "./dist/esm/index.js",
|
@@ -11,11 +11,14 @@
|
|
11
11
|
"@testing-library/user-event": "^13.5.0",
|
12
12
|
"@types/jest": "^27.4.1",
|
13
13
|
"@types/node": "^16.11.26",
|
14
|
-
"@types/react": "^17.0.
|
14
|
+
"@types/react": "^17.0.43",
|
15
15
|
"@types/react-dom": "^17.0.13",
|
16
|
+
"html-to-text": "^8.1.0",
|
16
17
|
"react": "^17.0.2",
|
17
18
|
"react-date-range": "^1.4.0",
|
18
19
|
"react-dom": "^17.0.2",
|
20
|
+
"react-native": "^0.68.0",
|
21
|
+
"react-native-render-html": "^6.3.4",
|
19
22
|
"react-render-html": "^0.6.0",
|
20
23
|
"react-scripts": "5.0.0",
|
21
24
|
"sass": "^1.49.9",
|
@@ -135,6 +135,8 @@ var datetimeFormatter = function (timestamp, format, todayServer, type, getServe
|
|
135
135
|
newFormat = dayName + ", " + dayDate + " " + monthName + " " + year;
|
136
136
|
break;
|
137
137
|
case "momentsAgo":
|
138
|
+
var diff = 0;
|
139
|
+
var diffMinute = 0;
|
138
140
|
if (todayTS >= dateTS) {
|
139
141
|
//check if 24hours has been passed
|
140
142
|
if (todayTS >= (dateTS + 86400)) {
|
@@ -143,28 +145,28 @@ var datetimeFormatter = function (timestamp, format, todayServer, type, getServe
|
|
143
145
|
else {
|
144
146
|
//check if hour has been passed
|
145
147
|
if (todayTS >= dateTS + 3600) {
|
146
|
-
|
148
|
+
diff = todayTS - dateTS;
|
147
149
|
if (diff === 0) {
|
148
150
|
newFormat = "An hour ago";
|
149
151
|
}
|
150
|
-
var
|
151
|
-
|
152
|
-
newFormat =
|
152
|
+
var diffHour_1 = diff / 3600;
|
153
|
+
diffHour_1 = ~~diffHour_1;
|
154
|
+
newFormat = diffHour_1 === 1 ? "An hour ago" : diffHour_1 + " hours ago";
|
153
155
|
}
|
154
156
|
else {
|
155
157
|
//check if a minute has been passed
|
156
158
|
if (todayTS >= dateTS + 60) {
|
157
|
-
|
159
|
+
diff = todayTS - dateTS;
|
158
160
|
if (diff === 0) {
|
159
161
|
newFormat = "A minute ago";
|
160
162
|
}
|
161
|
-
|
163
|
+
diffMinute = diff / 60;
|
162
164
|
diffMinute = ~~diffMinute;
|
163
165
|
newFormat = diffMinute === 1 ? "A minute ago" : diffMinute + " minutes ago";
|
164
166
|
}
|
165
167
|
else {
|
166
|
-
var
|
167
|
-
if (
|
168
|
+
var diff_1 = todayTS - dateTS;
|
169
|
+
if (diff_1 === 0 || diff_1 <= 10) {
|
168
170
|
newFormat = "Few seconds ago";
|
169
171
|
}
|
170
172
|
else {
|
@@ -179,6 +181,7 @@ var datetimeFormatter = function (timestamp, format, todayServer, type, getServe
|
|
179
181
|
}
|
180
182
|
break;
|
181
183
|
case "momentsAgoConvo":
|
184
|
+
var diffHour = 0;
|
182
185
|
if (todayTS >= dateTS) {
|
183
186
|
//check if 24hours has been passed
|
184
187
|
if (todayTS >= (dateTS + 86400)) {
|
@@ -187,28 +190,28 @@ var datetimeFormatter = function (timestamp, format, todayServer, type, getServe
|
|
187
190
|
else {
|
188
191
|
//check if hour has been passed
|
189
192
|
if (todayTS >= dateTS + 3600) {
|
190
|
-
var
|
191
|
-
if (
|
193
|
+
var diff_2 = todayTS - dateTS;
|
194
|
+
if (diff_2 === 0) {
|
192
195
|
newFormat = "An hour ago";
|
193
196
|
}
|
194
|
-
|
197
|
+
diffHour = diff_2 / 3600;
|
195
198
|
diffHour = ~~diffHour;
|
196
199
|
newFormat = diffHour === 1 ? "An hour ago" : diffHour + " hours ago";
|
197
200
|
}
|
198
201
|
else {
|
199
202
|
//check if a minute has been passed
|
200
203
|
if (todayTS >= dateTS + 60) {
|
201
|
-
var
|
202
|
-
if (
|
204
|
+
var diff_3 = todayTS - dateTS;
|
205
|
+
if (diff_3 === 0) {
|
203
206
|
newFormat = "A minute ago";
|
204
207
|
}
|
205
|
-
var
|
206
|
-
|
207
|
-
newFormat =
|
208
|
+
var diffMinute_1 = diff_3 / 60;
|
209
|
+
diffMinute_1 = ~~diffMinute_1;
|
210
|
+
newFormat = diffMinute_1 === 1 ? "A minute ago" : diffMinute_1 + " minutes ago";
|
208
211
|
}
|
209
212
|
else {
|
210
|
-
var
|
211
|
-
if (
|
213
|
+
var diff_4 = todayTS - dateTS;
|
214
|
+
if (diff_4 === 0 || diff_4 <= 10) {
|
212
215
|
newFormat = "Few moments ago";
|
213
216
|
}
|
214
217
|
else {
|
@@ -227,11 +230,11 @@ var datetimeFormatter = function (timestamp, format, todayServer, type, getServe
|
|
227
230
|
if (todayTS >= dateTS) {
|
228
231
|
//check if 24hours has been passed
|
229
232
|
if (todayTS >= (dateTS + 86400)) {
|
230
|
-
var
|
231
|
-
if (
|
233
|
+
var diff_5 = todayTS - dateTS;
|
234
|
+
if (diff_5 === 0) {
|
232
235
|
newFormat = "1 day";
|
233
236
|
}
|
234
|
-
var diffDay =
|
237
|
+
var diffDay = diff_5 / 86400;
|
235
238
|
diffDay = ~~diffDay;
|
236
239
|
newFormat = diffDay === 1 ? "1 day" : diffDay + " days";
|
237
240
|
}
|