Skip to content

tip change #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tip change #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4fa9f
changed the tip
ballerino Sep 12, 2015
0ae8a5c
changed index
ballerino Sep 12, 2015
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
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
window.onload = function() {
var number, tip, total;

alert("Let's calculate your 20% tip.");
alert("Let's calculate your 25% tip.");

baseAmount = parseFloat(prompt("How much is the bill?"));

tip = calculateTip(baseAmount);

total = calculateTotal(baseAmount, tip);

alert("Your 20% tip is: " + tip);
alert("Your 25% tip is: " + tip);

alert("Your total is: " + total);
};
Expand Down
2 changes: 1 addition & 1 deletion tip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use strict";

function calculateTip(baseAmount) {
return (.2 * baseAmount);
return (.25 * baseAmount);
}