Skip to content
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

Wip:Try dayjs instead of moment #351

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Wip:Try dayjs instead of moment #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"$": true,
"_": true,
"define": true,
"moment": true
"moment": true,
"dayjs": true,
"weekday": true
},
"extends": ["standard"],
"plugins": [],
Expand Down
1 change: 1 addition & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"tests"
],
"dependencies": {
"dayjs": "^1.8.22",
"jquery": ">=1.9",
"moment": ">=2.8.3"
},
Expand Down
4 changes: 2 additions & 2 deletions clndr.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo/demo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $(document).ready( function() {
// moment.locale('ru');

// Here's some magic to make sure the dates are happening this month.
var thisMonth = moment().format('YYYY-MM');
var thisMonth = dayjs().format('YYYY-MM');
// Events to load into calendar
var eventArray = [
{
Expand Down Expand Up @@ -152,4 +152,4 @@ $(document).ready( function() {
calendars.clndr3.forward();
}
});
});
});
6 changes: 4 additions & 2 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@

<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"></script>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"></script>-->
<script src="https://cdn.jsdelivr.net/npm/[email protected]/plugin/weekday.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dayjs.min.js"></script>
<script src="../src/clndr.js"></script>
<script src="demo.js"></script>
</body>
</html>
</html>
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"homepage": "https://github.com/kylestetz/CLNDR",
"main": "src/clndr.js",
"dependencies": {
"dayjs": "^1.8.22",
"jquery": ">=1.9",
"moment": ">=2.8.3"
},
Expand Down
Loading