Repository: tapestry-5 Updated Branches: refs/heads/master dcd31d68a -> ee6b0cade
Upgrade RequireJS to version 2.1.17 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b21c7b3a Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b21c7b3a Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b21c7b3a Branch: refs/heads/master Commit: b21c7b3a9a137b8f05008dbcf7a0948db933ed19 Parents: dcd31d6 Author: Howard M. Lewis Ship <hls...@apache.org> Authored: Mon Apr 6 13:13:27 2015 -0700 Committer: Howard M. Lewis Ship <hls...@apache.org> Committed: Mon Apr 6 13:13:27 2015 -0700 ---------------------------------------------------------------------- .../src/main/resources/META-INF/assets/tapestry5/require.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b21c7b3a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js index bc43457..babfa9a 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/require.js @@ -1,5 +1,5 @@ /** vim: et:ts=4:sw=4:sts=4 - * @license RequireJS 2.1.16 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved. + * @license RequireJS 2.1.17 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/requirejs for details */ @@ -12,7 +12,7 @@ var requirejs, require, define; (function (global) { var req, s, head, baseElement, dataMain, src, interactiveScript, currentlyAddingScript, mainScript, subPath, - version = '2.1.16', + version = '2.1.17', commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, @@ -244,7 +244,7 @@ var requirejs, require, define; // still work when converted to a path, even though // as an ID it is less than ideal. In larger point // releases, may be better to just kick out an error. - if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') { + if (i === 0 || (i === 1 && ary[2] === '..') || ary[i - 1] === '..') { continue; } else if (i > 0) { ary.splice(i - 1, 2);
