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
This commit is contained in:
Alexis Deveria
2010-02-02 19:24:17 +00:00
parent cf84f45d60
commit fad1c4395d
2 changed files with 7 additions and 5 deletions

View File

@@ -38,11 +38,11 @@ var put_locale = function(svgCanvas, given_param){
var processFile = function(data){ var processFile = function(data){
var LangData = eval(data), js_strings; var LangData = eval(data), js_strings;
var more = svgCanvas.runExtensions("addLangData", lang_param, true); 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); LangData = $.merge(LangData, m.data);
}); }
} });
$.each(LangData, function(i, data) { $.each(LangData, function(i, data) {
if(data.id) { if(data.id) {
var elem = $('#svg_editor').parent().find('#'+data.id)[0]; var elem = $('#svg_editor').parent().find('#'+data.id)[0];

View File

@@ -2753,7 +2753,9 @@ function svg_edit_setup() {
var sel = shower.attr('data-curopt'); var sel = shower.attr('data-curopt');
// Check if there's an icon here // Check if there's an icon here
if(!shower.children('svg, img').length) { 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);
} }
}); });