diff --git a/admin/client/src/bundles/lib.js b/admin/client/src/bundles/lib.js index 760dd2df7..0f76820aa 100644 --- a/admin/client/src/bundles/lib.js +++ b/admin/client/src/bundles/lib.js @@ -51,7 +51,18 @@ require('../../../../thirdparty/jquery-changetracker/lib/jquery.changetracker.js require('../../../../client/src/legacy/TreeDropdownField.js'); require('../../../../client/src/legacy/DateField.js'); + + +// TODO Move UploadField.js deps into the file once figuring out why uploads fail then +require('../../../../thirdparty/jquery-ui/jquery-ui.js'); +require('../../../../admin/client/src/legacy/ssui.core.js'); +require('imports?define=>false&this=>window!blueimp-load-image/load-image.js'); +require('blueimp-file-upload/jquery.iframe-transport.js'); +require('blueimp-file-upload/cors/jquery.xdr-transport.js'); +require('blueimp-file-upload/jquery.fileupload.js'); +require('blueimp-file-upload/jquery.fileupload-ui.js'); require('../../../../client/src/legacy/UploadField.js'); + require('../../../../client/src/legacy/HtmlEditorField.js'); require('../../../../client/src/legacy/TabSet.js'); require('../legacy/ssui.core.js'); diff --git a/client/src/legacy/UploadField.js b/client/src/legacy/UploadField.js index ea1a3fccd..85fb31ed9 100644 --- a/client/src/legacy/UploadField.js +++ b/client/src/legacy/UploadField.js @@ -1,16 +1,9 @@ import $ from 'jQuery'; import i18n from 'i18n'; -// entwine also required, but can't be included more than once without error -require('../../../thirdparty/jquery-ui/jquery-ui.js'); -require('../../../admin/client/src/legacy/ssui.core.js'); +// TODO Move deps from lib.js into the file once figuring out why uploads fail then window.tmpl = require('blueimp-tmpl/tmpl.js'); -require('imports?define=>false&this=>window!blueimp-load-image/load-image.js'); -require('blueimp-file-upload/jquery.iframe-transport.js'); -require('blueimp-file-upload/cors/jquery.xdr-transport.js'); -require('blueimp-file-upload/jquery.fileupload.js'); -require('blueimp-file-upload/jquery.fileupload-ui.js'); require('./UploadField_uploadtemplate.js'); require('./UploadField_downloadtemplate.js');