From 253319d6d379160d956855f7090d8c7b147db695 Mon Sep 17 00:00:00 2001 From: Fabiano Date: Thu, 2 Aug 2018 19:50:08 -0300 Subject: [PATCH] Update bootstrap to version 4.1.3; added masonry to composer. --- composer.json | 1 + composer.lock | 41 +++++++++++++++++++++++++++++++++++++- install.sh | 11 +++++----- src/functions/enqueues.php | 11 ++++++---- 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index d401337..1b09112 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "twbs/bootstrap": "4.*", "wp-bootstrap/wp-bootstrap-navwalker": "*", "kenwheeler/slick": "1.6.1", + "desandro/masonry": "4.*", "desandro/imagesloaded": "4.*" }, "scripts": { diff --git a/composer.lock b/composer.lock index f189b2d..96fd486 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "1a2069ad091a4f746d2a5d9750a49a7f", + "content-hash": "e76fd93afcf5cccb4b58c468e70bbeba", "packages": [ { "name": "composer/installers", @@ -165,6 +165,45 @@ ], "time": "2018-01-02T16:53:35+00:00" }, + { + "name": "desandro/masonry", + "version": "v4.2.2", + "source": { + "type": "git", + "url": "https://github.com/desandro/masonry.git", + "reference": "3b0883cf4a4a046896719b9cf282ea74be7ffecd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/desandro/masonry/zipball/3b0883cf4a4a046896719b9cf282ea74be7ffecd", + "reference": "3b0883cf4a4a046896719b9cf282ea74be7ffecd", + "shasum": "" + }, + "type": "component", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David DeSandro", + "homepage": "http://desandro.com/", + "role": "developer" + } + ], + "description": "Cascading grid layout library", + "homepage": "https://masonry.desandro.com", + "keywords": [ + "browser", + "dom", + "grid", + "javascript", + "layout", + "library", + "outlayer" + ], + "time": "2018-07-04T18:01:15+00:00" + }, { "name": "kenwheeler/slick", "version": "1.6.1", diff --git a/install.sh b/install.sh index b4b1bf1..120ab28 100644 --- a/install.sh +++ b/install.sh @@ -24,7 +24,7 @@ echo "\nCopy Frameword CSS - Bootstrap ...\n\n"; } recurse_copy("vendor/twbs/bootstrap/scss", "src/assets/vendor/bootstrap/scss"); copy("vendor/twbs/bootstrap/dist/js/bootstrap.min.js", "src/assets/vendor/bootstrap/js/bootstrap.min.js"); - copy("vendor/twbs/bootstrap/assets/js/vendor/popper.min.js", "src/assets/vendor/bootstrap/js/popper.min.js"); + copy("vendor/twbs/bootstrap/site/docs/4.1/assets/js/vendor/popper.min.js", "src/assets/vendor/bootstrap/js/popper.min.js"); echo "Copy Slick for Slider...\n\n"; if (!file_exists("src/assets/vendor/slick")) { @@ -39,11 +39,12 @@ echo "Copy Slick for Slider...\n\n"; copy("vendor/kenwheeler/slick/slick/ajax-loader.gif", "src/assets/vendor/slick/ajax-loader.gif"); recurse_copy("vendor/kenwheeler/slick/slick/fonts", "src/assets/vendor/slick/fonts"); -echo "Copy ImageLoaded... \n\n"; - if (!file_exists("src/assets/vendor/imgloaded")) { - mkdir("src/assets/vendor/imgloaded/", 0777, true); +echo "Copy Masonry & ImageLoaded... \n\n"; + if (!file_exists("src/assets/vendor/desandro")) { + mkdir("src/assets/vendor/desandro/", 0777, true); } - copy("vendor/desandro/imagesloaded/imagesloaded.pkgd.min.js", "src/assets/vendor/imgloaded/imagesloaded.pkgd.min.js"); + copy("vendor/desandro/masonry/dist/masonry.pkgd.min.js", "src/assets/vendor/desandro/masonry.pkgd.min.js"); + copy("vendor/desandro/imagesloaded/imagesloaded.pkgd.min.js", "src/assets/vendor/desandro/imagesloaded.pkgd.min.js"); echo "Finish Copy files! \n\n"; diff --git a/src/functions/enqueues.php b/src/functions/enqueues.php index 726a889..4bd6372 100644 --- a/src/functions/enqueues.php +++ b/src/functions/enqueues.php @@ -15,19 +15,22 @@ if ( ! function_exists('tainacan_Enqueues') ) { wp_register_script( 'jquery', includes_url( '/js/jquery/jquery.js' ), false, NULL, true ); wp_enqueue_script( 'jquery' ); - wp_register_script('masonryJS', 'https://unpkg.com/masonry-layout@4.2.1/dist/masonry.pkgd.min.js', '', '4.2.1', true); + wp_register_script('masonryJS', get_template_directory_uri() . '/assets/vendor/desandro/masonry.pkgd.min.js', '', '', true); wp_enqueue_script( 'masonryJS' ); + + wp_register_script('imageLoadedJS', get_template_directory_uri() . '/assets/vendor/desandro/imagesloaded.pkgd.min.js', '', '', true); + wp_enqueue_script( 'imageLoadedJS' ); /** - * Bootstrap 4.1.1 + * Bootstrap 4.1.3 */ //Style - wp_register_style('bootstrap4CSS', get_template_directory_uri() . '/assets/vendor/bootstrap/css/bootstrap.min.css', '', '4.1.1', ''); + wp_register_style('bootstrap4CSS', get_template_directory_uri() . '/assets/vendor/bootstrap/css/bootstrap.min.css'); wp_enqueue_style('bootstrap4CSS'); //Popper wp_register_script('popper_bootstrap4', get_template_directory_uri() . '/assets/vendor/bootstrap/js/popper.min.js', '', '', true); wp_enqueue_script('popper_bootstrap4'); //Javascript - wp_register_script('bootstrap4JS', get_template_directory_uri() . '/assets/vendor/bootstrap/js/bootstrap.min.js', array('jquery'), '4.1.1', true); + wp_register_script('bootstrap4JS', get_template_directory_uri() . '/assets/vendor/bootstrap/js/bootstrap.min.js', array('jquery'), '', true); wp_enqueue_script('bootstrap4JS'); /**