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

simplified undo/redon, node link and sub path button states 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2415 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Bruno Heridet 2013-02-16 16:07:19 +00:00
parent 79f7ee4614
commit 4441810638
1 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
editor/svg-editor.js
View File

@ -1678,16 +1678,8 @@
} }
// update history buttons // update history buttons
if (undoMgr.getUndoStackSize() > 0) { $('#tool_undo').toggleClass('disabled', undoMgr.getUndoStackSize() === 0);
$('#tool_undo').removeClass('disabled'); $('#tool_redo').toggleClass('disabled', undoMgr.getRedoStackSize() === 0);
} else {
$('#tool_undo').addClass('disabled');
}
if (undoMgr.getRedoStackSize() > 0) {
$('#tool_redo').removeClass('disabled');
} else {
$('#tool_redo').addClass('disabled');
}
svgCanvas.addedNew = false; svgCanvas.addedNew = false;
@ -2083,7 +2075,6 @@
overlay.bind('mousedown',function() { overlay.bind('mousedown',function() {
if (!button.hasClass('buttondown')) { if (!button.hasClass('buttondown')) {
button.addClass('buttondown').removeClass('buttonup');
// Margin must be reset in case it was changed before; // Margin must be reset in case it was changed before;
list.css('margin-left', 0).show(); list.css('margin-left', 0).show();
if (!height) { if (!height) {
@ -2094,11 +2085,10 @@
'height': height 'height': height
}, 200); }, 200);
on_button = true; on_button = true;
return false;
} else { } else {
button.removeClass('buttondown').addClass('buttonup');
list.fadeOut(200); list.fadeOut(200);
} }
button.toggleClass('buttondown buttonup');
}).hover(function() { }).hover(function() {
on_button = true; on_button = true;
}).mouseout(function() { }).mouseout(function() {
@ -2152,8 +2142,6 @@
button.bind('mousedown',function() { button.bind('mousedown',function() {
if (!button.hasClass('down')) { if (!button.hasClass('down')) {
button.addClass('down');
if (!dropUp) { if (!dropUp) {
var pos = $(elem).position(); var pos = $(elem).position();
list.css({ list.css({
@ -2162,12 +2150,11 @@
}); });
} }
list.show(); list.show();
on_button = true; on_button = true;
} else { } else {
button.removeClass('down');
list.hide(); list.hide();
} }
button.toggleClass('down');
}).hover(function() { }).hover(function() {
on_button = true; on_button = true;
}).mouseout(function() { }).mouseout(function() {
@ -2510,12 +2497,7 @@
}; };
var linkControlPoints = function() { var linkControlPoints = function() {
var linked = !$('#tool_node_link').hasClass('push_button_pressed'); $('#tool_node_link').toggleClass('push_button_pressed tool_button');
if (linked) {
$('#tool_node_link').addClass('push_button_pressed').removeClass('tool_button');
} else {
$('#tool_node_link').removeClass('push_button_pressed').addClass('tool_button');
}
path.linkControlPoints(linked); path.linkControlPoints(linked);
}; };
@ -2532,12 +2514,7 @@
}; };
var addSubPath = function() { var addSubPath = function() {
var sp = !$('#tool_add_subpath').hasClass('push_button_pressed'); button.toggleClass('push_button_pressed tool_button');
if (sp) {
button.addClass('push_button_pressed').removeClass('tool_button');
} else {
button.removeClass('push_button_pressed').addClass('tool_button');
}
path.addSubPath(sp); path.addSubPath(sp);
}; };
@ -3823,11 +3800,7 @@
var name = $('#layerlist tr.layer:eq(' + row + ') td.layername').text(); var name = $('#layerlist tr.layer:eq(' + row + ') td.layername').text();
var vis = $(this).hasClass('layerinvis'); var vis = $(this).hasClass('layerinvis');
svgCanvas.setLayerVisibility(name, vis); svgCanvas.setLayerVisibility(name, vis);
if (vis) { $(this).toggleClass('layerinvis');
$(this).removeClass('layerinvis');
} else {
$(this).addClass('layerinvis');
}
}); });
// if there were too few rows, let's add a few to make it not so lonely // if there were too few rows, let's add a few to make it not so lonely