#48 setting group as axis through _findGroups

makesites · Jul 20, 2013 · d373029 · d373029
1 parent d6c0c09
commit d373029
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 20 deletions.
diff --git a/build/cloudvisio-min.js b/build/cloudvisio-min.js
diff --git a/build/cloudvisio.js b/build/cloudvisio.js
@@ -1,4 +1,4 @@
-// @name cloudvisio - 0.6.0 (Sat, 20 Jul 2013 08:39:29 GMT)
+// @name cloudvisio - 0.6.0 (Sat, 20 Jul 2013 20:10:26 GMT)
 // @url https://github.com/makesites/cloudvisio
 
 // @author makesites
@@ -676,14 +676,6 @@ Cloudvisio.prototype.group = function(){
 		// update the existing data
 		this.data( data[i], opt);
 	}
-	// check if the selected layout "needs" a group
-	var axis = this.axis();
-	if( axis.group === false ){
-		// select the query key as the group axis
-		this.axis(id);
-		this._axis.group = id;
-	}
-
 
 	/*
 	// reset models if needed
@@ -1479,6 +1471,8 @@ Cloudvisio.prototype.update = function(){
 Cloudvisio.prototype.ready = function( layout ){
 	// fallback (not needed?)
 	//layout = layout || this.options.layout;
+	// check if the selected layout "needs" a group
+	this._findGroups();
 	// process query amounts
 	this.amount();
 	// prerequisite - we need to have some data set...
@@ -1615,6 +1609,27 @@ Cloudvisio.prototype._findType = function( key, data ){
 	return type;
 };
 
+// get the type of the selected field
+Cloudvisio.prototype._findGroups = function( key, data ){
+
+	var axis = this.axis();
+	var queries = this.queries();
+	// first see if we have a group "need"
+	if( axis.group === false ){
+		for( var i in queries ){
+		if(queries[i].type == "group"){
+			// select the query key as the group axis
+			this.axis(i);
+			this._axis.group = i;
+			// one group is enough?
+			break;
+		}
+		}
+	}
+
+};
+
+
 // define the color spectrum
 Cloudvisio.prototype.colors = function( colors ){
 	if (!arguments.length) return this.options.colors;

diff --git a/lib/regex.js b/lib/regex.js
@@ -103,14 +103,6 @@ Cloudvisio.prototype.group = function(){
 		// update the existing data
 		this.data( data[i], opt);
 	}
-	// check if the selected layout "needs" a group
-	var axis = this.axis();
-	if( axis.group === false ){
-		// select the query key as the group axis
-		this.axis(id);
-		this._axis.group = id;
-	}
-
 
 	/*
 	// reset models if needed

diff --git a/lib/render.js b/lib/render.js
@@ -37,6 +37,8 @@ Cloudvisio.prototype.update = function(){
 Cloudvisio.prototype.ready = function( layout ){
 	// fallback (not needed?)
 	//layout = layout || this.options.layout;
+	// check if the selected layout "needs" a group
+	this._findGroups();
 	// process query amounts
 	this.amount();
 	// prerequisite - we need to have some data set...
@@ -171,4 +173,24 @@ Cloudvisio.prototype._findType = function( key, data ){
 		type = itype;
 	}
 	return type;
-};
+};
+
+// get the type of the selected field
+Cloudvisio.prototype._findGroups = function( key, data ){
+
+	var axis = this.axis();
+	var queries = this.queries();
+	// first see if we have a group "need"
+	if( axis.group === false ){
+		for( var i in queries ){
+		if(queries[i].type == "group"){
+			// select the query key as the group axis
+			this.axis(i);
+			this._axis.group = i;
+			// one group is enough?
+			break;
+		}
+		}
+	}
+
+};