Skip to content

Commit

Permalink
Updating jQuery to 3.1.1.
Browse files Browse the repository at this point in the history
Include Migrate plugin to be sure we don't break anything.
Chosen is currently impacted by harvesthq/chosen#2729 (nothing too serious atm)
  • Loading branch information
The4thLaw committed Feb 5, 2017
1 parent 9cc8c25 commit 4f044e6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ public String getCss() {
KNOWN_SCRIPTS = new HashMap<String, Script>();

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")));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $quickTasks.prepare($javascript)
<link href="$link.contextPath/css/vendor/chosen.less" rel="stylesheet/less" type="text/css">
<link href="$link.contextPath/css/vendor/material.blue-pink.min.css" rel="stylesheet" type="text/css">
<link href="$link.contextPath/css/demyo.blue-pink.less" rel="stylesheet/less" type="text/css">
<script type="text/javascript" src="$link.contextPath/js/vendor/less.min.js"></script>
<script type="text/javascript" src="$link.contextPath/js/vendor/less-2.7.2.min.js"></script>
$javascript.load('Demyo.Core') ## Always load the core
$javascript.load('Demyo.QuickSearch') ## Always load quick search
#foreach($source in $javascript.scriptSources)
Expand Down

0 comments on commit 4f044e6

Please sign in to comment.