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

added missing radix and misc formatting 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2466 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Bruno Heridet 2013-02-23 18:56:45 +00:00
parent 4cdacdc168
commit 78cb0e48bb
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editor/svg-editor.js
View File

@ -2627,13 +2627,12 @@
var showSourceEditor = function(e, forSaving){ var showSourceEditor = function(e, forSaving){
if (editingsource) return; if (editingsource) return;
editingsource = true;
editingsource = true;
origSource = svgCanvas.getSvgString();
$('#save_output_btns').toggle(!!forSaving); $('#save_output_btns').toggle(!!forSaving);
$('#tool_source_back').toggle(!forSaving); $('#tool_source_back').toggle(!forSaving);
$('#svg_source_textarea').val(origSource);
var str = origSource = svgCanvas.getSvgString();
$('#svg_source_textarea').val(str);
$('#svg_source_editor').fadeIn(); $('#svg_source_editor').fadeIn();
$('#svg_source_textarea').focus(); $('#svg_source_textarea').focus();
}; };
@ -2842,7 +2841,7 @@
var s = sides[i]; var s = sides[i];
var cur = el.data('orig_margin-' + s); var cur = el.data('orig_margin-' + s);
if (cur == null) { if (cur == null) {
cur = parseInt(el.css('margin-' + s)); cur = parseInt(el.css('margin-' + s), 10);
// Cache the original margin // Cache the original margin
el.data('orig_margin-' + s, cur); el.data('orig_margin-' + s, cur);
} }
@ -2861,7 +2860,7 @@
var setIconSize = Editor.setIconSize = function(size, force) { var setIconSize = Editor.setIconSize = function(size, force) {
if (size == curPrefs.size && !force) return; if (size == curPrefs.size && !force) return;
// return;
// var elems = $('.tool_button, .push_button, .tool_button_current, .disabled, .icon_label, #url_notice, #tool_open'); // var elems = $('.tool_button, .push_button, .tool_button_current, .disabled, .icon_label, #url_notice, #tool_open');
var sel_toscale = '#tools_top .toolset, #editor_panel > *, #history_panel > *,\ var sel_toscale = '#tools_top .toolset, #editor_panel > *, #history_panel > *,\
#main_button, #tools_left > *, #path_node_panel > *, #multiselected_panel > *,\ #main_button, #tools_left > *, #path_node_panel > *, #multiselected_panel > *,\
@ -2887,7 +2886,7 @@
// console.log('l', $(this).css('left')); // console.log('l', $(this).css('left'));
// }); // });
// var scale = .75;//0.75; // var scale = .75;
var hidden_ps = elems.parents(':hidden'); var hidden_ps = elems.parents(':hidden');
hidden_ps.css('visibility', 'hidden').show(); hidden_ps.css('visibility', 'hidden').show();
@ -3116,8 +3115,7 @@
if (svgedit.browser.isIE()) { if (svgedit.browser.isIE()) {
(function() { (function() {
resetScrollPos = function() { resetScrollPos = function() {
if (workarea[0].scrollLeft === 0 if (workarea[0].scrollLeft === 0 && workarea[0].scrollTop === 0) {
&& workarea[0].scrollTop === 0) {
workarea[0].scrollLeft = curScrollPos.left; workarea[0].scrollLeft = curScrollPos.left;
workarea[0].scrollTop = curScrollPos.top; workarea[0].scrollTop = curScrollPos.top;
} }
@ -3213,7 +3211,7 @@
var i = shortcutButtons.length; var i = shortcutButtons.length;
while (i--) { while (i--) {
var button = document.getElementById(shortcutButtons[i]); var button = document.getElementById(shortcutButtons[i]);
if (button != null) { if (button) {
var title = button.title; var title = button.title;
var index = title.indexOf('Ctrl+'); var index = title.indexOf('Ctrl+');
button.title = [title.substr(0, index), 'Cmd+', title.substr(index + 5)].join(''); button.title = [title.substr(0, index), 'Cmd+', title.substr(index + 5)].join('');