Merge remote branch 'origin/master'

This commit is contained in:
Jonathan Puckey 2011-05-08 17:33:42 +01:00
commit 5ddb8e22d3
2 changed files with 4 additions and 2 deletions

View file

@ -287,8 +287,10 @@
var layer = document.activeLayer; var layer = document.activeLayer;
function onKeyDown(event) { function onKeyDown(event) {
if (event.key == 'space') if (event.key == 'space') {
layer.selected = !layer.selected; layer.selected = !layer.selected;
return false;
}
} }
</script> </script>
<style> <style>

View file

@ -127,7 +127,7 @@ var ToolEvent = this.ToolEvent = Base.extend({
// Instead, keep calculating the delta each time, so the result can be // Instead, keep calculating the delta each time, so the result can be
// directly modified by the script without changing the internal values. // directly modified by the script without changing the internal values.
// We could cache this and use clone, but this is almost as fast... // We could cache this and use clone, but this is almost as fast...
return this._delta && this.tool.lastPoint return !this._delta && this.tool.lastPoint
? this.tool.point.subtract(this.tool.lastPoint) ? this.tool.point.subtract(this.tool.lastPoint)
: this._delta; : this._delta;
}, },