Fixed issue 657 (color picker)
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1689 eee81c28-f429-11dd-99c0-75d572ba1dddmaster
parent
e33bd98ea4
commit
292dd46316
File diff suppressed because one or more lines are too long
|
@ -2609,20 +2609,13 @@
|
|||
console.log('NOTE: Icon image missing: ' + icon_id);
|
||||
return;
|
||||
}
|
||||
icon = icon.clone();
|
||||
$(elem).empty().append(icon);
|
||||
// if(forcedSize) {
|
||||
// var obj = {};
|
||||
// obj[elem + ' .svg_icon'] = forcedSize;
|
||||
// $.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);
|
||||
// }
|
||||
// }
|
||||
try {
|
||||
icon = icon.clone();
|
||||
$(elem).empty().append(icon);
|
||||
} catch(e) {
|
||||
// icon = svgCanvas.copyElem(icon[0]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var ua_prefix;
|
||||
|
|
|
@ -2263,7 +2263,6 @@ var groupSvgElem = this.groupSvgElem = function(elem) {
|
|||
$(g).append(elem).data('gsvg', elem)[0].id = getNextId();
|
||||
}
|
||||
|
||||
|
||||
// Function: copyElem
|
||||
// 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 R_nc = svgroot.createSVGTransform();
|
||||
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) {
|
||||
elem.removeAttribute("transform");
|
||||
|
@ -10614,7 +10617,6 @@ this.moveSelectedElements = function(dx,dy,undoable) {
|
|||
xform.setTranslate(dx,dy);
|
||||
}
|
||||
|
||||
console.log('num:',tlist.numberOfItems);
|
||||
if(tlist.numberOfItems) {
|
||||
tlist.insertItemBefore(xform, 0);
|
||||
} else {
|
||||
|
|
|
@ -139,6 +139,7 @@ $(function() {
|
|||
new_el.setAttribute(attr.nodeName, attr.nodeValue);
|
||||
}
|
||||
if(attr.nodeName == 'transform') {
|
||||
|
||||
console.log('val1:', attr.nodeValue);
|
||||
console.log('val2:', new_el.getAttribute('transform'));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue