diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
| commit | ea0140d87534c3b10e489d13a1449ebb79da832d (patch) | |
| tree | 85667ae651bc5cc9f0ea01c6f3871bbdee36a469 /mod/embed/views/default | |
| parent | 157117475338bcaab5fc3453ec54250343da595c (diff) | |
| parent | 671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (diff) | |
| download | elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.gz elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.bz2 | |
Merge branch 'lorea-preprod'
Diffstat (limited to 'mod/embed/views/default')
| -rw-r--r-- | mod/embed/views/default/embed/layout.php | 3 | ||||
| -rw-r--r-- | mod/embed/views/default/js/embed/embed.php | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mod/embed/views/default/embed/layout.php b/mod/embed/views/default/embed/layout.php index e906160b1..1ca263037 100644 --- a/mod/embed/views/default/embed/layout.php +++ b/mod/embed/views/default/embed/layout.php @@ -21,6 +21,9 @@ if ($selected->getData('view')) { } } +$tab .= elgg_view('graphics/ajax_loader', array( + 'class' => 'embed-throbber mtl', +)); $container_info = elgg_view('input/hidden', array( 'name' => 'embed_container_guid', diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php index 5fd534a09..0c8442292 100644 --- a/mod/embed/views/default/js/embed/embed.php +++ b/mod/embed/views/default/js/embed/embed.php @@ -85,11 +85,14 @@ elgg.embed.submit = function(event) { } } }, - error: function(xhr, status) { - // nothing for now + error : function(xhr, status) { + // @todo nothing for now } }); + $('.elgg-form-file-upload').hide(); + $('.embed-throbber').show(); + // this was bubbling up the DOM causing a submission event.preventDefault(); event.stopPropagation(); |