From 307d8719a7b81dc8d3893982d3f3b55f42b85685 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Mon, 21 Jan 2019 13:22:00 -0200 Subject: [PATCH] add import bootstrap em module global --- sapl-frontend/src/apps/compilacao/js/compilacao.js | 5 ++++- sapl-frontend/src/apps/compilacao/main.js | 1 - sapl-frontend/src/global/main.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sapl-frontend/src/apps/compilacao/js/compilacao.js b/sapl-frontend/src/apps/compilacao/js/compilacao.js index 3da14b298..06712d7a8 100644 --- a/sapl-frontend/src/apps/compilacao/js/compilacao.js +++ b/sapl-frontend/src/apps/compilacao/js/compilacao.js @@ -1,4 +1,6 @@ - function SetCookie(cookieName,cookieValue,nDays) { + + +function SetCookie(cookieName,cookieValue,nDays) { var today = new Date(); var expire = new Date(); if (nDays==null || nDays==0) nDays=1; @@ -269,6 +271,7 @@ }, 200) modal_ds.modal('show'); + }) }); }); diff --git a/sapl-frontend/src/apps/compilacao/main.js b/sapl-frontend/src/apps/compilacao/main.js index 50da3ac18..45fc0efed 100644 --- a/sapl-frontend/src/apps/compilacao/main.js +++ b/sapl-frontend/src/apps/compilacao/main.js @@ -1,5 +1,4 @@ // TODO: migrar compilacao para VueJs - import compilacao from "./js/compilacao"; import compilacao_view from "./js/compilacao_view"; import compilacao_notas from "./js/compilacao_notas"; diff --git a/sapl-frontend/src/global/main.js b/sapl-frontend/src/global/main.js index d36ff11d2..d2c28095f 100644 --- a/sapl-frontend/src/global/main.js +++ b/sapl-frontend/src/global/main.js @@ -1,6 +1,6 @@ import jQuery from "jquery"; -require('imports-loader?window.jQuery=jquery!./jquery.runner.js'); +import "bootstrap"; import "jquery-mask-plugin"; @@ -8,6 +8,7 @@ import "webpack-jquery-ui/dialog"; import "webpack-jquery-ui/sortable"; import "./functions"; +require('imports-loader?window.jQuery=jquery!./jquery.runner.js'); window.$ = window.jQuery = jQuery; window.autorModal();