浏览代码

bootstrap fix

xueli.xue 4 年之前
父节点
当前提交
375988fe1c

文件差异内容过多而无法显示
+ 0 - 7
xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.337.min.js


+ 1 - 0
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js

@@ -354,6 +354,7 @@
                     return $(cronContainer).html();
                 },
                 template: '<div class="popover" style="max-width:500px !important; width:425px;left:-341.656px;"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>',
+                sanitize:false,
                 placement: options.direction
 
             }).on('click', function (e) {

+ 1 - 0
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js

@@ -354,6 +354,7 @@
                     return $(cronContainer).html();
                 },
                 template: '<div class="popover" style="max-width:500px !important; width:425px;left:-341.656px;"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>',
+                sanitize:false,
                 placement: options.direction
 
             }).on('click', function (e) {

+ 0 - 1
xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl

@@ -435,7 +435,6 @@ exit 0
 <script src="${request.contextPath}/static/adminlte/bower_components/moment/moment.min.js"></script>
 <#-- cronGen -->
 <script src="${request.contextPath}/static/plugins/cronGen/cronGen<#if I18n.admin_i18n?default('')?length gt 0 >_${I18n.admin_i18n}</#if>.js"></script>
-<script src="${request.contextPath}/static/adminlte/bower_components/bootstrap/js/bootstrap.337.min.js"></script>
 <script src="${request.contextPath}/static/js/jobinfo.index.1.js"></script>
 </body>
 </html>