From f4cd5733952ca7341e13b526bd9d6f654d78bc04 Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 25 Aug 2017 12:24:04 +0200 Subject: [PATCH] - added rmariuzzo/jquery-checkboxes to composer requirements (composer.json) - removed js include/js/jquery.checkboxes-1.0.7.min.js - replaced jquery.checkboxes-1.0.7.min.js path with the new path --- application/views/templates/header.php | 2 +- composer.json | 15 ++++++++++++++- include/js/jquery.checkboxes-1.0.7.min.js | 1 - vilesci/personen/funktion_det.php | 2 +- vilesci/stammdaten/reihungstestverwaltung.php | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 include/js/jquery.checkboxes-1.0.7.min.js diff --git a/application/views/templates/header.php b/application/views/templates/header.php index fe502d323..9e47c6fff 100644 --- a/application/views/templates/header.php +++ b/application/views/templates/header.php @@ -56,7 +56,7 @@ if($jquery && $jqueryComposer) - + diff --git a/composer.json b/composer.json index 69c63dc1b..fa770d63e 100755 --- a/composer.json +++ b/composer.json @@ -71,6 +71,18 @@ "reference": "master" } } + }, + { + "type": "package", + "package": { + "name": "rmariuzzo/jquery-checkboxes", + "version": "1.0.7", + "source": { + "url": "https://github.com/rmariuzzo/checkboxes.js.git", + "type": "git", + "reference": "081cac1eb9b504dc32be27b57f32f6d1d29a5253" + } + } } ], "require": { @@ -98,7 +110,8 @@ "fzaninotto/faker": "1.*", "netcarver/textile": "^3.5", "netcarver/textile": "^3.5", - "borgar/textile-js": "1.0" + "borgar/textile-js": "1.0", + "rmariuzzo/jquery-checkboxes": "1.0.7" }, "require-dev": { "squizlabs/php_codesniffer": "2.*" diff --git a/include/js/jquery.checkboxes-1.0.7.min.js b/include/js/jquery.checkboxes-1.0.7.min.js deleted file mode 100644 index a548cff61..000000000 --- a/include/js/jquery.checkboxes-1.0.7.min.js +++ /dev/null @@ -1 +0,0 @@ -/*! checkboxes.js v1.0.7 | (c) 2013, 2016 Rubens Mariuzzo | http://github.com/rmariuzzo/checkboxes.js/LICENSE */"use strict";!function(a){var b=function(a){this.$context=a};b.prototype.check=function(){this.$context.find(":checkbox").filter(":not(:disabled)").filter(":visible").prop("checked",!0)},b.prototype.uncheck=function(){this.$context.find(":checkbox:visible").filter(":not(:disabled)").prop("checked",!1)},b.prototype.toggle=function(){this.$context.find(":checkbox:visible").filter(":not(:disabled)").each(function(){var b=a(this);b.prop("checked",!b.is(":checked"))})},b.prototype.max=function(a){if(a>0){var b=this;this.$context.on("click.checkboxes.max",":checkbox",function(){b.$context.find(":checked").length===a?b.$context.find(":checkbox:not(:checked)").prop("disabled",!0):b.$context.find(":checkbox:not(:checked)").prop("disabled",!1)})}else this.$context.off("click.checkboxes.max")},b.prototype.range=function(b){if(b){var c=this;this.$context.on("click.checkboxes.range",":checkbox",function(b){var d=a(b.target);if(b.shiftKey&&c.$last){var e=c.$context.find(":checkbox:visible"),f=e.index(c.$last),g=e.index(d),h=Math.min(f,g),i=Math.max(f,g)+1;e.slice(h,i).filter(":not(:disabled)").prop("checked",d.prop("checked"))}c.$last=d})}else this.$context.off("click.checkboxes.range")};var c=a.fn.checkboxes;a.fn.checkboxes=function(c){var d=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=a(this),f=e.data("checkboxes");f||e.data("checkboxes",f=new b(e,"object"==typeof c&&c)),"string"==typeof c&&f[c]&&f[c].apply(f,d)})},a.fn.checkboxes.Constructor=b,a.fn.checkboxes.noConflict=function(){return a.fn.checkboxes=c,this};var d=function(b){var c=a(b.target),d=c.attr("href"),e=a(c.data("context")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=c.data("action");e&&f&&(c.is(":checkbox")||b.preventDefault(),e.checkboxes(f))},e=function(){a("[data-toggle^=checkboxes]").each(function(){var b=a(this),c=b.data();delete c.toggle;for(var d in c)b.checkboxes(d,c[d])})};a(document).on("click.checkboxes.data-api","[data-toggle^=checkboxes]",d),a(document).on("ready.checkboxes.data-api",e)}(window.jQuery); \ No newline at end of file diff --git a/vilesci/personen/funktion_det.php b/vilesci/personen/funktion_det.php index b1ea94010..a111fdc2e 100644 --- a/vilesci/personen/funktion_det.php +++ b/vilesci/personen/funktion_det.php @@ -233,7 +233,7 @@ if (! $funktion->load ( $kurzbz )) { - + diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php index 2cc100d62..68b5d59f0 100644 --- a/vilesci/stammdaten/reihungstestverwaltung.php +++ b/vilesci/stammdaten/reihungstestverwaltung.php @@ -521,7 +521,7 @@ if(isset($_GET['excel'])) - +