Fixed domain comprobation during check() method, causing a fail compr…

…obation when having a TLD and subdomains from the same TLD
juanpablob · Oct 22, 2015 · e227242 · e227242
1 parent 06a58ec
commit e227242
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/dist/angular-environment.js b/dist/angular-environment.js
@@ -1,7 +1,7 @@
 /**
  * angular-environment Plugin
  *
- * An useful plugin that gives you an opportunity to set up different information
+ * An useful plugin that allows you to set up different information
  * such as api endpoints, urls, variables, etc, based on the context of scripts execution:
  * development, stage, production or any other custom environment you want to create.
  *
@@ -82,12 +82,12 @@ angular.module('environment', []).
 		 * @return {Void}
 		 */
 		this.check = function() {
-			var	hostname = window.location.hostname,
+			var	location = window.location.href,
 					self = this;
 
 			angular.forEach(this.data.domains, function(v, k) {
 				angular.forEach(v, function(v) {
-					if (hostname.search(v) !== -1) {
+					if (location.match('//' + v)) {
 						self.environment = k;
 					}
 				});

diff --git a/dist/angular-environment.min.js b/dist/angular-environment.min.js
diff --git a/src/angular-environment.js b/src/angular-environment.js
@@ -1,7 +1,7 @@
 /**
  * angular-environment Plugin
  *
- * An useful plugin that gives you an opportunity to set up different information
+ * An useful plugin that allows you to set up different information
  * such as api endpoints, urls, variables, etc, based on the context of scripts execution:
  * development, stage, production or any other custom environment you want to create.
  *
@@ -82,12 +82,12 @@ angular.module('environment', []).
 		 * @return {Void}
 		 */
 		this.check = function() {
-			var	hostname = window.location.hostname,
+			var	location = window.location.href,
 					self = this;
 
 			angular.forEach(this.data.domains, function(v, k) {
 				angular.forEach(v, function(v) {
-					if (hostname.search(v) !== -1) {
+					if (location.match('//' + v)) {
 						self.environment = k;
 					}
 				});