Merge branch 'develop' into release/3.2

joola · Oct 28, 2013 · a0b1637 · a0b1637
2 parents b2cdb75 + 35fb2fa
commit a0b1637
Show file tree

Hide file tree

Showing 5 changed files with 914 additions and 794 deletions.
diff --git a/lib/joolaio.js b/lib/joolaio.js
@@ -1276,9 +1276,16 @@ function getParameterByName(name) {
     return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
 }
 
-
 function scrollTop(destino) {
     var delay = 200;
     $('body').animate({scrollTop: '0px'}, delay);
     return true;
 }
+
+joolaio.options = {};
+joolaio.options.picker = {};
+joolaio.options.picker.metrics = {};
+joolaio.options.picker.metrics.hideDisabledMetrics = false;
+joolaio.options.picker.dimensions = {};
+joolaio.options.timeline = {};
+joolaio.options.timeline.plotDisabledWhenFiltered = true;