diff --git a/app/assets/javascripts/rails_admin/jquery.remotipart.fixed.js b/app/assets/javascripts/rails_admin/jquery.remotipart.fixed.js deleted file mode 100644 index 2cd1eec5ea..0000000000 --- a/app/assets/javascripts/rails_admin/jquery.remotipart.fixed.js +++ /dev/null @@ -1,72 +0,0 @@ -//= require jquery.iframe-transport.js -//= require_self - - -// This file is frozen in RailsAdmin to cope with https://github.com/JangoSteve/remotipart/pull/50 - -(function($) { - - var remotipart; - - $.remotipart = remotipart = { - - setup: function(form) { - form - // Allow setup part of $.rails.handleRemote to setup remote settings before canceling default remote handler - // This is required in order to change the remote settings using the form details - .one('ajax:beforeSend.remotipart', function(e, xhr, settings){ - // Delete the beforeSend bindings, since we're about to re-submit via ajaxSubmit with the beforeSubmit - // hook that was just setup and triggered via the default `$.rails.handleRemote` - // delete settings.beforeSend; - delete settings.beforeSend; - - settings.iframe = true; - settings.files = $($.rails.fileInputSelector, form); - settings.data = form.serializeArray(); - settings.processData = false; - - // Modify some settings to integrate JS request with rails helpers and middleware - if (settings.dataType === undefined) { settings.dataType = 'script *'; } - settings.data.push({name: 'remotipart_submitted', value: true}); - - // Allow remotipartSubmit to be cancelled if needed - if ($.rails.fire(form, 'ajax:remotipartSubmit', [xhr, settings])) { - // Second verse, same as the first - $.rails.ajax(settings); - } - - //Run cleanup - remotipart.teardown(form); - - // Cancel the jQuery UJS request - return false; - }) - - // Keep track that we just set this particular form with Remotipart bindings - // Note: The `true` value will get over-written with the `settings.dataType` from the `ajax:beforeSend` handler - .data('remotipartSubmitted', true); - }, - - teardown: function(form) { - form - .unbind('ajax:beforeSend.remotipart') - .removeData('remotipartSubmitted') - } - }; - - $(document).on('ajax:aborted:file', 'form', function(){ - var form = $(this); - - remotipart.setup(form); - - // If browser does not support submit bubbling, then this live-binding will be called before direct - // bindings. Therefore, we should directly call any direct bindings before remotely submitting form. - if (!$.support.submitBubbles && $().jquery < '1.7' && $.rails.callFormSubmitBindings(form) === false) return $.rails.stopEverything(e); - - // Manually call jquery-ujs remote call so that it can setup form and settings as usual, - // and trigger the `ajax:beforeSend` callback to which remotipart binds functionality. - $.rails.handleRemote(form); - return false; - }); - -})(jQuery); \ No newline at end of file diff --git a/app/assets/javascripts/rails_admin/rails_admin.js b/app/assets/javascripts/rails_admin/rails_admin.js index 2e066ff085..67e6f8e0f6 100644 --- a/app/assets/javascripts/rails_admin/rails_admin.js +++ b/app/assets/javascripts/rails_admin/rails_admin.js @@ -1,6 +1,6 @@ //= require 'jquery' //= require 'jquery_ujs' -//= require 'rails_admin/jquery.remotipart.fixed' +//= require 'jquery.remotipart' //= require 'jquery-ui/effect' //= require 'jquery-ui/sortable' //= require 'jquery-ui/autocomplete'