Skip to content
Snippets Groups Projects
Commit 062b4fd6 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'f-smaller-libs' into 'dev'

F smaller libs

See merge request !145
parents b3e5e2c3 7607ab11
Branches
Tags
2 merge requests!150Release 0.15.2,!145F smaller libs
Pipeline #61380 passed
No preview for this file type
...@@ -51,7 +51,7 @@ _create_jsheader () { ...@@ -51,7 +51,7 @@ _create_jsheader () {
</xsl:attribute> </xsl:attribute>
</xsl:element> </xsl:element>
" "
[[ -f "public/index.html" ]] && sed -i "s|^\(.*JS_INCLUDE.*\)$| <script src=\"${DIST_BUNDLE}\"><\/script>\n\1|g" public/index.html ; [ -f "public/index.html" ] && sed -i "s|^\(.*JS_INCLUDE.*\)$| <script src=\"${DIST_BUNDLE}\"><\/script>\n\1|g" public/index.html ;
else else
_ALL_SOURCES=$@ _ALL_SOURCES=$@
echo "${_ALL_SOURCES}" echo "${_ALL_SOURCES}"
...@@ -66,7 +66,7 @@ _create_jsheader () { ...@@ -66,7 +66,7 @@ _create_jsheader () {
</xsl:attribute> </xsl:attribute>
</xsl:element> </xsl:element>
" "
sed -i "s|^\(.*JS_INCLUDE.*\)$| <script src=\"${_SOURCE}\"><\/script>\n\1|g" public/index.html ; [ -f "public/index.html" ] && sed -i "s|^\(.*JS_INCLUDE.*\)$| <script src=\"${_SOURCE}\"><\/script>\n\1|g" public/index.html ;
done done
fi fi
......
...@@ -90,7 +90,7 @@ QUnit.test("autofocus_without_form", function(assert) { ...@@ -90,7 +90,7 @@ QUnit.test("autofocus_without_form", function(assert) {
return container[0]; return container[0];
}; };
// This should always work // This should always work
cb_without_autofocus = form_panel.create_show_form_callback( const cb_without_autofocus = form_panel.create_show_form_callback(
id, id,
title, title,
undefined, undefined,
...@@ -103,7 +103,7 @@ QUnit.test("autofocus_without_form", function(assert) { ...@@ -103,7 +103,7 @@ QUnit.test("autofocus_without_form", function(assert) {
assert.ok(document.querySelector(`#${id}`), "Callback was called without autofocus."); assert.ok(document.querySelector(`#${id}`), "Callback was called without autofocus.");
$(`#${id}`).remove(); $(`#${id}`).remove();
cb_with_autofocus = form_panel.create_show_form_callback( const cb_with_autofocus = form_panel.create_show_form_callback(
id, id,
title, title,
undefined, undefined,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment