ember-nf-graph
Advanced tools
Comparing version 1.0.0-beta.31 to 1.0.0-beta.32
@@ -44,7 +44,14 @@ import Ember from 'ember'; | ||
useTemplate: computed('hasBlock', 'template.blockParams', 'hasBlockParams', function(){ | ||
var preGlimmerCheck = this.get('template.blockParams'); | ||
var postGlimmerCheck = this.get('hasBlock') && this.get('hasBlockParams'); | ||
return Boolean(postGlimmerCheck || preGlimmerCheck); | ||
}), | ||
addTemplateObserver: function() { | ||
this.addObserver('template.blockParams', this, function() { | ||
var preGlimmer = this.get('template'); | ||
if (preGlimmer) { | ||
if (!this.get('hasBlock')) { | ||
this.set('hasBlock',computed('template.blockParams', function() { | ||
return this.get('template.blockParams'); | ||
})); | ||
} | ||
} | ||
}); | ||
}, | ||
@@ -187,2 +194,3 @@ attributeBindings: ['transform'], | ||
this.set('graph.xAxis', this); | ||
this.addTemplateObserver(); | ||
}, | ||
@@ -230,3 +238,3 @@ | ||
return uniqueData; | ||
} | ||
} | ||
else { | ||
@@ -233,0 +241,0 @@ return scale.ticks(tickCount); |
{ | ||
"name": "ember-nf-graph", | ||
"version": "1.0.0-beta.31", | ||
"version": "1.0.0-beta.32", | ||
"description": "A graphing/charting DSL for Ember.js", | ||
@@ -5,0 +5,0 @@ "files": [ |
Sorry, the diff of this file is not supported yet
195594
5753