Merge pull request #226 from s7anley/master

use Object.toString() instead of window.toString()
sorich87 · Mar 20, 2014 · 9cb34a1 · 9cb34a1
2 parents c6e12ab + 73532cf
commit 9cb34a1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/build/js/bootstrap-tour-standalone.js b/build/js/bootstrap-tour-standalone.js
@@ -931,7 +931,7 @@
     };
 
     Tour.prototype._isRedirect = function(path, currentPath) {
-      return (path != null) && path !== "" && ((toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || (toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
+      return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
     };
 
     Tour.prototype._redirect = function(step, path) {

diff --git a/build/js/bootstrap-tour-standalone.min.js b/build/js/bootstrap-tour-standalone.min.js
diff --git a/build/js/bootstrap-tour.js b/build/js/bootstrap-tour.js
@@ -420,7 +420,7 @@
     };
 
     Tour.prototype._isRedirect = function(path, currentPath) {
-      return (path != null) && path !== "" && ((toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || (toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
+      return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
     };
 
     Tour.prototype._redirect = function(step, path) {

diff --git a/build/js/bootstrap-tour.min.js b/build/js/bootstrap-tour.min.js
diff --git a/docs/assets/js/bootstrap-tour.js b/docs/assets/js/bootstrap-tour.js
@@ -420,7 +420,7 @@
     };
 
     Tour.prototype._isRedirect = function(path, currentPath) {
-      return (path != null) && path !== "" && ((toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || (toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
+      return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
     };
 
     Tour.prototype._redirect = function(step, path) {

diff --git a/src/coffee/bootstrap-tour.coffee b/src/coffee/bootstrap-tour.coffee
@@ -342,8 +342,8 @@
     # Check if step path equals current document path
     _isRedirect: (path, currentPath) ->
       path? and path isnt "" and (
-        (toString.call(path) is "[object RegExp]" and not path.test currentPath) or
-        (toString.call(path) is "[object String]" and
+        (({}).toString.call(path) is "[object RegExp]" and not path.test currentPath) or
+        (({}).toString.call(path) is "[object String]" and
           path.replace(/\?.*$/, "").replace(/\/?$/, "") isnt currentPath.replace(/\/?$/, ""))
       )