Skip to content

D
doodle
Commit 50065ae7 by crosf32
Options

remove jquery

parent a110532b
Showing with 35 additions and 57 deletions
dist/css/doodle.css
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
color: #2c2c2c !important; color: #2c2c2c !important;
} }
.doodle-table thead tr th{ .doodle-table thead tr th {
padding: 15px; padding: 15px;
height: 70px; height: 70px;
font-family: "Segoe UI", "Helvetica Neue", Arial, sans-serif; font-family: "Segoe UI", "Helvetica Neue", Arial, sans-serif;
...@@ -154,11 +154,11 @@ ...@@ -154,11 +154,11 @@
} }
.doodle-table .delete_col{ .doodle-table .delete_col {
background: #fddddd; background: #fddddd;
position: absolute; position: absolute;
width: 100%; width: 100%;
top: -74px; top: -100%;
height: 74px; height: 74px;
left: 0; left: 0;
opacity: 0; opacity: 0;
...@@ -180,6 +180,16 @@ ...@@ -180,6 +180,16 @@
border-right: none; border-right: none;
} }
.doodle-table #heure:hover div {
display: flex;
opacity: 1;
}
.doodle-table #date:hover div {
display: flex;
opacity: 1;
}
.doodle-table #date:hover { .doodle-table #date:hover {
background: #fdf2f2 !important; background: #fdf2f2 !important;
color: #f55753; color: #f55753;
......
package.json
...@@ -12,11 +12,8 @@ ...@@ -12,11 +12,8 @@
"dayjs": "^1.8.14" "dayjs": "^1.8.14"
}, },
"devDependencies": { "devDependencies": {
"bootstrap": "4.0.0-alpha.6",
"font-awesome": "^4.7.0",
"flatpickr": "^4.6.13", "flatpickr": "^4.6.13",
"jquery": "^3.3.1", "font-awesome": "^4.7.0",
"moment": "^2.20.1", "moment": "^2.20.1"
"tether": "^1.4.3"
} }
} }
test/index.html
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
<title>Jumbotron Template for Bootstrap</title> <title>Jumbotron Template for Bootstrap</title>
<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.css">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="./css/starter-template.css" rel="stylesheet"> <link href="./css/starter-template.css" rel="stylesheet">
<link href="../dist/css/doodle.css" rel="stylesheet"> <link href="../dist/css/doodle.css" rel="stylesheet">
...@@ -18,13 +15,13 @@ ...@@ -18,13 +15,13 @@
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<!-- Example row of columns --> <!-- Example row of columns -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="specific-doodle"> <div class="specific-doodle">
<div class="doodle table-responsive" data-json='{"29/07/2019":["11","12:15","13"],"30/07/2019":["11","12:15","13"],"31/07/2019":["11","12:15","13"],"01/08/2019":["13","12:15","11"],"02/08/2019":["11","12:15","13"]}' ></div> <div class="doodle table-responsive" data-json='{"29/07/2019":["11","13"],"30/07/2019":["11","12:15","13"],"31/07/2019":["11","12:15","13"],"01/08/2019":["13","12:15","11"],"02/08/2019":["11","12:15","13"]}' ></div>
<input type="hidden" id="inputVal" value='{"29/07/2019":["11","12:15","13"],"30/07/2019":["11","12:15","13"],"31/07/2019":["11","12:15","13"],"01/08/2019":["13","12:15","11"],"02/08/2019":["11","12:15","13"]}'> <input type="hidden" id="inputVal" value='{"29/07/2019":["11", "13"],"30/07/2019":["11","12:15","13"],"31/07/2019":["11","12:15","13"],"01/08/2019":["13","12:15","11"],"02/08/2019":["11","12:15","13"]}'>
</div> </div>
<!--<div class="doodle table-responsive" data-json="json/data.json"></div> <!--<div class="doodle table-responsive" data-json="json/data.json"></div>
...@@ -36,21 +33,12 @@ ...@@ -36,21 +33,12 @@
<footer> <footer>
<p>© Company 2017</p> <p>© Company 2017</p>
</footer> </footer>
</div> <!-- /container --> </div>
<script src="../node_modules/moment/min/moment.min.js"></script>
<!-- Jquery --> <script src="../node_modules/moment/min/moment-with-locales.js"></script>
<script src="../node_modules/jquery/dist/jquery.js"></script> <script src="../node_modules/flatpickr/dist/flatpickr.js"></script>
<!--<script src="../node_modules/tether/dist/js/tether.js"></script>--> <script src="../node_modules/flatpickr/dist/l10n/fr.js"></script>
<!-- Bootstrap / Boostrap datepicker / Bootstrap timepicker --> <script src="../dist/js/doodle.js" type="text/javascript"></script>
<!--<script src="../node_modules/bootstrap/dist/js/bootstrap.js"></script>--> <script src="../test/js/app.js" type="text/javascript"></script>
<!-- Moment -->
<script src="../node_modules/moment/min/moment.min.js"></script>
<script src="../node_modules/moment/min/moment-with-locales.js"></script>
<script src="../node_modules/flatpickr/dist/flatpickr.js"></script>
<script src="../node_modules/flatpickr/dist/l10n/fr.js"></script>
<script src="../dist/js/doodle.js" type="text/javascript"></script>
<script src="../test/js/app.js" type="text/javascript"></script>
</body></html> </body></html>
test/js/app.js
$( document ).ready(function() { new Doodle(document.querySelector('.doodle'), {
$('.doodle').Doodle({
editMode: true, editMode: true,
vertical: true, vertical: true,
inputSelector: '#inputVal' inputSelector: '#inputVal'
});
}); });
yarn.lock
...@@ -2,35 +2,20 @@ ...@@ -2,35 +2,20 @@
# yarn lockfile v1 # yarn lockfile v1
bootstrap-datepicker@^1.7.1: dayjs@^1.8.14:
version "1.7.1" version "1.11.5"
resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.7.1.tgz#4ee7faf34888dbec7834fbf9dbe7c4277e01ddaf" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.5.tgz#00e8cc627f231f9499c19b38af49f56dc0ac5e93"
dependencies: integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==
jquery ">=1.7.1 <4.0.0"
bootstrap-timepicker@^0.5.2: flatpickr@^4.6.13:
version "0.5.2" version "4.6.13"
resolved "https://registry.yarnpkg.com/bootstrap-timepicker/-/bootstrap-timepicker-0.5.2.tgz#10ed9f2a2f0b8ccaefcde0fcf6a0738b919a3835" resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94"
integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==
bootstrap@4.0.0-alpha.6:
version "4.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz#4f54dd33ac0deac3b28407bc2df7ec608869c9c8"
dependencies:
jquery ">=1.9.1"
tether "^1.4.0"
font-awesome@^4.7.0: font-awesome@^4.7.0:
version "4.7.0" version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
"jquery@>=1.7.1 <4.0.0", jquery@>=1.9.1, jquery@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
moment@^2.20.1: moment@^2.20.1:
version "2.21.0" version "2.21.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a" resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
tether@^1.4.0, tether@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.3.tgz#fd547024c47b6e5c9b87e1880f997991a9a6ad54"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment