mirror of
				https://github.com/KevinMidboe/vue-chartjs.git
				synced 2025-10-29 18:00:20 +00:00 
			
		
		
		
	Merge branch 'release/1.x' into pr/152
* release/1.x: ⬆️ Update dependency chart.js to 2.6.0 🐛 Fix dependency 💎 Release new version 1.1.4 # Conflicts: # dist/vue-chartjs.js # dist/vue-chartjs.js.map
This commit is contained in:
		
							
								
								
									
										21
									
								
								dist/vue-chartjs.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										21
									
								
								dist/vue-chartjs.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/vue-chartjs.js.map
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/vue-chartjs.js.map
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -63,6 +63,8 @@ export default Vue.extend({ | ||||
|     } | ||||
|   }, | ||||
|   beforeDestroy () { | ||||
|     this._chart.destroy() | ||||
|     if (this._chart) { | ||||
|       this._chart.destroy() | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|   | ||||
| @@ -46,6 +46,8 @@ export default Vue.extend({ | ||||
|     } | ||||
|   }, | ||||
|   beforeDestroy () { | ||||
|     this._chart.destroy() | ||||
|     if (this._chart) { | ||||
|       this._chart.destroy() | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|   | ||||
| @@ -46,6 +46,8 @@ export default Vue.extend({ | ||||
|     } | ||||
|   }, | ||||
|   beforeDestroy () { | ||||
|     this._chart.destroy() | ||||
|     if (this._chart) { | ||||
|       this._chart.destroy() | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|   | ||||
| @@ -61,6 +61,8 @@ export default Vue.extend({ | ||||
|     } | ||||
|   }, | ||||
|   beforeDestroy () { | ||||
|     this._chart.destroy() | ||||
|     if (this._chart) { | ||||
|       this._chart.destroy() | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|   | ||||
| @@ -46,6 +46,8 @@ export default Vue.extend({ | ||||
|     } | ||||
|   }, | ||||
|   beforeDestroy () { | ||||
|     this._chart.destroy() | ||||
|     if (this._chart) { | ||||
|       this._chart.destroy() | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|   | ||||
| @@ -46,6 +46,8 @@ export default Vue.extend({ | ||||
|     } | ||||
|   }, | ||||
|   beforeDestroy () { | ||||
|     this._chart.destroy() | ||||
|     if (this._chart) { | ||||
|       this._chart.destroy() | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|   | ||||
| @@ -46,6 +46,8 @@ export default Vue.extend({ | ||||
|     } | ||||
|   }, | ||||
|   beforeDestroy () { | ||||
|     this._chart.destroy() | ||||
|     if (this._chart) { | ||||
|       this._chart.destroy() | ||||
|     } | ||||
|   } | ||||
| }) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user