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;