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

Prompt user when moving elements to a layer. Remove some dead code. Comment more prompts needing localization. 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@812 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-10-13 03:16:02 +00:00
parent 91d450b5cb
commit 79522f7434
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/svg-editor.js
View File

@ -373,7 +373,8 @@ function svg_edit_setup() {
// fired when user wants to move elements to another layer // fired when user wants to move elements to another layer
$('#selLayerNames').change(function(){ $('#selLayerNames').change(function(){
var destLayer = this.options[this.selectedIndex].value; var destLayer = this.options[this.selectedIndex].value;
if (destLayer) { // TODO: localize this prompt
if (destLayer && confirm('Move selected elements to layer \'' + destLayer + '\'?')) {
svgCanvas.moveSelectedToLayer(destLayer); svgCanvas.moveSelectedToLayer(destLayer);
svgCanvas.clearSelection(); svgCanvas.clearSelection();
} }
@ -701,6 +702,7 @@ function svg_edit_setup() {
} }
var clickClear = function(){ var clickClear = function(){
// TODO: localize this prompt
if( confirm('Do you want to clear the drawing?\nThis will also erase your undo history!') ) { if( confirm('Do you want to clear the drawing?\nThis will also erase your undo history!') ) {
svgCanvas.clear(); svgCanvas.clear();
updateContextPanel(); updateContextPanel();
@ -814,6 +816,7 @@ function svg_edit_setup() {
if (!editingsource) return; if (!editingsource) return;
if (!svgCanvas.setSvgString($('#svg_source_textarea').val())) { if (!svgCanvas.setSvgString($('#svg_source_textarea').val())) {
// TODO: localize this prompt
if( !confirm('There were parsing errors in your SVG source.\nRevert back to original SVG source?') ) { if( !confirm('There were parsing errors in your SVG source.\nRevert back to original SVG source?') ) {
return false; return false;
} }
@ -843,6 +846,7 @@ function svg_edit_setup() {
if (editingsource) { if (editingsource) {
var oldString = svgCanvas.getSvgString(); var oldString = svgCanvas.getSvgString();
if (oldString != $('#svg_source_textarea').val()) { if (oldString != $('#svg_source_textarea').val()) {
// TODO: localize this prompt
if( !confirm('Ignore changes made to SVG source?') ) { if( !confirm('Ignore changes made to SVG source?') ) {
return false; return false;
} }
@ -1274,10 +1278,8 @@ function svg_edit_setup() {
var populateLayers = function(){ var populateLayers = function(){
var layerlist = $('#layerlist tbody'); var layerlist = $('#layerlist tbody');
var selLayerNames = $('#selLayerNames'); var selLayerNames = $('#selLayerNames');
var mselLayerNames = $('#mselLayerNames');
layerlist.empty(); layerlist.empty();
selLayerNames.empty(); selLayerNames.empty();
mselLayerNames.empty();
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--) {
@ -1290,7 +1292,6 @@ function svg_edit_setup() {
layerlist.append("<tr class=\"layer\"><td class=\"layervis layerinvis\"/><td class=\"layername\" >" + name + "</td></tr>"); layerlist.append("<tr class=\"layer\"><td class=\"layervis layerinvis\"/><td class=\"layername\" >" + name + "</td></tr>");
} }
selLayerNames.append("<option values=\"" + name + "\">" + name + "</option>"); selLayerNames.append("<option values=\"" + name + "\">" + name + "</option>");
mselLayerNames.append("<option values=\"" + name + "\">" + name + "</option>");
} }
// if we only have one layer, then always make sure that layer is selected // if we only have one layer, then always make sure that layer is selected
// (This is really only required upon first initialization) // (This is really only required upon first initialization)

5
editor/svgcanvas.js
View File

@ -3755,6 +3755,8 @@ function BatchCommand(text) {
return null; return null;
}; };
// Group: Fill and Stroke
this.setStrokePaint = function(p, addGrad) { this.setStrokePaint = function(p, addGrad) {
// make a copy // make a copy
@ -3798,6 +3800,9 @@ function BatchCommand(text) {
return cur_properties.stroke_width; return cur_properties.stroke_width;
}; };
// TODO: this seems like two bugs - if val is 0 and current_mode is NOT line/scribble, then
// we RECURSIVELY call setStrokeWidth(1) and then the rest of the function continues and
// stroke_width is set to 0 and selected element's stroke-width is set to 0
this.setStrokeWidth = function(val) { this.setStrokeWidth = function(val) {
if(val == 0 && $.inArray(current_mode, ['line', 'path']) == -1) { if(val == 0 && $.inArray(current_mode, ['line', 'path']) == -1) {
canvas.setStrokeWidth(1); canvas.setStrokeWidth(1);