3 files changed, 18 insertions, 9 deletions
diff --git a/mod/embed/start.php b/mod/embed/start.php
index 3b6e58ce1..e6fc5551b 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -32,16 +32,10 @@ function embed_init() {
  * @return array
  */
 function embed_longtext_menu($hook, $type, $items, $vars) {
-	// yeah this is naughty.  embed and ecml might want to merge.
-	if (elgg_is_active_plugin('ecml')) {
-		$active_section = 'active_section=web_services&';
-	} else {
-		$active_section = '';
-	}
 	
 	$items[] = ElggMenuItem::factory(array(
 		'name' => 'embed',
-		'href' => "embed?{$active_section}internal_id={$vars['id']}",
+		'href' => "embed",
 		'text' => elgg_echo('media:insert'),
 		'rel' => 'lightbox',
 		'link_class' => "elgg-longtext-control elgg-lightbox embed-control embed-control-{$vars['id']}",
diff --git a/mod/embed/views/default/embed/tabs.php b/mod/embed/views/default/embed/tabs.php
index a148ece9f..3f377fee5 100644
--- a/mod/embed/views/default/embed/tabs.php
+++ b/mod/embed/views/default/embed/tabs.php
@@ -16,7 +16,7 @@ foreach ($sections as $section_id => $section_info) {
 	$tab = array(
 		'title' => $section_info['name'],
 		'url' => '#',
-		'url_class' => 'embed_section',
+		'url_class' => 'embed-section',
 		'url_id' => $section_id,
 	);
 
@@ -31,7 +31,7 @@ if ($upload_sections) {
 	$tabs[] = array(
 		'title' => elgg_echo('embed:upload'),
 		'url' => '#',
-		'url_class' => 'embed_section',
+		'url_class' => 'embed-section',
 		'url_id' => 'upload',
 		'selected' => ($active_section == 'upload')
 	);
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index b709af05e..3b398af3a 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -15,6 +15,8 @@ elgg.embed.init = function() {
 
 	// special pagination helper for lightbox
 	$('.embed-wrapper .elgg-pagination a').live('click', elgg.embed.pagination);
+
+	$('.embed-section').live('click', elgg.embed.loadTab);
 }
 
 /**
@@ -50,4 +52,17 @@ elgg.embed.pagination = function(event) {
 	event.preventDefault();
 }
 
+/**
+ * Loads an embed tab
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.embed.loadTab = function(event) {
+	var section = $(this).attr('id');
+	var url = elgg.config.wwwroot + 'embed/embed?active_section=' + section;
+	$('.embed-wrapper').parent().load(url);
+	event.preventDefault();
+}
+
 elgg.register_hook_handler('init', 'system', elgg.embed.init);