Skip to content

Commit

Permalink
Merge branch 'admin-refactor' into custom-sounds-refactor
Browse files Browse the repository at this point in the history
* admin-refactor:
  Regression: Removed old user and room files from admin (#17528)
  [IMPROVE] Custom emoji refactor (#17499)
  Fix storybook
  LingoHub based on develop (#17520)
  RegExp improvements suggested by LGTM (#17500)
  • Loading branch information
ggazzo committed May 5, 2020
2 parents 97e3ef5 + db7b469 commit f027a40
Show file tree
Hide file tree
Showing 106 changed files with 863 additions and 2,529 deletions.
1 change: 1 addition & 0 deletions .storybook/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ module.exports = {
plugins: [
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-proposal-nullish-coalescing-operator',
],
};
11 changes: 7 additions & 4 deletions .storybook/mocks/meteor.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@ export const Mongo = {
}),
};

export const ReactiveVar = () => ({
get: () => {},
set: () => {},
});
export const ReactiveVar = (val) => {
let currentVal = val;
return {
get: () => currentVal,
set: (val) => { currentVal = val; },
};
};

export const ReactiveDict = () => ({
get: () => {},
Expand Down
2 changes: 1 addition & 1 deletion app/autotranslate/server/autotranslate.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export class AutoTranslate {
message = Markdown.parseMessageNotEscaped(message);

// Some parsers (e. g. Marked) wrap the complete message in a <p> - this is unnecessary and should be ignored with respect to translations
const regexWrappedParagraph = new RegExp('^\s*<p>|<\/p>\s*$', 'gm');
const regexWrappedParagraph = new RegExp('^\\s*<p>|</p>\\s*$', 'gm');
message.msg = message.msg.replace(regexWrappedParagraph, '');

for (const tokenIndex in message.tokens) {
Expand Down
132 changes: 0 additions & 132 deletions app/emoji-custom/assets/stylesheets/emojiCustomAdmin.css

This file was deleted.

76 changes: 0 additions & 76 deletions app/emoji-custom/client/admin/adminEmoji.html

This file was deleted.

141 changes: 0 additions & 141 deletions app/emoji-custom/client/admin/adminEmoji.js

This file was deleted.

7 changes: 0 additions & 7 deletions app/emoji-custom/client/admin/adminEmojiEdit.html

This file was deleted.

Loading

0 comments on commit f027a40

Please sign in to comment.