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

Fix a few missed Ziggy references.
tighten · Apr 21, 2018 · 52eedae · 52eedae
2 parents d2c8fe9 + f43496c
commit 52eedae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dist/js/route.js b/dist/js/route.js
@@ -162,7 +162,7 @@ var Router = function (_String) {
             return this.template.replace(/{([^}]+)}/gi, function (tag, i) {
                 var keyName = tag.replace(/\{|\}/gi, '').replace(/\?$/, ''),
                     key = _this2.numericParamIndices ? paramsArrayKey : keyName,
-                    defaultParameter = Ziggy.defaultParameters[keyName];
+                    defaultParameter = _this2.ziggy.defaultParameters[keyName];
 
                 if (defaultParameter && needDefaultParams) {
                     if (_this2.numericParamIndices) {
@@ -219,7 +219,7 @@ var Router = function (_String) {
         value: function current() {
             var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
 
-            var routeNames = Object.keys(Ziggy.namedRoutes);
+            var routeNames = Object.keys(this.ziggy.namedRoutes);
 
             var currentRoute = routeNames.filter(function (name) {
                 return new Router(name).matchUrl();

diff --git a/dist/js/route.min.js b/dist/js/route.min.js
diff --git a/src/js/route.js b/src/js/route.js
@@ -57,7 +57,7 @@ class Router extends String {
             (tag, i) => {
 		 let keyName = tag.replace(/\{|\}/gi, '').replace(/\?$/, ''),
                     key = this.numericParamIndices ? paramsArrayKey : keyName,
-                    defaultParameter = Ziggy.defaultParameters[keyName];
+                    defaultParameter = this.ziggy.defaultParameters[keyName];
 
                 if (defaultParameter && needDefaultParams) {
                     if (this.numericParamIndices) {
@@ -111,7 +111,7 @@ class Router extends String {
     }
 
     current(name = null) {
-        let routeNames = Object.keys(Ziggy.namedRoutes);
+        let routeNames = Object.keys(this.ziggy.namedRoutes);
 
         let currentRoute = routeNames.filter(name => {
             return new Router(name).matchUrl();