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

added Erik's patch to fix issue 223

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@710 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2009-09-24 18:47:03 +00:00
parent d1fe17fc60
commit 8bfc7ddc92
2 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
editor/svg-editor.js
View File

@@ -347,7 +347,7 @@ function svg_edit_setup() {
}); });
$('.attr_changer').change(function() { $('.attr_changer').change(function() {
var attr = this.getAttribute("data-attr"); var attr = this.getAttribute("alt");
var val = this.value; var val = this.value;
var valid = false; var valid = false;
if($.inArray(attr, length_attrs) != -1) { if($.inArray(attr, length_attrs) != -1) {
@@ -1102,8 +1102,8 @@ function svg_edit_setup() {
svgCanvas.createLayer(newName); svgCanvas.createLayer(newName);
updateContextPanel(); updateContextPanel();
populateLayers(); populateLayers();
$('#layerlist tr.layer').removeClass("layersel"); $('#layerlist option').removeAttr("selected");
$('#layerlist tr.layer:first').addClass("layersel"); $('#layerlist option:first').attr("selected", "selected");
}); });
$('#layer_delete').click(function() { $('#layer_delete').click(function() {
@@ -1113,40 +1113,39 @@ function svg_edit_setup() {
// This matches what SvgCanvas does // This matches what SvgCanvas does
// TODO: make this behavior less brittle (svg-editor should get which // TODO: make this behavior less brittle (svg-editor should get which
// layer is selected from the canvas and then select that one in the UI) // layer is selected from the canvas and then select that one in the UI)
$('#layerlist tr.layer').removeClass("layersel"); $('#layerlist option:first').attr("selected", "selected");
$('#layerlist tr.layer:first').addClass("layersel");
} }
}); });
$('#layer_up').click(function() { $('#layer_up').click(function() {
// find index position of selected option // find index position of selected option
var curIndex = $('#layerlist tr.layersel').prevAll().length; var curIndex = $('#layerlist option:selected').prevAll().length;
if (curIndex > 0) { if (curIndex > 0) {
var total = $('#layerlist tr.layer').length; var total = $('#layerlist option').length;
curIndex--; curIndex--;
svgCanvas.setCurrentLayerPosition(total-curIndex-1); svgCanvas.setCurrentLayerPosition(total-curIndex-1);
populateLayers(); populateLayers();
$('#layerlist tr.layer').removeClass("layersel"); $('#layerlist option').removeAttr("selected");
$('#layerlist tr.layer:eq('+curIndex+')').addClass("layersel"); $('#layerlist option:eq('+curIndex+')').attr("selected", "selected");
} }
}); });
$('#layer_down').click(function() { $('#layer_down').click(function() {
// find index position of selected option // find index position of selected option
var curIndex = $('#layerlist tr.layersel').prevAll().length; var curIndex = $('#layerlist option:selected').prevAll().length;
var total = $('#layerlist tr.layer').length; var total = $('#layerlist option').length;
if (curIndex < total-1) { if (curIndex < total-1) {
curIndex++; curIndex++;
svgCanvas.setCurrentLayerPosition(total-curIndex-1); svgCanvas.setCurrentLayerPosition(total-curIndex-1);
populateLayers(); populateLayers();
$('#layerlist tr.layer').removeClass("layersel"); $('#layerlist option').removeAttr("selected");
$('#layerlist tr.layer:eq('+curIndex+')').addClass("layersel"); $('#layerlist option:eq('+curIndex+')').attr("selected", "selected");
} }
}); });
$('#layer_rename').click(function() { $('#layer_rename').click(function() {
var curIndex = $('#layerlist tr.layersel').prevAll().length; var curIndex = $('#layerlist option:selected').prevAll().length;
var oldName = $('#layerlist tr.layersel td.layername').text(); var oldName = $('#layerlist option:selected').attr("value");
var newName = prompt("Please enter the new layer name",""); var newName = prompt("Please enter the new layer name","");
if (!newName) return; if (!newName) return;
if (oldName == newName) { if (oldName == newName) {
@@ -1163,56 +1162,34 @@ function svg_edit_setup() {
svgCanvas.renameCurrentLayer(newName); svgCanvas.renameCurrentLayer(newName);
populateLayers(); populateLayers();
$('#layerlist tr.layer').removeClass("layersel"); $('#layerlist option').removeAttr("selected");
$('#layerlist tr.layer:eq('+curIndex+')').addClass("layersel"); $('#layerlist option:eq('+curIndex+')').attr("selected", "selected");
}); });
var populateLayers = function(){ var populateLayers = function(){
var layerlist = $('#layerlist tbody'); $('#layerlist').empty();
layerlist.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--) {
var name = svgCanvas.getLayer(layer); var name = svgCanvas.getLayer(layer);
// contenteditable=\"true\" $('#layerlist').append("<option value=\"" + name + "\">" + name + "</option>");
if (svgCanvas.getLayerVisibility(name)) {
layerlist.append("<tr class=\"layer\"><td class=\"layervis\"/><td class=\"layername\" >" + name + "</td></tr>");
}
else {
layerlist.append("<tr class=\"layer\"><td class=\"layervis layerinvis\"/><td class=\"layername\" >" + name + "</td></tr>");
}
} }
// 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)
if (layerlist.size() == 1) { if ($('#layerlist').size() == 1) {
$('#layerlist tr:first').addClass("layersel"); $('#layerlist option:first').attr("selected", "selected");
} }
// handle selection of layer $('#layerlist option').mouseup(function(evt){
$('#layerlist td.layername').click(function(evt){ $('#layerlist option').removeAttr("selected");
$('#layerlist tr.layer').removeClass("layersel"); var option = $(this);
var row = $(this.parentNode); option.attr("selected", "selected");
row.addClass("layersel"); svgCanvas.setCurrentLayer(option.attr("value"));
svgCanvas.setCurrentLayer(this.textContent); }).click(function(evt) {
var container = document.getElementById("layerlist");
// var mouse_x = evt.pageX - container.boxObject.x;
// var mouse_y = evt.pageY - container.boxObject.y;
// mouse_x, mouse_y contain the relative x,y position of the click
}); });
$('#layerlist td.layervis').click(function(evt){
var row = $(this.parentNode).prevAll().length;
var name = $('#layerlist tr.layer:eq(' + row + ') td.layername').text();
var vis = $(this).hasClass('layerinvis');
svgCanvas.setLayerVisibility(name, vis);
if (vis) {
$(this).removeClass('layerinvis');
}
else {
$(this).addClass('layerinvis');
}
});
// if there were too few rows, let's add a few to make it not so lonely
var num = 5 - $('#layerlist tr.layer').size();
while (num-- > 0) {
// FIXME: there must a better way to do this
layerlist.append("<tr><td style=\"color:white\">_</td><td/></tr>");
}
}; };
populateLayers(); populateLayers();

15
opera-widget/index.html
View File

@@ -2,9 +2,22 @@
<head> <head>
<title>SVG Edit</title> <title>SVG Edit</title>
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="style.css">
<script>
/** this method adds the script that overrides the default open/save handlers */
function addHandlers()
{
var cdoc = document.getElementById("container").contentDocument;
if(cdoc)
{
var scriptelm = cdoc.createElement("script");
scriptelm.src = "../handlers.js";
cdoc.getElementsByTagName("head")[0].appendChild(scriptelm);
}
}
</script>
</head> </head>
<body> <body>
<object id="container" data="editor/svg-editor.html"> <object id="container" data="editor/svg-editor.html" onload="addHandlers()">
Failed to load for some reason. Failed to load for some reason.
</object> </object>
</body> </body>