-
-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP] Upgrade to Emoji-Mart v5 #128
Draft
rugk
wants to merge
7
commits into
main
Choose a base branch
from
emojimart5
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cc6e99d
chore: install emoji-mart v5
rugk ce66548
Try as per main Readme
rugk 3649b49
Update git submodules
rugk 9954e02
Use CommonCss from TinyWebExt
rugk 24164bb
Add combined-data.kjs from unpkg to make JS load
rugk a50ab2f
Merge branch 'main' into emojimart5
rugk 3a65878
chore: upgrade to v1.0.3 of emoji-mart
rugk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| The submitted source code is just for embedding of emoji-mart, see https://github.com/rugk/emoji-mart-embed/ for the whole source online. | ||
| You can build that separately and include the whole resulting git repo in the add-on. All other parts of the add-on are unminified/untranspiled (JavaScript) files. | ||
| The submitted source code includes emoji-mart as a dependency: https://github.com/missive/emoji-mart | ||
|
|
||
| The whole add-on source is also available at https://github.com/rugk/awesome-emoji-picker. |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,257 +1 @@ | ||
| @import url("./variables.css"); | ||
|
|
||
| body { | ||
| direction: __MSG_@@bidi_dir__; | ||
| } | ||
|
|
||
| /* https://design.firefox.com/photon/components/links.html */ | ||
| a { | ||
| color: var(--blue-60); | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| a:focus { | ||
| border-radius: 4px; | ||
| box-shadow: 0 0 0 2px var(--blue-50), 0 0 0 6px var(--blue-50-a30); | ||
| } | ||
|
|
||
| a:hover, a:active { | ||
| text-decoration: underline; | ||
| } | ||
|
|
||
| a:active { | ||
| color: var(--blue-70); | ||
| } | ||
|
|
||
| /* external link symbol */ | ||
| /* currently disabled, because it is not clear what an external link is, in our case */ | ||
| /*a:not([class])[href*="//"]::after { | ||
| background-image: url(/common/img/open-in-new.svg); | ||
| background-repeat: no-repeat; | ||
| background-size: 16px 16px; | ||
| content: ""; | ||
| display: inline-block; | ||
| height: 16px; | ||
| margin: -.3rem .15rem 0 .25rem; | ||
| vertical-align: middle; | ||
| width: 16px; | ||
| }*/ | ||
|
|
||
| /* small classes in order to avoid inline CSS */ | ||
| .invisible { | ||
| display: none !important; | ||
| } | ||
|
|
||
| .message-container { | ||
| position: relative; | ||
| } | ||
|
|
||
| /* buttons https://design.firefox.com/photon/components/buttons.html */ | ||
| .micro-button { | ||
| min-height: 24px; | ||
| height: auto; | ||
| border-radius: 2px; | ||
|
|
||
| padding-left: 8px; | ||
| padding-right: 8px; | ||
|
|
||
| /* not documented, but looks ugly otherwise */ | ||
| padding-top: 2px; | ||
| padding-bottom: 2px; | ||
|
|
||
| box-sizing: content-box; | ||
|
|
||
| /* do not break over multiple lines */ | ||
| /* white-space: nowrap; */ | ||
| height: auto; /* currently, we rather prefer breaking until https://github.com/rugk/offline-qr-code/issues/12 is done */ | ||
| } | ||
|
|
||
| /* use light color for dark backgrounds */ | ||
| .micro-button:hover.success, | ||
| .micro-button:active.success, | ||
| .micro-button:hover.warning, | ||
| .micro-button:active.warning, | ||
| .micro-button:hover.error, | ||
| .micro-button:active.error { | ||
| color: var(--white-100); | ||
| } | ||
|
|
||
| .micro-button.info { | ||
| background-color: var(--grey-90-a10); | ||
| } | ||
| .micro-button:hover.info { | ||
| background-color: var(--grey-90-a20); | ||
| } | ||
| .micro-button:active.info { | ||
| background-color: var(--grey-90-a30); | ||
| } | ||
|
|
||
| .micro-button.success { | ||
| background-color: var(--green-60); | ||
| } | ||
| .micro-button:hover.success { | ||
| background-color: var(--green-70); | ||
| } | ||
| .micro-button:active.success { | ||
| background-color: var(--green-80); | ||
| } | ||
|
|
||
| .micro-button.warning { | ||
| background-color: var(--yellow-60); | ||
| } | ||
| .micro-button:hover.warning { | ||
| background-color: var(--yellow-70); | ||
| } | ||
| .micro-button:active.warning { | ||
| background-color: var(--yellow-80); | ||
| } | ||
|
|
||
| .micro-button.error { | ||
| background-color: var(--red-70); | ||
| color: var(--white-100); | ||
| } | ||
| .micro-button:hover.error { | ||
| background-color: var(--red-80); | ||
| } | ||
| .micro-button:active.error { | ||
| background-color: var(--red-90); | ||
| } | ||
|
|
||
| .micro-button:focus { | ||
| box-shadow: 0 0 0 1px #0a84ff inset, 0 0 0 1px #0a84ff, 0 0 0 4px rgba(10, 132, 255, 0.3) | ||
| } | ||
|
|
||
| /* message box */ | ||
| /* follows https://design.firefox.com/photon/components/message-bars.html */ | ||
| .message-box { | ||
| padding: 4px; | ||
|
|
||
| border-radius: 4px; | ||
|
|
||
| /* use whole width */ | ||
| width: 100%; | ||
| min-height: 32px; | ||
|
|
||
| /* make errors selectable, so users can copy them */ | ||
| -moz-user-select: text; | ||
| cursor: text; | ||
|
|
||
| /* multiline */ | ||
| hypens: auto; | ||
| overflow-wrap: break-word; | ||
|
|
||
| /* center-vertically */ | ||
| display: flex; | ||
| align-items: center; | ||
|
|
||
| z-index: 2; | ||
|
|
||
| /* fade-in transition */ | ||
| /* follow https://design.firefox.com/photon/motion/duration-and-easing.html */ | ||
| opacity: 1; | ||
| max-height: 100px; | ||
|
|
||
| transition: opacity 150ms cubic-bezier(.07,.95,0,1), | ||
| max-height 200ms cubic-bezier(.07,.95,0,1); | ||
| } | ||
| .message-box.fade-hide { | ||
| max-height: 0px; | ||
| opacity: 0; | ||
| min-height: 0px; | ||
| } | ||
|
|
||
| /* add margin when messages are stacked on each other */ | ||
| .message-box:not(.invisible) ~ .message-box:not(.invisible) { | ||
| margin-top: 8px; | ||
| } | ||
|
|
||
| .error { | ||
| color: var(--white-100); | ||
| background-color: var(--red-60); | ||
| } | ||
|
|
||
| .info { | ||
| color: var(--grey-90); | ||
| background-color: var(--grey-20); | ||
| } | ||
|
|
||
| .success { | ||
| color: var(--green-90); | ||
| background-color: var(--green-50); | ||
| } | ||
|
|
||
| .warning { | ||
| color: var(--yellow-90); | ||
| background-color: var(--yellow-50); | ||
| } | ||
|
|
||
| /* message box action button */ | ||
| .message-action-button { | ||
| margin-left: 8px; | ||
|
|
||
| /* center vertially */ | ||
| margin-top: auto; | ||
| margin-bottom: auto; | ||
|
|
||
| /* some minimum margin to dismiss button or similar */ | ||
| margin-right: 4px; | ||
|
|
||
| border: 0; | ||
| color: var(--grey-90); | ||
|
|
||
| cursor: pointer; | ||
| } | ||
|
|
||
| /* icons for the message boxes */ | ||
| .message-box::before { | ||
| display: inline-block; | ||
|
|
||
| /* fixed size */ | ||
| background-size: 16px 16px; | ||
| width: 16px; | ||
| height: 16px; | ||
| min-width: 16px; | ||
| min-height: 16px; | ||
|
|
||
| content: ""; | ||
| margin: 4px; | ||
| } | ||
|
|
||
| .error::before { | ||
| background-image: url('/common/img/error-white.svg'); | ||
| } | ||
| .info::before { | ||
| background-image: url('/common/img/info-dark.svg'); | ||
| } | ||
| .success::before { | ||
| background-image: url('/common/img/check.svg'); | ||
| } | ||
| .warning::before { | ||
| background-image: url('/common/img/warning-dark.svg'); | ||
| } | ||
|
|
||
| .icon-dismiss { | ||
| box-sizing: content-box; | ||
| padding: 2px; | ||
|
|
||
| width: 24px; | ||
| height: 24px; | ||
|
|
||
| margin-left: auto; | ||
| cursor: pointer; | ||
|
|
||
| /* some animation on hover */ | ||
| transition: background-color 150ms cubic-bezier(.07,.95,0,1); | ||
| } | ||
| .icon-dismiss:hover { | ||
| background-color: var(--grey-90-a10); | ||
| border-radius: 2px; | ||
| } | ||
| .icon-dismiss:active { | ||
| background-color: var(--grey-90-a20); | ||
| border-radius: 2px; | ||
| } | ||
| .icon-dismiss:focus { | ||
| box-shadow: 0 0 0 1px var(--blue-50) inset, 0 0 0 1px var(--blue-50), 0 0 0 4px var(--blue-50-a30); | ||
| border-radius: 2px; | ||
| } | ||
| @import url("./modules/CommonCss/common.css"); |
Submodule emoji-mart-embed
updated
4 files
| +1 −1 | dist/emoji-mart.js | |
| +1 −1 | dist/emoji-mart.js.map | |
| +1,371 −1,242 | package-lock.json | |
| +7 −7 | package.json |
Submodule AddonSettings
updated
14 files
| +61 −11 | docs/AddonSettings.js.html | |
| +26 −3 | docs/examples_DefaultSettings.js.html | |
| +29 −26 | docs/index.html | |
| +33 −7 | docs/module-AddonSettings.html | |
| +86 −1 | docs/module-data_DefaultSettings.html | |
| +9 −1 | docs/module-defaultSettingsTest.html | |
| +15 −6 | docs/scripts/collapse.js | |
| +0 −4 | docs/scripts/jquery-3.1.1.min.js | |
| +12 −0 | docs/scripts/nav.js | |
| +4 −0 | docs/scripts/polyfill.js | |
| +75 −39 | docs/scripts/search.js | |
| +5 −0 | docs/styles/jsdoc.css | |
| +0 −156 | docs/tests_dataTest_defaultSettings.module_test.html | |
| +19 −1 | docs/tests_dataTest_defaultSettings.test.js.html |
Submodule AutomaticSettings
updated
9 files
| +105 −0 | EnvironmentalOptions.js | |
| +0 −42 | MobileOptions.js | |
| +12 −1 | README.md | |
| +8 −2 | css/photonOptions.css | |
| +5 −0 | internal/LoadAndSave.js | |
| +1 −1 | internal/Trigger.js | |
| +31 −0 | tests/environmentalOptions.test.js | |
| +1 −0 | tests/run.js | |
| +1 −0 | tests/setup.js |
Submodule BrowserCommunication
updated
15 files
| +1 −1 | .eslintrc | |
| +20 −1 | BrowserCommunication.js | |
| +1 −0 | CONTRIBUTORS | |
| +19 −2 | README.md | |
| +4 −1 | docs/BrowserCommunication.js.html | |
| +4 −1 | docs/examples_BrowserCommunicationTypes.js.html | |
| +9 −3 | docs/index.html | |
| +15 −1 | docs/module-BrowserCommunication.html | |
| +9 −1 | docs/module-data_BrowserCommunicationTypes.html | |
| +15 −6 | docs/scripts/collapse.js | |
| +0 −4 | docs/scripts/jquery-3.1.1.min.js | |
| +12 −0 | docs/scripts/nav.js | |
| +4 −0 | docs/scripts/polyfill.js | |
| +75 −39 | docs/scripts/search.js | |
| +5 −0 | docs/styles/jsdoc.css |
Submodule Localizer
updated
11 files
| +1 −1 | .eslintrc | |
| +9 −11 | README.md | |
| +136 −4 | docs/Localizer.js.html | |
| +57 −11 | docs/index.html | |
| +13 −2 | docs/module-Localizer.html | |
| +15 −6 | docs/scripts/collapse.js | |
| +0 −4 | docs/scripts/jquery-3.1.1.min.js | |
| +12 −0 | docs/scripts/nav.js | |
| +4 −0 | docs/scripts/polyfill.js | |
| +75 −39 | docs/scripts/search.js | |
| +5 −0 | docs/styles/jsdoc.css |
Submodule Logger
updated
12 files
| +1 −1 | .eslintrc | |
| +1 −0 | Logger.js | |
| +1 −1 | README.md | |
| +5 −1 | docs/Logger.js.html | |
| +15 −7 | docs/index.html | |
| +33 −7 | docs/module-Logger.html | |
| +15 −6 | docs/scripts/collapse.js | |
| +0 −4 | docs/scripts/jquery-3.1.1.min.js | |
| +12 −0 | docs/scripts/nav.js | |
| +4 −0 | docs/scripts/polyfill.js | |
| +75 −39 | docs/scripts/search.js | |
| +5 −0 | docs/styles/jsdoc.css |
Submodule MessageHandler
updated
17 files
| +1 −1 | .eslintrc | |
| +1 −1 | CommonMessages.js | |
| +1 −1 | CustomMessages.js | |
| +3 −1 | README.md | |
| +5 −2 | docs/CommonMessages.js.html | |
| +5 −2 | docs/CustomMessages.js.html | |
| +50 −38 | docs/index.html | |
| +63 −4 | docs/module-CommonMessages.html | |
| +19 −2 | docs/module-CustomMessages.html | |
| +0 −3,740 | docs/module-MessageHandler.html | |
| +15 −6 | docs/scripts/collapse.js | |
| +0 −4 | docs/scripts/jquery-3.1.1.min.js | |
| +12 −0 | docs/scripts/nav.js | |
| +4 −0 | docs/scripts/polyfill.js | |
| +75 −39 | docs/scripts/search.js | |
| +5 −0 | docs/styles/jsdoc.css | |
| +4 −4 | tests/messageHandler.test.js |
Submodule RandomTips
updated
3 files
| +1 −1 | .eslintrc | |
| +2 −2 | examples/Tips.js | |
| +1 −1 | tests/randomTips/baseCode.html |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "name": "awesome-emoji-picker", | ||
| "version": "2.0.0", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git+https://github.com/rugk/awesome-emoji-picker.git" | ||
| }, | ||
| "author": "rugk", | ||
| "license": "ISC", | ||
| "bugs": { | ||
| "url": "https://github.com/rugk/awesome-emoji-picker/issues" | ||
| }, | ||
| "homepage": "https://github.com/rugk/awesome-emoji-picker#readme", | ||
| "dependencies": { | ||
| "@emoji-mart/data": "^1.0.1", | ||
| "emoji-mart": "^5.0.0" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TODO: Update to emoji-mart v5.1.0
https://github.com/missive/emoji-mart/releases/tag/v5.1.0