value expand on drillThrough

Author: nikitaeverywhere

example/index.html

@@ -97,6 +97,7 @@
                 // drillDown: function ({Object { level: {number}, mdx: {string} }}) {}
                 //, drillThrough: function ({Object { level: {number}, mdx: {string} }}) {}
                 //, back: function ({Object { level: {number} }}) {}
+                // if cellDrillThrough callback returns boolean false, DrillThrough won't be performed.
                 //, cellDrillThrough: function ({Object { event: {event}, filters: {string[]} }}) {}
             }
             //, hideButtons: true // hides "back" and "drillThrough" buttons

export/LightPivotTable.xml export/LightPivotTable-DeepSeePortlet.xmlexport/LightPivotTable.xml renamed to export/LightPivotTable-DeepSeePortlet.xml

@@ -71,7 +71,7 @@ gulp.task("copyREADME", ["clean"], function (){
 gulp.task("exportCacheXML", [
         "clean", "addExample", "gatherScripts", "gatherCSS", "copyLICENSE", "copyREADME"
     ], function () {
-        return gulp.src("export/LightPivotTable.xml")
+        return gulp.src("export/LightPivotTable-DeepSeePortlet.xml")
             .pipe(
                 replace(/\{\{replace:css}}/,
                 fs.readFileSync("build/WEBModule/css/lightPivotTable.css"))

gulpfile.js

@@ -47,7 +47,7 @@ var setup = { // Object that contain settings. Any setting may be missed.
             , drillThrough: function ({Object { level: {number}, mdx: {string} }}) {}
             , back: function ({Object { level: {number} }}) {}
             // if cellDrillThrough callback returns boolean false, DrillThrough won't be performed.
-            , cellDrillThrough: function ({Object { event: {event}, filters: {string[]} }}) {}
+            , cellDrillThrough: function ({Object { event: {event}, filters: {string[]}, cellData: {object} }}) {}
         } ]
         [ , hideButtons: true // hides "back" and "drillThrough" buttons ]
         [ , triggerEvent: "touchstart" // all "click" events will be replaced by this event ]

readme.md

@@ -182,7 +182,7 @@
 .lpt .lpt-hoverMessage {
     z-index: 999;
     opacity: 0;
-    background: rgba(255, 255, 255, 0.8);
+    background: rgba(255, 255, 255, 0.85);
     -webkit-transition: opacity 1s ease;
     -moz-transition: opacity 1s ease;
     -o-transition: opacity 1s ease;

source/css/LightPivot.css

@@ -95,6 +95,16 @@ DataController.prototype.setData = function (data) {
 
 };
 
+/**
+ * Handle drillThrough on current level.
+ * If handler returns boolean false, drillThrough won't be performed.
+ *
+ * @param {function} handler
+ */
+DataController.prototype.setDrillThroughHandler = function (handler) {
+    this._dataStack[this._dataStack.length - 1].data.info.drillThroughHandler = handler;
+};
+
 /**
  * Sets properties of rows/columns.
  *

source/js/DataController.js

@@ -209,6 +209,10 @@ LightPivotTable.prototype.tryDrillThrough = function (filters) {
             _.pivotView.pushTable();
             _.dataController.pushData();
             _.dataController.setData(data);
+            _.dataController.setDrillThroughHandler(function (params) {
+                _.pivotView.displayMessage(params["cellData"]["value"] || "", true);
+                return false;
+            });
             if (typeof _.CONFIG.triggers["drillThrough"] === "function") {
                 _.CONFIG.triggers["drillThrough"].call(_, {
                     level: _.DRILL_LEVEL,

source/js/LightPivotTable.js

@@ -191,14 +191,16 @@ PivotView.prototype._drillThroughClickHandler = function (event) {
 };
 
 /**
+ * @param {object} cell
  * @param {number} x
  * @param {number} y
  * @param {event} event
+ * @param {function} [drillThroughHandler]
  */
-PivotView.prototype._cellClickHandler = function (x, y, event) {
+PivotView.prototype._cellClickHandler = function (cell, x, y, event, drillThroughHandler) {
 
     var data = this.controller.dataController.getData(),
-        f = [], f1, f2, callbackRes;
+        f = [], f1, f2, callbackRes = true;
 
     try {
         f1 = data.rawData[y][data.info.leftHeaderColumnsNumber - 1].source.path;
@@ -218,12 +220,18 @@ PivotView.prototype._cellClickHandler = function (x, y, event) {
         if (typeof this.controller.CONFIG.triggers["cellDrillThrough"] === "function") {
             callbackRes = this.controller.CONFIG.triggers["cellDrillThrough"]({
                 event: event,
-                filters: f
+                filters: f,
+                cellData: cell
             });
-            if (callbackRes !== false) this.controller.tryDrillThrough(f);
-        } else {
-            this.controller.tryDrillThrough(f);
         }
+        if (typeof drillThroughHandler === "function") {
+            callbackRes = !(!(false !== drillThroughHandler({
+                event: event,
+                filters: f,
+                cellData: cell
+            })) || !(callbackRes !== false));
+        }
+        if (callbackRes !== false) this.controller.tryDrillThrough(f);
     }
 
 };
@@ -540,11 +548,13 @@ PivotView.prototype.renderRawData = function (data) {
             if (rawData[y][x].style) td.setAttribute("style", rawData[y][x].style);
 
             // add handlers
-            td.addEventListener("click", (function (x, y) {
+            td.addEventListener("click", (function (x, y, cell) {
                 return function (event) {
-                    _._cellClickHandler.call(_, x, y, event);
+                    _._cellClickHandler.call(
+                        _, cell, x, y, event, info.drillThroughHandler
+                    );
                 };
-            })(x, y));
+            })(x, y, rawData[y][x]));
 
         }
         mainTBody.appendChild(tr);