Merge pull request #151 from tightenco/allow-custom-ziggy-in-url-builder

Allow custom Ziggy to be passed into UrlBuilder (so I can use UrlBuilder in other packages.)
tighten · Apr 21, 2018 · 1da970b · 1da970b
2 parents 6abb70e + d3c45b0
commit 1da970b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/dist/js/route.js b/dist/js/route.js
@@ -265,10 +265,14 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var UrlBuilder = function () {
     function UrlBuilder(name, absolute) {
+        var route = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+        var customZiggy = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+
         _classCallCheck(this, UrlBuilder);
 
         this.name = name;
-        this.route = Ziggy.namedRoutes[this.name];
+        this.ziggy = customZiggy ? customZiggy : Ziggy;
+        this.route = route ? route : this.ziggy.namedRoutes[this.name];
 
         if (typeof this.name === 'undefined') {
             throw new Error('Ziggy Error: You must provide a route name');
@@ -286,13 +290,13 @@ var UrlBuilder = function () {
         value: function setDomain() {
             if (!this.absolute) return '/';
 
-            if (!this.route.domain) return Ziggy.baseUrl.replace(/\/?$/, '/');
+            if (!this.route.domain) return this.ziggy.baseUrl.replace(/\/?$/, '/');
 
-            var host = (this.route.domain || Ziggy.baseDomain).replace(/\/+$/, '');
+            var host = (this.route.domain || this.ziggy.baseDomain).replace(/\/+$/, '');
 
-            if (Ziggy.basePort && host.replace(/\/+$/, '') === Ziggy.baseDomain.replace(/\/+$/, '')) host = Ziggy.baseDomain + ':' + Ziggy.basePort;
+            if (this.ziggy.basePort && host.replace(/\/+$/, '') === this.ziggy.baseDomain.replace(/\/+$/, '')) host = this.ziggy.baseDomain + ':' + this.ziggy.basePort;
 
-            return Ziggy.baseProtocol + '://' + host + '/';
+            return this.ziggy.baseProtocol + '://' + host + '/';
         }
     }, {
         key: 'construct',

diff --git a/dist/js/route.min.js b/dist/js/route.min.js
diff --git a/src/js/UrlBuilder.js b/src/js/UrlBuilder.js
@@ -1,33 +1,34 @@
 class UrlBuilder {
-    constructor(name, absolute) {
+    constructor(name, absolute, route = null, customZiggy = null) {
 
-        this.name       = name;
-        this.route      = Ziggy.namedRoutes[this.name];
+        this.name = name;
+        this.ziggy = customZiggy ? customZiggy : Ziggy;
+        this.route = route ? route : this.ziggy.namedRoutes[this.name];
 
         if (typeof this.name === 'undefined') {
             throw new Error('Ziggy Error: You must provide a route name');
         } else if (typeof this.route === 'undefined') {
             throw new Error(`Ziggy Error: route '${this.name}' is not found in the route list`);
         }
 
-        this.absolute   = typeof absolute === 'undefined' ? true : absolute;
-        this.domain     = this.setDomain();
-        this.path       = this.route.uri.replace(/^\//, '');
+        this.absolute = typeof absolute === 'undefined' ? true : absolute;
+        this.domain = this.setDomain();
+        this.path = this.route.uri.replace(/^\//, '');
     }
 
     setDomain() {
-        if (! this.absolute)
+        if (!this.absolute)
             return '/';
 
         if (!this.route.domain)
-            return Ziggy.baseUrl.replace(/\/?$/, '/');
+            return this.ziggy.baseUrl.replace(/\/?$/, '/');
 
-        let host = (this.route.domain || Ziggy.baseDomain).replace(/\/+$/, '');
+        let host = (this.route.domain || this.ziggy.baseDomain).replace(/\/+$/, '');
 
-        if (Ziggy.basePort && (host.replace(/\/+$/, '') === Ziggy.baseDomain.replace(/\/+$/, '')))
-            host = Ziggy.baseDomain + ':' + Ziggy.basePort;
+        if (this.ziggy.basePort && (host.replace(/\/+$/, '') === this.ziggy.baseDomain.replace(/\/+$/, '')))
+            host = this.ziggy.baseDomain + ':' + this.ziggy.basePort;
 
-        return Ziggy.baseProtocol + '://' + host + '/';
+        return this.ziggy.baseProtocol + '://' + host + '/';
     }
 
     construct() {