litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[VIVO-1063] Update jQuery to 1.12.4 and associated upgrades (#51)

Browse source 
* Initial jQuery 1.12.4 upgrade

* Upgrade jQuery UI to 1.12.1

* Upgrade to qTip2

* Update property handling

* Update property handling

* Update jCrop script and fix rounding of floating point co-ordinates

* Fix missing confirmation message

* Return empty JSON so that jQuery doesn’t complain

* Fix JavaScript error
This commit is contained in:
grahamtriggs 2016-12-13 19:57:05 +00:00 • committed by GitHub
parent 2dd25a6e45
commit 20ac3a3514
68 changed files with 4031 additions and 2722 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java
View file

@ -32,6 +32,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
import java.io.IOException;
/**
* This controller receives Ajax requests for reordering a list of individuals.
* Parameters:
@ -102,10 +104,13 @@ public class ReorderController extends VitroAjaxController {
// This may not be the most efficient way. Should we instead build up a Model of retractions and additions, so
// we only hit the database once?
reorderIndividuals(individualUris, vreq, rankPredicate);
response.setStatus(SC_OK);
response.setStatus(SC_OK);
try {
response.getWriter().write("{}");
} catch (IOException e) {
e.printStackTrace();
}
}
private void reorderIndividuals(String[] individualUris, VitroRequest vreq, String rankPredicate) {

7
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -71,7 +71,7 @@ public class UrlBuilder {
public enum Css {
CUSTOM_FORM("/edit/forms/css/customForm.css"),
JQUERY_UI("/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css");
JQUERY_UI("/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css");
private final String path;
@ -90,8 +90,9 @@ public class UrlBuilder {
public enum JavaScript {
CUSTOM_FORM_UTILS("/js/customFormUtils.js"),
JQUERY("/js/jquery.js"),
JQUERY_UI("/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"),
JQUERY("/js/jquery-1.12.4.min.js"),
JQUERY_MIGRATE("/js/jquery-migrate-1.4.1.js"),
JQUERY_UI("/js/jquery-ui/js/jquery-ui-1.12.1.min.js"),
UTILS("/js/utils.js");
private final String path;

64
api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java
View file

@ -58,8 +58,8 @@ public class URLRewritingHttpServletResponseTest {
@Test
public void test40984(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test40984(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test40988(){ urlEncodingStyleA(
@ -289,8 +289,8 @@ public class URLRewritingHttpServletResponseTest {
public void test39472(){ urlEncodingStyleA(
"/vivo/js/extensions/String.js", "/vivo/js/extensions/String.js"); }
@Test
public void test394730(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test394730(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test39473(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/jquery.bgiframe.pack.js",
@ -304,8 +304,8 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/jquery_plugins/ui.datepicker.js",
"/vivo/js/jquery_plugins/ui.datepicker.js"); }
@Test
public void test14958(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test14958(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test14968(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/getURLParam.js",
@ -347,8 +347,8 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/imageUpload/imageUploadUtils.js"); }
@Test
public void test184670(){ urlEncodingStyleA(
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css",
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css"); }
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css",
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css"); }
@Test
public void test18467(){ urlEncodingStyleA(
"/vivo/edit/forms/css/customForm.css",
@ -375,8 +375,8 @@ public class URLRewritingHttpServletResponseTest {
public void test18516(){ urlEncodingStyleA(
"/vivo/js/extensions/String.js", "/vivo/js/extensions/String.js"); }
@Test
public void test18543(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test18543(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test185440(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/jquery.bgiframe.pack.js",
@ -391,8 +391,8 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/jquery_plugins/ui.datepicker.js"); }
@Test
public void test18546(){ urlEncodingStyleA(
"/vivo/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js",
"/vivo/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"); }
"/vivo/js/jquery-ui/js/jquery-ui-1.12.1.min.js",
"/vivo/js/jquery-ui/js/jquery-ui-1.12.1.min.js"); }
@Test
public void test185470(){ urlEncodingStyleA(
"/vivo/js/customFormUtils.js", "/vivo/js/customFormUtils.js"); }
@ -412,8 +412,8 @@ public class URLRewritingHttpServletResponseTest {
public void test271590(){ urlEncodingStyleA(
"/vivo/js/extensions/String.js", "/vivo/js/extensions/String.js"); }
@Test
public void test27159(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test27159(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test27160(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/jquery.bgiframe.pack.js",
@ -438,8 +438,8 @@ public class URLRewritingHttpServletResponseTest {
public void test148510(){ urlEncodingStyleA(
"/vivo/js/extensions/String.js", "/vivo/js/extensions/String.js"); }
@Test
public void test14851(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test14851(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test14852(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/jquery.bgiframe.pack.js",
@ -454,8 +454,8 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/jquery_plugins/ui.datepicker.js"); }
@Test
public void test43748(){ urlEncodingStyleA(
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css",
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css"); }
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css",
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css"); }
@Test
public void test43749(){ urlEncodingStyleA(
"/vivo/edit/forms/css/customForm.css",
@ -482,8 +482,8 @@ public class URLRewritingHttpServletResponseTest {
public void test43760(){ urlEncodingStyleA(
"/vivo/js/extensions/String.js", "/vivo/js/extensions/String.js"); }
@Test
public void test437610(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test437610(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test43761(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/jquery.bgiframe.pack.js",
@ -498,8 +498,8 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/jquery_plugins/ui.datepicker.js"); }
@Test
public void test43763(){ urlEncodingStyleA(
"/vivo/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js",
"/vivo/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"); }
"/vivo/js/jquery-ui/js/jquery-ui-1.12.1.min.js",
"/vivo/js/jquery-ui/js/jquery-ui-1.12.1.min.js"); }
@Test
public void test437640(){ urlEncodingStyleA(
"/vivo/js/customFormUtils.js", "/vivo/js/customFormUtils.js"); }
@ -509,8 +509,8 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/edit/forms/js/customFormWithAutocomplete.js"); }
@Test
public void test14550(){ urlEncodingStyleA(
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css",
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css"); }
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css",
"/vivo/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css"); }
@Test
public void test14551(){ urlEncodingStyleA(
"/vivo/edit/forms/css/customForm.css",
@ -540,8 +540,8 @@ public class URLRewritingHttpServletResponseTest {
public void test14565(){ urlEncodingStyleA(
"/vivo/js/extensions/String.js", "/vivo/js/extensions/String.js"); }
@Test
public void test145650(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test145650(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test145660(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/jquery.bgiframe.pack.js",
@ -556,8 +556,8 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/jquery_plugins/ui.datepicker.js"); }
@Test
public void test145680(){ urlEncodingStyleA(
"/vivo/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js",
"/vivo/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"); }
"/vivo/js/jquery-ui/js/jquery-ui-1.12.1.min.js",
"/vivo/js/jquery-ui/js/jquery-ui-1.12.1.min.js"); }
@Test
public void test14568(){ urlEncodingStyleA(
"/vivo/js/customFormUtils.js", "/vivo/js/customFormUtils.js"); }
@ -580,8 +580,8 @@ public class URLRewritingHttpServletResponseTest {
public void test29084(){ urlEncodingStyleA(
"/vivo/js/extensions/String.js", "/vivo/js/extensions/String.js"); }
@Test
public void test29085(){ urlEncodingStyleA( "/vivo/js/jquery.js",
"/vivo/js/jquery.js"); }
public void test29085(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
"/vivo/js/jquery-1.12.4.min.js"); }
@Test
public void test290860(){ urlEncodingStyleA(
"/vivo/js/jquery_plugins/jquery.bgiframe.pack.js",
@ -599,8 +599,8 @@ public class URLRewritingHttpServletResponseTest {
@Test
public void test35560(){ urlEncodingStyleB( "/js/jquery.js",
"/js/jquery.js"); }
public void test35560(){ urlEncodingStyleB( "/js/jquery-1.12.4.min.js",
"/js/jquery-1.12.4.min.js"); }
@Test
public void test35562(){ urlEncodingStyleB(
"/js/jquery_plugins/getURLParam.js",