aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarak Squires <[email protected]>2010-05-15 00:09:18 -0400
committerMarak Squires <[email protected]>2010-05-15 00:09:18 -0400
commitb7127e4d6398b81fbb77607c7f89e46cf9b6b6aa (patch)
tree54933f6505f029e24e18fec9dbe94896eb9bf0d3
parent98b6d90ee5bb4c9f85dc4cfb98fe5fb846a2520a (diff)
parentf6de7e53657de015796d1db175371265df21b3e6 (diff)
downloadfaker-b7127e4d6398b81fbb77607c7f89e46cf9b6b6aa.tar.xz
faker-b7127e4d6398b81fbb77607c7f89e46cf9b6b6aa.zip
Merge branch 'master' of github.com:Marak/Faker.js
-rw-r--r--index.js2
-rw-r--r--lib/address.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/index.js b/index.js
index 8fe2f293..f006d2be 100644
--- a/index.js
+++ b/index.js
@@ -16,6 +16,6 @@ sys.puts(JSON.stringify(Faker.Address.secondaryAddress()));
sys.puts(JSON.stringify(Faker.Address.city()));
sys.puts(JSON.stringify(Faker.Address.streetName()));
sys.puts(JSON.stringify(Faker.Address.streetAddress()));
-sys.puts(JSON.stringify(Faker.Address.street_address(true)));
+sys.puts(JSON.stringify(Faker.Address.streetAddress(true)));
diff --git a/lib/address.js b/lib/address.js
index 57de6b93..58fb5c0b 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -43,13 +43,13 @@ exports.streetAddress = function(i) {
switch(Helper.randomNumber(2))
{
case 0:
- address = Helper.numerify("#####") + " " + this.street_name();
+ address = Helper.numerify("#####") + " " + this.streetName();
break;
case 1:
- address = Helper.numerify("####") + " " + this.street_name();
+ address = Helper.numerify("####") + " " + this.streetName();
break;
case 2:
- address = Helper.numerify("###") + " " + this.street_name();
+ address = Helper.numerify("###") + " " + this.streetName();
break;
}
var full_address = i ? address + " " + this.secondaryAddress() : address;