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

fixed missing semicolons and leaking ret var

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2428 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Bruno Heridet
2013-02-19 11:18:04 +00:00
parent 47b6e11be9
commit 363bfb4cf2
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
editor/svgutils.js
View File

@@ -122,10 +122,10 @@ svgedit.utilities.decode64 = function(input) {
var enc1, enc2, enc3, enc4 = ''; var enc1, enc2, enc3, enc4 = '';
var i = 0; var i = 0;
// remove all characters that are not A-Z, a-z, 0-9, +, /, or = // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ''); input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
do { do {
enc1 = KEYSTR.indexOf(input.charAt(i++)); enc1 = KEYSTR.indexOf(input.charAt(i++));
enc2 = KEYSTR.indexOf(input.charAt(i++)); enc2 = KEYSTR.indexOf(input.charAt(i++));
enc3 = KEYSTR.indexOf(input.charAt(i++)); enc3 = KEYSTR.indexOf(input.charAt(i++));
@@ -138,17 +138,17 @@ svgedit.utilities.decode64 = function(input) {
output = output + String.fromCharCode(chr1); output = output + String.fromCharCode(chr1);
if (enc3 != 64) { if (enc3 != 64) {
output = output + String.fromCharCode(chr2); output = output + String.fromCharCode(chr2);
} }
if (enc4 != 64) { if (enc4 != 64) {
output = output + String.fromCharCode(chr3); output = output + String.fromCharCode(chr3);
} }
chr1 = chr2 = chr3 = ''; chr1 = chr2 = chr3 = '';
enc1 = enc2 = enc3 = enc4 = ''; enc1 = enc2 = enc3 = enc4 = '';
} while (i < input.length); } while (i < input.length);
return unescape(output); return unescape(output);
}; };
// Currently not being used, so commented out for now // Currently not being used, so commented out for now
@@ -204,12 +204,12 @@ svgedit.utilities.text2xml = function(sXML) {
dXML.async = false; dXML.async = false;
} catch(e){ } catch(e){
throw new Error('XML Parser could not be instantiated'); throw new Error('XML Parser could not be instantiated');
}; }
try{ try{
if(dXML.loadXML) out = (dXML.loadXML(sXML))?dXML:false; if(dXML.loadXML) out = (dXML.loadXML(sXML)) ? dXML : false;
else out = dXML.parseFromString(sXML, 'text/xml'); else out = dXML.parseFromString(sXML, 'text/xml');
} }
catch(e){ throw new Error('Error parsing XML string'); }; catch(e){ throw new Error('Error parsing XML string'); }
return out; return out;
}; };
@@ -227,7 +227,7 @@ svgedit.utilities.bboxToObj = function(bbox) {
y: bbox.y, y: bbox.y,
width: bbox.width, width: bbox.width,
height: bbox.height height: bbox.height
} };
}; };
// Function: svgedit.utilities.walkTree // Function: svgedit.utilities.walkTree
@@ -266,7 +266,7 @@ svgedit.utilities.walkTreePost = function(elem, cbFn) {
// Function: svgedit.utilities.getUrlFromAttr // Function: svgedit.utilities.getUrlFromAttr
// Extracts the URL from the url(...) syntax of some attributes. // Extracts the URL from the url(...) syntax of some attributes.
// Three variants: // Three variants:
// * <circle fill="url(someFile.svg#foo)" /> // * <circle fill="url(someFile.svg#foo)" />
// * <circle fill="url('someFile.svg#foo')" /> // * <circle fill="url('someFile.svg#foo')" />
// * <circle fill='url("someFile.svg#foo")' /> // * <circle fill='url("someFile.svg#foo")' />
// //
@@ -296,13 +296,13 @@ svgedit.utilities.getUrlFromAttr = function(attrVal) {
// Returns the given element's xlink:href value // Returns the given element's xlink:href value
svgedit.utilities.getHref = function(elem) { svgedit.utilities.getHref = function(elem) {
return elem.getAttributeNS(NS.XLINK, 'href'); return elem.getAttributeNS(NS.XLINK, 'href');
} };
// Function: svgedit.utilities.setHref // Function: svgedit.utilities.setHref
// Sets the given element's xlink:href value // Sets the given element's xlink:href value
svgedit.utilities.setHref = function(elem, val) { svgedit.utilities.setHref = function(elem, val) {
elem.setAttributeNS(NS.XLINK, 'xlink:href', val); elem.setAttributeNS(NS.XLINK, 'xlink:href', val);
} };
// Function: findDefs // Function: findDefs
// //
@@ -422,6 +422,7 @@ function groupBBFix(selected) {
} }
var ref = $.data(selected, 'ref'); var ref = $.data(selected, 'ref');
var matched = null; var matched = null;
var ret;
if(ref) { if(ref) {
var copy = $(ref).children().clone().attr('visibility', 'hidden'); var copy = $(ref).children().clone().attr('visibility', 'hidden');
@@ -638,7 +639,7 @@ svgedit.utilities.cleanupElement = function(element) {
'stroke-width':1, 'stroke-width':1,
'rx':0, 'rx':0,
'ry':0 'ry':0
} };
for(var attr in defaults) { for(var attr in defaults) {
var val = defaults[attr]; var val = defaults[attr];