Skip to content

Commit 4ae129b

Browse files
committed
Fix router.js
1 parent 674fafd commit 4ae129b

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

Resources/config/plovr/compile.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
"type-prefixes-to-strip": ["goog.debug", "goog.asserts", "goog.assert", "console"],
1414
"name-suffixes-to-strip": ["logger", "logger_"],
1515

16-
"experimental-compiler-options": {
17-
"languageIn": "ECMASCRIPT5_STRICT"
18-
},
19-
2016
"output-file": "../../public/js/router.js",
2117
"output-wrapper": "/**\n * Portions of this code are from the Google Closure Library,\n * received from the Closure Authors under the Apache 2.0 license.\n *\n * All other code is (C) FriendsOfSymfony and subject to the MIT license.\n */\n(function() {%output%})();",
2218

Resources/js/router.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ goog.addSingletonGetter(fos.Router);
2020
* @typedef {{
2121
* tokens: (Array.<Array.<string>>),
2222
* defaults: (Object.<string, string>),
23-
* requirements: Object
23+
* requirements: Object,
24+
* hosttokens: (Array.<string>)
2425
* }}
2526
*/
2627
fos.Router.Route;
@@ -175,6 +176,7 @@ fos.Router.prototype.generate = function(name, opt_params, absolute) {
175176
var hasDefault = goog.object.containsKey(route.defaults, token[3]);
176177
if (false === optional || !hasDefault || (goog.object.containsKey(params, token[3]) && params[token[3]] != route.defaults[token[3]])) {
177178
var value;
179+
178180
if (goog.object.containsKey(params, token[3])) {
179181
value = params[token[3]];
180182
goog.object.remove(unusedParams, token[3]);

Resources/public/js/router.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.

0 commit comments

Comments
 (0)