From c6a9d4a8133d705d6bdd969fa422a8ff283575a9 Mon Sep 17 00:00:00 2001 From: bekjon777 Date: Tue, 16 Nov 2021 12:26:44 +0000 Subject: [PATCH 1/7] fixes clock image render --- package-lock.json | 692 ++++++++++++++++++ package.json | 2 +- runestone/activecode/js/timed_activecode.js | 8 +- runestone/clickableArea/js/timedclickable.js | 6 - runestone/common/css/clock.png | Bin 0 -> 23942 bytes runestone/common/css/time-tip.css | 8 + runestone/dragndrop/js/timeddnd.js | 6 - runestone/fitb/js/timedfitb.js | 6 - runestone/mchoice/js/timedmc.js | 6 - runestone/shortanswer/js/timed_shortanswer.js | 6 - webpack.index.js | 3 + 11 files changed, 705 insertions(+), 38 deletions(-) create mode 100644 runestone/common/css/clock.png create mode 100644 runestone/common/css/time-tip.css diff --git a/package-lock.json b/package-lock.json index bdd3887f3..d53bca8ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "wavedrom": "^2.0.0" }, "devDependencies": { + "compression-webpack-plugin": "^6.0.0", "copy-webpack-plugin": "^8.0.0", "css-loader": "^5.0.0", "css-minimizer-webpack-plugin": "^3.0.0", @@ -171,6 +172,12 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/@gar/promisify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", + "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", + "dev": true + }, "node_modules/@handsontable/formulajs": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@handsontable/formulajs/-/formulajs-2.0.2.tgz", @@ -238,6 +245,41 @@ "node": ">= 8" } }, + "node_modules/@npmcli/fs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz", + "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==", + "dev": true, + "dependencies": { + "@gar/promisify": "^1.0.1", + "semver": "^7.3.5" + } + }, + "node_modules/@npmcli/move-file": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", + "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", + "dev": true, + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/move-file/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@polka/url": { "version": "1.0.0-next.15", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz", @@ -541,6 +583,19 @@ "node": ">=0.4.0" } }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -825,6 +880,110 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, + "node_modules/cacache": { + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", + "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", + "dev": true, + "dependencies": { + "@npmcli/fs": "^1.0.0", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/cacache/node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/cacache/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cacache/node_modules/minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cacache/node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cacache/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cacache/node_modules/tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "dev": true, + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -944,6 +1103,15 @@ "node": ">= 4.0" } }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -1057,6 +1225,35 @@ "node": ">= 6" } }, + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "node_modules/compression-webpack-plugin": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz", + "integrity": "sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==", + "dev": true, + "dependencies": { + "cacache": "^15.0.5", + "find-cache-dir": "^3.3.1", + "schema-utils": "^3.0.0", + "serialize-javascript": "^5.0.1", + "webpack-sources": "^1.4.3" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -2131,6 +2328,23 @@ "node": ">=8" } }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -2642,6 +2856,21 @@ "node": ">=0.8.19" } }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -3103,6 +3332,30 @@ "node": ">=10" } }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -3252,6 +3505,78 @@ "yallist": "^3.0.0" } }, + "node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-collect/node_modules/minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/minipass/node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", @@ -3835,6 +4160,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -4501,6 +4841,12 @@ "node": ">=0.4.0" } }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", + "dev": true + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -4998,6 +5344,30 @@ "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.5.0.tgz", "integrity": "sha512-Qqr6HgX/hCDpLFWdN0BNoNpYQ2c1tOl1c3HGI0cshjaFSAWszKICuLZ9CyFUvRFPpEGW8RzHzwuXWWvXVGTKBg==" }, + "node_modules/ssri": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/ssri/node_modules/minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", @@ -5411,6 +5781,24 @@ "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", "dev": true }, + "node_modules/unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, + "dependencies": { + "unique-slug": "^2.0.0" + } + }, + "node_modules/unique-slug": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4" + } + }, "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -6638,6 +7026,12 @@ "strip-json-comments": "^3.1.1" } }, + "@gar/promisify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", + "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", + "dev": true + }, "@handsontable/formulajs": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@handsontable/formulajs/-/formulajs-2.0.2.tgz", @@ -6690,6 +7084,34 @@ "fastq": "^1.6.0" } }, + "@npmcli/fs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz", + "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==", + "dev": true, + "requires": { + "@gar/promisify": "^1.0.1", + "semver": "^7.3.5" + } + }, + "@npmcli/move-file": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", + "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", + "dev": true, + "requires": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + } + } + }, "@polka/url": { "version": "1.0.0-next.15", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz", @@ -6966,6 +7388,16 @@ "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==", "dev": true }, + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -7182,6 +7614,88 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, + "cacache": { + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", + "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", + "dev": true, + "requires": { + "@npmcli/fs": "^1.0.0", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + }, + "dependencies": { + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true + }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "requires": { + "minipass": "^3.0.0" + } + }, + "minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, + "tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "dev": true, + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + } + } + }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -7274,6 +7788,12 @@ "source-map": "~0.6.0" } }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -7365,6 +7885,25 @@ "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", "dev": true }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "compression-webpack-plugin": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz", + "integrity": "sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==", + "dev": true, + "requires": { + "cacache": "^15.0.5", + "find-cache-dir": "^3.3.1", + "schema-utils": "^3.0.0", + "serialize-javascript": "^5.0.1", + "webpack-sources": "^1.4.3" + } + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -8200,6 +8739,17 @@ "to-regex-range": "^5.0.1" } }, + "find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -8586,6 +9136,18 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + }, + "infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -8967,6 +9529,23 @@ "yallist": "^4.0.0" } }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -9085,6 +9664,66 @@ } } }, + "minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dev": true, + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } + } + }, + "minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "requires": { + "minipass": "^3.0.0" + }, + "dependencies": { + "minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } + } + }, "minizlib": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", @@ -9536,6 +10175,15 @@ } } }, + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } + }, "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -9982,6 +10630,12 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, + "promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", + "dev": true + }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -10350,6 +11004,26 @@ "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.5.0.tgz", "integrity": "sha512-Qqr6HgX/hCDpLFWdN0BNoNpYQ2c1tOl1c3HGI0cshjaFSAWszKICuLZ9CyFUvRFPpEGW8RzHzwuXWWvXVGTKBg==" }, + "ssri": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, + "requires": { + "minipass": "^3.1.1" + }, + "dependencies": { + "minipass": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", + "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + } + } + }, "stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", @@ -10675,6 +11349,24 @@ "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", "dev": true }, + "unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, + "requires": { + "unique-slug": "^2.0.0" + } + }, + "unique-slug": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4" + } + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", diff --git a/package.json b/package.json index e487534ee..a93a8e651 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "check-env": "node -e 'console.log(process.env)' | grep npm", - "build": "webpack --mode=development", + "build": "export NODE_OPTIONS=--openssl-legacy-provider; webpack --mode=development", "buildj": "webpack --mode=development --profile --json > stats.json", "watch": "webpack --mode=development --watch", "serve": "cd dist; python -m http.server 8080; cd ..", diff --git a/runestone/activecode/js/timed_activecode.js b/runestone/activecode/js/timed_activecode.js index c0c5c65ce..6677545f8 100644 --- a/runestone/activecode/js/timed_activecode.js +++ b/runestone/activecode/js/timed_activecode.js @@ -37,17 +37,11 @@ var TimedActiveCodeMixin = { // bje - not needed anymore renderTimedIcon: function (component) { - // renders the clock icon on timed components. The component parameter + // renders the clock icon on timed components. The component parameter // is the element that the icon should be appended to. var timeIconDiv = document.createElement("div"); - var timeIcon = document.createElement("img"); - $(timeIcon).attr({ - src: "../_static/clock.png", - style: "width:15px;height:15px", - }); timeIconDiv.className = "timeTip"; timeIconDiv.title = ""; - timeIconDiv.appendChild(timeIcon); $(component).prepend(timeIconDiv); }, diff --git a/runestone/clickableArea/js/timedclickable.js b/runestone/clickableArea/js/timedclickable.js index ee4f4d212..1d33bf481 100644 --- a/runestone/clickableArea/js/timedclickable.js +++ b/runestone/clickableArea/js/timedclickable.js @@ -18,14 +18,8 @@ export default class TimedClickableArea extends ClickableArea { // renders the clock icon on timed components. The component parameter // is the element that the icon should be appended to. var timeIconDiv = document.createElement("div"); - var timeIcon = document.createElement("img"); - $(timeIcon).attr({ - src: "../_static/clock.png", - style: "width:15px;height:15px", - }); timeIconDiv.className = "timeTip"; timeIconDiv.title = ""; - timeIconDiv.appendChild(timeIcon); $(component).prepend(timeIconDiv); } diff --git a/runestone/common/css/clock.png b/runestone/common/css/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..9f7e4ade1a8109350cd1a98114e6337665b60290 GIT binary patch literal 23942 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∓@Mrmx*Pv7Gs4UgV_^`cQ zla)_vt}x2n7qfep{DAy!%$l}>K^mq}^=@O*bi}4JUtwdeeEx(F7y7rBHje& zRXAqFyZwuZ_had1f%c7s^Ip=V>F6a@$1@`;Z}*f5B6;aXM5LIvl$B{qS`VuWqWgcQ z)msQaem~pS9>zgL6?qc!VXMiPU(I^q**KZwN6wQ|2@Isr8`yK1{OlFaFAI48R;mfd zrt`P6sgOw3&%nAsoab6NR3uS@ViJ+ZJPA*A8B$6!XH)QOT!GI#Cl^VYJCaFJ?1Sk39}+yXHU;FP6l(-HQ1(~rY!=(;p(-oT-F zghI4AE2c?wz2r|NNF4pAK;4txWcQ}4Kx~oe=-V1RbziZ@vT*F70xDLaWMS?ToY+Hz z_V@;`+##RBIRdXLE{-y%!R+b)H#7p2TWg_8HaN$w;X}1=Z?YUo{L*CF4Ud?9@F}G6 z)vScxY9)m`w@B9l>g~Vh4Osb5>U3{p=r@N-#_#>pTMlFc+#eh4x%K!0u{@R|_zVK2 zpW4L?FX^l+>l<3U*=9jGms`Z3gPtA$#g~>yaa3CAcfFob+HkNa!&I_#{A%0b0B~Av z?c0)&FrA&<`-cw;$M$`&r!qB=^K>fpk9K+!xBp~gts3%VhmsjBo(_4Kl5GjE$E<_N z7_tj)`hAk3>4kTe=ndyGjMVmmPN8o&_MBTnX6LDvSV|sqa@`(YKX5F^w zK$gXIOQB*ff!U8UI}@?(6(cKOuMy35S;Z}P%rCq!o5vdJ4e*Ob&rygAd3cV z^plg!gy9t{1oy3;fr!jb*go@)hUxZQvM?n~8;H4089J{MvlhYf^4{$Se|7A3JjP0u zmH#5(2IRD(N}XWH`cyOn=jihhqA-q@q4n??rOFU~*jqYAgK|+LUhFktqx^o;o_`9i z)uuE#CQ1J8=aF(%+$wTt(~KN9vA5Lwgy2O9a|Syl6o~yk`|ut%k@;YL4MGfBQFK!# zDwZW;AdZrKT&GQ@Bh^DNyVr=6-hhRx*wa4v_HNrlo1I*?LMV1de?SybgjonJYVYP% zd4U}+%cdcZuUHAunAOm}nw=$x7WiX7?CI58OamJ~*RI2`7R9N>kW9H;ZQh+PTzehXyC$yLSfderls7 zW8yF(ZlD$&e06D!U$)+wF#Trf;3X^hkrNB9TOAeucwQKFHKRio74g$3NNPSB>sda} z5-&>YDA9LmU7o!{8d*O}NF&INS)(??$WFLF?l?zq3aPu*Hy`~McSYA{iu=NGb!4>O zbQ?;QzNHSHjgK>{Y3m>QlB{%23eY%%iy)DX89)^w5g=tXD)aohyXC>HpoIBc>~MK% zRKvyfoHfCK;;2dC6=Mb_;?uwYxwDVBR2E1A&zOZ~XH@}pLq&P+gZR@cjT9eZqqmBR zktiRXfvW+z zIT{?#Zf;TH3Zr9VwIr&agqT*}C``J@S6SHjlurSPx;p$Q>%ik(4ZX@FX(QMoBNh#k zx1vu$=JDB)dZJ4Q^Lu`f7 z>Kmtkt3j_Y_KDrUF1mG2f`UCZcDbsI`gO+Z$|Xk0AXxaF{>J)iMN zac4$m!*qp9RLZ31K??A{mUC|oOgYOVl-mw}QDsq9)sfzng7vJdqanZbt4QSl+Y*Kx z80>EDbceIhRQv9gQ-v|19b_2Fw9aFD4;i69C}&(;`W5zi6%@kc`Kyz-u4Bb*S4x;W z_8eRC1VS&!P~$N+p{mS(P|idIEJcHyPi+vZE#rMA z4P*A(%cd%~|NVgbk861M0CpxwMw)X`{0*2p9J70cY(q_29O~$~t7Z&Jaj`CC9Xj1l zvBOmbs)WXsSC^gNI3?V{*g}?|O^GAK0ubZdsd*hNxIEy#Q?55n5ufAPcTf!+5EHj5 ze3_IN#{2LNSn!x;W||bv%crHKm1XKszb90ltF_p z*Ews7#@pvVGePqY$bDkM%N5+zuups!`dWrD9bBYJGk{`V-tZfiYH=44h@i`TPjNb{ zuZj&L2M6U^cMl4jXar!pvCMK*XV5RW0aTSYAoq_mb$1rxE4z?J87oYajE@C2(XDNW zqkky(zZn?BKRukl2aJOgr{#fV%c>}sj+*XGKoT4<&L^~bBHF%g=$JzZ+_ zKsUa0?#oYo|DsH#3104AnhqNr%F}ODQnZC#p#1Jz6GR|P3|F{JlHb29+xJk#OdD+h zzL{tpVM=i$MEo7H3a(obIApAut!g@4m&dlu2}v$rnX#8>l&~UbLPE4-UOnxmhAJxO z>MxxKmb3r?ooHuVm6`9EYw+>y*M4WK6Xq^RB0&sd zdNZK#nI)1%D+WZ8xdVt>MQPMEvipja!bT+qH9sZM-T|q;kI`J1s5oVz_gn zaDu9NO|nAz^mQpf@)j)Td~TthJ2kw%IAP0s#p;I+amEx@^3pkY#k>m;b8cJPNf4Bk zMge<{Cwu+Am8e<*3NIpL`<(qc6+kby$=4T+$Dy@Aw!#TXjjH(+B0&Gk*OZK|BWs(*HD_F%? zRi`so0kcAhs)L&86ftu6NQ0Z3bB6mb+y4ln9)nd}25P^8oR_ujVZ!hxegLR11m7CUu_{ald`dM?;A9_HTcB&XYU7lV)rK^gV z`H1J#`N$e$Fh6IV(yU8mB{R`)6NNOa`_4kGJzofW9czdhkNvgS|GGG=c5)fT+kLp@#WwlO6F1YX$ z4$x`?wVTUpa6^^y%~P`jZB8kPy_uYRcNsa`4jacVf-s7D4Ih_|ACY?!nNXWOT^R&ewH=8ecTOZ5Eq989ig_Ux|% zGPaHA1or>wF7?<91c+9C>Adg`1cw^SS?;=2d!VY;|TqB+zet}-I ze04AEduV^t&s+w)Ev{0Mbg05vFZQblal|HG-qiZaZ2f_%L<<5pSk5Q6-I0}Qu6WJ? zxo>T2a8s4S&2zK;Wll8V3?4juch3(-m{Oxt?9Z9YcsW_i>=!64rMk;jm|ggH85wZl z8G6Eea4G!IPqTdcWu3mu#q229qjUXUDRW}VP{$KHJimMfUn^_ruV;@qV-1uypVF~6 zZ*>F3tn11Ie8Ew?kC3Y8e79=RJn*>>7(l*3xP^_?%h{lGKcm|5`BL~9|HYebu@jfy zKH&uOVGnh&iFynAi+|*v0osVI_*yy3Z({A*Z??habg#Gp<*r{<;6OBZIGex2wnplN z)b%I8&qCyU>|CB+mh{`JKGDhtJyj)XAo*vX2NGFDg6TH|B74YZ*|=#I1*melWcp1s zAx)L%Qb4@y9iY=dhQ$jzzYJUcCWW8K?UL>aSCAf{rK5C{=OV(jMuYw=UD$7zJjlp% zD&;R)>(S1bM0&KnkQN$f%@U%k^(ZiPByf-6M6AmdaEZ}Gu)Wa0$e90aq}A+Z11eE1 z@&`3A#+v>83tx-0yqH_KN)5ma@Y#*g+^6Ft^;P=^+FDw5w-YlpsZ ze_0E?$GQH@VZ@1#!DGC4G&@nBbiDT;0Tpn4nFK(9=h~-#AE^VYQM%e?%vAx^;6JfB z5e*|ATYqfutX^A{CDJN}wtaW4zIa0)G|5hkp6{je*9_nWPL?L3>unC~6?U%GQ;_@< zlQKc(3ntX6e$^9Q4+e70fHGhY{cV22aNWu$b8}xhZ*YRS>+&gba2S9Bt^gKMf^zO>0$Ot;;% zq-LnI@QH*yuW@>CXrRWKgP{_%vyT_ExSD=nfIIyLUb+jXRy9$z1;R+Dd19xf&MH^m zSrgaw0bblokdnWx{X7heopJzv@^^p0*)ZK%dsG>3y+I5_4f`o{KA^sRiRVNp0%^|M z!(*!NYoVp>STkkDsSoxKM~(U$RpWq%#o6`!lZeYm1RgZc@i0_$ss2V7gB|C|#8G=) zo>c!I2X(zzgA&)8MWZ~m=KODz-v7w8R^`YCVGxeg<12PXS%APAamAZOgVye(q|u5{ z5CO%_UASn5eX$TqHF}4K9K`pi+vrzEJGdkR9)!4+_#r=OL@sePrOiMWTj#W*64J=L z??H{}th4>Ddd^rc)YLtc30PUf$4qpwytm4CkKx3B`o{-qe`T$~KdY2&DtK;8oSkAN zv2FB zaDw_J_RAEZ6Rwss2jmV4s0+7jDtWH|eRe8^aEoEFBy|ePd6JG&^z03I>iy-lzJkwM zJ*Z;nw=p-S|0NS}wuG1S0#T0zHoKLdWYlY0PuHSkbQoMhC4>JD3jhLlO7XG^M!+mE zC%sWEdWYW0A{#7&gDxeVNXGD&hTG=I2T7AYH|uto1UT+H5?iBz$R=+k&N_mime_5q~W(pO!& z>wXy6mII@wiIxiUY_?mWw3521b46Y{@0$azxh@6dxw$tw@lE|R9Wbt32nCT2ZR-ag zwEcQzTp9$4?4vyXN9XqSPE_nRXpD9aHrkbGA8lxmk8TvG(L3WfZD{#*_b)K5G0pi` z8d!7YF~?MHvq=rJ+b8!nslLnFz&J9y;C(;caQPODQ?I2S87h-l7T{Ea)k6J)ApUq0FkLOW?$_ zg2kI_yVC(*rPqNb)~goY|K0_`ObX&KSF5r$4>>xis$zdmu%P(_Ic22Oh>wf2dgkh% zX^!iILrC9$D}Q_G{AUyxqI~p3ipViE^~2V#lh>XTNPT!^zYR!gAij*fBD>(kfMOR= zSKWcFV`!_tKFpb_WbpdWm@j$>2SnO+lx^PpoaI5kagQL9J33zH*mn5*#1)7k_ZarU zCF5D+X^mdvQUR4%j;9^1RsMJcX- zj-l~8ET&q9_sSGZ1Z+XAFqDG$wmW7>{%SF3U~Iu}HfiGk4|SolnR#~#xGPBQT*d6I ziWXq4XDPO#T+K*Bvzow-yU7;IyTccNpK!GXMERU{6r6VeBeCt|7_p;PUoD-n&d2FVhI>#SRE)1Cj9EJ6!MsO{XV;AK+kB;l1i&U zYrtbY*P6hucalpNwkS#e#nhvhe4l_{6jBFsNJ{x|f+frPOC`YH0iXm3tIY2!<7aAp zNIO%p>MN2yK2Ad=C_ks|E#_VZtx{gkfZHzP_XkBMzb>@BHMM_$?Xj6TgtN^-jzp-r zIo4%M89$O7_r&&9(9R9J&l#_dWyfh7v~Z_~yC!Vj-;0YQv6$rz)&_+X6PM+5@F{l^UAD0-T&8 zGLf$G3JQOJ{CKY3b=2b1`O=biV>CL}_c2h4#`op3Q%Zz|el2G}njoUH-iw5?sCF3s zI$3Vr9Tuv)==v&zOyorR$e=A3xrj*0j}Xd*F+Wkjv9AhPiXK zhyqb!`?j}b2Qy?`!8G2=!mmYR_uK(DL)pqnt^WR5e{-g|wZu&Dz32bKxzb7~5ba%V z`2AI5D^l1*6Clzg9lLU3_=98FB`hANmDf&H+V(joslR_AtPe!tiG{Of7S|ycIDtZP zKdqOXYGytwKLr$kAX=AOR%2%C?n%j5eR~2J{kLBzNft-3`!bq8N+vsDFR{8U-gW9* zJ6BZsX??vx3K|{XNL3d0{Zl4ht2XTAB#ndnQ!5V|%*!qQ-R@+QfG-U8?-u*^gO@?pAd!r*GW2AtPFSrX|)xvV>A2d?hqa7TiP&kI`u16{)M) zw>5CAeAVmi?X7U=JmAFy+F?0ZGjAD@?nw0eGffGBfi4F?Hp<~2UI_$(GiD#mE zGIKbG#)D@0C!4j=_#=co3>m_`U6_)Rq6#`)%aw$c6_ygJbGP+EYTljwZW9ixQ2=sN z=o@l?ETA0*&jx?uA`gOCv3$8TAf^(NJpIHsGtif_lpZ+`-)DB?=n&`}9y&P|8E<{* zqJ|RNFG|sA;}`N{4gTs-4}@*MU6bt50B9R(g@4t757EwDk;75?tp9HfCin$D1QbfR zw}Mh&eU@e#)9*zuQR1B#8{a!*1TlIxl9Cccn8Y+$1JII2#{WLAtFv_5yBo)i=X>s-GOnzv zrL@aIo*cU zLjlpmZzuqq!8!JSFCqus)}Nre`%7;Ojd;?Rranma}#?tvsuaUh7issXW^;2@N>$hPi|X_BaM$0j}x zF~vesG+vm-d_0>TYk*$)EA%ki+Gw@&`GmC*P=Gc?HPm10fRtSbogf&HnW!StGUB`5 zd`f#c6B|-fsK6#hUHB9UaUsRGQyO(Op<`~y@8FsRzRK_Gx!GZ-m7l|`>-wOxD-XOs zwa|Z}--Fx@YNvH5Am?@FviW}m@q+fNU}YgRZ=w{jUeP5`TB6?!)g2MhnYLa2~+3EKgjV8o4CJIJnYL zk<+D$NVB-`&V%ejlp@?fBd1J>2jx}ZUL^u80Hj+HTscQJ`nVHG$3n4EsWr;LO z`IKpQ`f`acS+f?DE^vQ_P5{*Bf&Qzu(UvJ*{&~R+_d{N{rmwKAjtopq8z$r`z@&x% zIk|)UB@WtyzX)Ua*|Ot^NTZH#{rzasMV-8LYrx+FV79MqA0y07F1$NSzDhKhyiE|P zedfZ$AIB_c;{TugOQQ&}@a_tk32+LH;I4g^=k`8+6EWGN4hTNDO0_!f3Mo+3VQp?-fD+u%NONyG zB_<|?Cp|sa=;`Sj1T0*SrTLcJ5S z1!YTSRe=}=0M0PwjNfhU&%OXdLEdELE0m`A?j3?U^=D)b>Ter?nW)t+N4(7jFH}C4!y;yaE)in^id{rD8OF7LXjW>j5$~ zA72r36{zirqW|+Bg-%i0tG6%sM+%|q&8uMtcMIRB`hNjkzi(mWbZT@!oG5S#gHakJ zHMUt?PqUTSypdHJjI6QtC|Jx!x+Z$DHGR8@6G&vfXoABi#dTDT1IN5J*Y{5k=>6vd zvwTw0Y%wFOVkAZq*^I5$J)w0g61H-7%7l0g-f}J(0`gRY zsD=9oFkPZ9$WTe`hXfOJOb7jI@&1_$}%41ns08RXRp`|R;jn_0D9k}|ln zUl&phh!Nh#f{I4(EnguNy~D08m)%f)aGG%O%JEWLgH!#mlJkcb3wbdgrjizpsYM?M zyOiyC?g~4}cxJ�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 D#Oc`o literal 0 HcmV?d00001 diff --git a/runestone/common/css/time-tip.css b/runestone/common/css/time-tip.css new file mode 100644 index 000000000..842c91e20 --- /dev/null +++ b/runestone/common/css/time-tip.css @@ -0,0 +1,8 @@ +.timeTip { + background-image: url(./clock.png); + background-size: 15px; + width: 15px; + height: 15px; + position: relative; + left: 50%; +} \ No newline at end of file diff --git a/runestone/dragndrop/js/timeddnd.js b/runestone/dragndrop/js/timeddnd.js index 6dac19117..6044d2ba8 100644 --- a/runestone/dragndrop/js/timeddnd.js +++ b/runestone/dragndrop/js/timeddnd.js @@ -16,14 +16,8 @@ export default class TimedDragNDrop extends DragNDrop { // renders the clock icon on timed components. The component parameter // is the element that the icon should be appended to. var timeIconDiv = document.createElement("div"); - var timeIcon = document.createElement("img"); - $(timeIcon).attr({ - src: "../_static/clock.png", - style: "width:15px;height:15px", - }); timeIconDiv.className = "timeTip"; timeIconDiv.title = ""; - timeIconDiv.appendChild(timeIcon); $(component).prepend(timeIconDiv); } checkCorrectTimed() { diff --git a/runestone/fitb/js/timedfitb.js b/runestone/fitb/js/timedfitb.js index e60b5665b..a055dc62e 100644 --- a/runestone/fitb/js/timedfitb.js +++ b/runestone/fitb/js/timedfitb.js @@ -14,14 +14,8 @@ export default class TimedFITB extends FITB { // renders the clock icon on timed components. The component parameter // is the element that the icon should be appended to. var timeIconDiv = document.createElement("div"); - var timeIcon = document.createElement("img"); - $(timeIcon).attr({ - src: "../_static/clock.png", - style: "width:15px;height:15px", - }); timeIconDiv.className = "timeTip"; timeIconDiv.title = ""; - timeIconDiv.appendChild(timeIcon); $(component).prepend(timeIconDiv); } checkCorrectTimed() { diff --git a/runestone/mchoice/js/timedmc.js b/runestone/mchoice/js/timedmc.js index afb27a738..ce687bdaa 100644 --- a/runestone/mchoice/js/timedmc.js +++ b/runestone/mchoice/js/timedmc.js @@ -13,14 +13,8 @@ export default class TimedMC extends MultipleChoice { // renders the clock icon on timed components. The component parameter // is the element that the icon should be appended to. var timeIconDiv = document.createElement("div"); - var timeIcon = document.createElement("img"); - $(timeIcon).attr({ - src: "../_static/clock.png", - style: "width:15px;height:15px", - }); timeIconDiv.className = "timeTip"; timeIconDiv.title = ""; - timeIconDiv.appendChild(timeIcon); $(component).prepend(timeIconDiv); } hideButtons() { diff --git a/runestone/shortanswer/js/timed_shortanswer.js b/runestone/shortanswer/js/timed_shortanswer.js index 4ecfde956..68fb2c715 100644 --- a/runestone/shortanswer/js/timed_shortanswer.js +++ b/runestone/shortanswer/js/timed_shortanswer.js @@ -13,14 +13,8 @@ export default class TimedShortAnswer extends ShortAnswer { // renders the clock icon on timed components. The component parameter // is the element that the icon should be appended to. var timeIconDiv = document.createElement("div"); - var timeIcon = document.createElement("img"); - $(timeIcon).attr({ - src: "../_static/clock.png", - style: "width:15px;height:15px", - }); timeIconDiv.className = "timeTip"; timeIconDiv.title = ""; - timeIconDiv.appendChild(timeIcon); $(component).prepend(timeIconDiv); } checkCorrectTimed() { diff --git a/webpack.index.js b/webpack.index.js index 6c27ba631..39ff63d31 100644 --- a/webpack.index.js +++ b/webpack.index.js @@ -37,6 +37,9 @@ import "bootstrap/dist/css/bootstrap.css"; import "./runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/static/bootstrap-sphinx.js"; import "./runestone/common/css/runestone-custom-sphinx-bootstrap.css"; +// Timed questions related style +import "./runestone/common/css/time-tip.css"; + // Misc import "./runestone/common/js/bookfuncs.js"; import "./runestone/common/js/user-highlights.js"; From 6d327a1433b90f86c52d83e4508fc840dc8f44f6 Mon Sep 17 00:00:00 2001 From: bekjon777 Date: Tue, 16 Nov 2021 14:46:47 +0000 Subject: [PATCH 2/7] fixes timed fitb mc and parsons --- runestone/fitb/js/timedfitb.js | 2 +- runestone/mchoice/js/timedmc.js | 2 +- runestone/parsons/js/timedparsons.js | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/runestone/fitb/js/timedfitb.js b/runestone/fitb/js/timedfitb.js index a055dc62e..e951f38b3 100644 --- a/runestone/fitb/js/timedfitb.js +++ b/runestone/fitb/js/timedfitb.js @@ -2,7 +2,7 @@ import FITB from "./fitb.js"; export default class TimedFITB extends FITB { constructor(opts) { super(opts); - this.renderTimedIcon(this.inputDiv); + this.renderTimedIcon(this.containerDiv); this.hideButtons(); this.needsReinitialization = true; } diff --git a/runestone/mchoice/js/timedmc.js b/runestone/mchoice/js/timedmc.js index ce687bdaa..b6c47f685 100644 --- a/runestone/mchoice/js/timedmc.js +++ b/runestone/mchoice/js/timedmc.js @@ -5,7 +5,7 @@ export default class TimedMC extends MultipleChoice { super(opts); $(this.containerDiv).addClass("alert alert-warning runestone"); this.needsReinitialization = true; - this.renderTimedIcon(this.MCContainer); + this.renderTimedIcon(this.containerDiv); this.hideButtons(); // Don't show per-question buttons in a timed assessment } diff --git a/runestone/parsons/js/timedparsons.js b/runestone/parsons/js/timedparsons.js index 2cecedebb..316d0beae 100644 --- a/runestone/parsons/js/timedparsons.js +++ b/runestone/parsons/js/timedparsons.js @@ -11,10 +11,19 @@ export default class TimedParsons extends Parsons { } this.grader.showfeedback = this.showfeedback; this.hideFeedback(); + this.renderTimedIcon(this.containerDiv); $(this.checkButton).hide(); $(this.helpButton).hide(); $(this.resetButton).hide(); } + renderTimedIcon(component) { + // renders the clock icon on timed components. The component parameter + // is the element that the icon should be appended to. + var timeIconDiv = document.createElement("div"); + timeIconDiv.className = "timeTip"; + timeIconDiv.title = ""; + $(component).prepend(timeIconDiv); + } checkCorrectTimed() { return this.correct ? "T" : "F"; } From b2395691c8be33f463609c1fbb6a67e24a824b8a Mon Sep 17 00:00:00 2001 From: bekjon777 Date: Thu, 18 Nov 2021 05:11:36 +0000 Subject: [PATCH 3/7] gives activecode bg style consistent with other question types --- runestone/activecode/js/activecode.js | 2 +- runestone/activecode/js/timed_activecode.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/runestone/activecode/js/activecode.js b/runestone/activecode/js/activecode.js index a4ce0d502..3992982cc 100755 --- a/runestone/activecode/js/activecode.js +++ b/runestone/activecode/js/activecode.js @@ -141,7 +141,7 @@ export class ActiveCode extends RunestoneBase { this.outerDiv = document.createElement("div"); var linkdiv = document.createElement("div"); linkdiv.id = this.divid.replace(/_/g, "-").toLowerCase(); // :ref: changes _ to - so add this as a target - $(this.outerDiv).addClass("ac_section alert alert-warning"); + $(this.outerDiv).addClass("ac_section"); var codeDiv = document.createElement("div"); $(codeDiv).addClass("ac_code_div col-md-12"); this.codeDiv = codeDiv; diff --git a/runestone/activecode/js/timed_activecode.js b/runestone/activecode/js/timed_activecode.js index 6677545f8..3c9d1c724 100644 --- a/runestone/activecode/js/timed_activecode.js +++ b/runestone/activecode/js/timed_activecode.js @@ -12,10 +12,11 @@ import SQLActiveCode from "./activecode_sql"; var TimedActiveCodeMixin = { timedInit: async function (opts) { this.isTimed = true; + this.renderTimedIcon(this.containerDiv); this.hideButtons(); await this.addHistoryScrubber(true); // position last this.needsReinitialization = true; // the run button click listener needs to be reinitialized - this.containerDiv.classList.add("timedComponent"); + this.containerDiv.classList.add("timedComponent", "alert", "alert-warning"); window.edList[this.divid] = this; return true; }, From 38abeff74f303285f8ac3f978a4a65f08b979314 Mon Sep 17 00:00:00 2001 From: bekjon777 Date: Thu, 18 Nov 2021 13:31:00 +0000 Subject: [PATCH 4/7] removes the comment --- runestone/activecode/js/timed_activecode.js | 1 - 1 file changed, 1 deletion(-) diff --git a/runestone/activecode/js/timed_activecode.js b/runestone/activecode/js/timed_activecode.js index 3c9d1c724..565adc7b9 100644 --- a/runestone/activecode/js/timed_activecode.js +++ b/runestone/activecode/js/timed_activecode.js @@ -36,7 +36,6 @@ var TimedActiveCodeMixin = { } }, - // bje - not needed anymore renderTimedIcon: function (component) { // renders the clock icon on timed components. The component parameter // is the element that the icon should be appended to. From 70749145afdad76f471ef0f8d89fe2dec883a12b Mon Sep 17 00:00:00 2001 From: bekjon777 Date: Tue, 23 Nov 2021 12:46:32 +0000 Subject: [PATCH 5/7] removes redundant code from bookfuncs.js --- runestone/common/js/bookfuncs.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/runestone/common/js/bookfuncs.js b/runestone/common/js/bookfuncs.js index a12395c8c..4598f1f78 100644 --- a/runestone/common/js/bookfuncs.js +++ b/runestone/common/js/bookfuncs.js @@ -240,14 +240,6 @@ $(function () { // misc stuff // todo: This could be further distributed but making a video.js file just for one function seems dumb. window.addEventListener("load", function () { - // add the video play button overlay image - $(".video-play-overlay").each(function () { - $(this).css( - "background-image", - "url('{{pathto('_static/play_overlay_icon.png', 1)}}')" - ); - }); - // This function is needed to allow the dropdown search bar to work; // The default behaviour is that the dropdown menu closes when something in // it (like the search bar) is clicked From 450988841cc6f3bf45d8b714ff93f9b12cdf5ddb Mon Sep 17 00:00:00 2001 From: Bekzodjon Rakhimov <57421550+Bekjon777@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:08:55 -0500 Subject: [PATCH 6/7] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a93a8e651..612ec774a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "check-env": "node -e 'console.log(process.env)' | grep npm", - "build": "export NODE_OPTIONS=--openssl-legacy-provider; webpack --mode=development", + "build": "webpack --mode=development", "buildj": "webpack --mode=development --profile --json > stats.json", "watch": "webpack --mode=development --watch", "serve": "cd dist; python -m http.server 8080; cd ..", @@ -43,4 +43,4 @@ "vega-embed": "3.14.0", "wavedrom": "^2.0.0" } -} \ No newline at end of file +} From c72cf29ef993a121b47d96d8cdbf614593897f37 Mon Sep 17 00:00:00 2001 From: Bekzodjon Rakhimov <57421550+Bekjon777@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:10:03 -0500 Subject: [PATCH 7/7] Update package.json