Skip to content

Commit

Permalink
Merge pull request #483 from liimaorg/bugfix_datetimepicker
Browse files Browse the repository at this point in the history
Updated jquery, fixed datetimepicker
  • Loading branch information
yvespp authored May 8, 2019
2 parents 76e6cad + 7bd1ee7 commit 65d51b0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
4 changes: 2 additions & 2 deletions AMW_angular/io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"eonasdan-bootstrap-datetimepicker": "4.17.47",
"core-js": "2.5.2",
"ie-shim": "0.1.0",
"jquery": "3.3.1",
"jquery": "3.4.1",
"lodash": "4.17.11",
"moment": "2.21.0",
"@ng-select/ng-select": "0.19.0",
Expand All @@ -79,7 +79,7 @@
"@types/bootstrap": "3.3.36",
"@types/hammerjs": "2.0.33",
"@types/jasmine": "2.5.44",
"@types/jquery": "3.2.18",
"@types/jquery": "3.3.29",
"@types/lodash": "4.14.121",
"@types/node": "6.0.62",
"@types/selenium-webdriver": "2.53.39",
Expand Down
2 changes: 2 additions & 0 deletions AMW_angular/io/src/app/deployment/deployment.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import * as moment from 'moment';

declare var $: any;

$.fn.datetimepicker = require('eonasdan-bootstrap-datetimepicker');

@Component({
selector: 'amw-deployment',
templateUrl: './deployment.component.html'
Expand Down
18 changes: 14 additions & 4 deletions AMW_angular/io/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@
version "3.2.16"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.16.tgz#04419c404a3194350e7d3f339a90e72c88db3111"

"@types/[email protected]":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.18.tgz#a1cd262034cd8c79fa4d9b2a409d8f747ac2f72f"
"@types/[email protected]":
version "3.3.29"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.29.tgz#680a2219ce3c9250483722fccf5570d1e2d08abd"
dependencies:
"@types/sizzle" "*"

"@types/[email protected]":
version "4.14.121"
Expand Down Expand Up @@ -170,6 +172,10 @@
"@types/glob" "*"
"@types/node" "*"

"@types/sizzle@*":
version "2.3.2"
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"

"@types/source-map@*":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.2.tgz#973459e744cc7445c85b97f770275b479b138e08"
Expand Down Expand Up @@ -3604,7 +3610,11 @@ [email protected]:
version "0.0.10"
resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-0.0.10.tgz#94f48ae2bc946cad643035467b4bb7ea9c1075ef"

[email protected], "jquery@^1.8.3 || ^2.0 || ^3.0":
[email protected]:
version "3.4.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"

"jquery@^1.8.3 || ^2.0 || ^3.0":
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"

Expand Down

0 comments on commit 65d51b0

Please sign in to comment.