From b7f3386416634caf394da7db4805c577cd9d9ce8 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 11 Jan 2021 08:31:26 +0100 Subject: [PATCH] wait #4135 @0.75 --- Discac/Discac.zip | Bin 5903 -> 8287 bytes Discac/index.html | 189 ++++++++++++++++++++++++++++++++-- Discac/jquery.multi-select.js | 6 +- 3 files changed, 183 insertions(+), 12 deletions(-) diff --git a/Discac/Discac.zip b/Discac/Discac.zip index 15beb02de8dc223b2d10ea10a236024fcead569d..2f28b243a448eb7dd4e2d13502ccbc7d8f7f22db 100644 GIT binary patch delta 6922 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 delta 4522 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 k&;CNbhl0Le{#Bqz;M1& diff --git a/Discac/index.html b/Discac/index.html index b6ceacc..a8bb00e 100644 --- a/Discac/index.html +++ b/Discac/index.html @@ -81,7 +81,7 @@ .multi-select-menu label { color: #464646; display: block; - padding: 2px 10px; + padding: 3px 10px; font-size: 16px; } @@ -95,7 +95,7 @@ display: block; color: #474747; font-size: 0.875em; - padding: 0.2em 0.6em; + padding: 0.2em 2em 0.2em 0.6em; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -105,6 +105,19 @@ position: relative; } + .multi-select-button.active { + background-color: #66a11a; + color: #fff; + } + + .multi-select-button.active:after{ + border-color: #fff transparent transparent transparent; + } + + .multi-select-container--open .multi-select-button.active::after{ + border-color: transparent transparent #fff transparent + } + .multi-select-button:after { content: ""; display: inline-block; @@ -112,7 +125,7 @@ height: 0; border-style: solid; border-width: 0.4em 0.4em 0 0.4em; - border-color: #999 transparent transparent transparent; + border-color: #474747 transparent transparent transparent; margin-left: 0.4em; vertical-align: 0.1em; position: absolute; @@ -150,8 +163,26 @@ border-color: transparent transparent #999 transparent; } - #emptyres{ - padding:0 25px; + .checkbox { + display: inline-block; + width: 19px; + height: 19px; + background-image: url("checkbox.png"); + background-size: 19px auto; + background-repeat: no-repeat; + background-position: 0 100%; + margin-right: 5px; + vertical-align: top; + position: relative; + top: 1px; + } + + .checkbox[checked] { + background-position: 0 0; + } + + #emptyres { + padding: 0 25px; } @@ -280,8 +311,15 @@ }); }); + updateCheckboxes(); + + function updateCheckboxes() { + $(":checkbox").checkbox(); + $(":radio").checkbox(); + } + function updateChapters() { - var hasVisible=false; + var hasVisible = false; $('nav a').each(function () { var hide = false; var a = $(this); @@ -302,14 +340,15 @@ if (hide) { $(a).hide(); } else { - hasVisible=true; + hasVisible = true; $(a).show(); } + updateCheckboxes(); }); - if(hasVisible){ + if (hasVisible) { $("#emptyres").hide(); - }else{ + } else { $("#emptyres").show(); } @@ -321,7 +360,139 @@ }); updateChapters(); + + }); + (function ($) { + $.propHooks.checked = { + set: function (el, value) { + if (el.checked !== value) { + el.checked = value; + $(el).trigger('checkboxchange'); + } + } + }; + + function JQcheckbox(element) { + this.element = element; + this.type = this.element.attr('type'); + this.input = element; + this.substitute; + this.label = element.parents("label"); + if (this.label.length == 0) { + this.label = $('label[for="' + element.attr('id') + '"]'); + } + this.label.attr('data-value', element.attr('value')); + this.init(); + } + + JQcheckbox.prototype = { + init: function () { + var $this = this; + this.element.hide(); + this.element.next(".checkbox").remove(); + this.substitute = $('
'); + + var ignore = ['name', 'id', 'type', 'checked', 'style', 'value', 'class']; + + $.each(this.element.attributes, function (k, v) { + if (ignore == undefined || ignore.indexOf(k) == -1) { + $this.substitute.attr(k, v); + } + }); + this.element.after(this.substitute); + this.initEvents(); + this.initState(); + }, + initEvents: function () { + var $this = this; + this.substitute.off('click'); + this.substitute.on('click', function () { + $this.click(); + return false; + }); + + this.element.off('checkboxchange'); + this.element.on('checkboxchange', function () { + $this.initState(); + }); + this.label.off('click'); + this.label.on('click', function (e) { + if (e.target == this) { + $this.click(); + return false; + } + }); + + }, + click: function () { + var change = false; + if (this.type == 'radio') { + change = this.check(); + } else { + change = this.toggle(); + } + + if (change) { + this.element.trigger('change'); + } + }, + initState: function () { + if (!this.element.prop('checked')) { + this.uncheck(); + } else { + this.check(); + } + }, + toggle: function () { + this.element.trigger('change'); + if (this.element.prop('checked')) { + this.uncheck(); + } else { + this.check(); + } + return true; + }, + check: function () { + if (this.type == 'radio') { + try { + $(':radio[name="' + this.element.attr('name') + '"]').not(this.element).each(function () { + $(this).data('checkbox').uncheck(); + }); + } catch (err) { + + } + } + + if (this.substitute.attr('checked') != 'checked') { + this.substitute.attr('checked', 'checked'); + this.element.prop('checked', true); + this.label.attr('data-checked', 'checked'); + return true; + } + return false; + }, + uncheck: function () { + this.label.attr('data-checked', null); + this.substitute.attr('checked', null); + this.element.prop('checked', false); + } + + + }; + + jQuery.fn.checkbox = function () { + return this.each(function () { + var $this = $(this); + if ($(this).data('checkbox') != undefined) { + $(this).data('checkbox').initState(); + return; + } + $(this).data('checkbox', new JQcheckbox($this)); + }) + }; + })(jQuery); + \ No newline at end of file diff --git a/Discac/jquery.multi-select.js b/Discac/jquery.multi-select.js index 7dca470..8143f30 100644 --- a/Discac/jquery.multi-select.js +++ b/Discac/jquery.multi-select.js @@ -141,11 +141,11 @@ this.$button.empty(); if (selected.length == 0) { - this.$button.text(this.settings['noneText']); + this.$button.removeClass('active').text(this.settings['noneText']); } else if ((selected.length === options.length) && this.settings['allText']) { - this.$button.text(this.settings['allText']); + this.$button.removeClass('active').text(this.settings['allText']); } else { - this.$button.text(this.settings['noneText'] + ' : ' + selected.join(', ')); + this.$button.addClass('active').text(this.settings['noneText'] + ' : ' + selected.join(', ')); } }, -- 2.39.5