diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index e6c8523f..5f7bcf85 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -542,7 +542,7 @@
btn_holder = $('#dialog_buttons'),
dbox = function(type, msg, callback, defText) {
- $('#dialog_content').html(''+msg.replace(/\n/g,'
')+'
')
+ $('#dialog_content').html(''+msg.replace(/\n/g, '
')+'
')
.toggleClass('prompt', (type == 'prompt'));
btn_holder.empty();
@@ -962,7 +962,7 @@
clearTimeout(timer);
var opt = $(this).attr('data-curopt');
// Is library and popped up, so do nothing
- if (shower.data('isLibrary') && $(show_sel.replace('_show','')).is(':visible')) {
+ if (shower.data('isLibrary') && $(show_sel.replace('_show', '')).is(':visible')) {
toolButtonClick(show_sel, true);
return;
}
@@ -1194,7 +1194,7 @@
// Create a flyout menu if there isn't one already
if (!ref_btn.parent().hasClass('tools_flyout')) {
// Create flyout placeholder
- var tls_id = ref_btn[0].id.replace('tool_','tools_');
+ var tls_id = ref_btn[0].id.replace('tool_', 'tools_');
var show_btn = ref_btn.clone()
.attr('id',tls_id + '_show')
.append($('', {'class': 'flyout_arrow_horiz'}));
@@ -1419,7 +1419,6 @@
default:
paintBox.fill.update(true);
paintBox.stroke.update(true);
- //console.log(paintBox.fill);
$('#stroke_width').val(selectedElement.getAttribute('stroke-width') || 1);
$('#stroke_style').val(selectedElement.getAttribute('stroke-dasharray') || 'none');
@@ -1494,10 +1493,8 @@
#ellipse_panel, #line_panel, #text_panel, #image_panel, #container_panel, #use_panel, #a_panel').hide();
if (elem != null) {
var elname = elem.nodeName;
-
// If this is a link with no transform and one child, pretend
// its child is selected
-// console.log('go', elem)
// if (elname === 'a') { // && !$(elem).attr('transform')) {
// elem = elem.firstChild;
// }
@@ -1574,7 +1571,7 @@
if (point.type) {
seg_type.val(point.type).removeAttr('disabled');
} else {
- seg_type.val(4).attr('disabled','disabled');
+ seg_type.val(4).attr('disabled', 'disabled');
}
}
return;
@@ -1584,13 +1581,13 @@
var panels = {
g: [],
a: [],
- rect: ['rx','width','height'],
- image: ['width','height'],
- circle: ['cx','cy','r'],
- ellipse: ['cx','cy','rx','ry'],
- line: ['x1','y1','x2','y2'],
+ rect: ['rx', 'width', 'height'],
+ image: ['width', 'height'],
+ circle: ['cx', 'cy', 'r'],
+ ellipse: ['cx', 'cy', 'rx', 'ry'],
+ line: ['x1', 'y1', 'x2', 'y2'],
text: [],
- 'use': []
+ use: []
};
var el_name = elem.tagName;
@@ -1630,7 +1627,6 @@
var bv = elem[item].baseVal.value;
attrVal = svgedit.units.convertUnit(bv);
}
-
$('#' + el_name + '_' + item).val(attrVal || 0);
});
@@ -1653,7 +1649,7 @@
// Timeout needed for IE9
setTimeout(function() {
$('#text').focus().select();
- },100);
+ }, 100);
}
} // text
else if (el_name == 'image') {
@@ -2748,7 +2744,6 @@
$('#svg_docprops').show();
};
-
var showPreferences = function(){
if (preferences) return;
preferences = true;
@@ -2902,12 +2897,10 @@
console.log('NOTE: Icon image missing: ' + icon_id);
return;
}
-
$(elem).empty().append(icon);
};
- var ua_prefix;
- (ua_prefix = function() {
+ var uaPrefix = (function() {
var regex = /^(Moz|Webkit|Khtml|O|ms|Icab)(?=[A-Z])/;
var someScript = document.getElementsByTagName('script')[0];
for (var prop in someScript.style) {
@@ -2917,34 +2910,28 @@
return prop.match(regex)[0];
}
}
-
// Nothing found so far?
if ('WebkitOpacity' in someScript.style) return 'Webkit';
if ('KhtmlOpacity' in someScript.style) return 'Khtml';
return '';
- }());
+ })();
var scaleElements = function(elems, scale) {
- var prefix = '-' + ua_prefix.toLowerCase() + '-';
-
+ var prefix = '-' + uaPrefix.toLowerCase() + '-';
var sides = ['top', 'left', 'bottom', 'right'];
elems.each(function() {
-// console.log('go', scale);
-
// Handled in CSS
- // this.style[ua_prefix + 'Transform'] = 'scale(' + scale + ')';
+ // this.style[uaPrefix + 'Transform'] = 'scale(' + scale + ')';
var el = $(this);
-
var w = el.outerWidth() * (scale - 1);
var h = el.outerHeight() * (scale - 1);
var margins = {};
for (var i = 0; i < 4; i++) {
var s = sides[i];
-
var cur = el.data('orig_margin-' + s);
if (cur == null) {
cur = parseInt(el.css('margin-' + s));
@@ -2968,14 +2955,11 @@
if (size == curPrefs.size && !force) return;
// return;
// var elems = $('.tool_button, .push_button, .tool_button_current, .disabled, .icon_label, #url_notice, #tool_open');
- console.log('size', size);
-
var sel_toscale = '#tools_top .toolset, #editor_panel > *, #history_panel > *,\
#main_button, #tools_left > *, #path_node_panel > *, #multiselected_panel > *,\
#g_panel > *, #tool_font_size > *, .tools_flyout';
var elems = $(sel_toscale);
-
var scale = 1;
if (typeof size == 'number') {
@@ -3007,7 +2991,6 @@
$.pref('iconsize', size);
$('#iconsize').val(size);
-
// Change icon size
// $('.tool_button, .push_button, .tool_button_current, .disabled, .icon_label, #url_notice, #tool_open')
// .find('> svg, > img').each(function() {
@@ -3163,8 +3146,8 @@
});
styleStr += '}';
});
- //this.style[ua_prefix + 'Transform'] = 'scale(' + scale + ')';
- var prefix = '-' + ua_prefix.toLowerCase() + '-';
+ //this.style[uaPrefix + 'Transform'] = 'scale(' + scale + ')';
+ var prefix = '-' + uaPrefix.toLowerCase() + '-';
styleStr += (sel_toscale + '{' + prefix + 'transform: scale(' + scale + ');}'
+ ' #svg_editor div.toolset .toolset {' + prefix + 'transform: scale(1); margin: 1px !important;}' // Hack for markers
+ ' #svg_editor .ui-slider {' + prefix + 'transform: scale(' + (1/scale) + ');}' // Hack for sliders
@@ -3422,11 +3405,8 @@
operaRepaint();
};
-
-
var PaintBox = function(container, type) {
var cur = curConfig[type === 'fill' ? 'initFill' : 'initStroke'];
-
// set up gradients to be used for the buttons
var svgdocbox = new DOMParser().parseFromString(
'