Fix merge conflict and add bundle.js

Author: bmwwoo

app/controllers/MathSwipeController.coffee

@@ -60,7 +60,9 @@ class MathSwipeController
                         @goalContainer, @isMobile().any()?, Cell,
                         Colors, ClickHandler, SolutionService,
                         BoardSolvedService, RunningSum
-    ResetButton.bindClick @board
+
+    ResetButton.bindClick @board, RunningSum
+    RunningSum.empty()
     @createNewGame() unless ShareGameService.reloadPageWithHash(@board,
                                     solutionPlacements, SolutionService)
 

app/services/ClickHandler.coffee

@@ -17,8 +17,10 @@ class ClickHandler
       @checkForSolution()
       @unselectAll()
       if @BoardSolvedService.isCleared @board
-          TrackingService.boardEvent 'solved'
-          @board.successAnimation()
+        TrackingService.boardEvent 'solved'
+        @board.successAnimation()
+      else if @goalContainer.isEmpty()
+        @RunningSum.display @RunningSum.tilesEmptyString
     @mouseDown = false
 
   isMouseDown: ->
@@ -72,15 +74,15 @@ class ClickHandler
     false
 
   unselectAll: ->
-    @RunningSum.display ''
+    unless @RunningSum.runningSumElem.html() is @RunningSum.solutionOperatorString
+      @RunningSum.display @RunningSum.emptyString
     return if @clicked.length < 1
     for i in [@clicked.length - 1..0]
       @clicked[i].unselect()
     @clicked = []
 
   checkForSolution: () ->
     if @solutionService.isSolution()
-      @RunningSum.display ''
       @goalContainer.deleteGoal @solutionService.valueIndex
       @board.deleteCells @clickedToTuples()
       return true

app/services/ResetButton.coffee

@@ -2,9 +2,10 @@ $ = require 'jquery'
 
 class ResetButton
 
-  @bindClick: (board) ->
+  @bindClick: (board, RunningSum) ->
     $('#reset-button').click (e) =>
       board.resetBoard()
+      RunningSum.empty()
 
   @unbindClick: ->
     $('#reset-button').unbind('click')

app/services/RunningSum.coffee

@@ -2,16 +2,28 @@ $ = require 'jquery'
 
 class RunningSum
 
+  @runningSumElem = $( '#running-sum' )
+
+  @tilesEmptyString = 'Try to get all the tiles off the board!'
+  @solutionOperatorString = 'Solution must include an operator'
+  @invalidString = 'Invalid Expression'
+  @emptyString = ''
+
   @display: (solution, value) ->
-    if solution is ''
-      expression = ''
-    else if isNaN value
-      expression = 'Invalid Expression'
-    else if @isCompleteExpression solution
-      expression = (@addParens solution) + '=' + value
-    else
-      expression = solution
-    $('#running-sum').html(@format expression)
+    unless @runningSumElem.html() is @tilesEmptyString
+      if @isSpecialString solution
+        expression = solution
+      else if isNaN value
+        expression = @invalidString
+      else if @isCompleteExpression solution
+        expression = (@addParens solution) + '=' + value
+      else
+        expression = solution
+      @runningSumElem.html(@format expression)
+
+  @isSpecialString: (solution) ->
+    strings = [@emptyString, @tilesEmptyString, @solutionOperatorString]
+    strings.indexOf(solution) isnt -1
 
   @isCompleteExpression: (solution) ->
     return solution.search(/-?\d+[-+\*]\d+/g) is 0
@@ -33,4 +45,6 @@ class RunningSum
   @format: (input) ->
     input.replace(/\*/g, ' × ').replace(/\+/g, ' + ').replace(/(\d+|\))-/g, '$1 - ').replace(/\=/g, ' = ')
 
+  @empty: -> @runningSumElem.html @emptyString
+
 module.exports = RunningSum

app/services/SolutionService.coffee

@@ -2,24 +2,28 @@ InputSolver = require './InputSolver'
 
 class SolutionService
 
-  constructor: (@board, goals) ->
+  constructor: (@board, goals, @RunningSum) ->
     @goals = []
-    for g in goals
-      @goals.push g
+    @goals.push g for g in goals
 
   initialize: (clickedCells) ->
     @setSolutionString clickedCells
     @value = InputSolver.compute @solution
 
   isSolution: ->
-    return false unless @solution?.length >= 3
+    return false unless @solution?
     return false if @solution[@solution.length - 1] is '+' or
       @solution[@solution.length - 1] is '-' or
       @solution[@solution.length - 1] is '*'
     return false unless @value in @goals
+    if not @isCompleteExpression()
+      @RunningSum.display @RunningSum.solutionOperatorString
+      return false
     @valueIndex = @goals.indexOf @value
     @goals[@valueIndex] = ' '
-    return true
+    true
+
+  isCompleteExpression: -> @solution.search(/-?\d+[-+\*]\d+/g) is 0
 
   setSolutionString: (cells) ->
     @solution = ''

app/views/Board.coffee

@@ -9,7 +9,7 @@ class Board
     @initializer()
 
   initializer: =>
-    solutionService = new @SolutionService this, @goals
+    solutionService = new @SolutionService this, @goals, @RunningSum
     @clickHandler = new @ClickHandler this, solutionService, @goalContainer, @isMobile, @BoardSolvedService, @RunningSum
 
     @createBoard()

app/views/Board.js

@@ -6,6 +6,6 @@ Colors =
   board: '#294248'
   select: '#c7a579'
   symbol: 'black'
-  deletedGoalGrey: '#2F4F4F'
+  deletedGoalGrey: 'rgb(47, 79, 79)'
 
 module.exports = Colors

app/views/Colors.coffee

@@ -16,4 +16,9 @@ class GoalContainer
   clearGoals: ->
     @container.empty()
 
+  isEmpty: ->
+    for goal in $(@container.children())
+      return false if $(goal).css('color') isnt @Colors.deletedGoalGrey
+    true
+
 module.exports = GoalContainer