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

Fixed issue 657 (color picker) 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1689 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-08-30 17:17:57 +00:00
parent e33bd98ea4
commit 292dd46316
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/jgraduate/jpicker-1.0.12.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
editor/svg-editor.js
View File

@ -2609,20 +2609,13 @@
console.log('NOTE: Icon image missing: ' + icon_id); console.log('NOTE: Icon image missing: ' + icon_id);
return; return;
} }
icon = icon.clone(); try {
$(elem).empty().append(icon); icon = icon.clone();
// if(forcedSize) { $(elem).empty().append(icon);
// var obj = {}; } catch(e) {
// obj[elem + ' .svg_icon'] = forcedSize; // icon = svgCanvas.copyElem(icon[0]);
// $.resizeSvgIcons(obj); }
// } else {
// var size = curPrefs.iconsize;
// if(size && size !== 'm') {
// var icon_sizes = { s:16, m:24, l:32, xl:48}, obj = {};
// obj[elem + ' .svg_icon'] = icon_sizes[size];
// $.resizeSvgIcons(obj);
// }
// }
} }
var ua_prefix; var ua_prefix;

8
editor/svgcanvas.js
View File

@ -2263,7 +2263,6 @@ var groupSvgElem = this.groupSvgElem = function(elem) {
$(g).append(elem).data('gsvg', elem)[0].id = getNextId(); $(g).append(elem).data('gsvg', elem)[0].id = getNextId();
} }
// Function: copyElem // Function: copyElem
// Create a clone of an element, updating its ID and its children's IDs when needed // Create a clone of an element, updating its ID and its children's IDs when needed
// //
@ -2785,7 +2784,11 @@ this.setRotationAngle = function(val, preventUndo) {
var center = transformPoint(cx,cy,transformListToTransform(tlist).matrix); var center = transformPoint(cx,cy,transformListToTransform(tlist).matrix);
var R_nc = svgroot.createSVGTransform(); var R_nc = svgroot.createSVGTransform();
R_nc.setRotate(val, center.x, center.y); R_nc.setRotate(val, center.x, center.y);
tlist.insertItemBefore(R_nc,0); if(tlist.numberOfItems) {
tlist.insertItemBefore(R_nc, 0);
} else {
tlist.appendItem(R_nc);
}
} }
else if (tlist.numberOfItems == 0) { else if (tlist.numberOfItems == 0) {
elem.removeAttribute("transform"); elem.removeAttribute("transform");
@ -10614,7 +10617,6 @@ this.moveSelectedElements = function(dx,dy,undoable) {
xform.setTranslate(dx,dy); xform.setTranslate(dx,dy);
} }
console.log('num:',tlist.numberOfItems);
if(tlist.numberOfItems) { if(tlist.numberOfItems) {
tlist.insertItemBefore(xform, 0); tlist.insertItemBefore(xform, 0);
} else { } else {

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

@ -139,6 +139,7 @@ $(function() {
new_el.setAttribute(attr.nodeName, attr.nodeValue); new_el.setAttribute(attr.nodeName, attr.nodeValue);
} }
if(attr.nodeName == 'transform') { if(attr.nodeName == 'transform') {
console.log('val1:', attr.nodeValue); console.log('val1:', attr.nodeValue);
console.log('val2:', new_el.getAttribute('transform')); console.log('val2:', new_el.getAttribute('transform'));
} }