Skip to content

Fix start today #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hosseiniMajd wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix start today #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9e4467
Merge pull request #2 from a-m-dev/master
hosseiniMajd Nov 9, 2020
6838b55
Merge branch 'a-m-dev:master' into master
hosseiniMajd Dec 19, 2021
aa5e8c1
fix: show today in correct time-without gmt
Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Datepicker/lib/RangePicker.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Datepicker/lib/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Datepicker/src/DayComponent/DayComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ const DayComponent = ({

const [year, month] = monthId.split("__").map((el) => Number(el));

const todayDate = new Date().toLocaleString().replace(/(\d+)\/(\d+)\/(\d+)/, '$3-$1-$2');
const today = isJalaali
? jMoment(new Date().toISOString(), GEORGIAN_DATE_FORMAT).format(
JALAALI_DATE_FORMAT
? jMoment(todayDate, GEORGIAN_DATE_FORMAT).format(
JALAALI_DATE_FORMAT
)
: new Date().toISOString();
: todayDate;

const currentDate = `${year}-${month}-${day}`;

Expand Down
7 changes: 4 additions & 3 deletions src/js/Components/Datepicker/DayComponent/DayComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ const DayComponent = ({

const [year, month] = monthId.split("__").map((el) => Number(el));

const todayDate = new Date().toLocaleString().replace(/(\d+)\/(\d+)\/(\d+)/, '$3-$1-$2');
const today = isJalaali
? jMoment(new Date().toISOString(), GEORGIAN_DATE_FORMAT).format(
JALAALI_DATE_FORMAT
? jMoment(todayDate, GEORGIAN_DATE_FORMAT).format(
JALAALI_DATE_FORMAT
)
: new Date().toISOString();
: todayDate;

const currentDate = `${year}-${month}-${day}`;

Expand Down