Merge branch 'master' of github.com:literallycanvas/literallycanvas

Author: irskep

src/core/actions.coffee

@@ -66,7 +66,7 @@ class AddShapeAction
       newShapes = []
       for shape in @lc.shapes
         newShapes.push(shape) if shape.id != @shape.id
-      lc.shapes = newShapes
+      @lc.shapes = newShapes
     @lc.repaintLayer('main')
 
 

src/core/canvasRenderer.coffee

@@ -90,7 +90,7 @@ defineCanvasRenderer 'SelectionBox', do ->
         shape._br.width + shape.margin * 2,
         shape._br.height + shape.margin * 2)
     ctx.lineWidth = 1
-    ctx.strokeStyle = '#000'
+    ctx.strokeStyle = shape.backgroundColor or '#000'
     ctx.setLineDash([2, 4])
     ctx.strokeRect(
       shape._br.x - shape.margin, shape._br.y - shape.margin,

src/reactGUI/UndoRedoButtons.coffee

@@ -3,6 +3,7 @@ DOM = require '../reactGUI/ReactDOMFactories-shim'
 createReactClass = require '../reactGUI/createReactClass-shim'
 createSetStateOnEventMixin = require './createSetStateOnEventMixin'
 {classSet} = require '../core/util'
+{_} = require '../core/localization'
 
 createUndoRedoButtonComponent = (undoOrRedo) -> createReactClass
   displayName: if undoOrRedo == 'undo' then 'UndoButton' else 'RedoButton'
@@ -26,7 +27,7 @@ createUndoRedoButtonComponent = (undoOrRedo) -> createReactClass
     {div, img} = DOM
     {lc, imageURLPrefix} = @props
     title = if undoOrRedo == 'undo' then 'Undo' else 'Redo'
-
+    title = _(title)
     className = "lc-#{undoOrRedo} " + classSet
       'toolbar-button': true
       'thin-button': true

src/reactGUI/ZoomButtons.coffee

@@ -3,6 +3,7 @@ DOM = require '../reactGUI/ReactDOMFactories-shim'
 createReactClass = require '../reactGUI/createReactClass-shim'
 createSetStateOnEventMixin = require './createSetStateOnEventMixin'
 {classSet} = require '../core/util'
+{_} = require '../core/localization'
 
 createZoomButtonComponent = (inOrOut) -> createReactClass
   displayName: if inOrOut == 'in' then 'ZoomInButton' else 'ZoomOutButton'
@@ -19,7 +20,7 @@ createZoomButtonComponent = (inOrOut) -> createReactClass
     {div, img} = DOM
     {lc, imageURLPrefix} = @props
     title = if inOrOut == 'in' then 'Zoom in' else 'Zoom out'
-
+    title = _(title)
     className = "lc-zoom-#{inOrOut} " + classSet
       'toolbar-button': true
       'thin-button': true

src/tools/Ellipse.coffee

@@ -20,4 +20,7 @@ module.exports = class Ellipse extends ToolWithStroke
     lc.drawShapeInProgress(@currentShape)
 
   end: (x, y, lc) ->
+    # If there is no height or width, dont save
+    if @currentShape.height == 0 or @currentShape.width == 0
+      return
     lc.saveShape(@currentShape)

src/tools/Line.coffee

@@ -24,4 +24,9 @@ module.exports = class Line extends ToolWithStroke
     lc.drawShapeInProgress(@currentShape)
 
   end: (x, y, lc) ->
+    # If start == end, dont save
+    sameX = @currentShape.x1 == @currentShape.x2
+    sameY = @currentShape.y1 == @currentShape.y2
+    if sameX and sameY
+      return
     lc.saveShape(@currentShape)

src/tools/Rectangle.coffee

@@ -19,4 +19,7 @@ module.exports = class Rectangle extends ToolWithStroke
     lc.drawShapeInProgress(@currentShape)
 
   end: (x, y, lc) ->
+    # If there is no height or width, dont save
+    if @currentShape.height == 0 or @currentShape.width == 0
+      return
     lc.saveShape(@currentShape)