aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2021-07-22 18:11:46 -0400
committerGitHub <noreply@github.com>2021-07-22 18:11:46 -0400
commit73f06a3fa087af164c54b57b2d92466d689d107e (patch)
treed3105b40848cf3465ebf4e15732872bbc1748487
parent2d367140938f6501430c6fcb96faef797e75789c (diff)
Fix definition image aspect ratio issue (#1847)
* Fix incorrect aspect ratio * Update test data
-rw-r--r--ext/js/display/sandbox/structured-content-generator.js2
-rw-r--r--test/data/dictionaries/valid-dictionary1/character2.gifbin0 -> 68 bytes
-rw-r--r--test/data/dictionaries/valid-dictionary1/character3.gifbin0 -> 70 bytes
-rw-r--r--test/data/dictionaries/valid-dictionary1/term_bank_1.json11
-rw-r--r--test/test-database.js4
5 files changed, 14 insertions, 3 deletions
diff --git a/ext/js/display/sandbox/structured-content-generator.js b/ext/js/display/sandbox/structured-content-generator.js
index 833df6f6..f0e70c4d 100644
--- a/ext/js/display/sandbox/structured-content-generator.js
+++ b/ext/js/display/sandbox/structured-content-generator.js
@@ -91,7 +91,7 @@ class StructuredContentGenerator {
const usedWidth = (
hasPreferredWidth ?
preferredWidth :
- (hasPreferredHeight ? preferredHeight * invAspectRatio : width)
+ (hasPreferredHeight ? preferredHeight / invAspectRatio : width)
);
const node = this._createElement('a', 'gloss-image-link');
diff --git a/test/data/dictionaries/valid-dictionary1/character2.gif b/test/data/dictionaries/valid-dictionary1/character2.gif
new file mode 100644
index 00000000..8f7d000a
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/character2.gif
Binary files differ
diff --git a/test/data/dictionaries/valid-dictionary1/character3.gif b/test/data/dictionaries/valid-dictionary1/character3.gif
new file mode 100644
index 00000000..e6032832
--- /dev/null
+++ b/test/data/dictionaries/valid-dictionary1/character3.gif
Binary files differ
diff --git a/test/data/dictionaries/valid-dictionary1/term_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
index 1d75f597..8f2a4c42 100644
--- a/test/data/dictionaries/valid-dictionary1/term_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
@@ -66,6 +66,17 @@
"莢\n"
]},
{"type": "structured-content", "content": [
+ "Imgae aspect ratio tests:\nあ",
+ {"tag": "img", "path": "character2.gif", "height": 1.1, "imageRendering": "crisp-edges", "appearance": "monochrome", "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false},
+ "あ\nあ",
+ {"tag": "img", "path": "character2.gif", "width": 0.4125, "imageRendering": "crisp-edges", "appearance": "monochrome", "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false},
+ "あ\nあ",
+ {"tag": "img", "path": "character3.gif", "width": 1.1, "imageRendering": "crisp-edges", "appearance": "monochrome", "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false},
+ "あ\nあ",
+ {"tag": "img", "path": "character3.gif", "height": 0.4125, "imageRendering": "crisp-edges", "appearance": "monochrome", "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false},
+ "あ"
+ ]},
+ {"type": "structured-content", "content": [
{"tag": "div", "style": {"fontStyle": "normal"}, "content": "fontStyle:normal"},
{"tag": "div", "style": {"fontStyle": "italic"}, "content": "fontStyle:italic"},
{"tag": "div", "style": {"fontWeight": "normal"}, "content": "fontWeight:normal"},
diff --git a/test/test-database.js b/test/test-database.js
index f8b93505..f2a7efdd 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -162,8 +162,8 @@ async function testDatabase1() {
true
);
vm.assert.deepStrictEqual(counts, {
- counts: [{kanji: 2, kanjiMeta: 2, terms: 20, termMeta: 16, tagMeta: 15, media: 2}],
- total: {kanji: 2, kanjiMeta: 2, terms: 20, termMeta: 16, tagMeta: 15, media: 2}
+ counts: [{kanji: 2, kanjiMeta: 2, terms: 20, termMeta: 16, tagMeta: 15, media: 4}],
+ total: {kanji: 2, kanjiMeta: 2, terms: 20, termMeta: 16, tagMeta: 15, media: 4}
});
// Test find* functions