Merge branch 'release/3.2'

joola · Oct 28, 2013 · 4550c80 · 4550c80
2 parents ec93920 + cbeb0ce
commit 4550c80
Show file tree

Hide file tree

Showing 9 changed files with 2,880 additions and 2,739 deletions.
diff --git a/lib/joolaio.dataaccess.js b/lib/joolaio.dataaccess.js
@@ -110,7 +110,7 @@ joolaio.dataaccess.fetch = function (sender, endPoint, queryOptions, callback, t
                 else if (result.resultcode == 500)
                     throw { message: result.resulttext};
                 else if (typeof(callback) === "function")
-                    callback(sender, result.data, this /*error*/);
+                    callback(sender, result, this /*error*/);
                 else {
                     oResult = result;
                 }

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;
diff --git a/lib/joolaio.visualisation.dashboard.Pie.js b/lib/joolaio.visualisation.dashboard.Pie.js
@@ -620,7 +620,7 @@ joolaio.visualisation.dashboard.Pie.prototype.draw = function (container) {
 
     var $html = $('<div class="wrapper"></div>');
 
-    if ($($(container).parent()).attr('class').indexOf('span5') > -1) {
+    if ($($(container).parent()).attr('class') && $($(container).parent()).attr('class').indexOf('span5') > -1) {
         $html.append('<div class="row-fluid">' +
             '<div class="header">' +
             '<div class="settings"></div>' +