git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2653 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Brett Zamir 2014-01-31 10:55:18 +00:00
parent 525e8322a9
commit 51ed2f6106
1 changed files with 8 additions and 8 deletions

View File

@ -1229,12 +1229,12 @@
} else { } else {
button.appendTo(parent); button.appendTo(parent);
} }
var ref_btn;
if (btn.type =='mode_flyout') { if (btn.type =='mode_flyout') {
// Add to flyout menu / make flyout menu // Add to flyout menu / make flyout menu
// var opts = btn.includeWith; // var opts = btn.includeWith;
// // opts.button, default, position // // opts.button, default, position
var ref_btn = $(button); ref_btn = $(button);
flyout_holder = ref_btn.parent(); flyout_holder = ref_btn.parent();
// Create a flyout menu if there isn't one already // Create a flyout menu if there isn't one already
@ -1295,7 +1295,7 @@
// Add to flyout menu / make flyout menu // Add to flyout menu / make flyout menu
var opts = btn.includeWith; var opts = btn.includeWith;
// opts.button, default, position // opts.button, default, position
var ref_btn = $(opts.button); ref_btn = $(opts.button);
flyout_holder = ref_btn.parent(); flyout_holder = ref_btn.parent();
// Create a flyout menu if there isn't one already // Create a flyout menu if there isn't one already
@ -1989,9 +1989,9 @@
// - hides any flyouts // - hides any flyouts
// - adds the tool_button_current class to the button passed in // - adds the tool_button_current class to the button passed in
var toolButtonClick = function(button, noHiding) { var toolButtonClick = function(button, noHiding) {
if ($(button).hasClass('disabled')) return false; if ($(button).hasClass('disabled')) {return false;}
if ($(button).parent().hasClass('tools_flyout')) return true; if ($(button).parent().hasClass('tools_flyout')) {return true;}
var fadeFlyouts = fadeFlyouts || 'normal'; var fadeFlyouts = 'normal';
if (!noHiding) { if (!noHiding) {
$('.tools_flyout').fadeOut(fadeFlyouts); $('.tools_flyout').fadeOut(fadeFlyouts);
} }
@ -2007,7 +2007,7 @@
panning = false, keypan = false; panning = false, keypan = false;
$('#svgcanvas').bind('mousemove mouseup', function(evt) { $('#svgcanvas').bind('mousemove mouseup', function(evt) {
if (panning === false) return; if (panning === false) {return;}
w_area.scrollLeft -= (evt.clientX - last_x); w_area.scrollLeft -= (evt.clientX - last_x);
w_area.scrollTop -= (evt.clientY - last_y); w_area.scrollTop -= (evt.clientY - last_y);
@ -2015,7 +2015,7 @@
last_x = evt.clientX; last_x = evt.clientX;
last_y = evt.clientY; last_y = evt.clientY;
if (evt.type === 'mouseup') panning = false; if (evt.type === 'mouseup') {panning = false;}
return false; return false;
}).mousedown(function(evt) { }).mousedown(function(evt) {
if (evt.button === 1 || keypan === true) { if (evt.button === 1 || keypan === true) {