Added resize handles to text elements, minor code cleanup

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1102 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2009-12-23 18:31:38 +00:00
parent d6f66bfcf3
commit 718427a32d
2 changed files with 4 additions and 9 deletions

View File

@ -92,7 +92,7 @@ function svg_edit_setup() {
// needs to be included that returns the result as its first parameter. // needs to be included that returns the result as its first parameter.
// In the future we may want to add additional types of dialog boxes, since // In the future we may want to add additional types of dialog boxes, since
// they should be easy to handle this way. // they should be easy to handle this way.
var setDialogs = function() { function() {
$('#dialog_container').draggable({cancel:'#dialog_content, #dialog_buttons *'}); $('#dialog_container').draggable({cancel:'#dialog_content, #dialog_buttons *'});
var box = $('#dialog_box'), btn_holder = $('#dialog_buttons'); var box = $('#dialog_box'), btn_holder = $('#dialog_buttons');
@ -129,9 +129,7 @@ function svg_edit_setup() {
$.alert = function(msg, cb) { dbox('alert', msg, cb);}; $.alert = function(msg, cb) { dbox('alert', msg, cb);};
$.confirm = function(msg, cb) { dbox('confirm', msg, cb);}; $.confirm = function(msg, cb) { dbox('confirm', msg, cb);};
$.prompt = function(msg, txt, cb) { dbox('prompt', msg, cb, txt);}; $.prompt = function(msg, txt, cb) { dbox('prompt', msg, cb, txt);};
} }();
setDialogs();
var setSelectMode = function() { var setSelectMode = function() {
$('.tool_button_current').removeClass('tool_button_current').addClass('tool_button'); $('.tool_button_current').removeClass('tool_button_current').addClass('tool_button');
@ -1422,7 +1420,7 @@ function svg_edit_setup() {
// added these event handlers for all the push buttons so they // added these event handlers for all the push buttons so they
// behave more like buttons being pressed-in and not images // behave more like buttons being pressed-in and not images
function setPushButtons() { function() {
var toolnames = ['clear','open','save','source','delete','delete_multi','paste','clone','clone_multi','move_top','move_bottom']; var toolnames = ['clear','open','save','source','delete','delete_multi','paste','clone','clone_multi','move_top','move_bottom'];
var all_tools = ''; var all_tools = '';
var cur_class = 'tool_button_current'; var cur_class = 'tool_button_current';
@ -1442,9 +1440,7 @@ function svg_edit_setup() {
}).bind('mousedown mouseout',function(){ }).bind('mousedown mouseout',function(){
$(this).removeClass(cur_class);} $(this).removeClass(cur_class);}
); );
} }();
setPushButtons();
$('#workarea').bind("mousewheel DOMMouseScroll", function(e){ $('#workarea').bind("mousewheel DOMMouseScroll", function(e){
if(!e.shiftKey) return; if(!e.shiftKey) return;

View File

@ -383,7 +383,6 @@ function BatchCommand(text) {
this.rotateGrip.setAttribute("display", bShow); this.rotateGrip.setAttribute("display", bShow);
this.rotateGripConnector.setAttribute("display", bShow); this.rotateGripConnector.setAttribute("display", bShow);
var elem = this.selectedElement; var elem = this.selectedElement;
if(elem && (elem.tagName == "text")) bShow = "none";// || elem.tagName == "g")) bShow = "none";
for (dir in this.selectorGrips) { for (dir in this.selectorGrips) {
this.selectorGrips[dir].setAttribute("display", bShow); this.selectorGrips[dir].setAttribute("display", bShow);
} }