Restructure colour.js to work withing a .ready()

This commit is contained in:
Daniel Quinn 2018-12-01 16:22:19 +00:00
parent 4f4c515629
commit ea05ab2b06

View File

@ -2,48 +2,46 @@
// drop-down on the `Add tag` page that will update to show the selected tag // drop-down on the `Add tag` page that will update to show the selected tag
// color as the drop-down value is changed. // color as the drop-down value is changed.
if (django.jQuery("#id_colour").length) { django.jQuery(document).ready(function(){
if (django.jQuery("#id_colour").length) {
let colour; let colour;
let colour_num; let colour_num;
colour_num = django.jQuery("#id_colour").val() - 1; colour_num = django.jQuery("#id_colour").val() - 1;
colour = django.jQuery('#id_colour')[0][colour_num].text; colour = django.jQuery('#id_colour')[0][colour_num].text;
django.jQuery('#id_colour').after('<div class="colour_square"></div>') django.jQuery('#id_colour').after('<div class="colour_square"></div>');
django.jQuery('.colour_square').css({ django.jQuery('.colour_square').css({
'float': 'left', 'float': 'left',
'width': '20px', 'width': '20px',
'height': '20px', 'height': '20px',
'margin': '5px', 'margin': '5px',
'border': '1px solid rgba(0, 0, 0, .2)', 'border': '1px solid rgba(0, 0, 0, .2)',
'background': colour 'background': colour
}); });
django.jQuery('#id_colour').change(function () { django.jQuery('#id_colour').change(function () {
colour_num = django.jQuery("#id_colour").val() - 1; colour_num = django.jQuery("#id_colour").val() - 1;
colour = django.jQuery('#id_colour')[0][colour_num].text; colour = django.jQuery('#id_colour')[0][colour_num].text;
django.jQuery('.colour_square').css({'background': colour}); django.jQuery('.colour_square').css({'background': colour});
}); });
}
// The following jQuery snippet will add a small square next to each selection } else if (django.jQuery("select[id*='colour']").length) {
// drop-down on the `Edit tags` page that will update to show the selected tag
// color as the drop-down value is changed.
if (django.jQuery('select[id*="-colour"]').length) {
django.jQuery('select[id*="-colour"]').each(function (index, element) { django.jQuery('select[id*="-colour"]').each(function (index, element) {
let id; let id;
let loop_colour_num let loop_colour_num;
let loop_colour let loop_colour;
id = "colour_square_" + index; id = "colour_square_" + index;
django.jQuery(element).after('<div class="colour_square" id="' + id + '"></div>') django.jQuery(element).after('<div class="colour_square" id="' + id + '"></div>');
loop_colour_num = django.jQuery(element).val() - 1; loop_colour_num = django.jQuery(element).val() - 1;
loop_colour = django.jQuery(element)[0][loop_colour_num].text; loop_colour = django.jQuery(element)[0][loop_colour_num].text;
django.jQuery("<style type='text/css'>\ django.jQuery("<style type='text/css'>\
.colour_square{ \ .colour_square{ \
float: left; \ float: left; \
width: 20px; \ width: 20px; \
@ -51,15 +49,18 @@ if (django.jQuery('select[id*="-colour"]').length) {
margin: 5px; \ margin: 5px; \
border: 1px solid rgba(0,0,0,.2); \ border: 1px solid rgba(0,0,0,.2); \
} </style>").appendTo("head"); } </style>").appendTo("head");
django.jQuery('#' + id).css({'background': loop_colour});
console.log(id, loop_colour_num, loop_colour);
django.jQuery(element).change(function () {
loop_colour_num = django.jQuery(element).val() - 1;
loop_colour = django.jQuery(element)[0][loop_colour_num].text;
django.jQuery('#' + id).css({'background': loop_colour}); django.jQuery('#' + id).css({'background': loop_colour});
console.log('#' + id, loop_colour)
console.log(id, loop_colour_num, loop_colour) });
django.jQuery(element).change(function () {
loop_colour_num = django.jQuery(element).val() - 1;
loop_colour = django.jQuery(element)[0][loop_colour_num].text;
django.jQuery('#' + id).css({'background': loop_colour});
console.log('#' + id, loop_colour)
});
}) })
}
}
});