From aeef95ae52a73544681b45e387f7dd580e88e011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20L=2E=20=C5=A0ijanec?= Date: Tue, 28 Apr 2020 22:53:07 +0200 Subject: delam. --- layout/css/clean-blog.css | 411 ++++++++++++++++ layout/js/clean-blog.js | 41 ++ layout/js/contact_me.js | 75 +++ layout/js/jqBootstrapValidation.js | 937 +++++++++++++++++++++++++++++++++++++ lib/jsmin.c | 324 +++++++++++++ src/jsbundle.c | 26 + test/jsmin-test.c | 12 + 7 files changed, 1826 insertions(+) create mode 100644 layout/css/clean-blog.css create mode 100644 layout/js/clean-blog.js create mode 100644 layout/js/contact_me.js create mode 100644 layout/js/jqBootstrapValidation.js create mode 100644 lib/jsmin.c create mode 100644 src/jsbundle.c create mode 100644 test/jsmin-test.c diff --git a/layout/css/clean-blog.css b/layout/css/clean-blog.css new file mode 100644 index 0000000..abe4f83 --- /dev/null +++ b/layout/css/clean-blog.css @@ -0,0 +1,411 @@ +/*! + * Start Bootstrap - Clean Blog v5.0.8 (https://startbootstrap.com/template-overviews/clean-blog) + * Copyright 2013-2019 Start Bootstrap + * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-clean-blog/blob/master/LICENSE) + */ + +body { + font-size: 20px; + color: #212529; + font-family: 'Lora', 'Times New Roman', serif; +} + +p { + line-height: 1.5; + margin: 30px 0; +} + +p a { + text-decoration: underline; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: 800; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +a { + color: #212529; + transition: all 0.2s; +} + +a:focus, a:hover { + color: #0085A1; +} + +blockquote { + font-style: italic; + color: #868e96; +} + +.section-heading { + font-size: 36px; + font-weight: 700; + margin-top: 60px; +} + +.caption { + font-size: 14px; + font-style: italic; + display: block; + margin: 0; + padding: 10px; + text-align: center; + border-bottom-right-radius: 5px; + border-bottom-left-radius: 5px; +} + +::-moz-selection { + color: #fff; + background: #0085A1; + text-shadow: none; +} + +::selection { + color: #fff; + background: #0085A1; + text-shadow: none; +} + +img::-moz-selection { + color: #fff; + background: transparent; +} + +img::selection { + color: #fff; + background: transparent; +} + +img::-moz-selection { + color: #fff; + background: transparent; +} + +#mainNav { + position: absolute; + border-bottom: 1px solid #e9ecef; + background-color: white; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +#mainNav .navbar-brand { + font-weight: 800; + color: #343a40; +} + +#mainNav .navbar-toggler { + font-size: 12px; + font-weight: 800; + padding: 13px; + text-transform: uppercase; + color: #343a40; +} + +#mainNav .navbar-nav > li.nav-item > a { + font-size: 12px; + font-weight: 800; + letter-spacing: 1px; + text-transform: uppercase; +} + +@media only screen and (min-width: 992px) { + #mainNav { + border-bottom: 1px solid transparent; + background: transparent; + } + #mainNav .navbar-brand { + padding: 10px 20px; + color: #fff; + } + #mainNav .navbar-brand:focus, #mainNav .navbar-brand:hover { + color: rgba(255, 255, 255, 0.8); + } + #mainNav .navbar-nav > li.nav-item > a { + padding: 10px 20px; + color: #fff; + } + #mainNav .navbar-nav > li.nav-item > a:focus, #mainNav .navbar-nav > li.nav-item > a:hover { + color: rgba(255, 255, 255, 0.8); + } +} + +@media only screen and (min-width: 992px) { + #mainNav { + transition: background-color 0.2s; + /* Force Hardware Acceleration in WebKit */ + transform: translate3d(0, 0, 0); + -webkit-backface-visibility: hidden; + } + #mainNav.is-fixed { + /* when the user scrolls down, we hide the header right above the viewport */ + position: fixed; + top: -67px; + transition: transform 0.2s; + border-bottom: 1px solid white; + background-color: rgba(255, 255, 255, 0.9); + } + #mainNav.is-fixed .navbar-brand { + color: #212529; + } + #mainNav.is-fixed .navbar-brand:focus, #mainNav.is-fixed .navbar-brand:hover { + color: #0085A1; + } + #mainNav.is-fixed .navbar-nav > li.nav-item > a { + color: #212529; + } + #mainNav.is-fixed .navbar-nav > li.nav-item > a:focus, #mainNav.is-fixed .navbar-nav > li.nav-item > a:hover { + color: #0085A1; + } + #mainNav.is-visible { + /* if the user changes the scrolling direction, we show the header */ + transform: translate3d(0, 100%, 0); + } +} + +header.masthead { + margin-bottom: 50px; + background: no-repeat center center; + background-color: #868e96; + background-attachment: scroll; + position: relative; + background-size: cover; +} + +header.masthead .overlay { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + background-color: #212529; + opacity: 0.5; +} + +header.masthead .page-heading, +header.masthead .post-heading, +header.masthead .site-heading { + padding: 200px 0 150px; + color: white; +} + +@media only screen and (min-width: 768px) { + header.masthead .page-heading, + header.masthead .post-heading, + header.masthead .site-heading { + padding: 200px 0; + } +} + +header.masthead .page-heading, +header.masthead .site-heading { + text-align: center; +} + +header.masthead .page-heading h1, +header.masthead .site-heading h1 { + font-size: 50px; + margin-top: 0; +} + +header.masthead .page-heading .subheading, +header.masthead .site-heading .subheading { + font-size: 24px; + font-weight: 300; + line-height: 1.1; + display: block; + margin: 10px 0 0; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +@media only screen and (min-width: 768px) { + header.masthead .page-heading h1, + header.masthead .site-heading h1 { + font-size: 80px; + } +} + +header.masthead .post-heading h1 { + font-size: 35px; +} + +header.masthead .post-heading .meta, +header.masthead .post-heading .subheading { + line-height: 1.1; + display: block; +} + +header.masthead .post-heading .subheading { + font-size: 24px; + font-weight: 600; + margin: 10px 0 30px; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +header.masthead .post-heading .meta { + font-size: 20px; + font-weight: 300; + font-style: italic; + font-family: 'Lora', 'Times New Roman', serif; +} + +header.masthead .post-heading .meta a { + color: #fff; +} + +@media only screen and (min-width: 768px) { + header.masthead .post-heading h1 { + font-size: 55px; + } + header.masthead .post-heading .subheading { + font-size: 30px; + } +} + +.post-preview > a { + color: #212529; +} + +.post-preview > a:focus, .post-preview > a:hover { + text-decoration: none; + color: #0085A1; +} + +.post-preview > a > .post-title { + font-size: 30px; + margin-top: 30px; + margin-bottom: 10px; +} + +.post-preview > a > .post-subtitle { + font-weight: 300; + margin: 0 0 10px; +} + +.post-preview > .post-meta { + font-size: 18px; + font-style: italic; + margin-top: 0; + color: #868e96; +} + +.post-preview > .post-meta > a { + text-decoration: none; + color: #212529; +} + +.post-preview > .post-meta > a:focus, .post-preview > .post-meta > a:hover { + text-decoration: underline; + color: #0085A1; +} + +@media only screen and (min-width: 768px) { + .post-preview > a > .post-title { + font-size: 36px; + } +} + +.floating-label-form-group { + font-size: 14px; + position: relative; + margin-bottom: 0; + padding-bottom: 0.5em; + border-bottom: 1px solid #dee2e6; +} + +.floating-label-form-group input, +.floating-label-form-group textarea { + font-size: 1.5em; + position: relative; + z-index: 1; + padding: 0; + resize: none; + border: none; + border-radius: 0; + background: none; + box-shadow: none !important; + font-family: 'Lora', 'Times New Roman', serif; +} + +.floating-label-form-group input::-webkit-input-placeholder, +.floating-label-form-group textarea::-webkit-input-placeholder { + color: #868e96; + font-family: 'Lora', 'Times New Roman', serif; +} + +.floating-label-form-group label { + font-size: 0.85em; + line-height: 1.764705882em; + position: relative; + z-index: 0; + top: 2em; + display: block; + margin: 0; + transition: top 0.3s ease, opacity 0.3s ease; + vertical-align: middle; + vertical-align: baseline; + opacity: 0; +} + +.floating-label-form-group .help-block { + margin: 15px 0; +} + +.floating-label-form-group-with-value label { + top: 0; + opacity: 1; +} + +.floating-label-form-group-with-focus label { + color: #0085A1; +} + +form .form-group:first-child .floating-label-form-group { + border-top: 1px solid #dee2e6; +} + +footer { + padding: 50px 0 65px; +} + +footer .list-inline { + margin: 0; + padding: 0; +} + +footer .copyright { + font-size: 14px; + margin-bottom: 0; + text-align: center; +} + +.btn { + font-size: 14px; + font-weight: 800; + padding: 15px 25px; + letter-spacing: 1px; + text-transform: uppercase; + border-radius: 0; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +.btn-primary { + background-color: #0085A1; + border-color: #0085A1; +} + +.btn-primary:hover, .btn-primary:focus, .btn-primary:active { + color: #fff; + background-color: #00657b !important; + border-color: #00657b !important; +} + +.btn-lg { + font-size: 16px; + padding: 25px 35px; +} diff --git a/layout/js/clean-blog.js b/layout/js/clean-blog.js new file mode 100644 index 0000000..2930d5f --- /dev/null +++ b/layout/js/clean-blog.js @@ -0,0 +1,41 @@ +(function($) { + "use strict"; // Start of use strict + + // Floating label headings for the contact form + $("body").on("input propertychange", ".floating-label-form-group", function(e) { + $(this).toggleClass("floating-label-form-group-with-value", !!$(e.target).val()); + }).on("focus", ".floating-label-form-group", function() { + $(this).addClass("floating-label-form-group-with-focus"); + }).on("blur", ".floating-label-form-group", function() { + $(this).removeClass("floating-label-form-group-with-focus"); + }); + + // Show the navbar when the page is scrolled up + var MQL = 992; + + //primary navigation slide-in effect + if ($(window).width() > MQL) { + var headerHeight = $('#mainNav').height(); + $(window).on('scroll', { + previousTop: 0 + }, + function() { + var currentTop = $(window).scrollTop(); + //check if user is scrolling up + if (currentTop < this.previousTop) { + //if scrolling up... + if (currentTop > 0 && $('#mainNav').hasClass('is-fixed')) { + $('#mainNav').addClass('is-visible'); + } else { + $('#mainNav').removeClass('is-visible is-fixed'); + } + } else if (currentTop > this.previousTop) { + //if scrolling down... + $('#mainNav').removeClass('is-visible'); + if (currentTop > headerHeight && !$('#mainNav').hasClass('is-fixed')) $('#mainNav').addClass('is-fixed'); + } + this.previousTop = currentTop; + }); + } + +})(jQuery); // End of use strict diff --git a/layout/js/contact_me.js b/layout/js/contact_me.js new file mode 100644 index 0000000..6e91590 --- /dev/null +++ b/layout/js/contact_me.js @@ -0,0 +1,75 @@ +$(function() { + + $("#contactForm input,#contactForm textarea").jqBootstrapValidation({ + preventSubmit: true, + submitError: function($form, event, errors) { + // additional error messages or events + }, + submitSuccess: function($form, event) { + event.preventDefault(); // prevent default submit behaviour + // get values from FORM + var name = $("input#name").val(); + var email = $("input#email").val(); + var phone = $("input#phone").val(); + var message = $("textarea#message").val(); + var firstName = name; // For Success/Failure Message + // Check for white space in name for Success/Fail message + if (firstName.indexOf(' ') >= 0) { + firstName = name.split(' ').slice(0, -1).join(' '); + } + $this = $("#sendMessageButton"); + $this.prop("disabled", true); // Disable submit button until AJAX call is complete to prevent duplicate messages + $.ajax({ + url: "././mail/contact_me.php", + type: "POST", + data: { + name: name, + phone: phone, + email: email, + message: message + }, + cache: false, + success: function() { + // Success message + $('#success').html("
"); + $('#success > .alert-success').html(""); + $('#success > .alert-success') + .append("Your message has been sent. "); + $('#success > .alert-success') + .append('
'); + //clear all fields + $('#contactForm').trigger("reset"); + }, + error: function() { + // Fail message + $('#success').html("
"); + $('#success > .alert-danger').html(""); + $('#success > .alert-danger').append($("").text("Sorry " + firstName + ", it seems that my mail server is not responding. Please try again later!")); + $('#success > .alert-danger').append('
'); + //clear all fields + $('#contactForm').trigger("reset"); + }, + complete: function() { + setTimeout(function() { + $this.prop("disabled", false); // Re-enable submit button when AJAX call is complete + }, 1000); + } + }); + }, + filter: function() { + return $(this).is(":visible"); + }, + }); + + $("a[data-toggle=\"tab\"]").click(function(e) { + e.preventDefault(); + $(this).tab("show"); + }); +}); + +/*When clicking on Full hide fail/success boxes */ +$('#name').focus(function() { + $('#success').html(''); +}); diff --git a/layout/js/jqBootstrapValidation.js b/layout/js/jqBootstrapValidation.js new file mode 100644 index 0000000..6f05a2d --- /dev/null +++ b/layout/js/jqBootstrapValidation.js @@ -0,0 +1,937 @@ +/* jqBootstrapValidation + * A plugin for automating validation on Twitter Bootstrap formatted forms. + * + * v1.3.6 + * + * License: MIT - see LICENSE file + * + * http://ReactiveRaven.github.com/jqBootstrapValidation/ + */ + +(function($) { + + var createdElements = []; + + var defaults = { + options: { + prependExistingHelpBlock: false, + sniffHtml: true, // sniff for 'required', 'maxlength', etc + preventSubmit: true, // stop the form submit event from firing if validation fails + submitError: false, // function called if there is an error when trying to submit + submitSuccess: false, // function called just before a successful submit event is sent to the server + semanticallyStrict: false, // set to true to tidy up generated HTML output + autoAdd: { + helpBlocks: true + }, + filter: function() { + // return $(this).is(":visible"); // only validate elements you can see + return true; // validate everything + } + }, + methods: { + init: function(options) { + + var settings = $.extend(true, {}, defaults); + + settings.options = $.extend(true, settings.options, options); + + var $siblingElements = this; + + var uniqueForms = $.unique( + $siblingElements.map(function() { + return $(this).parents("form")[0]; + }).toArray() + ); + + $(uniqueForms).bind("submit", function(e) { + var $form = $(this); + var warningsFound = 0; + var $inputs = $form.find("input,textarea,select").not("[type=submit],[type=image]").filter(settings.options.filter); + $inputs.trigger("submit.validation").trigger("validationLostFocus.validation"); + + $inputs.each(function(i, el) { + var $this = $(el), + $controlGroup = $this.parents(".form-group").first(); + if ( + $controlGroup.hasClass("warning") + ) { + $controlGroup.removeClass("warning").addClass("error"); + warningsFound++; + } + }); + + $inputs.trigger("validationLostFocus.validation"); + + if (warningsFound) { + if (settings.options.preventSubmit) { + e.preventDefault(); + } + $form.addClass("error"); + if ($.isFunction(settings.options.submitError)) { + settings.options.submitError($form, e, $inputs.jqBootstrapValidation("collectErrors", true)); + } + } else { + $form.removeClass("error"); + if ($.isFunction(settings.options.submitSuccess)) { + settings.options.submitSuccess($form, e); + } + } + }); + + return this.each(function() { + + // Get references to everything we're interested in + var $this = $(this), + $controlGroup = $this.parents(".form-group").first(), + $helpBlock = $controlGroup.find(".help-block").first(), + $form = $this.parents("form").first(), + validatorNames = []; + + // create message container if not exists + if (!$helpBlock.length && settings.options.autoAdd && settings.options.autoAdd.helpBlocks) { + $helpBlock = $('
'); + $controlGroup.find('.controls').append($helpBlock); + createdElements.push($helpBlock[0]); + } + + // ============================================================= + // SNIFF HTML FOR VALIDATORS + // ============================================================= + + // *snort sniff snuffle* + + if (settings.options.sniffHtml) { + var message = ""; + // --------------------------------------------------------- + // PATTERN + // --------------------------------------------------------- + if ($this.attr("pattern") !== undefined) { + message = "Not in the expected format"; + if ($this.data("validationPatternMessage")) { + message = $this.data("validationPatternMessage"); + } + $this.data("validationPatternMessage", message); + $this.data("validationPatternRegex", $this.attr("pattern")); + } + // --------------------------------------------------------- + // MAX + // --------------------------------------------------------- + if ($this.attr("max") !== undefined || $this.attr("aria-valuemax") !== undefined) { + var max = ($this.attr("max") !== undefined ? $this.attr("max") : $this.attr("aria-valuemax")); + message = "Too high: Maximum of '" + max + "'"; + if ($this.data("validationMaxMessage")) { + message = $this.data("validationMaxMessage"); + } + $this.data("validationMaxMessage", message); + $this.data("validationMaxMax", max); + } + // --------------------------------------------------------- + // MIN + // --------------------------------------------------------- + if ($this.attr("min") !== undefined || $this.attr("aria-valuemin") !== undefined) { + var min = ($this.attr("min") !== undefined ? $this.attr("min") : $this.attr("aria-valuemin")); + message = "Too low: Minimum of '" + min + "'"; + if ($this.data("validationMinMessage")) { + message = $this.data("validationMinMessage"); + } + $this.data("validationMinMessage", message); + $this.data("validationMinMin", min); + } + // --------------------------------------------------------- + // MAXLENGTH + // --------------------------------------------------------- + if ($this.attr("maxlength") !== undefined) { + message = "Too long: Maximum of '" + $this.attr("maxlength") + "' characters"; + if ($this.data("validationMaxlengthMessage")) { + message = $this.data("validationMaxlengthMessage"); + } + $this.data("validationMaxlengthMessage", message); + $this.data("validationMaxlengthMaxlength", $this.attr("maxlength")); + } + // --------------------------------------------------------- + // MINLENGTH + // --------------------------------------------------------- + if ($this.attr("minlength") !== undefined) { + message = "Too short: Minimum of '" + $this.attr("minlength") + "' characters"; + if ($this.data("validationMinlengthMessage")) { + message = $this.data("validationMinlengthMessage"); + } + $this.data("validationMinlengthMessage", message); + $this.data("validationMinlengthMinlength", $this.attr("minlength")); + } + // --------------------------------------------------------- + // REQUIRED + // --------------------------------------------------------- + if ($this.attr("required") !== undefined || $this.attr("aria-required") !== undefined) { + message = settings.builtInValidators.required.message; + if ($this.data("validationRequiredMessage")) { + message = $this.data("validationRequiredMessage"); + } + $this.data("validationRequiredMessage", message); + } + // --------------------------------------------------------- + // NUMBER + // --------------------------------------------------------- + if ($this.attr("type") !== undefined && $this.attr("type").toLowerCase() === "number") { + message = settings.builtInValidators.number.message; + if ($this.data("validationNumberMessage")) { + message = $this.data("validationNumberMessage"); + } + $this.data("validationNumberMessage", message); + } + // --------------------------------------------------------- + // EMAIL + // --------------------------------------------------------- + if ($this.attr("type") !== undefined && $this.attr("type").toLowerCase() === "email") { + message = "Not a valid email address"; + if ($this.data("validationValidemailMessage")) { + message = $this.data("validationValidemailMessage"); + } else if ($this.data("validationEmailMessage")) { + message = $this.data("validationEmailMessage"); + } + $this.data("validationValidemailMessage", message); + } + // --------------------------------------------------------- + // MINCHECKED + // --------------------------------------------------------- + if ($this.attr("minchecked") !== undefined) { + message = "Not enough options checked; Minimum of '" + $this.attr("minchecked") + "' required"; + if ($this.data("validationMincheckedMessage")) { + message = $this.data("validationMincheckedMessage"); + } + $this.data("validationMincheckedMessage", message); + $this.data("validationMincheckedMinchecked", $this.attr("minchecked")); + } + // --------------------------------------------------------- + // MAXCHECKED + // --------------------------------------------------------- + if ($this.attr("maxchecked") !== undefined) { + message = "Too many options checked; Maximum of '" + $this.attr("maxchecked") + "' required"; + if ($this.data("validationMaxcheckedMessage")) { + message = $this.data("validationMaxcheckedMessage"); + } + $this.data("validationMaxcheckedMessage", message); + $this.data("validationMaxcheckedMaxchecked", $this.attr("maxchecked")); + } + } + + // ============================================================= + // COLLECT VALIDATOR NAMES + // ============================================================= + + // Get named validators + if ($this.data("validation") !== undefined) { + validatorNames = $this.data("validation").split(","); + } + + // Get extra ones defined on the element's data attributes + $.each($this.data(), function(i, el) { + var parts = i.replace(/([A-Z])/g, ",$1").split(","); + if (parts[0] === "validation" && parts[1]) { + validatorNames.push(parts[1]); + } + }); + + // ============================================================= + // NORMALISE VALIDATOR NAMES + // ============================================================= + + var validatorNamesToInspect = validatorNames; + var newValidatorNamesToInspect = []; + + do // repeatedly expand 'shortcut' validators into their real validators + { + // Uppercase only the first letter of each name + $.each(validatorNames, function(i, el) { + validatorNames[i] = formatValidatorName(el); + }); + + // Remove duplicate validator names + validatorNames = $.unique(validatorNames); + + // Pull out the new validator names from each shortcut + newValidatorNamesToInspect = []; + $.each(validatorNamesToInspect, function(i, el) { + if ($this.data("validation" + el + "Shortcut") !== undefined) { + // Are these custom validators? + // Pull them out! + $.each($this.data("validation" + el + "Shortcut").split(","), function(i2, el2) { + newValidatorNamesToInspect.push(el2); + }); + } else if (settings.builtInValidators[el.toLowerCase()]) { + // Is this a recognised built-in? + // Pull it out! + var validator = settings.builtInValidators[el.toLowerCase()]; + if (validator.type.toLowerCase() === "shortcut") { + $.each(validator.shortcut.split(","), function(i, el) { + el = formatValidatorName(el); + newValidatorNamesToInspect.push(el); + validatorNames.push(el); + }); + } + } + }); + + validatorNamesToInspect = newValidatorNamesToInspect; + + } while (validatorNamesToInspect.length > 0) + + // ============================================================= + // SET UP VALIDATOR ARRAYS + // ============================================================= + + var validators = {}; + + $.each(validatorNames, function(i, el) { + // Set up the 'override' message + var message = $this.data("validation" + el + "Message"); + var hasOverrideMessage = (message !== undefined); + var foundValidator = false; + message = + ( + message ? + message : + "'" + el + "' validation failed " + ); + + $.each( + settings.validatorTypes, + function(validatorType, validatorTemplate) { + if (validators[validatorType] === undefined) { + validators[validatorType] = []; + } + if (!foundValidator && $this.data("validation" + el + formatValidatorName(validatorTemplate.name)) !== undefined) { + validators[validatorType].push( + $.extend( + true, { + name: formatValidatorName(validatorTemplate.name), + message: message + }, + validatorTemplate.init($this, el) + ) + ); + foundValidator = true; + } + } + ); + + if (!foundValidator && settings.builtInValidators[el.toLowerCase()]) { + + var validator = $.extend(true, {}, settings.builtInValidators[el.toLowerCase()]); + if (hasOverrideMessage) { + validator.message = message; + } + var validatorType = validator.type.toLowerCase(); + + if (validatorType === "shortcut") { + foundValidator = true; + } else { + $.each( + settings.validatorTypes, + function(validatorTemplateType, validatorTemplate) { + if (validators[validatorTemplateType] === undefined) { + validators[validatorTemplateType] = []; + } + if (!foundValidator && validatorType === validatorTemplateType.toLowerCase()) { + $this.data("validation" + el + formatValidatorName(validatorTemplate.name), validator[validatorTemplate.name.toLowerCase()]); + validators[validatorType].push( + $.extend( + validator, + validatorTemplate.init($this, el) + ) + ); + foundValidator = true; + } + } + ); + } + } + + if (!foundValidator) { + $.error("Cannot find validation info for '" + el + "'"); + } + }); + + // ============================================================= + // STORE FALLBACK VALUES + // ============================================================= + + $helpBlock.data( + "original-contents", + ( + $helpBlock.data("original-contents") ? + $helpBlock.data("original-contents") : + $helpBlock.html() + ) + ); + + $helpBlock.data( + "original-role", + ( + $helpBlock.data("original-role") ? + $helpBlock.data("original-role") : + $helpBlock.attr("role") + ) + ); + + $controlGroup.data( + "original-classes", + ( + $controlGroup.data("original-clases") ? + $controlGroup.data("original-classes") : + $controlGroup.attr("class") + ) + ); + + $this.data( + "original-aria-invalid", + ( + $this.data("original-aria-invalid") ? + $this.data("original-aria-invalid") : + $this.attr("aria-invalid") + ) + ); + + // ============================================================= + // VALIDATION + // ============================================================= + + $this.bind( + "validation.validation", + function(event, params) { + + var value = getValue($this); + + // Get a list of the errors to apply + var errorsFound = []; + + $.each(validators, function(validatorType, validatorTypeArray) { + if (value || value.length || (params && params.includeEmpty) || (!!settings.validatorTypes[validatorType].blockSubmit && params && !!params.submitting)) { + $.each(validatorTypeArray, function(i, validator) { + if (settings.validatorTypes[validatorType].validate($this, value, validator)) { + errorsFound.push(validator.message); + } + }); + } + }); + + return errorsFound; + } + ); + + $this.bind( + "getValidators.validation", + function() { + return validators; + } + ); + + // ============================================================= + // WATCH FOR CHANGES + // ============================================================= + $this.bind( + "submit.validation", + function() { + return $this.triggerHandler("change.validation", { + submitting: true + }); + } + ); + $this.bind( + [ + "keyup", + "focus", + "blur", + "click", + "keydown", + "keypress", + "change" + ].join(".validation ") + ".validation", + function(e, params) { + + var value = getValue($this); + + var errorsFound = []; + + $controlGroup.find("input,textarea,select").each(function(i, el) { + var oldCount = errorsFound.length; + $.each($(el).triggerHandler("validation.validation", params), function(j, message) { + errorsFound.push(message); + }); + if (errorsFound.length > oldCount) { + $(el).attr("aria-invalid", "true"); + } else { + var original = $this.data("original-aria-invalid"); + $(el).attr("aria-invalid", (original !== undefined ? original : false)); + } + }); + + $form.find("input,select,textarea").not($this).not("[name=\"" + $this.attr("name") + "\"]").trigger("validationLostFocus.validation"); + + errorsFound = $.unique(errorsFound.sort()); + + // Were there any errors? + if (errorsFound.length) { + // Better flag it up as a warning. + $controlGroup.removeClass("success error").addClass("warning"); + + // How many errors did we find? + if (settings.options.semanticallyStrict && errorsFound.length === 1) { + // Only one? Being strict? Just output it. + $helpBlock.html(errorsFound[0] + + (settings.options.prependExistingHelpBlock ? $helpBlock.data("original-contents") : "")); + } else { + // Multiple? Being sloppy? Glue them together into an UL. + $helpBlock.html("
  • " + errorsFound.join("
  • ") + "
" + + (settings.options.prependExistingHelpBlock ? $helpBlock.data("original-contents") : "")); + } + } else { + $controlGroup.removeClass("warning error success"); + if (value.length > 0) { + $controlGroup.addClass("success"); + } + $helpBlock.html($helpBlock.data("original-contents")); + } + + if (e.type === "blur") { + $controlGroup.removeClass("success"); + } + } + ); + $this.bind("validationLostFocus.validation", function() { + $controlGroup.removeClass("success"); + }); + }); + }, + destroy: function() { + + return this.each( + function() { + + var + $this = $(this), + $controlGroup = $this.parents(".form-group").first(), + $helpBlock = $controlGroup.find(".help-block").first(); + + // remove our events + $this.unbind('.validation'); // events are namespaced. + // reset help text + $helpBlock.html($helpBlock.data("original-contents")); + // reset classes + $controlGroup.attr("class", $controlGroup.data("original-classes")); + // reset aria + $this.attr("aria-invalid", $this.data("original-aria-invalid")); + // reset role + $helpBlock.attr("role", $this.data("original-role")); + // remove all elements we created + if (createdElements.indexOf($helpBlock[0]) > -1) { + $helpBlock.remove(); + } + + } + ); + + }, + collectErrors: function(includeEmpty) { + + var errorMessages = {}; + this.each(function(i, el) { + var $el = $(el); + var name = $el.attr("name"); + var errors = $el.triggerHandler("validation.validation", { + includeEmpty: true + }); + errorMessages[name] = $.extend(true, errors, errorMessages[name]); + }); + + $.each(errorMessages, function(i, el) { + if (el.length === 0) { + delete errorMessages[i]; + } + }); + + return errorMessages; + + }, + hasErrors: function() { + + var errorMessages = []; + + this.each(function(i, el) { + errorMessages = errorMessages.concat( + $(el).triggerHandler("getValidators.validation") ? $(el).triggerHandler("validation.validation", { + submitting: true + }) : [] + ); + }); + + return (errorMessages.length > 0); + }, + override: function(newDefaults) { + defaults = $.extend(true, defaults, newDefaults); + } + }, + validatorTypes: { + callback: { + name: "callback", + init: function($this, name) { + return { + validatorName: name, + callback: $this.data("validation" + name + "Callback"), + lastValue: $this.val(), + lastValid: true, + lastFinished: true + }; + }, + validate: function($this, value, validator) { + if (validator.lastValue === value && validator.lastFinished) { + return !validator.lastValid; + } + + if (validator.lastFinished === true) { + validator.lastValue = value; + validator.lastValid = true; + validator.lastFinished = false; + + var rrjqbvValidator = validator; + var rrjqbvThis = $this; + executeFunctionByName( + validator.callback, + window, + $this, + value, + function(data) { + if (rrjqbvValidator.lastValue === data.value) { + rrjqbvValidator.lastValid = data.valid; + if (data.message) { + rrjqbvValidator.message = data.message; + } + rrjqbvValidator.lastFinished = true; + rrjqbvThis.data("validation" + rrjqbvValidator.validatorName + "Message", rrjqbvValidator.message); + // Timeout is set to avoid problems with the events being considered 'already fired' + setTimeout(function() { + rrjqbvThis.trigger("change.validation"); + }, 1); // doesn't need a long timeout, just long enough for the event bubble to burst + } + } + ); + } + + return false; + + } + }, + ajax: { + name: "ajax", + init: function($this, name) { + return { + validatorName: name, + url: $this.data("validation" + name + "Ajax"), + lastValue: $this.val(), + lastValid: true, + lastFinished: true + }; + }, + validate: function($this, value, validator) { + if ("" + validator.lastValue === "" + value && validator.lastFinished === true) { + return validator.lastValid === false; + } + + if (validator.lastFinished === true) { + validator.lastValue = value; + validator.lastValid = true; + validator.lastFinished = false; + $.ajax({ + url: validator.url, + data: "value=" + value + "&field=" + $this.attr("name"), + dataType: "json", + success: function(data) { + if ("" + validator.lastValue === "" + data.value) { + validator.lastValid = !!(data.valid); + if (data.message) { + validator.message = data.message; + } + validator.lastFinished = true; + $this.data("validation" + validator.validatorName + "Message", validator.message); + // Timeout is set to avoid problems with the events being considered 'already fired' + setTimeout(function() { + $this.trigger("change.validation"); + }, 1); // doesn't need a long timeout, just long enough for the event bubble to burst + } + }, + failure: function() { + validator.lastValid = true; + validator.message = "ajax call failed"; + validator.lastFinished = true; + $this.data("validation" + validator.validatorName + "Message", validator.message); + // Timeout is set to avoid problems with the events being considered 'already fired' + setTimeout(function() { + $this.trigger("change.validation"); + }, 1); // doesn't need a long timeout, just long enough for the event bubble to burst + } + }); + } + + return false; + + } + }, + regex: { + name: "regex", + init: function($this, name) { + return { + regex: regexFromString($this.data("validation" + name + "Regex")) + }; + }, + validate: function($this, value, validator) { + return (!validator.regex.test(value) && !validator.negative) || + (validator.regex.test(value) && validator.negative); + } + }, + required: { + name: "required", + init: function($this, name) { + return {}; + }, + validate: function($this, value, validator) { + return !!(value.length === 0 && !validator.negative) || + !!(value.length > 0 && validator.negative); + }, + blockSubmit: true + }, + match: { + name: "match", + init: function($this, name) { + var element = $this.parents("form").first().find("[name=\"" + $this.data("validation" + name + "Match") + "\"]").first(); + element.bind("validation.validation", function() { + $this.trigger("change.validation", { + submitting: true + }); + }); + return { + "element": element + }; + }, + validate: function($this, value, validator) { + return (value !== validator.element.val() && !validator.negative) || + (value === validator.element.val() && validator.negative); + }, + blockSubmit: true + }, + max: { + name: "max", + init: function($this, name) { + return { + max: $this.data("validation" + name + "Max") + }; + }, + validate: function($this, value, validator) { + return (parseFloat(value, 10) > parseFloat(validator.max, 10) && !validator.negative) || + (parseFloat(value, 10) <= parseFloat(validator.max, 10) && validator.negative); + } + }, + min: { + name: "min", + init: function($this, name) { + return { + min: $this.data("validation" + name + "Min") + }; + }, + validate: function($this, value, validator) { + return (parseFloat(value) < parseFloat(validator.min) && !validator.negative) || + (parseFloat(value) >= parseFloat(validator.min) && validator.negative); + } + }, + maxlength: { + name: "maxlength", + init: function($this, name) { + return { + maxlength: $this.data("validation" + name + "Maxlength") + }; + }, + validate: function($this, value, validator) { + return ((value.length > validator.maxlength) && !validator.negative) || + ((value.length <= validator.maxlength) && validator.negative); + } + }, + minlength: { + name: "minlength", + init: function($this, name) { + return { + minlength: $this.data("validation" + name + "Minlength") + }; + }, + validate: function($this, value, validator) { + return ((value.length < validator.minlength) && !validator.negative) || + ((value.length >= validator.minlength) && validator.negative); + } + }, + maxchecked: { + name: "maxchecked", + init: function($this, name) { + var elements = $this.parents("form").first().find("[name=\"" + $this.attr("name") + "\"]"); + elements.bind("click.validation", function() { + $this.trigger("change.validation", { + includeEmpty: true + }); + }); + return { + maxchecked: $this.data("validation" + name + "Maxchecked"), + elements: elements + }; + }, + validate: function($this, value, validator) { + return (validator.elements.filter(":checked").length > validator.maxchecked && !validator.negative) || + (validator.elements.filter(":checked").length <= validator.maxchecked && validator.negative); + }, + blockSubmit: true + }, + minchecked: { + name: "minchecked", + init: function($this, name) { + var elements = $this.parents("form").first().find("[name=\"" + $this.attr("name") + "\"]"); + elements.bind("click.validation", function() { + $this.trigger("change.validation", { + includeEmpty: true + }); + }); + return { + minchecked: $this.data("validation" + name + "Minchecked"), + elements: elements + }; + }, + validate: function($this, value, validator) { + return (validator.elements.filter(":checked").length < validator.minchecked && !validator.negative) || + (validator.elements.filter(":checked").length >= validator.minchecked && validator.negative); + }, + blockSubmit: true + } + }, + builtInValidators: { + email: { + name: "Email", + type: "shortcut", + shortcut: "validemail" + }, + validemail: { + name: "Validemail", + type: "regex", + regex: "[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\\.[A-Za-z]{2,4}", + message: "Not a valid email address" + }, + passwordagain: { + name: "Passwordagain", + type: "match", + match: "password", + message: "Does not match the given password" + }, + positive: { + name: "Positive", + type: "shortcut", + shortcut: "number,positivenumber" + }, + negative: { + name: "Negative", + type: "shortcut", + shortcut: "number,negativenumber" + }, + number: { + name: "Number", + type: "regex", + regex: "([+-]?\\\d+(\\\.\\\d*)?([eE][+-]?[0-9]+)?)?", + message: "Must be a number" + }, + integer: { + name: "Integer", + type: "regex", + regex: "[+-]?\\\d+", + message: "No decimal places allowed" + }, + positivenumber: { + name: "Positivenumber", + type: "min", + min: 0, + message: "Must be a positive number" + }, + negativenumber: { + name: "Negativenumber", + type: "max", + max: 0, + message: "Must be a negative number" + }, + required: { + name: "Required", + type: "required", + message: "This is required" + }, + checkone: { + name: "Checkone", + type: "minchecked", + minchecked: 1, + message: "Check at least one option" + } + } + }; + + var formatValidatorName = function(name) { + return name + .toLowerCase() + .replace( + /(^|\s)([a-z])/g, + function(m, p1, p2) { + return p1 + p2.toUpperCase(); + } + ); + }; + + var getValue = function($this) { + // Extract the value we're talking about + var value = $this.val(); + var type = $this.attr("type"); + if (type === "checkbox") { + value = ($this.is(":checked") ? value : ""); + } + if (type === "radio") { + value = ($('input[name="' + $this.attr("name") + '"]:checked').length > 0 ? value : ""); + } + return value; + }; + + function regexFromString(inputstring) { + return new RegExp("^" + inputstring + "$"); + } + + /** + * Thanks to Jason Bunting via StackOverflow.com + * + * http://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string#answer-359910 + * Short link: http://tinyurl.com/executeFunctionByName + **/ + function executeFunctionByName(functionName, context /*, args*/ ) { + var args = Array.prototype.slice.call(arguments).splice(2); + var namespaces = functionName.split("."); + var func = namespaces.pop(); + for (var i = 0; i < namespaces.length; i++) { + context = context[namespaces[i]]; + } + return context[func].apply(this, args); + } + + $.fn.jqBootstrapValidation = function(method) { + + if (defaults.methods[method]) { + return defaults.methods[method].apply(this, Array.prototype.slice.call(arguments, 1)); + } else if (typeof method === 'object' || !method) { + return defaults.methods.init.apply(this, arguments); + } else { + $.error('Method ' + method + ' does not exist on jQuery.jqBootstrapValidation'); + return null; + } + + }; + + $.jqBootstrapValidation = function(options) { + $(":input").not("[type=image],[type=submit]").jqBootstrapValidation.apply(this, arguments); + }; + +})(jQuery); diff --git a/lib/jsmin.c b/lib/jsmin.c new file mode 100644 index 0000000..f63e68f --- /dev/null +++ b/lib/jsmin.c @@ -0,0 +1,324 @@ +/* jsmin.c + 2019-10-30 + +Copyright (C) 2002 Douglas Crockford (www.crockford.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +/* +This file was modified by Anton Šijanec in 2020 in order to allow it being +used as a library for minifying JS inside other programs. All I've added +is the option to read from a source file and output to the minified file. +*/ + +#include +#include + +static int the_a; +static int the_b; +static int look_ahead = EOF; +static int the_x = EOF; +static int the_y = EOF; +FILE * source_js_file; +FILE * minified_js_file; + +static void error(char* string) { + fputs("JSMIN Error: ", stderr); + fputs(string, stderr); + fputc('\n', stderr); + exit(1); +} + +/* is_alphanum -- return true if the character is a letter, digit, underscore, + dollar sign, or non-ASCII character. +*/ + +static int is_alphanum(int codeunit) { + return ( + (codeunit >= 'a' && codeunit <= 'z') + || (codeunit >= '0' && codeunit <= '9') + || (codeunit >= 'A' && codeunit <= 'Z') + || codeunit == '_' + || codeunit == '$' + || codeunit == '\\' + || codeunit > 126 + ); +} + + +/* get -- return the next character from stdin. Watch out for lookahead. If + the character is a control character, translate it to a space or + linefeed. +*/ + +static int get() { + int codeunit = look_ahead; + look_ahead = EOF; + if (codeunit == EOF) { + codeunit = getc(source_js_file); + } + if (codeunit >= ' ' || codeunit == '\n' || codeunit == EOF) { + return codeunit; + } + if (codeunit == '\r') { + return '\n'; + } + return ' '; +} + + +/* peek -- get the next character without advancing. +*/ + +static int peek() { + look_ahead = get(); + return look_ahead; +} + + +/* next -- get the next character, excluding comments. peek() is used to see + if a '/' is followed by a '/' or '*'. +*/ + +static int next() { + int codeunit = get(); + if (codeunit == '/') { + switch (peek()) { + case '/': + for (;;) { + codeunit = get(); + if (codeunit <= '\n') { + break; + } + } + break; + case '*': + get(); + while (codeunit != ' ') { + switch (get()) { + case '*': + if (peek() == '/') { + get(); + codeunit = ' '; + } + break; + case EOF: + error("Unterminated comment."); + } + } + break; + } + } + the_y = the_x; + the_x = codeunit; + return codeunit; +} + + +/* action -- do something! What you do is determined by the argument: + 1 Output A. Copy B to A. Get the next B. + 2 Copy B to A. Get the next B. (Delete A). + 3 Get the next B. (Delete B). + action treats a string as a single character. + action recognizes a regular expression if it is preceded by the likes of + '(' or ',' or '='. +*/ + +static void action(int determined) { + switch (determined) { + case 1: + putc(the_a, minified_js_file); + if ( + (the_y == '\n' || the_y == ' ') + && (the_a == '+' || the_a == '-' || the_a == '*' || the_a == '/') + && (the_b == '+' || the_b == '-' || the_b == '*' || the_b == '/') + ) { + putc(the_y, minified_js_file); + } + case 2: + the_a = the_b; + if (the_a == '\'' || the_a == '"' || the_a == '`') { + for (;;) { + putc(the_a, minified_js_file); + the_a = get(); + if (the_a == the_b) { + break; + } + if (the_a == '\\') { + putc(the_a, minified_js_file); + the_a = get(); + } + if (the_a == EOF) { + error("Unterminated string literal."); + } + } + } + case 3: + the_b = next(); + if (the_b == '/' && ( + the_a == '(' || the_a == ',' || the_a == '=' || the_a == ':' + || the_a == '[' || the_a == '!' || the_a == '&' || the_a == '|' + || the_a == '?' || the_a == '+' || the_a == '-' || the_a == '~' + || the_a == '*' || the_a == '/' || the_a == '{' || the_a == '}' + || the_a == ';' + )) { + putc(the_a, minified_js_file); + if (the_a == '/' || the_a == '*') { + putc(' ', minified_js_file); + } + putc(the_b, minified_js_file); + for (;;) { + the_a = get(); + if (the_a == '[') { + for (;;) { + putc(the_a, minified_js_file); + the_a = get(); + if (the_a == ']') { + break; + } + if (the_a == '\\') { + putc(the_a, minified_js_file); + the_a = get(); + } + if (the_a == EOF) { + error( + "Unterminated set in Regular Expression literal." + ); + } + } + } else if (the_a == '/') { + switch (peek()) { + case '/': + case '*': + error( + "Unterminated set in Regular Expression literal." + ); + } + break; + } else if (the_a =='\\') { + putc(the_a, minified_js_file); + the_a = get(); + } + if (the_a == EOF) { + error("Unterminated Regular Expression literal."); + } + putc(the_a, minified_js_file); + } + the_b = next(); + } + } +} + + +/* jsmin -- Copy the input to the output, deleting the characters which are + insignificant to JavaScript. Comments will be removed. Tabs will be + replaced with spaces. Carriage returns will be replaced with linefeeds. + Most spaces and linefeeds will be removed. +*/ + +static void jsmin() { + if (peek() == 0xEF) { + get(); + get(); + get(); + } + the_a = '\n'; + action(3); + while (the_a != EOF) { + switch (the_a) { + case ' ': + action( + is_alphanum(the_b) + ? 1 + : 2 + ); + break; + case '\n': + switch (the_b) { + case '{': + case '[': + case '(': + case '+': + case '-': + case '!': + case '~': + action(1); + break; + case ' ': + action(3); + break; + default: + action( + is_alphanum(the_b) + ? 1 + : 2 + ); + } + break; + default: + switch (the_b) { + case ' ': + action( + is_alphanum(the_a) + ? 1 + : 3 + ); + break; + case '\n': + switch (the_a) { + case '}': + case ']': + case ')': + case '+': + case '-': + case '"': + case '\'': + case '`': + action(1); + break; + default: + action( + is_alphanum(the_a) + ? 1 + : 3 + ); + } + break; + default: + action(1); + break; + } + } + } +} + + +/* minify_js -- input filename, output filename +*/ + +int minify_js(const char* source_js_filename, const char* minified_js_filename) { + minified_js_file = fopen(minified_js_filename, "w"); + source_js_file = fopen(source_js_filename, "r"); + jsmin(); + return 0; +} + diff --git a/src/jsbundle.c b/src/jsbundle.c new file mode 100644 index 0000000..ad98250 --- /dev/null +++ b/src/jsbundle.c @@ -0,0 +1,26 @@ +#include +#include +#include +#include + +int main(int argc, char* argv[]) { + char bundle_filename[64] = "../dist/js/bundle.js"; + DIR *dir; + struct dirent *ent; + if ((dir = opendir ("../layout/js/")) != NULL) { + /* print all the files and directories within directory */ + while ((ent = readdir (dir)) != NULL) { + if(strcmp(ent->d_name, ".") != 0 && strcmp(ent->d_name, "..") != 0) { + char *dot = strrchr(ent->d_name, '.'); + if(dot && !strcmp(dot, ".js")) { + printf ("%s\n", ent->d_name); + } + } + } + closedir (dir); + } else { + /* could not open directory */ + return 1; + } + return 0; +} diff --git a/test/jsmin-test.c b/test/jsmin-test.c new file mode 100644 index 0000000..b6c4a20 --- /dev/null +++ b/test/jsmin-test.c @@ -0,0 +1,12 @@ +#include +#include +#include "jsmin.c" + +extern int main(int argc, char* argv[]) { + if(argc <= 1) { + printf("usage: %s source.js output.min.js\n", argv[0]); + return 1; + } + minify_js(argv[1], argv[2]); + return 0; +} -- cgit v1.2.3