]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #4725 - no longer removes file upload form outside of embed lightbox, no longer...
authorMatt Beckett <beck24@gmail.com>
Tue, 17 Jul 2012 20:19:24 +0000 (14:19 -0600)
committerMatt Beckett <beck24@gmail.com>
Tue, 17 Jul 2012 20:19:24 +0000 (14:19 -0600)
mod/embed/views/default/js/embed/embed.php

index 0c8442292877451031f4fa7d76c45b49ee61426f..eb6153abf26d85a44b6452566c623d82f3a7b788 100644 (file)
@@ -67,6 +67,8 @@ echo elgg_view('embed/custom_insert_js');
  * @return bool
  */
 elgg.embed.submit = function(event) {
+       $('.embed-wrapper .elgg-form-file-upload').hide();
+       $('.embed-throbber').show();
        
        $(this).ajaxSubmit({
                dataType : 'json',
@@ -82,6 +84,10 @@ elgg.embed.submit = function(event) {
                                        var url = elgg.normalize_url('embed/tab/' + forward);
                                        url = elgg.embed.addContainerGUID(url);
                                        $('.embed-wrapper').parent().load(url);
+                               } else {
+                                       // incorrect response, presumably an error has been displayed
+                                       $('.embed-throbber').hide();
+                                       $('.embed-wrapper .elgg-form-file-upload').show();
                                }
                        }
                },
@@ -90,9 +96,6 @@ elgg.embed.submit = function(event) {
                }
        });
 
-       $('.elgg-form-file-upload').hide();
-       $('.embed-throbber').show();
-
        // this was bubbling up the DOM causing a submission
        event.preventDefault();
        event.stopPropagation();