diff options
| author | Sem <sembrestels@riseup.net> | 2013-08-23 04:56:15 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-08-23 04:56:15 +0200 |
| commit | d72bc668b69f865988068c21aab7e781584f2ff7 (patch) | |
| tree | cdc843a58dd7ff487eb875ccc0f4ba92c1b5e6dd /views/default | |
| parent | 5f2e17c76537a26b0a73ca6a79b38beb55253363 (diff) | |
| download | elgg-d72bc668b69f865988068c21aab7e781584f2ff7.tar.gz elgg-d72bc668b69f865988068c21aab7e781584f2ff7.tar.bz2 | |
Updated to Elgg 1.8.16.
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/js/embed/embed.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/views/default/js/embed/embed.php b/views/default/js/embed/embed.php index 394240fa4..301ff5a49 100644 --- a/views/default/js/embed/embed.php +++ b/views/default/js/embed/embed.php @@ -34,8 +34,7 @@ elgg.embed.init = function() { // caches the current textarea id $(".embed-control").live('click', function() { - var textAreaId = /embed-control-(\S)+/.exec($(this).attr('class'))[0]; - elgg.embed.textAreaId = textAreaId.substr("embed-control-".length); + elgg.embed.textAreaId = /embed-control-(\S)+/.exec($(this).attr('class'))[1]; }); // special pagination helper for lightbox @@ -115,6 +114,18 @@ elgg.embed.submit = function(event) { $('.embed-wrapper .elgg-form-file-upload').show(); } } + + // ie 7 and 8 have a null response because of the use of an iFrame + // so just show the list after upload. + // http://jquery.malsup.com/form/#file-upload claims you can wrap JSON + // in a textarea, but a quick test didn't work, and that is fairly + // intrusive to the rest of the ajax system. + else if (response === undefined && $.browser.msie) { + var forward = $('input[name=embed_forward]').val(); + var url = elgg.normalize_url('embed/tab/' + forward); + url = elgg.embed.addContainerGUID(url); + $('.embed-wrapper').parent().load(url); + } }, error : function(xhr, status) { // @todo nothing for now |