Permalink
Browse files

Merge branch 'master' of yuisource.corp.yahoo.com:yui3

  • Loading branch information...
sdesai committed Nov 28, 2011
2 parents fda0ebb + f61a03f commit 0f6400e29698d4802163ebb52ad72c68db4e280c
Showing with 2,954 additions and 804 deletions.
  1. +5 −2 build/escape/escape-debug.js
  2. +1 −1 build/escape/escape-min.js
  3. +5 −2 build/escape/escape.js
  4. +266 −64 build/loader-base/loader-base-debug.js
  5. +4 −3 build/loader-base/loader-base-min.js
  6. +256 −59 build/loader-base/loader-base.js
  7. +266 −64 build/loader/loader-debug.js
  8. +5 −5 build/loader/loader-min.js
  9. +256 −59 build/loader/loader.js
  10. +15 −0 build/yui-base/yui-base-debug.js
  11. +3 −3 build/yui-base/yui-base-min.js
  12. +15 −0 build/yui-base/yui-base.js
  13. +15 −0 build/yui-core/yui-core-debug.js
  14. +3 −3 build/yui-core/yui-core-min.js
  15. +15 −0 build/yui-core/yui-core.js
  16. +281 −64 build/yui-nodejs/yui-nodejs-debug.js
  17. +7 −7 build/yui-nodejs/yui-nodejs-min.js
  18. +271 −59 build/yui-nodejs/yui-nodejs.js
  19. +281 −64 build/yui/yui-debug.js
  20. +9 −8 build/yui/yui-min.js
  21. +271 −59 build/yui/yui.js
  22. +18 −0 sandbox/loader/alias.html
  23. +3 −0 sandbox/loader/davglass.js
  24. +4 −4 sandbox/loader/gallery.html
  25. +41 −0 sandbox/loader/index.html
  26. +31 −0 sandbox/loader/pattern.html
  27. +1 −0 src/common/tests/coverage.xml
  28. +1 −1 src/common/tests/unit.xml
  29. +11 −4 src/escape/HISTORY.md
  30. +5 −2 src/escape/js/escape.js
  31. +1 −1 src/escape/tests/functional/escape-test.js
  32. +27 −0 src/get/build.xml
  33. +8 −0 src/get/get-nodejs.properties
  34. 0 src/{yui → get}/get-nodejs.xml
  35. +6 −0 src/get/get.properties
  36. 0 src/{yui → get}/get.xml
  37. 0 src/{yui → get}/js/get-nodejs.js
  38. 0 src/{yui → get}/js/get.js
  39. +5 −0 src/get/meta/get.json
  40. +156 −156 src/{yui/tests/get-tests.js → get/tests/get-test.js}
  41. +3 −3 src/{yui → get}/tests/get.html
  42. 0 src/{yui → get}/tests/getfiles/a.css
  43. 0 src/{yui → get}/tests/getfiles/a.js
  44. 0 src/{yui → get}/tests/getfiles/b.css
  45. 0 src/{yui → get}/tests/getfiles/b.js
  46. 0 src/{yui → get}/tests/getfiles/c.css
  47. 0 src/{yui → get}/tests/getfiles/c.js
  48. 0 src/{yui → get}/tests/getfiles/delay.js
  49. 0 src/{yui → get}/tests/getfiles/ib.css
  50. 0 src/{yui → get}/tests/manual/get.html
  51. +266 −64 src/loader/js/loader.js
  52. +3 −0 src/loader/tests/assets/mod.js
  53. +89 −0 src/loader/tests/loader-tests.js
  54. +1 −1 src/loader/tests/server/combo_template.html
  55. +1 −1 src/loader/tests/server/loader_template.html
  56. +2 −2 src/widget/docs/index.mustache
  57. +2 −2 src/yui/build.properties
  58. +0 −15 src/yui/get-nodejs.properties
  59. +0 −15 src/yui/get.properties
  60. +15 −0 src/yui/js/yui.js
  61. +0 −3 src/yui/meta/yui.json
  62. +2 −2 src/yui/nodejs-seed.properties
  63. +2 −2 src/yui/yui-base.properties
@@ -52,7 +52,7 @@ Escape = {
characters escaped, allowing the string to be used safely inside a regex.
The following characters, and all whitespace characters, are escaped:
- - # $ ^ * ( ) + [ ] { } | \ , . ?
+ - $ ^ * ( ) + [ ] { } | \ , . ?
If _string_ is not already a string, it will be coerced to a string.
@@ -62,7 +62,10 @@ Escape = {
@static
**/
regex: function (string) {
- return (string + '').replace(/[\-#$\^*()+\[\]{}|\\,.?\s]/g, '\\$&');
+ // There's no need to escape !, =, and : since they only have meaning
+ // when they follow a parenthesized ?, as in (?:...), and we already
+ // escape parens and question marks.
+ return (string + '').replace(/[\-$\^*()+\[\]{}|\\,.?\s]/g, '\\$&');
},
// -- Protected Static Methods ---------------------------------------------

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -52,7 +52,7 @@ Escape = {
characters escaped, allowing the string to be used safely inside a regex.
The following characters, and all whitespace characters, are escaped:
- - # $ ^ * ( ) + [ ] { } | \ , . ?
+ - $ ^ * ( ) + [ ] { } | \ , . ?
If _string_ is not already a string, it will be coerced to a string.
@@ -62,7 +62,10 @@ Escape = {
@static
**/
regex: function (string) {
- return (string + '').replace(/[\-#$\^*()+\[\]{}|\\,.?\s]/g, '\\$&');
+ // There's no need to escape !, =, and : since they only have meaning
+ // when they follow a parenthesized ?, as in (?:...), and we already
+ // escape parens and question marks.
+ return (string + '').replace(/[\-$\^*()+\[\]{}|\\,.?\s]/g, '\\$&');
},
// -- Protected Static Methods ---------------------------------------------
Oops, something went wrong.

0 comments on commit 0f6400e

Please sign in to comment.