Merge branch 'release/4.0.1'

kittn · Apr 21, 2017 · f21c9d1 · f21c9d1
2 parents 6470c57 + d7640a0
commit f21c9d1
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 21 deletions.
diff --git a/app/templates/_copy-wpplugins.js b/app/templates/_copy-wpplugins.js
@@ -5,10 +5,15 @@
 
 import kc from '../../config.json'
 import gulp from 'gulp'
+import gutil from 'gulp-util'
+import gulpLoadPlugins from 'gulp-load-plugins'
+
+const $ = gulpLoadPlugins()
 
 const copyWPPlugins = () => {
   gulp
     .src(kc.src.plugins + '**/*')
+    .pipe(global.checkChanged === true ? $.changed(kc.dist.dist + 'wp-content/plugins/') : gutil.noop())
     .pipe(gulp.dest(kc.dist.dist + 'wp-content/plugins/'))
 }
 

diff --git a/app/templates/src/gulpfile/tasks/build.js b/app/templates/src/gulpfile/tasks/build.js
@@ -28,16 +28,16 @@ const buildTask = (cb) => {
     [
       'compiler:css',
       'compiler:html'
-    ],
+    ]<% if (projectcritical === true) { %>,
+    [
+      'optimize:criticalCss'
+    ]<% } %>,
     [
       'minify:js',
       'minify:contentimages',
       'minify:inlineimages',
       'minify:css'
-    ]<% if (projectcritical === true) { %>,
-    [
-      'optimize:criticalCss'
-    ]<% } %>,
+    ],
     cb)
 }
 

diff --git a/app/templates/src/skeletons/starterpack/general/js/init-heighttransition.js b/app/templates/src/skeletons/starterpack/general/js/init-heighttransition.js
@@ -7,8 +7,9 @@ if (document.querySelector('.o-slideoutbox__trigger') !== null) {
     const item = items[i]
     const trigger = item.querySelector('.o-slideoutbox__trigger')
     trigger.addEventListener('click', function(el) {
-      const classes = el.srcElement.classList
-      const slideElement = el.srcElement.parentElement.parentElement.querySelector('.o-slideoutbox__body')
+      const eventTarget = el.target || el.srcElement
+      const classes = eventTarget.classList
+      const slideElement = eventTarget.parentElement.parentElement.querySelector('.o-slideoutbox__body')
 
       if (classes.contains('is-open')) {
         classes.remove('is-open')
@@ -37,8 +38,9 @@ if (document.querySelector('.o-accordion__trigger') !== null) {
     const triggers = item.querySelectorAll('.o-accordion__trigger')
     triggers.forEach(function(item) {
       item.addEventListener('click', function(el) {
-        const classes = el.srcElement.classList
-        const slideElement = el.srcElement.parentElement.querySelector('.o-accordion__body')
+        const eventTarget = el.target || el.srcElement
+        const classes = eventTarget.classList
+        const slideElement = eventTarget.parentElement.querySelector('.o-accordion__body')
 
         if (classes.contains('is-open')) {
           classes.remove('is-open')

diff --git a/...es/src/skeletons/starterpack/wordpress/structure/templates/_macros/macroMediaImageSet.php b/...es/src/skeletons/starterpack/wordpress/structure/templates/_macros/macroMediaImageSet.php
@@ -42,6 +42,9 @@ function macro_mediaImageSet($image,$classname,$format,$background = false, $tag
   ];
 
   if ($image) {
+    // Get Mime Type
+    $imageMime = $image['mime_type'];
+
     // Check Imageformat
     if (in_array($format, $imageformats)) {
       // Generate Image Set
@@ -58,14 +61,27 @@ function macro_mediaImageSet($image,$classname,$format,$background = false, $tag
 
       // Output as <img> or Background
       if ($background) {
-        // Check if Tag is used otherwise return a string
-        if ($tag != false) {
-          echo '<'.$tag.' class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"></'.$tag.'>';
+        if ($imageMime == 'image/svg+xml') {
+          // Check if Tag is used otherwise return a string
+          if ($tag != false) {
+            echo '<'.$tag.' class="'.$classname.'" style="background-image: url('.$imagepre.');'.$backgroundPosition.'"></'.$tag.'>';
+          } else {
+            echo 'class="'.$classname.'" style="background-image: url('.$imagepre.');'.$backgroundPosition.'"';
+          }
         } else {
-          echo 'class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"';
+          // Check if Tag is used otherwise return a string
+          if ($tag != false) {
+            echo '<'.$tag.' class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"></'.$tag.'>';
+          } else {
+            echo 'class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"';
+          }
         }
       } else {
-        echo '<img data-sizes="auto" src="'.$imagepre.'" data-srcset="'.$imageset.'" class="'.$classname.' lazyload" role="img" alt="'.$image["alt"].'" itemprop="thumbnail">';
+        if ($imageMime == 'image/svg+xml') {
+          echo  '<img src="'.$imagepre.'" class="'.$classname.'" role="img" alt="'.$image["alt"].'" itemprop="thumbnail">';
+        } else {
+          echo  '<img data-sizes="auto" src="'.$imagepre.'" data-srcset="'.$imageset.'" class="'.$classname.' lazyload" role="img" alt="'.$image["alt"].'" itemprop="thumbnail">';
+        }
       }
     } else {
       echo '<p style="color:red">Wrong Image Format!<br> Use the Following: uncropped, wide, extrawide, square or rect </p>';

diff --git a/...src/skeletons/starterpack/wordpress/structure/templates/_macros/macroMediaImageSetRef.php b/...src/skeletons/starterpack/wordpress/structure/templates/_macros/macroMediaImageSetRef.php
@@ -32,6 +32,9 @@ function macro_mediaImageSet($image,$classname,$format,$background = false, $tag
   }
 
   if ($image) {
+    // Get Mime Type
+    $imageMime = $image['mime_type'];
+
     // Check Imageformat
     if (in_array($format, $imageformats)) {
       // Generate Image Set
@@ -53,14 +56,28 @@ function macro_mediaImageSet($image,$classname,$format,$background = false, $tag
 
       // Output as <img> or Background
       if ($background) {
-        // Check if Tag is used otherwise return a string
-        if ($tag != false) {
-          echo '<'.$tag.' class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"></'.$tag.'>';
+        if ($imageMime == 'image/svg+xml') {
+          // Check if Tag is used otherwise return a string
+          if ($tag != false) {
+            echo '<'.$tag.' class="'.$classname.'" style="background-image: url('.$imagepre.');'.$backgroundPosition.'"></'.$tag.'>';
+          } else {
+            echo 'class="'.$classname.'" style="background-image: url('.$imagepre.');'.$backgroundPosition.'"';
+          }
         } else {
-          echo 'class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"';
+          // Check if Tag is used otherwise return a string
+          if ($tag != false) {
+            echo '<'.$tag.' class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"></'.$tag.'>';
+          } else {
+            echo 'class="'.$classname.' lazyload" style="background-image: url('.$imagepre.');'.$backgroundPosition.'" data-sizes="auto" data-bgset="'.$imageset.'"';
+          }
         }
+
       } else {
-        echo  '<img data-sizes="auto" src="'.$imagepre.'" data-srcset="'.$imageset.'" class="'.$classname.' lazyload" role="img" alt="'.$image["alt"].'" itemprop="thumbnail">';
+        if ($imageMime == 'image/svg+xml') {
+          echo  '<img src="'.$imagepre.'" class="'.$classname.'" role="img" alt="'.$image["alt"].'" itemprop="thumbnail">';
+        } else {
+          echo  '<img data-sizes="auto" src="'.$imagepre.'" data-srcset="'.$imageset.'" class="'.$classname.' lazyload" role="img" alt="'.$image["alt"].'" itemprop="thumbnail">';
+        }
       }
 
     } else {

diff --git a/...plates/src/skeletons/starterpack/wordpress/structure/templates/_objects/objCardSlider.php b/...plates/src/skeletons/starterpack/wordpress/structure/templates/_objects/objCardSlider.php
@@ -9,7 +9,7 @@
 $classnameCardSlider = 'o-slider';
 $ratio = get_sub_field('ratio');
 $style = get_sub_field('style');
-$slideCount = count( get_field('slides') );
+$slideCount = count( get_sub_field('slides') );
 
 $responsive = get_sub_field('responsive') ? '-r' : '';
 $spaceBetween = get_sub_field('spaceBetween') ? 'padding-left: '.get_sub_field('spaceBetween').';padding-right: '.get_sub_field('spaceBetween').';' : '';

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-kittn",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Kittn Scaffolding and Frontend Toolchain",
   "license": "MIT",
   "main": "app/index.js",