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

Fix issue 927 and issue 462. Patch by duopixel. 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2067 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Ahmad Syazwan 2012-03-22 10:31:25 +00:00
parent c15e813afb
commit c3f7b7541d
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
editor/svg-editor.js
View File

@ -876,36 +876,50 @@
// Remember the function that goes with this ID // Remember the function that goes with this ID
flyout_funcs[opts.sel] = opts.fn; flyout_funcs[opts.sel] = opts.fn;
if(opts.isDefault) def = i; if(opts.isDefault) def = i;
// Clicking the icon in flyout should set this set's icon // Clicking the icon in flyout should set this set's icon
var func = function(event) {
var func = function() { var options = opts;
//find the currently selected tool if comes from keystroke
if (event.type === "keydown") {
var flyoutIsSelected = $(options.parent + "_show").hasClass('tool_button_current');
var currentOperation = $(options.parent + "_show").attr("data-curopt");
$.each(holders[opts.parent], function(i, tool){
if (tool.sel == currentOperation) {
if(!event.shiftKey || !flyoutIsSelected) {
options = tool;
}
else {
options = holders[opts.parent][i+1] || holders[opts.parent][0];
}
}
});
}
if($(this).hasClass('disabled')) return false; if($(this).hasClass('disabled')) return false;
if (toolButtonClick(show_sel)) { if (toolButtonClick(show_sel)) {
opts.fn(); options.fn();
} }
if(opts.icon) { if(options.icon) {
var icon = $.getSvgIcon(opts.icon, true); var icon = $.getSvgIcon(options.icon, true);
} else { } else {
// var icon = $(options.sel).children().eq(0).clone();
var icon = $(opts.sel).children().eq(0).clone();
} }
icon[0].setAttribute('width',shower.width()); icon[0].setAttribute('width',shower.width());
icon[0].setAttribute('height',shower.height()); icon[0].setAttribute('height',shower.height());
shower.children(':not(.flyout_arrow_horiz)').remove(); shower.children(':not(.flyout_arrow_horiz)').remove();
shower.append(icon).attr('data-curopt', opts.sel); // This sets the current mode shower.append(icon).attr('data-curopt', options.sel); // This sets the current mode
} }
$(this).mouseup(func); $(this).mouseup(func);
if(opts.key) { if(opts.key) {
$(document).bind('keydown', opts.key[0], func); $(document).bind('keydown', opts.key[0] + " shift+" + opts.key[0], func);
} }
}); });
if(def) { if(def) {
shower.attr('data-curopt', btn_opts[def].sel); shower.attr('data-curopt', btn_opts[def].sel);
} else if(!shower.attr('data-curopt')) { } else if(!shower.attr('data-curopt')) {