Skip to content

Commit

Permalink
Merge pull request #200 from nzzdev/release-7.2.8
Browse files Browse the repository at this point in the history
Release 7.2.8
  • Loading branch information
dnlbln authored May 25, 2023
2 parents 93e5aff + 245819b commit e29caa2
Show file tree
Hide file tree
Showing 7 changed files with 143 additions and 143 deletions.
4 changes: 2 additions & 2 deletions dist/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@ function getFormattedBuckets(formattingOptions, buckets) {
};
}
return {
from: getFormattedValue(null, from),
to: getFormattedValue(null, to),
from: getFormattedValue(from, null),
to: getFormattedValue(to, null),
color,
};
});
Expand Down
246 changes: 123 additions & 123 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "q-table",
"version": "7.2.7",
"version": "7.2.8",
"description": "",
"main": "index.js",
"type": "module",
Expand Down Expand Up @@ -34,13 +34,13 @@
"uglify-js": "^3.17.4"
},
"devDependencies": {
"@happy-dom/jest-environment": "^9.20.1",
"@happy-dom/jest-environment": "^9.20.3",
"@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@rollup/plugin-terser": "^0.4.3",
"@rollup/plugin-typescript": "^11.1.1",
"@swc/core": "^1.3.59",
"@swc/core": "^1.3.60",
"@swc/jest": "^0.2.26",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/svelte": "^3.2.2",
Expand All @@ -59,7 +59,7 @@
"eslint": "^8.41.0",
"eslint-plugin-svelte": "^2.29.0",
"eslint-svelte3-preprocess": "^0.0.5",
"happy-dom": "^9.20.1",
"happy-dom": "^9.20.3",
"html-minifier": "^4.0.0",
"husky": "^8.0.3",
"jest": "^29.5.0",
Expand Down
22 changes: 11 additions & 11 deletions src/components/methodiek/Methodiek.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ function setMethodiek(bool: boolean): void {
<div
class="{bucket.color.colorClass}
qtable-methodiek-legend-circle"
style="color:{bucket.color.customColor}"></div>
style="color:{bucket.color.customColor}"
/>
</td>

{#if bucketIndex === 0 && legend.hasSingleValueBucket}
Expand All @@ -59,14 +60,13 @@ function setMethodiek(bool: boolean): void {
</td>
<td />
{/if}

</tr>
{/each}
{/if}
</table>

<div class="qtable-methodiek-descr">{methodBox.text}</div>
<a class="qtable-methodiek-clr-explainer" href={methodBox.article.url} target="_blank" rel="noopener noreferrer">
<a class="qtable-methodiek-clr-explainer" href={methodBox.article.url} target="_blank" rel="noopener noreferrer">
{methodBox.article.title}
</a>
</div>
Expand Down Expand Up @@ -104,19 +104,19 @@ function setMethodiek(bool: boolean): void {
:global(td) {
width: auto;
}
}
}
}
}
:global(.qtable-methodiek-legend-circle) {
position: relative;
box-sizing: content-box;
width: 7px;
height: 7px;
margin: 2px 8px 2px 2px;
border: 1px solid;
border-radius: 50%;
background-color: currentColor;
box-sizing: content-box;
width: 7px;
height: 7px;
margin: 2px 8px 2px 2px;
border: 1px solid;
border-radius: 50%;
background-color: currentColor;
}
:global(.qtable-methodiek-descr) {
Expand Down
1 change: 1 addition & 0 deletions src/helpers/colorColumn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ function createNumericalColorColumn(selectedColumn: number, settings: ColorColum
colors.push(color);
});
}

return {
legend,
colors,
Expand Down
4 changes: 2 additions & 2 deletions src/helpers/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,8 @@ export function getFormattedBuckets(formattingOptions: DataFormattingOptions, bu
}

return {
from: getFormattedValue(null, from),
to: getFormattedValue(null, to),
from: getFormattedValue(from, null),
to: getFormattedValue(to, null),
color,
};
});
Expand Down
1 change: 0 additions & 1 deletion tests/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export function createServer() {
});

return () => {
// console.log('WHYY', server);
return server;
}
}
Expand Down

0 comments on commit e29caa2

Please sign in to comment.