Skip to content

Commit b06c991

Browse files
authored
Merge branch 'dev-2.0' into fix/black-frame_dev-2.0
2 parents f5ac038 + 39ea296 commit b06c991

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

src/accessibility/gridOutput.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ function gridOutput(p5, fn){
1010

1111
//updates gridOutput
1212
fn._updateGridOutput = function(idT) {
13+
if (this._renderer && this._renderer instanceof p5.RendererGL) {
14+
if (!this._didOutputGridWebGLMessage) {
15+
this._didOutputGridWebGLMessage = true;
16+
console.error('gridOutput() does not yet work in WebGL mode.');
17+
}
18+
return;
19+
}
1320
//if html structure is not there yet
1421
if (!this.dummyDOM.querySelector(`#${idT}_summary`)) {
1522
return;

src/accessibility/textOutput.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ function textOutput(p5, fn){
1010

1111
//updates textOutput
1212
fn._updateTextOutput = function(idT) {
13+
if (this._renderer && this._renderer instanceof p5.RendererGL) {
14+
if (!this._didOutputTextWebGLMessage) {
15+
this._didOutputTextWebGLMessage = true;
16+
console.error('textOutput() does not yet work in WebGL mode.');
17+
}
18+
return;
19+
}
1320
//if html structure is not there yet
1421
if (!this.dummyDOM.querySelector(`#${idT}_summary`)) {
1522
return;

test/unit/io/loadTable.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ suite('loadTable', function() {
8484
// TODO: Current parsing does not handle quoted fields
8585
const table = await mockP5Prototype.loadTable(validFile);
8686
assert.equal(table.getRowCount(), 4);
87-
assert.equal(table.getRow(3).get(0), 'David,\nSr. "the boss"');
87+
const value = table.getRow(3).get(0).replace(/\r\n/g, '\n');
88+
assert.equal(value, 'David,\nSr. "the boss"');
8889
});
8990
});

0 commit comments

Comments
 (0)