From d72bc668b69f865988068c21aab7e781584f2ff7 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 23 Aug 2013 04:56:15 +0200
Subject: Updated to Elgg 1.8.16.

---
 views/default/js/embed/embed.php | 15 +++++++++++++--
 1 file 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
-- 
cgit v1.2.3


From d4b9e8fe47a4ef97950cedd566923fb2d1ec1ca0 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 8 Nov 2013 03:50:05 +0100
Subject: Bumped 1.8.0 version number.

---
 manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>
-- 
cgit v1.2.3