Merge branch 'master' into test/move_issues_tests_hs4.0.3

.eslintignore

@@ -1,4 +1,4 @@
-vendor/**
+vendor/**/*
 samples/data/**/*.js
 samples/highcharts/common-js/**/*.js
 samples/static/*.js

.eslintrc

@@ -1,20 +1,30 @@
 extends:
-    "./tools/eslint-default-config.yml"
+    "./node_modules/eslint-config-eslint/default.yml"
 
 rules:
     camelcase: [2, {"properties": "always"}]
     comma-dangle: [2, "never"]
     dot-location: [2, "property"]
     lines-around-comment: 0
+    max-len: 2
     newline-after-var: 0
     no-alert: 2
     no-console: 2
     no-debugger: 2
     no-else-return: 2
     no-nested-ternary: 0
+    no-param-reassign: 0 // Would be useful, but takes some work
+    no-restricted-properties: 0 // Complains about .substr and .substring. Not yet.
     no-unmodified-loop-condition: 0
+    no-useless-escape: 0 // @todo: Useful but a bit risky to change. 54 errors.
+    no-var: 0 // Not yet
     object-curly-spacing: [2, "always"]
+    operator-assignment: 0 // Could be nice, but the change is somewhat error prone.
     operator-linebreak: [2, "after"]
+    padding-line-between-statements: 0 // Annoying in samples and tools. If we want it, do --fix.
+    prefer-arrow-callback: 0 // Not supported in Highcharts, too early for tests and samples.
+    prefer-spread: 0 // Too early for samples
+    prefer-template: 0 // Will probably create a lot of noise in samples
     space-before-function-paren: [2, {"anonymous": "always", "named": "never"}] # JSLint style
     strict: 0
     valid-jsdoc: ["error", { prefer: { "returns": "return"}}]

.gitignore

@@ -17,6 +17,8 @@
 /js/modules/exporting.js
 /build
 /code
+/errors/errors.json
+/errors/errors.xml
 /tools/jsdoc/ink-docstrap
 /git-ignore-me.properties
 /highcharts.com.sublime-project
@@ -36,8 +38,8 @@
 /utils/samples/temp/
 /utils/samples/nightly/
 
-tree.json
-tree-namespace.json
+/tree.json
+/tree-namespace.json
 
 exporting-server/java/highcharts-export/highcharts-export-web/pom.xml.amazon
 exporting-server/java/highcharts-export/highcharts-export-web/pom.xml.github
@@ -63,8 +65,8 @@ nbproject/
 
 *.log
 *.patch
-samples/highcharts/common-js/browserify/demo.js
-samples/highcharts/common-js/webpack/demo.js
+/samples/highcharts/common-js/browserify/demo.js
+/samples/highcharts/common-js/webpack/demo.js
 /samples/cloud/charts
 
 /tmp/report.html

CONTRIBUTING.md

@@ -0,0 +1,118 @@
+# Contributor's Guide
+
+First of all, thank you for contributing to Highcharts! :+1: :confetti_ball:
+
+This file outlines the guidelines for contributing source code to the Highcharts repository,
+as well as writing good issue reports.
+
+## Contents
+
+[Reporting Bugs](#reporting-bugs)
+[Suggesting Features and/or Enhancements](#suggesting-features-and-enhancements)
+[Contributing Code](#contributing-code)
+  [Licensing And Legal](#licensing-and-legal)
+  [Style Guide](#style-guide)
+  [Pull Requests](#pull-requests)
+
+## Reporting Bugs
+
+We track bugs on the repository's [GitHub issue tracker](https://github.com/highcharts/highcharts/issues).
+
+Before submitting a new bug report, please try to search existing (open and closed) issues to 
+see if the issue is already reported. If you find an existing open issue, please
+add any additional information you might have on the bug to the existing ticket.
+
+If you find a closed issue describing your problem, please open a new issue and 
+link to the closed one in your issue description (use `#<ticket number>`, e.g. `#1234`).
+
+Please also follow the directions in our [ticket submission template](https://github.com/highcharts/highcharts/blob/master/ISSUE_TEMPLATE.md).
+
+### Writing a clear bug report
+
+To help us find and resolve issues as quickly as possible, it's important that your 
+issue description contains a clear description of the problem. 
+
+Your issue should:
+
+* have a clear and descriptive title
+* include any `console.error` output related to the issue
+* describe the expected behaviour/output
+* link to a JSFiddle demo of the issue
+* if it's not reproducable in a minimal demo, explain what actions where done to trigger the bug
+* include the tested Highcharts and browser version(s)
+
+## Suggesting Features and Enhancements
+
+Features and enhancements can be suggested on [user voice](https://highcharts.uservoice.com/).
+
+## Contributing Code
+
+### Licensing And Legal
+
+Please note that when you contribute code to the Highcharts repository that code 
+will be part of the Highcharts source base, which is a commercial product.
+
+For this reason, submissions may not contain code that prevents or limits commercial usage in closed-source applications.
+To ensure this, submissions must be licensed using one of the following licenses:
+
+* [Apache License 2.0](http://opensource.org/licenses/apache2.0)
+* [BSD Licence](http://www.opensource.org/licenses/BSD-3-Clause)
+* [MIT / X11 License](http://www.opensource.org/licenses/MIT)
+* [Mozilla Public License](http://www.opensource.org/licenses/MPL-2.0)
+
+No other license is permitted for contributions.
+
+A reference to the license and the author of the code *must* be present in a comment leading into the submitted code block,
+in a way that makes it clear *which code falls under the license, and where/who it came from*.
+
+As an example:
+```
+/**
+ * The following function is licensed under the MIT license.
+ * Author: John Doe
+ */
+function anMITLicensedFunction () {
+<some awesome code in here>
+}
+```
+
+### Style Guide
+
+**Commit Messages**
+
+Commits should use the following format:
+* past tense, e.g. `Fixed..` rather than `Fixes..`: this is because we use the commit messages to generate changelogs
+* try to limit the name to <=100 characters
+* fixes should refer to issues where applicable, i.e. `Fixed #1235, <description>`
+
+**JavaScript**
+
+We use the following JavaScript style:
+* spaces over tabs
+* 4 character indentation
+* max columns in a line is 80
+* top-level var declarations
+* no `console.*`
+* single quotes
+
+This style is enforced by ESLint, which is ran in a post-commit hook.
+
+### Pull Requests
+
+We utilize a pull request based workflow. This means that all work is done in
+feature/fix branches, and then merged through pull requests.
+
+We use a standard naming convention for these branches:
+
+* `feature/<description>`: the branch contains a new feature
+* `bugfix/<issuenumber>-<description>`: the branch contains a bugfix for an open issue
+* `docs/<description>`: the branch contains a fix to the documentation/doclets
+
+Your pull request should:
+
+* use the branch name (or follow the branch naming convention if the PR is based on the master branch on a fork) as the title
+* contain a link to an open issue - if there is one - in the description
+* contain a description of what the pull request implements/fixes
+
+
+

ISSUE_TEMPLATE.md

@@ -5,7 +5,7 @@
 
 
 #### Live demo with steps to reproduce
-<!-- template: jsfiddle.net/highcharts/llexl/ -->
+<!-- template: https://jsfiddle.net/highcharts/LLExL/ -->
 
 #### Product version
 <!--- Highcharts, Highstock or Highmaps plus version number -->

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "highcharts",
-    "version": "6.1.1",
+    "version": "7.0.3",
     "description": "JavaScript charting framework",
     "main": "lib/highcharts.js",
     "authors": [

build.properties

@@ -2,15 +2,20 @@
 
 highcharts.product.name=Highcharts
 highcharts.product.cdnpath=
-highcharts.product.version=6.1.1-modified
+highcharts.product.version=7.0.3-modified
 highcharts.product.date=
 
 highstock.product.name=Highstock
 highstock.product.cdnpath=/stock
-highstock.product.version=6.1.1-modified
+highstock.product.version=7.0.3-modified
 highstock.product.date=
 
 highmaps.product.name=Highmaps
 highmaps.product.cdnpath=/maps
-highmaps.product.version=6.1.1-modified
+highmaps.product.version=7.0.3-modified
 highmaps.product.date=
+
+gantt.product.name=Highcharts Gantt
+gantt.product.cdnpath=/gantt
+gantt.product.version=7.0.3-modified
+gantt.product.date=

build.xml

@@ -31,6 +31,12 @@
             <filter token="product.version" value="${highmaps.product.version}"/>
             <filter token="product.date" value="${highmaps.product.date}"/>
         </filterset>
+        <filterset id="gantt.filter">
+            <filter token="product.name" value="${gantt.product.name}"/>
+            <filter token="product.cdnpath" value="${gantt.product.cdnpath}"/>
+            <filter token="product.version" value="${gantt.product.version}"/>
+            <filter token="product.date" value="${gantt.product.date}"/>
+        </filterset>
         <filterset id="download.builder.filter">
             <filter token="product.name" value="${highcharts.product.name} ${highcharts.product.version}"/>
             <filter token="product.version" value="/${highstock.product.name} ${highstock.product.version}"/>
@@ -56,6 +62,9 @@
         <property name="highstock.src.name" value="highstock.src.js"/>
         <property name="highstock.src.file" value="${basedir}/js/${highstock.src.name}"/>
         <property name="highstock.minified.name" value="highstock.js"/>
+        <property name="gantt.src.name" value="highcharts-gantt.src.js"/>
+        <property name="gantt.src.file" value="${basedir}/js/${gantt.src.name}"/>
+        <property name="gantt.minified.name" value="highcharts-gantt.js"/>
         <property name="highmaps.src.name" value="highmaps.src.js"/>
         <property name="highmaps.src.file" value="${basedir}/js/${highmaps.src.name}"/>
         <property name="highmaps.minified.name" value="highmaps.js"/>
@@ -392,6 +401,8 @@
         <zip destfile="${dist.dir}/${highcharts.product.name}-${highcharts.product.version}.zip" basedir="${dist.dir}/highcharts"/>
         <zip destfile="${dist.dir}/${highstock.product.name}-${highstock.product.version}.zip" basedir="${dist.dir}/highstock"/>
         <zip destfile="${dist.dir}/${highmaps.product.name}-${highmaps.product.version}.zip" basedir="${dist.dir}/highmaps"/>
+        <zip destfile="${dist.dir}/Highcharts-Gantt-${gantt.product.version}.zip" basedir="${dist.dir}/gantt"/>
+
 
     </target>
 
@@ -800,10 +811,107 @@
         </ac:for>
     </target>
 
+
+
+    <!-- Deploy Gantt to S3 -->
+    <target name="deploy-gantt" depends="set.properties" description="Deploy Gantt distribution to Amazon S3">
+        <property file="git-ignore-me.properties"/>
+        <copy
+            file="${basedir}/build/dist/Highcharts-Gantt-${gantt.product.version}.zip"
+            tofile="${basedir}/build/dist/Highcharts-Gantt-${gantt.product.version}.zip"
+        />
+        <antcall target="put-file-to-S3">
+            <param name="local" value="${basedir}/build/dist/Highcharts-Gantt-${gantt.product.version}.zip"/>
+            <param name="remote" value="${amazon.s3.bucketname}/zips"/>
+            <param name="s3cmdDir" value="${s3cmd.dir}"/>
+            <param name="s3cmdDir" value="${s3cmd.dir}"/>
+        </antcall>
+        <antcall target="gzip-js">
+            <param name="js.dir" value="${basedir}/build/dist/gantt/code/"/>
+        </antcall>
+        <ac:var name="path.var" value=""/>
+        <ac:for list="${gantt.product.version}" delimiter="." param="val">
+            <sequential>
+                <ac:if>
+                    <length string="${path.var}" length="0"/>
+                    <then>
+                        <ac:var name="path.var" value="@{val}"/>
+                        <!-- this will be used later to do a remote copy on S3 -->
+                        <property name="copy.version" value="@{val}"/>
+                        <!-- Copy zipped js/* to Root on S3 -->
+                        <antcall target="put-gzipped-files-to-S3">
+                            <param name="local" value="${basedir}/build/dist/gantt/js-gzip/"/>
+                            <param name="remote" value="${amazon.s3.bucketname}/gantt"/>
+                            <param name="s3cmdDir" value="${s3cmd.dir}"/>
+                            <param name="http.expires" value="${http.expires.one.day}"/>
+                            <param name="max.age" value="${max.age.one.day}"/>
+                        </antcall>
+                        <!-- copy gfx folder to Root -->
+                        <antcall target="put-files-to-S3">
+                            <param name="local" value="${basedir}/build/dist/gantt/gfx"/>
+                            <param name="remote" value="${amazon.s3.bucketname}/gantt"/>
+                            <param name="s3cmdDir" value="${s3cmd.dir}"/>
+                            <param name="http.expires" value="${http.expires.one.day}"/>
+                            <param name="max.age" value="${max.age.one.day}"/>
+                        </antcall>
+                        <!-- Copy to js/* version [= ${path.var} ] on S3 -->
+                        <antcall target="put-gzipped-files-to-S3">
+                            <param name="local" value="${basedir}/build/dist/gantt/js-gzip/"/>
+                            <param name="remote" value="${amazon.s3.bucketname}/gantt/${path.var}"/>
+                            <param name="s3cmdDir" value="${s3cmd.dir}"/>
+                            <param name="http.expires" value="${http.expires.one.day}"/>
+                            <param name="max.age" value="${max.age.one.day}"/>
+                        </antcall>
+                        <!-- copy gfx folder to version folder on S3-->
+                        <antcall target="put-files-to-S3">
+                            <param name="local" value="${basedir}/build/dist/gantt/gfx"/>
+                            <param name="remote" value="${amazon.s3.bucketname}/gantt/${path.var}"/>
+                            <param name="s3cmdDir" value="${s3cmd.dir}"/>
+                            <param name="http.expires" value="${http.expires.one.day}"/>
+                            <param name="max.age" value="${max.age.one.day}"/>
+                        </antcall>
+                    </then>
+                    <elseif>
+                        <length string="${path.var}" length="3"/>
+                        <then>
+                            <ac:var name="path.var" value="${path.var}.@{val}"/>
+                            <!-- Copy to js/* version [= ${path.var} ] on S3 -->
+                            <antcall target="put-gzipped-files-to-S3">
+                                <param name="local" value="${basedir}/build/dist/gantt/js-gzip/"/>
+                                <param name="remote" value="${amazon.s3.bucketname}/gantt/${path.var}"/>
+                                <param name="s3cmdDir" value="${s3cmd.dir}"/>
+                                <param name="http.expires" value="${http.expires.five.years}"/>
+                                <param name="max.age" value="${max.age.five.years}"/>
+                            </antcall>
+                            <!-- copy gfx folder to version folder on S3-->
+                            <antcall target="put-files-to-S3">
+                                <param name="local" value="${basedir}/build/dist/gantt/gfx"/>
+                                <param name="remote" value="${amazon.s3.bucketname}/gantt/${path.var}"/>
+                                <param name="s3cmdDir" value="${s3cmd.dir}"/>
+                                <param name="http.expires" value="${http.expires.five.years}"/>
+                                <param name="max.age" value="${max.age.five.years}"/>
+                            </antcall>
+                        </then>
+                    </elseif>
+                    <else>
+                        <!-- concatenate version name and assign to path.var-->
+                        <ac:var name="path.var" value="${path.var}.@{val}"/>
+                        <antcall target="copy-folder-on-S3">
+                            <param name="from.s3" value="${amazon.s3.bucketname}/gantt/${copy.version}/"/>
+                            <param name="to.s3" value="${amazon.s3.bucketname}/gantt/${path.var}"/>
+                            <param name="s3cmdDir" value="${s3cmd.dir}"/>
+                        </antcall>
+                    </else>
+                </ac:if>
+            </sequential>
+        </ac:for>
+    </target>
+
     <target name="deploy-all">
         <antcall target="deploy-highcharts"></antcall>
         <antcall target="deploy-highstock"></antcall>
         <antcall target="deploy-highmaps"></antcall>
+        <antcall target="deploy-gantt"></antcall>
     </target>
 
 
@@ -838,6 +946,12 @@
     <!-- Copy the folders and content of /samples and /studies to higcharts.com.site -->
     <target name="copy-to-site" depends="set.properties" description="Copy files from this repo to repository www.highcharts.com">
         <property file="git-ignore-me.properties"/>
+        <delete includeEmptyDirs="true">
+            <fileset dir="${highcharts.site.dir}/samples/gantt" includes="**/*"/>
+            <fileset dir="${highcharts.site.dir}/samples/highcharts" includes="**/*"/>
+            <fileset dir="${highcharts.site.dir}/samples/maps" includes="**/*"/>
+            <fileset dir="${highcharts.site.dir}/samples/stock" includes="**/*"/>
+        </delete>
         <copy todir="${highcharts.site.dir}/samples">
             <fileset dir="samples"/>
         </copy>