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

Various JavaScript optimizations in svg-editor.js 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@441 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2009-08-21 15:35:55 +00:00
parent 2eea448e9a
commit 841d82e0a4
2 changed files with 67 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/svg-editor.html
View File

@ -101,11 +101,11 @@
<label class="rect_tool">y:</label> <label class="rect_tool">y:</label>
<input id="rect_y" class="rect_tool attr_changer" title="Change rectangle Y coordinate" alt="y" size="3"/> <input id="rect_y" class="rect_tool attr_changer" title="Change rectangle Y coordinate" alt="y" size="3"/>
<label class="rect_tool">width:</label> <label class="rect_tool">width:</label>
<input id="rect_w" class="rect_tool attr_changer" title="Change rectangle width" alt="width" size="3"/> <input id="rect_width" class="rect_tool attr_changer" title="Change rectangle width" alt="width" size="3"/>
<label class="rect_tool">height:</label> <label class="rect_tool">height:</label>
<input id="rect_h" class="rect_tool attr_changer" title="Change rectangle height" alt="height" size="3"/> <input id="rect_height" class="rect_tool attr_changer" title="Change rectangle height" alt="height" size="3"/>
<label class="rect_tool">Corner Radius:</label> <label class="rect_tool">Corner Radius:</label>
<input id="rect_radius" size="3" value="0" class="rect_tool" type="text" title="Change Rectangle Corner Radius" alt="Corner Radius"/> <input id="rect_rx" size="3" value="0" class="rect_tool" type="text" title="Change Rectangle Corner Radius" alt="Corner Radius"/>
</div> </div>
<div id="circle_panel"> <div id="circle_panel">

149
editor/svg-editor.js
View File

@ -4,9 +4,10 @@ if(!window.console) {
this.dir = function(str) {}; this.dir = function(str) {};
}; };
} }
var palette = ["#000000","#202020","#404040","#606060","#808080","#a0a0a0","#c0c0c0","#e0e0e0","#ffffff","#800000","#ff0000","#808000","#ffff00","#008000","#00ff00","#008080","#00ffff","#000080","#0000ff","#800080","#ff00ff","#2b0000","#550000","#800000","#aa0000","#d40000","#ff0000","#ff2a2a","#ff5555","#ff8080","#ffaaaa","#ffd5d5","#280b0b","#501616","#782121","#a02c2c","#c83737","#d35f5f","#de8787","#e9afaf","#f4d7d7","#241c1c","#483737","#6c5353","#916f6f","#ac9393","#c8b7b7","#e3dbdb","#2b1100","#552200","#803300","#aa4400","#d45500","#ff6600","#ff7f2a","#ff9955","#ffb380","#ffccaa","#ffe6d5","#28170b","#502d16","#784421","#a05a2c","#c87137","#d38d5f","#deaa87","#e9c6af","#f4e3d7","#241f1c","#483e37","#6c5d53","#917c6f","#ac9d93","#c8beb7","#e3dedb","#2b2200","#554400","#806600","#aa8800","#d4aa00","#ffcc00","#ffd42a","#ffdd55","#ffe680","#ffeeaa","#fff6d5","#28220b","#504416","#786721","#a0892c","#c8ab37","#d3bc5f","#decd87","#e9ddaf","#f4eed7","#24221c","#484537","#6c6753","#918a6f","#aca793","#c8c4b7","#e3e2db","#222b00","#445500","#668000","#88aa00","#aad400","#ccff00","#d4ff2a","#ddff55","#e5ff80","#eeffaa","#f6ffd5","#22280b","#445016","#677821","#89a02c","#abc837","#bcd35f","#cdde87","#dde9af","#eef4d7","#22241c","#454837","#676c53","#8a916f","#a7ac93","#c4c8b7","#e2e3db","#112b00","#225500","#338000","#44aa00","#55d400","#66ff00","#7fff2a","#99ff55","#b3ff80","#ccffaa","#e5ffd5","#17280b","#2d5016","#447821","#5aa02c","#71c837","#8dd35f","#aade87","#c6e9af","#e3f4d7","#1f241c","#3e4837","#5d6c53","#7c916f","#9dac93","#bec8b7","#dee3db","#002b00","#005500","#008000","#00aa00","#00d400","#00ff00","#2aff2a","#55ff55","#80ff80","#aaffaa","#d5ffd5","#0b280b","#165016","#217821","#2ca02c","#37c837","#5fd35f","#87de87","#afe9af","#d7f4d7","#1c241c","#374837","#536c53","#6f916f","#93ac93","#b7c8b7","#dbe3db","#002b11","#005522","#008033","#00aa44","#00d455","#00ff66","#2aff80","#55ff99","#80ffb3","#aaffcc","#d5ffe6","#0b2817","#16502d","#217844","#2ca05a","#37c871","#5fd38d","#87deaa","#afe9c6","#d7f4e3","#1c241f","#37483e","#536c5d","#6f917c","#93ac9d","#b7c8be","#dbe3de","#002b22","#005544","#008066","#00aa88","#00d4aa","#00ffcc","#2affd5","#55ffdd","#80ffe6","#aaffee","#d5fff6","#0b2822","#165044","#217867","#2ca089","#37c8ab","#5fd3bc","#87decd","#afe9dd","#d7f4ee","#1c2422","#374845","#536c67","#6f918a","#93aca7","#b7c8c4","#dbe3e2","#00222b","#004455","#006680","#0088aa","#00aad4","#00ccff","#2ad4ff","#55ddff","#80e5ff","#aaeeff","#d5f6ff","#0b2228","#164450","#216778","#2c89a0","#37abc8","#5fbcd3","#87cdde","#afdde9","#d7eef4","#1c2224","#374548","#53676c","#6f8a91","#93a7ac","#b7c4c8","#dbe2e3","#00112b","#002255","#003380","#0044aa","#0055d4","#0066ff","#2a7fff","#5599ff","#80b3ff","#aaccff","#d5e5ff","#0b1728","#162d50","#214478","#2c5aa0","#3771c8","#5f8dd3","#87aade","#afc6e9","#d7e3f4","#1c1f24","#373e48","#535d6c","#6f7c91","#939dac","#b7bec8","#dbdee3","#00002b","#000055","#000080","#0000aa","#0000d4","#0000ff","#2a2aff","#5555ff","#8080ff","#aaaaff","#d5d5ff","#0b0b28","#161650","#212178","#2c2ca0","#3737c8","#5f5fd3","#8787de","#afafe9","#d7d7f4","#1c1c24","#373748","#53536c","#6f6f91","#9393ac","#b7b7c8","#dbdbe3","#11002b","#220055","#330080","#4400aa","#5500d4","#6600ff","#7f2aff","#9955ff","#b380ff","#ccaaff","#e5d5ff","#170b28","#2d1650","#442178","#5a2ca0","#7137c8","#8d5fd3","#aa87de","#c6afe9","#e3d7f4","#1f1c24","#3e3748","#5d536c","#7c6f91","#9d93ac","#beb7c8","#dedbe3","#22002b","#440055","#660080","#8800aa","#aa00d4","#cc00ff","#d42aff","#dd55ff","#e580ff","#eeaaff","#f6d5ff","#220b28","#441650","#672178","#892ca0","#ab37c8","#bc5fd3","#cd87de","#ddafe9","#eed7f4","#221c24","#453748","#67536c","#8a6f91","#a793ac","#c4b7c8","#e2dbe3","#2b0022","#550044","#800066","#aa0088","#d400aa","#ff00cc","#ff2ad4","#ff55dd","#ff80e5","#ffaaee","#ffd5f6","#280b22","#501644","#782167","#a02c89","#c837ab","#d35fbc","#de87cd","#e9afdd","#f4d7ee","#241c22","#483745","#6c5367","#916f8a","#ac93a7","#c8b7c4","#e3dbe2","#2b0011","#550022","#800033","#aa0044","#d40055","#ff0066","#ff2a7f","#ff5599","#ff80b2","#ffaacc","#ffd5e5","#280b17","#50162d","#782144","#a02c5a","#c83771","#d35f8d","#de87aa","#e9afc6","#f4d7e3","#241c1f","#48373e","#6c535d","#916f7c","#ac939d","#c8b7be","#e3dbde"]
function svg_edit_setup() { function svg_edit_setup() {
var palette = ["#000000","#202020","#404040","#606060","#808080","#a0a0a0","#c0c0c0","#e0e0e0","#ffffff","#800000","#ff0000","#808000","#ffff00","#008000","#00ff00","#008080","#00ffff","#000080","#0000ff","#800080","#ff00ff","#2b0000","#550000","#800000","#aa0000","#d40000","#ff0000","#ff2a2a","#ff5555","#ff8080","#ffaaaa","#ffd5d5","#280b0b","#501616","#782121","#a02c2c","#c83737","#d35f5f","#de8787","#e9afaf","#f4d7d7","#241c1c","#483737","#6c5353","#916f6f","#ac9393","#c8b7b7","#e3dbdb","#2b1100","#552200","#803300","#aa4400","#d45500","#ff6600","#ff7f2a","#ff9955","#ffb380","#ffccaa","#ffe6d5","#28170b","#502d16","#784421","#a05a2c","#c87137","#d38d5f","#deaa87","#e9c6af","#f4e3d7","#241f1c","#483e37","#6c5d53","#917c6f","#ac9d93","#c8beb7","#e3dedb","#2b2200","#554400","#806600","#aa8800","#d4aa00","#ffcc00","#ffd42a","#ffdd55","#ffe680","#ffeeaa","#fff6d5","#28220b","#504416","#786721","#a0892c","#c8ab37","#d3bc5f","#decd87","#e9ddaf","#f4eed7","#24221c","#484537","#6c6753","#918a6f","#aca793","#c8c4b7","#e3e2db","#222b00","#445500","#668000","#88aa00","#aad400","#ccff00","#d4ff2a","#ddff55","#e5ff80","#eeffaa","#f6ffd5","#22280b","#445016","#677821","#89a02c","#abc837","#bcd35f","#cdde87","#dde9af","#eef4d7","#22241c","#454837","#676c53","#8a916f","#a7ac93","#c4c8b7","#e2e3db","#112b00","#225500","#338000","#44aa00","#55d400","#66ff00","#7fff2a","#99ff55","#b3ff80","#ccffaa","#e5ffd5","#17280b","#2d5016","#447821","#5aa02c","#71c837","#8dd35f","#aade87","#c6e9af","#e3f4d7","#1f241c","#3e4837","#5d6c53","#7c916f","#9dac93","#bec8b7","#dee3db","#002b00","#005500","#008000","#00aa00","#00d400","#00ff00","#2aff2a","#55ff55","#80ff80","#aaffaa","#d5ffd5","#0b280b","#165016","#217821","#2ca02c","#37c837","#5fd35f","#87de87","#afe9af","#d7f4d7","#1c241c","#374837","#536c53","#6f916f","#93ac93","#b7c8b7","#dbe3db","#002b11","#005522","#008033","#00aa44","#00d455","#00ff66","#2aff80","#55ff99","#80ffb3","#aaffcc","#d5ffe6","#0b2817","#16502d","#217844","#2ca05a","#37c871","#5fd38d","#87deaa","#afe9c6","#d7f4e3","#1c241f","#37483e","#536c5d","#6f917c","#93ac9d","#b7c8be","#dbe3de","#002b22","#005544","#008066","#00aa88","#00d4aa","#00ffcc","#2affd5","#55ffdd","#80ffe6","#aaffee","#d5fff6","#0b2822","#165044","#217867","#2ca089","#37c8ab","#5fd3bc","#87decd","#afe9dd","#d7f4ee","#1c2422","#374845","#536c67","#6f918a","#93aca7","#b7c8c4","#dbe3e2","#00222b","#004455","#006680","#0088aa","#00aad4","#00ccff","#2ad4ff","#55ddff","#80e5ff","#aaeeff","#d5f6ff","#0b2228","#164450","#216778","#2c89a0","#37abc8","#5fbcd3","#87cdde","#afdde9","#d7eef4","#1c2224","#374548","#53676c","#6f8a91","#93a7ac","#b7c4c8","#dbe2e3","#00112b","#002255","#003380","#0044aa","#0055d4","#0066ff","#2a7fff","#5599ff","#80b3ff","#aaccff","#d5e5ff","#0b1728","#162d50","#214478","#2c5aa0","#3771c8","#5f8dd3","#87aade","#afc6e9","#d7e3f4","#1c1f24","#373e48","#535d6c","#6f7c91","#939dac","#b7bec8","#dbdee3","#00002b","#000055","#000080","#0000aa","#0000d4","#0000ff","#2a2aff","#5555ff","#8080ff","#aaaaff","#d5d5ff","#0b0b28","#161650","#212178","#2c2ca0","#3737c8","#5f5fd3","#8787de","#afafe9","#d7d7f4","#1c1c24","#373748","#53536c","#6f6f91","#9393ac","#b7b7c8","#dbdbe3","#11002b","#220055","#330080","#4400aa","#5500d4","#6600ff","#7f2aff","#9955ff","#b380ff","#ccaaff","#e5d5ff","#170b28","#2d1650","#442178","#5a2ca0","#7137c8","#8d5fd3","#aa87de","#c6afe9","#e3d7f4","#1f1c24","#3e3748","#5d536c","#7c6f91","#9d93ac","#beb7c8","#dedbe3","#22002b","#440055","#660080","#8800aa","#aa00d4","#cc00ff","#d42aff","#dd55ff","#e580ff","#eeaaff","#f6d5ff","#220b28","#441650","#672178","#892ca0","#ab37c8","#bc5fd3","#cd87de","#ddafe9","#eed7f4","#221c24","#453748","#67536c","#8a6f91","#a793ac","#c4b7c8","#e2dbe3","#2b0022","#550044","#800066","#aa0088","#d400aa","#ff00cc","#ff2ad4","#ff55dd","#ff80e5","#ffaaee","#ffd5f6","#280b22","#501644","#782167","#a02c89","#c837ab","#d35fbc","#de87cd","#e9afdd","#f4d7ee","#241c22","#483745","#6c5367","#916f8a","#ac93a7","#c8b7c4","#e3dbe2","#2b0011","#550022","#800033","#aa0044","#d40055","#ff0066","#ff2a7f","#ff5599","#ff80b2","#ffaacc","#ffd5e5","#280b17","#50162d","#782144","#a02c5a","#c83771","#d35f8d","#de87aa","#e9afc6","#f4d7e3","#241c1f","#48373e","#6c535d","#916f7c","#ac939d","#c8b7be","#e3dbde"]
var isMac = false; //(navigator.platform.indexOf("Mac") != -1); var isMac = false; //(navigator.platform.indexOf("Mac") != -1);
var modKey = ""; //(isMac ? "meta+" : "ctrl+"); var modKey = ""; //(isMac ? "meta+" : "ctrl+");
var svgCanvas = new SvgCanvas(document.getElementById("svgcanvas")); var svgCanvas = new SvgCanvas(document.getElementById("svgcanvas"));
@ -131,28 +132,27 @@ function svg_edit_setup() {
fillOpacity *= 100; fillOpacity *= 100;
strokeOpacity *= 100; strokeOpacity *= 100;
// update the editor's fill paint var getPaint = function(color, opac) {
if (fillColor.substr(0,5) == "url(#") { // update the editor's fill paint
fillPaint = new $.jGraduate.Paint({alpha: fillOpacity, var opts = null;
linearGradient: document.getElementById(fillColor.substr(5,fillColor.length-6))});
} if (color.substr(0,5) == "url(#") {
else if (fillColor.substr(0,1) == "#") { opts = {
fillPaint = new $.jGraduate.Paint({alpha: fillOpacity, solidColor: fillColor.substr(1)}); alpha: opac,
} linearGradient: document.getElementById(color.substr(5,color.length-6))
else { };
fillPaint = new $.jGraduate.Paint(); }
else if (color.substr(0,1) == "#") {
opts = {
alpha: opac,
solidColor: color.substr(1)
};
}
return new $.jGraduate.Paint(opts);
} }
if (strokeColor.substr(0,5) == "url(#") { fillPaint = getPaint(fillColor, fillOpacity);
strokePaint = new $.jGraduate.Paint({alpha: strokeOpacity, strokePaint = getPaint(strokeColor, strokeOpacity);
linearGradient: document.getElementById(strokeColor.substr(5,strokeColor.length-6))});
}
else if (strokeColor.substr(0,1) == "#") {
strokePaint = new $.jGraduate.Paint({alpha: strokeOpacity, solidColor: strokeColor.substr(1)});
}
else {
strokePaint = new $.jGraduate.Paint();
}
fillOpacity = fillOpacity + " %"; fillOpacity = fillOpacity + " %";
strokeOpacity = strokeOpacity + " %"; strokeOpacity = strokeOpacity + " %";
@ -184,72 +184,51 @@ function svg_edit_setup() {
// updates the context panel tools based on the selected element // updates the context panel tools based on the selected element
var updateContextPanel = function() { var updateContextPanel = function() {
var elem = selectedElement; var elem = selectedElement;
$('#selected_panel').hide(); $('#selected_panel, #multiselected_panel, #rect_panel, #circle_panel,\
$('#multiselected_panel').hide(); #ellipse_panel, #line_panel, #text_panel').hide();
$('#rect_panel').hide();
$('#circle_panel').hide();
$('#ellipse_panel').hide();
$('#line_panel').hide();
$('#text_panel').hide();
if (elem != null) { if (elem != null) {
$('#angle').val(svgCanvas.getRotationAngle(elem)); $('#angle').val(svgCanvas.getRotationAngle(elem));
$('#selected_panel').show(); $('#selected_panel').show();
// update contextual tools here // update contextual tools here
switch(elem.tagName) { var panels = {
case "rect": rect: ['radius','x','y','width','height'],
$('#rect_panel').show(); circle: ['cx','cy','r'],
$('#rect_radius').val(elem.getAttribute("rx")||0); ellipse: ['cx','cy','rx','ry'],
$('#rect_x').val(elem.getAttribute("x")||0); line: ['x1','y1','x2','y2'],
$('#rect_y').val(elem.getAttribute("y")||0); text: ['x','y']
$('#rect_w').val(elem.getAttribute("width")||0); };
$('#rect_h').val(elem.getAttribute("height")||0);
break; var el_name = elem.tagName;
case "circle": var cur_panel = panels[el_name];
$('#circle_panel').show(); $('#' + el_name + '_panel').show();
$('#circle_cx').val(elem.getAttribute("cx")||0);
$('#circle_cy').val(elem.getAttribute("cy")||0); $.each(cur_panel, function(i, item) {
$('#circle_r').val(elem.getAttribute("r")||0); $('#' + el_name + '_' + item).val(elem.getAttribute(item) || 0);
break; });
case "ellipse":
$('#ellipse_panel').show(); if(el_name == 'text') {
$('#ellipse_cx').val(elem.getAttribute("cx")||0); $('#text_panel').css("display", "inline");
$('#ellipse_cy').val(elem.getAttribute("cy")||0); if (svgCanvas.getItalic()) {
$('#ellipse_rx').val(elem.getAttribute("rx")||0); $('#tool_italic').addClass('tool_button_current');
$('#ellipse_ry').val(elem.getAttribute("ry")||0); }
break; else {
case "line": $('#tool_italic').removeClass('tool_button_current');
$('#line_panel').show(); }
$('#line_x1').val(elem.getAttribute("x1")||0); if (svgCanvas.getBold()) {
$('#line_y1').val(elem.getAttribute("y1")||0); $('#tool_bold').addClass('tool_button_current');
$('#line_x2').val(elem.getAttribute("x2")||0); }
$('#line_y2').val(elem.getAttribute("y2")||0); else {
break; $('#tool_bold').removeClass('tool_button_current');
case "text": }
// jquery's show() always sets display to block $('#font_family').val(elem.getAttribute("font-family"));
$('#text_panel').show().css("display", "inline"); $('#font_size').val(elem.getAttribute("font-size"));
$('#text_x').val(elem.getAttribute("x")||0); $('#text').val(elem.textContent);
$('#text_y').val(elem.getAttribute("y")||0); if (svgCanvas.addedNew) {
if (svgCanvas.getItalic()) { $('#text').focus().select();
$('#tool_italic').addClass('tool_button_current'); }
}
else { }
$('#tool_italic').removeClass('tool_button_current');
}
if (svgCanvas.getBold()) {
$('#tool_bold').addClass('tool_button_current');
}
else {
$('#tool_bold').removeClass('tool_button_current');
}
$('#font_family').val(elem.getAttribute("font-family"));
$('#font_size').val(elem.getAttribute("font-size"));
$('#text').val(elem.textContent);
if (svgCanvas.addedNew) {
$('#text').focus();
$('#text').select();
}
break;
} // switch
} // if (elem != null) } // if (elem != null)
else if (multiselected) { else if (multiselected) {
$('#multiselected_panel').show(); $('#multiselected_panel').show();
@ -870,7 +849,7 @@ function svg_edit_setup() {
}); });
if(!found) $('#resolution').val('Custom'); if(!found) $('#resolution').val('Custom');
$('#svgcanvas').css( { 'width': x+'px', 'height': y+'px' } ); $('#svgcanvas').css( { 'width': x, 'height': y } );
} }
$('#resolution').change(function(){ $('#resolution').change(function(){
@ -896,7 +875,7 @@ function svg_edit_setup() {
svgCanvas.setResolution(x,y); svgCanvas.setResolution(x,y);
}); });
$('#rect_radius').SpinButton({ min: 0, max: 1000, step: 1, callback: changeRectRadius }); $('#rect_rx').SpinButton({ min: 0, max: 1000, step: 1, callback: changeRectRadius });
$('#stroke_width').SpinButton({ min: 1, max: 99, step: 1, callback: changeStrokeWidth }); $('#stroke_width').SpinButton({ min: 1, max: 99, step: 1, callback: changeStrokeWidth });
$('#angle').SpinButton({ min: -359, max: 359, step: 5, callback: changeRotationAngle }); $('#angle').SpinButton({ min: -359, max: 359, step: 5, callback: changeRotationAngle });