Permalink
Browse files

Nesting has been corrected, but there's still a small error

  • Loading branch information...
1 parent 92eae7f commit 523c20986cc9239088cf6bd1da70cc99b74c4139 @danieleguido danieleguido committed Feb 22, 2013
Showing with 5 additions and 4 deletions.
  1. +3 −2 static/js/outside/enq.js
  2. +2 −2 static/js/outside/enq_timeline.js
View
5 static/js/outside/enq.js
@@ -37,17 +37,18 @@ oo.nest = function( objects, nester, sorter ){
for (var d in objects){
+
// Define object
var index = nester( objects[d] );
// Check consistency of data
if ( index == null || index.length == 0 ) continue;
// Skip not filtered elements
- if (typeof objects[d].filtered != 'undefined') {
+ if ( typeof objects[d].filtered != 'undefined' ) {
if (objects[d].filtered == 'false') continue;
}
-
+
// Check group existence
if (typeof nested[ index ] == "undefined"){
nested[ index ] = { "key": index, "values":[] };
View
4 static/js/outside/enq_timeline.js
@@ -32,6 +32,8 @@ oo.enq.timeline.update = function( event, filters ){
return a.key < b.key ? -1 : a.key > b.key ? 1 : 0 }
);
+ oo.log('nest', nest)
+
// Set variables
var steps = oo.enq.timeline.steps,
@@ -87,8 +89,6 @@ oo.enq.timeline.init = function( objects ){
return a.key < b.key ? -1 : a.key > b.key ? 1 : 0 }
);
- oo.log('nest', nest)
-
// Set variables
var steps = nest.length,

0 comments on commit 523c209

Please sign in to comment.