From fad1c4395d60f2ee5c85c57f21a138bc78c821ff Mon Sep 17 00:00:00 2001
From: Alexis Deveria <adeveria@gmail.com>
Date: Tue, 2 Feb 2010 19:24:17 +0000
Subject: [PATCH] Fixed bug in Opera where flyout icon didn't show and fixed
 Issue 451: Switching languages is broken

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1327 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/locale/locale.js | 8 ++++----
 editor/svg-editor.js    | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/editor/locale/locale.js b/editor/locale/locale.js
index c46e9270..975f739e 100644
--- a/editor/locale/locale.js
+++ b/editor/locale/locale.js
@@ -38,11 +38,11 @@ var put_locale = function(svgCanvas, given_param){
 	var processFile = function(data){
 		var LangData = eval(data), js_strings;
 		var more = svgCanvas.runExtensions("addLangData", lang_param, true);
-		if(more.length) {
-			$.each(more, function(i, m) {
+		$.each(more, function(i, m) {
+			if(m.data) {
 				LangData = $.merge(LangData, m.data);
-			});
-		}
+			}
+		});
 		$.each(LangData, function(i, data) {
 			if(data.id) {
 				var elem = $('#svg_editor').parent().find('#'+data.id)[0];
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 92bb8c5b..9184bea0 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -2753,7 +2753,9 @@ function svg_edit_setup() {
 				var sel = shower.attr('data-curopt');
 				// Check if there's an icon here
 				if(!shower.children('svg, img').length) {
-					shower.append($(sel).children().clone());
+					var clone = $(sel).children().clone();
+					clone[0].removeAttribute('style'); //Needed for Opera
+					shower.append(clone);
 				}
 			});