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

Fix Issue 280: Update layer list and Move To select box after moving elements. Fix Issue 281: Make side panel resizable up to 300px, make default snap-open size 150px 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@828 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-10-14 16:29:28 +00:00
parent 22bac1eac5
commit f229d4c12e
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
editor/svg-editor.js
View File

@ -371,12 +371,15 @@ function svg_edit_setup() {
}); });
// fired when user wants to move elements to another layer // fired when user wants to move elements to another layer
var promptMoveLayerOnce = false;
$('#selLayerNames').change(function(){ $('#selLayerNames').change(function(){
var destLayer = this.options[this.selectedIndex].value; var destLayer = this.options[this.selectedIndex].value;
// TODO: localize this prompt // TODO: localize this prompt
if (destLayer && confirm('Move selected elements to layer \'' + destLayer + '\'?')) { if (destLayer && (promptMoveLayerOnce || confirm('Move selected elements to layer \'' + destLayer + '\'?'))) {
promptMoveLayerOnce = true;
svgCanvas.moveSelectedToLayer(destLayer); svgCanvas.moveSelectedToLayer(destLayer);
svgCanvas.clearSelection(); svgCanvas.clearSelection();
populateLayers();
} }
}); });
@ -1253,6 +1256,8 @@ function svg_edit_setup() {
$('#layerlist tr.layer:eq('+curIndex+')').addClass("layersel"); $('#layerlist tr.layer:eq('+curIndex+')').addClass("layersel");
}); });
var SIDEPANEL_MAXWIDTH = 300;
var SIDEPANEL_OPENWIDTH = 150;
var sidedrag = -1; var sidedrag = -1;
$('#sidepanel_handle') $('#sidepanel_handle')
.mousedown(function(evt) {sidedrag = evt.pageX;}) .mousedown(function(evt) {sidedrag = evt.pageX;})
@ -1274,9 +1279,9 @@ function svg_edit_setup() {
var sidepanels = $('#sidepanels'); var sidepanels = $('#sidepanels');
var sidewidth = parseInt(sidepanels.css('width')); var sidewidth = parseInt(sidepanels.css('width'));
if (sidewidth+deltax > 130) { if (sidewidth+deltax > SIDEPANEL_MAXWIDTH) {
deltax = 130 - sidewidth; deltax = SIDEPANEL_MAXWIDTH - sidewidth;
sidewidth = 130; sidewidth = SIDEPANEL_MAXWIDTH;
} }
else if (sidewidth+deltax < 2) { else if (sidewidth+deltax < 2) {
deltax = 2 - sidewidth; deltax = 2 - sidewidth;
@ -1298,7 +1303,7 @@ function svg_edit_setup() {
// the optional close argument forces the side panel closed // the optional close argument forces the side panel closed
var toggleSidePanel = function(close){ var toggleSidePanel = function(close){
var w = parseInt($('#sidepanels').css('width')); var w = parseInt($('#sidepanels').css('width'));
var deltax = (w > 2 || close ? 2 : 130) - w; var deltax = (w > 2 || close ? 2 : SIDEPANEL_OPENWIDTH) - w;
var workarea = $('#workarea'); var workarea = $('#workarea');
var sidepanels = $('#sidepanels'); var sidepanels = $('#sidepanels');
var layerpanel = $('#layerpanel'); var layerpanel = $('#layerpanel');
@ -1333,24 +1338,27 @@ function svg_edit_setup() {
var selLayerNames = $('#selLayerNames'); var selLayerNames = $('#selLayerNames');
layerlist.empty(); layerlist.empty();
selLayerNames.empty(); selLayerNames.empty();
var currentlayer = svgCanvas.getCurrentLayer();
var layer = svgCanvas.getNumLayers(); var layer = svgCanvas.getNumLayers();
// we get the layers in the reverse z-order (the layer rendered on top is listed first) // we get the layers in the reverse z-order (the layer rendered on top is listed first)
while (layer--) { while (layer--) {
var name = svgCanvas.getLayer(layer); var name = svgCanvas.getLayer(layer);
// contenteditable=\"true\" // contenteditable=\"true\"
var appendstr = "<tr class=\"layer";
if (name == currentlayer) {
appendstr += " layersel"
}
appendstr += "\">";
if (svgCanvas.getLayerVisibility(name)) { if (svgCanvas.getLayerVisibility(name)) {
layerlist.append("<tr class=\"layer\"><td class=\"layervis\"/><td class=\"layername\" >" + name + "</td></tr>"); appendstr += "<td class=\"layervis\"/><td class=\"layername\" >" + name + "</td></tr>";
} }
else { else {
layerlist.append("<tr class=\"layer\"><td class=\"layervis layerinvis\"/><td class=\"layername\" >" + name + "</td></tr>"); appendstr += "<td class=\"layervis layerinvis\"/><td class=\"layername\" >" + name + "</td></tr>";
} }
layerlist.append(appendstr);
selLayerNames.append("<option values=\"" + name + "\">" + name + "</option>"); selLayerNames.append("<option values=\"" + name + "\">" + name + "</option>");
} }
// if we only have one layer, then always make sure that layer is selected
// (This is really only required upon first initialization)
if (layerlist.size() == 1) {
$('#layerlist tr:first').addClass("layersel");
}
// handle selection of layer // handle selection of layer
$('#layerlist td.layername') $('#layerlist td.layername')
.click(function(evt){ .click(function(evt){