Skip to content
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.

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

Bug Fixes #58

Merged
merged 5 commits into from
Feb 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
before_install:
- mkdir boost_includes
- cp -r /usr/include/boost boost_includes/
- docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash
- docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-tag-1.37.33-64bit bash

install:
- npm install
Expand Down
24 changes: 13 additions & 11 deletions packages/perspective-viewer-highcharts/src/js/highcharts.js
Original file line number Diff line number Diff line change
Expand Up @@ -581,19 +581,21 @@ export function draw(mode) {
}

function resize(immediate) {
if (immediate && this._chart) {
if (this._chart && !this._resize_timer) {
this._chart.reflow();
} else {
if (this.resize_timer) {
clearTimeout(this.resize_timer);
}
this.resize_timer = setTimeout(() => {
if (this._chart && !document.hidden && this.offsetParent && document.contains(this)) {
this.resize_timer = undefined;
this._chart.reflow();
}
}, 50);
}
if (this._resize_timer) {
clearTimeout(this._resize_timer);
this._debounce_resize = true;
}
this._resize_timer = setTimeout(() => {
if (this._chart && !document.hidden && this.offsetParent && document.contains(this) && this._debounce_resize) {
this._chart.reflow();
}
this._resize_timer = undefined;
this._debounce_resize = false;
}, 50);

}

function delete_chart() {
Expand Down
8 changes: 8 additions & 0 deletions packages/perspective-viewer/src/js/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,14 @@ registerElement(template, {
}
},

'index': {
set: function () {
if (this._table) {
console.error(`Setting 'index' attribute after initialization has no effect`);
}
}
},

'row-pivots': {
set: function () {
let pivots = JSON.parse(this.getAttribute('row-pivots'));
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-viewer/src/less/row.less
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ perspective-row .row_draggable {
}

perspective-row .row_draggable select {
margin-left: 22px;
margin: 0px 0px 0px 22px;
border: none;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-viewer/src/less/view.less
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ perspective-viewer {
}
select {
height: 24px;
padding-left: 6px;
padding: 0px 0px 0px 6px;
font-size: 12px;
-webkit-appearance: none;
-moz-appearance: none;
Expand Down
4 changes: 2 additions & 2 deletions packages/perspective/src/cpp/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,8 @@ make_table(
{
// If user doesn't specify an column to use as the pkey index, just use
// row number
auto key_col = tbl->add_column("psp_pkey", tindex, false);
auto okey_col = tbl->add_column("psp_okey", tindex, false);
auto key_col = tbl->add_column("psp_pkey", DTYPE_INT32, true);
auto okey_col = tbl->add_column("psp_okey", DTYPE_INT32, true);

for (auto ridx = 0; ridx < tbl->size(); ++ridx)
{
Expand Down