Various fixes

- Fix user status dialog
  - Add label where missing
  - Move emoji picker inside input field (similar to talk)
  - Fix selecting an emoji
- Fix multiselect
- Fix button with confirmation action
- Fix some other unrelated dark theme issues
- Fix select2 focus
- Run npm lint:fix

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

2 files changed, 3 insertions, 3 deletions

diff --git a/core/src/OC/l10n.js b/core/src/OC/l10n.js
index 38dcf7f765e..2a4569ee272 100644
--- a/core/src/OC/l10n.js
+++ b/core/src/OC/l10n.js
@@ -87,7 +87,7 @@ const L10n = {
 	 * Register an app's translation bundle.
 	 *
 	 * @param {string} appName name of the app
-	 * @param {object<string, string>} bundle bundle
+	 * @param {Object<string, string>} bundle bundle
 	 */
 	register(appName, bundle) {
 		registerAppTranslations(appName, bundle, this._getPlural)
diff --git a/core/src/OC/query-string.js b/core/src/OC/query-string.js
index 8d56eb70705..56bf85186fb 100644
--- a/core/src/OC/query-string.js
+++ b/core/src/OC/query-string.js
@@ -28,7 +28,7 @@ import $ from 'jquery'
  * Parses a URL query string into a JS map
  *
  * @param {string} queryString query string in the format param1=1234&param2=abcde&param3=xyz
- * @return {object.<string, string>} map containing key/values matching the URL parameters
+ * @return {Object<string, string>} map containing key/values matching the URL parameters
  */
 export const parse = queryString => {
 	let pos
@@ -77,7 +77,7 @@ export const parse = queryString => {
 /**
  * Builds a URL query from a JS map.
  *
- * @param {object.<string, string>} params map containing key/values matching the URL parameters
+ * @param {Object<string, string>} params map containing key/values matching the URL parameters
  * @return {string} String containing a URL query (without question) mark
  */
 export const build = params => {