Skip to content

Commit f70e7e1

Browse files
committed
Refactor and add bundle.js
1 parent dc76c27 commit f70e7e1

File tree

5 files changed

+100
-286
lines changed

5 files changed

+100
-286
lines changed

app/services/ClickHandler.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class ClickHandler
7474
false
7575

7676
unselectAll: ->
77-
unless $('#running-sum').html() is @RunningSum.solutionOperatorString
77+
unless @RunningSum.runningSumElem.html() is @RunningSum.solutionOperatorString
7878
@RunningSum.display @RunningSum.emptyString
7979
return if @clicked.length < 1
8080
for i in [@clicked.length - 1..0]

app/services/RunningSum.coffee

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ $ = require 'jquery'
22

33
class RunningSum
44

5+
@runningSumElem = $( '#running-sum' )
6+
57
@tilesEmptyString = 'Try to get all the tiles off the board!'
68
@solutionOperatorString = 'Solution must include an operator'
79
@invalidString = 'Invalid Expression'
810
@emptyString = ''
911

1012
@display: (solution, value) ->
11-
unless $('#running-sum').html() is @tilesEmptyString
13+
unless @runningSumElem.html() is @tilesEmptyString
1214
if @isSpecialString solution
1315
expression = solution
1416
else if isNaN value
@@ -17,7 +19,7 @@ class RunningSum
1719
expression = (@addParens solution) + '=' + value
1820
else
1921
expression = solution
20-
$('#running-sum').html(@format expression)
22+
@runningSumElem.html(@format expression)
2123

2224
@isSpecialString: (solution) ->
2325
strings = [@emptyString, @tilesEmptyString, @solutionOperatorString]
@@ -43,6 +45,6 @@ class RunningSum
4345
@format: (input) ->
4446
input.replace(/\*/g, ' &times; ').replace(/\+/g, ' + ').replace(/(\d+|\))-/g, '$1 - ').replace(/\=/g, ' = ')
4547

46-
@empty: -> $('#running-sum').html(@emptyString)
48+
@empty: -> @runningSumElem.html @emptyString
4749

4850
module.exports = RunningSum

app/services/SolutionService.coffee

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ class SolutionService
44

55
constructor: (@board, goals, @RunningSum) ->
66
@goals = []
7-
for g in goals
8-
@goals.push g
7+
@goals.push g for g in goals
98

109
initialize: (clickedCells) ->
1110
@setSolutionString clickedCells
@@ -22,10 +21,9 @@ class SolutionService
2221
return false
2322
@valueIndex = @goals.indexOf @value
2423
@goals[@valueIndex] = ' '
25-
return true
24+
true
2625

27-
isCompleteExpression: ->
28-
return @solution.search(/-?\d+[-+\*]\d+/g) is 0
26+
isCompleteExpression: -> @solution.search(/-?\d+[-+\*]\d+/g) is 0
2927

3028
setSolutionString: (cells) ->
3129
@solution = ''

app/views/Board.js

Lines changed: 0 additions & 211 deletions
This file was deleted.

0 commit comments

Comments
 (0)