Skip to content

Commit

Permalink
SAK-32193 - Upgrade jquery and jquery UI for Sakai 12 (sakaiproject#4717
Browse files Browse the repository at this point in the history
)

* SAK-32193 - Upgrade jquery to 1.12.4 and jquery-ui to 1.12.1

* SAK-32193 - Upgrading jquery-ui to 1.12.1

* SAK-32193 - Fixes for PBJQ
  • Loading branch information
jonespm authored Aug 23, 2017
1 parent c29142f commit 023b771
Show file tree
Hide file tree
Showing 641 changed files with 687 additions and 687 deletions.
4 changes: 2 additions & 2 deletions basiclti/basiclti-tool/src/webapp/vm/lti_deploy_system.vm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<!-- jQuery -->
${includeLatestJQuery}

<script type="text/javascript" src="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"></script>
<link type="text/css" href="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.css" rel="stylesheet" media="screen" />
<script type="text/javascript" src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
<link type="text/css" href="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.css" rel="stylesheet" media="screen" />

<!-- Tablesorter: required -->
<link rel="stylesheet" href="/basiclti-admin-tool/css/blue/style.css">
Expand Down
4 changes: 2 additions & 2 deletions basiclti/basiclti-tool/src/webapp/vm/lti_tool_site.vm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<!-- jQuery -->
${includeLatestJQuery}

<script type="text/javascript" src="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"></script>
<link type="text/css" href="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.css" rel="stylesheet" media="screen" />
<script type="text/javascript" src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
<link type="text/css" href="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.css" rel="stylesheet" media="screen" />

<!-- Tablesorter: required -->
<link rel="stylesheet" href="/basiclti-admin-tool/css/blue/style.css">
Expand Down
4 changes: 2 additions & 2 deletions basiclti/basiclti-tool/src/webapp/vm/lti_tool_system.vm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<!-- jQuery -->
${includeLatestJQuery}

<script type="text/javascript" src="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"></script>
<link type="text/css" href="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.css" rel="stylesheet" media="screen" />
<script type="text/javascript" src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
<link type="text/css" href="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.css" rel="stylesheet" media="screen" />

<!-- Tablesorter: required -->
<link rel="stylesheet" href="/basiclti-admin-tool/css/blue/style.css">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ protected void handleViewRequest(HttpServletRequest req, HttpServletResponse res
+ "<link href=\"/library/skin/tool_base.css\" type=\"text/css\" rel=\"stylesheet\" media=\"all\" />\n"
+ "<link href=\"/library/skin/" + ServerConfigurationService.getString("skin.default") + "/tool.css\" type=\"text/css\" rel=\"stylesheet\" media=\"all\" />\n"
+ "<link href=\"/sakai-citations-tool/css/citations.css\" type=\"text/css\" rel=\"stylesheet\" media=\"all\" />\n"
+ "<script type=\"text/javascript\" src=\"/library/webjars/jquery/1.11.3/jquery.min.js\"></script>\n"
+ "<script type=\"text/javascript\" src=\"/library/webjars/jquery/1.12.4/jquery.min.js\"></script>\n"
+ "<script type=\"text/javascript\" src=\"/sakai-citations-tool/js/citationscript.js\"></script>\n"
+ "<script type=\"text/javascript\" src=\"/sakai-citations-tool/js/view_nested_citations.js\"></script>\n"
+ "<script type=\"text/javascript\" src=\"/sakai-citations-tool/js/jquery.googlebooks.thumbnails.js\"></script>\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<link href="/library/skin/tool_base.css" type="text/css" rel="stylesheet" media="all" />
<link href="/library/skin/default/tool.css" type="text/css" rel="stylesheet" media="all" />
<link href="/savecite/css/savecite.css" type="text/css" rel="stylesheet" media="all" />
<script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
<script type="text/javascript" src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
</head>
<body>
<div class="portletBody">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<title>$tlang.getString( "window.gscholar" )</title>
<link href="/library/skin/tool_base.css" type="text/css" rel="stylesheet" media="all" />
<link href="/library/skin/default/tool.css" type="text/css" rel="stylesheet" media="all" />
<script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
<script type="text/javascript" src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
<script type="text/javascript" src="/savecite/js/savecite.js"></script>
</head>
<body>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#set($default = "")
#if($!DEFAULT_TEMPLATE)#set($default = "$!DEFAULT_TEMPLATE.identifier")#end

<script type="text/javascript" src="#libraryLink('webjars/jquery/1.11.3/jquery.js')">
<script type="text/javascript" src="#libraryLink('webjars/jquery/1.12.4/jquery.js')">
</script>
<script type="text/javascript" src="/sakai-citations-tool/js/citationscript.js">
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
*
**********************************************************************************
-->
<script type="text/javascript" src="#libraryLink('webjars/jquery/1.11.3/jquery.min.js')">
<script type="text/javascript" src="#libraryLink('webjars/jquery/1.12.4/jquery.min.js')">
</script>
<script type="text/javascript" src="#libraryLink('webjars/jquery-ui/1.11.3/jquery-ui.min.js')">
<script type="text/javascript" src="#libraryLink('webjars/jquery-ui/1.12.1/jquery-ui.min.js')">
</script>
<script type="text/javascript" src="#libraryLink('js/jquery/sortable/jquery.sortable.min.js')">
</script>
<script src="/library/js/spinner.js" type="text/javascript">
</script>
<link media="all" rel="stylesheet" type="text/css" href="#libraryLink('webjars/jquery-ui/1.11.3/jquery-ui.min.css')">
<link media="all" rel="stylesheet" type="text/css" href="#libraryLink('webjars/jquery-ui/1.12.1/jquery-ui.min.css')">
<link media="all" rel="stylesheet" type="text/css" href="/sakai-citations-tool/css/citations.css">
<style type="text/css">
</style>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#citations-sortable li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; }
#citations-sortable li span { position: absolute; margin-left: -1.3em; }
</style>
<link rel="stylesheet" href="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.css" type="text/css" media="all" />
<script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
<script type="text/javascript" src="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"></script>
<link rel="stylesheet" href="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.css" type="text/css" media="all" />
<script type="text/javascript" src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
<script type="text/javascript" src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="/sakai-citations-tool/js/citationscript.js">
</script>
<div class="portletBody specialLink">
Expand Down
6 changes: 3 additions & 3 deletions commons/tool/src/webapp/WEB-INF/bootstrap.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
</script>
${sakaiHtmlHead}
<link rel="stylesheet" type="text/css" href="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.css"></script>
<link rel="stylesheet" type="text/css" href="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.css"></script>
<link href="/profile2-tool/css/profile2-profile-entity.css" type="text/css" rel="stylesheet" media="all" />
<link rel="stylesheet" type="text/css" href="/library/js/jquery/qtip/jquery.qtip-latest.min.css" media="all"/>
</head>
<body>

<script src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
<script src="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"></script>
<script src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
<script src="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"></script>
<script src="/library/webjars/momentjs/2.11.1/min/moment-with-locales.min.js"></script>
<script src="/library/js/jquery/qtip/jquery.qtip-latest.min.js"></script>
<script src="/commons-tool/lib/handlebars.runtime-v4.0.5.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,11 @@ public void renderHead(IHeaderResponse response) {
//response.renderJavascriptReference("js/my_tool_javascript.js");

//for jQuery
response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery/1.11.3/jquery.min.js"));
response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"));
response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery/1.12.4/jquery.min.js"));
response.render(JavaScriptHeaderItem.forUrl("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js"));

//for datepicker
response.render(CssHeaderItem.forUrl("/library/webjars/jquery-ui/1.11.3/jquery-ui.css"));
response.render(CssHeaderItem.forUrl("/library/webjars/jquery-ui/1.12.1/jquery-ui.css"));
response.render(JavaScriptHeaderItem.forUrl("javascript/jquery.asmselect.js"));
response.render(CssHeaderItem.forUrl("css/jquery.asmselect.css"));
response.render(JavaScriptHeaderItem.forUrl("/library/js/lang-datepicker/lang-datepicker.js"));
Expand Down
2 changes: 1 addition & 1 deletion feedback/src/webapp/WEB-INF/bootstrap.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
lang="${language}">
<head>
<link rel="stylesheet" type="text/css" href="/feedback-tool/css/feedback.css" />
<script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
<script type="text/javascript" src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
<script type="text/javascript" src="/feedback-tool/lib/jquery.form.min.js"></script>
<script type="text/javascript" src="/feedback-tool/lib/jquery.MultiFile.pack.js"></script>
<script type="text/javascript" src="//www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void renderHead(final IHeaderResponse response) {
response.render(
new PriorityHeaderItem(
JavaScriptHeaderItem
.forUrl(String.format("/library/webjars/jquery/1.11.3/jquery.min.js?version=%s", version))));
.forUrl(String.format("/library/webjars/jquery/1.12.4/jquery.min.js?version=%s", version))));
// And pair this instance of jQuery with a Bootstrap version we've tested with
response.render(
new PriorityHeaderItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ public void renderHead(final IHeaderResponse response) {

// Drag and Drop/Date Picker (requires jQueryUI)
response.render(JavaScriptHeaderItem
.forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js?version=%s", version)));
.forUrl(String.format("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js?version=%s", version)));

// Include Sakai Date Picker
response.render(JavaScriptHeaderItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void renderHead(final IHeaderResponse response) {

// Include Sakai Date Picker
response.render(
JavaScriptHeaderItem.forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js?version=%s", version)));
JavaScriptHeaderItem.forUrl(String.format("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js?version=%s", version)));
response.render(JavaScriptHeaderItem.forUrl(String.format("/library/js/lang-datepicker/lang-datepicker.js?version=%s", version)));

// Gradebook Import/Export styles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public void renderHead(final IHeaderResponse response) {

// Drag and Drop (requires jQueryUI)
response.render(JavaScriptHeaderItem
.forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js?version=%s", version)));
.forUrl(String.format("/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js?version=%s", version)));

response.render(CssHeaderItem.forUrl(String.format("/gradebookng-tool/styles/gradebook-settings.css?version=%s", version)));
response.render(
Expand Down
2 changes: 1 addition & 1 deletion help/help-tool/src/webapp/html/help.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../help/css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="/library/skin/morpheus-default/tool.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="../css/help.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<link href="/library/js/jquery/featherlight/0.4.0/featherlight.min.css" media="screen" rel="stylesheet" type="text/css" charset="utf-8">
<script src="/library/webjars/jquery/1.11.3/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
<script src="/library/webjars/jquery/1.12.4/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="/library/js/jquery/featherlight/0.4.0/featherlight.min.js" type="text/javascript" charset="utf-8"></script><script type="text/javascript" charset="utf-8">
$(document).ready(function(){
$("a[rel^='featherlight']").featherlight({
type: { image:true },
Expand Down
Loading

0 comments on commit 023b771

Please sign in to comment.