diff options
| author | Sem <sembrestels@riseup.net> | 2013-11-08 03:50:48 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-11-08 03:50:48 +0100 |
| commit | fb61398a422ef6bd25028f6f47c008738e8fea8c (patch) | |
| tree | 39d2ddd28e9214d7a1c6d1962736aea6bdc41d7f | |
| parent | e1f512cfdc67b46be1048dbb179b2abdef65920a (diff) | |
| parent | d4b9e8fe47a4ef97950cedd566923fb2d1ec1ca0 (diff) | |
| download | elgg-fb61398a422ef6bd25028f6f47c008738e8fea8c.tar.gz elgg-fb61398a422ef6bd25028f6f47c008738e8fea8c.tar.bz2 | |
Merge branch 'release/1.8.0'
| -rw-r--r-- | manifest.xml | 2 | ||||
| -rw-r--r-- | views/default/js/embed/embed.php | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/manifest.xml b/manifest.xml index 85820c2a1..ec5f22e90 100644 --- a/manifest.xml +++ b/manifest.xml @@ -2,7 +2,7 @@ <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Colorbox</name> <author>Lorea developers</author> - <version>1.8</version> + <version>1.8.0</version> <category>lorea</category> <category>enhancement</category> <category>multimedia</category> 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 |