merged master, resolving conflicts

woocommerce · Nov 20, 2017 · 2a0f699 · 2a0f699
2 parents 4bb45f0 + 15d02a0
commit 2a0f699
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/less
 node_modules/.bin
+node_modules/uglify-js
diff --git a/demo/css/flexslider.css b/demo/css/flexslider.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.6.2
+ * jQuery FlexSlider v2.6.4
  * http://www.woothemes.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/demo/js/jquery.flexslider.js b/demo/js/jquery.flexslider.js
@@ -1,4 +1,4 @@
-/*
+/* @preserve
  * jQuery FlexSlider v2.6.4
  * SC customizations 0.1 - added swiping flag; fixed resize bind issue in v2.6.4
  * Copyright 2012 WooThemes

diff --git a/jquery.flexslider-min.js b/jquery.flexslider-min.js
diff --git a/jquery.flexslider.js b/jquery.flexslider.js
@@ -1,4 +1,4 @@
-/*
+/* @preserve
  * jQuery FlexSlider v2.6.4
  * SC customizations 0.1 - added swiping flag; fixed resize bind issue in v2.6.4
  * Copyright 2012 WooThemes

diff --git a/package.json b/package.json
@@ -5,9 +5,10 @@
   "main": "jquery.flexslider.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
+    "build:js": "./node_modules/.bin/uglifyjs jquery.flexslider.js --comments --ie8 -o jquery.flexslider-min.js",
     "build:css": "./node_modules/.bin/lessc flexslider.less flexslider.css",
-    "build:demo": "cp jquery.flexslider.js demo/js/jquery.flexslider.js",
-    "build": "npm run build:css && npm run build:demo"
+    "build:demo": "cp jquery.flexslider.js demo/js/jquery.flexslider.js && cp flexslider.css demo/css/flexslider.css",
+    "build": "npm run build:js && npm run build:css && npm run build:demo"
   },
   "repository": {
     "type": "git",
@@ -30,6 +31,7 @@
     "jquery": ">=1.11.3"
   },
   "devDependencies": {
-    "less": "^2.7.3"
+    "less": "^2.7.3",
+    "uglify-js": "^3.1.10"
   }
 }