|
@@ -920,11 +920,14 @@
|
|
|
|
|
|
var timer;
|
|
var timer;
|
|
|
|
|
|
|
|
+ var pos = $(show_sel).position();
|
|
|
|
+ $(hold_sel).css({'left': pos.left+34, 'top': pos.top+77});
|
|
|
|
+
|
|
// Clicking the "show" icon should set the current mode
|
|
// Clicking the "show" icon should set the current mode
|
|
shower.mousedown(function(evt) {
|
|
shower.mousedown(function(evt) {
|
|
if(shower.hasClass('disabled')) return false;
|
|
if(shower.hasClass('disabled')) return false;
|
|
- var holder = $(show_sel.replace('_show',''));
|
|
|
|
- var l = holder[0].style.left;
|
|
|
|
|
|
+ var holder = $(hold_sel);
|
|
|
|
+ var l = pos.left+34;
|
|
var w = holder.width()*-1;
|
|
var w = holder.width()*-1;
|
|
var time = holder.data('shown_popop')?200:0;
|
|
var time = holder.data('shown_popop')?200:0;
|
|
timer = setTimeout(function() {
|
|
timer = setTimeout(function() {
|
|
@@ -953,9 +956,6 @@
|
|
});
|
|
});
|
|
|
|
|
|
// $('#tools_rect').mouseleave(function(){$('#tools_rect').fadeOut();});
|
|
// $('#tools_rect').mouseleave(function(){$('#tools_rect').fadeOut();});
|
|
-
|
|
|
|
- var pos = $(show_sel).position();
|
|
|
|
- $(hold_sel).css({'left': pos.left+34, 'top': pos.top+77});
|
|
|
|
});
|
|
});
|
|
|
|
|
|
setFlyoutTitles();
|
|
setFlyoutTitles();
|
|
@@ -2142,6 +2142,7 @@
|
|
// Made public for UI customization.
|
|
// Made public for UI customization.
|
|
// TODO: Group UI functions into a public svgEditor.ui interface.
|
|
// TODO: Group UI functions into a public svgEditor.ui interface.
|
|
Editor.addDropDown = function(elem, callback, dropUp) {
|
|
Editor.addDropDown = function(elem, callback, dropUp) {
|
|
|
|
+ if ($(elem).length == 0) return; // Quit if called on non-existant element
|
|
var button = $(elem).find('button');
|
|
var button = $(elem).find('button');
|
|
var list = $(elem).find('ul').attr('id', $(elem)[0].id + '-list');
|
|
var list = $(elem).find('ul').attr('id', $(elem)[0].id + '-list');
|
|
|
|
|
|
@@ -3282,8 +3283,15 @@
|
|
|
|
|
|
(function() {
|
|
(function() {
|
|
workarea.scroll(function() {
|
|
workarea.scroll(function() {
|
|
- $('#ruler_x')[0].scrollLeft = workarea[0].scrollLeft;
|
|
|
|
- $('#ruler_y')[0].scrollTop = workarea[0].scrollTop;
|
|
|
|
|
|
+
|
|
|
|
+ // TODO: jQuery's scrollLeft/Top() wouldn't require a null check
|
|
|
|
+
|
|
|
|
+ if ($('#ruler_x').length != 0) {
|
|
|
|
+ $('#ruler_x')[0].scrollLeft = workarea[0].scrollLeft;
|
|
|
|
+ }
|
|
|
|
+ if ($('#ruler_y').length != 0) {
|
|
|
|
+ $('#ruler_y')[0].scrollTop = workarea[0].scrollTop;
|
|
|
|
+ }
|
|
});
|
|
});
|
|
|
|
|
|
}());
|
|
}());
|
|
@@ -3999,7 +4007,7 @@
|
|
{sel:'#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel,#tool_prefs_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true},
|
|
{sel:'#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel,#tool_prefs_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true},
|
|
{sel:'#tool_source_save', fn: saveSourceEditor, evt: 'click'},
|
|
{sel:'#tool_source_save', fn: saveSourceEditor, evt: 'click'},
|
|
{sel:'#tool_docprops_save', fn: saveDocProperties, evt: 'click'},
|
|
{sel:'#tool_docprops_save', fn: saveDocProperties, evt: 'click'},
|
|
- {sel:'#tool_docprops', fn: showDocProperties, evt: 'mouseup', key: ['D', true]},
|
|
|
|
|
|
+ {sel:'#tool_docprops', fn: showDocProperties, evt: 'mouseup'},
|
|
{sel:'#tool_prefs_save', fn: savePreferences, evt: 'click'},
|
|
{sel:'#tool_prefs_save', fn: savePreferences, evt: 'click'},
|
|
{sel:'#tool_prefs_option', fn: function() {showPreferences();return false}, evt: 'mouseup'},
|
|
{sel:'#tool_prefs_option', fn: function() {showPreferences();return false}, evt: 'mouseup'},
|
|
{sel:'#tool_delete,#tool_delete_multi', fn: deleteSelected, evt: 'click', key: ['del/backspace', true]},
|
|
{sel:'#tool_delete,#tool_delete_multi', fn: deleteSelected, evt: 'click', key: ['del/backspace', true]},
|
|
@@ -4232,8 +4240,9 @@
|
|
}
|
|
}
|
|
|
|
|
|
$('#rulers').toggle(!!curConfig.showRulers);
|
|
$('#rulers').toggle(!!curConfig.showRulers);
|
|
- $('#show_rulers')[0].checked = curConfig.showRulers;
|
|
|
|
-
|
|
|
|
|
|
+ if(curConfig.showRulers) {
|
|
|
|
+ $('#show_rulers')[0].checked = true;
|
|
|
|
+ }
|
|
if(curConfig.gridSnapping) {
|
|
if(curConfig.gridSnapping) {
|
|
$('#grid_snapping_on')[0].checked = true;
|
|
$('#grid_snapping_on')[0].checked = true;
|
|
}
|
|
}
|