Skip to content

dependency updates #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mogoodrich wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dependency updates #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions omod/src/main/webapp/htmlForm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<%@ include file="/WEB-INF/template/header.jsp"%>
<%@ include file="localHeader.jsp" %>

<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.9.2.custom.min.css" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-1.8.3.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.9.2.custom.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.13.3.min.css" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-3.7.1.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.13.3.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/handlebars.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/htmlForm.js" />
<openmrs:htmlInclude file="/dwr/util.js" />
Expand Down
6 changes: 3 additions & 3 deletions omod/src/main/webapp/htmlFormEntry.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<openmrs:htmlInclude file="/dwr/engine.js" />
<openmrs:htmlInclude file="/dwr/util.js" />
<openmrs:htmlInclude file="/dwr/interface/DWRHtmlFormEntryService.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.9.2.custom.min.css" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-1.8.3.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.13.3.min.css" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-3.7.1.min.js" />
<script type="text/javascript">
$j = jQuery.noConflict();
</script>
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.9.2.custom.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.13.3.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/htmlFormEntry.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/htmlFormEntry.css" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/htmlForm.js" />
Expand Down
6 changes: 3 additions & 3 deletions omod/src/main/webapp/htmlFormFromFile.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<%@ include file="/WEB-INF/template/header.jsp"%>
<%@ include file="localHeader.jsp" %>

<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.9.2.custom.min.css" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-1.8.3.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.9.2.custom.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.13.3.min.css" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-3.7.1.min.js" />
<openmrs:htmlInclude file="/moduleResources/htmlformentry/jquery-ui-1.13.3.min.js" />
<openmrs:htmlInclude file="/dwr/util.js" />

<br />
Expand Down
13 changes: 7 additions & 6 deletions omod/src/main/webapp/resources/handlebars.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion omod/src/main/webapp/resources/htmlFormEntry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ openmrs.htmlformentry.refresh = function(v) {
this.id = newSpanId;
jq('#' + spanId + '_hid').attr('id', newSpanId + '_hid');
jq('#' + spanId + '_button').removeAttr('onclick', null)
.unbind('click').attr('id', newSpanId + '_button')
.off('click').attr('id', newSpanId + '_button')
.click(
function() {
jq('#' + newSpanId).remove();
Expand Down
2 changes: 0 additions & 2 deletions omod/src/main/webapp/resources/jquery-1.8.3.min.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions omod/src/main/webapp/resources/jquery-3.4.1.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions omod/src/main/webapp/resources/jquery-3.7.1.min.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions omod/src/main/webapp/resources/jquery-ui-1.13.3.min.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions omod/src/main/webapp/resources/jquery-ui-1.13.3.min.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions omod/src/main/webapp/resources/jquery-ui-1.9.2.custom.min.css
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions omod/src/main/webapp/resources/jquery-ui-1.9.2.custom.min.js
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions omod/src/main/webapp/resources/orderWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
$orderForm.find('.order-field-widget.order-doseUnits').find(':input').val("");
$orderForm.find('.order-field-widget.order-frequency').find(':input').val("");
$orderForm.find('.order-field-widget.order-route').find(':input').val("");
$orderForm.find('.order-field-widget.order-asNeeded').find(':input').removeAttr("checked");
$orderForm.find('.order-field-widget.order-asNeeded').find(':input').prop("checked", false);
$orderForm.find('.order-field-widget.order-instructions').find(':input').val("");
$orderForm.find('.order-field-widget.order-dosingInstructions').find(':input').val("");
}
Expand Down Expand Up @@ -548,7 +548,7 @@
$orderForm.find('.order-field-widget.order-orderReasonNonCoded').find(':input').val(order.orderReasonNonCoded.value);
$orderForm.find('.order-field-widget.order-careSetting').find(':input').val(order.careSetting.value);
$orderForm.find('.order-field-widget.order-instructions').find(':input').val(order.instructions.value);
$orderForm.find('.order-field-widget.order-urgency').find('input[type="radio"][value="' + order.urgency.value + '"]').attr('checked', 'true');
$orderForm.find('.order-field-widget.order-urgency').find('input[type="radio"][value="' + order.urgency.value + '"]').prop('checked', true);
if (order.isDrugOrder === 'true') {
$orderForm.find('.order-field-widget.order-drug').find(':input').val(order.drug.value);
$orderForm.find('.order-field-widget.order-drugNonCoded').find(':input').val(order.drugNonCoded.value);
Expand All @@ -560,7 +560,7 @@
$orderForm.find('.order-field-widget.order-route').find(':input').val(order.route.value);
$orderForm.find('.order-field-widget.order-frequency').find(':input').val(order.frequency.value);
if (order.asNeeded.value === 'true') {
$orderForm.find('.order-field-widget.order-asNeeded').find(':input').attr('checked', 'true');
$orderForm.find('.order-field-widget.order-asNeeded').find(':input').prop('checked', true);
}
$orderForm.find('.order-field-widget.order-duration').find(':input').val(order.duration.value);
$orderForm.find('.order-field-widget.order-durationUnits').find(':input').val(order.durationUnits.value);
Expand Down