Skip to content

Commit 52eedae

Browse files
Merge pull request #153 from tightenco/allow-custom-ziggy-in-url-builder
Fix a few missed Ziggy references.
2 parents d2c8fe9 + f43496c commit 52eedae

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

dist/js/route.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ var Router = function (_String) {
162162
return this.template.replace(/{([^}]+)}/gi, function (tag, i) {
163163
var keyName = tag.replace(/\{|\}/gi, '').replace(/\?$/, ''),
164164
key = _this2.numericParamIndices ? paramsArrayKey : keyName,
165-
defaultParameter = Ziggy.defaultParameters[keyName];
165+
defaultParameter = _this2.ziggy.defaultParameters[keyName];
166166

167167
if (defaultParameter && needDefaultParams) {
168168
if (_this2.numericParamIndices) {
@@ -219,7 +219,7 @@ var Router = function (_String) {
219219
value: function current() {
220220
var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
221221

222-
var routeNames = Object.keys(Ziggy.namedRoutes);
222+
var routeNames = Object.keys(this.ziggy.namedRoutes);
223223

224224
var currentRoute = routeNames.filter(function (name) {
225225
return new Router(name).matchUrl();

dist/js/route.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/route.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Router extends String {
5757
(tag, i) => {
5858
let keyName = tag.replace(/\{|\}/gi, '').replace(/\?$/, ''),
5959
key = this.numericParamIndices ? paramsArrayKey : keyName,
60-
defaultParameter = Ziggy.defaultParameters[keyName];
60+
defaultParameter = this.ziggy.defaultParameters[keyName];
6161

6262
if (defaultParameter && needDefaultParams) {
6363
if (this.numericParamIndices) {
@@ -111,7 +111,7 @@ class Router extends String {
111111
}
112112

113113
current(name = null) {
114-
let routeNames = Object.keys(Ziggy.namedRoutes);
114+
let routeNames = Object.keys(this.ziggy.namedRoutes);
115115

116116
let currentRoute = routeNames.filter(name => {
117117
return new Router(name).matchUrl();

0 commit comments

Comments
 (0)