vue-chartjs - npm Package Compare versions

Comparing version 1.0.3 to 1.1.0

CHANGELOG.md

 # Change Log
 
+## [1.1.0](https://github.com/apertureless/vue-chartjs/tree/1.1.0) (2016-08-21)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.3...1.1.0)
+
+**Implemented enhancements:**
+
+- Use Vue.util.mergeOptions to merge default options with user's options [\#5](https://github.com/apertureless/vue-chartjs/issues/5)
+
+**Merged pull requests:**
+
+- Feature/merge options \#5 [\#6](https://github.com/apertureless/vue-chartjs/pull/6) ([apertureless](https://github.com/apertureless))
+
 ## [1.0.3](https://github.com/apertureless/vue-chartjs/tree/1.0.3) (2016-08-20)
@@ -4,0 +15,0 @@ [Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.2...1.0.3)

package.json

 {
   "name": "vue-chartjs",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Vue wrapper for chart.js",
@@ -37,9 +37,12 @@ "author": "Jakub Juszczak <[e-mail]>",
     "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "chromedriver": "^2.21.2",
     "connect-history-api-fallback": "^1.1.0",
+    "cross-spawn": "^2.1.5",
     "css-loader": "^0.23.0",
     "eslint": "^2.10.2",
+    "eslint-config-standard": "^5.1.0",
     "eslint-friendly-formatter": "^2.0.5",
     "eslint-loader": "^1.3.0",
     "eslint-plugin-html": "^1.3.0",
-    "eslint-config-standard": "^5.1.0",
     "eslint-plugin-promise": "^1.0.8",
@@ -54,2 +57,4 @@ "eslint-plugin-standard": "^1.3.2",
     "http-proxy-middleware": "^0.12.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
     "json-loader": "^0.5.4",
@@ -64,16 +69,12 @@ "karma": "^0.13.15",
     "karma-webpack": "^1.7.0",
+    "lodash": "^4.15.0",
     "lolex": "^1.4.0",
     "mocha": "^2.4.5",
-    "chai": "^3.5.0",
-    "sinon": "^1.17.3",
-    "sinon-chai": "^2.8.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "ora": "^0.2.0",
     "phantomjs-prebuilt": "^2.1.3",
-    "chromedriver": "^2.21.2",
-    "cross-spawn": "^2.1.5",
-    "nightwatch": "^0.8.18",
     "selenium-server": "2.53.0",
-    "ora": "^0.2.0",
     "shelljs": "^0.6.0",
+    "sinon": "^1.17.3",
+    "sinon-chai": "^2.8.0",
     "url-loader": "^0.5.7",
@@ -80,0 +81,0 @@ "vue-hot-reload-api": "^1.2.0",

README.md

 # Vue-ChartJs
 
-[![npm version](https://badge.fury.io/js/vue-chartjs.svg)] (https://badge.fury.io/js/vue-chartjs) ![npm dependencies](https://david-dm.org/apertureless/vue-chartjs.svg) 
+[![npm version](https://badge.fury.io/js/vue-chartjs.svg)](https://badge.fury.io/js/vue-chartjs) ![npm dependencies](https://david-dm.org/apertureless/vue-chartjs.svg)
 
@@ -145,1 +145,13 @@ > VueJS wrapper for ChartJs
 For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+
+## Contributing
+
+1. Fork it ( https://github.com/apertureless/vue-chartjs/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
+## License
+
+This software is distributed under [MIT license](LICENSE.txt).

src/BaseCharts/Bar.js

 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
@@ -24,3 +25,3 @@ export default Vue.extend({
     return {
-      options: {
+      defaultOptions: {
         scales: {
@@ -48,3 +49,5 @@ yAxes: [{
   methods: {
-    render (data, options = this.options) {
+    render (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
       this._chart = new Chart(
@@ -54,3 +57,3 @@ this.$els.canvas.getContext('2d'), {
           data: data,
-          options: options
+          options: chartOptions
         }
@@ -57,0 +60,0 @@ )

src/BaseCharts/Doughnut.js

 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
@@ -24,3 +25,3 @@ export default Vue.extend({
     return {
-      options: {
+      defaultOptions: {
       }
@@ -31,3 +32,5 @@ }
   methods: {
-    render (data, options = this.options) {
+    render (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
       this._chart = new Chart(
@@ -37,3 +40,3 @@ this.$els.canvas.getContext('2d'), {
           data: data,
-          options: options
+          options: chartOptions
         }
@@ -40,0 +43,0 @@ )

src/BaseCharts/Line.js

 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
@@ -24,3 +25,3 @@ export default Vue.extend({
     return {
-      options: {
+      defaultOptions: {
         scales: {
@@ -46,3 +47,5 @@ yAxes: [{
   methods: {
-    render (data, options = this.options) {
+    render (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
       this._chart = new Chart(
@@ -52,3 +55,3 @@ this.$els.canvas.getContext('2d'), {
           data: data,
-          options: options
+          options: chartOptions
         }
@@ -55,0 +58,0 @@ )

src/BaseCharts/Pie.js

 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
@@ -24,3 +25,3 @@ export default Vue.extend({
     return {
-      options: {
+      defaultOptions: {
       }
@@ -31,3 +32,5 @@ }
   methods: {
-    render (data, options = this.options) {
+    render (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
       this._chart = new Chart(
@@ -37,3 +40,3 @@ this.$els.canvas.getContext('2d'), {
           data: data,
-          options: options
+          options: chartOptions
         }
@@ -40,0 +43,0 @@ )

src/BaseCharts/PolarArea.js

 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
@@ -24,3 +25,3 @@ export default Vue.extend({
     return {
-      options: {
+      defaultOptions: {
       }
@@ -31,3 +32,5 @@ }
   methods: {
-    render (data, options = this.options) {
+    render (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
       this._chart = new Chart(
@@ -37,3 +40,3 @@ this.$els.canvas.getContext('2d'), {
           data: data,
-          options: options
+          options: chartOptions
         }
@@ -40,0 +43,0 @@ )

src/BaseCharts/Radar.js

 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
@@ -24,3 +25,3 @@ export default Vue.extend({
     return {
-      options: {
+      defaultOptions: {
       }
@@ -31,3 +32,5 @@ }
   methods: {
-    render (data, options = this.options) {
+    render (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
       this._chart = new Chart(
@@ -37,3 +40,3 @@ this.$els.canvas.getContext('2d'), {
           data: data,
-          options: options
+          options: chartOptions
         }
@@ -40,0 +43,0 @@ )

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No License Found

License

(Experimental) License information could not be found.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

4495534

increased by15.46%

Number of package files

56

increased by12%

Number of low license alerts

0

decreased by-100%

Lines of code

2818

increased by7.43%

Number of lines in readme file

157

increased by8.28%

Worsened metrics

Dev dependency count

54

increased by1.89%

No dependency changes