diff --git a/sapl-frontend/src/apps/compilacao/js/compilacao_edit.js b/sapl-frontend/src/apps/compilacao/js/compilacao_edit.js index dd12b4b7d..7b5183979 100644 --- a/sapl-frontend/src/apps/compilacao/js/compilacao_edit.js +++ b/sapl-frontend/src/apps/compilacao/js/compilacao_edit.js @@ -227,7 +227,7 @@ function DispositivoEdit() { if (editortype != "construct") { dpt_form.html(data); if (editortype == 'tinymce' ) { - initTinymce(); + initTextRichEditor(); } //OptionalCustomFrontEnd().init(); } diff --git a/sapl-frontend/src/global/main.js b/sapl-frontend/src/global/main.js index d2c28095f..122c21cdd 100644 --- a/sapl-frontend/src/global/main.js +++ b/sapl-frontend/src/global/main.js @@ -1,15 +1,16 @@ import jQuery from "jquery"; +window.$ = window.jQuery = jQuery; -import "bootstrap"; +require('imports-loader?window.jQuery=jquery!./jquery.runner.js'); import "jquery-mask-plugin"; import "webpack-jquery-ui/dialog"; import "webpack-jquery-ui/sortable"; +import "bootstrap"; + import "./functions"; -require('imports-loader?window.jQuery=jquery!./jquery.runner.js'); -window.$ = window.jQuery = jQuery; window.autorModal(); window.refreshMask(); diff --git a/sapl-frontend/vue.config.js b/sapl-frontend/vue.config.js index 34aab8d78..9e68d7547 100644 --- a/sapl-frontend/vue.config.js +++ b/sapl-frontend/vue.config.js @@ -49,9 +49,9 @@ module.exports = { .add('./src/global/main.js') .end() - config.entry('compilacao') - .add('./src/apps/compilacao/main.js') - .end() + //config.entry('compilacao') + // .add('./src/apps/compilacao/main.js') + // .end() /*config .plugin('theme') diff --git a/sapl/templates/compilacao/dispositivo_form_alteracao.html b/sapl/templates/compilacao/dispositivo_form_alteracao.html index 3af409669..711472d01 100644 --- a/sapl/templates/compilacao/dispositivo_form_alteracao.html +++ b/sapl/templates/compilacao/dispositivo_form_alteracao.html @@ -7,6 +7,6 @@ 'url_form': '{% url 'sapl.compilacao:dispositivo_search_form'%}', 'text_button': '{% trans 'Definir Dispositivo'%}' }); - initTinymce(); + initTextRichEditor(); {% endblock %} diff --git a/sapl/templates/compilacao/dispositivo_form_edicao_basica.html b/sapl/templates/compilacao/dispositivo_form_edicao_basica.html index 45ab34594..5eca7a09d 100644 --- a/sapl/templates/compilacao/dispositivo_form_edicao_basica.html +++ b/sapl/templates/compilacao/dispositivo_form_edicao_basica.html @@ -31,6 +31,6 @@ }); } - initTinymce(); + initTextRichEditor(); {% endblock %} diff --git a/sapl/templates/sessao/expediente.html b/sapl/templates/sessao/expediente.html index 106840b88..c0b1611c5 100644 --- a/sapl/templates/sessao/expediente.html +++ b/sapl/templates/sessao/expediente.html @@ -49,12 +49,12 @@ {% block extra_js %} {% if perms|get_add_perm:view %} {% else %} {% endif %} {% endblock %} diff --git a/sapl/templates/sessao/ocorrencia_sessao.html b/sapl/templates/sessao/ocorrencia_sessao.html index 0daa921d8..0aef620d0 100644 --- a/sapl/templates/sessao/ocorrencia_sessao.html +++ b/sapl/templates/sessao/ocorrencia_sessao.html @@ -26,7 +26,7 @@ {% block extra_js %} {% if perms|get_add_perm:view %} {% endif %} {% endblock %} \ No newline at end of file