zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting jquery.svgicons.js until bug is actually found 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1718 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-09-15 20:22:51 +00:00
parent d42b8b919f
commit ef86b8a08a
1 changed files with 63 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
editor/svgicons/jquery.svgicons.js
View File

@ -128,6 +128,39 @@ $(function() {
(function($) {
function makeSVG(el) {
// manually create a copy of the element
var new_el = document.createElementNS(el.namespaceURI, el.nodeName);
$.each(el.attributes, function(i, attr) {
var ns = attr.namespaceURI;
if(ns) {
new_el.setAttributeNS(ns, attr.nodeName, attr.nodeValue);
} else {
new_el.setAttribute(attr.nodeName, attr.nodeValue);
}
if(attr.nodeName == 'transform') {
console.log('val1:', attr.nodeValue);
console.log('val2:', new_el.getAttribute('transform'));
}
});
// now create copies of all children
$.each(el.childNodes, function(i, child) {
switch(child.nodeType) {
case 1: // element node
new_el.appendChild(makeSVG(child));
break;
case 3: // text node
new_el.textContent = child.nodeValue;
break;
default:
break;
}
});
return new_el;
}
var svg_icons = {}, fixIDs;
$.svgIcons = function(file, opts) {
@ -144,23 +177,19 @@ $(function() {
var data_el = $('<object data="' + file + '" type=image/svg+xml>').appendTo('body').hide();
try {
svgdoc = data_el[0].contentDocument;
// TODO: IE still loads this, shouldn't even bother.
data_el.load(getIcons);
getIcons(0, true); // Opera will not run "load" event if file is already cached
} catch(err1) {
useFallback();
}
} else {
var parser = new DOMParser();
$.ajax({
url: file,
dataType: 'xml',
success: function(data) {
svgdoc = data;
$(function() {
if(!data) {
useFallback();
return;
}
svgdoc = parser.parseFromString(data, "text/xml");
getIcons('ajax');
});
},
@ -172,9 +201,17 @@ $(function() {
});
} else {
if(err.responseXML) {
svgdoc = parser.parseFromString(err.responseXML, "text/xml");
// Is there a non-ActiveX solution in IE9?
svgdoc = err.responseXML;
if(!svgdoc.childNodes.length) {
if(window.ActiveXObject) {
svgdoc = new ActiveXObject("Microsoft.XMLDOM");
svgdoc.loadXML(err.responseText);
} else {
$(useFallback);
}
} else {
$(useFallback);
}
$(function() {
@ -309,7 +346,9 @@ $(function() {
holder = $('#' + id);
if(elem.getElementsByTagNameNS) {
var svg = elem.getElementsByTagNameNS(svgns, 'svg')[0];
}
} else {
var svg = elem.getElementsByTagName('svg')[0];
}
var svgroot = document.createElementNS(svgns, "svg");
svgroot.setAttributeNS(svgns, 'viewBox', [0,0,icon_w,icon_h].join(' '));
@ -336,7 +375,13 @@ $(function() {
// With cloning, causes issue in Opera/Win/Non-EN
if(!isOpera) svg = svg.cloneNode(true);
svgroot.appendChild(svg);
// TODO: Figure out why makeSVG is necessary for IE9
try {
svgroot.appendChild(svg);
} catch(e) {
// For IE9
svgroot.appendChild(makeSVG(svg));
}
if(toImage) {
// Without cloning, Safari will crash
@ -357,7 +402,12 @@ $(function() {
$.each(opts.placement, function(sel, id) {
if(!svg_icons[id]) return;
$(sel).each(function(i) {
var copy = svg_icons[id].clone();
// TODO: Figure out why makeSVG is necessary for IE9
try {
var copy = svg_icons[id].clone();
} catch(e) {
var copy = makeSVG(svg_icons[id][0]);
}
setIcon($(this), copy, id);
})
});
@ -450,7 +500,7 @@ $(function() {
$.getSvgIcon = function(id, uniqueClone) {
var icon = svg_icons[id];
if(uniqueClone && icon) {
if(uniqueClone) {
icon = fixIDs(icon, 0, true).clone(true);
}
return icon;
@ -477,4 +527,4 @@ $(function() {
});
}
})(jQuery);
})(jQuery);