Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion bug1/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function renderTransactions(transactions) {
var finalHTML = '<div class="buffer">TRANSACTIONS</div>
var finalHTML = '<div class="buffer">TRANSACTIONS</div>'

var transactionsHTML = _.map(transactions, function(transaction) {
var transactionHTML = '<div class="transaction">';
Expand Down
6 changes: 3 additions & 3 deletions bug2/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<head>
<link rel="stylesheet" type="text/css" href="index.css">
<title>Skware Cash (Bug 2)</title>
<script type="text/javascript" src="lib/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="lib/underscore-min.js"></script>
<script type="text/javascript" src="lib/backbone-min.js"></script>
<script type="text/javascript" src="../lib/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../lib/underscore-min.js"></script>
<script type="text/javascript" src="../lib/backbone-min.js"></script>
<script type="text/javascript" src="data.js"></script>
<script type="text/javascript" src="index.js"></script>
</head>
Expand Down
3 changes: 2 additions & 1 deletion bug3/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ li.active {
width: 170px;
height: 36px;
border-radius: 8px;
padding-top: 13px;
padding-top: 13px;
background-color: #15D642;
font-weight: bold;
font-size: 20px;
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion bug3/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<li>Settings</li>
<li>Sign Out</li>
</ul>
<div class="new" style="background-color: #15D642;">New</div>
<div class="new">New</div>
</div>
<div class="right">
<div class="search">
Expand Down
10 changes: 5 additions & 5 deletions bug4/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ $(document).ready(function(){
$('.transactions').html(renderTransactions(fullTransactionData));

$('.search-input').on('input', function(e) {
var searchString = e.target.value;
var searchString = e.target.value.toLowerCase();
var filteredData = _.filter(fullTransactionData, function(transaction){
var foundInName = transaction.name.indexOf(searchString) > -1;
var foundInFor = transaction.for.indexOf(searchString) > -1;
var foundInDate = transaction.date.indexOf(searchString) > -1;
var foundInAmount = transaction.amount.indexOf(searchString) > -1;
var foundInName = transaction.name.toLowerCase().indexOf(searchString) > -1;
var foundInFor = transaction.for.toLowerCase().indexOf(searchString) > -1;
var foundInDate = transaction.date.toLowerCase().indexOf(searchString) > -1;
var foundInAmount = transaction.amount.toLowerCase().indexOf(searchString) > -1;
return foundInName || foundInFor || foundInDate || foundInAmount;
});

Expand Down
2 changes: 1 addition & 1 deletion bug5/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<doctype HTML!>
<html>
<head>
<link rel="stylesheet" type="text/css" href="../index.css">
<link rel="stylesheet" type="text/css" href="index.css">
<title>Skware Cash (Bug 4)</title>
<script type="text/javascript" src="../lib/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="../lib/underscore-min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion bug6/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function renderTransactions(transactions) {
var finalHTML = '<div class="buffer">TRANSACTIONS</div>';

var transactionsHTML = _.map(transactions, function() {
var transactionsHTML = _.map(transactions, function(transaction) {
var transactionHTML = '<div class="transaction">';
transactionHTML += '<div class="name">' + transaction.name + '</div>';
transactionHTML += '<div class="for">' + transaction.for + '</div>';
Expand Down
2 changes: 1 addition & 1 deletion bug7/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function renderTransactions(transactions) {
return transactionHTML;
});

finalHTML += transactionsHTML.join();
finalHTML += transactionsHTML.join('');

return finalHTML;
}
Expand Down
2 changes: 1 addition & 1 deletion bug8/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function renderTransactions(transactions) {
$(document).ready(function(){
$('.transactions').html(renderTransactions(fullTransactionData));

$('.search-input').on('change', function(e) {
$('.search-input').keypress('change', function(e) {
var searchString = e.target.value.toLowerCase();
var filteredData = _.filter(fullTransactionData, function(transaction){
var foundInName = transaction.name.toLowerCase().indexOf(searchString) > -1;
Expand Down