diff --git a/source/demyo-web/src/main/java/org/demyo/web/velocity/tools/JavascriptTool.java b/source/demyo-web/src/main/java/org/demyo/web/velocity/tools/JavascriptTool.java index bc12c952..dab68959 100644 --- a/source/demyo-web/src/main/java/org/demyo/web/velocity/tools/JavascriptTool.java +++ b/source/demyo-web/src/main/java/org/demyo/web/velocity/tools/JavascriptTool.java @@ -62,10 +62,11 @@ public String getCss() { KNOWN_SCRIPTS = new HashMap(); addScript(new Script("TinyMCE", "vendor/tinymce/tinymce.min.js")); - addScript(new Script("Dialog-Polyfill", "vendor/dialog-polyfill.js")); + addScript(new Script("Dialog-Polyfill", "vendor/dialog-polyfill-0.4.6.js")); addScript(new Script("Material", "vendor/material.min.js", KNOWN_SCRIPTS.get("Dialog-Polyfill"))); addScript(new Script("PrefixFree", "vendor/prefixfree.min.js")); - addScript(new Script("JQuery", "vendor/jquery-1.9.1.js")); + addScript(new Script("JQuery-Core", "vendor/jquery-3.1.1.min.js")); + addScript(new Script("JQuery", "vendor/jquery-migrate-3.0.0.js", KNOWN_SCRIPTS.get("JQuery-Core"))); addScript(new Script("Demyo.Core", "demyo_core.js", KNOWN_SCRIPTS.get("JQuery"), KNOWN_SCRIPTS.get("Material"), KNOWN_SCRIPTS.get("PrefixFree"))); addScript(new Script("Chosen", "vendor/chosen.jquery.min.js", KNOWN_SCRIPTS.get("JQuery"))); diff --git a/source/demyo-web/src/main/webapp/WEB-INF/velocity/layout/default.vm b/source/demyo-web/src/main/webapp/WEB-INF/velocity/layout/default.vm index 1352304e..9237cb7c 100644 --- a/source/demyo-web/src/main/webapp/WEB-INF/velocity/layout/default.vm +++ b/source/demyo-web/src/main/webapp/WEB-INF/velocity/layout/default.vm @@ -26,7 +26,7 @@ $quickTasks.prepare($javascript) - + $javascript.load('Demyo.Core') ## Always load the core $javascript.load('Demyo.QuickSearch') ## Always load quick search #foreach($source in $javascript.scriptSources) diff --git a/source/demyo-web/src/main/webapp/js/vendor/dialog-polyfill.js b/source/demyo-web/src/main/webapp/js/vendor/dialog-polyfill-0.4.6.js similarity index 100% rename from source/demyo-web/src/main/webapp/js/vendor/dialog-polyfill.js rename to source/demyo-web/src/main/webapp/js/vendor/dialog-polyfill-0.4.6.js diff --git a/source/demyo-web/src/main/webapp/js/vendor/less.min.js b/source/demyo-web/src/main/webapp/js/vendor/less-2.7.2.min.js similarity index 100% rename from source/demyo-web/src/main/webapp/js/vendor/less.min.js rename to source/demyo-web/src/main/webapp/js/vendor/less-2.7.2.min.js