From e00e12bdc5419e966421ec6dfa1bdeea19b727a5 Mon Sep 17 00:00:00 2001 From: nzambello Date: Mon, 29 Jun 2020 12:43:23 +0200 Subject: [PATCH 1/2] Used collective.slick slick bundle instead of a static specific one --- CHANGES.rst | 4 +- Gruntfile.js | 100 +- setup.py | 1 + src/redturtle/patterns/slider/configure.zcml | 6 - .../patterns/slider/libraries/slick/slick.css | 117 - .../slider/libraries/slick/slick.min.js | 2952 ---------------- .../slider/profiles/default/metadata.xml | 1 + .../slider/profiles/default/registry.xml | 16 +- ...dturtle-patterns-slider-bundle-compiled.js | 2992 +---------------- ...tle-patterns-slider-bundle-compiled.js.map | 17 +- ...le-patterns-slider-bundle-compiled.min.css | 2 +- ...atterns-slider-bundle-compiled.min.css.map | 2 +- .../patterns/slider/static/pattern.css | 6 +- .../patterns/slider/static/pattern.css.map | 14 +- .../patterns/slider/static/pattern.js | 26 +- 15 files changed, 97 insertions(+), 6159 deletions(-) delete mode 100755 src/redturtle/patterns/slider/libraries/slick/slick.css delete mode 100755 src/redturtle/patterns/slider/libraries/slick/slick.min.js diff --git a/CHANGES.rst b/CHANGES.rst index 1aebca9..33e17d8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,9 @@ Changelog 0.1.3 (unreleased) ------------------ -- Nothing changed yet. +BREAKING: +- Used collective.slick slick bundle instead of a static specific one + [nzambello] 0.1.2 (2018-06-11) diff --git a/Gruntfile.js b/Gruntfile.js index 29063ec..0d22dba 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,78 +1,95 @@ +const sass = require("node-sass"); -module.exports = function (grunt) { - 'use strict'; +module.exports = function(grunt) { + "use strict"; - require('load-grunt-tasks')(grunt); - var productRoot = 'src/redturtle/patterns/slider'; + require("load-grunt-tasks")(grunt); + var productRoot = "src/redturtle/patterns/slider"; grunt.initConfig({ - sass: { // Task - dist: { // Target - options: { // Target options - style: 'expanded', - }, - files: { // Dictionary of files - './src/redturtle/patterns/slider/static/pattern.css': `${productRoot}/static/pattern.scss`, + sass: { + // Task + dist: { + // Target + options: { + // Target options + style: "expanded" }, + files: { + // Dictionary of files + "./src/redturtle/patterns/slider/static/pattern.css": `${productRoot}/static/pattern.scss` + } }, + options: { + implementation: sass, + sourceMap: true, + outputStyle: "compressed" + } }, cssmin: { target: { files: { - './src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.min.css': [`${productRoot}/libraries/slick/slick.css`, `${productRoot}/static/pattern.css`], - }, + "./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.min.css": [ + `${productRoot}/static/pattern.css` + ] + } }, options: { - sourceMap: true, - }, + sourceMap: true + } }, requirejs: { - 'redturtle-patterns-slider': { + "redturtle-patterns-slider": { options: { - baseUrl: './', + baseUrl: "./", generateSourceMaps: true, preserveLicenseComments: false, paths: { - jquery: 'empty:', - 'pat-base': 'empty:', - 'slick.min': `${productRoot}/libraries/slick/slick.min`, - 'redturtle-patterns-slider': `${productRoot}/static/pattern` + jquery: "empty:", + "pat-base": "empty:", + "collective-slick-js": "empty:", + "redturtle-patterns-slider": `${productRoot}/static/pattern` }, wrapShim: true, name: `${productRoot}/static/bundle.js`, - exclude: ['jquery'], + exclude: ["jquery"], out: `${productRoot}/static/build/redturtle-patterns-slider-bundle-compiled.js`, - optimize: 'none', - }, - }, + optimize: "none" + } + } }, uglify: { - 'redturtle-patterns-slider': { + "redturtle-patterns-slider": { options: { sourceMap: true, sourceMapName: `./${productRoot}/static/build/redturtle-patterns-slider-bundle-compiled.js.map`, - sourceMapIncludeSources: false, + sourceMapIncludeSources: false }, files: { - './src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js': ['./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js'], - }, - }, + "./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js": [ + "./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js" + ] + } + } }, watch: { scripts: { - files: [`${productRoot}/static/pattern.js`, `${productRoot}/static/bundle.js`], - tasks: ['requirejs', 'uglify'], + files: [ + `${productRoot}/static/pattern.js`, + `${productRoot}/static/bundle.js` + ], + tasks: ["requirejs", "uglify"], options: { - livereload: true, - }, + livereload: true + } }, css: { files: `${productRoot}/static/pattern.scss`, - tasks: ['sass', 'cssmin'], + tasks: ["sass", "cssmin"], options: { - livereload: true, - }, - }, - }, + livereload: true + } + } + } // sed: { // version: { @@ -84,7 +101,6 @@ module.exports = function (grunt) { // }, }); - grunt.registerTask('default', ['watch']); - grunt.registerTask('compile', ['sass', 'cssmin', 'requirejs', 'uglify']); - + grunt.registerTask("default", ["watch"]); + grunt.registerTask("compile", ["sass", "cssmin", "requirejs", "uglify"]); }; diff --git a/setup.py b/setup.py index 99e797c..217989e 100644 --- a/setup.py +++ b/setup.py @@ -41,6 +41,7 @@ 'plone.api', 'Products.GenericSetup>=1.8.2', 'setuptools', + 'collective.slick', ], extras_require={ 'test': [ diff --git a/src/redturtle/patterns/slider/configure.zcml b/src/redturtle/patterns/slider/configure.zcml index d9dec49..59feed8 100644 --- a/src/redturtle/patterns/slider/configure.zcml +++ b/src/redturtle/patterns/slider/configure.zcml @@ -38,10 +38,4 @@ name="redturtle-patterns-slider" /> - - - diff --git a/src/redturtle/patterns/slider/libraries/slick/slick.css b/src/redturtle/patterns/slider/libraries/slick/slick.css deleted file mode 100755 index dd973fe..0000000 --- a/src/redturtle/patterns/slider/libraries/slick/slick.css +++ /dev/null @@ -1,117 +0,0 @@ -/* Slider */ -.slick-slider -{ - position: relative; - - display: block; - box-sizing: border-box; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - - -webkit-touch-callout: none; - -khtml-user-select: none; - -ms-touch-action: pan-y; - touch-action: pan-y; - -webkit-tap-highlight-color: transparent; -} - -.slick-list -{ - position: relative; - - display: block; - overflow: hidden; - - margin: 0; - padding: 0; -} -.slick-list:focus -{ - outline: none; -} -.slick-list.dragging -{ - cursor: pointer; - cursor: hand; -} - -.slick-slider .slick-track, -.slick-slider .slick-list -{ - -webkit-transform: translate3d(0, 0, 0); - -moz-transform: translate3d(0, 0, 0); - -ms-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); -} - -.slick-track -{ - position: relative; - top: 0; - left: 0; - - display: block; -} -.slick-track:before, -.slick-track:after -{ - display: table; - - content: ''; -} -.slick-track:after -{ - clear: both; -} -.slick-loading .slick-track -{ - visibility: hidden; -} - -.slick-slide -{ - display: none; - float: left; - - height: 100%; - min-height: 1px; -} -[dir='rtl'] .slick-slide -{ - float: right; -} -.slick-slide img -{ - display: block; -} -.slick-slide.slick-loading img -{ - display: none; -} -.slick-slide.dragging img -{ - pointer-events: none; -} -.slick-initialized .slick-slide -{ - display: block; -} -.slick-loading .slick-slide -{ - visibility: hidden; -} -.slick-vertical .slick-slide -{ - display: block; - - height: auto; - - border: 1px solid transparent; -} -.slick-arrow.slick-hidden { - display: none; -} diff --git a/src/redturtle/patterns/slider/libraries/slick/slick.min.js b/src/redturtle/patterns/slider/libraries/slick/slick.min.js deleted file mode 100755 index 8ac6b98..0000000 --- a/src/redturtle/patterns/slider/libraries/slick/slick.min.js +++ /dev/null @@ -1,2952 +0,0 @@ -/* - _ _ _ _ - ___| (_) ___| | __ (_)___ -/ __| | |/ __| |/ / | / __| -\__ \ | | (__| < _ | \__ \ -|___/_|_|\___|_|\_(_)/ |___/ - |__/ - - Version: 1.6.0 - Author: Ken Wheeler - Website: http://kenwheeler.github.io - Docs: http://kenwheeler.github.io/slick - Repo: http://github.com/kenwheeler/slick - Issues: http://github.com/kenwheeler/slick/issues - - */ -/* - _ _ _ _ - ___| (_) ___| | __ (_)___ -/ __| | |/ __| |/ / | / __| -\__ \ | | (__| < _ | \__ \ -|___/_|_|\___|_|\_(_)/ |___/ - |__/ - - Version: 1.6.0 - Author: Ken Wheeler - Website: http://kenwheeler.github.io - Docs: http://kenwheeler.github.io/slick - Repo: http://github.com/kenwheeler/slick - Issues: http://github.com/kenwheeler/slick/issues - - */ -/* global window, document, define, jQuery, setInterval, clearInterval */ -(function(factory) { - 'use strict'; - if (typeof define === 'function' && define.amd) { - define(['jquery'], factory); - } else if (typeof exports !== 'undefined') { - module.exports = factory(require('jquery')); - } else { - factory(jQuery); - } - -}(function($) { - 'use strict'; - var Slick = window.Slick || {}; - - Slick = (function() { - - var instanceUid = 0; - - function Slick(element, settings) { - - var _ = this, dataSettings; - - _.defaults = { - accessibility: true, - adaptiveHeight: false, - appendArrows: $(element), - appendDots: $(element), - arrows: true, - asNavFor: null, - prevArrow: '', - nextArrow: '', - autoplay: false, - autoplaySpeed: 3000, - centerMode: false, - centerPadding: '50px', - cssEase: 'ease', - customPaging: function(slider, i) { - return $('', - nextArrow: '', - autoplay: false, - autoplaySpeed: 3000, - centerMode: false, - centerPadding: '50px', - cssEase: 'ease', - customPaging: function(slider, i) { - return $('',\n nextArrow: '',\n autoplay: false,\n autoplaySpeed: 3000,\n centerMode: false,\n centerPadding: '50px',\n cssEase: 'ease',\n customPaging: function(slider, i) {\n return $('