IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore

Browse Source
This commit is contained in:
NikolayRechkin 2019-08-30 13:57:41 +03:00
commit 7b74e22fea
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/ASC.Web.Components/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "asc-web-components", "name": "asc-web-components",
"version": "1.0.22", "version": "1.0.23",
"description": "Ascensio System SIA component library", "description": "Ascensio System SIA component library",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"main": "dist/asc-web-components.cjs.js", "main": "dist/asc-web-components.cjs.js",

9
web/ASC.Web.Components/src/components/calendar-new/index.js
View File

@ -52,7 +52,8 @@ const CalendarStyle = styled.div`
font-size: 13px; font-size: 13px;
text-align: center; text-align: center;
${props => props.disabled ? ${props => props.disabled ?
`${DisabledStyle} `pointer-events: none;
${DisabledStyle}
` `
: "pointer-events: auto;" : "pointer-events: auto;"
} }
@ -301,7 +302,6 @@ class Calendar extends Component {
while (prevMonthDays != 0) { while (prevMonthDays != 0) {
if (prevDays + 1 === prevMonthDay) { disableClass = "calendar-month_disabled"; } if (prevDays + 1 === prevMonthDay) { disableClass = "calendar-month_disabled"; }
if (prevDays + 1 === prevYearDay) { disableClass = "calendar-month_disabled"; } if (prevDays + 1 === prevYearDay) { disableClass = "calendar-month_disabled"; }
//console.log(prevDays);
arrayDays.unshift( arrayDays.unshift(
<Day key={--keys} className={disableClass} > <Day key={--keys} className={disableClass} >
<AbbrDay <AbbrDay
@ -359,11 +359,6 @@ class Calendar extends Component {
else if (firstDay >= 5 && days > 30) { maxDays += 7; } else if (firstDay >= 5 && days > 30) { maxDays += 7; }
if (maxDays > 42) { maxDays -= 7; } if (maxDays > 42) { maxDays -= 7; }
//Disable next month days //Disable next month days
disableClass = null; disableClass = null;
if (openToDate.getFullYear() === maxDate.getFullYear() && openToDate.getMonth() >= maxDate.getMonth()) { if (openToDate.getFullYear() === maxDate.getFullYear() && openToDate.getMonth() >= maxDate.getMonth()) {

2
web/ASC.Web.Storybook/stories/input/calendar-new/README.md
View File

@ -7,7 +7,7 @@ Custom calendar
#### Usage #### Usage
```js ```js
import { Calendar } from 'asc-web-components'; import { NewCalendar } from 'asc-web-components';
<NewCalendar <NewCalendar
onChange={date => { onChange={date => {