Skip to content
This repository has been archived by the owner on Feb 18, 2022. It is now read-only.

[CUSTOMER-768]datepickerの日付選択不具合 #336

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

[CUSTOMER-768]datepickerの日付選択不具合 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5447b78
input要素の代わりにng-modelを使うように変更
Sep 7, 2017
bce229b
値をクリアするボタン追加
Sep 7, 2017
8efa7c1
jslint対応、dist更新
Sep 7, 2017
0386f5b
Update README.md
Sep 7, 2017
4e20b51
font-sizeをinheritに変更
Sep 7, 2017
d33e27b
datepickerのroot要素にあるfloat:leftをやめる
Sep 7, 2017
3857379
document全体のclickイベントが拾えない不具合
Sep 8, 2017
3e0e18d
年月日以外の値を保持して更新する、selectにclass指定
Sep 24, 2017
cd27a74
prevボタンとnextボタンのデフォルトを変更
Sep 28, 2017
acf36b5
distの方の修正をsrcに移動する
Sep 28, 2017
6c863f1
jslint対応
Sep 28, 2017
db1309f
input以外の要素をクリックした場合は無視する
Sep 28, 2017
2a38326
iphoneのsafariで初期化時にInvalid Dateの値が入る
Nov 23, 2017
eda9c9e
Chrome でタブ移動で datepicker が隠れないバグ修正
lllfujilll Mar 3, 2018
44632f7
clear時に空文字ではなくnullをセットする
Mar 22, 2018
d960227
input formのdate format対応
junamai2000 Mar 26, 2018
8837372
triggerHandlerの削除
junamai2000 Mar 28, 2018
d4ada46
Merge pull request #1 from verybestjp/feature-dateformat
Mar 28, 2018
5560345
モバイル判定を一時的にOFF、triggerHandlerの削除のdist反映もれ
May 28, 2018
9d70c8c
stopPropagation追加、INPUTを2回clickでclose
Nov 19, 2018
7a627da
ng-clickの最後に$event.stopPropagation()する
Nov 21, 2018
a92b6b3
click時のみopen/closeするように変更
Nov 26, 2018
f137f22
input type=buttonはclickで開閉、それ以外はfocus/blurで開閉
Nov 26, 2018
d76e8de
focusout/blurの場合、フォーカス外れた時のevent.targetはINPUT以外の要素
Nov 26, 2018
40541e6
[modify]datepicker で「本日」にスタイルを当てる #64
Mar 4, 2019
af9d9f4
微修正
Mar 4, 2019
aea2ac2
npm run dist実行
Mar 4, 2019
fc3f52a
Merge pull request #2 from verybestjp/fix/date_picker_today_style
Mar 4, 2019
7da4d89
DateオブジェクトのsetMonthで月がずれる現象の対処
Sep 30, 2019
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
11 changes: 11 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
本家からの変更点
=============
- datepicker要素に ng-modelを設定して、日付選択時にこの値が更新される
- 内部にinputを置くのは変わらないが、日付選択時にinputのvalueは変更されない
- clear-text指定で上部にクリアボタンを表示
```
<datepicker datepicker-class="align-right" button-prev="<i class='fa fa-arrow-left'></i>" button-next="<i class='fa fa-arrow-right'></i>" ng-change="vm.getList(true)" clear-text="取消" ng-model="vm.search_todo.expect_time">
<input type="button" ng-value="vm.search_todo.expect_time ? (vm.search_todo.expect_time | jpdateFilter:'year_month_day') : '予定日'">
</datepicker>
```

Angular Datepicker
==================
![Angular datepicker calendar](http://i.imgur.com/jKfADtA.png)
Expand Down
29 changes: 19 additions & 10 deletions dist/angular-datepicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ datepicker a, [datepicker] a, .datepicker a{
datepicker a:hover, [datepicker] a:hover, .datepicker a:hover{
text-decoration:none;
}
datepicker select, datepicker select:focus, datepicker select:hover,
.datepicker select, .datepicker select:focus, .datepicker select:hover,
[datepicker] select, [datepicker] select:focus, [datepicker] select:hover{
datepicker select._720kb-datepicker-calendar-select,
.datepicker select._720kb-datepicker-calendar-select,
[datepicker] select._720kb-datepicker-calendar-select {
width:100%;
overflow: hidden;
background:none;
Expand All @@ -23,14 +23,13 @@ datepicker, .datepicker, [datepicker],
._720kb-datepicker-calendar-days-header,
._720kb-datepicker-calendar-years-pagination-pages {
font-family: Helvetica Neue, Arial, sans-serif;
font-size: 13.5px;
font-size: inherit;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
width: 100%;
margin: 0 auto;
float: left;
clear: right;
position: relative;
}
Expand Down Expand Up @@ -60,13 +59,17 @@ datepicker, .datepicker, [datepicker],
text-align: center;
font-size: 15px;
line-height: 40px;
}
._720kb-datepicker-calendar-header:nth-child(odd) {
background: #138EFA;
}
._720kb-datepicker-calendar-header:nth-child(even) {
background: #7BC6FC;
}
._720kb-datepicker-calendar-header-clear {
background: #DDDDDD;
}
._720kb-datepicker-calendar-header-container {
height:40px;
}
._720kb-datepicker-calendar-header-left,
._720kb-datepicker-calendar-header-middle,
._720kb-datepicker-calendar-header-right {
Expand Down Expand Up @@ -109,9 +112,16 @@ datepicker, .datepicker, [datepicker],
-moz-border-radius: 1px;
border-radius: 1px;
}
._720kb-datepicker-calendar-day:hover,
._720kb-datepicker-calendar-day:hover {
background: #d0e9ff;
}
._720kb-datepicker-calendar-day._720kb-datepicker-today {
background: #777;
color: #fff;
}
._720kb-datepicker-calendar-day._720kb-datepicker-active {
background: rgba(0, 0, 0, 0.03);
background: #138efa;
color: #fff;
}
._720kb-datepicker-calendar-header a, ._720kb-datepicker-calendar-header a:hover {
text-decoration:none;
Expand Down Expand Up @@ -144,7 +154,6 @@ datepicker, .datepicker, [datepicker],
}
._720kb-datepicker-calendar-years-pagination{
padding:2% 0 0 0;
float:left;
clear: right;
width: 100%;
}
Expand Down
180 changes: 121 additions & 59 deletions dist/angular-datepicker.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/angular-datepicker.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/angular-datepicker.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/angular-datepicker.sourcemap.map
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 19 additions & 10 deletions src/css/angular-datepicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ datepicker a, [datepicker] a, .datepicker a{
datepicker a:hover, [datepicker] a:hover, .datepicker a:hover{
text-decoration:none;
}
datepicker select, datepicker select:focus, datepicker select:hover,
.datepicker select, .datepicker select:focus, .datepicker select:hover,
[datepicker] select, [datepicker] select:focus, [datepicker] select:hover{
datepicker select._720kb-datepicker-calendar-select,
.datepicker select._720kb-datepicker-calendar-select,
[datepicker] select._720kb-datepicker-calendar-select {
width:100%;
overflow: hidden;
background:none;
Expand All @@ -23,14 +23,13 @@ datepicker, .datepicker, [datepicker],
._720kb-datepicker-calendar-days-header,
._720kb-datepicker-calendar-years-pagination-pages {
font-family: Helvetica Neue, Arial, sans-serif;
font-size: 13.5px;
font-size: inherit;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
width: 100%;
margin: 0 auto;
float: left;
clear: right;
position: relative;
}
Expand Down Expand Up @@ -60,13 +59,17 @@ datepicker, .datepicker, [datepicker],
text-align: center;
font-size: 15px;
line-height: 40px;
}
._720kb-datepicker-calendar-header:nth-child(odd) {
background: #138EFA;
}
._720kb-datepicker-calendar-header:nth-child(even) {
background: #7BC6FC;
}
._720kb-datepicker-calendar-header-clear {
background: #DDDDDD;
}
._720kb-datepicker-calendar-header-container {
height:40px;
}
._720kb-datepicker-calendar-header-left,
._720kb-datepicker-calendar-header-middle,
._720kb-datepicker-calendar-header-right {
Expand Down Expand Up @@ -109,9 +112,16 @@ datepicker, .datepicker, [datepicker],
-moz-border-radius: 1px;
border-radius: 1px;
}
._720kb-datepicker-calendar-day:hover,
._720kb-datepicker-calendar-day:hover {
background: #d0e9ff;
}
._720kb-datepicker-calendar-day._720kb-datepicker-today {
background: #777;
color: #fff;
}
._720kb-datepicker-calendar-day._720kb-datepicker-active {
background: rgba(0, 0, 0, 0.03);
background: #138efa;
color: #fff;
}
._720kb-datepicker-calendar-header a, ._720kb-datepicker-calendar-header a:hover {
text-decoration:none;
Expand Down Expand Up @@ -144,7 +154,6 @@ datepicker, .datepicker, [datepicker],
}
._720kb-datepicker-calendar-years-pagination{
padding:2% 0 0 0;
float:left;
clear: right;
width: 100%;
}
Expand Down
Loading