Skip to content
Snippets Groups Projects
Commit 8c974847 authored by Loïc Correnson's avatar Loïc Correnson
Browse files

Merge branch 'feature/ivette/fix-typing' into 'master'

[ivette] fix typing

See merge request frama-c/frama-c!3753
parents 3c82d554 36741e0a
No related branches found
No related tags found
No related merge requests found
...@@ -2198,7 +2198,7 @@ isutf8-clean: ...@@ -2198,7 +2198,7 @@ isutf8-clean:
clean:: isutf8-clean clean:: isutf8-clean
BINARY_DISTRIB_FILES := \ BINARY_DISTRIB_FILES := \
$(sort $(wildcard ivette/src/dome/doc/template/static/fonts/*)) \ $(sort $(wildcard ivette/ivette.icns ivette/src/dome/doc/template/static/fonts/*)) \
$(sort $(wildcard share/*.ico share/*.png share/theme/*/*.png)) \ $(sort $(wildcard share/*.ico share/*.png share/theme/*/*.png)) \
FILES_WITHOUT_NEWLINE := \ FILES_WITHOUT_NEWLINE := \
......
...@@ -14,7 +14,9 @@ DISTRIB_FILES += ivette/distrib.sh ...@@ -14,7 +14,9 @@ DISTRIB_FILES += ivette/distrib.sh
DISTRIB_FILES += ivette/doc/pandoc/href.lua DISTRIB_FILES += ivette/doc/pandoc/href.lua
DISTRIB_FILES += ivette/doc/pandoc/index.json DISTRIB_FILES += ivette/doc/pandoc/index.json
DISTRIB_FILES += ivette/doc/pandoc/template.html DISTRIB_FILES += ivette/doc/pandoc/template.html
DISTRIB_FILES += ivette/electron-builder.json
DISTRIB_FILES += ivette/electron-webpack.json DISTRIB_FILES += ivette/electron-webpack.json
DISTRIB_FILES += ivette/ivette-macos.sh
DISTRIB_FILES += ivette/package.json DISTRIB_FILES += ivette/package.json
DISTRIB_FILES += ivette/src/dome/.gitignore DISTRIB_FILES += ivette/src/dome/.gitignore
DISTRIB_FILES += ivette/src/dome/CONTRIBUTING.md DISTRIB_FILES += ivette/src/dome/CONTRIBUTING.md
......
...@@ -21,7 +21,7 @@ Distribute() { ...@@ -21,7 +21,7 @@ Distribute() {
for f in $(git -C $repo ls-files .) for f in $(git -C $repo ls-files .)
do do
case $f in case $f in
Makefile.distrib | headers/* ) Makefile.distrib | headers/* | ivette.icns )
;; ;;
*) *)
echo "DISTRIB_FILES += $src/$f" >> $Distrib echo "DISTRIB_FILES += $src/$f" >> $Distrib
......
...@@ -13,7 +13,9 @@ distrib.sh: .ignore ...@@ -13,7 +13,9 @@ distrib.sh: .ignore
doc/pandoc/href.lua: .ignore doc/pandoc/href.lua: .ignore
doc/pandoc/index.json: .ignore doc/pandoc/index.json: .ignore
doc/pandoc/template.html: .ignore doc/pandoc/template.html: .ignore
electron-builder.json: .ignore
electron-webpack.json: .ignore electron-webpack.json: .ignore
ivette-macos.sh: .ignore
package.json: .ignore package.json: .ignore
src/dome/.gitignore: .ignore src/dome/.gitignore: .ignore
src/dome/CONTRIBUTING.md: .ignore src/dome/CONTRIBUTING.md: .ignore
......
...@@ -181,7 +181,7 @@ export function useEmitter( ...@@ -181,7 +181,7 @@ export function useEmitter(
emitter: undefined | null | Emitter, emitter: undefined | null | Emitter,
event: undefined | null | string, event: undefined | null | string,
callback: () => void, callback: () => void,
) { ): void {
return React.useEffect((): (undefined | (() => void)) => { return React.useEffect((): (undefined | (() => void)) => {
if (emitter && event) { if (emitter && event) {
emitter.on(event, callback); emitter.on(event, callback);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment