diff --git a/editor/svg-editor.css b/editor/svg-editor.css index 82e101fd..2661c873 100644 --- a/editor/svg-editor.css +++ b/editor/svg-editor.css @@ -23,6 +23,7 @@ #svg_editor #svgroot { -moz-user-select: none; + -webkit-user-select: none; position: absolute; top: 0; left: 0; @@ -140,6 +141,9 @@ width: 0px; overflow: auto; margin: 0px; + -moz-user-select: none; + -webkit-user-select: none; + } /* @@ -162,6 +166,7 @@ -moz-border-radius: 5px; -webkit-border-radius: 5px; -moz-user-select: none; + -webkit-user-select: none; } #svg_editor #sidepanel_handle:hover { @@ -171,6 +176,7 @@ #svg_editor #sidepanel_handle * { cursor: pointer; -moz-user-select: none; + -webkit-user-select: none; } #svg_editor #layerbuttons { margin: 0px; @@ -768,6 +774,7 @@ span.zoom_tool { #svg_editor .stroke_tool div div { -moz-user-select: none; + -webkit-user-select: none; width: 20px; height: 20px; margin: 1px 0; diff --git a/editor/svg-editor.js b/editor/svg-editor.js index 44979278..8ad3aa54 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -2940,13 +2940,14 @@ var SIDEPANEL_MAXWIDTH = 300; var SIDEPANEL_OPENWIDTH = 150; - var sidedrag = -1, sidedragging = false; + var sidedrag = -1, sidedragging = false, allowmove = false; var resizePanel = function(evt) { + if (!allowmove) return; if (sidedrag == -1) return; sidedragging = true; var deltax = sidedrag - evt.pageX; - + var sidepanels = $('#sidepanels'); var sidewidth = parseInt(sidepanels.css('width')); if (sidewidth+deltax > SIDEPANEL_MAXWIDTH) { @@ -2971,7 +2972,11 @@ .mousedown(function(evt) { sidedrag = evt.pageX; $(window).mousemove(resizePanel); - + allowmove = false; + // Silly hack for Chrome, which always runs mousemove right after mousedown + setTimeout(function() { + allowmove = true; + }, 20); }) .mouseup(function(evt) { if (!sidedragging) toggleSidePanel();