diff options
| author | Sem <sembrestels@riseup.net> | 2013-08-22 23:28:41 -0400 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-08-22 23:28:41 -0400 |
| commit | e6f2ed7bb01bd6f9032f77fd80118575e260618f (patch) | |
| tree | d5e33b2176f58dd51d721076cfc3b3fb206fa564 | |
| parent | e1f512cfdc67b46be1048dbb179b2abdef65920a (diff) | |
| parent | d72bc668b69f865988068c21aab7e781584f2ff7 (diff) | |
| download | elgg-e6f2ed7bb01bd6f9032f77fd80118575e260618f.tar.gz elgg-e6f2ed7bb01bd6f9032f77fd80118575e260618f.tar.bz2 | |
Merge branch '1.8' of gitorious.org:lorea/colorbox into 1.8
| -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 5267c53e0..ada6653a8 100644 --- a/views/default/js/embed/embed.php +++ b/views/default/js/embed/embed.php @@ -35,8 +35,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 @@ -116,6 +115,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 |