Skip to content
This repository was archived by the owner on Nov 17, 2018. It is now read-only.

Commit 6461490

Browse files
willtennienwilltennien
committed
Features: I a allow the user to search multiple expenses.
1 parent 5468d60 commit 6461490

File tree

63 files changed

+642
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+642
-87
lines changed

‎app/assets/images/.DS_Store‎

6 KB
Binary file not shown.

‎app/assets/images/splitwise-logo-medium-small.png‎

9.45 KB
Loading

‎app/assets/images/splitwise-logo-small.png‎

6.79 KB
Loading

‎app/assets/images/unused/loading-old-1.gif‎

3.96 KB
Loading

‎app/assets/images/unused/loading-old.gif‎

1.69 KB
Loading

‎app/assets/images/unused/loading.gif‎

47 KB
Loading

app/assets/images/splitwise-logo-medium.png renamed to app/assets/images/unused/splitwise-logo-medium.png

File renamed without changes.

‎app/assets/javascripts/oauth.js.coffee‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,11 @@
66
# All this logic will automatically be available in application.js.
77
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
88

9-
this.activateMatchbox = () ->
10-
###
11-
$('.side-menu-item.matching').click(() ->
12-
$('.side-menu-item.matching #matchbox-container').css('visibility', 'visible')
13-
false
14-
)
15-
$(document).click(() ->
16-
$('.side-menu-item.matching #matchbox-container').css('visibility', 'hidden')
17-
)
18-
###
9+
$(() ->
1910
$('#matchbox .submit').click(() ->
2011
window.location.href = "/user/expenses_matching?query=#{$('#matchbox input').val()}"
2112
)
13+
)
2214

2315
### Example arguments:
2416
chartType = 'AreaChart'
@@ -110,7 +102,8 @@ this.createScrolledChart = (data, variable) ->
110102
return dates.all.length - 1
111103

112104

113-
drawCharts = createCheckin(2, () ->
105+
drawCharts = createCheckin((if google.visualization then 1 else 2), () ->
106+
console.debug('createScrolledChart: all parallel prerequisites have loaded; I will now draw the charts.')
114107

115108
spawnDates()
116109
elem.scrollChart = createScrollChart()
@@ -200,7 +193,8 @@ this.createScrolledChart = (data, variable) ->
200193

201194

202195
google.setOnLoadCallback(drawCharts)
203-
google.load('visualization', '1', {packages: ['corechart']})
196+
unless google.visualization
197+
google.load('visualization', '1', {packages: ['corechart']})
204198

205199
###
206200
rows = undefined
@@ -219,4 +213,19 @@ this.createScrolledChart = (data, variable) ->
219213
)
220214
drawCharts()
221215

222-
)
216+
)
217+
218+
219+
###
220+
this.activateMatchbox = () ->
221+
$('.side-menu-item.matching').click(() ->
222+
$('.side-menu-item.matching #matchbox-container').css('visibility', 'visible')
223+
false
224+
)
225+
$(document).click(() ->
226+
$('.side-menu-item.matching #matchbox-container').css('visibility', 'hidden')
227+
)
228+
$('#matchbox .submit').click(() ->
229+
window.location.href = "/user/expenses_matching?query=#{$('#matchbox input').val()}"
230+
)
231+
###

‎app/assets/javascripts/oauth_balance.js.coffee‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ options =
1313
colors: ['#0088CC']
1414
legend:
1515
position: 'none'
16+
textStyle:
17+
fontName: 'Lato, Lucida Grande'
1618
hAxis:
1719
textStyle:
1820
fontName: 'Lato, Lucida Grande'
@@ -28,6 +30,8 @@ options =
2830
height: '100%'
2931
legend:
3032
position: 'none'
33+
textStyle:
34+
fontName: 'Lato, Lucida Grande'
3135
hAxis:
3236
textPosition: 'none'
3337
vAxis:

‎app/assets/javascripts/oauth_balances_over_time_with_friends.coffee‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ options =
88
chartType: 'AreaChart'
99

1010
optionsMainChart:
11+
legend:
12+
textStyle:
13+
fontName: 'Lato, Lucida Grande'
1114
hAxis:
1215
textStyle:
1316
fontName: 'Lato, Lucida Grande'

0 commit comments

Comments
 (0)