osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into a-move-mobile

Browse Source
This commit is contained in:
Jarek Radosz 2022-08-14 21:15:04 +02:00
commit 4665ad3dd7
No known key found for this signature in database
GPG Key ID: 62D0FBAE5BF9B953
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/tests.yml vendored
View File

@ -179,7 +179,7 @@ jobs:
name: core frontend (${{ matrix.browser }})
runs-on: ubuntu-latest
container: discourse/discourse_test:slim-browsers
timeout-minutes: 30
timeout-minutes: 35
strategy:
fail-fast: false
@ -223,16 +223,16 @@ jobs:
if: ${{ always() }}
working-directory: ./app/assets/javascripts/discourse
run: sudo -E -u discourse -H yarn ember exam --path /tmp/emberbuild --split=3 --partition=1 --launch "${{ matrix.browser }}" --random
timeout-minutes: 20
timeout-minutes: 15
- name: Core QUnit 2
if: ${{ always() }}
working-directory: ./app/assets/javascripts/discourse
run: sudo -E -u discourse -H yarn ember exam --path /tmp/emberbuild --split=3 --partition=2 --launch "${{ matrix.browser }}" --random
timeout-minutes: 20
timeout-minutes: 15
- name: Core QUnit 3
if: ${{ always() }}
working-directory: ./app/assets/javascripts/discourse
run: sudo -E -u discourse -H yarn ember exam --path /tmp/emberbuild --split=3 --partition=3 --launch "${{ matrix.browser }}" --random
timeout-minutes: 20
timeout-minutes: 15

8
app/assets/javascripts/discourse/app/components/time-shortcut-picker.js
View File

@ -127,8 +127,8 @@ export default Component.extend({
},
_loadLastUsedCustomDatetime() {
let lastTime = localStorage.lastCustomTime;
let lastDate = localStorage.lastCustomDate;
const lastTime = this.keyValueStore.lastCustomTime;
const lastDate = this.keyValueStore.lastCustomDate;
if (lastTime && lastDate) {
let parsed = parseCustomDatetime(lastDate, lastTime, this.userTimezone);
@ -242,8 +242,8 @@ export default Component.extend({
if (customDatetime.isValid() && this.customDate) {
dateTime = customDatetime;
localStorage.lastCustomTime = this.customTime;
localStorage.lastCustomDate = this.customDate;
this.keyValueStore.lastCustomTime = this.customTime;
this.keyValueStore.lastCustomDate = this.customDate;
}
} else {
dateTime = this.options.findBy("id", type).time;

4
app/assets/javascripts/discourse/app/lib/key-value-store.js
View File

@ -1,5 +1,7 @@
import { isTesting } from "discourse-common/config/environment";
const TEST_KEY_PREFIX = "__test_";
// A simple key value store that uses LocalStorage
let safeLocalStorage;
@ -20,7 +22,7 @@ export default class KeyValueStore {
context = null;
constructor(ctx) {
this.context = isTesting() ? `test_${ctx}` : ctx;
this.context = isTesting() ? `${TEST_KEY_PREFIX}${ctx}` : ctx;
}
abandonLocal() {

5
app/assets/stylesheets/common/components/user-status-message.scss
View File

@ -1,3 +1,8 @@
.user-status-message-description {
margin-left: 0.1em;
color: var(--primary-800);
}
.user-status-message-tooltip {
.emoji {
width: 1em;