From 7910aaafa2d682f143b71766cea5178565102cd5 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 24 Oct 2014 17:23:46 +0200 Subject: [PATCH] added firebase to data brick --- blocks/data/index.js | 13 ++++++++----- components/dataRepresentation/index.less | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/blocks/data/index.js b/blocks/data/index.js index 5fb5253e..0ffc0e2e 100644 --- a/blocks/data/index.js +++ b/blocks/data/index.js @@ -27,12 +27,15 @@ module.exports = { }, ready: function (){ var self = this; - // Fetch collected Data - /*var data = new Data('foooobar'); + // Fetch collected Data self.currentDataSets = []; - data.getAllDataSets(function(currentDataSets) { - self.currentDataSets = currentDataSets; - });*/ + if(!self.isEditing) { + var data = new Data(self.$parent.$parent.$data.app.id); + + data.getAllDataSets(function(currentDataSets) { + self.currentDataSets = currentDataSets; + }); + } } }; diff --git a/components/dataRepresentation/index.less b/components/dataRepresentation/index.less index 14036dcf..ebea667a 100644 --- a/components/dataRepresentation/index.less +++ b/components/dataRepresentation/index.less @@ -114,6 +114,8 @@ .noDataInfo { border-bottom: 1px solid @borderColor; + border-top: 1px solid @borderColor; + margin-top: -1px; padding: 10px 14px; font-size: 14px; color: @darkGrey;