Skip to content

Commit

Permalink
Removed duplicate dropbox code from dataset pg that was on editfilefr…
Browse files Browse the repository at this point in the history
…agment [ref #4610]
  • Loading branch information
mheppler committed Sep 27, 2018
1 parent 59277aa commit 730a06a
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions src/main/webapp/dataset.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,6 @@

<!-- END: Publish/Submit for Review Dialogs -->
</h:form>
<script type="text/javascript" src="/resources/js/dropins.js" id="dropboxjs" data-app-key="#{DatasetPage.dropBoxKey}"/>
<script type="text/javascript">
$(document).ready(function () {
popoverHTML('#{bundle.htmlAllowedTitle}');
Expand Down Expand Up @@ -1595,23 +1594,6 @@
var urlregex = new RegExp("^(http|https|ftp)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&amp;%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(/($|[a-zA-Z0-9\.\,\?\'\\\+&amp;%\$#\=~_\-]+))*$");
return urlregex.test(textval);
}
function openDropboxChooser() {
options = {
// Required. Called when a user selects an item in the Chooser.
success: function (files) {
// Pass the JSON-ized output of the Chooser to the backing bean,
// via a hidden input field:
$('input[id$="dropBoxSelectionInput"]').val(JSON.stringify(files));
//alert(JSON.stringify(files));
// Trigger the upload processing method in the backing
// bean, via an invisible commandButton:
$('button[id$="dropBoxButton"]').trigger('click');
},
linkType: "direct",
multiselect: true,
};
Dropbox.choose(options);
}
</script>
</ui:define>
</ui:composition>
Expand Down

0 comments on commit 730a06a

Please sign in to comment.