" + t + "
";
// create the notification div stylesheet
- var sheet = document.createElement("style");
- var style =
+ let sheet = document.createElement("style");
+ let style =
".buorg {position:absolute; z-index:111111; width:100%; top:0px; left:0px; background:#FDF2AB; text-align:left; font-family: sans-serif; color:#000; font-size: 14px;} .buorg div {padding: 8px;} .buorg a, .buorg a:visited {color:#E25600; text-decoration: underline;} @media print { .buorg { display: none !important; } }";
// insert the div and stylesheet into the DOM
diff --git a/app/assets/javascripts/discourse-common/addon/config/environment.js b/app/assets/javascripts/discourse-common/addon/config/environment.js
index 409b6af066..d2a47b1247 100644
--- a/app/assets/javascripts/discourse-common/addon/config/environment.js
+++ b/app/assets/javascripts/discourse-common/addon/config/environment.js
@@ -14,6 +14,12 @@ export function isTesting() {
return Ember.testing || environment === "testing";
}
+// Generally means "before we migrated to Ember CLI"
+let _isLegacy = Ember.VERSION.startsWith("3.12");
+export function isLegacyEmber() {
+ return _isLegacy;
+}
+
export function isDevelopment() {
return environment === "development";
}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js b/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
index 07bda95a9e..d60b94eaf7 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/attribute-hook.js
@@ -32,8 +32,8 @@ AttributeHook.prototype.unhook = function (node, prop, next) {
return;
}
- var colonPosition = prop.indexOf(":");
- var localName = colonPosition > -1 ? prop.substr(colonPosition + 1) : prop;
+ let colonPosition = prop.indexOf(":");
+ let localName = colonPosition > -1 ? prop.substr(colonPosition + 1) : prop;
node.removeAttributeNS(this.namespace, localName);
};
diff --git a/app/assets/javascripts/discourse-common/addon/lib/debounce.js b/app/assets/javascripts/discourse-common/addon/lib/debounce.js
index 541498fda6..5e30864574 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/debounce.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/debounce.js
@@ -1,14 +1,17 @@
-import { debounce, run } from "@ember/runloop";
-import { isTesting } from "discourse-common/config/environment";
+import { debounce, next, run } from "@ember/runloop";
+import { isLegacyEmber, isTesting } from "discourse-common/config/environment";
+
/**
Debounce a Javascript function. This means if it's called many times in a time limit it
should only be executed once (at the end of the limit counted from the last call made).
Original function will be called with the context and arguments from the last call made.
**/
+let testingFunc = isLegacyEmber() ? run : next;
+
export default function () {
if (isTesting()) {
- return run(...arguments);
+ return testingFunc(...arguments);
} else {
return debounce(...arguments);
}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/get-url.js b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
index 1981a38bfb..29a9e56ce1 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/get-url.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/get-url.js
@@ -15,9 +15,9 @@ export default function getURL(url) {
return url;
}
- const found = url.indexOf(baseUri);
+ const found = url.startsWith(baseUri);
- if (found >= 0 && found < 3) {
+ if (found) {
return url;
}
if (url[0] !== "/") {
diff --git a/app/assets/javascripts/discourse-common/addon/lib/helpers.js b/app/assets/javascripts/discourse-common/addon/lib/helpers.js
index e9af233da8..a2014653c8 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/helpers.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/helpers.js
@@ -22,7 +22,7 @@ const _helpers = {};
function rawGet(ctx, property, options) {
if (options.types && options.data.view) {
- var view = options.data.view;
+ let view = options.data.view;
return view.getStream
? view.getStream(property).value()
: view.getAttr(property);
diff --git a/app/assets/javascripts/discourse-common/addon/lib/object.js b/app/assets/javascripts/discourse-common/addon/lib/object.js
index 4fe99d96b8..294235b1ce 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/object.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/object.js
@@ -47,7 +47,7 @@ export function deepEqual(obj1, obj2) {
if (Object.keys(obj1).length !== Object.keys(obj2).length) {
return false;
}
- for (var prop in obj1) {
+ for (let prop in obj1) {
if (!deepEqual(obj1[prop], obj2[prop])) {
return false;
}
diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
index 37bb2c93d0..634d77c39e 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js
@@ -29,24 +29,22 @@ export function registerRawHelpers(hbs, handlebarsClass) {
};
// #each .. in support (as format is transformed to this)
- hbs.registerHelper("each", function (
- localName,
- inKeyword,
- contextName,
- options
- ) {
- if (typeof contextName === "undefined") {
- return;
+ hbs.registerHelper(
+ "each",
+ function (localName, inKeyword, contextName, options) {
+ if (typeof contextName === "undefined") {
+ return;
+ }
+ let list = get(this, contextName);
+ let output = [];
+ for (let i = 0; i < list.length; i++) {
+ let innerContext = {};
+ innerContext[localName] = list[i];
+ output.push(options.fn(innerContext));
+ }
+ return output.join("");
}
- var list = get(this, contextName);
- var output = [];
- for (var i = 0; i < list.length; i++) {
- let innerContext = {};
- innerContext[localName] = list[i];
- output.push(options.fn(innerContext));
- }
- return output.join("");
- });
+ );
function stringCompatHelper(fn) {
const old = hbs.helpers[fn];
diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
index d2d3149c79..f49e427317 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars.js
@@ -6,7 +6,7 @@ import Handlebars from "handlebars";
const RawHandlebars = Handlebars.create();
function buildPath(blk, args) {
- var result = {
+ let result = {
type: "PathExpression",
data: false,
depth: blk.path.depth,
@@ -22,7 +22,7 @@ function buildPath(blk, args) {
}
function replaceGet(ast) {
- var visitor = new Handlebars.Visitor();
+ let visitor = new Handlebars.Visitor();
visitor.mutating = true;
visitor.MustacheStatement = function (mustache) {
@@ -42,7 +42,7 @@ function replaceGet(ast) {
// This allows us to use the same syntax in all templates
visitor.BlockStatement = function (block) {
if (block.path.original === "each" && block.params.length === 1) {
- var paramName = block.program.blockParams[0];
+ let paramName = block.program.blockParams[0];
block.params = [
buildPath(block, { original: paramName }),
{ type: "CommentStatement", value: "in" },
@@ -74,10 +74,10 @@ if (Handlebars.Compiler) {
RawHandlebars.JavaScriptCompiler.prototype.namespace = "RawHandlebars";
RawHandlebars.precompile = function (value, asObject) {
- var ast = Handlebars.parse(value);
+ let ast = Handlebars.parse(value);
replaceGet(ast);
- var options = {
+ let options = {
knownHelpers: {
get: true,
},
@@ -87,7 +87,7 @@ if (Handlebars.Compiler) {
asObject = asObject === undefined ? true : asObject;
- var environment = new RawHandlebars.Compiler().compile(ast, options);
+ let environment = new RawHandlebars.Compiler().compile(ast, options);
return new RawHandlebars.JavaScriptCompiler().compile(
environment,
options,
@@ -97,20 +97,20 @@ if (Handlebars.Compiler) {
};
RawHandlebars.compile = function (string) {
- var ast = Handlebars.parse(string);
+ let ast = Handlebars.parse(string);
replaceGet(ast);
// this forces us to rewrite helpers
- var options = { data: true, stringParams: true };
- var environment = new RawHandlebars.Compiler().compile(ast, options);
- var templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
+ let options = { data: true, stringParams: true };
+ let environment = new RawHandlebars.Compiler().compile(ast, options);
+ let templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
environment,
options,
undefined,
true
);
- var t = RawHandlebars.template(templateSpec);
+ let t = RawHandlebars.template(templateSpec);
t.isMethod = false;
return t;
diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
index f720febb29..51222877ff 100644
--- a/app/assets/javascripts/discourse-common/addon/resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/resolver.js
@@ -111,7 +111,7 @@ export function buildResolver(baseName) {
);
});
- var module;
+ let module;
if (moduleName) {
module = requirejs(moduleName, null, null, true /* force sync */);
if (module && module["default"]) {
@@ -200,7 +200,7 @@ export function buildResolver(baseName) {
findPluginMobileTemplate(parsedName) {
if (_options.mobileView) {
- var pluginParsedName = this.parseName(
+ let pluginParsedName = this.parseName(
parsedName.fullName.replace(
"template:",
"template:javascripts/mobile/"
@@ -212,7 +212,7 @@ export function buildResolver(baseName) {
findMobileTemplate(parsedName) {
if (_options.mobileView) {
- var mobileParsedName = this.parseName(
+ let mobileParsedName = this.parseName(
parsedName.fullName.replace("template:", "template:mobile/")
);
return this.findTemplate(mobileParsedName);
@@ -241,15 +241,15 @@ export function buildResolver(baseName) {
},
findUnderscoredTemplate(parsedName) {
- var decamelized = parsedName.fullNameWithoutType.decamelize();
- var underscored = decamelized.replace(/\-/g, "_");
+ let decamelized = parsedName.fullNameWithoutType.decamelize();
+ let underscored = decamelized.replace(/\-/g, "_");
return Ember.TEMPLATES[underscored];
},
// Try to find a template within a special admin namespace, e.g. adminEmail => admin/templates/email
// (similar to how discourse lays out templates)
findAdminTemplate(parsedName) {
- var decamelized = parsedName.fullNameWithoutType.decamelize();
+ let decamelized = parsedName.fullNameWithoutType.decamelize();
if (decamelized.indexOf("components") === 0) {
let comPath = `admin/templates/${decamelized}`;
const compTemplate =
diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js b/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
index 96692bb553..dd4299c700 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
@@ -12,7 +12,7 @@ export default function decoratorAlias(fn, errorMessage) {
configurable: desc.configurable,
writable: desc.writable,
initializer: function () {
- var value = extractValue(desc);
+ let value = extractValue(desc);
return fn.apply(null, params.concat(value));
},
};
diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
index c7f3729d8e..4fad373bf8 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
@@ -51,7 +51,7 @@ export function readOnly(target, name, desc) {
enumerable: desc.enumerable,
configurable: desc.configurable,
initializer: function () {
- var value = extractValue(desc);
+ let value = extractValue(desc);
return value.readOnly();
},
};
diff --git a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
index f8ff22c817..3987adffa6 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
@@ -10,7 +10,7 @@ export default function handleDescriptor(target, key, desc, params = []) {
let computedDescriptor;
if (desc.writable) {
- var val = extractValue(desc);
+ let val = extractValue(desc);
if (typeof val === "object") {
let value = {};
if (val.get) {
diff --git a/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
index 1cbffd611b..659f924114 100644
--- a/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
+++ b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js
@@ -6,7 +6,7 @@ const Handlebars = require("handlebars");
const RawHandlebars = Handlebars.create();
function buildPath(blk, args) {
- var result = {
+ let result = {
type: "PathExpression",
data: false,
depth: blk.path.depth,
@@ -22,7 +22,7 @@ function buildPath(blk, args) {
}
function replaceGet(ast) {
- var visitor = new Handlebars.Visitor();
+ let visitor = new Handlebars.Visitor();
visitor.mutating = true;
visitor.MustacheStatement = function (mustache) {
@@ -42,7 +42,7 @@ function replaceGet(ast) {
// This allows us to use the same syntax in all templates
visitor.BlockStatement = function (block) {
if (block.path.original === "each" && block.params.length === 1) {
- var paramName = block.program.blockParams[0];
+ let paramName = block.program.blockParams[0];
block.params = [
buildPath(block, { original: paramName }),
{ type: "CommentStatement", value: "in" },
@@ -71,10 +71,10 @@ RawHandlebars.JavaScriptCompiler.prototype.compiler =
RawHandlebars.JavaScriptCompiler.prototype.namespace = "RawHandlebars";
RawHandlebars.precompile = function (value, asObject) {
- var ast = Handlebars.parse(value);
+ let ast = Handlebars.parse(value);
replaceGet(ast);
- var options = {
+ let options = {
knownHelpers: {
get: true,
},
@@ -84,7 +84,7 @@ RawHandlebars.precompile = function (value, asObject) {
asObject = asObject === undefined ? true : asObject;
- var environment = new RawHandlebars.Compiler().compile(ast, options);
+ let environment = new RawHandlebars.Compiler().compile(ast, options);
return new RawHandlebars.JavaScriptCompiler().compile(
environment,
options,
@@ -94,20 +94,20 @@ RawHandlebars.precompile = function (value, asObject) {
};
RawHandlebars.compile = function (string) {
- var ast = Handlebars.parse(string);
+ let ast = Handlebars.parse(string);
replaceGet(ast);
// this forces us to rewrite helpers
- var options = { data: true, stringParams: true };
- var environment = new RawHandlebars.Compiler().compile(ast, options);
- var templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
+ let options = { data: true, stringParams: true };
+ let environment = new RawHandlebars.Compiler().compile(ast, options);
+ let templateSpec = new RawHandlebars.JavaScriptCompiler().compile(
environment,
options,
undefined,
true
);
- var t = RawHandlebars.template(templateSpec);
+ let t = RawHandlebars.template(templateSpec);
t.isMethod = false;
return t;
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 093dfe5eea..b28effdddb 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -26,7 +26,8 @@ const Discourse = Application.extend({
const init = module.default;
const oldInitialize = init.initialize;
- init.initialize = () => oldInitialize.call(init, this.__container__, this);
+ init.initialize = (app) => oldInitialize.call(init, app.__container__, app);
+
return init;
},
diff --git a/app/assets/javascripts/discourse/app/components/activation-controls.js b/app/assets/javascripts/discourse/app/components/activation-controls.js
index 15d48468b0..99ed8d2b1b 100644
--- a/app/assets/javascripts/discourse/app/components/activation-controls.js
+++ b/app/assets/javascripts/discourse/app/components/activation-controls.js
@@ -1,4 +1,10 @@
import Component from "@ember/component";
+import { or } from "@ember/object/computed";
+
export default Component.extend({
classNames: "activation-controls",
+ canEditEmail: or(
+ "siteSettings.enable_local_logins",
+ "siteSettings.email_editable"
+ ),
});
diff --git a/app/assets/javascripts/discourse/app/components/backup-codes.js b/app/assets/javascripts/discourse/app/components/backup-codes.js
index e66fe6de63..565f282174 100644
--- a/app/assets/javascripts/discourse/app/components/backup-codes.js
+++ b/app/assets/javascripts/discourse/app/components/backup-codes.js
@@ -5,12 +5,12 @@ import discourseComputed from "discourse-common/utils/decorators";
// https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding
function b64EncodeUnicode(str) {
return btoa(
- encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function toSolidBytes(
- match,
- p1
- ) {
- return String.fromCharCode("0x" + p1);
- })
+ encodeURIComponent(str).replace(
+ /%([0-9A-F]{2})/g,
+ function toSolidBytes(match, p1) {
+ return String.fromCharCode("0x" + p1);
+ }
+ )
);
}
diff --git a/app/assets/javascripts/discourse/app/components/basic-topic-list.js b/app/assets/javascripts/discourse/app/components/basic-topic-list.js
index 0445741f0b..3343512568 100644
--- a/app/assets/javascripts/discourse/app/components/basic-topic-list.js
+++ b/app/assets/javascripts/discourse/app/components/basic-topic-list.js
@@ -10,7 +10,7 @@ export default Component.extend({
@discourseComputed("topicList.loaded")
loaded() {
- var topicList = this.topicList;
+ let topicList = this.topicList;
if (topicList) {
return topicList.get("loaded");
} else {
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-local-date.js b/app/assets/javascripts/discourse/app/components/bookmark-local-date.js
new file mode 100644
index 0000000000..d89c200073
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/bookmark-local-date.js
@@ -0,0 +1,57 @@
+import Component from "@ember/component";
+import I18n from "I18n";
+import { action } from "@ember/object";
+import { getOwner } from "discourse-common/lib/get-owner";
+import { or } from "@ember/object/computed";
+
+export default Component.extend({
+ tagName: "",
+
+ init() {
+ this._super(...arguments);
+
+ this.loadLocalDates();
+ },
+
+ get postLocalDateFormatted() {
+ return this.postLocalDate().format(I18n.t("dates.long_no_year"));
+ },
+
+ showPostLocalDate: or("postDetectedLocalDate", "postDetectedLocalTime"),
+
+ loadLocalDates() {
+ let postEl = document.querySelector(`[data-post-id="${this.postId}"]`);
+ let localDateEl = null;
+ if (postEl) {
+ localDateEl = postEl.querySelector(".discourse-local-date");
+ }
+
+ this.setProperties({
+ postDetectedLocalDate: localDateEl ? localDateEl.dataset.date : null,
+ postDetectedLocalTime: localDateEl ? localDateEl.dataset.time : null,
+ postDetectedLocalTimezone: localDateEl
+ ? localDateEl.dataset.timezone
+ : null,
+ });
+ },
+
+ postLocalDate() {
+ const bookmarkController = getOwner(this).lookup("controller:bookmark");
+ let parsedPostLocalDate = bookmarkController._parseCustomDateTime(
+ this.postDetectedLocalDate,
+ this.postDetectedLocalTime,
+ this.postDetectedLocalTimezone
+ );
+
+ if (!this.postDetectedLocalTime) {
+ return bookmarkController.startOfDay(parsedPostLocalDate);
+ }
+
+ return parsedPostLocalDate;
+ },
+
+ @action
+ setReminder() {
+ return this.onChange(this.postLocalDate());
+ },
+});
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index 2ed3a8712a..b666a5ad33 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -536,10 +536,10 @@ export default Component.extend({
_warnMentionedGroups($preview) {
schedule("afterRender", () => {
- var found = this.warnedGroupMentions || [];
+ let found = this.warnedGroupMentions || [];
$preview.find(".mention-group.notify").each((idx, e) => {
const $e = $(e);
- var name = $e.data("name");
+ let name = $e.data("name");
if (found.indexOf(name) === -1) {
this.groupsMentioned([
{
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index c5c636ab67..de6531d172 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -184,7 +184,7 @@ class Toolbar {
if (button.shortcut) {
const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
const mod = mac ? "Meta" : "Ctrl";
- var shortcutTitle = `${mod}+${button.shortcut}`;
+ let shortcutTitle = `${mod}+${button.shortcut}`;
// Mac users are used to glyphs for shortcut keys
if (mac) {
diff --git a/app/assets/javascripts/discourse/app/components/d-modal.js b/app/assets/javascripts/discourse/app/components/d-modal.js
index 2ef23e5a17..e74f12d566 100644
--- a/app/assets/javascripts/discourse/app/components/d-modal.js
+++ b/app/assets/javascripts/discourse/app/components/d-modal.js
@@ -1,3 +1,4 @@
+import { computed } from "@ember/object";
import Component from "@ember/component";
import I18n from "I18n";
import afterTransition from "discourse/lib/after-transition";
@@ -12,10 +13,16 @@ export default Component.extend({
"modalStyle",
"hasPanels",
],
- attributeBindings: ["data-keyboard", "aria-modal"],
+ attributeBindings: [
+ "data-keyboard",
+ "aria-modal",
+ "role",
+ "ariaLabelledby:aria-labelledby",
+ ],
dismissable: true,
title: null,
subtitle: null,
+ role: "dialog",
init() {
this._super(...arguments);
@@ -33,6 +40,10 @@ export default Component.extend({
// Inform screenreaders of the modal
"aria-modal": "true",
+ ariaLabelledby: computed("title", function () {
+ return this.title ? "discourse-modal-title" : null;
+ }),
+
@on("didInsertElement")
setUp() {
$("html").on("keyup.discourse-modal", (e) => {
diff --git a/app/assets/javascripts/discourse/app/components/popup-input-tip.js b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
index 51d5519862..9d02aeff01 100644
--- a/app/assets/javascripts/discourse/app/components/popup-input-tip.js
+++ b/app/assets/javascripts/discourse/app/components/popup-input-tip.js
@@ -28,7 +28,7 @@ export default Component.extend({
@observes("lastShownAt")
bounce() {
if (this.lastShownAt) {
- var $elem = $(this.element);
+ let $elem = $(this.element);
if (!this.animateAttribute) {
this.animateAttribute = $elem.css("left") === "auto" ? "right" : "left";
}
@@ -51,7 +51,7 @@ export default Component.extend({
},
bounceLeft($elem) {
- for (var i = 0; i < 5; i++) {
+ for (let i = 0; i < 5; i++) {
$elem
.animate({ left: "+=" + this.bouncePixels }, this.bounceDelay)
.animate({ left: "-=" + this.bouncePixels }, this.bounceDelay);
@@ -59,7 +59,7 @@ export default Component.extend({
},
bounceRight($elem) {
- for (var i = 0; i < 5; i++) {
+ for (let i = 0; i < 5; i++) {
$elem
.animate({ right: "-=" + this.bouncePixels }, this.bounceDelay)
.animate({ right: "+=" + this.bouncePixels }, this.bounceDelay);
diff --git a/app/assets/javascripts/discourse/app/components/share-popup.js b/app/assets/javascripts/discourse/app/components/share-popup.js
index 3b2c3eb093..a2d9decc13 100644
--- a/app/assets/javascripts/discourse/app/components/share-popup.js
+++ b/app/assets/javascripts/discourse/app/components/share-popup.js
@@ -56,7 +56,7 @@ export default Component.extend({
},
_showUrl($target, url) {
- const $currentTargetOffset = $target.offset();
+ const currentTargetOffset = $target.offset();
const $this = $(this.element);
if (isEmpty(url)) {
@@ -69,7 +69,7 @@ export default Component.extend({
}
const shareLinkWidth = $this.width();
- let x = $currentTargetOffset.left - shareLinkWidth / 2;
+ let x = currentTargetOffset.left - shareLinkWidth / 2;
if (x < 25) {
x = 25;
}
@@ -78,15 +78,18 @@ export default Component.extend({
}
const header = $(".d-header");
- let y = $currentTargetOffset.top - ($this.height() + 20);
+ let y = currentTargetOffset.top - ($this.height() + 20);
if (y < header.offset().top + header.height()) {
- y = $currentTargetOffset.top + 10;
+ y = currentTargetOffset.top + 10;
}
- $this.css({ top: "" + y + "px" });
+ this.element.style.top = `${y}px`;
if (!this.site.mobileView) {
- $this.css({ left: "" + x + "px" });
+ this.element.style.left = `${x}px`;
+ if (document.documentElement.classList.contains("rtl")) {
+ this.element.style.right = "unset";
+ }
}
this.set("link", url);
this.set("visible", true);
diff --git a/app/assets/javascripts/discourse/app/components/tag-groups-form.js b/app/assets/javascripts/discourse/app/components/tag-groups-form.js
index d9ba0fff3b..d701fb300c 100644
--- a/app/assets/javascripts/discourse/app/components/tag-groups-form.js
+++ b/app/assets/javascripts/discourse/app/components/tag-groups-form.js
@@ -107,6 +107,8 @@ export default Component.extend(bufferedProperty("model"), {
this.allGroups.forEach((group) => {
if (groupIds.includes(group.id)) {
updatedPermissions[group.name] = PermissionType.FULL;
+ } else {
+ delete updatedPermissions[group.name];
}
});
diff --git a/app/assets/javascripts/discourse/app/components/tap-tile.js b/app/assets/javascripts/discourse/app/components/tap-tile.js
index b384ff7d71..8671cc1ad2 100644
--- a/app/assets/javascripts/discourse/app/components/tap-tile.js
+++ b/app/assets/javascripts/discourse/app/components/tap-tile.js
@@ -1,13 +1,26 @@
+import { reads } from "@ember/object/computed";
import Component from "@ember/component";
import { propertyEqual } from "discourse/lib/computed";
export default Component.extend({
init() {
this._super(...arguments);
+
this.set("elementId", `tap_tile_${this.tileId}`);
},
+
classNames: ["tap-tile"],
+
classNameBindings: ["active"],
+
+ attributeBindings: ["role", "ariaPressed", "tabIndex"],
+
+ role: "button",
+
+ tabIndex: 0,
+
+ ariaPressed: reads("active"),
+
click() {
this.onChange(this.tileId);
},
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 22d67f2d00..2efef6a1f3 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -226,12 +226,6 @@ export default Component.extend({
return this.unhandledRowClick(e, topic);
},
- actions: {
- toggleBookmark() {
- this.topic.toggleBookmark().finally(() => this.renderTopicListItem());
- },
- },
-
unhandledRowClick() {},
navigateToTopic,
diff --git a/app/assets/javascripts/discourse/app/components/topic-list.js b/app/assets/javascripts/discourse/app/components/topic-list.js
index 2f1270844f..8383cb035e 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list.js
@@ -163,9 +163,9 @@ export default Component.extend(LoadMore, {
},
click(e) {
- var self = this;
- var onClick = function (sel, callback) {
- var target = $(e.target).closest(sel);
+ let self = this;
+ let onClick = function (sel, callback) {
+ let target = $(e.target).closest(sel);
if (target.length === 1) {
callback.apply(self, [target]);
diff --git a/app/assets/javascripts/discourse/app/components/user-badge.js b/app/assets/javascripts/discourse/app/components/user-badge.js
index 201fa55021..6a2c8ceddb 100644
--- a/app/assets/javascripts/discourse/app/components/user-badge.js
+++ b/app/assets/javascripts/discourse/app/components/user-badge.js
@@ -12,7 +12,7 @@ export default Component.extend({
@discourseComputed("badge", "user")
badgeUrl() {
// NOTE: I tried using a link-to helper here but the queryParams mean it fails
- var username = this.get("user.username_lower") || "";
+ let username = this.get("user.username_lower") || "";
username = username !== "" ? "?username=" + username : "";
return this.get("badge.url") + username;
},
diff --git a/app/assets/javascripts/discourse/app/controllers/bookmark.js b/app/assets/javascripts/discourse/app/controllers/bookmark.js
index 5cab58bd0a..ec0e0010bb 100644
--- a/app/assets/javascripts/discourse/app/controllers/bookmark.js
+++ b/app/assets/javascripts/discourse/app/controllers/bookmark.js
@@ -1,5 +1,4 @@
import { REMINDER_TYPES, formattedReminderTime } from "discourse/lib/bookmark";
-import { and, or } from "@ember/object/computed";
import { isEmpty, isPresent } from "@ember/utils";
import { next, schedule } from "@ember/runloop";
import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
@@ -10,6 +9,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
import { Promise } from "rsvp";
import { action } from "@ember/object";
import { ajax } from "discourse/lib/ajax";
+import { and } from "@ember/object/computed";
import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -62,9 +62,7 @@ export default Controller.extend(ModalFunctionality, {
customReminderTime: null,
lastCustomReminderDate: null,
lastCustomReminderTime: null,
- postDetectedLocalDate: null,
- postDetectedLocalTime: null,
- postDetectedLocalTimezone: null,
+ postLocalDate: null,
mouseTrap: null,
userTimezone: null,
showOptions: false,
@@ -95,6 +93,8 @@ export default Controller.extend(ModalFunctionality, {
this._initializeExistingBookmarkData();
}
+ this.loadLocalDates();
+
schedule("afterRender", () => {
if (this.site.isMobileDevice) {
document.getElementById("bookmark-name").blur();
@@ -240,11 +240,6 @@ export default Controller.extend(ModalFunctionality, {
showLastCustom: and("lastCustomReminderTime", "lastCustomReminderDate"),
- showPostLocalDate: or(
- "model.postDetectedLocalDate",
- "model.postDetectedLocalTime"
- ),
-
get showLaterToday() {
let later = this.laterToday();
return (
@@ -302,8 +297,22 @@ export default Controller.extend(ModalFunctionality, {
return this.nextMonth().format(I18n.t("dates.long_no_year"));
},
- get postLocalDateFormatted() {
- return this.postLocalDate().format(I18n.t("dates.long_no_year"));
+ loadLocalDates() {
+ let postEl = document.querySelector(
+ `[data-post-id="${this.model.postId}"]`
+ );
+ let localDateEl = null;
+ if (postEl) {
+ localDateEl = postEl.querySelector(".discourse-local-date");
+ }
+
+ if (localDateEl) {
+ this.setProperties({
+ postDetectedLocalDate: localDateEl.dataset.date,
+ postDetectedLocalTime: localDateEl.dataset.time,
+ postDetectedLocalTimezone: localDateEl.dataset.timezone,
+ });
+ }
},
@discourseComputed("userTimezone")
@@ -442,7 +451,7 @@ export default Controller.extend(ModalFunctionality, {
case REMINDER_TYPES.LAST_CUSTOM:
return this.parsedLastCustomReminderDatetime;
case REMINDER_TYPES.POST_LOCAL_DATE:
- return this.postLocalDate();
+ return this.postLocalDate;
}
},
@@ -454,20 +463,6 @@ export default Controller.extend(ModalFunctionality, {
return this.startOfDay(this.now().add(1, "month"));
},
- postLocalDate() {
- let parsedPostLocalDate = this._parseCustomDateTime(
- this.model.postDetectedLocalDate,
- this.model.postDetectedLocalTime,
- this.model.postDetectedLocalTimezone
- );
-
- if (!this.model.postDetectedLocalTime) {
- return this.startOfDay(parsedPostLocalDate);
- }
-
- return parsedPostLocalDate;
- },
-
tomorrow() {
return this.startOfDay(this.now().add(1, "day"));
},
@@ -572,4 +567,13 @@ export default Controller.extend(ModalFunctionality, {
return this.saveAndClose();
}
},
+
+ @action
+ selectPostLocalDate(date) {
+ this.setProperties({
+ selectedReminderType: this.reminderTypes.POST_LOCAL_DATE,
+ postLocalDate: date,
+ });
+ return this.saveAndClose();
+ },
});
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index afdf82bb26..6f8d6e245e 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -727,7 +727,7 @@ export default Controller.extend({
}
}
- var staged = false;
+ let staged = false;
// TODO: This should not happen in model
const imageSizes = {};
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
index 01879ddc2e..b286fd4fda 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery/categories.js
@@ -19,15 +19,6 @@ export default DiscoveryController.extend({
canEdit: reads("currentUser.staff"),
- @discourseComputed("model.categories.[].featuredTopics.length")
- latestTopicOnly() {
- return (
- this.get("model.categories").find(
- (c) => c.get("featuredTopics.length") > 1
- ) === undefined
- );
- },
-
@discourseComputed("model.parentCategory")
categoryPageStyle(parentCategory) {
let style = this.site.mobileView
diff --git a/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js b/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
index 9b4aad2586..bbfa66193d 100644
--- a/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
+++ b/app/assets/javascripts/discourse/app/controllers/edit-category-tabs.js
@@ -1,3 +1,4 @@
+import { and, readOnly } from "@ember/object/computed";
import discourseComputed, { on } from "discourse-common/utils/decorators";
import Category from "discourse/models/category";
import Controller from "@ember/controller";
@@ -7,7 +8,6 @@ import { NotificationLevels } from "discourse/lib/notification-levels";
import PermissionType from "discourse/models/permission-type";
import bootbox from "bootbox";
import { extractError } from "discourse/lib/ajax-error";
-import { readOnly } from "@ember/object/computed";
import { underscore } from "@ember/string";
export default Controller.extend({
@@ -15,11 +15,12 @@ export default Controller.extend({
saving: false,
deleting: false,
panels: null,
- hiddenTooltip: true,
+ showTooltip: false,
createdCategory: false,
expandedMenu: false,
mobileView: readOnly("site.mobileView"),
parentParams: null,
+ showDeleteReason: and("showTooltip", "model.cannot_delete_reason"),
@on("init")
_initPanels() {
@@ -143,7 +144,7 @@ export default Controller.extend({
},
toggleDeleteTooltip() {
- this.toggleProperty("hiddenTooltip");
+ this.toggleProperty("showTooltip");
},
goBack() {
diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
index 44dee80ae3..a7ba222f8c 100644
--- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js
@@ -77,9 +77,9 @@ export default Controller.extend({
@discourseComputed("context", "context_id")
searchContextDescription(context, id) {
- var name = id;
+ let name = id;
if (context === "category") {
- var category = Category.findById(id);
+ let category = Category.findById(id);
if (!category) {
return;
}
@@ -322,7 +322,7 @@ export default Controller.extend({
},
loadMore() {
- var page = this.page;
+ let page = this.page;
if (
this.get("model.grouped_search_result.more_full_page_results") &&
!this.loading &&
diff --git a/app/assets/javascripts/discourse/app/controllers/group.js b/app/assets/javascripts/discourse/app/controllers/group.js
index 635a1bca1e..3d10fc9f02 100644
--- a/app/assets/javascripts/discourse/app/controllers/group.js
+++ b/app/assets/javascripts/discourse/app/controllers/group.js
@@ -142,13 +142,22 @@ export default Controller.extend({
destroyGroup() {
this.set("destroying", true);
+ const model = this.model;
+ let message = I18n.t("admin.groups.delete_confirm");
+
+ if (model.has_messages && model.message_count > 0) {
+ message = I18n.t("admin.groups.delete_with_messages_confirm", {
+ count: model.message_count,
+ });
+ }
+
bootbox.confirm(
- I18n.t("admin.groups.delete_confirm"),
+ message,
I18n.t("no_value"),
I18n.t("yes_value"),
(confirmed) => {
if (confirmed) {
- this.model
+ model
.destroy()
.then(() => this.transitionToRoute("groups.index"))
.catch((error) => {
diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js
index 23d66efe33..b6fd92cc7e 100644
--- a/app/assets/javascripts/discourse/app/controllers/history.js
+++ b/app/assets/javascripts/discourse/app/controllers/history.js
@@ -17,7 +17,7 @@ import { sanitizeAsync } from "discourse/lib/text";
function customTagArray(fieldName) {
return computed(fieldName, function () {
- var val = this.get(fieldName);
+ let val = this.get(fieldName);
if (!val) {
return val;
}
@@ -194,7 +194,7 @@ export default Controller.extend(ModalFunctionality, {
if (displayingInline) {
return this.isEitherRevisionHidden ? "hidden-revision-either" : null;
} else {
- var result = [];
+ let result = [];
if (prevHidden) {
result.push("hidden-revision-previous");
}
@@ -227,7 +227,7 @@ export default Controller.extend(ModalFunctionality, {
@discourseComputed("model.category_id_changes")
previousCategory(changes) {
if (changes) {
- var category = Category.findById(changes["previous"]);
+ let category = Category.findById(changes["previous"]);
return categoryBadgeHTML(category, { allowUncategorized: true });
}
},
@@ -235,7 +235,7 @@ export default Controller.extend(ModalFunctionality, {
@discourseComputed("model.category_id_changes")
currentCategory(changes) {
if (changes) {
- var category = Category.findById(changes["current"]);
+ let category = Category.findById(changes["current"]);
return categoryBadgeHTML(category, { allowUncategorized: true });
}
},
diff --git a/app/assets/javascripts/discourse/app/controllers/login.js b/app/assets/javascripts/discourse/app/controllers/login.js
index ce500f8209..481b70453f 100644
--- a/app/assets/javascripts/discourse/app/controllers/login.js
+++ b/app/assets/javascripts/discourse/app/controllers/login.js
@@ -403,6 +403,8 @@ export default Controller.extend(ModalFunctionality, {
skipConfirmation,
});
- showModal("createAccount", { modalClass: "create-account" });
+ next(() => {
+ showModal("createAccount", { modalClass: "create-account" });
+ });
},
});
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
index 2062170002..2709ebe99e 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/emails.js
@@ -62,7 +62,7 @@ export default Controller.extend({
@discourseComputed()
frequencyEstimate() {
- var estimate = this.get("model.mailing_list_posts_per_day");
+ let estimate = this.get("model.mailing_list_posts_per_day");
if (!estimate || estimate < 2) {
return I18n.t("user.mailing_list_mode.few_per_day");
} else {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index aff0e805b8..2ae8253e64 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -153,7 +153,7 @@ export default Controller.extend({
"themeId"
)
currentSchemeCanBeSelected(userThemes, userColorSchemes, themeId) {
- if (!userThemes) {
+ if (!userThemes || !themeId) {
return false;
}
diff --git a/app/assets/javascripts/discourse/app/controllers/reorder-categories.js b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
index 0875848ce3..c0b7778018 100644
--- a/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
+++ b/app/assets/javascripts/discourse/app/controllers/reorder-categories.js
@@ -15,7 +15,7 @@ export default Controller.extend(ModalFunctionality, Evented, {
this.categoriesSorting = ["position"];
},
- @discourseComputed("site.categories")
+ @discourseComputed("site.categories.[]")
categoriesBuffered(categories) {
const bufProxy = EmberObjectProxy.extend(BufferedProxy);
return categories.map((c) => bufProxy.create({ content: c }));
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index 7222df90c9..60acd67e74 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -72,7 +72,7 @@ export default Controller.extend({
}
const joinedTags = tags.slice(0, displayN).join(", ");
- var more = Math.max(0, tags.length - displayN);
+ let more = Math.max(0, tags.length - displayN);
const tagsString =
more === 0
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index e050aca6ea..7240ee39e9 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -702,9 +702,9 @@ export default Controller.extend(bufferedProperty("model"), {
if (!this.currentUser) {
return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
} else if (post) {
- return post.toggleBookmark();
+ return this._togglePostBookmark(post);
} else {
- return this.model.toggleBookmark().then((changedIds) => {
+ return this._toggleTopicBookmark(this.model).then((changedIds) => {
if (!changedIds) {
return;
}
@@ -1167,6 +1167,107 @@ export default Controller.extend(bufferedProperty("model"), {
}
},
+ _togglePostBookmark(post) {
+ return new Promise((resolve) => {
+ let modalController = showModal("bookmark", {
+ model: {
+ postId: post.id,
+ id: post.bookmark_id,
+ reminderAt: post.bookmark_reminder_at,
+ autoDeletePreference: post.bookmark_auto_delete_preference,
+ name: post.bookmark_name,
+ },
+ title: post.bookmark_id
+ ? "post.bookmarks.edit"
+ : "post.bookmarks.create",
+ modalClass: "bookmark-with-reminder",
+ });
+ modalController.setProperties({
+ onCloseWithoutSaving: () => {
+ resolve({ closedWithoutSaving: true });
+ post.appEvents.trigger("post-stream:refresh", { id: post.id });
+ },
+ afterSave: (savedData) => {
+ post.createBookmark(savedData);
+ resolve({ closedWithoutSaving: false });
+ },
+ afterDelete: (topicBookmarked) => {
+ post.deleteBookmark(topicBookmarked);
+ },
+ });
+ });
+ },
+
+ _toggleTopicBookmark() {
+ if (this.model.bookmarking) {
+ return Promise.resolve();
+ }
+ this.model.set("bookmarking", true);
+ const bookmark = !this.model.bookmarked;
+ let posts = this.model.postStream.posts;
+
+ return this.model.firstPost().then((firstPost) => {
+ const toggleBookmarkOnServer = () => {
+ if (bookmark) {
+ return this._togglePostBookmark(firstPost).then((opts) => {
+ this.model.set("bookmarking", false);
+ if (opts && opts.closedWithoutSaving) {
+ return;
+ }
+ return this.model.afterTopicBookmarked(firstPost);
+ });
+ } else {
+ return this.model
+ .deleteBookmark()
+ .then(() => {
+ this.model.toggleProperty("bookmarked");
+ this.model.set("bookmark_reminder_at", null);
+ let clearedBookmarkProps = {
+ bookmarked: false,
+ bookmark_id: null,
+ bookmark_name: null,
+ bookmark_reminder_at: null,
+ };
+ if (posts) {
+ const updated = [];
+ posts.forEach((post) => {
+ if (post.bookmarked) {
+ post.setProperties(clearedBookmarkProps);
+ updated.push(post.id);
+ }
+ });
+ firstPost.setProperties(clearedBookmarkProps);
+ return updated;
+ }
+ })
+ .catch(popupAjaxError)
+ .finally(() => this.model.set("bookmarking", false));
+ }
+ };
+
+ const unbookmarkedPosts = [];
+ if (!bookmark && posts) {
+ posts.forEach(
+ (post) => post.bookmarked && unbookmarkedPosts.push(post)
+ );
+ }
+
+ return new Promise((resolve) => {
+ if (unbookmarkedPosts.length > 1) {
+ bootbox.confirm(
+ I18n.t("bookmarks.confirm_clear"),
+ I18n.t("no_value"),
+ I18n.t("yes_value"),
+ (confirmed) =>
+ confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
+ );
+ } else {
+ toggleBookmarkOnServer().then(resolve);
+ }
+ });
+ });
+ },
+
togglePinnedState() {
this.send("togglePinnedForUser");
},
diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity.js b/app/assets/javascripts/discourse/app/controllers/user-activity.js
index d6e7241f35..f2023c232b 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity.js
@@ -16,7 +16,7 @@ export default Controller.extend({
@observes("userActionType", "model.stream.itemsLoaded")
_showFooter: function () {
- var showFooter;
+ let showFooter;
if (this.userActionType) {
const stat = (this.get("model.stats") || []).find(
(s) => s.action_type === this.userActionType
diff --git a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
index 4e1fd70393..e14955789e 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-private-messages.js
@@ -40,7 +40,7 @@ export default Controller.extend({
bulkOperation(operation) {
const selected = this.selected;
- var params = { type: operation };
+ let params = { type: operation };
if (this.isGroup) {
params.group = this.groupFilter;
}
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index fa9e99749b..a2b531f8a3 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -3,7 +3,11 @@ import EmberObject, { computed, set } from "@ember/object";
import { alias, and, gt, not, or } from "@ember/object/computed";
import CanCheckEmails from "discourse/mixins/can-check-emails";
import User from "discourse/models/user";
+import I18n from "I18n";
+import bootbox from "bootbox";
import discourseComputed from "discourse-common/utils/decorators";
+import getURL from "discourse-common/lib/get-url";
+import { iconHTML } from "discourse-common/lib/icon-library";
import { isEmpty } from "@ember/utils";
import optionalService from "discourse/lib/optional-service";
import { prioritizeNameInUx } from "discourse/lib/settings";
@@ -168,7 +172,57 @@ export default Controller.extend(CanCheckEmails, {
},
adminDelete() {
- this.adminTools.deleteUser(this.get("model.id"));
+ const userId = this.get("model.id");
+ const message = I18n.t("admin.user.delete_confirm");
+ const location = document.location.pathname;
+
+ const performDestroy = (block) => {
+ bootbox.dialog(I18n.t("admin.user.deleting_user"));
+ let formData = { context: location };
+ if (block) {
+ formData["block_email"] = true;
+ formData["block_urls"] = true;
+ formData["block_ip"] = true;
+ }
+ formData["delete_posts"] = true;
+
+ this.adminTools
+ .deleteUser(userId, formData)
+ .then((data) => {
+ if (data.deleted) {
+ document.location = getURL("/admin/users/list/active");
+ } else {
+ bootbox.alert(I18n.t("admin.user.delete_failed"));
+ }
+ })
+ .catch(() => bootbox.alert(I18n.t("admin.user.delete_failed")));
+ };
+
+ const buttons = [
+ {
+ label: I18n.t("composer.cancel"),
+ class: "btn",
+ link: true,
+ },
+ {
+ label:
+ `${iconHTML("exclamation-triangle")} ` +
+ I18n.t("admin.user.delete_and_block"),
+ class: "btn btn-danger",
+ callback: function () {
+ performDestroy(true);
+ },
+ },
+ {
+ label: I18n.t("admin.user.delete_dont_block"),
+ class: "btn btn-primary",
+ callback: function () {
+ performDestroy(false);
+ },
+ },
+ ];
+
+ bootbox.dialog(message, buttons, { classes: "delete-user-modal" });
},
updateNotificationLevel(level) {
diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js
index 71dcd3d722..289b0407d9 100644
--- a/app/assets/javascripts/discourse/app/helpers/category-link.js
+++ b/app/assets/javascripts/discourse/app/helpers/category-link.js
@@ -16,7 +16,7 @@ export function replaceCategoryLinkRenderer(fn) {
}
function categoryStripe(color, classes) {
- var style = color ? "style='background-color: #" + color + ";'" : "";
+ let style = color ? "style='background-color: #" + color + ";'" : "";
return "";
}
@@ -65,7 +65,7 @@ export function categoryBadgeHTML(category, opts) {
}
export function categoryLinkHTML(category, options) {
- var categoryOptions = {};
+ let categoryOptions = {};
// TODO: This is a compatibility layer with the old helper structure.
// Can be removed once we migrate to `registerUnbound` fully
diff --git a/app/assets/javascripts/discourse/app/helpers/format-date.js b/app/assets/javascripts/discourse/app/helpers/format-date.js
index e91759cdce..1798b23e02 100644
--- a/app/assets/javascripts/discourse/app/helpers/format-date.js
+++ b/app/assets/javascripts/discourse/app/helpers/format-date.js
@@ -7,7 +7,7 @@ import { registerUnbound } from "discourse-common/lib/helpers";
update the dates on a regular interval.
**/
registerUnbound("format-date", function (val, params) {
- var leaveAgo,
+ let leaveAgo,
format = "medium",
title = true;
@@ -22,7 +22,7 @@ registerUnbound("format-date", function (val, params) {
}
if (val) {
- var date = new Date(val);
+ let date = new Date(val);
return htmlSafe(
autoUpdatingRelativeAge(date, {
format: format,
diff --git a/app/assets/javascripts/discourse/app/helpers/loading-spinner.js b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
index 5f15403d05..5188c61990 100644
--- a/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
+++ b/app/assets/javascripts/discourse/app/helpers/loading-spinner.js
@@ -1,13 +1,13 @@
import { htmlHelper } from "discourse-common/lib/helpers";
function renderSpinner(cssClass) {
- var html = "";
}
-var spinnerHTML = renderSpinner();
+let spinnerHTML = renderSpinner();
export default htmlHelper((params) => {
const hash = params.hash;
diff --git a/app/assets/javascripts/discourse/app/helpers/shorten-url.js b/app/assets/javascripts/discourse/app/helpers/shorten-url.js
index 5b7012a339..4a35906190 100644
--- a/app/assets/javascripts/discourse/app/helpers/shorten-url.js
+++ b/app/assets/javascripts/discourse/app/helpers/shorten-url.js
@@ -1,7 +1,7 @@
import { registerUnbound } from "discourse-common/lib/helpers";
registerUnbound("shorten-url", function (url) {
- var matches = url.match(/\//g);
+ let matches = url.match(/\//g);
if (matches && matches.length === 3) {
url = url.replace(/\/$/, "");
diff --git a/app/assets/javascripts/discourse/app/initializers/inject-objects.js b/app/assets/javascripts/discourse/app/initializers/inject-objects.js
index abcf14a574..533e9134af 100644
--- a/app/assets/javascripts/discourse/app/initializers/inject-objects.js
+++ b/app/assets/javascripts/discourse/app/initializers/inject-objects.js
@@ -1,6 +1,9 @@
-// backwards compatibility for plugins that depend on this initializer
+import { setDefaultOwner } from "discourse-common/lib/get-owner";
export default {
name: "inject-objects",
- initialize() {},
+ initialize(container, app) {
+ // This is required for Ember CLI tests to work
+ setDefaultOwner(app.__container__);
+ },
};
diff --git a/app/assets/javascripts/discourse/app/lib/after-transition.js b/app/assets/javascripts/discourse/app/lib/after-transition.js
index 16c57b53cf..70edaaf843 100644
--- a/app/assets/javascripts/discourse/app/lib/after-transition.js
+++ b/app/assets/javascripts/discourse/app/lib/after-transition.js
@@ -4,7 +4,7 @@
SO: http://stackoverflow.com/questions/9943435/css3-animation-end-techniques
**/
-var dummy = document.createElement("div"),
+let dummy = document.createElement("div"),
eventNameHash = {
webkit: "webkitTransitionEnd",
Moz: "transitionend",
@@ -12,8 +12,8 @@ var dummy = document.createElement("div"),
ms: "MSTransitionEnd",
};
-var transitionEnd = (function () {
- var retValue;
+let transitionEnd = (function () {
+ let retValue;
retValue = "transitionend";
Object.keys(eventNameHash).some(function (vendor) {
if (vendor + "TransitionProperty" in dummy.style) {
diff --git a/app/assets/javascripts/discourse/app/lib/category-hashtags.js b/app/assets/javascripts/discourse/app/lib/category-hashtags.js
index 75c85616f9..18cf98b899 100644
--- a/app/assets/javascripts/discourse/app/lib/category-hashtags.js
+++ b/app/assets/javascripts/discourse/app/lib/category-hashtags.js
@@ -15,8 +15,8 @@ export function replaceSpan($elem, categorySlug, categoryLink, type) {
export function categoryHashtagTriggerRule(textarea, opts) {
const result = caretRowCol(textarea);
const row = result.rowNum;
- var col = result.colNum;
- var line = textarea.value.split("\n")[row - 1];
+ let col = result.colNum;
+ let line = textarea.value.split("\n")[row - 1];
if (opts && opts.backSpace) {
col = col - 1;
diff --git a/app/assets/javascripts/discourse/app/lib/category-tag-search.js b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
index d2e1fd5c83..ef84ac811f 100644
--- a/app/assets/javascripts/discourse/app/lib/category-tag-search.js
+++ b/app/assets/javascripts/discourse/app/lib/category-tag-search.js
@@ -37,7 +37,7 @@ function searchTags(term, categories, limit) {
data: { limit: limit, q },
});
- var returnVal = CANCELLED_STATUS;
+ let returnVal = CANCELLED_STATUS;
oldSearch
.then((r) => {
@@ -91,8 +91,8 @@ export function search(term, siteSettings) {
}
const limit = 5;
- var categories = Category.search(term, { limit });
- var numOfCategories = categories.length;
+ let categories = Category.search(term, { limit });
+ let numOfCategories = categories.length;
categories = categories.map((category) => {
return { model: category, text: Category.slugFor(category, SEPARATOR, 2) };
diff --git a/app/assets/javascripts/discourse/app/lib/mobile.js b/app/assets/javascripts/discourse/app/lib/mobile.js
index e7c1543948..a35cfcee6d 100644
--- a/app/assets/javascripts/discourse/app/lib/mobile.js
+++ b/app/assets/javascripts/discourse/app/lib/mobile.js
@@ -27,7 +27,7 @@ const Mobile = {
localStorage.removeItem("mobileView");
}
if (localStorage.mobileView) {
- var savedValue = localStorage.mobileView === "true";
+ let savedValue = localStorage.mobileView === "true";
if (savedValue !== this.mobileView) {
this.reloadPage(savedValue);
}
diff --git a/app/assets/javascripts/discourse/app/lib/page-visible.js b/app/assets/javascripts/discourse/app/lib/page-visible.js
index 7733a9d747..0771a2f3c0 100644
--- a/app/assets/javascripts/discourse/app/lib/page-visible.js
+++ b/app/assets/javascripts/discourse/app/lib/page-visible.js
@@ -1,5 +1,5 @@
// for android we test webkit
-var hiddenProperty =
+let hiddenProperty =
document.hidden !== undefined
? "hidden"
: document.webkitHidden !== undefined
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index b536e80dbb..636c8207a7 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -737,10 +737,10 @@ class PluginApi {
* example:
*
* api.addUserMenuGlyph({
- * label: 'awesome.label',
+ * title: 'awesome.label',
* className: 'my-class',
* icon: 'my-icon',
- * href: `/some/path`
+ * data: { url: `/some/path` },
* });
*
*/
@@ -1227,11 +1227,11 @@ let _pluginv01;
// from http://stackoverflow.com/questions/6832596/how-to-compare-software-version-number-using-js-only-number
function cmpVersions(a, b) {
- var i, diff;
- var regExStrip0 = /(\.0+)+$/;
- var segmentsA = a.replace(regExStrip0, "").split(".");
- var segmentsB = b.replace(regExStrip0, "").split(".");
- var l = Math.min(segmentsA.length, segmentsB.length);
+ let i, diff;
+ let regExStrip0 = /(\.0+)+$/;
+ let segmentsA = a.replace(regExStrip0, "").split(".");
+ let segmentsB = b.replace(regExStrip0, "").split(".");
+ let l = Math.min(segmentsA.length, segmentsB.length);
for (i = 0; i < l; i++) {
diff = parseInt(segmentsA[i], 10) - parseInt(segmentsB[i], 10);
diff --git a/app/assets/javascripts/discourse/app/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
index 99c8b335e1..1bea1a5f07 100644
--- a/app/assets/javascripts/discourse/app/lib/safari-hacks.js
+++ b/app/assets/javascripts/discourse/app/lib/safari-hacks.js
@@ -93,7 +93,7 @@ function positioningWorkaround($fixedElement) {
const fixedElement = $fixedElement[0];
const oldHeight = fixedElement.style.height;
- var originalScrollTop = 0;
+ let originalScrollTop = 0;
let lastTouchedElement = null;
positioningWorkaround.blur = function (evt) {
@@ -114,7 +114,7 @@ function positioningWorkaround($fixedElement) {
}
};
- var blurredNow = function (evt) {
+ let blurredNow = function (evt) {
// we cannot use evt.relatedTarget to get the last focused element in safari iOS
// document.activeElement is also unreliable (iOS does not mark buttons as focused)
// so instead, we store the last touched element and check against it
@@ -145,11 +145,11 @@ function positioningWorkaround($fixedElement) {
positioningWorkaround.blur(evt);
};
- var blurred = function (evt) {
+ let blurred = function (evt) {
discourseDebounce(this, blurredNow, evt, INPUT_DELAY);
};
- var positioningHack = function (evt) {
+ let positioningHack = function (evt) {
let _this = this;
if (evt === undefined) {
@@ -203,7 +203,7 @@ function positioningWorkaround($fixedElement) {
}, delay);
};
- var lastTouched = function (evt) {
+ let lastTouched = function (evt) {
if (evt && evt.target) {
lastTouchedElement = evt.target;
}
@@ -231,7 +231,7 @@ function positioningWorkaround($fixedElement) {
};
positioningWorkaround.touchstartEvent = function (element) {
- var triggerHack = positioningHack.bind(element);
+ let triggerHack = positioningHack.bind(element);
triggerHack();
};
diff --git a/app/assets/javascripts/discourse/app/lib/text-direction.js b/app/assets/javascripts/discourse/app/lib/text-direction.js
index 013cbdaed4..b3da0964b6 100644
--- a/app/assets/javascripts/discourse/app/lib/text-direction.js
+++ b/app/assets/javascripts/discourse/app/lib/text-direction.js
@@ -29,3 +29,7 @@ export function siteDir() {
}
return _siteDir;
}
+
+export function isDocumentRTL() {
+ return siteDir() === "rtl";
+}
diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index c77c5c6cd7..980d92a417 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -6,7 +6,7 @@ import { emailValid } from "discourse/lib/utilities";
import { isTesting } from "discourse-common/config/environment";
import { userPath } from "discourse/lib/url";
-var cache = {},
+let cache = {},
cacheKey,
cacheTime,
currentTerm,
@@ -23,7 +23,7 @@ function performSearch(
groupMembersOf,
resultsFn
) {
- var cached = cache[term];
+ let cached = cache[term];
if (cached) {
resultsFn(cached);
return;
@@ -52,7 +52,7 @@ function performSearch(
},
});
- var returnVal = CANCELLED_STATUS;
+ let returnVal = CANCELLED_STATUS;
oldSearch
.then(function (r) {
@@ -81,7 +81,7 @@ function performSearch(
});
}
-var debouncedSearch = function (
+let debouncedSearch = function (
term,
topicId,
categoryId,
@@ -113,7 +113,7 @@ function organizeResults(r, options) {
return r;
}
- var exclude = options.exclude || [],
+ let exclude = options.exclude || [],
limit = options.limit || 5,
users = [],
emails = [],
@@ -182,7 +182,7 @@ export default function userSearch(options) {
options.term = options.term.substring(1);
}
- var term = options.term || "",
+ let term = options.term || "",
includeGroups = options.includeGroups,
includeMentionableGroups = options.includeMentionableGroups,
includeMessageableGroups = options.includeMessageableGroups,
diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js
index 6267aa8f21..f7b7bad13e 100644
--- a/app/assets/javascripts/discourse/app/lib/utilities.js
+++ b/app/assets/javascripts/discourse/app/lib/utilities.js
@@ -97,7 +97,7 @@ export function tinyAvatar(avatarTemplate, options) {
}
export function postUrl(slug, topicId, postNumber) {
- var url = getURL("/t/");
+ let url = getURL("/t/");
if (slug) {
url += slug + "/";
} else {
@@ -190,11 +190,11 @@ export function selectedElement() {
// Determine the row and col of the caret in an element
export function caretRowCol(el) {
- var cp = caretPosition(el);
- var rows = el.value.slice(0, cp).split("\n");
- var rowNum = rows.length;
+ let cp = caretPosition(el);
+ let rows = el.value.slice(0, cp).split("\n");
+ let rowNum = rows.length;
- var colNum =
+ let colNum =
cp -
rows.splice(0, rowNum - 1).reduce(function (sum, row) {
return sum + row.length + 1;
@@ -205,7 +205,7 @@ export function caretRowCol(el) {
// Determine the position of the caret in an element
export function caretPosition(el) {
- var r, rc, re;
+ let r, rc, re;
if (el.selectionStart) {
return el.selectionStart;
}
@@ -227,7 +227,7 @@ export function caretPosition(el) {
// Set the caret's position
export function setCaretPosition(ctrl, pos) {
- var range;
+ let range;
if (ctrl.setSelectionRange) {
ctrl.focus();
ctrl.setSelectionRange(pos, pos);
@@ -421,7 +421,7 @@ export function areCookiesEnabled() {
// see: https://github.com/Modernizr/Modernizr/blob/400db4043c22af98d46e1d2b9cbc5cb062791192/feature-detects/cookies.js
try {
document.cookie = "cookietest=1";
- var ret = document.cookie.indexOf("cookietest=") !== -1;
+ let ret = document.cookie.indexOf("cookietest=") !== -1;
document.cookie = "cookietest=1; expires=Thu, 01-Jan-1970 00:00:01 GMT";
return ret;
} catch (e) {
diff --git a/app/assets/javascripts/discourse/app/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js
index 3f332c6e42..39ab250c8f 100644
--- a/app/assets/javascripts/discourse/app/mapping-router.js
+++ b/app/assets/javascripts/discourse/app/mapping-router.js
@@ -113,7 +113,7 @@ export function mapRoutes() {
// can define admin routes.
Object.keys(requirejs._eak_seen).forEach(function (key) {
if (/route-map$/.test(key)) {
- var module = requirejs(key, null, null, true);
+ let module = requirejs(key, null, null, true);
if (!module || !module.default) {
throw new Error(key + " must export a route map.");
}
diff --git a/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js b/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
index d539a14063..2908384952 100644
--- a/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
+++ b/app/assets/javascripts/discourse/app/mixins/bulk-topic-selection.js
@@ -3,8 +3,11 @@ import { NotificationLevels } from "discourse/lib/notification-levels";
import Topic from "discourse/models/topic";
import { alias } from "@ember/object/computed";
import { on } from "discourse-common/utils/decorators";
+import { inject as service } from "@ember/service";
export default Mixin.create({
+ router: service(),
+
bulkSelectEnabled: false,
selected: null,
diff --git a/app/assets/javascripts/discourse/app/mixins/singleton.js b/app/assets/javascripts/discourse/app/mixins/singleton.js
index 6bed17037e..7aabd44c35 100644
--- a/app/assets/javascripts/discourse/app/mixins/singleton.js
+++ b/app/assets/javascripts/discourse/app/mixins/singleton.js
@@ -67,7 +67,7 @@ const Singleton = Mixin.create({
// Returns OR sets a property on the singleton instance.
currentProp(property, value) {
- var instance = this.current();
+ let instance = this.current();
if (!instance) {
return;
}
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 2340a7213d..b6b84f4634 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -312,7 +312,7 @@ const Category = RestModel.extend({
},
});
-var _uncategorized;
+let _uncategorized;
Category.reopenClass({
slugEncoded() {
@@ -508,7 +508,7 @@ Category.reopenClass({
},
search(term, opts) {
- var limit = 5;
+ let limit = 5;
if (opts) {
if (opts.limit === 0) {
@@ -529,8 +529,8 @@ Category.reopenClass({
const categories = Category.listByActivity();
const length = categories.length;
- var i;
- var data = [];
+ let i;
+ let data = [];
const done = () => {
return data.length === limit;
diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 6c1fe8213c..d369d05f36 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -177,7 +177,7 @@ NavItem.reopenClass({
return null;
}
- var args = { name: filterType, hasIcon: filterType === "unread" };
+ let args = { name: filterType, hasIcon: filterType === "unread" };
if (opts.category) {
args.category = opts.category;
}
diff --git a/app/assets/javascripts/discourse/app/models/post.js b/app/assets/javascripts/discourse/app/models/post.js
index 5a8acd7c96..4c3a671ddf 100644
--- a/app/assets/javascripts/discourse/app/models/post.js
+++ b/app/assets/javascripts/discourse/app/models/post.js
@@ -16,7 +16,6 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
import { postUrl } from "discourse/lib/utilities";
import { propertyEqual } from "discourse/lib/computed";
import { resolveShareUrl } from "discourse/helpers/share-url";
-import showModal from "discourse/lib/show-modal";
import { userPath } from "discourse/lib/url";
const Post = RestModel.extend({
@@ -304,58 +303,24 @@ const Post = RestModel.extend({
return ajax(`/posts/${this.id}/unhide`, { type: "PUT" });
},
- toggleBookmark() {
- let postEl = document.querySelector(`[data-post-id="${this.id}"]`);
- let localDateEl = null;
- if (postEl) {
- localDateEl = postEl.querySelector(".discourse-local-date");
- }
-
- return new Promise((resolve) => {
- let controller = showModal("bookmark", {
- model: {
- postId: this.id,
- id: this.bookmark_id,
- reminderAt: this.bookmark_reminder_at,
- autoDeletePreference: this.bookmark_auto_delete_preference,
- name: this.bookmark_name,
- postDetectedLocalDate: localDateEl ? localDateEl.dataset.date : null,
- postDetectedLocalTime: localDateEl ? localDateEl.dataset.time : null,
- postDetectedLocalTimezone: localDateEl
- ? localDateEl.dataset.timezone
- : null,
- },
- title: this.bookmark_id
- ? "post.bookmarks.edit"
- : "post.bookmarks.create",
- modalClass: "bookmark-with-reminder",
- });
- controller.setProperties({
- onCloseWithoutSaving: () => {
- resolve({ closedWithoutSaving: true });
- this.appEvents.trigger("post-stream:refresh", { id: this.id });
- },
- afterSave: (savedData) => {
- this.setProperties({
- "topic.bookmarked": true,
- bookmarked: true,
- bookmark_reminder_at: savedData.reminderAt,
- bookmark_reminder_type: savedData.reminderType,
- bookmark_auto_delete_preference: savedData.autoDeletePreference,
- bookmark_name: savedData.name,
- bookmark_id: savedData.id,
- });
- resolve({ closedWithoutSaving: false });
- this.appEvents.trigger("page:bookmark-post-toggled", this);
- this.appEvents.trigger("post-stream:refresh", { id: this.id });
- },
- afterDelete: (topicBookmarked) => {
- this.set("topic.bookmarked", topicBookmarked);
- this.clearBookmark();
- this.appEvents.trigger("page:bookmark-post-toggled", this);
- },
- });
+ createBookmark(data) {
+ this.setProperties({
+ "topic.bookmarked": true,
+ bookmarked: true,
+ bookmark_reminder_at: data.reminderAt,
+ bookmark_reminder_type: data.reminderType,
+ bookmark_auto_delete_preference: data.autoDeletePreference,
+ bookmark_name: data.name,
+ bookmark_id: data.id,
});
+ this.appEvents.trigger("page:bookmark-post-toggled", this);
+ this.appEvents.trigger("post-stream:refresh", { id: this.id });
+ },
+
+ deleteBookmark(bookmarked) {
+ this.set("topic.bookmarked", bookmarked);
+ this.clearBookmark();
+ this.appEvents.trigger("page:bookmark-post-toggled", this);
},
clearBookmark() {
diff --git a/app/assets/javascripts/discourse/app/models/store.js b/app/assets/javascripts/discourse/app/models/store.js
index aa477b0ee1..d1783c08ef 100644
--- a/app/assets/javascripts/discourse/app/models/store.js
+++ b/app/assets/javascripts/discourse/app/models/store.js
@@ -114,9 +114,9 @@ export default EmberObject.extend({
},
find(type, findArgs, opts) {
- var adapter = this.adapterFor(type);
+ let adapter = this.adapterFor(type);
return adapter.find(this, type, findArgs, opts).then((result) => {
- var hydrated = this._hydrateFindResults(result, type, findArgs, opts);
+ let hydrated = this._hydrateFindResults(result, type, findArgs, opts);
if (result.extras) {
hydrated.set("extras", result.extras);
@@ -139,7 +139,7 @@ export default EmberObject.extend({
hydrated.set(
"content",
hydrated.get("content").map((item) => {
- var staleItem = stale.content.findBy(primaryKey, item.get(primaryKey));
+ let staleItem = stale.content.findBy(primaryKey, item.get(primaryKey));
if (staleItem) {
staleItem.setProperties(item);
} else {
diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index d2ceed6a3a..71a2bb709b 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -291,7 +291,7 @@ const TopicTrackingState = EmberObject.extend({
if (split.length >= 4) {
filter = split[split.length - 1];
// c/cat/subcat/6/l/latest
- var category = Category.findSingleBySlug(
+ let category = Category.findSingleBySlug(
split.splice(1, split.length - 4).join("/")
);
this.set("filterCategory", category);
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index 8796bc4261..6de4b88f73 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -11,7 +11,6 @@ import Session from "discourse/models/session";
import Site from "discourse/models/site";
import User from "discourse/models/user";
import { ajax } from "discourse/lib/ajax";
-import bootbox from "bootbox";
import { deepMerge } from "discourse-common/lib/object";
import discourseComputed from "discourse-common/utils/decorators";
import { emojiUnescape } from "discourse/lib/text";
@@ -404,73 +403,8 @@ const Topic = RestModel.extend({
}
},
- toggleBookmark() {
- if (this.bookmarking) {
- return Promise.resolve();
- }
- this.set("bookmarking", true);
- const bookmark = !this.bookmarked;
- let posts = this.postStream.posts;
-
- return this.firstPost().then((firstPost) => {
- const toggleBookmarkOnServer = () => {
- if (bookmark) {
- return firstPost.toggleBookmark().then((opts) => {
- this.set("bookmarking", false);
- if (opts.closedWithoutSaving) {
- return;
- }
- return this.afterTopicBookmarked(firstPost);
- });
- } else {
- return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" })
- .then(() => {
- this.toggleProperty("bookmarked");
- this.set("bookmark_reminder_at", null);
- let clearedBookmarkProps = {
- bookmarked: false,
- bookmark_id: null,
- bookmark_name: null,
- bookmark_reminder_at: null,
- };
- if (posts) {
- const updated = [];
- posts.forEach((post) => {
- if (post.bookmarked) {
- post.setProperties(clearedBookmarkProps);
- updated.push(post.id);
- }
- });
- firstPost.setProperties(clearedBookmarkProps);
- return updated;
- }
- })
- .catch(popupAjaxError)
- .finally(() => this.set("bookmarking", false));
- }
- };
-
- const unbookmarkedPosts = [];
- if (!bookmark && posts) {
- posts.forEach(
- (post) => post.bookmarked && unbookmarkedPosts.push(post)
- );
- }
-
- return new Promise((resolve) => {
- if (unbookmarkedPosts.length > 1) {
- bootbox.confirm(
- I18n.t("bookmarks.confirm_clear"),
- I18n.t("no_value"),
- I18n.t("yes_value"),
- (confirmed) =>
- confirmed ? toggleBookmarkOnServer().then(resolve) : resolve()
- );
- } else {
- toggleBookmarkOnServer().then(resolve);
- }
- });
- });
+ deleteBookmark() {
+ return ajax(`/t/${this.id}/remove_bookmarks`, { type: "PUT" });
},
createGroupInvite(group) {
diff --git a/app/assets/javascripts/discourse/app/models/user-badge.js b/app/assets/javascripts/discourse/app/models/user-badge.js
index 304059d65d..0aaff3f561 100644
--- a/app/assets/javascripts/discourse/app/models/user-badge.js
+++ b/app/assets/javascripts/discourse/app/models/user-badge.js
@@ -27,7 +27,7 @@ UserBadge.reopenClass({
if (json.users === undefined) {
json.users = [];
}
- var users = {};
+ let users = {};
json.users.forEach(function (userJson) {
users[userJson.id] = User.create(userJson);
});
@@ -36,7 +36,7 @@ UserBadge.reopenClass({
if (json.topics === undefined) {
json.topics = [];
}
- var topics = {};
+ let topics = {};
json.topics.forEach(function (topicJson) {
topics[topicJson.id] = Topic.create(topicJson);
});
@@ -45,13 +45,13 @@ UserBadge.reopenClass({
if (json.badges === undefined) {
json.badges = [];
}
- var badges = {};
+ let badges = {};
Badge.createFromJson(json).forEach(function (badge) {
badges[badge.get("id")] = badge;
});
// Create UserBadge object(s).
- var userBadges = [];
+ let userBadges = [];
if ("user_badge" in json) {
userBadges = [json.user_badge];
} else {
@@ -61,9 +61,9 @@ UserBadge.reopenClass({
}
userBadges = userBadges.map(function (userBadgeJson) {
- var userBadge = UserBadge.create(userBadgeJson);
+ let userBadge = UserBadge.create(userBadgeJson);
- var grantedAtDate = Date.parse(userBadge.get("granted_at"));
+ let grantedAtDate = Date.parse(userBadge.get("granted_at"));
userBadge.set("grantedAt", grantedAtDate);
userBadge.set("badge", badges[userBadge.get("badge_id")]);
@@ -102,7 +102,7 @@ UserBadge.reopenClass({
if (!username) {
return Promise.resolve([]);
}
- var url = "/user-badges/" + username + ".json";
+ let url = "/user-badges/" + username + ".json";
if (options && options.grouped) {
url += "?grouped=true";
}
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 7a0b562b43..61f34556f6 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -342,7 +342,7 @@ const User = RestModel.extend({
data[s] = this.get(`user_option.${s}`);
});
- var updatedState = {};
+ let updatedState = {};
["muted", "regular", "watched", "tracked", "watched_first_post"].forEach(
(s) => {
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
index 8c4b69dd0f..d064dd3b32 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/map-routes.js
@@ -1,5 +1,5 @@
import Application from "@ember/application";
-import Ember from "ember";
+import { isLegacyEmber } from "discourse-common/config/environment";
import { registerRouter } from "discourse/mapping-router";
let originalBuildInstance;
@@ -12,8 +12,7 @@ export default {
let router = registerRouter(app);
container.registry.register("router:main", router);
- // TODO: Remove this once we've upgraded Ember everywhere
- if (Ember.VERSION.startsWith("3.12")) {
+ if (isLegacyEmber()) {
// HACK to fix: https://github.com/emberjs/ember.js/issues/10310
originalBuildInstance =
originalBuildInstance || Application.prototype.buildInstance;
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
index 27b511eb53..d3f6dbe3c6 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
@@ -3,8 +3,8 @@ export default {
initialize: function () {
$('script[type="text/x-handlebars"]').each(function () {
- var $this = $(this);
- var name = $this.attr("name") || $this.data("template-name");
+ let $this = $(this);
+ let name = $this.attr("name") || $this.data("template-name");
if (window.console) {
window.console.log(
diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index 8672db77c1..5b77d14f82 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -157,7 +157,7 @@ export default (filterArg, params) => {
canCreateTopic: canCreateTopic,
});
- var topicOpts = {
+ let topicOpts = {
model: topics,
category,
period:
diff --git a/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js b/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js
index 07f8c7243d..64b18a9518 100644
--- a/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js
+++ b/app/assets/javascripts/discourse/app/routes/edit-category-tabs.js
@@ -13,6 +13,7 @@ export default DiscourseRoute.extend({
controller.setProperties({
parentParams,
selectedTab: transition.to.params.tab,
+ showTooltip: false,
});
},
});
diff --git a/app/assets/javascripts/discourse/app/routes/full-page-search.js b/app/assets/javascripts/discourse/app/routes/full-page-search.js
index f628bb7998..3c4fe84715 100644
--- a/app/assets/javascripts/discourse/app/routes/full-page-search.js
+++ b/app/assets/javascripts/discourse/app/routes/full-page-search.js
@@ -30,7 +30,7 @@ export default DiscourseRoute.extend({
model(params) {
const cached = getTransient("lastSearch");
- var args = { q: params.q };
+ let args = { q: params.q };
if (params.context_id && !args.skip_context) {
args.search_context = {
type: params.context,
diff --git a/app/assets/javascripts/discourse/app/routes/signup.js b/app/assets/javascripts/discourse/app/routes/signup.js
index f46e3c544e..89a6a04c7a 100644
--- a/app/assets/javascripts/discourse/app/routes/signup.js
+++ b/app/assets/javascripts/discourse/app/routes/signup.js
@@ -5,7 +5,7 @@ const SignupRoute = buildStaticRoute("signup");
SignupRoute.reopen({
beforeModel() {
- var canSignUp = this.controllerFor("application").get("canSignUp");
+ let canSignUp = this.controllerFor("application").get("canSignUp");
if (!this.siteSettings.login_required) {
this.replaceWith("discovery.latest").then((e) => {
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
index a311180f53..454aa33103 100644
--- a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
@@ -5,7 +5,9 @@
class="btn-primary resend"}}
{{/unless}}
-{{d-button action=editActivationEmail
- label="login.change_email"
- icon="pencil-alt"
- class="edit-email"}}
+{{#if canEditEmail}}
+ {{d-button action=editActivationEmail
+ label="login.change_email"
+ icon="pencil-alt"
+ class="edit-email"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-local-date.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark-local-date.hbs
new file mode 100644
index 0000000000..a30363826d
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark-local-date.hbs
@@ -0,0 +1,6 @@
+{{#if showPostLocalDate}}
+ {{#tap-tile icon="globe-americas" tileId=tileId activeTile=activeTile onChange=(action "setReminder")}}
+ {{i18n "bookmarks.reminders.post_local_date"}}
+ {{postLocalDateFormatted}}
+ {{/tap-tile}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
index 9243d15028..b62e4a8fb5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
@@ -1,3 +1,2 @@
{{categories-only categories=categories
- latestTopicOnly=latestTopicOnly
showTopics="true"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
index b676b34e12..dc314151b3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
@@ -8,7 +8,7 @@
{{#if title}}
-
{{title}}
+{{title}}
{{#if subtitle}}{{subtitle}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs index 353f1be130..60f5047be7 100644 --- a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs @@ -71,7 +71,7 @@
{{i18n "category.foreground_color"}}:
-
{{#each category.featuredTopics as |t|}}
- {{featured-topic topic=t latestTopicOnly=latestTopicOnly}}
+ {{featured-topic topic=t}}
{{/each}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
index c717b704d2..03b0a9a4d8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
@@ -7,6 +7,7 @@
+
#{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
{{color-picker colors=foregroundColors value=category.text_color id="edit-text-color"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
index 937d05c1d5..c6a04a2d69 100644
--- a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
@@ -2,11 +2,4 @@
{{html-safe topic.fancyTitle}}
{{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
-{{#if latestTopicOnly}}
-
-{{else}}
- {{format-age topic.last_posted_at}}
-{{/if}}
+{{format-age topic.last_posted_at}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
index 73e122024d..44f88763ec 100644
--- a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
@@ -6,4 +6,4 @@
{{/each}}
{{i18n "user.ignored_users_instructions"}}
-{{#d-button action=(action "newIgnoredUser") class="btn-default" icon="plus"}}{{i18n "user.user_notifications.add_ignored_user"}}{{/d-button}}
+{{d-button action=(action "newIgnoredUser") class="btn-default" icon="plus" label="user.user_notifications.add_ignored_user"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
index 58e4b1a693..dbf5cc2922 100644
--- a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
@@ -32,7 +32,7 @@
{{#if showTopics}}
{{user-chooser
+ id="search-posted-by"
value=searchedTerms.username
onChange=(action "onChangeSearchTermForUsername")
options=(hash
@@ -20,6 +21,7 @@
{{search-advanced-category-chooser
+ id="search-in-category"
value=searchedTerms.category.id
onChange=(action "onChangeSearchTermForCategory")
}}
@@ -33,6 +35,7 @@
{{tag-chooser
+ id="search-with-tags"
tags=searchedTerms.tags
allowCreate=false
everyTag=true
@@ -57,66 +60,76 @@
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index fcbd8c506d..c836ab9e16 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -203,9 +203,9 @@
{{i18n "search.advanced.title"}}
{{else}}
-
+ {{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}
+ {{d-icon "wrench"}}
{{/if}}
{{plugin-outlet name="user-profile-controls"
tagName=""
diff --git a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
index 5aafe34de9..450b8bb40f 100644
--- a/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
+++ b/app/assets/javascripts/discourse/app/widgets/avatar-flair.js
@@ -29,7 +29,7 @@ createWidget("avatar-flair", {
},
buildAttributes(attrs) {
- var style = "";
+ let style = "";
if (!this.isIcon(attrs)) {
style +=
"background-image: url(" +
diff --git a/app/assets/javascripts/discourse/app/widgets/button.js b/app/assets/javascripts/discourse/app/widgets/button.js
index 413d01ba28..01df29e6cf 100644
--- a/app/assets/javascripts/discourse/app/widgets/button.js
+++ b/app/assets/javascripts/discourse/app/widgets/button.js
@@ -31,13 +31,28 @@ export const ButtonClass = {
buildAttributes() {
const attrs = this.attrs;
const attributes = {};
+ let title = attrs.translatedTitle;
- if (attrs.title) {
- const title = I18n.t(attrs.title, attrs.titleOptions);
+ if (!title && attrs.title) {
+ title = I18n.t(attrs.title, attrs.titleOptions);
+ }
+
+ if (title) {
attributes["aria-label"] = title;
attributes.title = title;
}
+ if (attrs.role) {
+ attributes["role"] = attrs.role;
+ }
+
+ if (attrs.tabAttrs) {
+ const tab = attrs.tabAttrs;
+ attributes["aria-selected"] = tab["aria-selected"];
+ attributes["tabindex"] = tab["tabindex"];
+ attributes["aria-controls"] = tab["aria-controls"];
+ }
+
if (attrs.disabled) {
attributes.disabled = "true";
}
@@ -51,22 +66,40 @@ export const ButtonClass = {
return attributes;
},
+ _buildIcon(attrs) {
+ const icon = iconNode(attrs.icon, { class: attrs.iconClass });
+ if (attrs["aria-label"]) {
+ icon.properties.attributes["role"] = "img";
+ icon.properties.attributes["aria-hidden"] = false;
+ }
+ return icon;
+ },
+
html(attrs) {
const contents = [];
const left = !attrs.iconRight;
if (attrs.icon && left) {
- contents.push(iconNode(attrs.icon, { class: attrs.iconClass }));
+ contents.push(this._buildIcon(attrs));
}
if (attrs.label) {
contents.push(
h("span.d-button-label", I18n.t(attrs.label, attrs.labelOptions))
);
}
+ if (attrs.translatedLabel) {
+ contents.push(
+ h(
+ "span.d-button-label",
+ attrs.translatedLabel.toString(),
+ attrs.translatedLabelOptions
+ )
+ );
+ }
if (attrs.contents) {
contents.push(attrs.contents);
}
if (attrs.icon && !left) {
- contents.push(iconNode(attrs.icon, { class: attrs.iconClass }));
+ contents.push(this._buildIcon(attrs));
}
return contents;
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index f8747fa552..e581b7d752 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -146,8 +146,10 @@ createWidget(
"a.icon",
{
attributes: {
- href: attrs.user.get("path"),
- title: attrs.user.get("name"),
+ "aria-haspopup": true,
+ "aria-expanded": attrs.active,
+ href: attrs.user.path,
+ title: attrs.user.name || attrs.user.username,
"data-auto-route": true,
},
},
@@ -177,6 +179,8 @@ createWidget(
"a.icon.btn-flat",
{
attributes: {
+ "aria-expanded": attrs.active,
+ "aria-haspopup": true,
href: attrs.href,
"data-auto-route": true,
title,
@@ -441,7 +445,7 @@ export default createWidget("header", {
if (this.site.mobileView) {
const searchService = this.register.lookup("search-service:main");
const context = searchService.get("searchContext");
- var params = "";
+ let params = "";
if (context) {
params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.state.skipSearchContext}`;
diff --git a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
index 818da0e0c3..8d4e4c8673 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-edits-indicator.js
@@ -1,7 +1,5 @@
import I18n from "I18n";
import { createWidget } from "discourse/widgets/widget";
-import { h } from "virtual-dom";
-import { iconNode } from "discourse-common/lib/icon-library";
import { longDate } from "discourse/lib/formatter";
function mult(val) {
@@ -53,24 +51,16 @@ export default createWidget("post-edits-indicator", {
title = `${I18n.t("post.last_edited_on")} ${date}`;
}
- const contents = [
- attrs.version > 1 ? attrs.version - 1 : "",
- " ",
- iconNode(icon),
- ];
-
- return h(
- "a",
- {
- className,
- attributes: { title, href: "#" },
- },
- contents
- );
+ return this.attach("flat-button", {
+ icon,
+ translatedTitle: title,
+ className,
+ action: "onPostEditsIndicatorClick",
+ translatedLabel: attrs.version > 1 ? attrs.version - 1 : "",
+ });
},
- click(e) {
- e.preventDefault();
+ onPostEditsIndicatorClick() {
if (this.attrs.wiki && this.attrs.version === 1) {
this.sendWidgetAction("editPost");
} else if (this.attrs.canViewEditHistory) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index 700ffef23a..be5066e3d8 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -12,7 +12,7 @@ export function actionDescriptionHtml(actionCode, createdAt, username) {
const dt = new Date(createdAt);
const when = autoUpdatingRelativeAge(dt, { format: "medium-with-ago" });
- var who = "";
+ let who = "";
if (username) {
if (actionCode === "invited_group" || actionCode === "removed_group") {
who = `@${username}`;
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index e90befbc42..5c7dad44c2 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -660,8 +660,10 @@ createWidget("post-article", {
.find("post-reply-history", { postId: this.attrs.id })
.then((posts) => {
this.state.repliesAbove = posts.map((p) => {
- p.shareUrl = `${topicUrl}/${p.post_number}`;
- return transformWithCallbacks(p);
+ let result = transformWithCallbacks(p);
+ result.shareUrl = `${topicUrl}/${p.post_number}`;
+ result.asPost = this.store.createRecord("post", p);
+ return result;
});
});
}
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
index 23145723b5..8c6f0996f2 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-panel.js
@@ -40,6 +40,15 @@ export default createWidget("quick-access-panel", {
return Promise.resolve([]);
},
+ buildAttributes() {
+ const attributes = this.attrs;
+ attributes["aria-labelledby"] = this.key;
+ attributes["tabindex"] = "0";
+ attributes["role"] = "tabpanel";
+
+ return attributes;
+ },
+
newItemsLoaded() {},
itemHtml(item) {}, // eslint-disable-line no-unused-vars
diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js
index e532b38a21..7c89f3da0c 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js
@@ -23,51 +23,82 @@ export function addUserMenuGlyph(glyph) {
createWidget("user-menu-links", {
tagName: "div.menu-links-header",
+ _tabAttrs(quickAccessType) {
+ return {
+ "aria-controls": `quick-access-${quickAccessType}`,
+ "aria-selected": "false",
+ tabindex: "-1",
+ };
+ },
+
+ // TODO: Remove when 2.7 gets released.
+ _structureAsTab(extraGlyph) {
+ const glyph = extraGlyph;
+ // Assume glyph is a button if it has a data-url field.
+ if (!glyph.data || !glyph.data.url) {
+ glyph.title = glyph.label;
+ glyph.data = { url: glyph.href };
+
+ glyph.label = null;
+ glyph.href = null;
+ }
+
+ glyph.role = "tab";
+ glyph.tabAttrs = this._tabAttrs(glyph.actionParam);
+
+ return glyph;
+ },
+
profileGlyph() {
return {
- label: "user.preferences",
+ title: "user.preferences",
className: "user-preferences-link",
icon: "user",
- href: `${this.attrs.path}/summary`,
action: UserMenuAction.QUICK_ACCESS,
actionParam: QuickAccess.PROFILE,
- "aria-label": "user.preferences",
+ data: { url: `${this.attrs.path}/summary` },
+ role: "tab",
+ tabAttrs: this._tabAttrs(QuickAccess.PROFILE),
};
},
notificationsGlyph() {
return {
- label: "user.notifications",
+ title: "user.notifications",
className: "user-notifications-link",
icon: "bell",
- href: `${this.attrs.path}/notifications`,
action: UserMenuAction.QUICK_ACCESS,
actionParam: QuickAccess.NOTIFICATIONS,
- "aria-label": "user.notifications",
+ data: { url: `${this.attrs.path}/notifications` },
+ role: "tab",
+ tabAttrs: this._tabAttrs(QuickAccess.NOTIFICATIONS),
};
},
bookmarksGlyph() {
return {
+ title: "user.bookmarks",
action: UserMenuAction.QUICK_ACCESS,
actionParam: QuickAccess.BOOKMARKS,
- label: "user.bookmarks",
className: "user-bookmarks-link",
icon: "bookmark",
- href: `${this.attrs.path}/activity/bookmarks`,
+ data: { url: `${this.attrs.path}/activity/bookmarks` },
"aria-label": "user.bookmarks",
+ role: "tab",
+ tabAttrs: this._tabAttrs(QuickAccess.BOOKMARKS),
};
},
messagesGlyph() {
return {
+ title: "user.private_messages",
action: UserMenuAction.QUICK_ACCESS,
actionParam: QuickAccess.MESSAGES,
- label: "user.private_messages",
className: "user-pms-link",
icon: "envelope",
- href: `${this.attrs.path}/messages`,
- "aria-label": "user.private_messages",
+ data: { url: `${this.attrs.path}/messages` },
+ role: "tab",
+ tabAttrs: this._tabAttrs(QuickAccess.MESSAGES),
};
},
@@ -82,7 +113,7 @@ createWidget("user-menu-links", {
if (this.isActive(glyph)) {
glyph = this.markAsActive(glyph);
}
- return this.attach("link", $.extend(glyph, { hideLabel: true }));
+ return this.attach("flat-button", glyph);
},
html() {
@@ -94,7 +125,8 @@ createWidget("user-menu-links", {
g = g(this);
}
if (g) {
- glyphs.push(g);
+ const structuredGlyph = this._structureAsTab(g);
+ glyphs.push(structuredGlyph);
}
});
}
@@ -108,9 +140,10 @@ createWidget("user-menu-links", {
glyphs.push(this.profileGlyph());
- return h("ul.menu-links-row", [
+ return h("div.menu-links-row", [
h(
- "li.glyphs",
+ "div.glyphs",
+ { attributes: { "aria-label": "Menu links", role: "tablist" } },
glyphs.map((l) => this.glyphHtml(l))
),
]);
@@ -121,6 +154,7 @@ createWidget("user-menu-links", {
// the full page.
definition.action = null;
definition.actionParam = null;
+ definition.url = definition.data.url;
if (definition.className) {
definition.className += " active";
@@ -128,6 +162,9 @@ createWidget("user-menu-links", {
definition.className = "active";
}
+ definition.tabAttrs["tabindex"] = "0";
+ definition.tabAttrs["aria-selected"] = "true";
+
return definition;
},
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
index 3df14fd12e..7393d1dbb5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
@@ -27,7 +27,7 @@ acceptance("Category Edit", function (needs) {
await fillIn("input.category-name", "testing");
assert.equal(queryAll(".badge-category").text(), "testing");
- await fillIn("#edit-text-color", "#ff0000");
+ await fillIn(".edit-text-color input", "#ff0000");
await click(".edit-category-topic-template");
await fillIn(".d-editor-input", "this is the new topic template");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 1cec7ceb8c..1514688695 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -790,7 +790,7 @@ acceptance("Composer", function (needs) {
await click(
queryAll(
".button-wrapper[data-image-index='0'] .scale-btn[data-scale='50']"
- )
+ )[0]
);
assertImageResized(assert, uploads);
@@ -800,7 +800,7 @@ acceptance("Composer", function (needs) {
await click(
queryAll(
".button-wrapper[data-image-index='3'] .scale-btn[data-scale='50']"
- )
+ )[0]
);
assertImageResized(assert, uploads);
@@ -810,7 +810,7 @@ acceptance("Composer", function (needs) {
await click(
queryAll(
".button-wrapper[data-image-index='4'] .scale-btn[data-scale='75']"
- )
+ )[0]
);
assertImageResized(assert, uploads);
@@ -819,7 +819,7 @@ acceptance("Composer", function (needs) {
await click(
queryAll(
".button-wrapper[data-image-index='5'] .scale-btn[data-scale='50']"
- )
+ )[0]
);
assertImageResized(assert, uploads);
@@ -828,7 +828,7 @@ acceptance("Composer", function (needs) {
await click(
queryAll(
".button-wrapper[data-image-index='6'] .scale-btn[data-scale='75']"
- )
+ )[0]
);
assertImageResized(assert, uploads);
@@ -837,7 +837,7 @@ acceptance("Composer", function (needs) {
await click(
queryAll(
".button-wrapper[data-image-index='8'] .scale-btn[data-scale='75']"
- )
+ )[0]
);
assertImageResized(assert, uploads);
@@ -846,7 +846,7 @@ acceptance("Composer", function (needs) {
await click(
queryAll(
".button-wrapper[data-image-index='9'] .scale-btn[data-scale='75']"
- )
+ )[0]
);
assertImageResized(assert, uploads);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
index 9bbefe9313..c85cb272c5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
@@ -64,7 +64,7 @@ acceptance("Create Account - User Fields", function (needs) {
await click(".modal-footer .btn-primary");
assert.equal(queryAll("#modal-alert")[0].style.display, "");
- await fillIn(".user-field input[type=text]:first", "Barky");
+ await fillIn(".user-field input[type=text]:nth-of-type(1)", "Barky");
await click(".user-field input[type=checkbox]");
await click(".modal-footer .btn-primary");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js b/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
index b573383066..ac67b052df 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
@@ -127,6 +127,13 @@ acceptance("Dashboard", function (needs) {
"its set the value of the filter from the query params"
);
});
+
+ test("new features", async function (assert) {
+ await visit("/admin");
+
+ assert.ok(exists(".dashboard-new-features"));
+ assert.ok(exists(".dashboard-new-features .new-features-release-notes"));
+ });
});
acceptance("Dashboard: dashboard_visible_tabs", function (needs) {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js b/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js
index eaf9ca4896..86ce29be17 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/enforce-second-factor-test.js
@@ -3,9 +3,20 @@ import {
queryAll,
updateCurrentUser,
} from "discourse/tests/helpers/qunit-helpers";
-import { click, visit } from "@ember/test-helpers";
+import { click, settled, visit } from "@ember/test-helpers";
import { test } from "qunit";
+async function catchAbortedTransition() {
+ try {
+ await visit("/u/eviltrout/summary");
+ } catch (e) {
+ if (e.message !== "TransitionAborted") {
+ throw e;
+ }
+ }
+ await settled();
+}
+
acceptance("Enforce Second Factor", function (needs) {
needs.user();
needs.pretender((server, helper) => {
@@ -21,7 +32,7 @@ acceptance("Enforce Second Factor", function (needs) {
await visit("/u/eviltrout/preferences/second-factor");
this.siteSettings.enforce_second_factor = "staff";
- await visit("/u/eviltrout/summary");
+ await catchAbortedTransition();
assert.equal(
queryAll(".control-label").text(),
@@ -45,7 +56,7 @@ acceptance("Enforce Second Factor", function (needs) {
await visit("/u/eviltrout/preferences/second-factor");
this.siteSettings.enforce_second_factor = "all";
- await visit("/u/eviltrout/summary");
+ await catchAbortedTransition();
assert.equal(
queryAll(".control-label").text(),
@@ -70,7 +81,7 @@ acceptance("Enforce Second Factor", function (needs) {
this.siteSettings.enforce_second_factor = "all";
this.siteSettings.allow_anonymous_posting = true;
- await visit("/u/eviltrout/summary");
+ await catchAbortedTransition();
assert.notEqual(
queryAll(".control-label").text(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
index 2e92868be1..5164cd920d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
@@ -261,6 +261,18 @@ acceptance("Group - Authenticated", function (needs) {
"Awesome Team",
"it should display the group name"
);
+
+ await click(".group-details-button button.btn-danger");
+
+ assert.equal(
+ queryAll(".bootbox .modal-body").html(),
+ I18n.t("admin.groups.delete_with_messages_confirm", {
+ count: 2,
+ }),
+ "it should warn about orphan messages"
+ );
+
+ await click(".modal-footer .btn-default");
});
test("Moderator Viewing Group", async function (assert) {
@@ -280,7 +292,7 @@ acceptance("Group - Authenticated", function (needs) {
await click(".group-add-members-modal .modal-close");
- const memberDropdown = selectKit(".group-member-dropdown:first");
+ const memberDropdown = selectKit(".group-member-dropdown:nth-of-type(1)");
await memberDropdown.expand();
assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
index 618315426e..d073b44942 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
@@ -6,22 +6,23 @@ import {
import { click, visit } from "@ember/test-helpers";
import { test } from "qunit";
-acceptance("Opening the hamburger menu with some reviewables", function (
- needs
-) {
- needs.user();
- needs.pretender((server, helper) => {
- server.get("/review/count.json", () => helper.response({ count: 3 }));
- });
- test("As a staff member", async function (assert) {
- updateCurrentUser({ moderator: true, admin: false });
+acceptance(
+ "Opening the hamburger menu with some reviewables",
+ function (needs) {
+ needs.user();
+ needs.pretender((server, helper) => {
+ server.get("/review/count.json", () => helper.response({ count: 3 }));
+ });
+ test("As a staff member", async function (assert) {
+ updateCurrentUser({ moderator: true, admin: false });
- await visit("/");
- await click(".hamburger-dropdown");
+ await visit("/");
+ await click(".hamburger-dropdown");
- assert.equal(
- queryAll(".review .badge-notification.reviewables").text(),
- "3"
- );
- });
-});
+ assert.equal(
+ queryAll(".review .badge-notification.reviewables").text(),
+ "3"
+ );
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
index a03c92e3a4..814e727756 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
@@ -59,7 +59,7 @@ acceptance("Accept Invite - User Fields", function (needs) {
"submit is still disabled due to lack of user fields"
);
- await fillIn(".user-field input[type=text]:first", "Barky");
+ await fillIn(".user-field input[type=text]:nth-of-type(1)", "Barky");
assert.ok(
exists(".invites-show .btn-primary:disabled"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
index 4a517fae5b..42bacdd5f2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
@@ -1,4 +1,4 @@
-import { triggerKeyEvent, visit } from "@ember/test-helpers";
+import { getApplication, triggerKeyEvent, visit } from "@ember/test-helpers";
import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
@@ -9,7 +9,7 @@ import { withPluginApi } from "discourse/lib/plugin-api";
acceptance("Plugin Keyboard Shortcuts - Logged In", function (needs) {
needs.user();
needs.hooks.beforeEach(function () {
- KeyboardShortcutInitializer.initialize(this.container);
+ KeyboardShortcutInitializer.initialize(getApplication());
});
test("a plugin can add a keyboard shortcut", async function (assert) {
withPluginApi("0.8.38", (api) => {
@@ -32,7 +32,7 @@ acceptance("Plugin Keyboard Shortcuts - Logged In", function (needs) {
acceptance("Plugin Keyboard Shortcuts - Anonymous", function (needs) {
needs.hooks.beforeEach(function () {
- KeyboardShortcutInitializer.initialize(this.container);
+ KeyboardShortcutInitializer.initialize(getApplication());
});
test("a plugin can add a keyboard shortcut with an option", async function (assert) {
let spy = sinon.spy(KeyboardShortcuts, "_bindToPath");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
index e22cfa1000..c87974cf1a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
@@ -95,18 +95,18 @@ acceptance("User Preferences", function (needs) {
queryAll(".saved").remove();
};
- fillIn(".pref-name input[type=text]", "Jon Snow");
+ await fillIn(".pref-name input[type=text]", "Jon Snow");
await savePreferences();
- click(".preferences-nav .nav-profile a");
- fillIn("#edit-location", "Westeros");
+ await click(".preferences-nav .nav-profile a");
+ await fillIn("#edit-location", "Westeros");
await savePreferences();
- click(".preferences-nav .nav-emails a");
- click(".pref-activity-summary input[type=checkbox]");
+ await click(".preferences-nav .nav-emails a");
+ await click(".pref-activity-summary input[type=checkbox]");
await savePreferences();
- click(".preferences-nav .nav-notifications a");
+ await click(".preferences-nav .nav-notifications a");
await selectKit(
".control-group.notifications .combo-box.duration"
).expand();
@@ -115,8 +115,8 @@ acceptance("User Preferences", function (needs) {
).selectRowByValue(1440);
await savePreferences();
- click(".preferences-nav .nav-categories a");
- fillIn(".tracking-controls .category-selector", "faq");
+ await click(".preferences-nav .nav-categories a");
+ await fillIn(".tracking-controls .category-selector input", "faq");
await savePreferences();
assert.ok(
@@ -124,8 +124,8 @@ acceptance("User Preferences", function (needs) {
"tags tab isn't there when tags are disabled"
);
- click(".preferences-nav .nav-interface a");
- click(".control-group.other input[type=checkbox]:first");
+ await click(".preferences-nav .nav-interface a");
+ await click(".control-group.other input[type=checkbox]:nth-of-type(1)");
savePreferences();
assert.ok(
@@ -175,15 +175,19 @@ acceptance("User Preferences", function (needs) {
"it has the connected accounts section"
);
assert.ok(
- queryAll(".pref-associated-accounts table tr:first td:first")
+ queryAll(
+ ".pref-associated-accounts table tr:nth-of-type(1) td:nth-of-type(1)"
+ )
.html()
.indexOf("Facebook") > -1,
"it lists facebook"
);
- await click(".pref-associated-accounts table tr:first td:last button");
+ await click(
+ ".pref-associated-accounts table tr:nth-of-type(1) td:last-child button"
+ );
- queryAll(".pref-associated-accounts table tr:first td:last button")
+ queryAll(".pref-associated-accounts table tr:nth-of-type(1) td:last button")
.html()
.indexOf("Connect") > -1;
});
@@ -286,28 +290,29 @@ acceptance("Second Factor Backups", function (needs) {
});
});
-acceptance("Avatar selector when selectable avatars is enabled", function (
- needs
-) {
- needs.user();
- needs.settings({ selectable_avatars_enabled: true });
- needs.pretender((server, helper) => {
- server.get("/site/selectable-avatars.json", () =>
- helper.response([
- "https://www.discourse.org",
- "https://meta.discourse.org",
- ])
- );
- });
+acceptance(
+ "Avatar selector when selectable avatars is enabled",
+ function (needs) {
+ needs.user();
+ needs.settings({ selectable_avatars_enabled: true });
+ needs.pretender((server, helper) => {
+ server.get("/site/selectable-avatars.json", () =>
+ helper.response([
+ "https://www.discourse.org",
+ "https://meta.discourse.org",
+ ])
+ );
+ });
- test("selectable avatars", async function (assert) {
- await visit("/u/eviltrout/preferences");
- await click(".pref-avatar .btn");
- assert.ok(
- exists(".selectable-avatars", "opens the avatar selection modal")
- );
- });
-});
+ test("selectable avatars", async function (assert) {
+ await visit("/u/eviltrout/preferences");
+ await click(".pref-avatar .btn");
+ assert.ok(
+ exists(".selectable-avatars", "opens the avatar selection modal")
+ );
+ });
+ }
+);
acceptance("User Preferences when badges are disabled", function (needs) {
needs.user();
@@ -329,7 +334,7 @@ acceptance("User Preferences when badges are disabled", function (needs) {
await visit("/u/eviltrout/preferences");
assert.equal(
- queryAll(".auth-tokens > .auth-token:first .auth-token-device")
+ queryAll(".auth-tokens > .auth-token:nth-of-type(1) .auth-token-device")
.text()
.trim(),
"Linux Computer",
@@ -337,7 +342,7 @@ acceptance("User Preferences when badges are disabled", function (needs) {
);
assert.equal(
- queryAll(".pref-auth-tokens > a:first").text().trim(),
+ queryAll(".pref-auth-tokens > a:nth-of-type(1)").text().trim(),
I18n.t("user.auth_tokens.show_all", { count: 3 }),
"it should display two tokens"
);
@@ -346,14 +351,14 @@ acceptance("User Preferences when badges are disabled", function (needs) {
"it should display two tokens"
);
- await click(".pref-auth-tokens > a:first");
+ await click(".pref-auth-tokens > a:nth-of-type(1)");
assert.ok(
queryAll(".pref-auth-tokens .auth-token").length === 3,
"it should display three tokens"
);
- await click(".auth-token-dropdown:first button");
+ await click(".auth-token-dropdown button:nth-of-type(1)");
await click("li[data-value='notYou']");
assert.ok(queryAll(".d-modal:visible").length === 1, "modal should appear");
@@ -392,7 +397,9 @@ acceptance(
"clear button not present"
);
- const selectTopicBtn = queryAll(".feature-topic-on-profile-btn:first");
+ const selectTopicBtn = queryAll(
+ ".feature-topic-on-profile-btn:nth-of-type(1)"
+ )[0];
assert.ok(exists(selectTopicBtn), "feature topic button is present");
await click(selectTopicBtn);
@@ -402,7 +409,9 @@ acceptance(
"topic picker modal is open"
);
- const topicRadioBtn = queryAll('input[name="choose_topic_id"]:first');
+ const topicRadioBtn = queryAll(
+ 'input[name="choose_topic_id"]:nth-of-type(1)'
+ )[0];
assert.ok(exists(topicRadioBtn), "Topic options are prefilled");
await click(topicRadioBtn);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js b/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
index 13a2f52e1e..24d8055fb7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
@@ -3,7 +3,7 @@ import {
addRawTemplate,
removeRawTemplate,
} from "discourse-common/lib/raw-templates";
-import compile from "handlebars-compiler";
+import { compile } from "handlebars";
import { test } from "qunit";
import { visit } from "@ember/test-helpers";
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
index de8eaab54d..48f0d1f9ed 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
@@ -160,7 +160,9 @@ acceptance("Search - Full Page", function (needs) {
'"autocomplete" popup has an entry for "admin"'
);
- await click(".search-advanced-options .autocomplete ul li a:first");
+ await click(
+ ".search-advanced-options .autocomplete ul li a:nth-of-type(1)"
+ );
assert.ok(
exists('.search-advanced-options span:contains("admin")'),
@@ -308,7 +310,7 @@ acceptance("Search - Full Page", function (needs) {
test("update status through advanced search ui", async function (assert) {
const statusSelector = selectKit(
- ".search-advanced-options .select-kit#status"
+ ".search-advanced-options .select-kit#search-status-options"
);
await visit("/search");
@@ -331,7 +333,7 @@ acceptance("Search - Full Page", function (needs) {
test("doesn't update status filter header if wrong value entered through searchbox", async function (assert) {
const statusSelector = selectKit(
- ".search-advanced-options .select-kit#status"
+ ".search-advanced-options .select-kit#search-status-options"
);
await visit("/search");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js b/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
index 62df079754..9b6136663a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
@@ -154,10 +154,6 @@ acceptance("Signing In", function () {
"the username validation is bad"
);
await click(".modal-footer .btn-primary");
- assert.ok(
- exists("#new-account-username:focus"),
- "username field is focused"
- );
await fillIn("#new-account-username", "goodtuna");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js b/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
index c3ab9d85d8..6d8de06da1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
@@ -46,7 +46,7 @@ acceptance("Tag Groups", function (needs) {
await click(".tag-group-content .btn.btn-default");
- await click(".tag-chooser .choice:first");
+ await click(".tag-chooser .choice:nth-of-type(1)");
assert.ok(!queryAll(".tag-group-content .btn.btn-danger")[0].disabled);
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
index a3d339afec..8d0670b0c8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
@@ -1,6 +1,7 @@
import {
acceptance,
exists,
+ invisible,
queryAll,
updateCurrentUser,
} from "discourse/tests/helpers/qunit-helpers";
@@ -10,6 +11,74 @@ import { test } from "qunit";
acceptance("Tags", function (needs) {
needs.user();
+ needs.pretender((server, helper) => {
+ server.get("/tag/test/notifications", () =>
+ helper.response({
+ tag_notification: { id: "test", notification_level: 2 },
+ })
+ );
+
+ server.get("/tag/test/l/unread.json", () =>
+ helper.response({
+ users: [
+ {
+ id: 42,
+ username: "foo",
+ name: "Foo",
+ avatar_template: "/user_avatar/localhost/foo/{size}/10265_2.png",
+ },
+ ],
+ primary_groups: [],
+ topic_list: {
+ can_create_topic: true,
+ draft: null,
+ draft_key: "new_topic",
+ per_page: 30,
+ top_tags: [],
+ tags: [{ id: 42, name: "test", topic_count: 1, staff: false }],
+ topics: [
+ {
+ id: 42,
+ title: "Hello world",
+ fancy_title: "Hello world",
+ slug: "hello-world",
+ posts_count: 1,
+ reply_count: 1,
+ highest_post_number: 1,
+ created_at: "2020-01-01T00:00:00.000Z",
+ last_posted_at: "2020-01-01T00:00:00.000Z",
+ bumped: true,
+ bumped_at: "2020-01-01T00:00:00.000Z",
+ archetype: "regular",
+ unseen: false,
+ last_read_post_number: 1,
+ unread: 0,
+ new_posts: 1,
+ pinned: false,
+ unpinned: null,
+ visible: true,
+ closed: true,
+ archived: false,
+ notification_level: 3,
+ bookmarked: false,
+ liked: true,
+ tags: ["test"],
+ views: 42,
+ like_count: 42,
+ has_summary: false,
+ last_poster_username: "foo",
+ pinned_globally: false,
+ featured_link: null,
+ posters: [],
+ },
+ ],
+ },
+ })
+ );
+
+ server.put("/topics/bulk", () => helper.response({}));
+ });
+
test("list the tags", async function (assert) {
await visit("/tags");
@@ -19,6 +88,13 @@ acceptance("Tags", function (needs) {
"shows the eviltrout tag"
);
});
+
+ test("dismiss notifications", async function (assert) {
+ await visit("/tag/test/l/unread");
+ await click("button.dismiss-read");
+ await click(".dismiss-read-modal button.btn-primary");
+ assert.ok(invisible(".dismiss-read-modal"));
+ });
});
acceptance("Tags listed by group", function (needs) {
@@ -102,7 +178,7 @@ acceptance("Tags listed by group", function (needs) {
"shown in given order and with tags that are not in a group"
);
assert.deepEqual(
- $(".tag-list:first .discourse-tag")
+ $(".tag-list:nth-of-type(1) .discourse-tag")
.toArray()
.map((i) => {
return $(i).text();
@@ -111,7 +187,7 @@ acceptance("Tags listed by group", function (needs) {
"shows the tags in default sort (by count)"
);
assert.deepEqual(
- $(".tag-list:first .discourse-tag")
+ $(".tag-list:nth-of-type(1) .discourse-tag")
.toArray()
.map((i) => {
return $(i).attr("href");
@@ -302,7 +378,7 @@ acceptance("Tag info", function (needs) {
"delete UI is visible"
);
- await click(".unlink-synonym:first");
+ await click(".unlink-synonym:nth-of-type(1)");
assert.ok(
queryAll(".tag-info .synonyms-list .tag-box").length === 1,
"removed a synonym"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
index 627da72912..f71e25020d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
@@ -22,7 +22,7 @@ acceptance("Topic Discovery", function (needs) {
assert.ok(exists(".topic-list .topic-list-item"), "has topics");
assert.equal(
- queryAll("a[data-user-card=eviltrout]:first img.avatar").attr("title"),
+ queryAll("a[data-user-card=eviltrout] img.avatar").attr("title"),
"Evil Trout - Most Posts",
"it shows user's full name in avatar title"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
index 351d39e573..29b8d6d8c2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -1,17 +1,22 @@
import {
acceptance,
- exists,
queryAll,
visible,
} from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
+import {
+ click,
+ fillIn,
+ settled,
+ triggerKeyEvent,
+ visit,
+} from "@ember/test-helpers";
import I18n from "I18n";
import selectKit from "discourse/tests/helpers/select-kit-helper";
import { test } from "qunit";
import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
import { withPluginApi } from "discourse/lib/plugin-api";
-function selectText(selector) {
+async function selectText(selector) {
const range = document.createRange();
const node = document.querySelector(selector);
range.selectNodeContents(node);
@@ -19,6 +24,7 @@ function selectText(selector) {
const selection = window.getSelection();
selection.removeAllRanges();
selection.addRange(range);
+ await settled();
}
acceptance("Topic", function (needs) {
@@ -140,7 +146,7 @@ acceptance("Topic", function (needs) {
await click(".topic-post:nth-of-type(1) button.show-post-admin-menu");
await click(".btn.wiki");
- assert.ok(queryAll("a.wiki").length === 1, "it shows the wiki icon");
+ assert.ok(queryAll("button.wiki").length === 1, "it shows the wiki icon");
});
test("Visit topic routes", async function (assert) {
@@ -302,7 +308,7 @@ acceptance("Topic featured links", function (needs) {
await click(".toggle-admin-menu");
await click(".topic-admin-pin .btn");
- await click(".btn-primary:last");
+ await click(".make-banner");
await click(".toggle-admin-menu");
await click(".topic-admin-visible .btn");
@@ -362,7 +368,7 @@ acceptance("Topic featured links", function (needs) {
test("Quoting a quote keeps the original poster name", async function (assert) {
await visit("/t/internationalization-localization/280");
- selectText("#post_5 blockquote");
+ await selectText("#post_5 blockquote");
await click(".quote-button .insert-quote");
assert.ok(
@@ -374,7 +380,7 @@ acceptance("Topic featured links", function (needs) {
test("Quoting a quote of a different topic keeps the original topic title", async function (assert) {
await visit("/t/internationalization-localization/280");
- selectText("#post_9 blockquote");
+ await selectText("#post_9 blockquote");
await click(".quote-button .insert-quote");
assert.ok(
@@ -388,7 +394,7 @@ acceptance("Topic featured links", function (needs) {
test("Quoting a quote with the Reply button keeps the original poster name", async function (assert) {
await visit("/t/internationalization-localization/280");
- selectText("#post_5 blockquote");
+ await selectText("#post_5 blockquote");
await click(".reply");
assert.ok(
@@ -400,7 +406,7 @@ acceptance("Topic featured links", function (needs) {
test("Quoting a quote with replyAsNewTopic keeps the original poster name", async function (assert) {
await visit("/t/internationalization-localization/280");
- selectText("#post_5 blockquote");
+ await selectText("#post_5 blockquote");
await triggerKeyEvent(document, "keypress", "j".charCodeAt(0));
await triggerKeyEvent(document, "keypress", "t".charCodeAt(0));
@@ -413,7 +419,7 @@ acceptance("Topic featured links", function (needs) {
test("Quoting by selecting text can mark the quote as full", async function (assert) {
await visit("/t/internationalization-localization/280");
- selectText("#post_5 .cooked");
+ await selectText("#post_5 .cooked");
await click(".quote-button .insert-quote");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
index 3dff64d71d..2e9281f368 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
@@ -17,7 +17,7 @@ acceptance("User Card - Show Local Time", function (needs) {
User.current().changeTimezone("Australia/Brisbane");
await visit("/t/internationalization-localization/280");
- await click('a[data-user-card="charlie"]:first');
+ await click('a[data-user-card="charlie"]');
assert.not(
exists(".user-card .local-time"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
index 2c747253a6..ae7603bf4d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
@@ -15,7 +15,13 @@ acceptance("User Routes", function (needs) {
);
});
test("Invalid usernames", async function (assert) {
- await visit("/u/eviltrout%2F..%2F..%2F/summary");
+ try {
+ await visit("/u/eviltrout%2F..%2F..%2F/summary");
+ } catch (e) {
+ if (e.message !== "TransitionAborted") {
+ throw e;
+ }
+ }
assert.equal(currentRouteName(), "exception-unknown");
});
diff --git a/app/assets/javascripts/discourse/tests/fixtures/dashboard-new-features.js b/app/assets/javascripts/discourse/tests/fixtures/dashboard-new-features.js
new file mode 100644
index 0000000000..fe9d50b791
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/fixtures/dashboard-new-features.js
@@ -0,0 +1,32 @@
+export default {
+ "/admin/dashboard/new-features.json": {
+ new_features: [
+ {
+ id: 1,
+ user_id: 127,
+ emoji: "😎",
+ title: "New color palettes",
+ description:
+ "New light and dark color palettes that adhere to Web Content Accessibility Guidelines. ",
+ tier: [],
+ link: "https://meta.discourse.org",
+ created_at: "2021-01-18T19:59:29.666Z",
+ updated_at: "2021-01-19T19:33:16.150Z",
+ },
+ {
+ id: 7,
+ user_id: 127,
+ emoji: "👱♀️",
+ title: "Suspend users quickly",
+ description:
+ "Staff can now suspend or silence a user immediately, without needing to visit the review queue or admin page. ",
+ tier: [],
+ link: "",
+ created_at: "2021-01-19T19:20:09.757Z",
+ updated_at: "2021-01-19T19:20:09.757Z",
+ }
+ ],
+ release_notes_link:
+ "https://meta.discourse.org/c/feature/announcements?tags=release-notes\u0026before=0",
+ },
+};
diff --git a/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
index f1a7867be6..615fe75086 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js
@@ -46,7 +46,9 @@ export default {
is_group_owner: true,
mentionable: true,
messageable: true,
- can_see_members: true
+ can_see_members: true,
+ has_messages: true,
+ message_count: 2
},
extras: {
visible_group_names: ["discourse"]
diff --git a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
index b75d641d33..80997d6f07 100644
--- a/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/create-pretender.js
@@ -144,6 +144,15 @@ export function applyDefaultHandlers(pretender) {
return response({ email: "eviltrout@example.com" });
});
+ pretender.get("/u/is_local_username", () =>
+ response({
+ valid: [],
+ valid_groups: [],
+ mentionable_groups: [],
+ cannot_see: [],
+ })
+ );
+
pretender.get("/u/eviltrout.json", () => {
const json = fixturesByUrl["/u/eviltrout.json"];
json.user.can_edit = loggedIn();
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 7072dbea9a..948abcd31c 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -378,6 +378,10 @@ export function queryAll() {
return window.find(...arguments);
}
+export function query() {
+ return document.querySelector(...arguments);
+}
+
export function invisible(selector) {
const $items = queryAll(selector + ":visible");
return (
diff --git a/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js b/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js
new file mode 100644
index 0000000000..b97c72aecd
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js
@@ -0,0 +1,26 @@
+import componentTest, {
+ setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import {
+ discourseModule,
+ queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
+
+discourseModule(
+ "Integration | Component | activation-controls",
+ function (hooks) {
+ setupRenderingTest(hooks);
+
+ componentTest("hides change email button", {
+ template: `{{activation-controls}}`,
+ beforeEach() {
+ this.siteSettings.enable_local_logins = false;
+ this.siteSettings.email_editable = false;
+ },
+
+ test(assert) {
+ assert.equal(queryAll("button.edit-email").length, 0);
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
index 2503f89da9..c6408ba2aa 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
@@ -97,33 +97,33 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
});
}
- testCase(`selecting the space before a word`, async function (
- assert,
- textarea
- ) {
- textarea.selectionStart = 5;
- textarea.selectionEnd = 7;
+ testCase(
+ `selecting the space before a word`,
+ async function (assert, textarea) {
+ textarea.selectionStart = 5;
+ textarea.selectionEnd = 7;
- await click(`button.bold`);
+ await click(`button.bold`);
- assert.equal(this.value, `hello **w**orld.`);
- assert.equal(textarea.selectionStart, 8);
- assert.equal(textarea.selectionEnd, 9);
- });
+ assert.equal(this.value, `hello **w**orld.`);
+ assert.equal(textarea.selectionStart, 8);
+ assert.equal(textarea.selectionEnd, 9);
+ }
+ );
- testCase(`selecting the space after a word`, async function (
- assert,
- textarea
- ) {
- textarea.selectionStart = 0;
- textarea.selectionEnd = 6;
+ testCase(
+ `selecting the space after a word`,
+ async function (assert, textarea) {
+ textarea.selectionStart = 0;
+ textarea.selectionEnd = 6;
- await click(`button.bold`);
+ await click(`button.bold`);
- assert.equal(this.value, `**hello** world.`);
- assert.equal(textarea.selectionStart, 2);
- assert.equal(textarea.selectionEnd, 7);
- });
+ assert.equal(this.value, `**hello** world.`);
+ assert.equal(textarea.selectionStart, 2);
+ assert.equal(textarea.selectionEnd, 7);
+ }
+ );
testCase(`bold button with no selection`, async function (assert, textarea) {
await click(`button.bold`);
@@ -149,37 +149,37 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
assert.equal(textarea.selectionEnd, 11);
});
- testCase(`bold with a multiline selection`, async function (
- assert,
- textarea
- ) {
- this.set("value", "hello\n\nworld\n\ntest.");
+ testCase(
+ `bold with a multiline selection`,
+ async function (assert, textarea) {
+ this.set("value", "hello\n\nworld\n\ntest.");
- textarea.selectionStart = 0;
- textarea.selectionEnd = 12;
+ textarea.selectionStart = 0;
+ textarea.selectionEnd = 12;
- await click(`button.bold`);
- assert.equal(this.value, `**hello**\n\n**world**\n\ntest.`);
- assert.equal(textarea.selectionStart, 0);
- assert.equal(textarea.selectionEnd, 20);
+ await click(`button.bold`);
+ assert.equal(this.value, `**hello**\n\n**world**\n\ntest.`);
+ assert.equal(textarea.selectionStart, 0);
+ assert.equal(textarea.selectionEnd, 20);
- await click(`button.bold`);
- assert.equal(this.value, `hello\n\nworld\n\ntest.`);
- assert.equal(textarea.selectionStart, 0);
- assert.equal(textarea.selectionEnd, 12);
- });
+ await click(`button.bold`);
+ assert.equal(this.value, `hello\n\nworld\n\ntest.`);
+ assert.equal(textarea.selectionStart, 0);
+ assert.equal(textarea.selectionEnd, 12);
+ }
+ );
- testCase(`italic button with no selection`, async function (
- assert,
- textarea
- ) {
- await click(`button.italic`);
- const example = I18n.t(`composer.italic_text`);
- assert.equal(this.value, `hello world.*${example}*`);
+ testCase(
+ `italic button with no selection`,
+ async function (assert, textarea) {
+ await click(`button.italic`);
+ const example = I18n.t(`composer.italic_text`);
+ assert.equal(this.value, `hello world.*${example}*`);
- assert.equal(textarea.selectionStart, 13);
- assert.equal(textarea.selectionEnd, 13 + example.length);
- });
+ assert.equal(textarea.selectionStart, 13);
+ assert.equal(textarea.selectionEnd, 13 + example.length);
+ }
+ );
testCase(`italic button with a selection`, async function (assert, textarea) {
textarea.selectionStart = 6;
@@ -196,25 +196,25 @@ discourseModule("Integration | Component | d-editor", function (hooks) {
assert.equal(textarea.selectionEnd, 11);
});
- testCase(`italic with a multiline selection`, async function (
- assert,
- textarea
- ) {
- this.set("value", "hello\n\nworld\n\ntest.");
+ testCase(
+ `italic with a multiline selection`,
+ async function (assert, textarea) {
+ this.set("value", "hello\n\nworld\n\ntest.");
- textarea.selectionStart = 0;
- textarea.selectionEnd = 12;
+ textarea.selectionStart = 0;
+ textarea.selectionEnd = 12;
- await click(`button.italic`);
- assert.equal(this.value, `*hello*\n\n*world*\n\ntest.`);
- assert.equal(textarea.selectionStart, 0);
- assert.equal(textarea.selectionEnd, 16);
+ await click(`button.italic`);
+ assert.equal(this.value, `*hello*\n\n*world*\n\ntest.`);
+ assert.equal(textarea.selectionStart, 0);
+ assert.equal(textarea.selectionEnd, 16);
- await click(`button.italic`);
- assert.equal(this.value, `hello\n\nworld\n\ntest.`);
- assert.equal(textarea.selectionStart, 0);
- assert.equal(textarea.selectionEnd, 12);
- });
+ await click(`button.italic`);
+ assert.equal(this.value, `hello\n\nworld\n\ntest.`);
+ assert.equal(textarea.selectionStart, 0);
+ assert.equal(textarea.selectionEnd, 12);
+ }
+ );
componentTest("advanced code", {
template: "{{d-editor value=value}}",
@@ -508,20 +508,20 @@ third line`
assert.equal(this.value, "hello\n\nwor\n\nld.\n\n> Blockquote");
});
- testCase(`bullet button with no selection`, async function (
- assert,
- textarea
- ) {
- const example = I18n.t("composer.list_item");
+ testCase(
+ `bullet button with no selection`,
+ async function (assert, textarea) {
+ const example = I18n.t("composer.list_item");
- await click(`button.bullet`);
- assert.equal(this.value, `hello world.\n\n* ${example}`);
- assert.equal(textarea.selectionStart, 14);
- assert.equal(textarea.selectionEnd, 16 + example.length);
+ await click(`button.bullet`);
+ assert.equal(this.value, `hello world.\n\n* ${example}`);
+ assert.equal(textarea.selectionStart, 14);
+ assert.equal(textarea.selectionEnd, 16 + example.length);
- await click(`button.bullet`);
- assert.equal(this.value, `hello world.\n\n${example}`);
- });
+ await click(`button.bullet`);
+ assert.equal(this.value, `hello world.\n\n${example}`);
+ }
+ );
testCase(`bullet button with a selection`, async function (assert, textarea) {
textarea.selectionStart = 6;
@@ -538,25 +538,25 @@ third line`
assert.equal(textarea.selectionEnd, 12);
});
- testCase(`bullet button with a multiple line selection`, async function (
- assert,
- textarea
- ) {
- this.set("value", "* Hello\n\nWorld\n\nEvil");
+ testCase(
+ `bullet button with a multiple line selection`,
+ async function (assert, textarea) {
+ this.set("value", "* Hello\n\nWorld\n\nEvil");
- textarea.selectionStart = 0;
- textarea.selectionEnd = 20;
+ textarea.selectionStart = 0;
+ textarea.selectionEnd = 20;
- await click(`button.bullet`);
- assert.equal(this.value, "Hello\n\nWorld\n\nEvil");
- assert.equal(textarea.selectionStart, 0);
- assert.equal(textarea.selectionEnd, 18);
+ await click(`button.bullet`);
+ assert.equal(this.value, "Hello\n\nWorld\n\nEvil");
+ assert.equal(textarea.selectionStart, 0);
+ assert.equal(textarea.selectionEnd, 18);
- await click(`button.bullet`);
- assert.equal(this.value, "* Hello\n\n* World\n\n* Evil");
- assert.equal(textarea.selectionStart, 0);
- assert.equal(textarea.selectionEnd, 24);
- });
+ await click(`button.bullet`);
+ assert.equal(this.value, "* Hello\n\n* World\n\n* Evil");
+ assert.equal(textarea.selectionStart, 0);
+ assert.equal(textarea.selectionEnd, 24);
+ }
+ );
testCase(`list button with no selection`, async function (assert, textarea) {
const example = I18n.t("composer.list_item");
@@ -633,23 +633,23 @@ third line`
},
});
- testCase(`doesn't jump to bottom with long text`, async function (
- assert,
- textarea
- ) {
- let longText = "hello world.";
- for (let i = 0; i < 8; i++) {
- longText = longText + longText;
+ testCase(
+ `doesn't jump to bottom with long text`,
+ async function (assert, textarea) {
+ let longText = "hello world.";
+ for (let i = 0; i < 8; i++) {
+ longText = longText + longText;
+ }
+ this.set("value", longText);
+
+ $(textarea).scrollTop(0);
+ textarea.selectionStart = 3;
+ textarea.selectionEnd = 3;
+
+ await click("button.bold");
+ assert.equal($(textarea).scrollTop(), 0, "it stays scrolled up");
}
- this.set("value", longText);
-
- $(textarea).scrollTop(0);
- textarea.selectionStart = 3;
- textarea.selectionEnd = 3;
-
- await click("button.bold");
- assert.equal($(textarea).scrollTop(), 0, "it stays scrolled up");
- });
+ );
componentTest("emoji", {
template: "{{d-editor value=value}}",
diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
index eade3cffdf..f7b2ca1af9 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js
@@ -24,23 +24,24 @@ function toTimeInput() {
const DEFAULT_DATE_TIME = moment("2019-01-29 14:45");
-discourseModule("Integration | Component | date-time-input-range", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | date-time-input-range",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("default", {
- template: `{{date-time-input-range from=from to=to}}`,
+ componentTest("default", {
+ template: `{{date-time-input-range from=from to=to}}`,
- beforeEach() {
- this.setProperties({ from: DEFAULT_DATE_TIME, to: null });
- },
+ beforeEach() {
+ this.setProperties({ from: DEFAULT_DATE_TIME, to: null });
+ },
- test(assert) {
- assert.equal(fromDateInput().value, "January 29, 2019");
- assert.equal(fromTimeInput().dataset.name, "14:45");
- assert.equal(toDateInput().value, "");
- assert.equal(toTimeInput().dataset.name, "--:--");
- },
- });
-});
+ test(assert) {
+ assert.equal(fromDateInput().value, "January 29, 2019");
+ assert.equal(fromTimeInput().dataset.name, "14:45");
+ assert.equal(toDateInput().value, "");
+ assert.equal(toTimeInput().dataset.name, "--:--");
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js
index 684ef966d1..bc3bc78a74 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js
@@ -8,98 +8,99 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
import I18n from "I18n";
-discourseModule("Integration | Component | secret-value-list", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | secret-value-list",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("adding a value", {
- template: "{{secret-value-list values=values}}",
+ componentTest("adding a value", {
+ template: "{{secret-value-list values=values}}",
- async test(assert) {
- this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
+ async test(assert) {
+ this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
- await fillIn(".new-value-input.key", "thirdKey");
- await click(".add-value-btn");
+ await fillIn(".new-value-input.key", "thirdKey");
+ await click(".add-value-btn");
- assert.ok(
- queryAll(".values .value").length === 2,
- "it doesn't add the value to the list if secret is missing"
- );
+ assert.ok(
+ queryAll(".values .value").length === 2,
+ "it doesn't add the value to the list if secret is missing"
+ );
- await fillIn(".new-value-input.key", "");
- await fillIn(".new-value-input.secret", "thirdValue");
- await click(".add-value-btn");
+ await fillIn(".new-value-input.key", "");
+ await fillIn(".new-value-input.secret", "thirdValue");
+ await click(".add-value-btn");
- assert.ok(
- queryAll(".values .value").length === 2,
- "it doesn't add the value to the list if key is missing"
- );
+ assert.ok(
+ queryAll(".values .value").length === 2,
+ "it doesn't add the value to the list if key is missing"
+ );
- await fillIn(".new-value-input.key", "thirdKey");
- await fillIn(".new-value-input.secret", "thirdValue");
- await click(".add-value-btn");
+ await fillIn(".new-value-input.key", "thirdKey");
+ await fillIn(".new-value-input.secret", "thirdValue");
+ await click(".add-value-btn");
- assert.ok(
- queryAll(".values .value").length === 3,
- "it adds the value to the list of values"
- );
+ assert.ok(
+ queryAll(".values .value").length === 3,
+ "it adds the value to the list of values"
+ );
- assert.deepEqual(
- this.values,
- "firstKey|FirstValue\nsecondKey|secondValue\nthirdKey|thirdValue",
- "it adds the value to the list of values"
- );
- },
- });
+ assert.deepEqual(
+ this.values,
+ "firstKey|FirstValue\nsecondKey|secondValue\nthirdKey|thirdValue",
+ "it adds the value to the list of values"
+ );
+ },
+ });
- componentTest("adding an invalid value", {
- template: "{{secret-value-list values=values}}",
+ componentTest("adding an invalid value", {
+ template: "{{secret-value-list values=values}}",
- async test(assert) {
- await fillIn(".new-value-input.key", "someString");
- await fillIn(".new-value-input.secret", "keyWithAPipe|Hidden");
- await click(".add-value-btn");
+ async test(assert) {
+ await fillIn(".new-value-input.key", "someString");
+ await fillIn(".new-value-input.secret", "keyWithAPipe|Hidden");
+ await click(".add-value-btn");
- assert.ok(
- queryAll(".values .value").length === 0,
- "it doesn't add the value to the list of values"
- );
+ assert.ok(
+ queryAll(".values .value").length === 0,
+ "it doesn't add the value to the list of values"
+ );
- assert.deepEqual(
- this.values,
- undefined,
- "it doesn't add the value to the list of values"
- );
+ assert.deepEqual(
+ this.values,
+ undefined,
+ "it doesn't add the value to the list of values"
+ );
- assert.ok(
- queryAll(".validation-error")
- .html()
- .indexOf(I18n.t("admin.site_settings.secret_list.invalid_input")) >
- -1,
- "it shows validation error"
- );
- },
- });
+ assert.ok(
+ queryAll(".validation-error")
+ .html()
+ .indexOf(I18n.t("admin.site_settings.secret_list.invalid_input")) >
+ -1,
+ "it shows validation error"
+ );
+ },
+ });
- componentTest("removing a value", {
- template: "{{secret-value-list values=values}}",
+ componentTest("removing a value", {
+ template: "{{secret-value-list values=values}}",
- async test(assert) {
- this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
+ async test(assert) {
+ this.set("values", "firstKey|FirstValue\nsecondKey|secondValue");
- await click(".values .value[data-index='0'] .remove-value-btn");
+ await click(".values .value[data-index='0'] .remove-value-btn");
- assert.ok(
- queryAll(".values .value").length === 1,
- "it removes the value from the list of values"
- );
+ assert.ok(
+ queryAll(".values .value").length === 1,
+ "it removes the value from the list of values"
+ );
- assert.equal(
- this.values,
- "secondKey|secondValue",
- "it removes the expected value"
- );
- },
- });
-});
+ assert.equal(
+ this.values,
+ "secondKey|secondValue",
+ "it removes the expected value"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js
index 4cc1a4b013..b3611c3670 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js
@@ -47,313 +47,314 @@ function template(options = []) {
`;
}
-discourseModule("Integration | Component | select-kit/category-drop", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | select-kit/category-drop",
+ function (hooks) {
+ setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.set("subject", selectKit());
- });
+ hooks.beforeEach(function () {
+ this.set("subject", selectKit());
+ });
- componentTest("caretUpIcon", {
- template: `
+ componentTest("caretUpIcon", {
+ template: `
{{category-drop
category=value
categories=content
}}
`,
- async test(assert) {
- const $header = this.subject.header().el();
+ async test(assert) {
+ const $header = this.subject.header().el();
- assert.ok(
- exists($header.find(`.d-icon-caret-right`)),
- "it uses the correct default icon"
- );
- },
- });
+ assert.ok(
+ exists($header.find(`.d-icon-caret-right`)),
+ "it uses the correct default icon"
+ );
+ },
+ });
- componentTest("none", {
- template: `
+ componentTest("none", {
+ template: `
{{category-drop
category=value
categories=content
}}
`,
- async test(assert) {
- const text = this.subject.header().label();
- assert.equal(
- text,
- I18n.t("category.all").toLowerCase(),
- "it uses the noneLabel"
- );
- },
- });
+ async test(assert) {
+ const text = this.subject.header().label();
+ assert.equal(
+ text,
+ I18n.t("category.all").toLowerCase(),
+ "it uses the noneLabel"
+ );
+ },
+ });
- componentTest("[not staff - TL0] displayCategoryDescription", {
- template: template(),
+ componentTest("[not staff - TL0] displayCategoryDescription", {
+ template: template(),
- beforeEach() {
- set(this.currentUser, "staff", false);
- set(this.currentUser, "trust_level", 0);
+ beforeEach() {
+ set(this.currentUser, "staff", false);
+ set(this.currentUser, "trust_level", 0);
- initCategories(this);
- },
+ initCategories(this);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const row = this.subject.rowByValue(this.category.id);
- assert.ok(
- exists(row.el().find(".category-desc")),
- "it shows category description for newcomers"
- );
- },
- });
+ const row = this.subject.rowByValue(this.category.id);
+ assert.ok(
+ exists(row.el().find(".category-desc")),
+ "it shows category description for newcomers"
+ );
+ },
+ });
- componentTest("[not staff - TL1] displayCategoryDescription", {
- template: template(),
+ componentTest("[not staff - TL1] displayCategoryDescription", {
+ template: template(),
- beforeEach() {
- set(this.currentUser, "moderator", false);
- set(this.currentUser, "admin", false);
- set(this.currentUser, "trust_level", 1);
- initCategories(this);
- },
+ beforeEach() {
+ set(this.currentUser, "moderator", false);
+ set(this.currentUser, "admin", false);
+ set(this.currentUser, "trust_level", 1);
+ initCategories(this);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const row = this.subject.rowByValue(this.category.id);
- assert.ok(
- !exists(row.el().find(".category-desc")),
- "it doesn't shows category description for TL0+"
- );
- },
- });
+ const row = this.subject.rowByValue(this.category.id);
+ assert.ok(
+ !exists(row.el().find(".category-desc")),
+ "it doesn't shows category description for TL0+"
+ );
+ },
+ });
- componentTest("[staff - TL0] displayCategoryDescription", {
- template: template(),
+ componentTest("[staff - TL0] displayCategoryDescription", {
+ template: template(),
- beforeEach() {
- set(this.currentUser, "moderator", true);
- set(this.currentUser, "trust_level", 0);
+ beforeEach() {
+ set(this.currentUser, "moderator", true);
+ set(this.currentUser, "trust_level", 0);
- initCategories(this);
- },
+ initCategories(this);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const row = this.subject.rowByValue(this.category.id);
- assert.ok(
- !exists(row.el().find(".category-desc")),
- "it doesn't show category description for staff"
- );
- },
- });
+ const row = this.subject.rowByValue(this.category.id);
+ assert.ok(
+ !exists(row.el().find(".category-desc")),
+ "it doesn't show category description for staff"
+ );
+ },
+ });
- componentTest("hideParentCategory (default: false)", {
- template: template(),
+ componentTest("hideParentCategory (default: false)", {
+ template: template(),
- beforeEach() {
- initCategories(this);
- },
+ beforeEach() {
+ initCategories(this);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const row = this.subject.rowByValue(this.category.id);
- assert.equal(row.value(), this.category.id);
- assert.equal(this.category.parent_category_id, null);
- },
- });
+ const row = this.subject.rowByValue(this.category.id);
+ assert.equal(row.value(), this.category.id);
+ assert.equal(this.category.parent_category_id, null);
+ },
+ });
- componentTest("hideParentCategory (true)", {
- template: template(["hideParentCategory=true"]),
-
- beforeEach() {
- initCategoriesWithParentCategory(this);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- const parentRow = this.subject.rowByValue(this.parentCategory.id);
- assert.notOk(parentRow.exists(), "the parent row is not showing");
-
- const childCategory = this.categories.firstObject;
- const childCategoryId = childCategory.id;
- const childRow = this.subject.rowByValue(childCategoryId);
- assert.ok(childRow.exists(), "the child row is showing");
-
- const $categoryStatus = childRow.el().find(".category-status");
- assert.ok($categoryStatus.text().trim().match(/^spec/));
- },
- });
-
- componentTest("allow_uncategorized_topics (true)", {
- template: template(),
-
- beforeEach() {
- this.siteSettings.allow_uncategorized_topics = true;
- initCategories(this);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- const uncategorizedCategoryId = this.site.uncategorized_category_id;
- const row = this.subject.rowByValue(uncategorizedCategoryId);
- assert.ok(row.exists(), "the uncategorized row is showing");
- },
- });
-
- componentTest("allow_uncategorized_topics (false)", {
- template: template(),
-
- beforeEach() {
- this.siteSettings.allow_uncategorized_topics = false;
- initCategories(this);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- const uncategorizedCategoryId = this.site.uncategorized_category_id;
- const row = this.subject.rowByValue(uncategorizedCategoryId);
- assert.notOk(row.exists(), "the uncategorized row is not showing");
- },
- });
-
- componentTest("countSubcategories (default: false)", {
- template: template(),
-
- beforeEach() {
- initCategories(this);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- const category = Category.findById(7);
- const row = this.subject.rowByValue(category.id);
- const topicCount = row.el().find(".topic-count").text().trim();
-
- assert.equal(
- topicCount,
- "× 481",
- "it doesn't include the topic count of subcategories"
- );
- },
- });
-
- componentTest("countSubcategories (true)", {
- template: template(["countSubcategories=true"]),
-
- beforeEach() {
- initCategories(this);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- const category = Category.findById(7);
- const row = this.subject.rowByValue(category.id);
- const topicCount = row.el().find(".topic-count").text().trim();
-
- assert.equal(
- topicCount,
- "× 584",
- "it includes the topic count of subcategories"
- );
- },
- });
-
- componentTest("shortcuts:default", {
- template: template(),
-
- beforeEach() {
- initCategories(this);
- this.set("category", null);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- assert.equal(
- this.subject.rowByIndex(0).value(),
- this.categories.firstObject.id,
- "Shortcuts are not prepended when no category is selected"
- );
- },
- });
-
- componentTest("shortcuts:category is set", {
- template: template(),
-
- beforeEach() {
- initCategories(this);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- assert.equal(this.subject.rowByIndex(0).value(), ALL_CATEGORIES_ID);
- },
- });
-
- componentTest("shortcuts with parentCategory/subCategory=true:default", {
- template: template(["subCategory=true"]),
-
- beforeEach() {
- initCategoriesWithParentCategory(this);
- },
-
- async test(assert) {
- await this.subject.expand();
-
- assert.equal(this.subject.rowByIndex(0).value(), NO_CATEGORIES_ID);
- },
- });
-
- componentTest(
- "shortcuts with parentCategory/subCategory=true:category is selected",
- {
- template: template(["subCategory=true"]),
+ componentTest("hideParentCategory (true)", {
+ template: template(["hideParentCategory=true"]),
beforeEach() {
initCategoriesWithParentCategory(this);
- this.set("category", this.categories.firstObject);
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+
+ const parentRow = this.subject.rowByValue(this.parentCategory.id);
+ assert.notOk(parentRow.exists(), "the parent row is not showing");
+
+ const childCategory = this.categories.firstObject;
+ const childCategoryId = childCategory.id;
+ const childRow = this.subject.rowByValue(childCategoryId);
+ assert.ok(childRow.exists(), "the child row is showing");
+
+ const $categoryStatus = childRow.el().find(".category-status");
+ assert.ok($categoryStatus.text().trim().match(/^spec/));
+ },
+ });
+
+ componentTest("allow_uncategorized_topics (true)", {
+ template: template(),
+
+ beforeEach() {
+ this.siteSettings.allow_uncategorized_topics = true;
+ initCategories(this);
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+
+ const uncategorizedCategoryId = this.site.uncategorized_category_id;
+ const row = this.subject.rowByValue(uncategorizedCategoryId);
+ assert.ok(row.exists(), "the uncategorized row is showing");
+ },
+ });
+
+ componentTest("allow_uncategorized_topics (false)", {
+ template: template(),
+
+ beforeEach() {
+ this.siteSettings.allow_uncategorized_topics = false;
+ initCategories(this);
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+
+ const uncategorizedCategoryId = this.site.uncategorized_category_id;
+ const row = this.subject.rowByValue(uncategorizedCategoryId);
+ assert.notOk(row.exists(), "the uncategorized row is not showing");
+ },
+ });
+
+ componentTest("countSubcategories (default: false)", {
+ template: template(),
+
+ beforeEach() {
+ initCategories(this);
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+
+ const category = Category.findById(7);
+ const row = this.subject.rowByValue(category.id);
+ const topicCount = row.el().find(".topic-count").text().trim();
+
+ assert.equal(
+ topicCount,
+ "× 481",
+ "it doesn't include the topic count of subcategories"
+ );
+ },
+ });
+
+ componentTest("countSubcategories (true)", {
+ template: template(["countSubcategories=true"]),
+
+ beforeEach() {
+ initCategories(this);
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+
+ const category = Category.findById(7);
+ const row = this.subject.rowByValue(category.id);
+ const topicCount = row.el().find(".topic-count").text().trim();
+
+ assert.equal(
+ topicCount,
+ "× 584",
+ "it includes the topic count of subcategories"
+ );
+ },
+ });
+
+ componentTest("shortcuts:default", {
+ template: template(),
+
+ beforeEach() {
+ initCategories(this);
+ this.set("category", null);
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+
+ assert.equal(
+ this.subject.rowByIndex(0).value(),
+ this.categories.firstObject.id,
+ "Shortcuts are not prepended when no category is selected"
+ );
+ },
+ });
+
+ componentTest("shortcuts:category is set", {
+ template: template(),
+
+ beforeEach() {
+ initCategories(this);
},
async test(assert) {
await this.subject.expand();
assert.equal(this.subject.rowByIndex(0).value(), ALL_CATEGORIES_ID);
- assert.equal(this.subject.rowByIndex(1).value(), NO_CATEGORIES_ID);
},
- }
- );
+ });
- componentTest("category url", {
- template: template(),
+ componentTest("shortcuts with parentCategory/subCategory=true:default", {
+ template: template(["subCategory=true"]),
- beforeEach() {
- initCategoriesWithParentCategory(this);
- sinon.stub(DiscourseURL, "routeTo");
- },
+ beforeEach() {
+ initCategoriesWithParentCategory(this);
+ },
- async test(assert) {
- await this.subject.expand();
- await this.subject.selectRowByValue(26);
+ async test(assert) {
+ await this.subject.expand();
- assert.ok(
- DiscourseURL.routeTo.calledWith("/c/feature/spec/26"),
- "it builds a correct URL"
- );
- },
- });
-});
+ assert.equal(this.subject.rowByIndex(0).value(), NO_CATEGORIES_ID);
+ },
+ });
+
+ componentTest(
+ "shortcuts with parentCategory/subCategory=true:category is selected",
+ {
+ template: template(["subCategory=true"]),
+
+ beforeEach() {
+ initCategoriesWithParentCategory(this);
+ this.set("category", this.categories.firstObject);
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+
+ assert.equal(this.subject.rowByIndex(0).value(), ALL_CATEGORIES_ID);
+ assert.equal(this.subject.rowByIndex(1).value(), NO_CATEGORIES_ID);
+ },
+ }
+ );
+
+ componentTest("category url", {
+ template: template(),
+
+ beforeEach() {
+ initCategoriesWithParentCategory(this);
+ sinon.stub(DiscourseURL, "routeTo");
+ },
+
+ async test(assert) {
+ await this.subject.expand();
+ await this.subject.selectRowByValue(26);
+
+ assert.ok(
+ DiscourseURL.routeTo.calledWith("/c/feature/spec/26"),
+ "it builds a correct URL"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
index fbd9e4cc03..67176a1818 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js
@@ -24,17 +24,17 @@ const setDefaultState = (ctx, options) => {
ctx.setProperties(properties);
};
-discourseModule("Integration | Component | select-kit/combo-box", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | select-kit/combo-box",
+ function (hooks) {
+ setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.set("subject", selectKit());
- });
+ hooks.beforeEach(function () {
+ this.set("subject", selectKit());
+ });
- componentTest("options.clearable", {
- template: `
+ componentTest("options.clearable", {
+ template: `
{{combo-box
value=value
content=content
@@ -43,36 +43,36 @@ discourseModule("Integration | Component | select-kit/combo-box", function (
}}
`,
- beforeEach() {
- setDefaultState(this, {
- clearable: true,
- onChange: (value) => {
- this.set("value", value);
- },
- });
- },
+ beforeEach() {
+ setDefaultState(this, {
+ clearable: true,
+ onChange: (value) => {
+ this.set("value", value);
+ },
+ });
+ },
- async test(assert) {
- const $header = this.subject.header();
+ async test(assert) {
+ const $header = this.subject.header();
- assert.ok(
- exists($header.el().find(".btn-clear")),
- "it shows the clear button"
- );
- assert.equal($header.value(), DEFAULT_VALUE);
+ assert.ok(
+ exists($header.el().find(".btn-clear")),
+ "it shows the clear button"
+ );
+ assert.equal($header.value(), DEFAULT_VALUE);
- await click($header.el().find(".btn-clear"));
+ await click($header.el().find(".btn-clear"));
- assert.notOk(
- exists($header.el().find(".btn-clear")),
- "it hides the clear button"
- );
- assert.equal($header.value(), null);
- },
- });
+ assert.notOk(
+ exists($header.el().find(".btn-clear")),
+ "it hides the clear button"
+ );
+ assert.equal($header.value(), null);
+ },
+ });
- componentTest("options.{caretUpIcon,caretDownIcon}", {
- template: `
+ componentTest("options.{caretUpIcon,caretDownIcon}", {
+ template: `
{{combo-box
value=value
content=content
@@ -83,27 +83,28 @@ discourseModule("Integration | Component | select-kit/combo-box", function (
}}
`,
- beforeEach() {
- setDefaultState(this, {
- caretUpIcon: "pencil-alt",
- caretDownIcon: "trash-alt",
- });
- },
+ beforeEach() {
+ setDefaultState(this, {
+ caretUpIcon: "pencil-alt",
+ caretDownIcon: "trash-alt",
+ });
+ },
- async test(assert) {
- const $header = this.subject.header().el();
+ async test(assert) {
+ const $header = this.subject.header().el();
- assert.ok(
- exists($header.find(`.d-icon-${this.caretDownIcon}`)),
- "it uses the icon provided"
- );
+ assert.ok(
+ exists($header.find(`.d-icon-${this.caretDownIcon}`)),
+ "it uses the icon provided"
+ );
- await this.subject.expand();
+ await this.subject.expand();
- assert.ok(
- exists($header.find(`.d-icon-${this.caretUpIcon}`)),
- "it uses the icon provided"
- );
- },
- });
-});
+ assert.ok(
+ exists($header.find(`.d-icon-${this.caretUpIcon}`)),
+ "it uses the icon provided"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js
index d7dfbe6a3f..0999e83e38 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js
@@ -16,31 +16,32 @@ function template(options = []) {
`;
}
-discourseModule("Integration | Component | select-kit/list-setting", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | select-kit/list-setting",
+ function (hooks) {
+ setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.set("subject", selectKit());
- });
+ hooks.beforeEach(function () {
+ this.set("subject", selectKit());
+ });
- componentTest("default", {
- template: template(),
+ componentTest("default", {
+ template: template(),
- beforeEach() {
- this.set("value", ["bold", "italic"]);
- this.set("choices", ["bold", "italic", "underline"]);
- },
+ beforeEach() {
+ this.set("value", ["bold", "italic"]);
+ this.set("choices", ["bold", "italic", "underline"]);
+ },
- async test(assert) {
- assert.equal(this.subject.header().name(), "bold,italic");
- assert.equal(this.subject.header().value(), "bold,italic");
+ async test(assert) {
+ assert.equal(this.subject.header().name(), "bold,italic");
+ assert.equal(this.subject.header().value(), "bold,italic");
- await this.subject.expand();
+ await this.subject.expand();
- assert.equal(this.subject.rows().length, 1);
- assert.equal(this.subject.rowByIndex(0).value(), "underline");
- },
- });
-});
+ assert.equal(this.subject.rows().length, 1);
+ assert.equal(this.subject.rowByIndex(0).value(), "underline");
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js
index 503966d994..38c934338d 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js
@@ -33,42 +33,43 @@ const setDefaultState = (ctx, options) => {
ctx.setProperties(properties);
};
-discourseModule("Integration | Component | select-kit/multi-select", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | select-kit/multi-select",
+ function (hooks) {
+ setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.set("subject", selectKit());
- });
+ hooks.beforeEach(function () {
+ this.set("subject", selectKit());
+ });
- componentTest("content", {
- template: template(),
+ componentTest("content", {
+ template: template(),
- beforeEach() {
- setDefaultState(this);
- },
+ beforeEach() {
+ setDefaultState(this);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const content = this.subject.displayedContent();
- assert.equal(content.length, 3, "it shows rows");
- assert.equal(
- content[0].name,
- this.content.firstObject.name,
- "it has the correct name"
- );
- assert.equal(
- content[0].id,
- this.content.firstObject.id,
- "it has the correct value"
- );
- assert.equal(
- this.subject.header().value(),
- null,
- "it doesn't set a value from the content"
- );
- },
- });
-});
+ const content = this.subject.displayedContent();
+ assert.equal(content.length, 3, "it shows rows");
+ assert.equal(
+ content[0].name,
+ this.content.firstObject.name,
+ "it has the correct name"
+ );
+ assert.equal(
+ content[0].id,
+ this.content.firstObject.id,
+ "it has the correct value"
+ );
+ assert.equal(
+ this.subject.header().value(),
+ null,
+ "it doesn't set a value from the content"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
index ac9c4ee1b6..8deb9d73d6 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js
@@ -44,103 +44,106 @@ const setDefaultState = (ctx, options) => {
ctx.setProperties(properties);
};
-discourseModule("Integration | Component | select-kit/single-select", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | select-kit/single-select",
+ function (hooks) {
+ setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.set("subject", selectKit());
- });
+ hooks.beforeEach(function () {
+ this.set("subject", selectKit());
+ });
- componentTest("content", {
- template: "{{single-select content=content}}",
+ componentTest("content", {
+ template: "{{single-select content=content}}",
- beforeEach() {
- setDefaultState(this);
- },
+ beforeEach() {
+ setDefaultState(this);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const content = this.subject.displayedContent();
- assert.equal(content.length, 3, "it shows rows");
- assert.equal(
- content[0].name,
- this.content.firstObject.name,
- "it has the correct name"
- );
- assert.equal(
- content[0].id,
- this.content.firstObject.id,
- "it has the correct value"
- );
- assert.equal(
- this.subject.header().value(),
- null,
- "it doesn't set a value from the content"
- );
- },
- });
+ const content = this.subject.displayedContent();
+ assert.equal(content.length, 3, "it shows rows");
+ assert.equal(
+ content[0].name,
+ this.content.firstObject.name,
+ "it has the correct name"
+ );
+ assert.equal(
+ content[0].id,
+ this.content.firstObject.id,
+ "it has the correct value"
+ );
+ assert.equal(
+ this.subject.header().value(),
+ null,
+ "it doesn't set a value from the content"
+ );
+ },
+ });
- componentTest("value", {
- template: template(),
+ componentTest("value", {
+ template: template(),
- beforeEach() {
- setDefaultState(this);
- },
+ beforeEach() {
+ setDefaultState(this);
+ },
- test(assert) {
- assert.equal(
- this.subject.header().value(this.content),
- 1,
- "it selects the correct content to display"
- );
- },
- });
+ test(assert) {
+ assert.equal(
+ this.subject.header().value(this.content),
+ 1,
+ "it selects the correct content to display"
+ );
+ },
+ });
- componentTest("options.filterable", {
- template: template(["filterable=filterable"]),
+ componentTest("options.filterable", {
+ template: template(["filterable=filterable"]),
- beforeEach() {
- setDefaultState(this, { filterable: true });
- },
+ beforeEach() {
+ setDefaultState(this, { filterable: true });
+ },
- async test(assert) {
- await this.subject.expand();
- assert.ok(this.subject.filter().exists(), "it shows the filter");
+ async test(assert) {
+ await this.subject.expand();
+ assert.ok(this.subject.filter().exists(), "it shows the filter");
- const filter = this.subject.displayedContent()[1].name;
- await this.subject.fillInFilter(filter);
- assert.equal(
- this.subject.displayedContent()[0].name,
- filter,
- "it filters the list"
- );
- },
- });
+ const filter = this.subject.displayedContent()[1].name;
+ await this.subject.fillInFilter(filter);
+ assert.equal(
+ this.subject.displayedContent()[0].name,
+ filter,
+ "it filters the list"
+ );
+ },
+ });
- componentTest("options.limitMatches", {
- template: template(["limitMatches=limitMatches", "filterable=filterable"]),
+ componentTest("options.limitMatches", {
+ template: template([
+ "limitMatches=limitMatches",
+ "filterable=filterable",
+ ]),
- beforeEach() {
- setDefaultState(this, { limitMatches: 1, filterable: true });
- },
+ beforeEach() {
+ setDefaultState(this, { limitMatches: 1, filterable: true });
+ },
- async test(assert) {
- await this.subject.expand();
- await this.subject.fillInFilter("ba");
+ async test(assert) {
+ await this.subject.expand();
+ await this.subject.fillInFilter("ba");
- assert.equal(
- this.subject.displayedContent().length,
- 1,
- "it returns only 1 result"
- );
- },
- });
+ assert.equal(
+ this.subject.displayedContent().length,
+ 1,
+ "it returns only 1 result"
+ );
+ },
+ });
- componentTest("valueAttribute (deprecated)", {
- template: `
+ componentTest("valueAttribute (deprecated)", {
+ template: `
{{single-select
value=value
content=content
@@ -148,200 +151,201 @@ discourseModule("Integration | Component | select-kit/single-select", function (
}}
`,
- beforeEach() {
- this.set("value", "normal");
+ beforeEach() {
+ this.set("value", "normal");
- const content = [
- { name: "Smallest", value: "smallest" },
- { name: "Smaller", value: "smaller" },
- { name: "Normal", value: "normal" },
- { name: "Larger", value: "larger" },
- { name: "Largest", value: "largest" },
- ];
- this.set("content", content);
- },
+ const content = [
+ { name: "Smallest", value: "smallest" },
+ { name: "Smaller", value: "smaller" },
+ { name: "Normal", value: "normal" },
+ { name: "Larger", value: "larger" },
+ { name: "Largest", value: "largest" },
+ ];
+ this.set("content", content);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- assert.equal(this.subject.selectedRow().value(), this.value);
- },
- });
+ assert.equal(this.subject.selectedRow().value(), this.value);
+ },
+ });
- componentTest("none:string", {
- template: template(['none="test.none"']),
+ componentTest("none:string", {
+ template: template(['none="test.none"']),
- beforeEach() {
- I18n.translations[I18n.locale].js.test = { none: "(default)" };
- setDefaultState(this, { value: 1 });
- },
+ beforeEach() {
+ I18n.translations[I18n.locale].js.test = { none: "(default)" };
+ setDefaultState(this, { value: 1 });
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const noneRow = this.subject.rowByIndex(0);
- assert.equal(noneRow.value(), null);
- assert.equal(noneRow.name(), I18n.t("test.none"));
- },
- });
+ const noneRow = this.subject.rowByIndex(0);
+ assert.equal(noneRow.value(), null);
+ assert.equal(noneRow.name(), I18n.t("test.none"));
+ },
+ });
- componentTest("none:object", {
- template: template(["none=none"]),
+ componentTest("none:object", {
+ template: template(["none=none"]),
- beforeEach() {
- setDefaultState(this, { none: { value: null, name: "(default)" } });
- },
+ beforeEach() {
+ setDefaultState(this, { none: { value: null, name: "(default)" } });
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const noneRow = this.subject.rowByIndex(0);
- assert.equal(noneRow.value(), null);
- assert.equal(noneRow.name(), "(default)");
- },
- });
+ const noneRow = this.subject.rowByIndex(0);
+ assert.equal(noneRow.value(), null);
+ assert.equal(noneRow.name(), "(default)");
+ },
+ });
- componentTest("content is a basic array", {
- template: template(['none="test.none"']),
+ componentTest("content is a basic array", {
+ template: template(['none="test.none"']),
- beforeEach() {
- I18n.translations[I18n.locale].js.test = { none: "(default)" };
- setDefaultState(this, {
- nameProperty: null,
- valueProperty: null,
- value: "foo",
- content: ["foo", "bar", "baz"],
- });
- },
+ beforeEach() {
+ I18n.translations[I18n.locale].js.test = { none: "(default)" };
+ setDefaultState(this, {
+ nameProperty: null,
+ valueProperty: null,
+ value: "foo",
+ content: ["foo", "bar", "baz"],
+ });
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- const noneRow = this.subject.rowByIndex(0);
- assert.equal(noneRow.value(), I18n.t("test.none"));
- assert.equal(noneRow.name(), I18n.t("test.none"));
- assert.equal(this.value, "foo");
+ const noneRow = this.subject.rowByIndex(0);
+ assert.equal(noneRow.value(), I18n.t("test.none"));
+ assert.equal(noneRow.name(), I18n.t("test.none"));
+ assert.equal(this.value, "foo");
- await this.subject.selectRowByIndex(0);
+ await this.subject.selectRowByIndex(0);
- assert.equal(this.value, null);
- },
- });
+ assert.equal(this.value, null);
+ },
+ });
- componentTest("selected value can be 0", {
- template: template(),
+ componentTest("selected value can be 0", {
+ template: template(),
- beforeEach() {
- setDefaultState(this, {
- value: 1,
- content: [
- { id: 0, name: "foo" },
- { id: 1, name: "bar" },
- ],
- });
- },
+ beforeEach() {
+ setDefaultState(this, {
+ value: 1,
+ content: [
+ { id: 0, name: "foo" },
+ { id: 1, name: "bar" },
+ ],
+ });
+ },
- async test(assert) {
- assert.equal(this.subject.header().value(), 1);
+ async test(assert) {
+ assert.equal(this.subject.header().value(), 1);
- await this.subject.expand();
- await this.subject.selectRowByValue(0);
+ await this.subject.expand();
+ await this.subject.selectRowByValue(0);
- assert.equal(this.subject.header().value(), 0);
- },
- });
+ assert.equal(this.subject.header().value(), 0);
+ },
+ });
- componentTest("prevents propagating click event on header", {
- template:
- "{{#d-button icon='times' action=onClick}}{{single-select options=(hash preventsClickPropagation=true) value=value content=content}}{{/d-button}}",
+ componentTest("prevents propagating click event on header", {
+ template:
+ "{{#d-button icon='times' action=onClick}}{{single-select options=(hash preventsClickPropagation=true) value=value content=content}}{{/d-button}}",
- beforeEach() {
- this.setProperties({
- onClick: () => this.set("value", "foo"),
- content: DEFAULT_CONTENT,
- value: DEFAULT_VALUE,
- });
- },
+ beforeEach() {
+ this.setProperties({
+ onClick: () => this.set("value", "foo"),
+ content: DEFAULT_CONTENT,
+ value: DEFAULT_VALUE,
+ });
+ },
- async test(assert) {
- assert.equal(this.value, DEFAULT_VALUE);
- await this.subject.expand();
- assert.equal(this.value, DEFAULT_VALUE);
- },
- });
+ async test(assert) {
+ assert.equal(this.value, DEFAULT_VALUE);
+ await this.subject.expand();
+ assert.equal(this.value, DEFAULT_VALUE);
+ },
+ });
- componentTest("labelProperty", {
- template:
- '{{single-select labelProperty="foo" value=value content=content}}',
+ componentTest("labelProperty", {
+ template:
+ '{{single-select labelProperty="foo" value=value content=content}}',
- beforeEach() {
- this.setProperties({
- content: [{ id: 1, name: "john", foo: "JACKSON" }],
- value: 1,
- });
- },
+ beforeEach() {
+ this.setProperties({
+ content: [{ id: 1, name: "john", foo: "JACKSON" }],
+ value: 1,
+ });
+ },
- async test(assert) {
- assert.equal(this.subject.header().label(), "JACKSON");
+ async test(assert) {
+ assert.equal(this.subject.header().label(), "JACKSON");
- await this.subject.expand();
+ await this.subject.expand();
- const row = this.subject.rowByValue(1);
+ const row = this.subject.rowByValue(1);
- assert.equal(row.label(), "JACKSON");
- },
- });
+ assert.equal(row.label(), "JACKSON");
+ },
+ });
- componentTest("titleProperty", {
- template:
- '{{single-select titleProperty="foo" value=value content=content}}',
+ componentTest("titleProperty", {
+ template:
+ '{{single-select titleProperty="foo" value=value content=content}}',
- beforeEach() {
- this.setProperties({
- content: [{ id: 1, name: "john", foo: "JACKSON" }],
- value: 1,
- });
- },
+ beforeEach() {
+ this.setProperties({
+ content: [{ id: 1, name: "john", foo: "JACKSON" }],
+ value: 1,
+ });
+ },
- async test(assert) {
- assert.equal(this.subject.header().title(), "JACKSON");
+ async test(assert) {
+ assert.equal(this.subject.header().title(), "JACKSON");
- await this.subject.expand();
+ await this.subject.expand();
- const row = this.subject.rowByValue(1);
+ const row = this.subject.rowByValue(1);
- assert.equal(row.title(), "JACKSON");
- },
- });
+ assert.equal(row.title(), "JACKSON");
+ },
+ });
- componentTest("langProperty", {
- template:
- '{{single-select langProperty="foo" value=value content=content}}',
+ componentTest("langProperty", {
+ template:
+ '{{single-select langProperty="foo" value=value content=content}}',
- beforeEach() {
- this.setProperties({
- content: [{ id: 1, name: "john", foo: "be" }],
- value: null,
- });
- },
+ beforeEach() {
+ this.setProperties({
+ content: [{ id: 1, name: "john", foo: "be" }],
+ value: null,
+ });
+ },
- async test(assert) {
- assert.equal(
- this.subject.header().el()[0].querySelector(".selected-name").lang,
- ""
- );
+ async test(assert) {
+ assert.equal(
+ this.subject.header().el()[0].querySelector(".selected-name").lang,
+ ""
+ );
- await this.subject.expand();
+ await this.subject.expand();
- const row = this.subject.rowByValue(1);
- assert.equal(row.el()[0].lang, "be");
+ const row = this.subject.rowByValue(1);
+ assert.equal(row.el()[0].lang, "be");
- await this.subject.selectRowByValue(1);
+ await this.subject.selectRowByValue(1);
- assert.equal(
- this.subject.header().el()[0].querySelector(".selected-name").lang,
- "be"
- );
- },
- });
-});
+ assert.equal(
+ this.subject.header().el()[0].querySelector(".selected-name").lang,
+ "be"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js
index 55df881fdf..5b6ca63707 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js
@@ -36,63 +36,64 @@ function template(options = []) {
`;
}
-discourseModule("Integration | Component | select-kit/tag-drop", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | select-kit/tag-drop",
+ function (hooks) {
+ setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.set("subject", selectKit());
+ hooks.beforeEach(function () {
+ this.set("subject", selectKit());
- const site = Site.current();
- set(site, "top_tags", ["jeff", "neil", "arpit", "régis"]);
+ const site = Site.current();
+ set(site, "top_tags", ["jeff", "neil", "arpit", "régis"]);
- const response = (object) => {
- return [200, { "Content-Type": "application/json" }, object];
- };
+ const response = (object) => {
+ return [200, { "Content-Type": "application/json" }, object];
+ };
- pretender.get("/tags/filter/search", (params) => {
- if (params.queryParams.q === "rég") {
- return response({
- results: [{ id: "régis", text: "régis", count: 2, pm_count: 0 }],
- });
- } else if (params.queryParams.q === "dav") {
- return response({
- results: [{ id: "David", text: "David", count: 2, pm_count: 0 }],
- });
- }
+ pretender.get("/tags/filter/search", (params) => {
+ if (params.queryParams.q === "rég") {
+ return response({
+ results: [{ id: "régis", text: "régis", count: 2, pm_count: 0 }],
+ });
+ } else if (params.queryParams.q === "dav") {
+ return response({
+ results: [{ id: "David", text: "David", count: 2, pm_count: 0 }],
+ });
+ }
+ });
});
- });
- componentTest("default", {
- template: template(["tagId=tagId"]),
+ componentTest("default", {
+ template: template(["tagId=tagId"]),
- beforeEach() {
- initTags(this);
- },
+ beforeEach() {
+ initTags(this);
+ },
- async test(assert) {
- await this.subject.expand();
+ async test(assert) {
+ await this.subject.expand();
- assert.ok(true);
- // const row = this.subject.rowByValue(this.category.id);
- // assert.ok(
- // exists(row.el().find(".category-desc")),
- // "it shows category description for newcomers"
- // );
+ assert.ok(true);
+ // const row = this.subject.rowByValue(this.category.id);
+ // assert.ok(
+ // exists(row.el().find(".category-desc")),
+ // "it shows category description for newcomers"
+ // );
- const content = this.subject.displayedContent();
+ const content = this.subject.displayedContent();
- assert.equal(
- content[0].name,
- I18n.t("tagging.selector_no_tags"),
- "it has the translated label for no-tags"
- );
- assert.equal(
- content[1].name,
- I18n.t("tagging.selector_all_tags"),
- "it has the correct label for all-tags"
- );
- },
- });
-});
+ assert.equal(
+ content[0].name,
+ I18n.t("tagging.selector_no_tags"),
+ "it has the translated label for no-tags"
+ );
+ assert.equal(
+ content[1].name,
+ I18n.t("tagging.selector_all_tags"),
+ "it has the correct label for all-tags"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js
index 8eae6bf75b..7066ee74f1 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js
@@ -4,37 +4,38 @@ import componentTest, {
import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import selectKit from "discourse/tests/helpers/select-kit-helper";
-discourseModule("Integration | Component | select-kit/user-chooser", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | select-kit/user-chooser",
+ function (hooks) {
+ setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.set("subject", selectKit());
- });
+ hooks.beforeEach(function () {
+ this.set("subject", selectKit());
+ });
- componentTest("displays usernames", {
- template: `{{user-chooser value=value}}`,
+ componentTest("displays usernames", {
+ template: `{{user-chooser value=value}}`,
- beforeEach() {
- this.set("value", ["bob", "martin"]);
- },
+ beforeEach() {
+ this.set("value", ["bob", "martin"]);
+ },
- async test(assert) {
- assert.equal(this.subject.header().name(), "bob,martin");
- },
- });
+ async test(assert) {
+ assert.equal(this.subject.header().name(), "bob,martin");
+ },
+ });
- componentTest("can remove a username", {
- template: `{{user-chooser value=value}}`,
+ componentTest("can remove a username", {
+ template: `{{user-chooser value=value}}`,
- beforeEach() {
- this.set("value", ["bob", "martin"]);
- },
+ beforeEach() {
+ this.set("value", ["bob", "martin"]);
+ },
- async test(assert) {
- await this.subject.deselectItem("bob");
- assert.equal(this.subject.header().name(), "martin");
- },
- });
-});
+ async test(assert) {
+ await this.subject.deselectItem("bob");
+ assert.equal(this.subject.header().name(), "martin");
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js
index 794c95338b..9afee06d23 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/actions-summary-test.js
@@ -6,29 +6,30 @@ import {
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
-discourseModule("Integration | Component | Widget | actions-summary", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | actions-summary",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("post deleted", {
- template: '{{mount-widget widget="actions-summary" args=args}}',
- beforeEach() {
- this.set("args", {
- deleted_at: "2016-01-01",
- deletedByUsername: "eviltrout",
- deletedByAvatarTemplate: "/images/avatar.png",
- });
- },
- test(assert) {
- assert.ok(
- queryAll(".post-action .d-icon-far-trash-alt").length === 1,
- "it has the deleted icon"
- );
- assert.ok(
- queryAll(".avatar[title=eviltrout]").length === 1,
- "it has the deleted by avatar"
- );
- },
- });
-});
+ componentTest("post deleted", {
+ template: '{{mount-widget widget="actions-summary" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ deleted_at: "2016-01-01",
+ deletedByUsername: "eviltrout",
+ deletedByAvatarTemplate: "/images/avatar.png",
+ });
+ },
+ test(assert) {
+ assert.ok(
+ queryAll(".post-action .d-icon-far-trash-alt").length === 1,
+ "it has the deleted icon"
+ );
+ assert.ok(
+ queryAll(".avatar[title=eviltrout]").length === 1,
+ "it has the deleted by avatar"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js
index 49a11aa97d..3267c81113 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/avatar-flair-test.js
@@ -6,41 +6,42 @@ import {
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
-discourseModule("Integration | Component | Widget | avatar-flair", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | avatar-flair",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("avatar flair with an icon", {
- template: '{{mount-widget widget="avatar-flair" args=args}}',
- beforeEach() {
- this.set("args", {
- primary_group_flair_url: "fa-bars",
- primary_group_flair_bg_color: "CC0000",
- primary_group_flair_color: "FFFFFF",
- });
- },
- test(assert) {
- assert.ok(queryAll(".avatar-flair").length, "it has the tag");
- assert.ok(queryAll("svg.d-icon-bars").length, "it has the svg icon");
- assert.equal(
- queryAll(".avatar-flair").attr("style"),
- "background-color: #CC0000; color: #FFFFFF; ",
- "it has styles"
- );
- },
- });
+ componentTest("avatar flair with an icon", {
+ template: '{{mount-widget widget="avatar-flair" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ primary_group_flair_url: "fa-bars",
+ primary_group_flair_bg_color: "CC0000",
+ primary_group_flair_color: "FFFFFF",
+ });
+ },
+ test(assert) {
+ assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+ assert.ok(queryAll("svg.d-icon-bars").length, "it has the svg icon");
+ assert.equal(
+ queryAll(".avatar-flair").attr("style"),
+ "background-color: #CC0000; color: #FFFFFF; ",
+ "it has styles"
+ );
+ },
+ });
- componentTest("avatar flair with an image", {
- template: '{{mount-widget widget="avatar-flair" args=args}}',
- beforeEach() {
- this.set("args", {
- primary_group_flair_url: "/images/avatar.png",
- });
- },
- test(assert) {
- assert.ok(queryAll(".avatar-flair").length, "it has the tag");
- assert.ok(queryAll("svg").length === 0, "it does not have an svg icon");
- },
- });
-});
+ componentTest("avatar flair with an image", {
+ template: '{{mount-widget widget="avatar-flair" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ primary_group_flair_url: "/images/avatar.png",
+ });
+ },
+ test(assert) {
+ assert.ok(queryAll(".avatar-flair").length, "it has the tag");
+ assert.ok(queryAll("svg").length === 0, "it does not have an svg icon");
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js
index 343aeb729e..4f73a310db 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/button-test.js
@@ -3,6 +3,7 @@ import componentTest, {
} from "discourse/tests/helpers/component-test";
import {
discourseModule,
+ query,
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
@@ -69,4 +70,29 @@ discourseModule("Integration | Component | Widget | button", function (hooks) {
);
},
});
+
+ componentTest("translatedLabel", {
+ template: '{{mount-widget widget="button" args=args}}',
+
+ beforeEach() {
+ this.set("args", { translatedLabel: "foo bar" });
+ },
+
+ test(assert) {
+ assert.equal(query("button span.d-button-label").innerText, "foo bar");
+ },
+ });
+
+ componentTest("translatedTitle", {
+ template: '{{mount-widget widget="button" args=args}}',
+
+ beforeEach() {
+ this.set("args", { label: "topic.create", translatedTitle: "foo bar" });
+ },
+
+ test(assert) {
+ assert.equal(query("button").title, "foo bar");
+ assert.equal(query("button").ariaLabel, "foo bar");
+ },
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js
index 43638125ea..8eb98821e8 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/hamburger-menu-test.js
@@ -12,252 +12,256 @@ let mutedCategoryIds = [];
let unreadCategoryIds = [];
let categoriesByCount = [];
-discourseModule("Integration | Component | Widget | hamburger-menu", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | hamburger-menu",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("prioritize faq", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("prioritize faq", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.siteSettings.faq_url = "http://example.com/faq";
- this.currentUser.set("read_faq", false);
- },
+ beforeEach() {
+ this.siteSettings.faq_url = "http://example.com/faq";
+ this.currentUser.set("read_faq", false);
+ },
- test(assert) {
- assert.ok(queryAll(".faq-priority").length);
- assert.ok(!queryAll(".faq-link").length);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".faq-priority").length);
+ assert.ok(!queryAll(".faq-link").length);
+ },
+ });
- componentTest("prioritize faq - user has read", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("prioritize faq - user has read", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.siteSettings.faq_url = "http://example.com/faq";
- this.currentUser.set("read_faq", true);
- },
+ beforeEach() {
+ this.siteSettings.faq_url = "http://example.com/faq";
+ this.currentUser.set("read_faq", true);
+ },
- test(assert) {
- assert.ok(!queryAll(".faq-priority").length);
- assert.ok(queryAll(".faq-link").length);
- },
- });
+ test(assert) {
+ assert.ok(!queryAll(".faq-priority").length);
+ assert.ok(queryAll(".faq-link").length);
+ },
+ });
- componentTest("staff menu - not staff", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("staff menu - not staff", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.currentUser.set("staff", false);
- },
+ beforeEach() {
+ this.currentUser.set("staff", false);
+ },
- test(assert) {
- assert.ok(!queryAll(".admin-link").length);
- },
- });
+ test(assert) {
+ assert.ok(!queryAll(".admin-link").length);
+ },
+ });
- componentTest("staff menu - moderator", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("staff menu - moderator", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.currentUser.set("moderator", true);
- },
+ beforeEach() {
+ this.currentUser.set("moderator", true);
+ },
- test(assert) {
- assert.ok(queryAll(".admin-link").length);
- assert.ok(queryAll(".review").length);
- assert.ok(!queryAll(".settings-link").length);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".admin-link").length);
+ assert.ok(queryAll(".review").length);
+ assert.ok(!queryAll(".settings-link").length);
+ },
+ });
- componentTest("staff menu - admin", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("staff menu - admin", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.currentUser.setProperties({ admin: true });
- },
+ beforeEach() {
+ this.currentUser.setProperties({ admin: true });
+ },
- test(assert) {
- assert.ok(queryAll(".settings-link").length);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".settings-link").length);
+ },
+ });
- componentTest("logged in links", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("logged in links", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- test(assert) {
- assert.ok(queryAll(".new-topics-link").length);
- assert.ok(queryAll(".unread-topics-link").length);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".new-topics-link").length);
+ assert.ok(queryAll(".unread-topics-link").length);
+ },
+ });
- componentTest("general links", {
- template: '{{mount-widget widget="hamburger-menu"}}',
- anonymous: true,
+ componentTest("general links", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
+ anonymous: true,
- test(assert) {
- assert.ok(queryAll("li[class='']").length === 0);
- assert.ok(queryAll(".latest-topics-link").length);
- assert.ok(!queryAll(".new-topics-link").length);
- assert.ok(!queryAll(".unread-topics-link").length);
- assert.ok(queryAll(".top-topics-link").length);
- assert.ok(queryAll(".badge-link").length);
- assert.ok(queryAll(".category-link").length > 0);
- },
- });
+ test(assert) {
+ assert.ok(queryAll("li[class='']").length === 0);
+ assert.ok(queryAll(".latest-topics-link").length);
+ assert.ok(!queryAll(".new-topics-link").length);
+ assert.ok(!queryAll(".unread-topics-link").length);
+ assert.ok(queryAll(".top-topics-link").length);
+ assert.ok(queryAll(".badge-link").length);
+ assert.ok(queryAll(".category-link").length > 0);
+ },
+ });
- let maxCategoriesToDisplay;
+ let maxCategoriesToDisplay;
- componentTest("top categories - anonymous", {
- template: '{{mount-widget widget="hamburger-menu"}}',
- anonymous: true,
+ componentTest("top categories - anonymous", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
+ anonymous: true,
- beforeEach() {
- this.siteSettings.header_dropdown_category_count = 8;
- },
+ beforeEach() {
+ this.siteSettings.header_dropdown_category_count = 8;
+ },
- test(assert) {
- assert.equal(queryAll(".category-link").length, 8);
- assert.equal(
- queryAll(".category-link .category-name").text(),
- this.site
- .get("categoriesByCount")
- .slice(0, 8)
- .map((c) => c.name)
- .join("")
- );
- },
- });
+ test(assert) {
+ assert.equal(queryAll(".category-link").length, 8);
+ assert.equal(
+ queryAll(".category-link .category-name").text(),
+ this.site
+ .get("categoriesByCount")
+ .slice(0, 8)
+ .map((c) => c.name)
+ .join("")
+ );
+ },
+ });
- componentTest("top categories - allow_uncategorized_topics", {
- template: '{{mount-widget widget="hamburger-menu"}}',
- anonymous: true,
+ componentTest("top categories - allow_uncategorized_topics", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
+ anonymous: true,
- beforeEach() {
- this.siteSettings.allow_uncategorized_topics = false;
- this.siteSettings.header_dropdown_category_count = 8;
- },
+ beforeEach() {
+ this.siteSettings.allow_uncategorized_topics = false;
+ this.siteSettings.header_dropdown_category_count = 8;
+ },
- test(assert) {
- assert.equal(queryAll(".category-link").length, 8);
- assert.equal(
- queryAll(".category-link .category-name").text(),
- this.site
- .get("categoriesByCount")
- .filter((c) => c.name !== "uncategorized")
- .slice(0, 8)
- .map((c) => c.name)
- .join("")
- );
- },
- });
+ test(assert) {
+ assert.equal(queryAll(".category-link").length, 8);
+ assert.equal(
+ queryAll(".category-link .category-name").text(),
+ this.site
+ .get("categoriesByCount")
+ .filter((c) => c.name !== "uncategorized")
+ .slice(0, 8)
+ .map((c) => c.name)
+ .join("")
+ );
+ },
+ });
- componentTest("top categories", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("top categories", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.siteSettings.header_dropdown_category_count = 8;
- maxCategoriesToDisplay = this.siteSettings.header_dropdown_category_count;
- categoriesByCount = this.site.get("categoriesByCount").slice();
- categoriesByCount.every((c) => {
- if (!topCategoryIds.includes(c.id)) {
- if (mutedCategoryIds.length === 0) {
- mutedCategoryIds.push(c.id);
- c.set("notification_level", NotificationLevels.MUTED);
- } else if (unreadCategoryIds.length === 0) {
- unreadCategoryIds.push(c.id);
- for (let i = 0; i < 5; i++) {
- c.topicTrackingState.states["t123" + i] = {
- category_id: c.id,
- last_read_post_number: 1,
- highest_post_number: 2,
- notification_level: NotificationLevels.TRACKING,
- };
+ beforeEach() {
+ this.siteSettings.header_dropdown_category_count = 8;
+ maxCategoriesToDisplay = this.siteSettings
+ .header_dropdown_category_count;
+ categoriesByCount = this.site.get("categoriesByCount").slice();
+ categoriesByCount.every((c) => {
+ if (!topCategoryIds.includes(c.id)) {
+ if (mutedCategoryIds.length === 0) {
+ mutedCategoryIds.push(c.id);
+ c.set("notification_level", NotificationLevels.MUTED);
+ } else if (unreadCategoryIds.length === 0) {
+ unreadCategoryIds.push(c.id);
+ for (let i = 0; i < 5; i++) {
+ c.topicTrackingState.states["t123" + i] = {
+ category_id: c.id,
+ last_read_post_number: 1,
+ highest_post_number: 2,
+ notification_level: NotificationLevels.TRACKING,
+ };
+ }
+ } else {
+ unreadCategoryIds.splice(0, 0, c.id);
+ for (let i = 0; i < 10; i++) {
+ c.topicTrackingState.states["t321" + i] = {
+ category_id: c.id,
+ last_read_post_number: null,
+ };
+ }
+ return false;
}
- } else {
- unreadCategoryIds.splice(0, 0, c.id);
- for (let i = 0; i < 10; i++) {
- c.topicTrackingState.states["t321" + i] = {
- category_id: c.id,
- last_read_post_number: null,
- };
- }
- return false;
}
- }
- return true;
- });
- this.currentUser.set("top_category_ids", topCategoryIds);
- },
+ return true;
+ });
+ this.currentUser.set("top_category_ids", topCategoryIds);
+ },
- test(assert) {
- assert.equal(queryAll(".category-link").length, maxCategoriesToDisplay);
+ test(assert) {
+ assert.equal(queryAll(".category-link").length, maxCategoriesToDisplay);
- categoriesByCount = categoriesByCount.filter(
- (c) => !mutedCategoryIds.includes(c.id)
- );
- let ids = [
- ...unreadCategoryIds,
- ...topCategoryIds,
- ...categoriesByCount.map((c) => c.id),
- ]
- .uniq()
- .slice(0, maxCategoriesToDisplay);
+ categoriesByCount = categoriesByCount.filter(
+ (c) => !mutedCategoryIds.includes(c.id)
+ );
+ let ids = [
+ ...unreadCategoryIds,
+ ...topCategoryIds,
+ ...categoriesByCount.map((c) => c.id),
+ ]
+ .uniq()
+ .slice(0, maxCategoriesToDisplay);
- assert.equal(
- queryAll(".category-link .category-name").text(),
- ids.map((i) => categoriesByCount.find((c) => c.id === i).name).join("")
- );
- },
- });
+ assert.equal(
+ queryAll(".category-link .category-name").text(),
+ ids
+ .map((i) => categoriesByCount.find((c) => c.id === i).name)
+ .join("")
+ );
+ },
+ });
- componentTest("badges link - disabled", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("badges link - disabled", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.siteSettings.enable_badges = false;
- },
+ beforeEach() {
+ this.siteSettings.enable_badges = false;
+ },
- test(assert) {
- assert.ok(!queryAll(".badge-link").length);
- },
- });
+ test(assert) {
+ assert.ok(!queryAll(".badge-link").length);
+ },
+ });
- componentTest("badges link", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("badges link", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- test(assert) {
- assert.ok(queryAll(".badge-link").length);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".badge-link").length);
+ },
+ });
- componentTest("user directory link", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("user directory link", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- test(assert) {
- assert.ok(queryAll(".user-directory-link").length);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".user-directory-link").length);
+ },
+ });
- componentTest("user directory link - disabled", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("user directory link - disabled", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- beforeEach() {
- this.siteSettings.enable_user_directory = false;
- },
+ beforeEach() {
+ this.siteSettings.enable_user_directory = false;
+ },
- test(assert) {
- assert.ok(!queryAll(".user-directory-link").length);
- },
- });
+ test(assert) {
+ assert.ok(!queryAll(".user-directory-link").length);
+ },
+ });
- componentTest("general links", {
- template: '{{mount-widget widget="hamburger-menu"}}',
+ componentTest("general links", {
+ template: '{{mount-widget widget="hamburger-menu"}}',
- test(assert) {
- assert.ok(queryAll(".about-link").length);
- assert.ok(queryAll(".keyboard-shortcuts-link").length);
- },
- });
-});
+ test(assert) {
+ assert.ok(queryAll(".about-link").length);
+ assert.ok(queryAll(".keyboard-shortcuts-link").length);
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js
index bf5d3d3684..c9d2932549 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/home-logo-test.js
@@ -14,240 +14,241 @@ const darkLogo = "/images/d-logo-sketch.png?dark";
const title = "Cool Forum";
const prefersDark = "(prefers-color-scheme: dark)";
-discourseModule("Integration | Component | Widget | home-logo", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | home-logo",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("basics", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- skip: true,
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_logo_small_url = smallLogo;
- this.siteSettings.title = title;
- this.set("args", { minimized: false });
- },
+ componentTest("basics", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ skip: true,
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_logo_small_url = smallLogo;
+ this.siteSettings.title = title;
+ this.set("args", { minimized: false });
+ },
- test(assert) {
- assert.ok(queryAll(".title").length === 1);
+ test(assert) {
+ assert.ok(queryAll(".title").length === 1);
- assert.ok(queryAll("img#site-logo.logo-big").length === 1);
- assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
- assert.equal(queryAll("#site-logo").attr("alt"), title);
- },
- });
+ assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+ assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+ assert.equal(queryAll("#site-logo").attr("alt"), title);
+ },
+ });
- componentTest("basics - minimized", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_logo_small_url = smallLogo;
- this.siteSettings.title = title;
- this.set("args", { minimized: true });
- },
+ componentTest("basics - minimized", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_logo_small_url = smallLogo;
+ this.siteSettings.title = title;
+ this.set("args", { minimized: true });
+ },
- test(assert) {
- assert.ok(queryAll("img.logo-small").length === 1);
- assert.equal(queryAll("img.logo-small").attr("src"), smallLogo);
- assert.equal(queryAll("img.logo-small").attr("alt"), title);
- assert.equal(queryAll("img.logo-small").attr("width"), 36);
- },
- });
+ test(assert) {
+ assert.ok(queryAll("img.logo-small").length === 1);
+ assert.equal(queryAll("img.logo-small").attr("src"), smallLogo);
+ assert.equal(queryAll("img.logo-small").attr("alt"), title);
+ assert.equal(queryAll("img.logo-small").attr("width"), 36);
+ },
+ });
- componentTest("no logo", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = "";
- this.siteSettings.site_logo_small_url = "";
- this.siteSettings.title = title;
- this.set("args", { minimized: false });
- },
+ componentTest("no logo", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = "";
+ this.siteSettings.site_logo_small_url = "";
+ this.siteSettings.title = title;
+ this.set("args", { minimized: false });
+ },
- test(assert) {
- assert.ok(queryAll("h1#site-text-logo.text-logo").length === 1);
- assert.equal(queryAll("#site-text-logo").text(), title);
- },
- });
+ test(assert) {
+ assert.ok(queryAll("h1#site-text-logo.text-logo").length === 1);
+ assert.equal(queryAll("#site-text-logo").text(), title);
+ },
+ });
- componentTest("no logo - minimized", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = "";
- this.siteSettings.site_logo_small_url = "";
- this.siteSettings.title = title;
- this.set("args", { minimized: true });
- },
+ componentTest("no logo - minimized", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = "";
+ this.siteSettings.site_logo_small_url = "";
+ this.siteSettings.title = title;
+ this.set("args", { minimized: true });
+ },
- test(assert) {
- assert.ok(queryAll(".d-icon-home").length === 1);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".d-icon-home").length === 1);
+ },
+ });
- componentTest("mobile logo", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_mobile_logo_url = mobileLogo;
- this.siteSettings.site_logo_small_url = smallLogo;
- this.site.mobileView = true;
- },
+ componentTest("mobile logo", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_mobile_logo_url = mobileLogo;
+ this.siteSettings.site_logo_small_url = smallLogo;
+ this.site.mobileView = true;
+ },
- test(assert) {
- assert.ok(queryAll("img#site-logo.logo-mobile").length === 1);
- assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
- },
- });
+ test(assert) {
+ assert.ok(queryAll("img#site-logo.logo-mobile").length === 1);
+ assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
+ },
+ });
- componentTest("mobile without logo", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.site.mobileView = true;
- },
+ componentTest("mobile without logo", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.site.mobileView = true;
+ },
- test(assert) {
- assert.ok(queryAll("img#site-logo.logo-big").length === 1);
- assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
- },
- });
+ test(assert) {
+ assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+ assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+ },
+ });
- componentTest("logo with dark mode alternative", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_logo_dark_url = darkLogo;
- Session.currentProp("darkModeAvailable", true);
- },
- afterEach() {
- Session.currentProp("darkModeAvailable", null);
- },
+ componentTest("logo with dark mode alternative", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_logo_dark_url = darkLogo;
+ Session.currentProp("darkModeAvailable", true);
+ },
+ afterEach() {
+ Session.currentProp("darkModeAvailable", null);
+ },
- test(assert) {
- assert.ok(queryAll("img#site-logo.logo-big").length === 1);
- assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+ test(assert) {
+ assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+ assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
- assert.equal(
- queryAll("picture source").attr("media"),
- prefersDark,
- "includes dark mode media attribute"
- );
- assert.equal(
- queryAll("picture source").attr("srcset"),
- darkLogo,
- "includes dark mode alternative logo source"
- );
- },
- });
+ assert.equal(
+ queryAll("picture source").attr("media"),
+ prefersDark,
+ "includes dark mode media attribute"
+ );
+ assert.equal(
+ queryAll("picture source").attr("srcset"),
+ darkLogo,
+ "includes dark mode alternative logo source"
+ );
+ },
+ });
- componentTest("mobile logo with dark mode alternative", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_mobile_logo_url = mobileLogo;
- this.siteSettings.site_mobile_logo_dark_url = darkLogo;
- Session.currentProp("darkModeAvailable", true);
+ componentTest("mobile logo with dark mode alternative", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_mobile_logo_url = mobileLogo;
+ this.siteSettings.site_mobile_logo_dark_url = darkLogo;
+ Session.currentProp("darkModeAvailable", true);
- this.site.mobileView = true;
- },
- afterEach() {
- Session.currentProp("darkModeAvailable", null);
- },
+ this.site.mobileView = true;
+ },
+ afterEach() {
+ Session.currentProp("darkModeAvailable", null);
+ },
- test(assert) {
- assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
+ test(assert) {
+ assert.equal(queryAll("#site-logo").attr("src"), mobileLogo);
- assert.equal(
- queryAll("picture source").attr("media"),
- prefersDark,
- "includes dark mode media attribute"
- );
- assert.equal(
- queryAll("picture source").attr("srcset"),
- darkLogo,
- "includes dark mode alternative logo source"
- );
- },
- });
+ assert.equal(
+ queryAll("picture source").attr("media"),
+ prefersDark,
+ "includes dark mode media attribute"
+ );
+ assert.equal(
+ queryAll("picture source").attr("srcset"),
+ darkLogo,
+ "includes dark mode alternative logo source"
+ );
+ },
+ });
- componentTest("dark mode enabled but no dark logo set", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_logo_dark_url = "";
- Session.currentProp("darkModeAvailable", true);
- },
- afterEach() {
- Session.currentProp("darkModeAvailable", null);
- },
+ componentTest("dark mode enabled but no dark logo set", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_logo_dark_url = "";
+ Session.currentProp("darkModeAvailable", true);
+ },
+ afterEach() {
+ Session.currentProp("darkModeAvailable", null);
+ },
- test(assert) {
- assert.ok(queryAll("img#site-logo.logo-big").length === 1);
- assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
- assert.ok(
- queryAll("picture").length === 0,
- "does not include alternative logo"
- );
- },
- });
+ test(assert) {
+ assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+ assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+ assert.ok(
+ queryAll("picture").length === 0,
+ "does not include alternative logo"
+ );
+ },
+ });
- componentTest("dark logo set but no dark mode", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_logo_dark_url = darkLogo;
- },
+ componentTest("dark logo set but no dark mode", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_logo_dark_url = darkLogo;
+ },
- test(assert) {
- assert.ok(queryAll("img#site-logo.logo-big").length === 1);
- assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
- assert.ok(
- queryAll("picture").length === 0,
- "does not include alternative logo"
- );
- },
- });
+ test(assert) {
+ assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+ assert.equal(queryAll("#site-logo").attr("src"), bigLogo);
+ assert.ok(
+ queryAll("picture").length === 0,
+ "does not include alternative logo"
+ );
+ },
+ });
- componentTest("dark color scheme and dark logo set", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_logo_dark_url = darkLogo;
- Session.currentProp("defaultColorSchemeIsDark", true);
- },
- afterEach() {
- Session.currentProp("defaultColorSchemeIsDark", null);
- },
- test(assert) {
- assert.ok(queryAll("img#site-logo.logo-big").length === 1);
- assert.equal(
- queryAll("#site-logo").attr("src"),
- darkLogo,
- "uses dark logo"
- );
- assert.ok(
- queryAll("picture").length === 0,
- "does not add dark mode alternative"
- );
- },
- });
+ componentTest("dark color scheme and dark logo set", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_logo_dark_url = darkLogo;
+ Session.currentProp("defaultColorSchemeIsDark", true);
+ },
+ afterEach() {
+ Session.currentProp("defaultColorSchemeIsDark", null);
+ },
+ test(assert) {
+ assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+ assert.equal(
+ queryAll("#site-logo").attr("src"),
+ darkLogo,
+ "uses dark logo"
+ );
+ assert.ok(
+ queryAll("picture").length === 0,
+ "does not add dark mode alternative"
+ );
+ },
+ });
- componentTest("dark color scheme and dark logo not set", {
- template: '{{mount-widget widget="home-logo" args=args}}',
- beforeEach() {
- this.siteSettings.site_logo_url = bigLogo;
- this.siteSettings.site_logo_dark_url = "";
- Session.currentProp("defaultColorSchemeIsDark", true);
- },
- afterEach() {
- Session.currentProp("defaultColorSchemeIsDark", null);
- },
- test(assert) {
- assert.ok(queryAll("img#site-logo.logo-big").length === 1);
- assert.equal(
- queryAll("#site-logo").attr("src"),
- bigLogo,
- "uses regular logo on dark scheme if no dark logo"
- );
- },
- });
-});
+ componentTest("dark color scheme and dark logo not set", {
+ template: '{{mount-widget widget="home-logo" args=args}}',
+ beforeEach() {
+ this.siteSettings.site_logo_url = bigLogo;
+ this.siteSettings.site_logo_dark_url = "";
+ Session.currentProp("defaultColorSchemeIsDark", true);
+ },
+ afterEach() {
+ Session.currentProp("defaultColorSchemeIsDark", null);
+ },
+ test(assert) {
+ assert.ok(queryAll("img#site-logo.logo-big").length === 1);
+ assert.equal(
+ queryAll("#site-logo").attr("src"),
+ bigLogo,
+ "uses regular logo on dark scheme if no dark logo"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js
index 6a24877b12..e8287519c8 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-links-test.js
@@ -7,59 +7,91 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
import { click } from "@ember/test-helpers";
-discourseModule("Integration | Component | Widget | post-links", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | post-links",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("duplicate links", {
- template: '{{mount-widget widget="post-links" args=args}}',
- beforeEach() {
- this.set("args", {
- id: 2,
- links: [
- {
- title: "Evil Trout Link",
- url: "http://eviltrout.com",
- reflection: true,
- },
- {
- title: "Evil Trout Link",
- url: "http://dupe.eviltrout.com",
- reflection: true,
- },
- ],
- });
- },
- test(assert) {
- assert.equal(
- queryAll(".post-links a.track-link").length,
- 1,
- "it hides the dupe link"
- );
- },
- });
+ componentTest("duplicate links", {
+ template: '{{mount-widget widget="post-links" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ id: 2,
+ links: [
+ {
+ title: "Evil Trout Link",
+ url: "http://eviltrout.com",
+ reflection: true,
+ },
+ {
+ title: "Evil Trout Link",
+ url: "http://dupe.eviltrout.com",
+ reflection: true,
+ },
+ ],
+ });
+ },
+ test(assert) {
+ assert.equal(
+ queryAll(".post-links a.track-link").length,
+ 1,
+ "it hides the dupe link"
+ );
+ },
+ });
- componentTest("collapsed links", {
- template: '{{mount-widget widget="post-links" args=args}}',
- beforeEach() {
- this.set("args", {
- id: 1,
- links: [
- { title: "Link 1", url: "http://eviltrout.com?1", reflection: true },
- { title: "Link 2", url: "http://eviltrout.com?2", reflection: true },
- { title: "Link 3", url: "http://eviltrout.com?3", reflection: true },
- { title: "Link 4", url: "http://eviltrout.com?4", reflection: true },
- { title: "Link 5", url: "http://eviltrout.com?5", reflection: true },
- { title: "Link 6", url: "http://eviltrout.com?6", reflection: true },
- { title: "Link 7", url: "http://eviltrout.com?7", reflection: true },
- ],
- });
- },
- async test(assert) {
- assert.ok(queryAll(".expand-links").length === 1, "collapsed by default");
- await click("a.expand-links");
- assert.equal(queryAll(".post-links a.track-link").length, 7);
- },
- });
-});
+ componentTest("collapsed links", {
+ template: '{{mount-widget widget="post-links" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ id: 1,
+ links: [
+ {
+ title: "Link 1",
+ url: "http://eviltrout.com?1",
+ reflection: true,
+ },
+ {
+ title: "Link 2",
+ url: "http://eviltrout.com?2",
+ reflection: true,
+ },
+ {
+ title: "Link 3",
+ url: "http://eviltrout.com?3",
+ reflection: true,
+ },
+ {
+ title: "Link 4",
+ url: "http://eviltrout.com?4",
+ reflection: true,
+ },
+ {
+ title: "Link 5",
+ url: "http://eviltrout.com?5",
+ reflection: true,
+ },
+ {
+ title: "Link 6",
+ url: "http://eviltrout.com?6",
+ reflection: true,
+ },
+ {
+ title: "Link 7",
+ url: "http://eviltrout.com?7",
+ reflection: true,
+ },
+ ],
+ });
+ },
+ async test(assert) {
+ assert.ok(
+ queryAll(".expand-links").length === 1,
+ "collapsed by default"
+ );
+ await click("a.expand-links");
+ assert.equal(queryAll(".post-links a.track-link").length, 7);
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js
index a497cae817..53f10c31fe 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js
@@ -7,48 +7,49 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
import { withPluginApi } from "discourse/lib/plugin-api";
-discourseModule("Integration | Component | Widget | post-menu", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | post-menu",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("add extra button", {
- template: '{{mount-widget widget="post-menu" args=args}}',
- beforeEach() {
- this.set("args", {});
- withPluginApi("0.8", (api) => {
- api.addPostMenuButton("coffee", () => {
- return {
- action: "drinkCoffee",
- icon: "coffee",
- className: "hot-coffee",
- title: "coffee.title",
- position: "first",
- };
+ componentTest("add extra button", {
+ template: '{{mount-widget widget="post-menu" args=args}}',
+ beforeEach() {
+ this.set("args", {});
+ withPluginApi("0.8", (api) => {
+ api.addPostMenuButton("coffee", () => {
+ return {
+ action: "drinkCoffee",
+ icon: "coffee",
+ className: "hot-coffee",
+ title: "coffee.title",
+ position: "first",
+ };
+ });
});
- });
- },
- async test(assert) {
- assert.ok(
- queryAll(".actions .extra-buttons .hot-coffee").length === 1,
- "It renders extra button"
- );
- },
- });
+ },
+ async test(assert) {
+ assert.ok(
+ queryAll(".actions .extra-buttons .hot-coffee").length === 1,
+ "It renders extra button"
+ );
+ },
+ });
- componentTest("remove extra button", {
- template: '{{mount-widget widget="post-menu" args=args}}',
- beforeEach() {
- this.set("args", {});
- withPluginApi("0.8", (api) => {
- api.removePostMenuButton("coffee");
- });
- },
- async test(assert) {
- assert.ok(
- queryAll(".actions .extra-buttons .hot-coffee").length === 0,
- "It doesn't removes coffee button"
- );
- },
- });
-});
+ componentTest("remove extra button", {
+ template: '{{mount-widget widget="post-menu" args=args}}',
+ beforeEach() {
+ this.set("args", {});
+ withPluginApi("0.8", (api) => {
+ api.removePostMenuButton("coffee");
+ });
+ },
+ async test(assert) {
+ assert.ok(
+ queryAll(".actions .extra-buttons .hot-coffee").length === 0,
+ "It doesn't removes coffee button"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js
index 5d4ce3ff92..1005000f04 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-stream-test.js
@@ -21,136 +21,137 @@ function postStreamTest(name, attrs) {
});
}
-discourseModule("Integration | Component | Widget | post-stream", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | post-stream",
+ function (hooks) {
+ setupRenderingTest(hooks);
- postStreamTest("basics", {
- posts() {
- const site = this.container.lookup("site:main");
- const topic = Topic.create();
- topic.set("details.created_by", { id: 123 });
- return [
- Post.create({
- topic,
- id: 1,
- post_number: 1,
- user_id: 123,
- primary_group_name: "trout",
- avatar_template: "/images/avatar.png",
- }),
- Post.create({
- topic,
- id: 2,
- post_number: 2,
- post_type: site.get("post_types.moderator_action"),
- }),
- Post.create({ topic, id: 3, post_number: 3, hidden: true }),
- Post.create({
- topic,
- id: 4,
- post_number: 4,
- post_type: site.get("post_types.whisper"),
- }),
- Post.create({
- topic,
- id: 5,
- post_number: 5,
- wiki: true,
- via_email: true,
- }),
- Post.create({
- topic,
- id: 6,
- post_number: 6,
- via_email: true,
- is_auto_generated: true,
- }),
- ];
- },
+ postStreamTest("basics", {
+ posts() {
+ const site = this.container.lookup("site:main");
+ const topic = Topic.create();
+ topic.set("details.created_by", { id: 123 });
+ return [
+ Post.create({
+ topic,
+ id: 1,
+ post_number: 1,
+ user_id: 123,
+ primary_group_name: "trout",
+ avatar_template: "/images/avatar.png",
+ }),
+ Post.create({
+ topic,
+ id: 2,
+ post_number: 2,
+ post_type: site.get("post_types.moderator_action"),
+ }),
+ Post.create({ topic, id: 3, post_number: 3, hidden: true }),
+ Post.create({
+ topic,
+ id: 4,
+ post_number: 4,
+ post_type: site.get("post_types.whisper"),
+ }),
+ Post.create({
+ topic,
+ id: 5,
+ post_number: 5,
+ wiki: true,
+ via_email: true,
+ }),
+ Post.create({
+ topic,
+ id: 6,
+ post_number: 6,
+ via_email: true,
+ is_auto_generated: true,
+ }),
+ ];
+ },
- test(assert) {
- assert.equal(queryAll(".post-stream").length, 1);
- assert.equal(queryAll(".topic-post").length, 6, "renders all posts");
+ test(assert) {
+ assert.equal(queryAll(".post-stream").length, 1);
+ assert.equal(queryAll(".topic-post").length, 6, "renders all posts");
- // look for special class bindings
- assert.equal(
- queryAll(".topic-post:nth-of-type(1).topic-owner").length,
- 1,
- "it applies the topic owner class"
- );
- assert.equal(
- queryAll(".topic-post:nth-of-type(1).group-trout").length,
- 1,
- "it applies the primary group class"
- );
- assert.equal(
- queryAll(".topic-post:nth-of-type(1).regular").length,
- 1,
- "it applies the regular class"
- );
- assert.equal(
- queryAll(".topic-post:nth-of-type(2).moderator").length,
- 1,
- "it applies the moderator class"
- );
- assert.equal(
- queryAll(".topic-post:nth-of-type(3).post-hidden").length,
- 1,
- "it applies the hidden class"
- );
- assert.equal(
- queryAll(".topic-post:nth-of-type(4).whisper").length,
- 1,
- "it applies the whisper class"
- );
- assert.equal(
- queryAll(".topic-post:nth-of-type(5).wiki").length,
- 1,
- "it applies the wiki class"
- );
+ // look for special class bindings
+ assert.equal(
+ queryAll(".topic-post:nth-of-type(1).topic-owner").length,
+ 1,
+ "it applies the topic owner class"
+ );
+ assert.equal(
+ queryAll(".topic-post:nth-of-type(1).group-trout").length,
+ 1,
+ "it applies the primary group class"
+ );
+ assert.equal(
+ queryAll(".topic-post:nth-of-type(1).regular").length,
+ 1,
+ "it applies the regular class"
+ );
+ assert.equal(
+ queryAll(".topic-post:nth-of-type(2).moderator").length,
+ 1,
+ "it applies the moderator class"
+ );
+ assert.equal(
+ queryAll(".topic-post:nth-of-type(3).post-hidden").length,
+ 1,
+ "it applies the hidden class"
+ );
+ assert.equal(
+ queryAll(".topic-post:nth-of-type(4).whisper").length,
+ 1,
+ "it applies the whisper class"
+ );
+ assert.equal(
+ queryAll(".topic-post:nth-of-type(5).wiki").length,
+ 1,
+ "it applies the wiki class"
+ );
- // it renders an article for the body with appropriate attributes
- assert.equal(queryAll("article#post_2").length, 1);
- assert.equal(queryAll('article[data-user-id="123"]').length, 1);
- assert.equal(queryAll('article[data-post-id="3"]').length, 1);
- assert.equal(queryAll("article#post_5.via-email").length, 1);
- assert.equal(queryAll("article#post_6.is-auto-generated").length, 1);
+ // it renders an article for the body with appropriate attributes
+ assert.equal(queryAll("article#post_2").length, 1);
+ assert.equal(queryAll('article[data-user-id="123"]').length, 1);
+ assert.equal(queryAll('article[data-post-id="3"]').length, 1);
+ assert.equal(queryAll("article#post_5.via-email").length, 1);
+ assert.equal(queryAll("article#post_6.is-auto-generated").length, 1);
- assert.equal(
- queryAll("article:nth-of-type(1) .main-avatar").length,
- 1,
- "renders the main avatar"
- );
- },
- });
+ assert.equal(
+ queryAll("article:nth-of-type(1) .main-avatar").length,
+ 1,
+ "renders the main avatar"
+ );
+ },
+ });
- postStreamTest("deleted posts", {
- posts() {
- const topic = Topic.create();
- topic.set("details.created_by", { id: 123 });
- return [
- Post.create({
- topic,
- id: 1,
- post_number: 1,
- deleted_at: new Date().toString(),
- }),
- ];
- },
+ postStreamTest("deleted posts", {
+ posts() {
+ const topic = Topic.create();
+ topic.set("details.created_by", { id: 123 });
+ return [
+ Post.create({
+ topic,
+ id: 1,
+ post_number: 1,
+ deleted_at: new Date().toString(),
+ }),
+ ];
+ },
- test(assert) {
- assert.equal(
- queryAll(".topic-post.deleted").length,
- 1,
- "it applies the deleted class"
- );
- assert.equal(
- queryAll(".deleted-user-avatar").length,
- 1,
- "it has the trash avatar"
- );
- },
- });
-});
+ test(assert) {
+ assert.equal(
+ queryAll(".topic-post.deleted").length,
+ 1,
+ "it applies the deleted class"
+ );
+ assert.equal(
+ queryAll(".deleted-user-avatar").length,
+ 1,
+ "it has the trash avatar"
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
index 9206c230eb..5f74973677 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
@@ -113,7 +113,7 @@ discourseModule("Integration | Component | Widget | post", function (hooks) {
this.on("showHistory", () => (this.historyShown = true));
},
async test(assert) {
- await click(".post-info.edits");
+ await click(".post-info.edits button");
assert.ok(this.historyShown, "clicking the pencil shows the history");
},
});
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js
index 0c2a15ba76..725ba46060 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/poster-name-test.js
@@ -6,74 +6,75 @@ import {
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
-discourseModule("Integration | Component | Widget | poster-name", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | poster-name",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("basic rendering", {
- template: '{{mount-widget widget="poster-name" args=args}}',
- beforeEach() {
- this.set("args", {
- username: "eviltrout",
- usernameUrl: "/u/eviltrout",
- name: "Robin Ward",
- user_title: "Trout Master",
- });
- },
- test(assert) {
- assert.ok(queryAll(".names").length);
- assert.ok(queryAll("span.username").length);
- assert.ok(queryAll('a[data-user-card="eviltrout"]').length);
- assert.equal(queryAll(".username a").text(), "eviltrout");
- assert.equal(queryAll(".full-name a").text(), "Robin Ward");
- assert.equal(queryAll(".user-title").text(), "Trout Master");
- },
- });
+ componentTest("basic rendering", {
+ template: '{{mount-widget widget="poster-name" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ username: "eviltrout",
+ usernameUrl: "/u/eviltrout",
+ name: "Robin Ward",
+ user_title: "Trout Master",
+ });
+ },
+ test(assert) {
+ assert.ok(queryAll(".names").length);
+ assert.ok(queryAll("span.username").length);
+ assert.ok(queryAll('a[data-user-card="eviltrout"]').length);
+ assert.equal(queryAll(".username a").text(), "eviltrout");
+ assert.equal(queryAll(".full-name a").text(), "Robin Ward");
+ assert.equal(queryAll(".user-title").text(), "Trout Master");
+ },
+ });
- componentTest("extra classes and glyphs", {
- template: '{{mount-widget widget="poster-name" args=args}}',
- beforeEach() {
- this.set("args", {
- username: "eviltrout",
- usernameUrl: "/u/eviltrout",
- staff: true,
- admin: true,
- moderator: true,
- new_user: true,
- primary_group_name: "fish",
- });
- },
- test(assert) {
- assert.ok(queryAll("span.staff").length);
- assert.ok(queryAll("span.admin").length);
- assert.ok(queryAll("span.moderator").length);
- assert.ok(queryAll(".d-icon-shield-alt").length);
- assert.ok(queryAll("span.new-user").length);
- assert.ok(queryAll("span.fish").length);
- },
- });
+ componentTest("extra classes and glyphs", {
+ template: '{{mount-widget widget="poster-name" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ username: "eviltrout",
+ usernameUrl: "/u/eviltrout",
+ staff: true,
+ admin: true,
+ moderator: true,
+ new_user: true,
+ primary_group_name: "fish",
+ });
+ },
+ test(assert) {
+ assert.ok(queryAll("span.staff").length);
+ assert.ok(queryAll("span.admin").length);
+ assert.ok(queryAll("span.moderator").length);
+ assert.ok(queryAll(".d-icon-shield-alt").length);
+ assert.ok(queryAll("span.new-user").length);
+ assert.ok(queryAll("span.fish").length);
+ },
+ });
- componentTest("disable display name on posts", {
- template: '{{mount-widget widget="poster-name" args=args}}',
- beforeEach() {
- this.siteSettings.display_name_on_posts = false;
- this.set("args", { username: "eviltrout", name: "Robin Ward" });
- },
- test(assert) {
- assert.equal(queryAll(".full-name").length, 0);
- },
- });
+ componentTest("disable display name on posts", {
+ template: '{{mount-widget widget="poster-name" args=args}}',
+ beforeEach() {
+ this.siteSettings.display_name_on_posts = false;
+ this.set("args", { username: "eviltrout", name: "Robin Ward" });
+ },
+ test(assert) {
+ assert.equal(queryAll(".full-name").length, 0);
+ },
+ });
- componentTest("doesn't render a name if it's similar to the username", {
- template: '{{mount-widget widget="poster-name" args=args}}',
- beforeEach() {
- this.siteSettings.prioritize_username_in_ux = true;
- this.siteSettings.display_name_on_posts = true;
- this.set("args", { username: "eviltrout", name: "evil-trout" });
- },
- test(assert) {
- assert.equal(queryAll(".second").length, 0);
- },
- });
-});
+ componentTest("doesn't render a name if it's similar to the username", {
+ template: '{{mount-widget widget="poster-name" args=args}}',
+ beforeEach() {
+ this.siteSettings.prioritize_username_in_ux = true;
+ this.siteSettings.display_name_on_posts = true;
+ this.set("args", { username: "eviltrout", name: "evil-trout" });
+ },
+ test(assert) {
+ assert.equal(queryAll(".second").length, 0);
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js
index 20ae8b1206..95316703f7 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/small-user-list-test.js
@@ -6,25 +6,26 @@ import {
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
-discourseModule("Integration | Component | Widget | small-user-list", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | small-user-list",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("renders avatars and support for unknown", {
- template: '{{mount-widget widget="small-user-list" args=args}}',
- beforeEach() {
- this.set("args", {
- users: [
- { id: 456, username: "eviltrout" },
- { id: 457, username: "someone", unknown: true },
- ],
- });
- },
- async test(assert) {
- assert.ok(queryAll('[data-user-card="eviltrout"]').length === 1);
- assert.ok(queryAll('[data-user-card="someone"]').length === 0);
- assert.ok(queryAll(".unknown").length, "includes unkown user");
- },
- });
-});
+ componentTest("renders avatars and support for unknown", {
+ template: '{{mount-widget widget="small-user-list" args=args}}',
+ beforeEach() {
+ this.set("args", {
+ users: [
+ { id: 456, username: "eviltrout" },
+ { id: 457, username: "someone", unknown: true },
+ ],
+ });
+ },
+ async test(assert) {
+ assert.ok(queryAll('[data-user-card="eviltrout"]').length === 1);
+ assert.ok(queryAll('[data-user-card="someone"]').length === 0);
+ assert.ok(queryAll(".unknown").length, "includes unkown user");
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js
index 89fce7aeb1..f8e8377eb0 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/topic-status-test.js
@@ -7,41 +7,42 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
import TopicStatusIcons from "discourse/helpers/topic-status-icons";
-discourseModule("Integration | Component | Widget | topic-status", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | topic-status",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("basics", {
- template: '{{mount-widget widget="topic-status" args=args}}',
- beforeEach(store) {
- this.set("args", {
- topic: store.createRecord("topic", { closed: true }),
- disableActions: true,
- });
- },
- test(assert) {
- assert.ok(queryAll(".topic-status .d-icon-lock").length);
- },
- });
+ componentTest("basics", {
+ template: '{{mount-widget widget="topic-status" args=args}}',
+ beforeEach(store) {
+ this.set("args", {
+ topic: store.createRecord("topic", { closed: true }),
+ disableActions: true,
+ });
+ },
+ test(assert) {
+ assert.ok(queryAll(".topic-status .d-icon-lock").length);
+ },
+ });
- componentTest("extendability", {
- template: '{{mount-widget widget="topic-status" args=args}}',
- beforeEach(store) {
- TopicStatusIcons.addObject([
- "has_accepted_answer",
- "far-check-square",
- "solved",
- ]);
- this.set("args", {
- topic: store.createRecord("topic", {
- has_accepted_answer: true,
- }),
- disableActions: true,
- });
- },
- test(assert) {
- assert.ok(queryAll(".topic-status .d-icon-far-check-square").length);
- },
- });
-});
+ componentTest("extendability", {
+ template: '{{mount-widget widget="topic-status" args=args}}',
+ beforeEach(store) {
+ TopicStatusIcons.addObject([
+ "has_accepted_answer",
+ "far-check-square",
+ "solved",
+ ]);
+ this.set("args", {
+ topic: store.createRecord("topic", {
+ has_accepted_answer: true,
+ }),
+ disableActions: true,
+ });
+ },
+ test(assert) {
+ assert.ok(queryAll(".topic-status .d-icon-far-check-square").length);
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js
index 891c07101c..232745f935 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/user-menu-test.js
@@ -10,224 +10,227 @@ import I18n from "I18n";
import { click } from "@ember/test-helpers";
import sinon from "sinon";
-discourseModule("Integration | Component | Widget | user-menu", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | user-menu",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("basics", {
- template: '{{mount-widget widget="user-menu"}}',
+ componentTest("basics", {
+ template: '{{mount-widget widget="user-menu"}}',
- test(assert) {
- assert.ok(queryAll(".user-menu").length);
- assert.ok(queryAll(".user-preferences-link").length);
- assert.ok(queryAll(".user-notifications-link").length);
- assert.ok(queryAll(".user-bookmarks-link").length);
- assert.ok(queryAll(".quick-access-panel").length);
- assert.ok(queryAll(".notifications-dismiss").length);
- },
- });
+ test(assert) {
+ assert.ok(queryAll(".user-menu").length);
+ assert.ok(queryAll(".user-preferences-link").length);
+ assert.ok(queryAll(".user-notifications-link").length);
+ assert.ok(queryAll(".user-bookmarks-link").length);
+ assert.ok(queryAll(".quick-access-panel").length);
+ assert.ok(queryAll(".notifications-dismiss").length);
+ },
+ });
- componentTest("notifications", {
- template: '{{mount-widget widget="user-menu"}}',
+ componentTest("notifications", {
+ template: '{{mount-widget widget="user-menu"}}',
- async test(assert) {
- const $links = queryAll(".quick-access-panel li a");
+ async test(assert) {
+ const $links = queryAll(".quick-access-panel li a");
- assert.equal($links.length, 5);
- assert.ok($links[0].href.includes("/t/a-slug/123"));
+ assert.equal($links.length, 5);
+ assert.ok($links[0].href.includes("/t/a-slug/123"));
- assert.ok(
- $links[1].href.includes(
- "/u/eviltrout/notifications/likes-received?acting_username=aquaman"
- )
- );
+ assert.ok(
+ $links[1].href.includes(
+ "/u/eviltrout/notifications/likes-received?acting_username=aquaman"
+ )
+ );
- assert.equal(
- $links[1].text,
- `aquaman ${I18n.t("notifications.liked_consolidated_description", {
- count: 5,
- })}`
- );
-
- assert.ok($links[2].href.includes("/u/test2/messages/group/test"));
- assert.ok(
- $links[2].innerHTML.includes(
- I18n.t("notifications.group_message_summary", {
+ assert.equal(
+ $links[1].text,
+ `aquaman ${I18n.t("notifications.liked_consolidated_description", {
count: 5,
- group_name: "test",
- })
- )
- );
+ })}`
+ );
- assert.ok($links[3].href.includes("/u/test1"));
- assert.ok(
- $links[3].innerHTML.includes(
- I18n.t("notifications.invitee_accepted", { username: "test1" })
- )
- );
+ assert.ok($links[2].href.includes("/u/test2/messages/group/test"));
+ assert.ok(
+ $links[2].innerHTML.includes(
+ I18n.t("notifications.group_message_summary", {
+ count: 5,
+ group_name: "test",
+ })
+ )
+ );
- assert.ok($links[4].href.includes("/g/test"));
- assert.ok(
- $links[4].innerHTML.includes(
- I18n.t("notifications.membership_request_accepted", {
- group_name: "test",
- })
- )
- );
+ assert.ok($links[3].href.includes("/u/test1"));
+ assert.ok(
+ $links[3].innerHTML.includes(
+ I18n.t("notifications.invitee_accepted", { username: "test1" })
+ )
+ );
- const routeToStub = sinon.stub(DiscourseURL, "routeTo");
- await click(".user-notifications-link");
- assert.ok(
- routeToStub.calledWith(queryAll(".user-notifications-link")[0].href),
- "a second click should redirect to the full notifications page"
- );
- },
- });
+ assert.ok($links[4].href.includes("/g/test"));
+ assert.ok(
+ $links[4].innerHTML.includes(
+ I18n.t("notifications.membership_request_accepted", {
+ group_name: "test",
+ })
+ )
+ );
- componentTest("log out", {
- template: '{{mount-widget widget="user-menu" logout=(action "logout")}}',
+ const routeToStub = sinon.stub(DiscourseURL, "routeTo");
+ await click(".user-notifications-link");
+ assert.ok(
+ routeToStub.calledWith(
+ queryAll(".user-notifications-link").data("url")
+ ),
+ "a second click should redirect to the full notifications page"
+ );
+ },
+ });
- beforeEach() {
- this.on("logout", () => (this.loggedOut = true));
- },
+ componentTest("log out", {
+ template: '{{mount-widget widget="user-menu" logout=(action "logout")}}',
- async test(assert) {
- await click(".user-preferences-link");
+ beforeEach() {
+ this.on("logout", () => (this.loggedOut = true));
+ },
- assert.ok(queryAll(".logout").length);
+ async test(assert) {
+ await click(".user-preferences-link");
- await click(".logout button");
- assert.ok(this.loggedOut);
- },
- });
+ assert.ok(queryAll(".logout").length);
- componentTest("private messages - disabled", {
- template: '{{mount-widget widget="user-menu"}}',
- beforeEach() {
- this.siteSettings.enable_personal_messages = false;
- },
+ await click(".logout button");
+ assert.ok(this.loggedOut);
+ },
+ });
- test(assert) {
- assert.ok(!queryAll(".user-pms-link").length);
- },
- });
+ componentTest("private messages - disabled", {
+ template: '{{mount-widget widget="user-menu"}}',
+ beforeEach() {
+ this.siteSettings.enable_personal_messages = false;
+ },
- componentTest("private messages - enabled", {
- template: '{{mount-widget widget="user-menu"}}',
- beforeEach() {
- this.siteSettings.enable_personal_messages = true;
- },
+ test(assert) {
+ assert.ok(!queryAll(".user-pms-link").length);
+ },
+ });
- async test(assert) {
- const userPmsLink = queryAll(".user-pms-link")[0];
- assert.ok(userPmsLink);
- await click(".user-pms-link");
+ componentTest("private messages - enabled", {
+ template: '{{mount-widget widget="user-menu"}}',
+ beforeEach() {
+ this.siteSettings.enable_personal_messages = true;
+ },
- const message = queryAll(".quick-access-panel li a")[0];
- assert.ok(message);
+ async test(assert) {
+ const userPmsLink = queryAll(".user-pms-link").data("url");
+ assert.ok(userPmsLink);
+ await click(".user-pms-link");
- assert.ok(
- message.href.includes("/t/bug-can-not-render-emoji-properly/174/2"),
- "should link to the next unread post"
- );
- assert.ok(
- message.innerHTML.includes("mixtape"),
- "should include the last poster's username"
- );
- assert.ok(
- message.innerHTML.match(//),
- "should correctly render emoji in message title"
- );
+ const message = queryAll(".quick-access-panel li a")[0];
+ assert.ok(message);
- const routeToStub = sinon.stub(DiscourseURL, "routeTo");
- await click(".user-pms-link");
- assert.ok(
- routeToStub.calledWith(userPmsLink.href),
- "a second click should redirect to the full private messages page"
- );
- },
- });
+ assert.ok(
+ message.href.includes("/t/bug-can-not-render-emoji-properly/174/2"),
+ "should link to the next unread post"
+ );
+ assert.ok(
+ message.innerHTML.includes("mixtape"),
+ "should include the last poster's username"
+ );
+ assert.ok(
+ message.innerHTML.match(//),
+ "should correctly render emoji in message title"
+ );
- componentTest("bookmarks", {
- template: '{{mount-widget widget="user-menu"}}',
+ const routeToStub = sinon.stub(DiscourseURL, "routeTo");
+ await click(".user-pms-link");
+ assert.ok(
+ routeToStub.calledWith(userPmsLink),
+ "a second click should redirect to the full private messages page"
+ );
+ },
+ });
- async test(assert) {
- await click(".user-bookmarks-link");
+ componentTest("bookmarks", {
+ template: '{{mount-widget widget="user-menu"}}',
- const bookmark = queryAll(".quick-access-panel li a")[0];
- assert.ok(bookmark);
+ async test(assert) {
+ await click(".user-bookmarks-link");
- assert.ok(bookmark.href.includes("/t/yelling-topic-title/119"));
- assert.ok(
- bookmark.innerHTML.includes("someguy"),
- "should include the last poster's username"
- );
- assert.ok(
- bookmark.innerHTML.match(//),
- "should correctly render emoji in bookmark title"
- );
+ const bookmark = queryAll(".quick-access-panel li a")[0];
+ assert.ok(bookmark);
- const routeToStub = sinon.stub(DiscourseURL, "routeTo");
- await click(".user-bookmarks-link");
- assert.ok(
- routeToStub.calledWith(queryAll(".user-bookmarks-link")[0].href),
- "a second click should redirect to the full bookmarks page"
- );
- },
- });
+ assert.ok(bookmark.href.includes("/t/yelling-topic-title/119"));
+ assert.ok(
+ bookmark.innerHTML.includes("someguy"),
+ "should include the last poster's username"
+ );
+ assert.ok(
+ bookmark.innerHTML.match(//),
+ "should correctly render emoji in bookmark title"
+ );
- componentTest("anonymous", {
- template:
- '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
+ const routeToStub = sinon.stub(DiscourseURL, "routeTo");
+ await click(".user-bookmarks-link");
+ assert.ok(
+ routeToStub.calledWith(queryAll(".user-bookmarks-link").data("url")),
+ "a second click should redirect to the full bookmarks page"
+ );
+ },
+ });
- beforeEach() {
- this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
- this.siteSettings.allow_anonymous_posting = true;
- this.siteSettings.anonymous_posting_min_trust_level = 3;
+ componentTest("anonymous", {
+ template:
+ '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
- this.on("toggleAnonymous", () => (this.anonymous = true));
- },
+ beforeEach() {
+ this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
+ this.siteSettings.allow_anonymous_posting = true;
+ this.siteSettings.anonymous_posting_min_trust_level = 3;
- async test(assert) {
- await click(".user-preferences-link");
- assert.ok(queryAll(".enable-anonymous").length);
+ this.on("toggleAnonymous", () => (this.anonymous = true));
+ },
- await click(".enable-anonymous");
- assert.ok(this.anonymous);
- },
- });
+ async test(assert) {
+ await click(".user-preferences-link");
+ assert.ok(queryAll(".enable-anonymous").length);
- componentTest("anonymous - disabled", {
- template: '{{mount-widget widget="user-menu"}}',
+ await click(".enable-anonymous");
+ assert.ok(this.anonymous);
+ },
+ });
- beforeEach() {
- this.siteSettings.allow_anonymous_posting = false;
- },
+ componentTest("anonymous - disabled", {
+ template: '{{mount-widget widget="user-menu"}}',
- async test(assert) {
- await click(".user-preferences-link");
- assert.ok(!queryAll(".enable-anonymous").length);
- },
- });
+ beforeEach() {
+ this.siteSettings.allow_anonymous_posting = false;
+ },
- componentTest("anonymous - switch back", {
- template:
- '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
+ async test(assert) {
+ await click(".user-preferences-link");
+ assert.ok(!queryAll(".enable-anonymous").length);
+ },
+ });
- beforeEach() {
- this.currentUser.setProperties({ is_anonymous: true });
- this.siteSettings.allow_anonymous_posting = true;
+ componentTest("anonymous - switch back", {
+ template:
+ '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
- this.on("toggleAnonymous", () => (this.anonymous = false));
- },
+ beforeEach() {
+ this.currentUser.setProperties({ is_anonymous: true });
+ this.siteSettings.allow_anonymous_posting = true;
- async test(assert) {
- await click(".user-preferences-link");
- assert.ok(queryAll(".disable-anonymous").length);
+ this.on("toggleAnonymous", () => (this.anonymous = false));
+ },
- await click(".disable-anonymous");
- assert.notOk(this.anonymous);
- },
- });
-});
+ async test(assert) {
+ await click(".user-preferences-link");
+ assert.ok(queryAll(".disable-anonymous").length);
+
+ await click(".disable-anonymous");
+ assert.notOk(this.anonymous);
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js
index 9e2642a16a..f17e92981c 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/widget-dropdown-test.js
@@ -60,79 +60,79 @@ const TEMPLATE = `
)
}}`;
-discourseModule("Integration | Component | Widget | widget-dropdown", function (
- hooks
-) {
- setupRenderingTest(hooks);
+discourseModule(
+ "Integration | Component | Widget | widget-dropdown",
+ function (hooks) {
+ setupRenderingTest(hooks);
- componentTest("dropdown id", {
- template: TEMPLATE,
+ componentTest("dropdown id", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ },
- test(assert) {
- assert.ok(exists("#my-dropdown"));
- },
- });
+ test(assert) {
+ assert.ok(exists("#my-dropdown"));
+ },
+ });
- componentTest("label", {
- template: TEMPLATE,
+ componentTest("label", {
+ template: TEMPLATE,
- _translations: I18n.translations,
+ _translations: I18n.translations,
- beforeEach() {
- I18n.translations = { en: { js: { foo: "FooBaz" } } };
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ I18n.translations = { en: { js: { foo: "FooBaz" } } };
+ this.setProperties(DEFAULT_CONTENT);
+ },
- afterEach() {
- I18n.translations = this._translations;
- },
+ afterEach() {
+ I18n.translations = this._translations;
+ },
- test(assert) {
- assert.equal(headerLabel(), "FooBaz");
- },
- });
+ test(assert) {
+ assert.equal(headerLabel(), "FooBaz");
+ },
+ });
- componentTest("translatedLabel", {
- template: TEMPLATE,
+ componentTest("translatedLabel", {
+ template: TEMPLATE,
- _translations: I18n.translations,
+ _translations: I18n.translations,
- beforeEach() {
- I18n.translations = { en: { js: { foo: "FooBaz" } } };
- this.setProperties(DEFAULT_CONTENT);
- this.set("translatedLabel", "BazFoo");
- },
+ beforeEach() {
+ I18n.translations = { en: { js: { foo: "FooBaz" } } };
+ this.setProperties(DEFAULT_CONTENT);
+ this.set("translatedLabel", "BazFoo");
+ },
- afterEach() {
- I18n.translations = this._translations;
- },
+ afterEach() {
+ I18n.translations = this._translations;
+ },
- test(assert) {
- assert.equal(headerLabel(), this.translatedLabel);
- },
- });
+ test(assert) {
+ assert.equal(headerLabel(), this.translatedLabel);
+ },
+ });
- componentTest("content", {
- template: TEMPLATE,
+ componentTest("content", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ },
- async test(assert) {
- await toggle();
- assert.equal(rowById(1).dataset.id, 1, "it creates rows");
- assert.equal(rowById(2).dataset.id, 2, "it creates rows");
- assert.equal(rowById(3).dataset.id, 3, "it creates rows");
- },
- });
+ async test(assert) {
+ await toggle();
+ assert.equal(rowById(1).dataset.id, 1, "it creates rows");
+ assert.equal(rowById(2).dataset.id, 2, "it creates rows");
+ assert.equal(rowById(3).dataset.id, 3, "it creates rows");
+ },
+ });
- componentTest("onChange action", {
- template: `
+ componentTest("onChange action", {
+ template: `
{{mount-widget
widget="widget-dropdown"
@@ -145,204 +145,205 @@ discourseModule("Integration | Component | Widget | widget-dropdown", function (
}}
`,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
- this.on(
- "onChange",
- (item) => (this._element.querySelector("#test").innerText = item.id)
- );
- },
+ this.on(
+ "onChange",
+ (item) => (this._element.querySelector("#test").innerText = item.id)
+ );
+ },
- async test(assert) {
- await toggle();
- await clickRowById(2);
- assert.equal(
- queryAll("#test").text(),
- 2,
- "it calls the onChange actions"
- );
- },
- });
+ async test(assert) {
+ await toggle();
+ await clickRowById(2);
+ assert.equal(
+ queryAll("#test").text(),
+ 2,
+ "it calls the onChange actions"
+ );
+ },
+ });
- componentTest("can be opened and closed", {
- template: TEMPLATE,
+ componentTest("can be opened and closed", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ },
- async test(assert) {
- assert.ok(exists("#my-dropdown.closed"));
- assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
- await toggle();
- assert.equal(rowById(2).innerText.trim(), "FooBar");
- assert.ok(exists("#my-dropdown.opened"));
- assert.ok(exists("#my-dropdown .widget-dropdown-body"));
- await toggle();
- assert.ok(exists("#my-dropdown.closed"));
- assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
- },
- });
+ async test(assert) {
+ assert.ok(exists("#my-dropdown.closed"));
+ assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
+ await toggle();
+ assert.equal(rowById(2).innerText.trim(), "FooBar");
+ assert.ok(exists("#my-dropdown.opened"));
+ assert.ok(exists("#my-dropdown .widget-dropdown-body"));
+ await toggle();
+ assert.ok(exists("#my-dropdown.closed"));
+ assert.ok(!exists("#my-dropdown .widget-dropdown-body"));
+ },
+ });
- componentTest("icon", {
- template: TEMPLATE,
+ componentTest("icon", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- this.set("icon", "times");
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ this.set("icon", "times");
+ },
- test(assert) {
- assert.ok(exists(header().querySelector(".d-icon-times")));
- },
- });
+ test(assert) {
+ assert.ok(exists(header().querySelector(".d-icon-times")));
+ },
+ });
- componentTest("class", {
- template: TEMPLATE,
+ componentTest("class", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- this.set("class", "activated");
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ this.set("class", "activated");
+ },
- test(assert) {
- assert.ok(exists("#my-dropdown.activated"));
- },
- });
+ test(assert) {
+ assert.ok(exists("#my-dropdown.activated"));
+ },
+ });
- componentTest("content with translatedLabel", {
- template: TEMPLATE,
+ componentTest("content with translatedLabel", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ },
- async test(assert) {
- await toggle();
- assert.equal(rowById(2).innerText.trim(), "FooBar");
- },
- });
+ async test(assert) {
+ await toggle();
+ assert.equal(rowById(2).innerText.trim(), "FooBar");
+ },
+ });
- componentTest("content with label", {
- template: TEMPLATE,
+ componentTest("content with label", {
+ template: TEMPLATE,
- _translations: I18n.translations,
+ _translations: I18n.translations,
- beforeEach() {
- I18n.translations = { en: { js: { foo: "FooBaz" } } };
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ I18n.translations = { en: { js: { foo: "FooBaz" } } };
+ this.setProperties(DEFAULT_CONTENT);
+ },
- afterEach() {
- I18n.translations = this._translations;
- },
+ afterEach() {
+ I18n.translations = this._translations;
+ },
- async test(assert) {
- await toggle();
- assert.equal(rowById(1).innerText.trim(), "FooBaz");
- },
- });
+ async test(assert) {
+ await toggle();
+ assert.equal(rowById(1).innerText.trim(), "FooBaz");
+ },
+ });
- componentTest("content with icon", {
- template: TEMPLATE,
+ componentTest("content with icon", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ },
- async test(assert) {
- await toggle();
- assert.ok(exists(rowById(3).querySelector(".d-icon-times")));
- },
- });
+ async test(assert) {
+ await toggle();
+ assert.ok(exists(rowById(3).querySelector(".d-icon-times")));
+ },
+ });
- componentTest("content with html", {
- template: TEMPLATE,
+ componentTest("content with html", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ },
- async test(assert) {
- await toggle();
- assert.equal(rowById(4).innerHTML.trim(), "baz");
- },
- });
+ async test(assert) {
+ await toggle();
+ assert.equal(rowById(4).innerHTML.trim(), "baz");
+ },
+ });
- componentTest("separator", {
- template: TEMPLATE,
+ componentTest("separator", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ },
- async test(assert) {
- await toggle();
- assert.ok(
- queryAll(
- "#my-dropdown .widget-dropdown-item:nth-child(3)"
- )[0].classList.contains("separator")
- );
- },
- });
+ async test(assert) {
+ await toggle();
+ assert.ok(
+ queryAll(
+ "#my-dropdown .widget-dropdown-item:nth-child(3)"
+ )[0].classList.contains("separator")
+ );
+ },
+ });
- componentTest("hides widget if no content", {
- template: TEMPLATE,
+ componentTest("hides widget if no content", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties({ content: null, label: "foo" });
- },
+ beforeEach() {
+ this.setProperties({ content: null, label: "foo" });
+ },
- test(assert) {
- assert.notOk(exists("#my-dropdown .widget-dropdown-header"));
- assert.notOk(exists("#my-dropdown .widget-dropdown-body"));
- },
- });
+ test(assert) {
+ assert.notOk(exists("#my-dropdown .widget-dropdown-header"));
+ assert.notOk(exists("#my-dropdown .widget-dropdown-body"));
+ },
+ });
- componentTest("headerClass option", {
- template: TEMPLATE,
+ componentTest("headerClass option", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- this.set("options", { headerClass: "btn-small and-text" });
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ this.set("options", { headerClass: "btn-small and-text" });
+ },
- test(assert) {
- assert.ok(header().classList.contains("widget-dropdown-header"));
- assert.ok(header().classList.contains("btn-small"));
- assert.ok(header().classList.contains("and-text"));
- },
- });
+ test(assert) {
+ assert.ok(header().classList.contains("widget-dropdown-header"));
+ assert.ok(header().classList.contains("btn-small"));
+ assert.ok(header().classList.contains("and-text"));
+ },
+ });
- componentTest("bodyClass option", {
- template: TEMPLATE,
+ componentTest("bodyClass option", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- this.set("options", { bodyClass: "gigantic and-yet-small" });
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ this.set("options", { bodyClass: "gigantic and-yet-small" });
+ },
- async test(assert) {
- await toggle();
- assert.ok(body().classList.contains("widget-dropdown-body"));
- assert.ok(body().classList.contains("gigantic"));
- assert.ok(body().classList.contains("and-yet-small"));
- },
- });
+ async test(assert) {
+ await toggle();
+ assert.ok(body().classList.contains("widget-dropdown-body"));
+ assert.ok(body().classList.contains("gigantic"));
+ assert.ok(body().classList.contains("and-yet-small"));
+ },
+ });
- componentTest("caret option", {
- template: TEMPLATE,
+ componentTest("caret option", {
+ template: TEMPLATE,
- beforeEach() {
- this.setProperties(DEFAULT_CONTENT);
- this.set("options", { caret: true });
- },
+ beforeEach() {
+ this.setProperties(DEFAULT_CONTENT);
+ this.set("options", { caret: true });
+ },
- test(assert) {
- assert.ok(
- exists("#my-dropdown .widget-dropdown-header .d-icon-caret-down")
- );
- },
- });
-});
+ test(assert) {
+ assert.ok(
+ exists("#my-dropdown .widget-dropdown-header .d-icon-caret-down")
+ );
+ },
+ });
+ }
+);
diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js
index 39f97ab8b7..10924acedc 100644
--- a/app/assets/javascripts/discourse/tests/setup-tests.js
+++ b/app/assets/javascripts/discourse/tests/setup-tests.js
@@ -33,9 +33,9 @@ const Modal = Plugin.Constructor;
function AcceptanceModal(option, _relatedTarget) {
return this.each(function () {
- var $this = $(this);
- var data = $this.data("bs.modal");
- var options = $.extend(
+ let $this = $(this);
+ let data = $this.data("bs.modal");
+ let options = $.extend(
{},
Modal.DEFAULTS,
$this.data(),
@@ -202,8 +202,8 @@ export default function setupTests(app, container) {
// Load ES6 tests
function getUrlParameter(name) {
name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
- var regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
- var results = regex.exec(location.search);
+ let regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
+ let results = regex.exec(location.search);
return results === null
? ""
: decodeURIComponent(results[1].replace(/\+/g, " "));
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
index ca8a6b1856..e67342fbb4 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
@@ -6,6 +6,7 @@ import {
import KeyboardShortcutInitializer from "discourse/initializers/keyboard-shortcuts";
import { REMINDER_TYPES } from "discourse/lib/bookmark";
import User from "discourse/models/user";
+import { getApplication } from "@ember/test-helpers";
import sinon from "sinon";
import { test } from "qunit";
@@ -18,7 +19,7 @@ function mockMomentTz(dateString) {
discourseModule("Unit | Controller | bookmark", function (hooks) {
hooks.beforeEach(function () {
logIn();
- KeyboardShortcutInitializer.initialize(this.container);
+ KeyboardShortcutInitializer.initialize(getApplication());
BookmarkController = this.owner.lookup("controller:bookmark");
BookmarkController.setProperties({
diff --git a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
index decaab7f4a..155af39015 100644
--- a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
@@ -5,8 +5,8 @@ let originalTemplates;
let resolver;
function lookupTemplate(assert, name, expectedTemplate, message) {
- var parseName = resolver.parseName(name);
- var result = resolver.resolveTemplate(parseName);
+ let parseName = resolver.parseName(name);
+ let result = resolver.resolveTemplate(parseName);
assert.equal(result, expectedTemplate, message);
}
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js b/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js
index de2f56eed3..14b0b66d81 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/click-track-test.js
@@ -154,7 +154,7 @@ module("Unit | Utility | click-track", function (hooks) {
assert.notOk(track(generateClickEventOn("a")));
- var $link = fixture("a").first();
+ let $link = fixture("a").first();
assert.ok($link.hasClass("no-href"));
assert.equal($link.data("href"), "http://www.google.com/");
assert.blank($link.attr("href"));
@@ -178,7 +178,7 @@ module("Unit | Utility | click-track", function (hooks) {
function badgeClickCount(assert, id, expected) {
track(generateClickEventOn("#" + id));
- var $badge = $("span.badge", fixture("#" + id).first());
+ let $badge = $("span.badge", fixture("#" + id).first());
assert.equal(parseInt($badge.html(), 10), expected);
}
@@ -200,7 +200,7 @@ module("Unit | Utility | click-track", function (hooks) {
function testOpenInANewTab(description, clickEventModifier) {
test(description, async function (assert) {
- var clickEvent = generateClickEventOn("a");
+ let clickEvent = generateClickEventOn("a");
clickEventModifier(clickEvent);
assert.ok(track(clickEvent));
assert.notOk(clickEvent.defaultPrevented);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js
index 216e42cd63..e8d7cd3db9 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js
@@ -45,7 +45,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
});
test("propertyEqual", function (assert) {
- var t = EmberObject.extend({
+ let t = EmberObject.extend({
same: propertyEqual("cookies", "biscuits"),
}).create({
cookies: 10,
@@ -58,7 +58,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
});
test("propertyNotEqual", function (assert) {
- var t = EmberObject.extend({
+ let t = EmberObject.extend({
diff: propertyNotEqual("cookies", "biscuits"),
}).create({
cookies: 10,
@@ -71,7 +71,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
});
test("fmt", function (assert) {
- var t = EmberObject.extend({
+ let t = EmberObject.extend({
exclaimyUsername: fmt("username", "!!! %@ !!!"),
multiple: fmt("username", "mood", "%@ is %@"),
}).create({
@@ -105,7 +105,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
});
test("i18n", function (assert) {
- var t = EmberObject.extend({
+ let t = EmberObject.extend({
exclaimyUsername: i18n("username", "!!! %@ !!!"),
multiple: i18n("username", "mood", "%@ is %@"),
}).create({
@@ -139,7 +139,7 @@ discourseModule("Unit | Utility | computed", function (hooks) {
});
test("url", function (assert) {
- var t, testClass;
+ let t, testClass;
testClass = EmberObject.extend({
userUrl: url("username", "/u/%@"),
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
index fa7faff0fc..71cc9bc95a 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
@@ -159,7 +159,7 @@ discourseModule("Unit | Utility | formatter", function (hooks) {
assert.equal(formatDays(-500), shortDateYear(-500));
assert.equal(formatDays(-365 * 2 - 1), shortDateYear(-365 * 2 - 1)); // one leap year
- var originalValue = this.siteSettings.relative_date_duration;
+ let originalValue = this.siteSettings.relative_date_duration;
this.siteSettings.relative_date_duration = 7;
assert.equal(formatDays(7), "7d");
assert.equal(formatDays(8), shortDate(8));
@@ -203,9 +203,9 @@ discourseModule("Unit | Utility | formatter", function (hooks) {
});
test("autoUpdatingRelativeAge", function (assert) {
- var d = moment().subtract(1, "day").toDate();
+ let d = moment().subtract(1, "day").toDate();
- var $elem = $(autoUpdatingRelativeAge(d));
+ let $elem = $(autoUpdatingRelativeAge(d));
assert.equal($elem.data("format"), "tiny");
assert.equal($elem.data("time"), d.getTime());
assert.equal($elem.attr("title"), undefined);
@@ -233,8 +233,8 @@ discourseModule("Unit | Utility | formatter", function (hooks) {
});
test("updateRelativeAge", function (assert) {
- var d = new Date();
- var $elem = $(autoUpdatingRelativeAge(d));
+ let d = new Date();
+ let $elem = $(autoUpdatingRelativeAge(d));
$elem.data("time", d.getTime() - 2 * 60 * 1000);
updateRelativeAge($elem);
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js b/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
index 82d86b838a..626de26679 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
@@ -60,6 +60,12 @@ module("Unit | Utility | get-url", function () {
"relative url has subfolder"
);
+ assert.equal(
+ getURL("/u/forumadmin"),
+ "/forum/u/forumadmin",
+ "relative url has subfolder even if username contains subfolder"
+ );
+
assert.equal(
getURL(""),
"/forum",
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
index 25b6121bda..02be685e6b 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js
@@ -194,7 +194,7 @@ discourseModule("Unit | Utility | uploads", function () {
test("isImage", function (assert) {
["png", "webp", "jpg", "jpeg", "gif", "ico"].forEach((extension) => {
- var image = "image." + extension;
+ let image = "image." + extension;
assert.ok(isImage(image), image + " is recognized as an image");
assert.ok(
isImage("http://foo.bar/path/to/" + image),
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
index e76b27877d..6739b729a7 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js
@@ -71,7 +71,7 @@ discourseModule("Unit | Utilities", function () {
});
test("avatarUrl", function (assert) {
- var rawSize = getRawSize;
+ let rawSize = getRawSize;
assert.blank(avatarUrl("", "tiny"), "no template returns blank");
assert.equal(
avatarUrl("/fake/template/{size}.png", "tiny"),
@@ -85,7 +85,7 @@ discourseModule("Unit | Utilities", function () {
);
});
- var setDevicePixelRatio = function (value) {
+ let setDevicePixelRatio = function (value) {
if (Object.defineProperty && !window.hasOwnProperty("devicePixelRatio")) {
Object.defineProperty(window, "devicePixelRatio", { value: 2 });
} else {
@@ -94,10 +94,10 @@ discourseModule("Unit | Utilities", function () {
};
test("avatarImg", function (assert) {
- var oldRatio = window.devicePixelRatio;
+ let oldRatio = window.devicePixelRatio;
setDevicePixelRatio(2);
- var avatarTemplate = "/path/to/avatar/{size}.png";
+ let avatarTemplate = "/path/to/avatar/{size}.png";
assert.equal(
avatarImg({ avatarTemplate: avatarTemplate, size: "tiny" }),
"
",
@@ -164,7 +164,7 @@ discourseModule("Unit | Utilities", function () {
});
test("caretRowCol", function (assert) {
- var textarea = document.createElement("textarea");
+ let textarea = document.createElement("textarea");
const content = document.createTextNode("01234\n56789\n012345");
textarea.appendChild(content);
document.body.appendChild(textarea);
diff --git a/app/assets/javascripts/discourse/tests/unit/localization-test.js b/app/assets/javascripts/discourse/tests/unit/localization-test.js
index 4939746aed..f2bf2f3c0f 100644
--- a/app/assets/javascripts/discourse/tests/unit/localization-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/localization-test.js
@@ -1,6 +1,7 @@
import { module, test } from "qunit";
import I18n from "I18n";
import LocalizationInitializer from "discourse/initializers/localization";
+import { getApplication } from "@ember/test-helpers";
module("initializer:localization", {
_locale: I18n.locale,
@@ -42,7 +43,7 @@ test("translation overrides", function (assert) {
"js.composer.reply": "WAT",
"js.topic.reply.help": "foobar",
};
- LocalizationInitializer.initialize(this.registry);
+ LocalizationInitializer.initialize(getApplication());
assert.equal(
I18n.t("composer.reply"),
@@ -61,7 +62,7 @@ test("skip translation override if parent node is not an object", function (asse
"js.composer.reply": "WAT",
"js.composer.reply.help": "foobar",
};
- LocalizationInitializer.initialize(this.registry);
+ LocalizationInitializer.initialize(getApplication());
assert.equal(I18n.t("composer.reply.help"), "[fr.composer.reply.help]");
});
diff --git a/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js b/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
index b142e52042..0a2e29d0e5 100644
--- a/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
@@ -4,10 +4,10 @@ import Singleton from "discourse/mixins/singleton";
module("Unit | Mixin | singleton", function () {
test("current", function (assert) {
- var DummyModel = EmberObject.extend({});
+ let DummyModel = EmberObject.extend({});
DummyModel.reopenClass(Singleton);
- var current = DummyModel.current();
+ let current = DummyModel.current();
assert.present(current, "current returns the current instance");
assert.equal(
current,
@@ -22,9 +22,9 @@ module("Unit | Mixin | singleton", function () {
});
test("currentProp reading", function (assert) {
- var DummyModel = EmberObject.extend({});
+ let DummyModel = EmberObject.extend({});
DummyModel.reopenClass(Singleton);
- var current = DummyModel.current();
+ let current = DummyModel.current();
assert.blank(
DummyModel.currentProp("evil"),
@@ -39,14 +39,14 @@ module("Unit | Mixin | singleton", function () {
});
test("currentProp writing", function (assert) {
- var DummyModel = EmberObject.extend({});
+ let DummyModel = EmberObject.extend({});
DummyModel.reopenClass(Singleton);
assert.blank(
DummyModel.currentProp("adventure"),
"by default attributes are blank"
);
- var result = DummyModel.currentProp("adventure", "time");
+ let result = DummyModel.currentProp("adventure", "time");
assert.equal(result, "time", "it returns the new value");
assert.equal(
DummyModel.currentProp("adventure"),
@@ -70,7 +70,7 @@ module("Unit | Mixin | singleton", function () {
});
test("createCurrent", function (assert) {
- var Shoe = EmberObject.extend({});
+ let Shoe = EmberObject.extend({});
Shoe.reopenClass(Singleton, {
createCurrent: function () {
return Shoe.create({ toes: 5 });
@@ -85,7 +85,7 @@ module("Unit | Mixin | singleton", function () {
});
test("createCurrent that returns null", function (assert) {
- var Missing = EmberObject.extend({});
+ let Missing = EmberObject.extend({});
Missing.reopenClass(Singleton, {
createCurrent: function () {
return null;
diff --git a/app/assets/javascripts/discourse/tests/unit/models/post-test.js b/app/assets/javascripts/discourse/tests/unit/models/post-test.js
index b85d5762b7..82b5e52805 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/post-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/post-test.js
@@ -18,13 +18,13 @@ function buildPost(args) {
module("Unit | Model | post", function () {
test("defaults", function (assert) {
- var post = Post.create({ id: 1 });
+ let post = Post.create({ id: 1 });
assert.blank(post.get("deleted_at"), "it has no deleted_at by default");
assert.blank(post.get("deleted_by"), "there is no deleted_by by default");
});
test("new_user", function (assert) {
- var post = Post.create({ trust_level: 0 });
+ let post = Post.create({ trust_level: 0 });
assert.ok(post.get("new_user"), "post is from a new user");
post.set("trust_level", 1);
@@ -32,7 +32,7 @@ module("Unit | Model | post", function () {
});
test("firstPost", function (assert) {
- var post = Post.create({ post_number: 1 });
+ let post = Post.create({ post_number: 1 });
assert.ok(post.get("firstPost"), "it's the first post");
post.set("post_number", 10);
@@ -40,7 +40,7 @@ module("Unit | Model | post", function () {
});
test("updateFromPost", function (assert) {
- var post = Post.create({
+ let post = Post.create({
post_number: 1,
raw: "hello world",
});
diff --git a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
index 8fe391217d..b549826f1a 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
@@ -15,7 +15,7 @@ module("Unit | Model | rest-model", function () {
},
});
- var g = Grape.create({ store, percent: 0.4 });
+ let g = Grape.create({ store, percent: 0.4 });
assert.equal(g.get("inverse"), 0.6, "it runs `munge` on `create`");
});
diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
index 8cbe7b06b5..4e11fe0324 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
@@ -9,13 +9,13 @@ function buildDetails(id) {
module("Unit | Model | topic-details", function () {
test("defaults", function (assert) {
- var details = buildDetails(1234);
+ let details = buildDetails(1234);
assert.present(details, "the details are present by default");
assert.ok(!details.get("loaded"), "details are not loaded by default");
});
test("updateFromJson", function (assert) {
- var details = buildDetails(1234);
+ let details = buildDetails(1234);
details.updateFromJson({
allowed_users: [{ username: "eviltrout" }],
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
index 9b6518c3de..50cd70e739 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
@@ -3,7 +3,7 @@ import UserAction from "discourse/models/user-action";
module("Unit | Model | user-action", function () {
test("collapsing likes", function (assert) {
- var actions = UserAction.collapseStream([
+ let actions = UserAction.collapseStream([
UserAction.create({
action_type: UserAction.TYPES.likes_given,
topic_id: 1,
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
index 9fdeb815a6..8ba20c9cc6 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
@@ -4,8 +4,8 @@ import UserAction from "discourse/models/user-action";
module("Unit | Model | user-stream", function () {
test("basics", function (assert) {
- var user = User.create({ id: 1, username: "eviltrout" });
- var stream = user.get("stream");
+ let user = User.create({ id: 1, username: "eviltrout" });
+ let stream = user.get("stream");
assert.present(stream, "a user has a stream by default");
assert.equal(
stream.get("user"),
@@ -25,8 +25,8 @@ module("Unit | Model | user-stream", function () {
});
test("filterParam", function (assert) {
- var user = User.create({ id: 1, username: "eviltrout" });
- var stream = user.get("stream");
+ let user = User.create({ id: 1, username: "eviltrout" });
+ let stream = user.get("stream");
// defaults to posts/topics
assert.equal(stream.get("filterParam"), "4,5");
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
index d17725a6f8..0b95967b12 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
@@ -7,7 +7,7 @@ import sinon from "sinon";
module("Unit | Model | user", function () {
test("staff", function (assert) {
- var user = User.create({ id: 1, username: "eviltrout" });
+ let user = User.create({ id: 1, username: "eviltrout" });
assert.ok(!user.get("staff"), "user is not staff");
@@ -19,7 +19,7 @@ module("Unit | Model | user", function () {
});
test("searchContext", function (assert) {
- var user = User.create({ id: 1, username: "EvilTrout" });
+ let user = User.create({ id: 1, username: "EvilTrout" });
assert.deepEqual(
user.get("searchContext"),
@@ -29,7 +29,7 @@ module("Unit | Model | user", function () {
});
test("isAllowedToUploadAFile", function (assert) {
- var user = User.create({ trust_level: 0, admin: true });
+ let user = User.create({ trust_level: 0, admin: true });
assert.ok(
user.isAllowedToUploadAFile("image"),
"admin can always upload a file"
diff --git a/app/assets/javascripts/embed-application.js b/app/assets/javascripts/embed-application.js
index 4ba6a082fa..f71ac900ef 100644
--- a/app/assets/javascripts/embed-application.js
+++ b/app/assets/javascripts/embed-application.js
@@ -9,11 +9,11 @@
}
function clickPostLink(e) {
- var postId = e.target.getAttribute("data-link-to-post");
+ let postId = e.target.getAttribute("data-link-to-post");
if (postId) {
- var postElement = document.getElementById("post-" + postId);
+ let postElement = document.getElementById("post-" + postId);
if (postElement) {
- var rect = postElement.getBoundingClientRect();
+ let rect = postElement.getBoundingClientRect();
if (rect && rect.top) {
postUp({ type: "discourse-scroll", top: rect.top });
e.preventDefault();
@@ -25,9 +25,9 @@
window.onload = function () {
// get state info from data attribute
- var embedState = document.querySelector("[data-embed-state]");
- var state = "unknown";
- var embedId = null;
+ let embedState = document.querySelector("[data-embed-state]");
+ let state = "unknown";
+ let embedId = null;
if (embedState) {
state = embedState.getAttribute("data-embed-state");
embedId = embedState.getAttribute("data-embed-id");
@@ -41,7 +41,7 @@
embedId,
});
- var postLinks = document.querySelectorAll("a[data-link-to-post]"),
+ let postLinks = document.querySelectorAll("a[data-link-to-post]"),
i;
for (i = 0; i < postLinks.length; i++) {
@@ -49,15 +49,15 @@
}
// Make sure all links in the iframe point to _blank
- var cookedLinks = document.querySelectorAll(".cooked a");
+ let cookedLinks = document.querySelectorAll(".cooked a");
for (i = 0; i < cookedLinks.length; i++) {
cookedLinks[i].target = "_blank";
}
// Adjust all names
- var names = document.querySelectorAll(".username a");
+ let names = document.querySelectorAll(".username a");
for (i = 0; i < names.length; i++) {
- var username = names[i].innerHTML;
+ let username = names[i].innerHTML;
if (username) {
/* global BreakString */
names[i].innerHTML = new BreakString(username).break();
diff --git a/app/assets/javascripts/handlebars-shim.js b/app/assets/javascripts/handlebars-shim.js
index fb191149a1..9d8403d189 100644
--- a/app/assets/javascripts/handlebars-shim.js
+++ b/app/assets/javascripts/handlebars-shim.js
@@ -5,6 +5,10 @@ if (typeof define !== "undefined") {
if (typeof Handlebars !== "undefined") {
// eslint-disable-next-line
__exports__.default = Handlebars;
+ __exports__.compile = function () {
+ // eslint-disable-next-line
+ return Handlebars.compile.apply(this, arguments);
+ };
}
});
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
index 4160d7986d..c9d2c714a4 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
@@ -191,7 +191,7 @@ function findInlineCloseTag(state, openTag, start, max) {
}
function applyBBCode(state, startLine, endLine, silent, md) {
- var nextLine,
+ let nextLine,
oldParent,
oldLineMax,
rule,
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
index cd24628689..069a88c2f3 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
@@ -15,7 +15,7 @@ export default null;
// based off https://github.com/markdown-it/markdown-it-emoji/blob/master/dist/markdown-it-emoji.js
//
export function textReplace(state, callback, skipAllLinks) {
- var i,
+ let i,
j,
l,
tokens,
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
index 596c45ad7f..e876499a25 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
@@ -5,7 +5,7 @@
const REGEX = /^\s*$/i;
function rule(state, startLine, endLine) {
- var nextLine,
+ let nextLine,
token,
lineText,
pos = state.bMarks[startLine] + state.tShift[startLine],
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
index 1de6a74a36..5781c9df20 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js
@@ -5,7 +5,7 @@
// this is a freedom patch, so careful, may break on updates
function newline(state, silent) {
- var token,
+ let token,
pmax,
max,
pos = state.pos;
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
index a44a0214d7..79c5166769 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js
@@ -4,7 +4,7 @@
// link starts with a space, so we can bypass a onebox
// this is a freedom patch, so careful, may break on updates
function paragraph(state, startLine /*, endLine*/) {
- var content,
+ let content,
terminate,
i,
l,
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
index c7e0dc9ca7..45dc70ebcd 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
@@ -113,7 +113,7 @@ const rule = {
if (offTopicQuote) {
const topicInfo = options.getTopicInfo(topicId);
if (topicInfo) {
- var href = topicInfo.href;
+ let href = topicInfo.href;
if (postNumber > 0) {
href += "/" + postNumber;
}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
index 63bf3f7059..8b34244611 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js
@@ -90,8 +90,8 @@ export function setup(helper) {
const imageIndex = token.attrIndex("index-image");
if (scaleIndex !== -1) {
- var selectedScale = token.attrs[scaleIndex][1];
- var index = token.attrs[imageIndex][1];
+ let selectedScale = token.attrs[scaleIndex][1];
+ let index = token.attrs[imageIndex][1];
let result = "";
result += oldRule(tokens, idx, options, env, slf);
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
index 5213bceac9..59504133b9 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
@@ -11,6 +11,7 @@
class="btn-clear"
icon="times"
action=selectKit.onClearSelection
+ ariaLabel="clear_input"
}}
{{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
index da45408eac..c826cea9a7 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
@@ -1,5 +1,5 @@
{{#if selectKit.options.showFullTitle}}
-
-
- {{#if currentUser}}
-
-
{{combo-box
- id="status"
+ id="search-status-options"
valueProperty="value"
content=statusOptions
value=searchedTerms.status
@@ -179,7 +192,7 @@
-
+
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
index 6a5c91b8b8..282c608b75 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
@@ -1,6 +1,5 @@
{{#discovery-categories refresh=(action "refresh")}}
{{component categoryPageStyle
categories=model.categories
- latestTopicOnly=latestTopicOnly
topics=model.topics}}
{{/discovery-categories}}
diff --git a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
index 4a2b132ccc..b5a7afc0cc 100644
--- a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
@@ -34,6 +34,12 @@
{{/each}}
+ {{#if showDeleteReason}}
+
{{input
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
index 38a950ba19..76545e5803 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
@@ -89,16 +89,18 @@
- {{d-button
- class="btn-default"
- action=(action "save")
- disabled=savingDisabled
- label="tagging.groups.save"}}
+
+ {{d-button
+ class="btn-default"
+ action=(action "save")
+ disabled=savingDisabled
+ label="tagging.groups.save"}}
- {{d-button
- class="btn-danger"
- action=(action "destroy")
- disabled=buffered.isNew
- icon="far-trash-alt"
- label="tagging.groups.delete"}}
+ {{d-button
+ class="btn-danger"
+ action=(action "destroy")
+ disabled=buffered.isNew
+ icon="far-trash-alt"
+ label="tagging.groups.delete"}}
+
+
+ {{/if}}
+
{{/if}}
{{html-safe model.cannot_delete_reason}}
+{{i18n "search.advanced.title"}} -
+ {{/if}} {{#if site.mobileView}} diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs index 9243d15028..b62e4a8fb5 100644 --- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs @@ -1,3 +1,2 @@ {{categories-only categories=categories - latestTopicOnly=latestTopicOnly showTopics="true"}} diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs index 6a5c91b8b8..282c608b75 100644 --- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs +++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/categories.hbs @@ -1,6 +1,5 @@ {{#discovery-categories refresh=(action "refresh")}} {{component categoryPageStyle categories=model.categories - latestTopicOnly=latestTopicOnly topics=model.topics}} {{/discovery-categories}} diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs index ba19e49d42..46049bb9b7 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs @@ -65,12 +65,7 @@{{i18n "bookmarks.reminders.next_month"}}
{{nextMonthFormatted}}
{{/tap-tile}}
- {{#if showPostLocalDate}}
- {{#tap-tile icon="globe-americas" tileId=reminderTypes.POST_LOCAL_DATE activeTile=grid.activeTile onChange=(action "selectReminderType")}}
- {{i18n "bookmarks.reminders.post_local_date"}}
- {{postLocalDateFormatted}}
- {{/tap-tile}}
- {{/if}}
+ {{bookmark-local-date postId=model.postId tileId=reminderTypes.POST_LOCAL_DATE activeTile=grid.activeTile onChange=(action "selectPostLocalDate")}}
{{#tap-tile icon="calendar-alt" tileId=reminderTypes.CUSTOM activeTile=grid.activeTile onChange=(action "selectReminderType")}}
{{i18n "bookmarks.reminders.custom"}}
{{/tap-tile}}
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 5a3468539d..e02068af25 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -67,7 +67,7 @@
{{/if}}
{{#if currentUser.staff}}
- ",
@@ -164,7 +164,7 @@ discourseModule("Unit | Utilities", function () {
});
test("caretRowCol", function (assert) {
- var textarea = document.createElement("textarea");
+ let textarea = document.createElement("textarea");
const content = document.createTextNode("01234\n56789\n012345");
textarea.appendChild(content);
document.body.appendChild(textarea);
diff --git a/app/assets/javascripts/discourse/tests/unit/localization-test.js b/app/assets/javascripts/discourse/tests/unit/localization-test.js
index 4939746aed..f2bf2f3c0f 100644
--- a/app/assets/javascripts/discourse/tests/unit/localization-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/localization-test.js
@@ -1,6 +1,7 @@
import { module, test } from "qunit";
import I18n from "I18n";
import LocalizationInitializer from "discourse/initializers/localization";
+import { getApplication } from "@ember/test-helpers";
module("initializer:localization", {
_locale: I18n.locale,
@@ -42,7 +43,7 @@ test("translation overrides", function (assert) {
"js.composer.reply": "WAT",
"js.topic.reply.help": "foobar",
};
- LocalizationInitializer.initialize(this.registry);
+ LocalizationInitializer.initialize(getApplication());
assert.equal(
I18n.t("composer.reply"),
@@ -61,7 +62,7 @@ test("skip translation override if parent node is not an object", function (asse
"js.composer.reply": "WAT",
"js.composer.reply.help": "foobar",
};
- LocalizationInitializer.initialize(this.registry);
+ LocalizationInitializer.initialize(getApplication());
assert.equal(I18n.t("composer.reply.help"), "[fr.composer.reply.help]");
});
diff --git a/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js b/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
index b142e52042..0a2e29d0e5 100644
--- a/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/mixins/singleton-test.js
@@ -4,10 +4,10 @@ import Singleton from "discourse/mixins/singleton";
module("Unit | Mixin | singleton", function () {
test("current", function (assert) {
- var DummyModel = EmberObject.extend({});
+ let DummyModel = EmberObject.extend({});
DummyModel.reopenClass(Singleton);
- var current = DummyModel.current();
+ let current = DummyModel.current();
assert.present(current, "current returns the current instance");
assert.equal(
current,
@@ -22,9 +22,9 @@ module("Unit | Mixin | singleton", function () {
});
test("currentProp reading", function (assert) {
- var DummyModel = EmberObject.extend({});
+ let DummyModel = EmberObject.extend({});
DummyModel.reopenClass(Singleton);
- var current = DummyModel.current();
+ let current = DummyModel.current();
assert.blank(
DummyModel.currentProp("evil"),
@@ -39,14 +39,14 @@ module("Unit | Mixin | singleton", function () {
});
test("currentProp writing", function (assert) {
- var DummyModel = EmberObject.extend({});
+ let DummyModel = EmberObject.extend({});
DummyModel.reopenClass(Singleton);
assert.blank(
DummyModel.currentProp("adventure"),
"by default attributes are blank"
);
- var result = DummyModel.currentProp("adventure", "time");
+ let result = DummyModel.currentProp("adventure", "time");
assert.equal(result, "time", "it returns the new value");
assert.equal(
DummyModel.currentProp("adventure"),
@@ -70,7 +70,7 @@ module("Unit | Mixin | singleton", function () {
});
test("createCurrent", function (assert) {
- var Shoe = EmberObject.extend({});
+ let Shoe = EmberObject.extend({});
Shoe.reopenClass(Singleton, {
createCurrent: function () {
return Shoe.create({ toes: 5 });
@@ -85,7 +85,7 @@ module("Unit | Mixin | singleton", function () {
});
test("createCurrent that returns null", function (assert) {
- var Missing = EmberObject.extend({});
+ let Missing = EmberObject.extend({});
Missing.reopenClass(Singleton, {
createCurrent: function () {
return null;
diff --git a/app/assets/javascripts/discourse/tests/unit/models/post-test.js b/app/assets/javascripts/discourse/tests/unit/models/post-test.js
index b85d5762b7..82b5e52805 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/post-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/post-test.js
@@ -18,13 +18,13 @@ function buildPost(args) {
module("Unit | Model | post", function () {
test("defaults", function (assert) {
- var post = Post.create({ id: 1 });
+ let post = Post.create({ id: 1 });
assert.blank(post.get("deleted_at"), "it has no deleted_at by default");
assert.blank(post.get("deleted_by"), "there is no deleted_by by default");
});
test("new_user", function (assert) {
- var post = Post.create({ trust_level: 0 });
+ let post = Post.create({ trust_level: 0 });
assert.ok(post.get("new_user"), "post is from a new user");
post.set("trust_level", 1);
@@ -32,7 +32,7 @@ module("Unit | Model | post", function () {
});
test("firstPost", function (assert) {
- var post = Post.create({ post_number: 1 });
+ let post = Post.create({ post_number: 1 });
assert.ok(post.get("firstPost"), "it's the first post");
post.set("post_number", 10);
@@ -40,7 +40,7 @@ module("Unit | Model | post", function () {
});
test("updateFromPost", function (assert) {
- var post = Post.create({
+ let post = Post.create({
post_number: 1,
raw: "hello world",
});
diff --git a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
index 8fe391217d..b549826f1a 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js
@@ -15,7 +15,7 @@ module("Unit | Model | rest-model", function () {
},
});
- var g = Grape.create({ store, percent: 0.4 });
+ let g = Grape.create({ store, percent: 0.4 });
assert.equal(g.get("inverse"), 0.6, "it runs `munge` on `create`");
});
diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
index 8cbe7b06b5..4e11fe0324 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js
@@ -9,13 +9,13 @@ function buildDetails(id) {
module("Unit | Model | topic-details", function () {
test("defaults", function (assert) {
- var details = buildDetails(1234);
+ let details = buildDetails(1234);
assert.present(details, "the details are present by default");
assert.ok(!details.get("loaded"), "details are not loaded by default");
});
test("updateFromJson", function (assert) {
- var details = buildDetails(1234);
+ let details = buildDetails(1234);
details.updateFromJson({
allowed_users: [{ username: "eviltrout" }],
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
index 9b6518c3de..50cd70e739 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js
@@ -3,7 +3,7 @@ import UserAction from "discourse/models/user-action";
module("Unit | Model | user-action", function () {
test("collapsing likes", function (assert) {
- var actions = UserAction.collapseStream([
+ let actions = UserAction.collapseStream([
UserAction.create({
action_type: UserAction.TYPES.likes_given,
topic_id: 1,
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
index 9fdeb815a6..8ba20c9cc6 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js
@@ -4,8 +4,8 @@ import UserAction from "discourse/models/user-action";
module("Unit | Model | user-stream", function () {
test("basics", function (assert) {
- var user = User.create({ id: 1, username: "eviltrout" });
- var stream = user.get("stream");
+ let user = User.create({ id: 1, username: "eviltrout" });
+ let stream = user.get("stream");
assert.present(stream, "a user has a stream by default");
assert.equal(
stream.get("user"),
@@ -25,8 +25,8 @@ module("Unit | Model | user-stream", function () {
});
test("filterParam", function (assert) {
- var user = User.create({ id: 1, username: "eviltrout" });
- var stream = user.get("stream");
+ let user = User.create({ id: 1, username: "eviltrout" });
+ let stream = user.get("stream");
// defaults to posts/topics
assert.equal(stream.get("filterParam"), "4,5");
diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
index d17725a6f8..0b95967b12 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/user-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/user-test.js
@@ -7,7 +7,7 @@ import sinon from "sinon";
module("Unit | Model | user", function () {
test("staff", function (assert) {
- var user = User.create({ id: 1, username: "eviltrout" });
+ let user = User.create({ id: 1, username: "eviltrout" });
assert.ok(!user.get("staff"), "user is not staff");
@@ -19,7 +19,7 @@ module("Unit | Model | user", function () {
});
test("searchContext", function (assert) {
- var user = User.create({ id: 1, username: "EvilTrout" });
+ let user = User.create({ id: 1, username: "EvilTrout" });
assert.deepEqual(
user.get("searchContext"),
@@ -29,7 +29,7 @@ module("Unit | Model | user", function () {
});
test("isAllowedToUploadAFile", function (assert) {
- var user = User.create({ trust_level: 0, admin: true });
+ let user = User.create({ trust_level: 0, admin: true });
assert.ok(
user.isAllowedToUploadAFile("image"),
"admin can always upload a file"
diff --git a/app/assets/javascripts/embed-application.js b/app/assets/javascripts/embed-application.js
index 4ba6a082fa..f71ac900ef 100644
--- a/app/assets/javascripts/embed-application.js
+++ b/app/assets/javascripts/embed-application.js
@@ -9,11 +9,11 @@
}
function clickPostLink(e) {
- var postId = e.target.getAttribute("data-link-to-post");
+ let postId = e.target.getAttribute("data-link-to-post");
if (postId) {
- var postElement = document.getElementById("post-" + postId);
+ let postElement = document.getElementById("post-" + postId);
if (postElement) {
- var rect = postElement.getBoundingClientRect();
+ let rect = postElement.getBoundingClientRect();
if (rect && rect.top) {
postUp({ type: "discourse-scroll", top: rect.top });
e.preventDefault();
@@ -25,9 +25,9 @@
window.onload = function () {
// get state info from data attribute
- var embedState = document.querySelector("[data-embed-state]");
- var state = "unknown";
- var embedId = null;
+ let embedState = document.querySelector("[data-embed-state]");
+ let state = "unknown";
+ let embedId = null;
if (embedState) {
state = embedState.getAttribute("data-embed-state");
embedId = embedState.getAttribute("data-embed-id");
@@ -41,7 +41,7 @@
embedId,
});
- var postLinks = document.querySelectorAll("a[data-link-to-post]"),
+ let postLinks = document.querySelectorAll("a[data-link-to-post]"),
i;
for (i = 0; i < postLinks.length; i++) {
@@ -49,15 +49,15 @@
}
// Make sure all links in the iframe point to _blank
- var cookedLinks = document.querySelectorAll(".cooked a");
+ let cookedLinks = document.querySelectorAll(".cooked a");
for (i = 0; i < cookedLinks.length; i++) {
cookedLinks[i].target = "_blank";
}
// Adjust all names
- var names = document.querySelectorAll(".username a");
+ let names = document.querySelectorAll(".username a");
for (i = 0; i < names.length; i++) {
- var username = names[i].innerHTML;
+ let username = names[i].innerHTML;
if (username) {
/* global BreakString */
names[i].innerHTML = new BreakString(username).break();
diff --git a/app/assets/javascripts/handlebars-shim.js b/app/assets/javascripts/handlebars-shim.js
index fb191149a1..9d8403d189 100644
--- a/app/assets/javascripts/handlebars-shim.js
+++ b/app/assets/javascripts/handlebars-shim.js
@@ -5,6 +5,10 @@ if (typeof define !== "undefined") {
if (typeof Handlebars !== "undefined") {
// eslint-disable-next-line
__exports__.default = Handlebars;
+ __exports__.compile = function () {
+ // eslint-disable-next-line
+ return Handlebars.compile.apply(this, arguments);
+ };
}
});
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
index 4160d7986d..c9d2c714a4 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
@@ -191,7 +191,7 @@ function findInlineCloseTag(state, openTag, start, max) {
}
function applyBBCode(state, startLine, endLine, silent, md) {
- var nextLine,
+ let nextLine,
oldParent,
oldLineMax,
rule,
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
index cd24628689..069a88c2f3 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js
@@ -15,7 +15,7 @@ export default null;
// based off https://github.com/markdown-it/markdown-it-emoji/blob/master/dist/markdown-it-emoji.js
//
export function textReplace(state, callback, skipAllLinks) {
- var i,
+ let i,
j,
l,
tokens,
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
index 596c45ad7f..e876499a25 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js
@@ -5,7 +5,7 @@
const REGEX = /^
+
{{#if item.icon}}
{{d-icon item.icon}}
{{/if}}
@@ -17,6 +17,7 @@
icon="times"
action=selectKit.deselect
actionParam=item
+ ariaLabel="clear_input"
}}
{{/if}}
{{/if}}
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
index 4c00de2810..7f935e4fb4 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js
@@ -3,7 +3,7 @@ import { module, test } from "qunit";
import { run } from "@ember/runloop";
import startApp from "wizard/test/helpers/start-app";
-var wizard;
+let wizard;
module("Acceptance: wizard", {
beforeEach() {
wizard = startApp();
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 05d0eb3c9f..3aec94db05 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -25,7 +25,7 @@
//= require test-shims
// Trick JSHint into allow document.write
-var d = document;
+let d = document;
d.write(
'
Bist du sicher?" + other: "Wenn Sie diese Gruppe löschen, werden %{count} Nachrichten verwaist, Gruppenmitglieder haben keinen Zugriff mehr auf sie.
Bist du sicher?" delete_failed: "Gruppe konnte nicht gelöscht werden. Wenn dies eine automatische Gruppe ist, kann sie nicht gelöscht werden." delete_owner_confirm: "Eigentümerrechte für '%{username}' entfernen?" add: "Hinzufügen" @@ -3883,9 +3892,7 @@ de: Beispiel: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} Eigenschaften sollten mit einem Präfix versehen werden, um Konflikte mit Discourse und Plugins zu vermeiden. head_tag: @@ -4382,6 +4389,9 @@ de: anonymize_yes: "Ja, diesen Benutzer anonymisieren" anonymize_failed: "Beim Anonymisieren des Benutzers ist ein Fehler aufgetreten." delete: "Benutzer löschen" + delete_posts: + progress: + title: "Fortschritt beim Löschen von Beiträgen" merge: button: "Zusammenführen" prompt: @@ -4393,6 +4403,8 @@ de: target_username_placeholder: "Benutzername des neuen Eigentümers" transfer_and_delete: "Übertragen & Löschen @%{username}" cancel: "Abbrechen" + progress: + title: "Fortschritt der Zusammenführung" confirmation: title: "Übertragen & Löschen @%{username}" description: | @@ -4540,6 +4552,7 @@ de: recommended: "Wir empfehlen, dass du den folgenden Text an deine Bedürfnisse anpasst:" show_overriden: "Nur geänderte Texte anzeigen" locale: "Sprache:" + fallback_locale_warning: "Du bearbeitest eine Sprache basierend auf %{fallback}. Benutzer, die %{fallback} als Sprache ihrer Schnittstelle wählen, werden deine Änderungen nicht sehen." more_than_50_results: "Es gibt mehr als 50 Ergebnisse. Bitte grenze deine Suche weiter ein." settings: show_overriden: "Nur geänderte anzeigen" diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml index 000fb2fe66..0e767ed114 100644 --- a/config/locales/client.el.yml +++ b/config/locales/client.el.yml @@ -1594,8 +1594,6 @@ el: date_time_picker: from: Από to: Προς - errors: - to_before_from: "Η τελική ημερομηνία πρέπει να είναι αργότερα από την αρχική ημερομηνία." emoji_picker: filter_placeholder: Αναζήτηση για emoji smileys_&_emotion: Χαμόγελα και συγκίνηση diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index fefb293a43..e3d88511e1 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -210,6 +210,7 @@ en: us_west_1: "US West (N. California)" us_west_2: "US West (Oregon)" + clear_input: "Clear input" edit: "edit the title and category of this topic" expand: "Expand" not_implemented: "That feature hasn't been implemented yet, sorry!" @@ -837,7 +838,6 @@ en: posts: "Posts" topics: "Topics" latest: "Latest" - latest_by: "latest by" toggle_ordering: "toggle ordering control" subcategories: "Subcategories" muted: "Muted categories" @@ -3600,6 +3600,10 @@ en: installed_version: "Installed" latest_version: "Latest" problems_found: "Some advice based on your current site settings" + new_features: + title: "🎁 New Features" + dismiss: "Dismiss" + learn_more: "Learn more" last_checked: "Last checked" refresh_problems: "Refresh" no_problems: "No problems were found." @@ -3734,6 +3738,9 @@ en: group_members: "Group members" delete: "Delete" delete_confirm: "Delete this group?" + delete_with_messages_confirm: + one: "Deleting this group will cause %{count} message to be orphaned, group members will no longer have access to it.
Are you sure?" + other: "Deleting this group will cause %{count} messages to be orphaned, group members will no longer have access to them.
Are you sure?" delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed." delete_owner_confirm: "Remove owner privilege for '%{username}'?" add: "Add" @@ -4162,9 +4169,7 @@ en: Example: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} Prefixing the property names is highly recommended to avoid conflicts with plugins and/or core. head_tag: diff --git a/config/locales/client.en_GB.yml b/config/locales/client.en_GB.yml index 1c76c9c06f..d299959136 100644 --- a/config/locales/client.en_GB.yml +++ b/config/locales/client.en_GB.yml @@ -112,17 +112,6 @@ en_GB: color_definitions: text: "Colour Definitions" title: "Enter custom colour definitions (advanced users only)" - placeholder: |2- - - Use this stylesheet to add custom colours to the list of CSS custom properties. - - Example: - - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } - - Prefixing the property names is highly recommended to avoid conflicts with plugins and/or core. colors: select_base: title: "Select base colour palette" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 922da8a1e0..45878c36e1 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -424,6 +424,9 @@ es: fields: "Campos" reject_reason: "Motivo" user_percentage: + summary: + one: "%{agreed}, %{disagreed}, %{ignored}, (del último reporte)" + other: "%{agreed}, %{disagreed}, %{ignored} (de los últimos %{count} reportes)" agreed: one: "%{count}% de acuerdo" other: "%{count}% de acuerdo" @@ -841,6 +844,20 @@ es: mute_option_title: "No recibirás ninguna notificación relacionada con este usuario." normal_option: "Normal" normal_option_title: "Se te notificará si este usuario te responde, cita o menciona." + notification_schedule: + title: "Horario de notificaciones" + label: "Activar horario personalizado de notificaciones" + tip: "Fuera de estas horas, se activará el modo «no molestar» automáticamente." + midnight: "Medianoche" + none: "Ninguno" + monday: "Lunes" + tuesday: "Martes" + wednesday: "Miércoles" + thursday: "Jueves" + friday: "Viernes" + saturday: "Sábado" + sunday: "Domingo" + to: "a" activity_stream: "Actividad" preferences: "Preferencias" feature_topic_on_profile: @@ -870,6 +887,7 @@ es: perm_denied_expl: "Has denegado el permiso para las notificaciones. Configura tu navegador para permitir notificaciones. " disable: "Desactivar notificaciones" enable: "Activar notificaciones" + each_browser_note: 'Nota: hay que cambiar este ajuste en cada navegador que uses. Todas las notificaciones serán desactivadas en el modo «no molestar», independientemente de este ajuste.' consent_prompt: "¿Quieres recibir notificaciones en vivo cuando alguien responda a tus mensajes?" dismiss: "Descartar" dismiss_notifications: "Descartar todo" @@ -1654,8 +1672,6 @@ es: date_time_picker: from: Desde to: Hasta - errors: - to_before_from: "La fecha «hasta» debe ser posterior a la fecha «desde»." emoji_picker: filter_placeholder: Buscar emoji smileys_&_emotion: Caras y emociones @@ -1814,6 +1830,7 @@ es: label: "Crear tema" shared_draft: label: "Borrador compartido" + desc: "Inicia un tema-borrador que solo será visible por los usuarios permitidos" toggle_topic_bump: label: "Alternar bump del tema" desc: "Responder sin alterar la fecha de última respuesta" @@ -1946,6 +1963,7 @@ es: or_search_google: "O prueba buscar a través de Google:" search_google: "Intenta buscar con Google:" search_google_button: "Google" + search_button: "Buscar" context: user: "Buscar publicaciones de @%{username}" category: "Buscar la categoría #%{category}" @@ -2514,7 +2532,7 @@ es: other: "ver %{count} publicaciones ocultas" notice: new_user: "Esta es la primera vez que %{user} ha publicado — ¡démosle la bienvenida a nuestra comunidad!" - returning_user: "Hace tiempo que no vemos a %{user} — su última publicación fue %{time}. " + returning_user: "Hacía tiempo que no veíamos a %{user}, su última publicación fue %{time}." unread: "Publicaciones sin leer" has_replies: one: "%{count} Respuesta" @@ -2843,6 +2861,7 @@ es: list_filters: all: "todos los temas" none: "sin subcategoría" + colors_disabled: "No puedes seleccionar colores porque tienes no tienes activados los estilos de categoría." flagging: title: "¡Gracias por ayudar a mantener una comunidad civilizada!" action: "Reportar publicación" @@ -2860,6 +2879,7 @@ es: notify_action: "Mensaje" official_warning: "Advertencia oficial" delete_spammer: "Eliminar spammer" + delete_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {# publicación} other {# publicaciones}} y {TOPICS, plural, one {# tema} other {# temas}} de este usuario, también eliminarás su cuenta, bloquearás registros desde su dirección IP {ip_address}, y añadirás su correo electrónico {email} a una lista de bloqueos permanentes. ¿Seguro que el usuario es de verdad un spammer?" yes_delete_spammer: "Sí, eliminar spammer" ip_address_missing: "(N/D)" hidden_email_address: "(oculto)" @@ -2926,6 +2946,12 @@ es: title: "Este tema es un mensaje personal" help: "Este tema es un mensaje personal" posts: "Publicaciones" + posts_likes_MF: | + Este tema tiene {count, plural, one {# respuesta} other {# respuestas}} {ratio, select, + low {con una proporción de me gusta por publicación alta} + med {con una proporción de me gusta por publicación muy alta} + high {con una proporción de me gusta por publicación extremadamente alta} + other {}} original_post: "Publicación original" views: "Vistas" views_lowercase: @@ -3255,6 +3281,7 @@ es: invite: custom_message: "Dale a tu invitación un toque personal escribiendo un mensaje personalizado." custom_message_placeholder: "Ingresa tu mensaje personalizado" + approval_not_required: "El usuario será aprobado automáticamente en cuanto acepte esta invitación." custom_message_template_forum: "¡Hey, deberías unirte a este foro!" custom_message_template_topic: "¡Hey, creemos que este tema te va a encantar!" forced_anonymous: "Debido a una carga extrema, esto se está mostrando temporalmente a todos como lo vería un usuario que no haya iniciado sesión." @@ -3276,6 +3303,7 @@ es: two_hours: "2 horas" tomorrow: "Hasta mañana" custom: "Personalizado" + set_schedule: "Establecer un horario de notificaciones" admin_js: type_to_filter: "filtrar opciones..." admin: @@ -3303,6 +3331,10 @@ es: installed_version: "Instalada" latest_version: "Última" problems_found: "Algunos consejos con base en tus ajustes actuales" + new_features: + title: "\U0001F381 Novedades" + dismiss: "Ocultar" + learn_more: "Más información" last_checked: "Ultima comprobación" refresh_problems: "Refrescar" no_problems: "No se encontró ningún problema." @@ -3793,6 +3825,7 @@ es: install_upload: "Desde tu dispositivo" install_git_repo: "Desde un repositorio git" install_create: "Crear nuevo" + duplicate_remote_theme: "El componente de tema «%{name}» ya está instalado, ¿seguro que quieres instalar otra copia?" about_theme: "Acerca de" license: "Licencia" version: "Versión:" @@ -3812,6 +3845,7 @@ es: check_for_updates: "Buscar actualizaciones" updating: "Actualizando..." up_to_date: "El tema está actualizado. Última comprobación:" + has_overwritten_history: "La versión actual del tema ya no existe, porque el historial de Git ha sido sobreescrito por un force push." add: "Agregar" theme_settings: "Ajustes del tema" no_settings: "Este tema no tiene ajustes." @@ -3841,17 +3875,6 @@ es: color_definitions: text: "Definiciones de color" title: "Introducir definiciones de colores personalizadas (para usuarios avanzados)" - placeholder: |2- - - Usa esta hoja de estilos para añadir colores personalizados a la lista de propiedades personalizadas de CSS. - - Por ejemplo: - - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } - - Añadir un prefijo a los nombres de las propiedades es altamente recomendado para evitar conflictos con plugins y el núcleo. head_tag: text: "" title: "HTML que será insertado antes de la etiqueta" @@ -4297,6 +4320,7 @@ es: clear_penalty_history: title: "Eliminado historial de faltas" description: "usuarios con faltas no pueden alcanzar NC3" + delete_all_posts_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {# publicación} other {# publicaciones}} y {TOPICS, plural, one {# tema} other {# temas}}. ¿Estás seguro?" silence: "Silenciar" unsilence: "Dejar de silenciar" silenced: "¿Silenciado?" @@ -4345,6 +4369,9 @@ es: anonymize_yes: "Sí, hacer anónima esta cuenta." anonymize_failed: "Hubo un problema al hacer anónima la cuenta." delete: "Eliminar usuario" + delete_posts: + progress: + title: "Progreso de la eliminación de publicaciones" merge: button: "Juntar" prompt: @@ -4356,6 +4383,8 @@ es: target_username_placeholder: "Nombre de usuario del nuevo dueño" transfer_and_delete: "Transferir y eliminar @%{username}" cancel: "Cancelar" + progress: + title: "Progreso de fusión" confirmation: title: "Transferir y eliminar @%{username}" description: | @@ -4502,6 +4531,7 @@ es: go_back: "Volver a la búsqueda" recommended: "Recomendamos personalizar el siguiente texto para que se ajusten a tus necesidades:" show_overriden: "Solo mostrar sobrescritos" + locale: "Idioma:" more_than_50_results: "Hay más de 50 resultados. Por favor, afina tu busqueda." settings: show_overriden: "Solo mostrar anulados" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index f06d408af5..8ea48d0093 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -1603,8 +1603,6 @@ fi: date_time_picker: from: Mistä to: Vastaanottaja - errors: - to_before_from: "Päättymispäivän on oltava myöhempi kuin alkamispäivän." emoji_picker: filter_placeholder: Etsi emojia smileys_&_emotion: Hymiöt ja tunteet diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 8dada8822d..dfb9ba7e74 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -844,6 +844,19 @@ fr: mute_option_title: "Vous ne recevrez pas de notifications en lien avec cet utilisateur." normal_option: "Normal" normal_option_title: "Vous serez notifié si cet utilisateur vous répond, vous cite ou vous mentionne." + notification_schedule: + title: "Planification des notifications" + label: "Activer la planification des notifications personnalisées" + tip: "En dehors de ces heures, vous serez automatiquement mis en \"ne pas déranger\"." + midnight: "Minuit" + none: "Aucun" + monday: "Lundi" + tuesday: "Mardi" + wednesday: "Mercredi" + thursday: "Jeudi" + friday: "Vendredi" + saturday: "samedi" + sunday: "dimanche" activity_stream: "Activité" preferences: "Préférences" feature_topic_on_profile: @@ -890,7 +903,7 @@ fr: color_schemes: default_description: "Couleur du thème" disable_dark_scheme: "Désactivé" - dark_instructions: "Vous pouvez prévisualiser le jeu de couleurs du mode sombre en basculant le mode sombre de votre appareil." + dark_instructions: "Vous pouvez prévisualiser le jeu de couleurs du mode sombre en activant le mode sombre de votre appareil." undo: "Réinitialiser" regular: "Normal" dark: "Mode sombre" @@ -1659,8 +1672,6 @@ fr: date_time_picker: from: De to: À - errors: - to_before_from: "La date de fin doit être postérieure à celle de début." emoji_picker: filter_placeholder: Rechercher un émoji smileys_&_emotion: Frimousses et émotions @@ -3292,6 +3303,7 @@ fr: two_hours: "2 heures" tomorrow: "Jusqu'à demain" custom: "Personnalisé" + set_schedule: "Planifier les notifications" admin_js: type_to_filter: "commencez à taper pour filtrer…" admin: @@ -3319,6 +3331,10 @@ fr: installed_version: "Installée" latest_version: "Dernière" problems_found: "Quelques conseils d'après vos paramètres actuels" + new_features: + title: "\U0001F381 Nouvelles fonctionnalités" + dismiss: "Ignorer" + learn_more: "En savoir plus…" last_checked: "Dernière vérification" refresh_problems: "Actualiser" no_problems: "Aucun problème n'a été trouvé." @@ -3862,17 +3878,6 @@ fr: color_definitions: text: "Définitions de couleur" title: "Entrez des définitions de couleurs personnalisées (utilisateurs avancés uniquement)" - placeholder: |2- - - Utilisez cette feuille de style pour ajouter des couleurs personnalisées à la liste des propriétés personnalisées CSS. - - Exemple : - - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } - - Il est fortement recommandé de préfixer les noms de propriété pour éviter les conflits avec Discourse ou ses extensions. head_tag: text: "" title: "HTML qui sera inséré avant la balise " diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index a4c650dfca..b6ba6056ea 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -187,6 +187,7 @@ gl: us_gov_west_1: "AWS GovCloud (EUA-Oeste)" us_west_1: "EUA Oeste (N. California)" us_west_2: "EUA Oeste (Oregón)" + clear_input: "Despexar entrada" edit: "editar o título e a categoría deste tema" expand: "Expandir" not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda." @@ -422,6 +423,7 @@ gl: email: "Correo electrónico" name: "Nome" fields: "Campos" + reject_reason: "Razón" user_percentage: summary: one: "%{agreed}, %{disagreed}, %{ignored} (da última alerta)" @@ -514,6 +516,9 @@ gl: other: "Tes %{count} publicacións pendentes." ok: "De acordo" example_username: "nome de usuario" + reject_reason: + title: "Por que rexeita a este usuario?" + send_email: "Enviar correo de rexeitamento" user_action: user_posted_topic: "%{user} publicou o tema" you_posted_topic: "Vostede publicou o tema" @@ -840,6 +845,20 @@ gl: mute_option_title: "Non recibirás notificación ningunha relacionada con este usuario." normal_option: "Normal" normal_option_title: "Recibirás unha notificación se este usuario che responde, cita a túa mensaxe ou menciona o teu nome." + notification_schedule: + title: "Calendario de notificacións" + label: "Activar o calendario personalizado de notificacións" + tip: "Fóra destas horas, vostede terá posto automaticamente en «non molestar»" + midnight: "Medianoite" + none: "Ningunha" + monday: "Luns" + tuesday: "Martes" + wednesday: "Mércores" + thursday: "Xoves" + friday: "Venres" + saturday: "Sábado" + sunday: "Domingo" + to: "para o" activity_stream: "Actividade" preferences: "Preferencias" feature_topic_on_profile: @@ -1655,8 +1674,6 @@ gl: date_time_picker: from: De to: A - errors: - to_before_from: "A data límite debe ser posterior á de orixe." emoji_picker: filter_placeholder: Buscar emoji smileys_&_emotion: Emoticonas e emoción @@ -1948,6 +1965,7 @@ gl: or_search_google: "Ou proba a buscar con Google:" search_google: "Proba a buscar con Google:" search_google_button: "Google" + search_button: "Buscar" context: user: "Buscar publicacións de @%{username}" category: "Buscar na categoría #%{category}" @@ -2846,6 +2864,7 @@ gl: list_filters: all: "todos os temas" none: "sen subcategorías" + colors_disabled: "Non pode seleccionar cores porque ten un estilo de categoría con ningún." flagging: title: "Grazas por axudar a manter a nosa comunidade." action: "Denunciar publicación" @@ -3287,6 +3306,7 @@ gl: two_hours: "2 horas" tomorrow: "Ata mañá" custom: "Personalizado" + set_schedule: "Estabelecer un calendario de notificacións" admin_js: type_to_filter: "escribe para filtrar..." admin: @@ -3314,6 +3334,10 @@ gl: installed_version: "Instalado" latest_version: "Últimos" problems_found: "Algúns consellos baseados na súa configuración actual do sitio" + new_features: + title: "Novas funcionalidades" + dismiss: "Desbotar" + learn_more: "Saber máis" last_checked: "Última comprobación" refresh_problems: "Actualizar" no_problems: "Non se atoparon problemas." @@ -3444,6 +3468,9 @@ gl: group_members: "Membros do grupo" delete: "Eliminar" delete_confirm: "Eliminar este grupo?" + delete_with_messages_confirm: + one: "Se elimina este grupo, quedará orfo %{count} mensaxe, os membros do grupo xa non terán acceso a el.
Está seguro?" + other: "Se elimina este grupo, quedará orfo %{count} mensaxes, os membros do grupo xa non terán acceso a el.
Está seguro?" delete_failed: "Non é posíbel eliminar o grupo. Se este é un grupo automático, non se pode destruír." delete_owner_confirm: "Eliminar os privilexios de usuario de «%{username}»?" add: "Engadir" @@ -3861,15 +3888,13 @@ gl: title: "Escriba definicións de cor personalizadas (só para usuarios avanzados)" placeholder: |2- - Utilice esta folla de estilo para engadir cores personalizadas á listaxe de propiedades CSS. + Utilice esta folla de estilo para engadir cores personalizadas á lista de propiedades de CSS personalizadas Exemplo: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} - Prefixar os nomes da propiedade resulta altamente recomendábel para evitarmos conflitos con complementos e/ou o núcleo. + Recoméndase intensamente prefixar os nomes para evitar conflitos con complementos e/ou o núcleo. head_tag: text: "" title: "HTML que se inserirá antes da etiqueta " @@ -4364,6 +4389,9 @@ gl: anonymize_yes: "Si, converter a conta en anónima" anonymize_failed: "Produciuse un problema convertendo a conta en anónima." delete: "Eliminar usuario" + delete_posts: + progress: + title: "Progreso na eliminación de publicacións" merge: button: "Combinar" prompt: @@ -4375,6 +4403,8 @@ gl: target_username_placeholder: "Nome de usuario do novo propietario" transfer_and_delete: "Transferir e eliminar @%{username}" cancel: "Cancelar" + progress: + title: "Combinar o progreso" confirmation: title: "Transferir e eliminar @%{username}" description: | @@ -4521,6 +4551,8 @@ gl: go_back: "Volver á busca" recommended: "Recomendamos personalizar o seguinte texto para axeitalo ás túas necesidades:" show_overriden: "Amosar só os cambios" + locale: "Idioma:" + fallback_locale_warning: "Está a editar un idioma baseado en %{fallback}. Os usuarios que escollan %{fallback} como idioma de interface non verán os cambios." more_than_50_results: "Hai máis de 50 resultados. Restrinxe a busca." settings: show_overriden: "Amosar só os cambios" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 7466ef4396..c4242b623f 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -233,6 +233,7 @@ he: us_gov_west_1: "הענן הממשלתי של AWS (מערב ארה״ב)" us_west_1: "מערב ארה״ב (צפון קליפורניה)" us_west_2: "מערב ארה״ב (אורגון)" + clear_input: "פינוי הקלט" edit: "עריכת הכותרת והקטגוריה של נושא זה" expand: "הרחב" not_implemented: "תכונה זו עדיין לא מומשה, עמך הסליחה!" @@ -1788,8 +1789,6 @@ he: date_time_picker: from: מאת to: אל - errors: - to_before_from: "תאריך היעד חייב להיות לאחר תאריך ההתחלה." emoji_picker: filter_placeholder: חיפוש אחר אמוג׳י smileys_&_emotion: חייכנים ורגש @@ -3599,6 +3598,10 @@ he: installed_version: "הותקן" latest_version: "אחרונה" problems_found: "עצה שמבוססת על הגדרות האתר הנוכחיות שלך" + new_features: + title: "\U0001F381 תכונות חדשות" + dismiss: "התעלמות" + learn_more: "מידע נוסף" last_checked: "נבדק לאחרונה" refresh_problems: "רענן" no_problems: "לא נמצאו בעיות." @@ -3731,6 +3734,11 @@ he: group_members: "חברי הקבוצה" delete: "מחיקה" delete_confirm: "להסיר קבוצה זו?" + delete_with_messages_confirm: + one: "מחיקת הקבוצה הזאת תוביל להתייתמותה של הודעה %{count}, חברי הקבוצה לא יוכלו לגשת אליה עוד.
להמשיך?" + two: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.
להמשיך?" + many: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.
להמשיך?" + other: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.
להמשיך?" delete_failed: "לא ניתן להסיר קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה." delete_owner_confirm: "להסיר את הרשאות הניהול של ‚%{username}’?" add: "הוספה" @@ -4158,17 +4166,15 @@ he: דוגמה: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} מומלץ מאוד להוסיף קידומת לשמות המאפיינים כדי להימנע מסתירות מול תוספים ו/או הליבה. head_tag: - text: "" - title: "HTML שיוכנס לפני התג " + text: "" + title: "HTML שיוכנס לפני התג " body_tag: - text: "
'
);
@@ -40,14 +40,14 @@ if (window.Logster) {
}
Ember.Test.adapter = window.QUnitAdapter.create();
-var createPretendServer = requirejs(
+let createPretendServer = requirejs(
"wizard/test/wizard-pretender",
null,
null,
false
).default;
-var server;
+let server;
QUnit.testStart(function () {
server = createPretendServer();
});
@@ -56,8 +56,8 @@ QUnit.testDone(function () {
server.shutdown();
});
-var _testApp = requirejs("wizard/test/helpers/start-app").default();
-var _buildResolver = requirejs("discourse-common/resolver").buildResolver;
+let _testApp = requirejs("wizard/test/helpers/start-app").default();
+let _buildResolver = requirejs("discourse-common/resolver").buildResolver;
window.setResolver(_buildResolver("wizard").create({ namespace: _testApp }));
Object.keys(requirejs.entries).forEach(function (entry) {
diff --git a/app/assets/stylesheets/common/admin/dashboard.scss b/app/assets/stylesheets/common/admin/dashboard.scss
index 8d38420b7b..0e553c4a9a 100644
--- a/app/assets/stylesheets/common/admin/dashboard.scss
+++ b/app/assets/stylesheets/common/admin/dashboard.scss
@@ -612,3 +612,42 @@
font-size: $font-up-3;
}
}
+
+.dashboard-new-features {
+ .section-body {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+ grid-gap: 1.5em;
+ }
+
+ .section-footer {
+ margin: 1.5em;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ .btn {
+ margin-left: 1em;
+ }
+ }
+}
+
+.admin-new-feature-item {
+ display: flex;
+ align-items: flex-start;
+
+ .new-feature-emoji {
+ font-size: 3.5em;
+ padding-right: 0.5em;
+ padding-left: 0.5em;
+ }
+
+ .new-feature-content {
+ padding-right: 0.5em;
+ align-self: center;
+ .header {
+ font-size: $font-up-1;
+ font-weight: bold;
+ margin-bottom: 0.5em;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index d362f9876b..c38b7e17db 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -34,18 +34,6 @@
max-height: 40vh;
}
}
-
- @include breakpoint(medium) {
- // hide button labels to save space
- .btn {
- .d-button-label {
- display: none;
- }
- .d-icon {
- margin: 0;
- }
- }
- }
}
.navigation-container {
@@ -81,6 +69,14 @@
> * {
white-space: nowrap;
}
+ .select-kit button {
+ height: 100%; // ensures nested select-kit button matches height of button siblings
+ }
+ .btn {
+ // need to reduce vertical padding for consistent height
+ padding-top: 0.3em;
+ padding-bottom: 0.3em;
+ }
}
.show-more {
@@ -295,15 +291,23 @@
}
.heatmap-high,
-.heatmap-high a {
+.heatmap-high a,
+.heatmap-high .d-icon,
+.heatmap-high .d-button-label {
color: #fe7a15 !important;
}
+
.heatmap-med,
-.heatmap-med a {
+.heatmap-med a,
+.heatmap-med .d-icon,
+.heatmap-med .d-button-label {
color: #cf7721 !important;
}
+
.heatmap-low,
-.heatmap-low a {
+.heatmap-low a,
+.heatmap-low .d-icon,
+.heatmap-low .d-button-label {
color: #9b764f !important;
}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 78e721198c..379302565a 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -122,6 +122,7 @@
}
.action-title {
+ line-height: normal;
@include ellipsis;
}
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 9bdd3be77a..ebaeaa087d 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -859,3 +859,24 @@ table {
z-index: z("max");
color: var(--secondary);
}
+
+.controls {
+ .grouped-control {
+ display: flex;
+ flex-direction: column;
+
+ .grouped-control-label {
+ padding: 0.25em 0;
+ }
+
+ .grouped-control-field {
+ flex: 1 0 auto;
+ display: flex;
+ padding-bottom: 0.25em;
+
+ label {
+ margin: 0;
+ }
+ }
+ }
+}
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index dabcc81172..b0145b246e 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -7,7 +7,7 @@ div.edit-category {
grid-template-rows: auto auto auto;
grid-row-gap: 1em;
grid-column-gap: 1.5em;
- grid-template-areas: "header header" "sidebar content" "sidebar footer";
+ grid-template-areas: "header header" "sidebar content" "sidebar warning" "sidebar footer";
.edit-category-title {
grid-area: header;
@@ -141,37 +141,16 @@ div.edit-category {
}
}
+ .edit-category-delete-warning {
+ grid-area: warning;
+ }
+
.edit-category-footer {
grid-area: footer;
display: flex;
justify-content: space-between;
align-self: start;
padding: 0 1.5em 2em 0;
-
- .disable-info {
- position: relative;
- .cannot-delete-reason {
- position: absolute;
- bottom: 125%;
- right: 0px;
- width: 250px;
- background: var(--primary);
- color: var(--secondary);
- text-align: center;
- border-radius: 2px;
- padding: 12px 8px;
-
- &::after {
- top: 100%;
- left: 57%;
- border: solid transparent;
- content: " ";
- position: absolute;
- border-top-color: var(--primary);
- border-width: 8px;
- }
- }
- }
}
}
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 9d93eb26f8..2fde6944ae 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -380,76 +380,73 @@ div.menu-links-header {
display: flex;
width: 100%;
z-index: 2;
+ justify-content: space-between;
- li {
+ .glyphs {
display: inline-flex;
align-items: center;
- flex-wrap: wrap;
+ flex-wrap: nowrap;
+ width: 100%;
+ justify-content: space-between;
+ padding: 0;
- &.glyphs {
- flex-wrap: nowrap;
- width: 100%;
- justify-content: space-between;
- padding: 0;
-
- a {
- display: flex;
- flex: 1 1 auto;
- padding: 0.65em 0.25em 0.75em;
- justify-content: center;
- }
- }
-
- a,
button {
- // This is to make sure active and inactive tab icons have the same
- // size. `box-sizing` does not work and I have no idea why.
- border: 1px solid transparent;
- &:not(.active):hover {
- border-bottom: 0;
- margin-top: -1px;
- }
+ display: flex;
+ flex: 1 1 auto;
+ padding: 0.65em 0.25em 0.75em;
+ justify-content: center;
+ }
+ }
+
+ button {
+ // This is to make sure active and inactive tab icons have the same
+ // size. `box-sizing` does not work and I have no idea why.
+ border: 1px solid transparent;
+ &:not(.active):hover {
+ border-bottom: 0;
+ margin-top: -1px;
+ }
+ }
+
+ button.active {
+ border: 1px solid var(--primary-low);
+ border-bottom: 1px solid var(--secondary);
+ position: relative;
+
+ .d-icon {
+ color: var(--primary-high);
}
- a.active {
- border: 1px solid var(--primary-low);
- border-bottom: 1px solid var(--secondary);
- position: relative;
-
- .d-icon {
- color: var(--primary-high);
- }
-
- &:focus,
- &:hover {
- background-color: inherit;
- }
+ &:focus,
+ &:hover {
+ background-color: inherit;
}
}
}
- a:hover,
- a:focus {
+
+ button:hover,
+ button:focus {
background-color: var(--highlight-medium);
outline: none;
}
- a {
+ button {
padding: 0.3em 0.5em;
}
- li {
+ .glyphs {
display: table-cell;
width: auto;
text-align: center;
}
- li:first-child {
+ .glyphs:first-child {
text-align: left;
}
- li:last-child {
+ .glyphs:last-child {
text-align: right;
}
.fa,
- a {
+ button {
color: var(--primary-med-or-secondary-med);
}
}
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 77c2bdccd9..a6ef072f02 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -162,14 +162,22 @@
}
.modal-footer {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
padding: 14px 15px 10px;
border-top: 1px solid var(--primary-low);
.btn {
- margin: 0 5px 5px 0;
+ margin: 0 0.3em 0 0;
&[href] {
min-height: unset;
}
}
+
+ .btn,
+ a {
+ margin-bottom: 0.3em;
+ }
}
.modal {
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 750d1627f2..b8c0a81bba 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -803,3 +803,9 @@ aside.onebox.stackexchange .onebox-body {
}
}
}
+
+aside.onebox.preview-error .site-icon {
+ width: 16px;
+ height: 16px;
+ margin-right: 0.5em;
+}
diff --git a/app/assets/stylesheets/common/base/popup-menu.scss b/app/assets/stylesheets/common/base/popup-menu.scss
index 56f2a0bc2c..a69e7ee920 100644
--- a/app/assets/stylesheets/common/base/popup-menu.scss
+++ b/app/assets/stylesheets/common/base/popup-menu.scss
@@ -19,12 +19,12 @@
}
.btn {
- display: flex;
- text-align: left;
+ justify-content: left;
background: none;
width: 100%;
padding: 0.75em;
border-radius: 0;
+ margin: 0;
.d-icon {
color: var(--primary-medium);
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 49c8d980f3..7fbbb1a594 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -188,11 +188,6 @@
width: auto;
}
- .refresh {
- height: 1em;
- display: flex;
- }
-
.score-filter {
width: 5em;
}
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index de3ac13d76..0995f19ca6 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -120,3 +120,12 @@
}
}
}
+
+.rtl .ace_placeholder {
+ direction: rtl !important;
+ text-align: right !important;
+
+ [dir="ltr"] {
+ text-align: left !important;
+ }
+}
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index a6154bfc19..d4377f0331 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -11,7 +11,7 @@
.search-bar {
display: flex;
justify-content: space-between;
- align-items: center;
+ align-items: stretch;
margin-bottom: 1em;
.search-query {
@@ -128,6 +128,7 @@
}
.search-advanced-title {
+ font-size: $font-up-1;
background: var(--primary-low);
padding: 0.358em 1em;
@include breakpoint(medium) {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 9083ca2a94..398da477bb 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -258,6 +258,9 @@ header .discourse-tag {
margin-bottom: 10px;
}
}
+ .tag-group-controls {
+ display: flex;
+ }
.group-tags-list .tag-chooser {
width: 100%;
}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 67eb33a49a..2ca3d905fd 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -655,6 +655,35 @@ blockquote {
&.raw-email {
cursor: pointer;
}
+ &.edits {
+ .widget-button {
+ display: flex;
+ align-items: center;
+
+ .d-button-label {
+ order: 0;
+ padding-right: 0.25em;
+ color: var(--primary-med-or-secondary-med);
+ transition: color 0.25s;
+ }
+
+ .d-icon {
+ order: 1;
+ transition: color 0.25s;
+ color: var(--primary-med-or-secondary-med);
+ }
+ .discourse-no-touch & {
+ &:hover {
+ .d-button-label {
+ color: var(--primary-high);
+ }
+ .d-icon {
+ color: var(--primary-high);
+ }
+ }
+ }
+ }
+ }
}
pre {
@@ -1049,31 +1078,21 @@ a.mention-group {
}
#topic-footer-buttons {
- padding: 0.5em 0;
+ padding: 0.75em 0;
.topic-footer-main-buttons {
- margin: 0 0 -0.5em 0;
display: flex;
flex-wrap: wrap;
-
- > .btn {
- margin: 0 0.5em 0.5em 0;
- display: inline-flex;
- align-items: center;
-
- .d-button-label {
- display: flex;
- flex: 1 0 auto;
- align-items: center;
- }
+ align-items: stretch; // aligns items by making them the same height
+ button {
+ margin-right: 0.54em;
}
.topic-admin-menu-button-container {
display: inline-flex;
- }
-
- .topic-admin-menu-button-container > span:not(:empty) {
- margin: 0 0.5em 0.5em 0;
+ > span {
+ display: flex; // to make this button match siblings behavior, all of its parents need to be flex
+ }
}
}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index dfe6c33825..2188b94246 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -217,7 +217,6 @@
.btn {
margin-bottom: 10px;
- line-height: $line-height-medium;
}
}
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index e00d5c2876..f97a14ff04 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -13,25 +13,24 @@
$hover-bg-color: var(--primary-medium),
$hover-icon-color: var(--primary-low)
) {
- display: inline-block;
- margin: 0;
- padding: 6px 12px;
- min-height: 30px;
- border: none;
box-sizing: border-box;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ margin: 0;
+ padding: 0.53em 0.8em;
+ border: none;
font-weight: normal;
+ font-size: $font-0;
+ line-height: normal;
color: $text-color;
background: $bg-color;
- font-size: $font-0;
- line-height: $line-height-small;
- text-align: center;
cursor: pointer;
transition: all 0.25s;
.d-icon {
color: $icon-color;
margin-right: 0.45em;
transition: color 0.25s;
- line-height: $line-height-medium; // Match button text line-height
}
&.no-text {
.d-icon {
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 1f1b3f6580..7763081b4b 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -22,6 +22,7 @@
@extend .clearfix;
> li {
+ display: flex;
float: left;
margin-right: 0.5em;
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 73ff05bf8d..e01d994c11 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -263,7 +263,7 @@
// shared styles for all font sizes
.btn,
.btn-default {
- padding: 0 0.5em;
+ padding: 0.5em;
}
.d-editor-spacer {
margin: 0 0.25em;
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 3ed65ef0af..11443cd002 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -38,6 +38,7 @@
.value {
font-size: $font-up-1;
+ font-weight: bold;
}
.unit {
font-size: $font-down-1;
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index 33aeee78b5..a096f5ddae 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -11,6 +11,11 @@
.more-topics {
margin-top: 1em;
}
+
+ .posts-map {
+ font-size: $font-up-1;
+ font-weight: bold;
+ }
}
.latest-topic-list-item {
@@ -53,6 +58,6 @@
}
.topic-last-activity a {
- color: var(--primary-med-or-secondary-high);
+ color: var(--primary-low-mid-or-secondary-high);
}
}
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index aed20e9962..ddb0c6f36b 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -186,15 +186,11 @@
> ul {
display: inline-flex;
> li {
- display: inline;
- margin-left: 12px;
- .d-button-label {
- line-height: 1;
- }
+ display: inline-flex;
+ margin-left: 0.75em;
}
a {
- margin-bottom: 10px;
width: auto;
}
}
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index a10d75c209..e78c827a70 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -237,9 +237,19 @@ a.reply-to-tab {
color: var(--tertiary);
}
+ .topic-footer-main-buttons {
+ display: flex;
+ align-items: stretch;
+ }
+
.topic-footer-mobile-dropdown {
- margin: 0 0.5em 0.5em 0;
+ margin: 0 0.75em 0 0;
width: 160px;
+ display: flex;
+ }
+
+ .select-kit-header {
+ height: 100%;
}
.topic-notifications-button,
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index eb246d75e5..1b75618f88 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -22,4 +22,15 @@ class Admin::DashboardController < Admin::AdminController
def problems
render_json_dump(problems: AdminDashboardData.fetch_problems(check_force_https: request.ssl?))
end
+
+ def new_features
+ data = { new_features: DiscourseUpdates.unseen_new_features(current_user.id) }
+ data.merge!(release_notes_link: AdminDashboardGeneralData.fetch_cached_stats["release_notes_link"])
+ render json: data
+ end
+
+ def mark_new_features_as_seen
+ DiscourseUpdates.mark_new_features_as_seen(current_user.id)
+ render json: success_json
+ end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 53878b0396..c501ff1447 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -819,7 +819,7 @@ class ApplicationController < ActionController::Base
params[:slug] = params[:slug].first if params[:slug].kind_of?(Array)
params[:id] = params[:id].first if params[:id].kind_of?(Array)
- @slug = (params[:slug].presence || params[:id].presence || "").tr('-', ' ')
+ @slug = (params[:slug].presence || params[:id].presence || "").to_s.tr('-', ' ')
render_to_string status: opts[:status], layout: opts[:layout], formats: [:html], template: '/exceptions/not_found'
end
diff --git a/app/controllers/do_not_disturb_controller.rb b/app/controllers/do_not_disturb_controller.rb
index 3f43246844..db24c7167c 100644
--- a/app/controllers/do_not_disturb_controller.rb
+++ b/app/controllers/do_not_disturb_controller.rb
@@ -25,9 +25,8 @@ class DoNotDisturbController < ApplicationController
def destroy
current_user.active_do_not_disturb_timings.destroy_all
current_user.publish_do_not_disturb(ends_at: nil)
- current_user.notifications.unprocessed.each do |notification|
- NotificationEmailer.process_notification(notification, no_delay: true)
- end
+ current_user.shelved_notifications.each(&:process)
+ current_user.shelved_notifications.destroy_all
render json: success_json
end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index fb4723c21f..0b754ef160 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -94,8 +94,7 @@ class InvitesController < ApplicationController
guardian.ensure_can_invite_to_forum!(groups)
group_ids = groups.map(&:id)
- invite_exists = Invite.exists?(email: params[:email], invited_by_id: current_user.id)
- if invite_exists && !guardian.can_send_multiple_invites?(current_user)
+ if Invite.exists?(email: params[:email])
return render json: failed_json, status: 422
end
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb
index 35474d8152..c83e8800ce 100644
--- a/app/controllers/reviewables_controller.rb
+++ b/app/controllers/reviewables_controller.rb
@@ -189,7 +189,7 @@ class ReviewablesController < ApplicationController
return render_json_error(error)
end
- args.merge!(reject_reason: params[:reject_reason], send_email: params[:send_email] == "true") if reviewable.type == 'ReviewableUser'
+ args.merge!(reject_reason: params[:reject_reason], send_email: params[:send_email] != "false") if reviewable.type == 'ReviewableUser'
result = reviewable.perform(current_user, params[:action_id].to_sym, args)
rescue Reviewable::InvalidAction => e
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2c4163e986..651fda8340 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1041,18 +1041,14 @@ class UsersController < ApplicationController
def search_users
term = params[:term].to_s.strip
- topic_id = params[:topic_id]
- topic_id = topic_id.to_i if topic_id
-
- category_id = params[:category_id].to_i if category_id.present?
+ topic_id = params[:topic_id].to_i if params[:topic_id].present?
+ category_id = params[:category_id].to_i if params[:category_id].present?
topic_allowed_users = params[:topic_allowed_users] || false
group_names = params[:groups] || []
group_names << params[:group] if params[:group]
- if group_names.present?
- @groups = Group.where(name: group_names)
- end
+ @groups = Group.where(name: group_names) if group_names.present?
options = {
topic_allowed_users: topic_allowed_users,
@@ -1060,13 +1056,8 @@ class UsersController < ApplicationController
groups: @groups
}
- if topic_id
- options[:topic_id] = topic_id
- end
-
- if category_id
- options[:category_id] = category_id
- end
+ options[:topic_id] = topic_id if topic_id
+ options[:category_id] = category_id if category_id
results = UserSearch.new(term, options).search
@@ -1075,8 +1066,10 @@ class UsersController < ApplicationController
to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template]) }
+ # blank term is only handy for in-topic search of users after @
+ # we do not want group results ever if term is blank
groups =
- if current_user
+ if term.present? && current_user
if params[:include_groups] == 'true'
Group.visible_groups(current_user)
elsif params[:include_mentionable_groups] == 'true'
@@ -1086,10 +1079,6 @@ class UsersController < ApplicationController
end
end
- # blank term is only handy for in-topic search of users after @
- # we do not want group results ever if term is blank
- groups = nil if term.blank?
-
if groups
groups = Group.search_groups(term, groups: groups)
groups = groups.order('groups.name asc')
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0b994496dc..0f94822298 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -560,4 +560,16 @@ module ApplicationHelper
end
end
end
+
+ def authentication_data
+ return @authentication_data if defined?(@authentication_data)
+
+ @authentication_data = begin
+ value = cookies[:authentication_data]
+ if value
+ cookies.delete(:authentication_data, path: Discourse.base_path("/"))
+ end
+ current_user ? nil : value
+ end
+ end
end
diff --git a/app/jobs/onceoff/fix_post_search_data_after_default_locale_rename.rb b/app/jobs/onceoff/fix_post_search_data_after_default_locale_rename.rb
new file mode 100644
index 0000000000..76e0b10d24
--- /dev/null
+++ b/app/jobs/onceoff/fix_post_search_data_after_default_locale_rename.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Jobs
+ class FixPostSearchDataAfterDefaultLocaleRename < ::Jobs::Onceoff
+ def execute_onceoff(args)
+ return if SearchIndexer::POST_INDEX_VERSION != 4
+
+ sql = <<~SQL
+ UPDATE post_search_data
+ SET locale = 'en'
+ WHERE post_id IN (
+ SELECT post_id
+ FROM post_search_data
+ WHERE locale = 'en_US'
+ LIMIT 100000
+ )
+ SQL
+
+ loop { break if DB.exec(sql) == 0 }
+ end
+ end
+end
diff --git a/app/jobs/scheduled/process_shelved_notifications.rb b/app/jobs/scheduled/process_shelved_notifications.rb
index 38470a18d3..d734e51e81 100644
--- a/app/jobs/scheduled/process_shelved_notifications.rb
+++ b/app/jobs/scheduled/process_shelved_notifications.rb
@@ -6,22 +6,17 @@ module Jobs
def execute(args)
sql = <<~SQL
- SELECT n.id FROM notifications AS n
- INNER JOIN do_not_disturb_timings AS dndt ON n.user_id = dndt.user_id
- WHERE n.processed = false
+ SELECT sn.id FROM shelved_notifications as sn
+ INNER JOIN notifications AS notification ON sn.notification_id = notification.id
+ INNER JOIN do_not_disturb_timings AS dndt ON notification.user_id = dndt.user_id
AND dndt.ends_at <= :now
SQL
now = Time.zone.now
- notification_ids = DB.query_single(sql, now: now)
-
- Notification.where(id: notification_ids).each do |notification|
- begin
- NotificationEmailer.process_notification(notification, no_delay: true)
- rescue
- Rails.logger.warn("Failed to process notification with ID #{notification.id}")
- end
- end
+ shelved_notification_ids = DB.query_single(sql, now: now)
+ shelved_notifications = ShelvedNotification.where(id: shelved_notification_ids)
+ shelved_notifications.each(&:process)
+ shelved_notifications.destroy_all
DB.exec("DELETE FROM do_not_disturb_timings WHERE ends_at < :now", now: now)
end
diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index 3d6579c78f..26215cdc7a 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -1,201 +1,162 @@
# frozen_string_literal: true
module Jobs
- # if locale changes or search algorithm changes we may want to reindex stuff
class ReindexSearch < ::Jobs::Scheduled
every 2.hours
- CLEANUP_GRACE_PERIOD = 1.day.ago
-
def execute(args)
- @verbose = true if args && Hash === args && args[:verbose]
+ @verbose = args[:verbose]
+ @cleanup_grace_period = 1.day.ago
- rebuild_problem_topics
- rebuild_problem_posts
- rebuild_problem_categories
- rebuild_problem_users
- rebuild_problem_tags
- clean_post_search_data
- clean_topic_search_data
+ rebuild_categories
+ rebuild_tags
+ rebuild_topics
+ rebuild_posts
+ rebuild_users
- @verbose = nil
+ clean_topics
+ clean_posts
end
- def rebuild_problem_categories(limit: 500)
+ def rebuild_categories(limit: 500, indexer: SearchIndexer)
category_ids = load_problem_category_ids(limit)
- if @verbose
- puts "rebuilding #{category_ids.length} categories"
- end
+ puts "rebuilding #{category_ids.size} categories" if @verbose
category_ids.each do |id|
category = Category.find_by(id: id)
- SearchIndexer.index(category, force: true) if category
+ indexer.index(category, force: true) if category
end
end
- def rebuild_problem_users(limit: 10000)
- user_ids = load_problem_user_ids(limit)
-
- if @verbose
- puts "rebuilding #{user_ids.length} users"
- end
-
- user_ids.each do |id|
- user = User.find_by(id: id)
- SearchIndexer.index(user, force: true) if user
- end
- end
-
- def rebuild_problem_topics(limit: 10000)
- topic_ids = load_problem_topic_ids(limit)
-
- if @verbose
- puts "rebuilding #{topic_ids.length} topics"
- end
-
- topic_ids.each do |id|
- topic = Topic.find_by(id: id)
- SearchIndexer.index(topic, force: true) if topic
- end
- end
-
- def rebuild_problem_posts(limit: 20000, indexer: SearchIndexer, verbose: false)
- post_ids = load_problem_post_ids(limit)
- verbose ||= @verbose
-
- if verbose
- puts "rebuilding #{post_ids.length} posts"
- end
-
- i = 0
- post_ids.each do |id|
- # could be deleted while iterating through batch
- if post = Post.find_by(id: id)
- indexer.index(post, force: true)
- i += 1
-
- if verbose && i % 1000 == 0
- puts "#{i} posts reindexed"
- end
- end
- end
- end
-
- def rebuild_problem_tags(limit: 10000)
+ def rebuild_tags(limit: 1_000, indexer: SearchIndexer)
tag_ids = load_problem_tag_ids(limit)
- if @verbose
- puts "rebuilding #{tag_ids.length} tags"
- end
+ puts "rebuilding #{tag_ids.size} tags" if @verbose
tag_ids.each do |id|
tag = Tag.find_by(id: id)
- SearchIndexer.index(tag, force: true) if tag
+ indexer.index(tag, force: true) if tag
end
end
- private
+ def rebuild_topics(limit: 10_000, indexer: SearchIndexer)
+ topic_ids = load_problem_topic_ids(limit)
- def clean_post_search_data
- puts "cleaning up post search data" if @verbose
+ puts "rebuilding #{topic_ids.size} topics" if @verbose
- PostSearchData
- .joins("LEFT JOIN posts p ON p.id = post_search_data.post_id")
- .where("p.raw = ''")
- .delete_all
-
- DB.exec(<<~SQL, deleted_at: CLEANUP_GRACE_PERIOD)
- DELETE FROM post_search_data
- WHERE post_id IN (
- SELECT post_id
- FROM post_search_data
- LEFT JOIN posts ON post_search_data.post_id = posts.id
- INNER JOIN topics ON posts.topic_id = topics.id
- WHERE (topics.deleted_at IS NOT NULL
- AND topics.deleted_at <= :deleted_at) OR (
- posts.deleted_at IS NOT NULL AND
- posts.deleted_at <= :deleted_at
- )
-
- )
- SQL
+ topic_ids.each do |id|
+ topic = Topic.find_by(id: id)
+ indexer.index(topic, force: true) if topic
+ end
end
- def clean_topic_search_data
+ def rebuild_posts(limit: 20_000, indexer: SearchIndexer)
+ post_ids = load_problem_post_ids(limit)
+
+ puts "rebuilding #{post_ids.size} posts" if @verbose
+
+ post_ids.each do |id|
+ post = Post.find_by(id: id)
+ indexer.index(post, force: true) if post
+ end
+ end
+
+ def rebuild_users(limit: 5_000, indexer: SearchIndexer)
+ user_ids = load_problem_user_ids(limit)
+
+ puts "rebuilding #{user_ids.size} users" if @verbose
+
+ user_ids.each do |id|
+ user = User.find_by(id: id)
+ indexer.index(user, force: true) if user
+ end
+ end
+
+ def clean_topics
puts "cleaning up topic search data" if @verbose
- DB.exec(<<~SQL, deleted_at: CLEANUP_GRACE_PERIOD)
- DELETE FROM topic_search_data
- WHERE topic_id IN (
- SELECT topic_id
- FROM topic_search_data
- INNER JOIN topics ON topic_search_data.topic_id = topics.id
- WHERE topics.deleted_at IS NOT NULL
- AND topics.deleted_at <= :deleted_at
- )
+ # remove search data from deleted topics
+
+ DB.exec(<<~SQL, deleted_at: @cleanup_grace_period)
+ DELETE FROM topic_search_data
+ WHERE topic_id IN (
+ SELECT topic_id
+ FROM topic_search_data
+ LEFT JOIN topics ON topic_id = topics.id
+ WHERE topics.id IS NULL
+ OR (deleted_at IS NOT NULL AND deleted_at <= :deleted_at)
+ )
SQL
end
- def load_problem_post_ids(limit)
- params = {
- locale: SiteSetting.default_locale,
- version: SearchIndexer::MIN_POST_REINDEX_VERSION,
- limit: limit
- }
+ def clean_posts
+ puts "cleaning up post search data" if @verbose
- DB.query_single(<<~SQL, params)
- SELECT
- posts.id
- FROM posts
- JOIN topics ON topics.id = posts.topic_id
- LEFT JOIN post_search_data pd
- ON pd.locale = :locale
- AND pd.version >= :version
- AND pd.post_id = posts.id
- WHERE pd.post_id IS NULL
- AND posts.deleted_at IS NULL
- AND topics.deleted_at IS NULL
- AND posts.raw != ''
- ORDER BY posts.id DESC
- LIMIT :limit
+ # remove search data from deleted/empty posts
+
+ DB.exec(<<~SQL, deleted_at: @cleanup_grace_period)
+ DELETE FROM post_search_data
+ WHERE post_id IN (
+ SELECT post_id
+ FROM post_search_data
+ LEFT JOIN posts ON post_id = posts.id
+ JOIN topics ON posts.topic_id = topics.id
+ WHERE posts.id IS NULL
+ OR posts.raw = ''
+ OR (posts.deleted_at IS NOT NULL AND posts.deleted_at <= :deleted_at)
+ OR (topics.deleted_at IS NOT NULL AND topics.deleted_at <= :deleted_at)
+ )
SQL
end
def load_problem_category_ids(limit)
- Category.joins(:category_search_data)
- .where('category_search_data.locale != ?
- OR category_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::CATEGORY_INDEX_VERSION)
- .order('categories.id asc')
- .limit(limit)
- .pluck(:id)
- end
-
- def load_problem_topic_ids(limit)
- Topic.joins(:topic_search_data)
- .where('topic_search_data.locale != ?
- OR topic_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::TOPIC_INDEX_VERSION)
- .order('topics.id desc')
- .limit(limit)
- .pluck(:id)
- end
-
- def load_problem_user_ids(limit)
- User.joins(:user_search_data)
- .where('user_search_data.locale != ?
- OR user_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::USER_INDEX_VERSION)
- .order('users.id asc')
+ Category
+ .joins("LEFT JOIN category_search_data ON category_id = categories.id")
+ .where("category_search_data.locale IS NULL OR category_search_data.locale != ? OR category_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::CATEGORY_INDEX_VERSION)
+ .order("categories.id ASC")
.limit(limit)
.pluck(:id)
end
def load_problem_tag_ids(limit)
- Tag.joins(:tag_search_data)
- .where('tag_search_data.locale != ?
- OR tag_search_data.version != ?', SiteSetting.default_locale, SearchIndexer::TAG_INDEX_VERSION)
- .order('tags.id asc')
+ Tag
+ .joins("LEFT JOIN tag_search_data ON tag_id = tags.id")
+ .where("tag_search_data.locale IS NULL OR tag_search_data.locale != ? OR tag_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::TAG_INDEX_VERSION)
+ .order("tags.id ASC")
.limit(limit)
.pluck(:id)
end
+
+ def load_problem_topic_ids(limit)
+ Topic
+ .joins("LEFT JOIN topic_search_data ON topic_id = topics.id")
+ .where("topic_search_data.locale IS NULL OR topic_search_data.locale != ? OR topic_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::TOPIC_INDEX_VERSION)
+ .order("topics.id DESC")
+ .limit(limit)
+ .pluck(:id)
+ end
+
+ def load_problem_post_ids(limit)
+ Post
+ .joins(:topic)
+ .joins("LEFT JOIN post_search_data ON post_id = posts.id")
+ .where("posts.raw != ''")
+ .where("topics.deleted_at IS NULL")
+ .where("post_search_data.locale IS NULL OR post_search_data.locale != ? OR post_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::POST_INDEX_VERSION)
+ .order("posts.id DESC")
+ .limit(limit)
+ .pluck(:id)
+ end
+
+ def load_problem_user_ids(limit)
+ User
+ .joins("LEFT JOIN user_search_data ON user_id = users.id")
+ .where("user_search_data.locale IS NULL OR user_search_data.locale != ? OR user_search_data.version != ?", SiteSetting.default_locale, SearchIndexer::USER_INDEX_VERSION)
+ .order("users.id ASC")
+ .limit(limit)
+ .pluck(:id)
+ end
+
end
end
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 306dfa3d39..4f7d2c0610 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -109,7 +109,7 @@ class CategoryList < DraftableList
to_delete << c
end
end
- @categories.each { |c| c.subcategory_ids = subcategories[c.id] }
+ @categories.each { |c| c.subcategory_ids = subcategories[c.id] || [] }
@categories.delete_if { |c| to_delete.include?(c) }
end
diff --git a/app/models/group.rb b/app/models/group.rb
index 4c601847ee..696703c187 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -838,6 +838,11 @@ class Group < ActiveRecord::Base
)
end
+ def message_count
+ return 0 unless self.has_messages
+ TopicAllowedGroup.where(group_id: self.id).joins(:topic).count
+ end
+
protected
def name_format_validator
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 9fbc6afc42..b5a07a32e2 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -4,13 +4,14 @@ class Notification < ActiveRecord::Base
belongs_to :user
belongs_to :topic
+ has_one :shelved_notification
+
MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS = 24
validates_presence_of :data
validates_presence_of :notification_type
scope :unread, lambda { where(read: false) }
- scope :unprocessed, lambda { where(processed: false) }
scope :recent, lambda { |n = nil| n ||= 10; order('notifications.created_at desc').limit(n) }
scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
.where('topics.id IS NULL OR topics.deleted_at IS NULL') }
@@ -283,10 +284,11 @@ class Notification < ActiveRecord::Base
end
def send_email
- if skip_send_email
- return update(processed: true)
- end
- NotificationEmailer.process_notification(self) unless user.do_not_disturb?
+ return if skip_send_email
+
+ user.do_not_disturb? ?
+ ShelvedNotification.create(notification_id: self.id) :
+ NotificationEmailer.process_notification(self)
end
end
diff --git a/app/models/shelved_notification.rb b/app/models/shelved_notification.rb
new file mode 100644
index 0000000000..79e4bee249
--- /dev/null
+++ b/app/models/shelved_notification.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ShelvedNotification < ActiveRecord::Base
+ belongs_to :notification
+
+ def process
+ NotificationEmailer.process_notification(notification, no_delay: true)
+ end
+end
diff --git a/app/models/trust_level_setting.rb b/app/models/trust_level_setting.rb
index 4660adc580..68b7e2b1d9 100644
--- a/app/models/trust_level_setting.rb
+++ b/app/models/trust_level_setting.rb
@@ -9,7 +9,7 @@ class TrustLevelSetting < EnumSiteSetting
def self.values
levels = TrustLevel.all
- @values ||= valid_values.map { |x|
+ valid_values.map { |x|
{
name: x.is_a?(Integer) ? "#{x}: #{levels[x.to_i].name}" : x,
value: x
diff --git a/app/models/user.rb b/app/models/user.rb
index 8b6f58d13c..315eac92d8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1391,6 +1391,10 @@ class User < ActiveRecord::Base
active_do_not_disturb_timings.maximum(:ends_at)
end
+ def shelved_notifications
+ ShelvedNotification.joins(:notification).where("notifications.user_id = ?", self.id)
+ end
+
protected
def badge_grant
diff --git a/app/models/user_notification_schedule.rb b/app/models/user_notification_schedule.rb
index 18892506db..f2346d4e17 100644
--- a/app/models/user_notification_schedule.rb
+++ b/app/models/user_notification_schedule.rb
@@ -18,10 +18,14 @@ class UserNotificationSchedule < ActiveRecord::Base
scope :enabled, -> { where(enabled: true) }
def create_do_not_disturb_timings(delete_existing: false)
- user.do_not_disturb_timings.where(scheduled: true).destroy_all if delete_existing
+ destroy_scheduled_timings if delete_existing
UserNotificationScheduleProcessor.create_do_not_disturb_timings_for(self)
end
+ def destroy_scheduled_timings
+ user.do_not_disturb_timings.where(scheduled: true).destroy_all
+ end
+
private
def has_valid_times
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index 447f5d4492..7498b230be 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -1,13 +1,12 @@
# frozen_string_literal: true
-# Searches for a user by username or full text or name (if enabled in SiteSettings)
class UserSearch
MAX_SIZE_PRIORITY_MENTION ||= 500
def initialize(term, opts = {})
- @term = term
- @term_like = "#{term.downcase.gsub("_", "\\_")}%"
+ @term = term.downcase
+ @term_like = @term.gsub("_", "\\_") + "%"
@topic_id = opts[:topic_id]
@category_id = opts[:category_id]
@topic_allowed_users = opts[:topic_allowed_users]
@@ -15,131 +14,129 @@ class UserSearch
@include_staged_users = opts[:include_staged_users] || false
@limit = opts[:limit] || 20
@groups = opts[:groups]
+
+ @topic = Topic.find(@topic_id) if @topic_id
+ @category = Category.find(@category_id) if @category_id
+
@guardian = Guardian.new(@searching_user)
- @guardian.ensure_can_see_groups_members! @groups if @groups
- @guardian.ensure_can_see_category! Category.find(@category_id) if @category_id
- @guardian.ensure_can_see_topic! Topic.find(@topic_id) if @topic_id
+ @guardian.ensure_can_see_groups_members!(@groups) if @groups
+ @guardian.ensure_can_see_category!(@category) if @category
+ @guardian.ensure_can_see_topic!(@topic) if @topic
end
def scoped_users
users = User.where(active: true)
users = users.where(staged: false) unless @include_staged_users
+ users = users.not_suspended unless @searching_user&.staff?
if @groups
- users = users.joins("INNER JOIN group_users ON group_users.user_id = users.id")
+ users = users
+ .joins(:group_users)
.where("group_users.group_id IN (?)", @groups.map(&:id))
end
- unless @searching_user && @searching_user.staff?
- users = users.not_suspended
- end
-
# Only show users who have access to private topic
- if @topic_id && @topic_allowed_users == "true"
- topic = Topic.find_by(id: @topic_id)
-
- if topic.category && topic.category.read_restricted
- users = users.includes(:secure_categories)
- .where("users.admin = TRUE OR categories.id = ?", topic.category.id)
- .references(:categories)
- end
- end
-
- users.limit(@limit)
- end
-
- def filtered_by_term_users
- users = scoped_users
-
- if @term.present?
- if SiteSetting.enable_names? && @term !~ /[_\.-]/
- query = Search.ts_query(term: @term, ts_config: "simple")
-
- users = users.includes(:user_search_data)
- .references(:user_search_data)
- .where("user_search_data.search_data @@ #{query}")
- .order(DB.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
-
- else
- users = users.where("username_lower LIKE :term_like", term_like: @term_like)
- end
+ if @topic_allowed_users == "true" && @topic&.category&.read_restricted
+ users = users
+ .references(:categories)
+ .includes(:secure_categories)
+ .where("users.admin OR categories.id = ?", @topic.category_id)
end
users
end
+ def filtered_by_term_users
+ if @term.blank?
+ scoped_users
+ elsif SiteSetting.enable_names? && @term !~ /[_\.-]/
+ query = Search.ts_query(term: @term, ts_config: "simple")
+
+ scoped_users
+ .includes(:user_search_data)
+ .where("user_search_data.search_data @@ #{query}")
+ .order(DB.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
+ else
+ scoped_users.where("username_lower LIKE :term_like", term_like: @term_like)
+ end
+ end
+
def search_ids
users = Set.new
# 1. exact username matches
if @term.present?
- scoped_users.where(username_lower: @term.downcase)
+ exact_matches = scoped_users.where(username_lower: @term)
+
+ # don't polute mentions with users who haven't shown up in over a year
+ exact_matches = exact_matches.where('last_seen_at > ?', 1.year.ago) if @topic_id || @category_id
+
+ exact_matches
.limit(@limit)
.pluck(:id)
.each { |id| users << id }
-
end
- return users.to_a if users.length >= @limit
+ return users.to_a if users.size >= @limit
# 2. in topic
if @topic_id
in_topic = filtered_by_term_users
- .where('users.id IN (SELECT p.user_id FROM posts p WHERE topic_id = ?)', @topic_id)
+ .where('users.id IN (SELECT user_id FROM posts WHERE topic_id = ?)', @topic_id)
if @searching_user.present?
in_topic = in_topic.where('users.id <> ?', @searching_user.id)
end
in_topic
- .order('last_seen_at DESC')
- .limit(@limit - users.length)
+ .order('last_seen_at DESC NULLS LAST')
+ .limit(@limit - users.size)
.pluck(:id)
.each { |id| users << id }
end
- return users.to_a if users.length >= @limit
+ return users.to_a if users.size >= @limit
- secure_category_id = nil
+ # 3. in category
+ secure_category_id =
+ if @category_id
+ DB.query_single(<<~SQL, @category_id).first
+ SELECT id
+ FROM categories
+ WHERE read_restricted
+ AND id = ?
+ SQL
+ elsif @topic_id
+ DB.query_single(<<~SQL, @topic_id).first
+ SELECT id
+ FROM categories
+ WHERE read_restricted
+ AND id IN (SELECT category_id FROM topics WHERE id = ?)
+ SQL
+ end
- if @category_id
- secure_category_id = DB.query_single(<<~SQL, @category_id).first
- SELECT id FROM categories
- WHERE read_restricted AND id = ?
- SQL
- elsif @topic_id
- secure_category_id = DB.query_single(<<~SQL, @topic_id).first
- SELECT id FROM categories
- WHERE read_restricted AND id IN (
- SELECT category_id FROM topics
- WHERE id = ?
- )
- SQL
- end
-
- # 3. category matches
if secure_category_id
- @searching_user.present?
-
category_groups = Group.where(<<~SQL, secure_category_id, MAX_SIZE_PRIORITY_MENTION)
groups.id IN (
- SELECT group_id FROM category_groups
- JOIN groups g ON group_id = g.id
- WHERE
- category_id = ? AND
- user_count < ?
+ SELECT group_id
+ FROM category_groups
+ JOIN groups g ON group_id = g.id
+ WHERE category_id = ?
+ AND user_count < ?
)
SQL
- category_groups = category_groups.members_visible_groups(@searching_user)
+ if @searching_user.present?
+ category_groups = category_groups.members_visible_groups(@searching_user)
+ end
in_category = filtered_by_term_users
.where(<<~SQL, category_groups.pluck(:id))
users.id IN (
SELECT gu.user_id
- FROM group_users gu
- WHERE group_id IN (?)
- LIMIT 200
+ FROM group_users gu
+ WHERE group_id IN (?)
+ LIMIT 200
)
SQL
@@ -148,17 +145,19 @@ class UserSearch
end
in_category
- .order('last_seen_at DESC')
- .limit(@limit - users.length)
+ .order('last_seen_at DESC NULLS LAST')
+ .limit(@limit - users.size)
.pluck(:id)
.each { |id| users << id }
end
- return users.to_a if users.length >= @limit
+ return users.to_a if users.size >= @limit
+
# 4. global matches
if @term.present?
- filtered_by_term_users.order('last_seen_at DESC')
- .limit(@limit - users.length)
+ filtered_by_term_users
+ .order('last_seen_at DESC NULLS LAST')
+ .limit(@limit - users.size)
.pluck(:id)
.each { |id| users << id }
end
diff --git a/app/serializers/category_detailed_serializer.rb b/app/serializers/category_detailed_serializer.rb
index 483f78f845..6b1e5083b2 100644
--- a/app/serializers/category_detailed_serializer.rb
+++ b/app/serializers/category_detailed_serializer.rb
@@ -26,10 +26,6 @@ class CategoryDetailedSerializer < BasicCategorySerializer
is_uncategorized
end
- def include_subcategory_ids?
- subcategory_ids.present?
- end
-
def topics_day
count_with_subcategories(:topics_day)
end
diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb
index 53a6f0d93d..584e20b1f0 100644
--- a/app/serializers/group_show_serializer.rb
+++ b/app/serializers/group_show_serializer.rb
@@ -25,7 +25,8 @@ class GroupShowSerializer < BasicGroupSerializer
:email_password,
:imap_last_error,
:imap_old_emails,
- :imap_new_emails
+ :imap_new_emails,
+ :message_count
def self.admin_or_owner_attributes(*attrs)
attributes(*attrs)
diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index a8b2406ca3..21e31e5ebb 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -125,7 +125,6 @@ class NotificationEmailer
end
def self.process_notification(notification, no_delay: false)
- notification.update(processed: true)
return if @disabled
email_user = EmailUser.new(notification, no_delay: no_delay)
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index 472a1eb715..970d1fff42 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -59,11 +59,12 @@ class UserAnonymizer
)
end
- @user.user_avatar.try(:destroy)
- @user.single_sign_on_record.try(:destroy)
- @user.oauth2_user_infos.try(:destroy_all)
- @user.user_associated_accounts.try(:destroy_all)
- @user.api_keys.find_each { |x| x.try(:destroy) }
+ @user.user_avatar&.destroy!
+ @user.single_sign_on_record&.destroy!
+ @user.oauth2_user_infos.destroy_all
+ @user.user_associated_accounts.destroy_all
+ @user.api_keys.destroy_all
+ @user.user_api_keys.destroy_all
@user.user_emails.secondary.destroy_all
@user_history = log_action
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 41593b84db..544b9883ca 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -200,7 +200,9 @@ class UserUpdater
if saved
if user_notification_schedule
- user_notification_schedule.create_do_not_disturb_timings(delete_existing: true)
+ user_notification_schedule.enabled ?
+ user_notification_schedule.create_do_not_disturb_timings(delete_existing: true) :
+ user_notification_schedule.destroy_scheduled_timings
end
DiscourseEvent.trigger(:user_updated, user)
end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 165ece79e1..796a7be265 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -60,8 +60,8 @@
<%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
- <%- if !current_user && (data = cookies.delete(:authentication_data, path: Discourse.base_path("/"))) %>
-
+ <%- if authentication_data %>
+
<%- end %>
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 32df70d8cb..b2338abe47 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -1873,8 +1873,6 @@ ar:
date_time_picker:
from: من
to: إلى
- errors:
- to_before_from: "يجب أن يكون تاريخ الانتهاء متأخراً عن التاريخ."
emoji_picker:
filter_placeholder: ابحث عن إيموجي
smileys_&_emotion: الابتسامات والعواطف
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 793db26e22..d5ae6e75e0 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -1614,8 +1614,6 @@ bs_BA:
date_time_picker:
from: Od
to: Ka
- errors:
- to_before_from: "Ciljani datum mora biti kasniji od početnog datuma."
emoji_picker:
filter_placeholder: Pretraži emotikone
smileys_&_emotion: Smeješci i osječaj
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 88aad82005..462344ec75 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -1479,8 +1479,6 @@ ca:
date_time_picker:
from: De
to: A
- errors:
- to_before_from: "La data final ha de ser posterior a la data inicial."
emoji_picker:
filter_placeholder: Cerca un emoji
smileys_&_emotion: Emoticones
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 8d049b6f4a..d69faf7ea1 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -1390,8 +1390,6 @@ da:
date_time_picker:
from: Fra
to: Til
- errors:
- to_before_from: "Til dato skal være senere end fra dato."
emoji_picker:
filter_placeholder: Søg efter humørikon
smileys_&_emotion: Smilys og følelser
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 32da447236..702cdd1c25 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -187,6 +187,7 @@ de:
us_gov_west_1: "AWS GovCloud (US-West)"
us_west_1: "USA West (Nordkalifornien)"
us_west_2: "USA West (Oregon)"
+ clear_input: "Eingabe löschen"
edit: "Titel und Kategorie dieses Themas ändern"
expand: "Aufklappen"
not_implemented: "Entschuldige, diese Funktion wurde noch nicht implementiert!"
@@ -1673,8 +1674,6 @@ de:
date_time_picker:
from: Von
to: An
- errors:
- to_before_from: "Das Datum muss später als das von-Datum sein."
emoji_picker:
filter_placeholder: Emoji suchen
smileys_&_emotion: Smileys und Emotion
@@ -1883,7 +1882,7 @@ de:
membership_request_accepted: "Mitgliedschaft akzeptiert in '%{group_name}' "
membership_request_consolidated:
one: "%{count} offene Mitgliedschaftsanfrage für '%{group_name}'"
- other: "%{count} offene Mitgliedschaftanfragen für '%{group_name}'"
+ other: "%{count} offene Mitgliedschaftsanfragen für '%{group_name}'"
reaction: "%{username} %{description}"
reaction_2: "%{username}, %{username2} %{description}"
votes_released: "%{description} - abgeschlossen"
@@ -1966,6 +1965,7 @@ de:
or_search_google: "Oder versuche stattdessen mit Google zu suchen:"
search_google: "Versuche stattdessen mit Google zu suchen:"
search_google_button: "Google"
+ search_button: "Suche"
context:
user: "Beiträge von @%{username} durchsuchen"
category: "Kategorie #%{category} durchsuchen"
@@ -2864,6 +2864,7 @@ de:
list_filters:
all: "alle Themen"
none: "keine Unterkategorien"
+ colors_disabled: "Sie können keine Farben auswählen, da Sie keinen Kategoriestil haben."
flagging:
title: "Danke für deine Mithilfe!"
action: "Beitrag melden"
@@ -3305,6 +3306,7 @@ de:
two_hours: "2 Stunden"
tomorrow: "Bis morgen"
custom: "Benutzerdefiniert"
+ set_schedule: "Zeitplan für Benachrichtigungen festlegen"
admin_js:
type_to_filter: "zum Filtern hier eingeben…"
admin:
@@ -3332,6 +3334,10 @@ de:
installed_version: "Installiert"
latest_version: "Neueste"
problems_found: "Ein paar Ratschläge basierend auf deinen aktuellen Website-Einstellungen"
+ new_features:
+ title: "\U0001F381 Neue Funktionen"
+ dismiss: "Verwerfen"
+ learn_more: "Mehr erfahren"
last_checked: "Zuletzt geprüft"
refresh_problems: "Aktualisieren"
no_problems: "Es wurden keine Probleme gefunden."
@@ -3462,6 +3468,9 @@ de:
group_members: "Gruppenmitglieder"
delete: "Löschen"
delete_confirm: "Diese Gruppe löschen?"
+ delete_with_messages_confirm:
+ one: "Wenn Sie diese Gruppe löschen, wird %{count} Nachricht verwaist, Gruppenmitglieder haben keinen Zugriff mehr darauf.
Bist du sicher?" + other: "Wenn Sie diese Gruppe löschen, werden %{count} Nachrichten verwaist, Gruppenmitglieder haben keinen Zugriff mehr auf sie.
Bist du sicher?" delete_failed: "Gruppe konnte nicht gelöscht werden. Wenn dies eine automatische Gruppe ist, kann sie nicht gelöscht werden." delete_owner_confirm: "Eigentümerrechte für '%{username}' entfernen?" add: "Hinzufügen" @@ -3883,9 +3892,7 @@ de: Beispiel: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} Eigenschaften sollten mit einem Präfix versehen werden, um Konflikte mit Discourse und Plugins zu vermeiden. head_tag: @@ -4382,6 +4389,9 @@ de: anonymize_yes: "Ja, diesen Benutzer anonymisieren" anonymize_failed: "Beim Anonymisieren des Benutzers ist ein Fehler aufgetreten." delete: "Benutzer löschen" + delete_posts: + progress: + title: "Fortschritt beim Löschen von Beiträgen" merge: button: "Zusammenführen" prompt: @@ -4393,6 +4403,8 @@ de: target_username_placeholder: "Benutzername des neuen Eigentümers" transfer_and_delete: "Übertragen & Löschen @%{username}" cancel: "Abbrechen" + progress: + title: "Fortschritt der Zusammenführung" confirmation: title: "Übertragen & Löschen @%{username}" description: | @@ -4540,6 +4552,7 @@ de: recommended: "Wir empfehlen, dass du den folgenden Text an deine Bedürfnisse anpasst:" show_overriden: "Nur geänderte Texte anzeigen" locale: "Sprache:" + fallback_locale_warning: "Du bearbeitest eine Sprache basierend auf %{fallback}. Benutzer, die %{fallback} als Sprache ihrer Schnittstelle wählen, werden deine Änderungen nicht sehen." more_than_50_results: "Es gibt mehr als 50 Ergebnisse. Bitte grenze deine Suche weiter ein." settings: show_overriden: "Nur geänderte anzeigen" diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml index 000fb2fe66..0e767ed114 100644 --- a/config/locales/client.el.yml +++ b/config/locales/client.el.yml @@ -1594,8 +1594,6 @@ el: date_time_picker: from: Από to: Προς - errors: - to_before_from: "Η τελική ημερομηνία πρέπει να είναι αργότερα από την αρχική ημερομηνία." emoji_picker: filter_placeholder: Αναζήτηση για emoji smileys_&_emotion: Χαμόγελα και συγκίνηση diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index fefb293a43..e3d88511e1 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -210,6 +210,7 @@ en: us_west_1: "US West (N. California)" us_west_2: "US West (Oregon)" + clear_input: "Clear input" edit: "edit the title and category of this topic" expand: "Expand" not_implemented: "That feature hasn't been implemented yet, sorry!" @@ -837,7 +838,6 @@ en: posts: "Posts" topics: "Topics" latest: "Latest" - latest_by: "latest by" toggle_ordering: "toggle ordering control" subcategories: "Subcategories" muted: "Muted categories" @@ -3600,6 +3600,10 @@ en: installed_version: "Installed" latest_version: "Latest" problems_found: "Some advice based on your current site settings" + new_features: + title: "🎁 New Features" + dismiss: "Dismiss" + learn_more: "Learn more" last_checked: "Last checked" refresh_problems: "Refresh" no_problems: "No problems were found." @@ -3734,6 +3738,9 @@ en: group_members: "Group members" delete: "Delete" delete_confirm: "Delete this group?" + delete_with_messages_confirm: + one: "Deleting this group will cause %{count} message to be orphaned, group members will no longer have access to it.
Are you sure?" + other: "Deleting this group will cause %{count} messages to be orphaned, group members will no longer have access to them.
Are you sure?" delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed." delete_owner_confirm: "Remove owner privilege for '%{username}'?" add: "Add" @@ -4162,9 +4169,7 @@ en: Example: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} Prefixing the property names is highly recommended to avoid conflicts with plugins and/or core. head_tag: diff --git a/config/locales/client.en_GB.yml b/config/locales/client.en_GB.yml index 1c76c9c06f..d299959136 100644 --- a/config/locales/client.en_GB.yml +++ b/config/locales/client.en_GB.yml @@ -112,17 +112,6 @@ en_GB: color_definitions: text: "Colour Definitions" title: "Enter custom colour definitions (advanced users only)" - placeholder: |2- - - Use this stylesheet to add custom colours to the list of CSS custom properties. - - Example: - - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } - - Prefixing the property names is highly recommended to avoid conflicts with plugins and/or core. colors: select_base: title: "Select base colour palette" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 922da8a1e0..45878c36e1 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -424,6 +424,9 @@ es: fields: "Campos" reject_reason: "Motivo" user_percentage: + summary: + one: "%{agreed}, %{disagreed}, %{ignored}, (del último reporte)" + other: "%{agreed}, %{disagreed}, %{ignored} (de los últimos %{count} reportes)" agreed: one: "%{count}% de acuerdo" other: "%{count}% de acuerdo" @@ -841,6 +844,20 @@ es: mute_option_title: "No recibirás ninguna notificación relacionada con este usuario." normal_option: "Normal" normal_option_title: "Se te notificará si este usuario te responde, cita o menciona." + notification_schedule: + title: "Horario de notificaciones" + label: "Activar horario personalizado de notificaciones" + tip: "Fuera de estas horas, se activará el modo «no molestar» automáticamente." + midnight: "Medianoche" + none: "Ninguno" + monday: "Lunes" + tuesday: "Martes" + wednesday: "Miércoles" + thursday: "Jueves" + friday: "Viernes" + saturday: "Sábado" + sunday: "Domingo" + to: "a" activity_stream: "Actividad" preferences: "Preferencias" feature_topic_on_profile: @@ -870,6 +887,7 @@ es: perm_denied_expl: "Has denegado el permiso para las notificaciones. Configura tu navegador para permitir notificaciones. " disable: "Desactivar notificaciones" enable: "Activar notificaciones" + each_browser_note: 'Nota: hay que cambiar este ajuste en cada navegador que uses. Todas las notificaciones serán desactivadas en el modo «no molestar», independientemente de este ajuste.' consent_prompt: "¿Quieres recibir notificaciones en vivo cuando alguien responda a tus mensajes?" dismiss: "Descartar" dismiss_notifications: "Descartar todo" @@ -1654,8 +1672,6 @@ es: date_time_picker: from: Desde to: Hasta - errors: - to_before_from: "La fecha «hasta» debe ser posterior a la fecha «desde»." emoji_picker: filter_placeholder: Buscar emoji smileys_&_emotion: Caras y emociones @@ -1814,6 +1830,7 @@ es: label: "Crear tema" shared_draft: label: "Borrador compartido" + desc: "Inicia un tema-borrador que solo será visible por los usuarios permitidos" toggle_topic_bump: label: "Alternar bump del tema" desc: "Responder sin alterar la fecha de última respuesta" @@ -1946,6 +1963,7 @@ es: or_search_google: "O prueba buscar a través de Google:" search_google: "Intenta buscar con Google:" search_google_button: "Google" + search_button: "Buscar" context: user: "Buscar publicaciones de @%{username}" category: "Buscar la categoría #%{category}" @@ -2514,7 +2532,7 @@ es: other: "ver %{count} publicaciones ocultas" notice: new_user: "Esta es la primera vez que %{user} ha publicado — ¡démosle la bienvenida a nuestra comunidad!" - returning_user: "Hace tiempo que no vemos a %{user} — su última publicación fue %{time}. " + returning_user: "Hacía tiempo que no veíamos a %{user}, su última publicación fue %{time}." unread: "Publicaciones sin leer" has_replies: one: "%{count} Respuesta" @@ -2843,6 +2861,7 @@ es: list_filters: all: "todos los temas" none: "sin subcategoría" + colors_disabled: "No puedes seleccionar colores porque tienes no tienes activados los estilos de categoría." flagging: title: "¡Gracias por ayudar a mantener una comunidad civilizada!" action: "Reportar publicación" @@ -2860,6 +2879,7 @@ es: notify_action: "Mensaje" official_warning: "Advertencia oficial" delete_spammer: "Eliminar spammer" + delete_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {# publicación} other {# publicaciones}} y {TOPICS, plural, one {# tema} other {# temas}} de este usuario, también eliminarás su cuenta, bloquearás registros desde su dirección IP {ip_address}, y añadirás su correo electrónico {email} a una lista de bloqueos permanentes. ¿Seguro que el usuario es de verdad un spammer?" yes_delete_spammer: "Sí, eliminar spammer" ip_address_missing: "(N/D)" hidden_email_address: "(oculto)" @@ -2926,6 +2946,12 @@ es: title: "Este tema es un mensaje personal" help: "Este tema es un mensaje personal" posts: "Publicaciones" + posts_likes_MF: | + Este tema tiene {count, plural, one {# respuesta} other {# respuestas}} {ratio, select, + low {con una proporción de me gusta por publicación alta} + med {con una proporción de me gusta por publicación muy alta} + high {con una proporción de me gusta por publicación extremadamente alta} + other {}} original_post: "Publicación original" views: "Vistas" views_lowercase: @@ -3255,6 +3281,7 @@ es: invite: custom_message: "Dale a tu invitación un toque personal escribiendo un mensaje personalizado." custom_message_placeholder: "Ingresa tu mensaje personalizado" + approval_not_required: "El usuario será aprobado automáticamente en cuanto acepte esta invitación." custom_message_template_forum: "¡Hey, deberías unirte a este foro!" custom_message_template_topic: "¡Hey, creemos que este tema te va a encantar!" forced_anonymous: "Debido a una carga extrema, esto se está mostrando temporalmente a todos como lo vería un usuario que no haya iniciado sesión." @@ -3276,6 +3303,7 @@ es: two_hours: "2 horas" tomorrow: "Hasta mañana" custom: "Personalizado" + set_schedule: "Establecer un horario de notificaciones" admin_js: type_to_filter: "filtrar opciones..." admin: @@ -3303,6 +3331,10 @@ es: installed_version: "Instalada" latest_version: "Última" problems_found: "Algunos consejos con base en tus ajustes actuales" + new_features: + title: "\U0001F381 Novedades" + dismiss: "Ocultar" + learn_more: "Más información" last_checked: "Ultima comprobación" refresh_problems: "Refrescar" no_problems: "No se encontró ningún problema." @@ -3793,6 +3825,7 @@ es: install_upload: "Desde tu dispositivo" install_git_repo: "Desde un repositorio git" install_create: "Crear nuevo" + duplicate_remote_theme: "El componente de tema «%{name}» ya está instalado, ¿seguro que quieres instalar otra copia?" about_theme: "Acerca de" license: "Licencia" version: "Versión:" @@ -3812,6 +3845,7 @@ es: check_for_updates: "Buscar actualizaciones" updating: "Actualizando..." up_to_date: "El tema está actualizado. Última comprobación:" + has_overwritten_history: "La versión actual del tema ya no existe, porque el historial de Git ha sido sobreescrito por un force push." add: "Agregar" theme_settings: "Ajustes del tema" no_settings: "Este tema no tiene ajustes." @@ -3841,17 +3875,6 @@ es: color_definitions: text: "Definiciones de color" title: "Introducir definiciones de colores personalizadas (para usuarios avanzados)" - placeholder: |2- - - Usa esta hoja de estilos para añadir colores personalizados a la lista de propiedades personalizadas de CSS. - - Por ejemplo: - - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } - - Añadir un prefijo a los nombres de las propiedades es altamente recomendado para evitar conflictos con plugins y el núcleo. head_tag: text: "" title: "HTML que será insertado antes de la etiqueta" @@ -4297,6 +4320,7 @@ es: clear_penalty_history: title: "Eliminado historial de faltas" description: "usuarios con faltas no pueden alcanzar NC3" + delete_all_posts_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {# publicación} other {# publicaciones}} y {TOPICS, plural, one {# tema} other {# temas}}. ¿Estás seguro?" silence: "Silenciar" unsilence: "Dejar de silenciar" silenced: "¿Silenciado?" @@ -4345,6 +4369,9 @@ es: anonymize_yes: "Sí, hacer anónima esta cuenta." anonymize_failed: "Hubo un problema al hacer anónima la cuenta." delete: "Eliminar usuario" + delete_posts: + progress: + title: "Progreso de la eliminación de publicaciones" merge: button: "Juntar" prompt: @@ -4356,6 +4383,8 @@ es: target_username_placeholder: "Nombre de usuario del nuevo dueño" transfer_and_delete: "Transferir y eliminar @%{username}" cancel: "Cancelar" + progress: + title: "Progreso de fusión" confirmation: title: "Transferir y eliminar @%{username}" description: | @@ -4502,6 +4531,7 @@ es: go_back: "Volver a la búsqueda" recommended: "Recomendamos personalizar el siguiente texto para que se ajusten a tus necesidades:" show_overriden: "Solo mostrar sobrescritos" + locale: "Idioma:" more_than_50_results: "Hay más de 50 resultados. Por favor, afina tu busqueda." settings: show_overriden: "Solo mostrar anulados" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index f06d408af5..8ea48d0093 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -1603,8 +1603,6 @@ fi: date_time_picker: from: Mistä to: Vastaanottaja - errors: - to_before_from: "Päättymispäivän on oltava myöhempi kuin alkamispäivän." emoji_picker: filter_placeholder: Etsi emojia smileys_&_emotion: Hymiöt ja tunteet diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 8dada8822d..dfb9ba7e74 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -844,6 +844,19 @@ fr: mute_option_title: "Vous ne recevrez pas de notifications en lien avec cet utilisateur." normal_option: "Normal" normal_option_title: "Vous serez notifié si cet utilisateur vous répond, vous cite ou vous mentionne." + notification_schedule: + title: "Planification des notifications" + label: "Activer la planification des notifications personnalisées" + tip: "En dehors de ces heures, vous serez automatiquement mis en \"ne pas déranger\"." + midnight: "Minuit" + none: "Aucun" + monday: "Lundi" + tuesday: "Mardi" + wednesday: "Mercredi" + thursday: "Jeudi" + friday: "Vendredi" + saturday: "samedi" + sunday: "dimanche" activity_stream: "Activité" preferences: "Préférences" feature_topic_on_profile: @@ -890,7 +903,7 @@ fr: color_schemes: default_description: "Couleur du thème" disable_dark_scheme: "Désactivé" - dark_instructions: "Vous pouvez prévisualiser le jeu de couleurs du mode sombre en basculant le mode sombre de votre appareil." + dark_instructions: "Vous pouvez prévisualiser le jeu de couleurs du mode sombre en activant le mode sombre de votre appareil." undo: "Réinitialiser" regular: "Normal" dark: "Mode sombre" @@ -1659,8 +1672,6 @@ fr: date_time_picker: from: De to: À - errors: - to_before_from: "La date de fin doit être postérieure à celle de début." emoji_picker: filter_placeholder: Rechercher un émoji smileys_&_emotion: Frimousses et émotions @@ -3292,6 +3303,7 @@ fr: two_hours: "2 heures" tomorrow: "Jusqu'à demain" custom: "Personnalisé" + set_schedule: "Planifier les notifications" admin_js: type_to_filter: "commencez à taper pour filtrer…" admin: @@ -3319,6 +3331,10 @@ fr: installed_version: "Installée" latest_version: "Dernière" problems_found: "Quelques conseils d'après vos paramètres actuels" + new_features: + title: "\U0001F381 Nouvelles fonctionnalités" + dismiss: "Ignorer" + learn_more: "En savoir plus…" last_checked: "Dernière vérification" refresh_problems: "Actualiser" no_problems: "Aucun problème n'a été trouvé." @@ -3862,17 +3878,6 @@ fr: color_definitions: text: "Définitions de couleur" title: "Entrez des définitions de couleurs personnalisées (utilisateurs avancés uniquement)" - placeholder: |2- - - Utilisez cette feuille de style pour ajouter des couleurs personnalisées à la liste des propriétés personnalisées CSS. - - Exemple : - - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } - - Il est fortement recommandé de préfixer les noms de propriété pour éviter les conflits avec Discourse ou ses extensions. head_tag: text: "" title: "HTML qui sera inséré avant la balise " diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index a4c650dfca..b6ba6056ea 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -187,6 +187,7 @@ gl: us_gov_west_1: "AWS GovCloud (EUA-Oeste)" us_west_1: "EUA Oeste (N. California)" us_west_2: "EUA Oeste (Oregón)" + clear_input: "Despexar entrada" edit: "editar o título e a categoría deste tema" expand: "Expandir" not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda." @@ -422,6 +423,7 @@ gl: email: "Correo electrónico" name: "Nome" fields: "Campos" + reject_reason: "Razón" user_percentage: summary: one: "%{agreed}, %{disagreed}, %{ignored} (da última alerta)" @@ -514,6 +516,9 @@ gl: other: "Tes %{count} publicacións pendentes." ok: "De acordo" example_username: "nome de usuario" + reject_reason: + title: "Por que rexeita a este usuario?" + send_email: "Enviar correo de rexeitamento" user_action: user_posted_topic: "%{user} publicou o tema" you_posted_topic: "Vostede publicou o tema" @@ -840,6 +845,20 @@ gl: mute_option_title: "Non recibirás notificación ningunha relacionada con este usuario." normal_option: "Normal" normal_option_title: "Recibirás unha notificación se este usuario che responde, cita a túa mensaxe ou menciona o teu nome." + notification_schedule: + title: "Calendario de notificacións" + label: "Activar o calendario personalizado de notificacións" + tip: "Fóra destas horas, vostede terá posto automaticamente en «non molestar»" + midnight: "Medianoite" + none: "Ningunha" + monday: "Luns" + tuesday: "Martes" + wednesday: "Mércores" + thursday: "Xoves" + friday: "Venres" + saturday: "Sábado" + sunday: "Domingo" + to: "para o" activity_stream: "Actividade" preferences: "Preferencias" feature_topic_on_profile: @@ -1655,8 +1674,6 @@ gl: date_time_picker: from: De to: A - errors: - to_before_from: "A data límite debe ser posterior á de orixe." emoji_picker: filter_placeholder: Buscar emoji smileys_&_emotion: Emoticonas e emoción @@ -1948,6 +1965,7 @@ gl: or_search_google: "Ou proba a buscar con Google:" search_google: "Proba a buscar con Google:" search_google_button: "Google" + search_button: "Buscar" context: user: "Buscar publicacións de @%{username}" category: "Buscar na categoría #%{category}" @@ -2846,6 +2864,7 @@ gl: list_filters: all: "todos os temas" none: "sen subcategorías" + colors_disabled: "Non pode seleccionar cores porque ten un estilo de categoría con ningún." flagging: title: "Grazas por axudar a manter a nosa comunidade." action: "Denunciar publicación" @@ -3287,6 +3306,7 @@ gl: two_hours: "2 horas" tomorrow: "Ata mañá" custom: "Personalizado" + set_schedule: "Estabelecer un calendario de notificacións" admin_js: type_to_filter: "escribe para filtrar..." admin: @@ -3314,6 +3334,10 @@ gl: installed_version: "Instalado" latest_version: "Últimos" problems_found: "Algúns consellos baseados na súa configuración actual do sitio" + new_features: + title: "Novas funcionalidades" + dismiss: "Desbotar" + learn_more: "Saber máis" last_checked: "Última comprobación" refresh_problems: "Actualizar" no_problems: "Non se atoparon problemas." @@ -3444,6 +3468,9 @@ gl: group_members: "Membros do grupo" delete: "Eliminar" delete_confirm: "Eliminar este grupo?" + delete_with_messages_confirm: + one: "Se elimina este grupo, quedará orfo %{count} mensaxe, os membros do grupo xa non terán acceso a el.
Está seguro?" + other: "Se elimina este grupo, quedará orfo %{count} mensaxes, os membros do grupo xa non terán acceso a el.
Está seguro?" delete_failed: "Non é posíbel eliminar o grupo. Se este é un grupo automático, non se pode destruír." delete_owner_confirm: "Eliminar os privilexios de usuario de «%{username}»?" add: "Engadir" @@ -3861,15 +3888,13 @@ gl: title: "Escriba definicións de cor personalizadas (só para usuarios avanzados)" placeholder: |2- - Utilice esta folla de estilo para engadir cores personalizadas á listaxe de propiedades CSS. + Utilice esta folla de estilo para engadir cores personalizadas á lista de propiedades de CSS personalizadas Exemplo: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} - Prefixar os nomes da propiedade resulta altamente recomendábel para evitarmos conflitos con complementos e/ou o núcleo. + Recoméndase intensamente prefixar os nomes para evitar conflitos con complementos e/ou o núcleo. head_tag: text: "" title: "HTML que se inserirá antes da etiqueta " @@ -4364,6 +4389,9 @@ gl: anonymize_yes: "Si, converter a conta en anónima" anonymize_failed: "Produciuse un problema convertendo a conta en anónima." delete: "Eliminar usuario" + delete_posts: + progress: + title: "Progreso na eliminación de publicacións" merge: button: "Combinar" prompt: @@ -4375,6 +4403,8 @@ gl: target_username_placeholder: "Nome de usuario do novo propietario" transfer_and_delete: "Transferir e eliminar @%{username}" cancel: "Cancelar" + progress: + title: "Combinar o progreso" confirmation: title: "Transferir e eliminar @%{username}" description: | @@ -4521,6 +4551,8 @@ gl: go_back: "Volver á busca" recommended: "Recomendamos personalizar o seguinte texto para axeitalo ás túas necesidades:" show_overriden: "Amosar só os cambios" + locale: "Idioma:" + fallback_locale_warning: "Está a editar un idioma baseado en %{fallback}. Os usuarios que escollan %{fallback} como idioma de interface non verán os cambios." more_than_50_results: "Hai máis de 50 resultados. Restrinxe a busca." settings: show_overriden: "Amosar só os cambios" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 7466ef4396..c4242b623f 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -233,6 +233,7 @@ he: us_gov_west_1: "הענן הממשלתי של AWS (מערב ארה״ב)" us_west_1: "מערב ארה״ב (צפון קליפורניה)" us_west_2: "מערב ארה״ב (אורגון)" + clear_input: "פינוי הקלט" edit: "עריכת הכותרת והקטגוריה של נושא זה" expand: "הרחב" not_implemented: "תכונה זו עדיין לא מומשה, עמך הסליחה!" @@ -1788,8 +1789,6 @@ he: date_time_picker: from: מאת to: אל - errors: - to_before_from: "תאריך היעד חייב להיות לאחר תאריך ההתחלה." emoji_picker: filter_placeholder: חיפוש אחר אמוג׳י smileys_&_emotion: חייכנים ורגש @@ -3599,6 +3598,10 @@ he: installed_version: "הותקן" latest_version: "אחרונה" problems_found: "עצה שמבוססת על הגדרות האתר הנוכחיות שלך" + new_features: + title: "\U0001F381 תכונות חדשות" + dismiss: "התעלמות" + learn_more: "מידע נוסף" last_checked: "נבדק לאחרונה" refresh_problems: "רענן" no_problems: "לא נמצאו בעיות." @@ -3731,6 +3734,11 @@ he: group_members: "חברי הקבוצה" delete: "מחיקה" delete_confirm: "להסיר קבוצה זו?" + delete_with_messages_confirm: + one: "מחיקת הקבוצה הזאת תוביל להתייתמותה של הודעה %{count}, חברי הקבוצה לא יוכלו לגשת אליה עוד.
להמשיך?" + two: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.
להמשיך?" + many: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.
להמשיך?" + other: "מחיקת הקבוצה הזאת תוביל להתייתמותן של %{count} הודעות, חברי הקבוצה לא יוכלו לגשת אליהן עוד.
להמשיך?" delete_failed: "לא ניתן להסיר קבוצה זו. אם זו קבוצה אוטומטית, היא בלתי ניתנת למחיקה." delete_owner_confirm: "להסיר את הרשאות הניהול של ‚%{username}’?" add: "הוספה" @@ -4158,17 +4166,15 @@ he: דוגמה: - :root { - --mytheme-tertiary-or-quaternary: #{dark-light-choose($tertiary, $quaternary)}; - } + %{example} מומלץ מאוד להוסיף קידומת לשמות המאפיינים כדי להימנע מסתירות מול תוספים ו/או הליבה. head_tag: - text: "" - title: "HTML שיוכנס לפני התג " + text: "" + title: "HTML שיוכנס לפני התג " body_tag: - text: "