Merge branch 'develop'

praxisnetau · Feb 7, 2018 · 001f1b5 · 001f1b5
2 parents 62d6316 + 895fc64
commit 001f1b5
Show file tree

Hide file tree

Showing 9 changed files with 4,940 additions and 4,098 deletions.
diff --git a/README.md b/README.md
@@ -74,9 +74,9 @@ Please see [contributing](CONTRIBUTING.md) for more information.
 
 ## Maintainers
 
-[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](http://www.praxis.net.au)
+[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](https://www.praxis.net.au)
 ---|---
-[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](http://www.praxis.net.au)
+[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](https://www.praxis.net.au)
 
 ## License
 

diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/SliderComponent.js b/client/src/components/SliderComponent.js
@@ -17,6 +17,7 @@ $(function() {
       speed: $wrapper.data('speed'),
       pause: $wrapper.data('pause'),
       mode: $wrapper.data('mode'),
+      pager: $wrapper.data('pager'),
       adaptiveHeight: $wrapper.data('adaptive-height'),
       pauseOnHover: $wrapper.data('pause-on-hover'),
       gallery: $wrapper.data('gallery'),

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
       "name": "Colin Tucker",
       "role": "Developer",
       "email": "colin@praxis.net.au",
-      "homepage": "http://www.praxis.net.au"
+      "homepage": "https://www.praxis.net.au"
     }
   ],
   "require": {

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     {
       "name": "Colin Tucker",
       "email": "colin@praxis.net.au",
-      "url": "http://www.praxis.net.au"
+      "url": "https://www.praxis.net.au"
     }
   ],
   "repository": {
@@ -25,30 +25,34 @@
     "url": "https://github.com/praxisnetau/silverware-slider/issues"
   },
   "engines": {
-    "node": "^4.2.0"
+    "node": "^8.x"
   },
   "scripts": {
     "watch": "webpack --env.development --colors --watch",
     "build": "webpack --env.production --colors --optimize-minimize"
   },
   "dependencies": {},
   "devDependencies": {
-    "autoprefixer": "^7.1.5",
+    "autoprefixer": "^7.2.4",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
-    "babel-preset-env": "^1.6.0",
+    "babel-preset-env": "^1.6.1",
     "clean-webpack-plugin": "^0.1.17",
-    "copy-webpack-plugin": "^4.1.1",
-    "css-loader": "^0.28.7",
-    "extract-text-webpack-plugin": "^3.0.1",
-    "file-loader": "^1.1.5",
+    "copy-webpack-plugin": "^4.3.1",
+    "css-loader": "^0.28.8",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^1.1.6",
     "lightslider": "^1.1.6",
-    "node-sass": "^4.5.3",
-    "postcss-loader": "^2.0.6",
+    "node-sass": "^4.7.2",
+    "postcss-loader": "^2.0.10",
+    "resolve-url-loader": "^2.2.1",
     "sass-loader": "^6.0.6",
-    "style-loader": "^0.19.0",
+    "style-loader": "^0.19.1",
+    "svgo": "^1.0.3",
+    "svgo-loader": "^2.1.0",
+    "uglifyjs-webpack-plugin": "^1.1.6",
     "url-loader": "^0.6.2",
-    "webpack": "^3.6.0"
+    "webpack": "^3.10.0"
   },
   "babel": {
     "presets": [

diff --git a/postcss.config.js b/postcss.config.js
@@ -1 +1,8 @@
-module.exports = {};
+/* PostCSS Configuration
+===================================================================================================================== */
+
+module.exports = {
+  plugins: [
+    require('autoprefixer')
+  ]
+};
diff --git a/src/Components/SliderComponent.php b/src/Components/SliderComponent.php
@@ -128,6 +128,7 @@ class SliderComponent extends BaseComponent
         'NumberOfThumbs' => 'Int',
         'PauseOnHover' => 'Boolean',
         'AdaptiveHeight' => 'Boolean',
+        'ShowPager' => 'Boolean',
         'ShowThumbs' => 'Boolean',
         'ShowControls' => 'Boolean',
         'HideCaptionsOnMobile' => 'Boolean',
@@ -158,6 +159,7 @@ class SliderComponent extends BaseComponent
         'NumberOfThumbs' => 10,
         'PauseOnHover' => 1,
         'AdaptiveHeight' => 1,
+        'ShowPager' => 1,
         'ShowThumbs' => 0,
         'ShowControls' => 1,
         'IconPrev' => 'chevron-left',
@@ -346,6 +348,10 @@ public function getCMSFields()
                         'HideCaptionsOnMobile',
                         $this->fieldLabel('HideCaptionsOnMobile')
                     ),
+                    CheckboxField::create(
+                        'ShowPager',
+                        $this->fieldLabel('ShowPager')
+                    ),
                     CheckboxField::create(
                         'ShowControls',
                         $this->fieldLabel('ShowControls')
@@ -391,6 +397,7 @@ public function fieldLabels($includerelations = true)
         $labels['NumberOfItems'] = _t(__CLASS__ . '.NUMBEROFITEMS', 'Number of items');
         $labels['PauseOnHover'] = _t(__CLASS__ . '.PAUSEONHOVER', 'Pause on hover');
         $labels['AdaptiveHeight'] = _t(__CLASS__ . '.ADAPTIVEHEIGHT', 'Adaptive height');
+        $labels['ShowPager'] = _t(__CLASS__ . '.SHOWPAGER', 'Show pager');
         $labels['ShowThumbs'] = _t(__CLASS__ . '.SHOWTHUMBNAILS', 'Show thumbnails');
         $labels['ShowControls'] = _t(__CLASS__ . '.SHOWCONTROLS', 'Show controls');
         $labels['NumberOfThumbs'] = _t(__CLASS__ . '.NUMBEROFTHUMBNAILS', 'Number of thumbnails');
@@ -534,6 +541,7 @@ public function getWrapperDataAttributes()
             'data-loop' => $this->dbObject('Loop')->NiceAsBoolean(),
             'data-pause' => $this->Pause,
             'data-speed' => $this->Speed,
+            'data-pager' => $this->dbObject('ShowPager')->NiceAsBoolean(),
             'data-gallery' => $this->dbObject('ShowThumbs')->NiceAsBoolean(),
             'data-controls' => $this->dbObject('ShowControls')->NiceAsBoolean(),
             'data-thumb-item' => $this->NumberOfThumbs,