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

Removed chunks of code for IE9 compat, no longer necessary thanks to fixes in IE9 Beta

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1716 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2010-09-15 20:10:43 +00:00
parent 119bf24229
commit fac8fbe1d1
3 changed files with 47 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/svg-editor.html
View File

@@ -121,7 +121,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<li id="tool_docprops"> <li id="tool_docprops">
<div></div> <div></div>
Document Properties [I] Document Properties [P]
</li> </li>
</ul> </ul>

97
editor/svg-editor.js
View File

@@ -3115,70 +3115,45 @@
operaRepaint(); operaRepaint();
}; };
if(window.DOMParser) { // set up gradients to be used for the buttons
// set up gradients to be used for the buttons var svgdocbox = new DOMParser().parseFromString(
var svgdocbox = new DOMParser().parseFromString( '<svg xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%"\
'<svg xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%"\ fill="#' + curConfig.initFill.color + '" opacity="' + curConfig.initFill.opacity + '"/>\
fill="#' + curConfig.initFill.color + '" opacity="' + curConfig.initFill.opacity + '"/>\ <linearGradient id="gradbox_">\
<linearGradient id="gradbox_">\ <stop stop-color="#000" offset="0.0"/>\
<stop stop-color="#000" offset="0.0"/>\ <stop stop-color="#FF0000" offset="1.0"/>\
<stop stop-color="#FF0000" offset="1.0"/>\ </linearGradient></svg>', 'text/xml');
</linearGradient></svg>', 'text/xml'); var docElem = svgdocbox.documentElement;
var docElem = svgdocbox.documentElement;
var boxgrad = svgdocbox.getElementById('gradbox_'); var boxgrad = svgdocbox.getElementById('gradbox_');
boxgrad.id = 'gradbox_fill'; boxgrad.id = 'gradbox_fill';
docElem.setAttribute('width',16.5); docElem.setAttribute('width',16.5);
$('#fill_color').append( document.importNode(docElem,true) ); $('#fill_color').append( document.importNode(docElem,true) );
boxgrad.id = 'gradbox_stroke'; boxgrad.id = 'gradbox_stroke';
docElem.setAttribute('width',16.5); docElem.setAttribute('width',16.5);
$('#stroke_color').append( document.importNode(docElem,true) ); $('#stroke_color').append( document.importNode(docElem,true) );
$('#stroke_color rect').attr({ $('#stroke_color rect').attr({
'fill': '#' + curConfig.initStroke.color, 'fill': '#' + curConfig.initStroke.color,
'opacity': curConfig.initStroke.opacity 'opacity': curConfig.initStroke.opacity
}); });
$('#stroke_width').val(curConfig.initStroke.width); $('#stroke_width').val(curConfig.initStroke.width);
$('#group_opacity').val(curConfig.initOpacity * 100); $('#group_opacity').val(curConfig.initOpacity * 100);
// Use this SVG elem to test vectorEffect support // Use this SVG elem to test vectorEffect support
var test_el = docElem.firstChild; var test_el = docElem.firstChild;
test_el.setAttribute('style','vector-effect:non-scaling-stroke'); test_el.setAttribute('style','vector-effect:non-scaling-stroke');
var supportsNonSS = (test_el.style.vectorEffect == 'non-scaling-stroke'); var supportsNonSS = (test_el.style.vectorEffect == 'non-scaling-stroke');
test_el.removeAttribute('style'); test_el.removeAttribute('style');
// Use this to test support for blur element. Seems to work to test support in Webkit // Use this to test support for blur element. Seems to work to test support in Webkit
var blur_test = svgdocbox.createElementNS('http://www.w3.org/2000/svg', 'feGaussianBlur'); var blur_test = svgdocbox.createElementNS('http://www.w3.org/2000/svg', 'feGaussianBlur');
if(typeof blur_test.stdDeviationX === "undefined") { if(typeof blur_test.stdDeviationX === "undefined") {
$('#tool_blur').hide(); $('#tool_blur').hide();
}
$(blur_test).remove();
} else {
var svgns = "http://www.w3.org/2000/svg";
var svgdocbox = document.createElementNS(svgns, 'svg');
var rect = svgCanvas.addSvgElementFromJson({
element: 'rect',
attr: {
width: '100%',
height: '100%',
fill: '#' + curConfig.initFill.color,
opacity: curConfig.initFill.opacity
}
});
svgdocbox.appendChild(rect);
var linearGradient = svgCanvas.addSvgElementFromJson({
element: 'linearGradient',
attr: {
id: 'gradbox_'
}
});
svgdocbox.appendChild(linearGradient);
var docElem = svgdocbox;
} }
$(blur_test).remove();
// Test for embedImage support (use timeout to not interfere with page load) // Test for embedImage support (use timeout to not interfere with page load)
setTimeout(function() { setTimeout(function() {

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

@@ -128,39 +128,6 @@ $(function() {
(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; var svg_icons = {}, fixIDs;
$.svgIcons = function(file, opts) { $.svgIcons = function(file, opts) {
@@ -177,18 +144,21 @@ $(function() {
var data_el = $('<object data="' + file + '" type=image/svg+xml>').appendTo('body').hide(); var data_el = $('<object data="' + file + '" type=image/svg+xml>').appendTo('body').hide();
try { try {
svgdoc = data_el[0].contentDocument; svgdoc = data_el[0].contentDocument;
// TODO: IE still loads this, shouldn't even bother.
data_el.load(getIcons); data_el.load(getIcons);
getIcons(0, true); // Opera will not run "load" event if file is already cached getIcons(0, true); // Opera will not run "load" event if file is already cached
} catch(err1) { } catch(err1) {
useFallback(); useFallback();
} }
} else { } else {
var parser = new DOMParser();
$.ajax({ $.ajax({
url: file, url: file,
dataType: 'xml',
success: function(data) { success: function(data) {
svgdoc = data; if(!data) {
$(useFallback);
return;
}
svgdoc = parser.parseFromString(data, "text/xml");
$(function() { $(function() {
getIcons('ajax'); getIcons('ajax');
}); });
@@ -201,17 +171,9 @@ $(function() {
}); });
} else { } else {
if(err.responseXML) { if(err.responseXML) {
// Is there a non-ActiveX solution in IE9? svgdoc = parser.parseFromString(err.responseXML, "text/xml");
svgdoc = err.responseXML;
if(!svgdoc.childNodes.length) { if(!svgdoc.childNodes.length) {
if(window.ActiveXObject) {
svgdoc = new ActiveXObject("Microsoft.XMLDOM");
svgdoc.loadXML(err.responseText);
} else {
$(useFallback);
}
} else {
$(useFallback); $(useFallback);
} }
$(function() { $(function() {
@@ -346,9 +308,7 @@ $(function() {
holder = $('#' + id); holder = $('#' + id);
if(elem.getElementsByTagNameNS) { if(elem.getElementsByTagNameNS) {
var svg = elem.getElementsByTagNameNS(svgns, 'svg')[0]; var svg = elem.getElementsByTagNameNS(svgns, 'svg')[0];
} else { }
var svg = elem.getElementsByTagName('svg')[0];
}
var svgroot = document.createElementNS(svgns, "svg"); var svgroot = document.createElementNS(svgns, "svg");
svgroot.setAttributeNS(svgns, 'viewBox', [0,0,icon_w,icon_h].join(' ')); svgroot.setAttributeNS(svgns, 'viewBox', [0,0,icon_w,icon_h].join(' '));
@@ -375,13 +335,7 @@ $(function() {
// With cloning, causes issue in Opera/Win/Non-EN // With cloning, causes issue in Opera/Win/Non-EN
if(!isOpera) svg = svg.cloneNode(true); if(!isOpera) svg = svg.cloneNode(true);
// TODO: Figure out why makeSVG is necessary for IE9 svgroot.appendChild(svg);
try {
svgroot.appendChild(svg);
} catch(e) {
// For IE9
svgroot.appendChild(makeSVG(svg));
}
if(toImage) { if(toImage) {
// Without cloning, Safari will crash // Without cloning, Safari will crash
@@ -402,12 +356,7 @@ $(function() {
$.each(opts.placement, function(sel, id) { $.each(opts.placement, function(sel, id) {
if(!svg_icons[id]) return; if(!svg_icons[id]) return;
$(sel).each(function(i) { $(sel).each(function(i) {
// TODO: Figure out why makeSVG is necessary for IE9 var copy = svg_icons[id].clone();
try {
var copy = svg_icons[id].clone();
} catch(e) {
var copy = makeSVG(svg_icons[id][0]);
}
setIcon($(this), copy, id); setIcon($(this), copy, id);
}) })
}); });