Merge branch 'master' of https://github.com/Marak/Faker.js

6 files changed, 37 insertions, 37 deletions

diff --git a/lib/address.js b/lib/address.js
index 9f9a5082..7e323c29 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -48,19 +48,19 @@ var address = {
     //
     streetAddress: function (useFullAddress) {
         if (useFullAddress === undefined) { useFullAddress = false; }
-        var address = "";
+        var result = "";
         switch (Faker.random.number(3)) {
         case 0:
-            address = Helpers.replaceSymbolWithNumber("#####") + " " + this.streetName();
+            result = Helpers.replaceSymbolWithNumber("#####") + " " + address.streetName();
             break;
         case 1:
-            address = Helpers.replaceSymbolWithNumber("####") +  " " + this.streetName();
+            result = Helpers.replaceSymbolWithNumber("####") +  " " + address.streetName();
             break;
         case 2:
-            address = Helpers.replaceSymbolWithNumber("###") + " " + this.streetName();
+            result = Helpers.replaceSymbolWithNumber("###") + " " + address.streetName();
             break;
         }
-        return useFullAddress ? (address + " " + this.secondaryAddress()) : address;
+        return useFullAddress ? (result + " " + this.secondaryAddress()) : result;
     },
 
     secondaryAddress: function () {
diff --git a/lib/company.js b/lib/company.js
index 2298f607..c075d1ff 100644
--- a/lib/company.js
+++ b/lib/company.js
@@ -8,7 +8,7 @@ var company = {
     companyName: function (format) {
         switch ((format ? format : Faker.random.number(3))) {
         case 0:
-            return Faker.Name.lastName() + " " + this.companySuffix();
+            return Faker.Name.lastName() + " " + company.companySuffix();
         case 1:
             return Faker.Name.lastName() + "-" + Faker.Name.lastName();
         case 2:
@@ -17,7 +17,7 @@ var company = {
     },
 
     companySuffix: function () {
-        return Faker.random.array_element(this.suffixes());
+        return Faker.random.array_element(company.suffixes());
     },
 
     catchPhrase: function () {
diff --git a/lib/internet.js b/lib/internet.js
index 898769de..765ddba0 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -2,7 +2,7 @@ var Faker = require('../index');
 
 var internet = {
     email: function () {
-        return Faker.Helpers.slugify(this.userName()) + "@" + Faker.Helpers.slugify(this.domainName());
+        return Faker.Helpers.slugify(internet.userName()) + "@" + Faker.Helpers.slugify(internet.domainName());
     },
 
     userName: function () {
@@ -19,7 +19,7 @@ var internet = {
     },
 
     domainName: function () {
-        return this.domainWord() + "." + Faker.random.domain_suffix();
+        return internet.domainWord() + "." + Faker.random.domain_suffix();
     },
 
     domainWord:  function () {
diff --git a/lib/lorem.js b/lib/lorem.js
index 7010fca9..baa18ebc 100644
--- a/lib/lorem.js
+++ b/lib/lorem.js
@@ -14,28 +14,28 @@ var lorem = {
         // strange issue with the node_min_test failing for captialize, please fix and add this back
         //return  this.words(wordCount + Helpers.randomNumber(7)).join(' ').capitalize();
 
-        return  this.words(wordCount + Faker.random.number(7)).join(' ');
+        return  lorem.words(wordCount + Faker.random.number(7)).join(' ');
     },
 
     sentences: function (sentenceCount) {
         if (typeof sentenceCount == 'undefined') { sentenceCount = 3; }
         var sentences = [];
         for (sentenceCount; sentenceCount > 0; sentenceCount--) {
-            sentences.push(this.sentence());
+            sentences.push(lorem.sentence());
         }
         return sentences.join("\n");
     },
 
     paragraph: function (sentenceCount) {
         if (typeof sentenceCount == 'undefined') { sentenceCount = 3; }
-        return this.sentences(sentenceCount + Faker.random.number(3));
+        return lorem.sentences(sentenceCount + Faker.random.number(3));
     },
 
     paragraphs: function (paragraphCount) {
         if (typeof paragraphCount == 'undefined') { paragraphCount = 3; }
         var paragraphs = [];
         for (paragraphCount; paragraphCount > 0; paragraphCount--) {
-            paragraphs.push(this.paragraph());
+            paragraphs.push(lorem.paragraph());
         }
         return paragraphs.join("\n \r\t");
     }
diff --git a/lib/name.js b/lib/name.js
index 48759dcf..ff405c54 100644
--- a/lib/name.js
+++ b/lib/name.js
@@ -13,12 +13,12 @@ var _name = {
         var r = Faker.random.number(8);
         switch (r) {
         case 0:
-            return Faker.random.name_prefix() + " " + this.firstName() + " " + this.lastName();
+            return Faker.random.name_prefix() + " " + _name.firstName() + " " + _name.lastName();
         case 1:
-            return this.firstName() + " " + this.lastName() + " " + Faker.random.name_suffix();
+            return _name.firstName() + " " + _name.lastName() + " " + Faker.random.name_suffix();
         }
 
-        return this.firstName() + " " + this.lastName();
+        return _name.firstName() + " " + _name.lastName();
     }
 };
 
diff --git a/lib/random.js b/lib/random.js
index 7d010109..8a3b3abe 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -13,87 +13,87 @@ var random = {
     },
 
     city_prefix: function () {
-        return this.array_element(definitions.city_prefix);
+        return random.array_element(definitions.city_prefix);
     },
 
     city_suffix: function () {
-        return this.array_element(definitions.city_suffix);
+        return random.array_element(definitions.city_suffix);
     },
 
     street_suffix: function () {
-        return this.array_element(definitions.street_suffix);
+        return random.array_element(definitions.street_suffix);
     },
 
     br_state: function () {
-        return this.array_element(definitions.br_state);
+        return random.array_element(definitions.br_state);
     },
 
     br_state_abbr: function () {
-        return this.array_element(definitions.br_state_abbr);
+        return random.array_element(definitions.br_state_abbr);
     },
 
     us_state: function () {
-        return this.array_element(definitions.us_state);
+        return random.array_element(definitions.us_state);
     },
 
     us_state_abbr: function () {
-        return this.array_element(definitions.us_state_abbr);
+        return random.array_element(definitions.us_state_abbr);
     },
 
     uk_county: function () {
-        return this.array_element(definitions.uk_county);
+        return random.array_element(definitions.uk_county);
     },
 
     uk_country: function () {
-        return this.array_element(definitions.uk_country);
+        return random.array_element(definitions.uk_country);
     },
 
     first_name: function () {
-        return this.array_element(definitions.first_name);
+        return random.array_element(definitions.first_name);
     },
 
     last_name: function () {
-        return this.array_element(definitions.last_name);
+        return random.array_element(definitions.last_name);
     },
 
     name_prefix: function () {
-        return this.array_element(definitions.name_prefix);
+        return random.array_element(definitions.name_prefix);
     },
 
     name_suffix: function () {
-        return this.array_element(definitions.name_suffix);
+        return random.array_element(definitions.name_suffix);
     },
 
     catch_phrase_adjective: function () {
-        return this.array_element(definitions.catch_phrase_adjective);
+        return random.array_element(definitions.catch_phrase_adjective);
     },
 
     catch_phrase_descriptor: function () {
-        return this.array_element(definitions.catch_phrase_descriptor);
+        return random.array_element(definitions.catch_phrase_descriptor);
     },
 
     catch_phrase_noun: function () {
-        return this.array_element(definitions.catch_phrase_noun);
+        return random.array_element(definitions.catch_phrase_noun);
     },
 
     bs_adjective: function () {
-        return this.array_element(definitions.bs_adjective);
+        return random.array_element(definitions.bs_adjective);
     },
 
     bs_buzz: function () {
-        return this.array_element(definitions.bs_buzz);
+        return random.array_element(definitions.bs_buzz);
     },
 
     bs_noun: function () {
-        return this.array_element(definitions.bs_noun);
+        return random.array_element(definitions.bs_noun);
     },
 
     phone_formats: function () {
-        return this.array_element(definitions.phone_formats);
+        return random.array_element(definitions.phone_formats);
     },
 
     domain_suffix: function () {
-        return this.array_element(definitions.domain_suffix);
+        return random.array_element(definitions.domain_suffix);
     }
 
 };