aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest.xml2
-rw-r--r--views/default/js/embed/embed.php15
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