refs #789 - fix regression with embed flash code

2 files changed, 19 insertions, 22 deletions

diff --git a/plugins/CoreHome/templates/graph.tpl b/plugins/CoreHome/templates/graph.tpl
index ff4f282a1b..487a7139b0 100644
--- a/plugins/CoreHome/templates/graph.tpl
+++ b/plugins/CoreHome/templates/graph.tpl
@@ -14,10 +14,10 @@
 				"{$flashParameters.requiredFlashVersion}",
 				"{$flashParameters.swfLibraryPath}expressInstall.swf",
 				{literal}{{/literal}
+					"{if $flashParameters.includeData}x-{/if}data-file":"{$urlGraphData|escape:"url"}",
 				{if $flashParameters.includeData}
 					"id":"{$chartDivId}",
 				{/if}
-					"{if $flashParameters.includeData}x-{/if}data-file":"{$urlGraphData|escape:"url"}",
 					"loading":"{'General_Loading'|translate|escape:"html"}"
 				{literal}},
 				{{/literal}
diff --git a/plugins/Widgetize/templates/widgetize.js b/plugins/Widgetize/templates/widgetize.js
index 46382eacbe..12841e496d 100644
--- a/plugins/Widgetize/templates/widgetize.js
+++ b/plugins/Widgetize/templates/widgetize.js
@@ -68,27 +68,24 @@ function widgetize()
 		);
 		
 		// Add the Flash Export if a flash <embed> is found in the widget 
-		// 0.5: removing temporarily this feature as it seems not working
-		if(false) {
-			$(loadedWidgetElement)
-				.find('embed,object')
-				.each(function() {
-					var htmlEmbed = $(this).parent().html();
-	
-					htmlEmbed = htmlEmbed.replace(/ (data=")/, ' $1' + unescape(piwik.piwik_url));
-					htmlEmbed = htmlEmbed.replace(/ (value=")x-(data-file=)/, ' $1$2' + piwik.piwik_url + 'index.php');
-	
-					$(exportButtonsElement).append(
-						'<div id="embedThisWidgetFlash">'+
-							'<label for="embedThisWidgetFlashInput">&rsaquo; Embed Flash</label>'+
-							'<span id="embedThisWidgetFlashInput">'+
-								self.getInputFormWithHtml('flashEmbed', htmlEmbed) +
-							'</span>'+
-						'</div>'
-					);
-				});
-		}
-		
+		$(loadedWidgetElement)
+			.find('embed,object')
+			.each(function() {
+				var htmlEmbed = $(this).parent().html();
+
+				htmlEmbed = htmlEmbed.replace(/ (data=")/, ' $1' + unescape(piwik.piwik_url));
+				htmlEmbed = htmlEmbed.replace(/ (value=")x-(data-file=)/, ' $1$2' + piwik.piwik_url + 'index.php');
+
+				$(exportButtonsElement).append(
+					'<div id="embedThisWidgetFlash">'+
+						'<label for="embedThisWidgetFlashInput">&rsaquo; Embed Flash</label>'+
+						'<span id="embedThisWidgetFlashInput">'+
+							self.getInputFormWithHtml('flashEmbed', htmlEmbed) +
+						'</span>'+
+					'</div>'
+				);
+			});
+
 		// 0.5: Removing launchpad feature as it doesn't seem to work well despite us contacting Clearspring
 		if(false) {
 			$(exportButtonsElement).append(