Commit 8beecaf4 by Simon

Fix image

parent d4abd278
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
.doodle-table.backend tr td:last-child { .doodle-table.backend tr td:last-child {
background: #fafafa; background: #fafafa;
border: 1px dashed #e6e6e6; border-top: 1px dashed #e6e6e6;
} }
...@@ -158,30 +158,9 @@ ...@@ -158,30 +158,9 @@
align-items: center; align-items: center;
} }
.doodle-table .delete_row button{ .doodle-table .delete_col a, .doodle-table .delete_row a{
width: 16px; width: 16px;
height: 16px; height: 16px;
padding: 0;
font-weight: 200;
background: #f55753;
color: #fff;
border-radius: 2px;
border: none;
cursor: pointer;
}
.doodle-table .delete_col a{
width: 21px;
height: 21px;
padding: 0;
font-weight: 200;
background: #f55753;
color: #fff;
border-radius: 2px;
border: none;
text-decoration: none;
align-self: center;
} }
.doodle-table .delete_row button:focus{ .doodle-table .delete_row button:focus{
......
(function($) { (function($) {
const CLOSEIMG = 'assets/lib/doodle/css/close.png';
/** /**
* doodle Object * doodle Object
* @param item * @param item
...@@ -324,7 +326,7 @@ ...@@ -324,7 +326,7 @@
this.createJSON(); this.createJSON();
$('.doodle').html(''); $('.doodle').html('');
$(document).off('click', 'input[type=checkbox]'); $(document).off('click', 'input[type=checkbox]');
$(document).off('click', 'td button'); $(document).off('click', 'td a');
$(document).off('changeDate', '#addDate'); $(document).off('changeDate', '#addDate');
$(document).off('hide.timepicker', '#timepicker'); $(document).off('hide.timepicker', '#timepicker');
$(document).off('mouseenter mouseleave', '#date'); $(document).off('mouseenter mouseleave', '#date');
...@@ -357,7 +359,7 @@ ...@@ -357,7 +359,7 @@
}); });
$(document).on('click', 'input[type=checkbox]', this.eventCheckInput); $(document).on('click', 'input[type=checkbox]', this.eventCheckInput);
$(document).on('click', 'td button', this.eventRemoveDate); $(document).on('click', 'td a', this.eventRemoveDate);
$(document).on('click', 'th a', this.eventRemoveHour); $(document).on('click', 'th a', this.eventRemoveHour);
$(document).on('changeDate', '#myDatepicker', this.eventAddDate); $(document).on('changeDate', '#myDatepicker', this.eventAddDate);
$(document).on('hide.timepicker', '#timepicker',this.eventAddHour); $(document).on('hide.timepicker', '#timepicker',this.eventAddHour);
...@@ -449,7 +451,7 @@ ...@@ -449,7 +451,7 @@
let formatDateMonth = moment(this.days[index], 'DD/MM/YYYY').locale('fr').format('MMMM'); let formatDateMonth = moment(this.days[index], 'DD/MM/YYYY').locale('fr').format('MMMM');
let formatDate = moment(this.days[index], 'DD/MM/YYYY').format('DDMMYYYY'); let formatDate = moment(this.days[index], 'DD/MM/YYYY').format('DDMMYYYY');
html = $tr.append('<td id="date"><span class="date_format"><b>' + formatDateDay + '</b> ' + formatDateMonth + '</span><div class="delete_row"><button>x</button></div></td>') html = $tr.append('<td id="date"><span class="date_format"><b>' + formatDateDay + '</b> ' + formatDateMonth + '</span><div class="delete_row"><a href="#"><img src='+ CLOSEIMG +' /></a></div></td>')
.append(this.createBodyContent(formatDate)) .append(this.createBodyContent(formatDate))
.append('<td></td>'); .append('<td></td>');
...@@ -555,7 +557,7 @@ ...@@ -555,7 +557,7 @@
//Ajoute les heures //Ajoute les heures
for(let index in finalSortedTab) { for(let index in finalSortedTab) {
thead = $tr.append('<th id="heure"><span>' + finalSortedTab[index] + '</span><div class="delete_col"><a href="#">x</a></div></th>'); thead = $tr.append('<th id="heure"><span>' + finalSortedTab[index] + '</span><div class="delete_col"><a href="#"><img src='+ CLOSEIMG +' /></a></div></th>');
} }
thead = $tr.append(`<th><div class="input-group bootstrap-timepicker timepicker"> thead = $tr.append(`<th><div class="input-group bootstrap-timepicker timepicker">
...@@ -786,9 +788,10 @@ ...@@ -786,9 +788,10 @@
* @param e * @param e
*/ */
this.eventRemoveDate = (e) => { this.eventRemoveDate = (e) => {
e.preventDefault();
e.stopImmediatePropagation(); e.stopImmediatePropagation();
let date = $(e.target).parent().parent().find('span').text(); let date = $(e.target).parent().parent().parent().find('span').text();
let formatDateDay = moment(date, 'dddd DD MMMM').locale('fr').format('DDMMYYYY'); let formatDateDay = moment(date, 'dddd DD MMMM').locale('fr').format('DDMMYYYY');
let formatDateOnSneFou = moment(date, 'dddd DD MMMM').locale('fr').format('DD/MM/YYYY'); let formatDateOnSneFou = moment(date, 'dddd DD MMMM').locale('fr').format('DD/MM/YYYY');
...@@ -811,7 +814,7 @@ ...@@ -811,7 +814,7 @@
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
let hour = $(e.target).parent().parent().find('span').first().text(); let hour = $(e.target).parent().parent().parent().find('span').first().text();
hour = hour.replace('h', ':'); hour = hour.replace('h', ':');
if(hour.length < 5){ if(hour.length < 5){
......
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