Skip to content

ZEPPELIN-1170 Handsontable fails to display data on second run #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
r-kamath wants to merge 2 commits into from
Closed

ZEPPELIN-1170 Handsontable fails to display data on second run #1182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d63d517
ZEPPELIN-1170 Handsontable fails to display data on second run
r-kamath Jul 13, 2016
6f0f591
Merge remote-tracking branch 'upstream/master' into ZEPPELIN-1170
r-kamath Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 29 additions & 38 deletions zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,49 +1282,40 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
var resultRows = data.rows;
var columnNames = _.pluck(data.columnNames, 'name');

// on chart type change, destroy table to force reinitialization.
if ($scope.hot) {
$scope.hot.destroy();
$scope.hot = null;
}

// create table if not exists.
if (!$scope.hot) {
$scope.hot = new Handsontable(container, {
rowHeaders: false,
stretchH: 'all',
sortIndicator: true,
columnSorting: true,
contextMenu: false,
manualColumnResize: true,
manualRowResize: true,
readOnly: true,
readOnlyCellClassName: '', // don't apply any special class so we can retain current styling
fillHandle: false,
fragmentSelection: true,
disableVisualSelection: true,
cells: function(row, col, prop) {
var cellProperties = {};
cellProperties.renderer = function(instance, td, row, col, prop, value, cellProperties) {
if (!isNaN(value)) {
cellProperties.format = '0,0.[00000]';
td.style.textAlign = 'left';
Handsontable.renderers.NumericRenderer.apply(this, arguments);
} else if (value.length > '%html'.length && '%html ' === value.substring(0, '%html '.length)) {
td.innerHTML = value.substring('%html'.length);
} else {
Handsontable.renderers.TextRenderer.apply(this, arguments);
}
};
return cellProperties;
}
});
}

// load data into table.
$scope.hot.updateSettings({
$scope.hot = new Handsontable(container, {
colHeaders: columnNames,
data: resultRows
data: resultRows,
rowHeaders: false,
stretchH: 'all',
sortIndicator: true,
columnSorting: true,
contextMenu: false,
manualColumnResize: true,
manualRowResize: true,
readOnly: true,
readOnlyCellClassName: '', // don't apply any special class so we can retain current styling
fillHandle: false,
fragmentSelection: true,
disableVisualSelection: true,
cells: function(row, col, prop) {
var cellProperties = {};
cellProperties.renderer = function(instance, td, row, col, prop, value, cellProperties) {
if (!isNaN(value)) {
cellProperties.format = '0,0.[00000]';
td.style.textAlign = 'left';
Handsontable.renderers.NumericRenderer.apply(this, arguments);
} else if (value.length > '%html'.length && '%html ' === value.substring(0, '%html '.length)) {
td.innerHTML = value.substring('%html'.length);
} else {
Handsontable.renderers.TextRenderer.apply(this, arguments);
}
};
return cellProperties;
}
});
};

Expand Down