diff --git a/sapl-frontend/package.json b/sapl-frontend/package.json index 0f35b9a36..016f92c1a 100644 --- a/sapl-frontend/package.json +++ b/sapl-frontend/package.json @@ -11,6 +11,7 @@ "@fortawesome/fontawesome-free": "^5.6.3", "bootstrap": "^4.2.1", "dotenv": "^6.2.0", + "imports-loader": "^0.8.0", "jquery": "^3.3.1", "jquery-mask-plugin": "^1.14.15", "jquery-ui-themes": "^1.12.0", diff --git a/sapl-frontend/src/assets/audio/ring.mp3 b/sapl-frontend/src/assets/audio/ring.mp3 deleted file mode 100644 index 97d8fc2d3..000000000 Binary files a/sapl-frontend/src/assets/audio/ring.mp3 and /dev/null differ diff --git a/sapl-frontend/src/global/jquery.runner.js b/sapl-frontend/src/global/jquery.runner.js index b85a6dacc..27919ae8f 100644 --- a/sapl-frontend/src/global/jquery.runner.js +++ b/sapl-frontend/src/global/jquery.runner.js @@ -293,4 +293,4 @@ _$.fn.runner.format = formatTime; -}).call(this); +}).call(window); diff --git a/sapl-frontend/src/global/main.js b/sapl-frontend/src/global/main.js index 17cb0849d..d5c1ec2c7 100644 --- a/sapl-frontend/src/global/main.js +++ b/sapl-frontend/src/global/main.js @@ -1,4 +1,7 @@ import jQuery from "jquery"; +window.$ = window.jQuery = jQuery; + +require('imports-loader?window.jQuery=jquery!./jquery.runner.js'); import "jquery-mask-plugin"; @@ -7,7 +10,6 @@ import "webpack-jquery-ui/sortable"; import "./functions"; -window.$ = window.jQuery = jQuery; window.autorModal(); window.refreshMask(); diff --git a/sapl/templates/sessao/painel.html b/sapl/templates/sessao/painel.html index d83c99e86..1efb65854 100644 --- a/sapl/templates/sessao/painel.html +++ b/sapl/templates/sessao/painel.html @@ -1,6 +1,7 @@ {% extends "crud/detail.html" %} {% load i18n %} {% load staticfiles %} +{% load webpack_static from webpack_loader %} {% block actions %} {% endblock %} {% block title %} @@ -12,7 +13,7 @@ {% block detail_content %} - +
Iniciar painel completo