Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
lsmith committed Nov 30, 2011
2 parents 526073a + 92ee814 commit d433efff0515b9a353c94bb105d44675a176dc1a
Showing with 4,497 additions and 3,878 deletions.
  1. +31 −26 build/base-base/base-base-debug.js
  2. +1 −1 build/base-base/base-base-min.js
  3. +29 −25 build/base-base/base-base.js
  4. BIN build/clickable-rail/assets/thumb-x-oblong-dark.png
  5. BIN build/clickable-rail/assets/thumb-x-oblong.png
  6. BIN build/clickable-rail/assets/thumb-x-oblong2-dark.png
  7. BIN build/clickable-rail/assets/thumb-x-oblong2.png
  8. BIN build/clickable-rail/assets/thumb-y-oblong-dark.png
  9. BIN build/clickable-rail/assets/thumb-y-oblong.png
  10. BIN build/clickable-rail/assets/thumb-y-oblong2-dark.png
  11. BIN build/clickable-rail/assets/thumb-y-oblong2.png
  12. +5 −2 build/escape/escape-debug.js
  13. +1 −1 build/escape/escape-min.js
  14. +5 −2 build/escape/escape.js
  15. +253 −368 build/loader-base/loader-base-debug.js
  16. +3 −3 build/loader-base/loader-base-min.js
  17. +243 −354 build/loader-base/loader-base.js
  18. +253 −368 build/loader/loader-debug.js
  19. +3 −3 build/loader/loader-min.js
  20. +243 −354 build/loader/loader.js
  21. +340 −58 build/pjax-base/pjax-base-debug.js
  22. +1 −1 build/pjax-base/pjax-base-min.js
  23. +340 −58 build/pjax-base/pjax-base.js
  24. BIN build/range-slider/assets/thumb-x-oblong-dark.png
  25. BIN build/range-slider/assets/thumb-x-oblong.png
  26. BIN build/range-slider/assets/thumb-x-oblong2-dark.png
  27. BIN build/range-slider/assets/thumb-x-oblong2.png
  28. BIN build/range-slider/assets/thumb-y-oblong-dark.png
  29. BIN build/range-slider/assets/thumb-y-oblong.png
  30. BIN build/range-slider/assets/thumb-y-oblong2-dark.png
  31. BIN build/range-slider/assets/thumb-y-oblong2.png
  32. +75 −20 build/router/router-debug.js
  33. +1 −1 build/router/router-min.js
  34. +75 −20 build/router/router.js
  35. BIN build/slider-base/assets/skins/audio-light/rail-x.png
  36. BIN build/slider-base/assets/skins/audio-light/rail-y.png
  37. BIN build/slider-base/assets/skins/audio-light/thumb-x.png
  38. BIN build/slider-base/assets/skins/audio-light/thumb-y.png
  39. BIN build/slider-base/assets/skins/audio/rail-x.png
  40. BIN build/slider-base/assets/skins/audio/rail-y.png
  41. BIN build/slider-base/assets/skins/audio/thumb-x.png
  42. BIN build/slider-base/assets/skins/audio/thumb-y.png
  43. BIN build/slider-base/assets/skins/capsule-dark/rail-x-dots.png
  44. BIN build/slider-base/assets/skins/capsule-dark/rail-x-lines.png
  45. BIN build/slider-base/assets/skins/capsule-dark/rail-x.png
  46. BIN build/slider-base/assets/skins/capsule-dark/rail-y-dots.png
  47. BIN build/slider-base/assets/skins/capsule-dark/rail-y-lines.png
  48. BIN build/slider-base/assets/skins/capsule-dark/rail-y.png
  49. BIN build/slider-base/assets/skins/capsule-dark/thumb-x-line.png
  50. BIN build/slider-base/assets/skins/capsule-dark/thumb-x.png
  51. BIN build/slider-base/assets/skins/capsule-dark/thumb-y-line.png
  52. BIN build/slider-base/assets/skins/capsule-dark/thumb-y.png
  53. BIN build/slider-base/assets/skins/capsule/rail-x-dots.png
  54. BIN build/slider-base/assets/skins/capsule/rail-x-lines.png
  55. BIN build/slider-base/assets/skins/capsule/rail-x.png
  56. BIN build/slider-base/assets/skins/capsule/rail-y-dots.png
  57. BIN build/slider-base/assets/skins/capsule/rail-y-lines.png
  58. BIN build/slider-base/assets/skins/capsule/rail-y.png
  59. BIN build/slider-base/assets/skins/capsule/thumb-x-line.png
  60. BIN build/slider-base/assets/skins/capsule/thumb-x.png
  61. BIN build/slider-base/assets/skins/capsule/thumb-y-line.png
  62. BIN build/slider-base/assets/skins/capsule/thumb-y-lines.png
  63. BIN build/slider-base/assets/skins/capsule/thumb-y.png
  64. BIN build/slider-base/assets/skins/night/rail-x-lines.png
  65. BIN build/slider-base/assets/skins/night/rail-x.png
  66. BIN build/slider-base/assets/skins/night/rail-y-lines.png
  67. BIN build/slider-base/assets/skins/night/rail-y.png
  68. BIN build/slider-base/assets/skins/night/thumb-x.png
  69. BIN build/slider-base/assets/skins/night/thumb-y.png
  70. BIN build/slider-base/assets/skins/round-dark/rail-x.png
  71. BIN build/slider-base/assets/skins/round-dark/rail-y.png
  72. BIN build/slider-base/assets/skins/round-dark/thumb-x-grip.png
  73. BIN build/slider-base/assets/skins/round-dark/thumb-x.png
  74. BIN build/slider-base/assets/skins/round-dark/thumb-y-grip.png
  75. BIN build/slider-base/assets/skins/round-dark/thumb-y.png
  76. BIN build/slider-base/assets/skins/round/rail-x.png
  77. BIN build/slider-base/assets/skins/round/rail-y.png
  78. BIN build/slider-base/assets/skins/round/thumb-x-grip.png
  79. BIN build/slider-base/assets/skins/round/thumb-x.png
  80. BIN build/slider-base/assets/skins/round/thumb-y-grip.png
  81. BIN build/slider-base/assets/skins/round/thumb-y.png
  82. BIN build/slider-base/assets/skins/sam-dark/rail-x-lines.png
  83. BIN build/slider-base/assets/skins/sam-dark/rail-x.png
  84. BIN build/slider-base/assets/skins/sam-dark/rail-y-lines.png
  85. BIN build/slider-base/assets/skins/sam-dark/rail-y.png
  86. BIN build/slider-base/assets/skins/sam-dark/thumb-x.png
  87. BIN build/slider-base/assets/skins/sam-dark/thumb-y.png
  88. BIN build/slider-base/assets/skins/sam/rail-x-lines.png
  89. BIN build/slider-base/assets/skins/sam/rail-x.png
  90. BIN build/slider-base/assets/skins/sam/rail-y-lines.png
  91. BIN build/slider-base/assets/skins/sam/rail-y.png
  92. BIN build/slider-base/assets/skins/sam/thumb-x.png
  93. BIN build/slider-base/assets/skins/sam/thumb-y.png
  94. BIN build/slider-base/assets/thumb-x-oblong-dark.png
  95. BIN build/slider-base/assets/thumb-x-oblong.png
  96. BIN build/slider-base/assets/thumb-x-oblong2-dark.png
  97. BIN build/slider-base/assets/thumb-x-oblong2.png
  98. BIN build/slider-base/assets/thumb-y-oblong-dark.png
  99. BIN build/slider-base/assets/thumb-y-oblong.png
  100. BIN build/slider-base/assets/thumb-y-oblong2-dark.png
  101. BIN build/slider-base/assets/thumb-y-oblong2.png
  102. BIN build/slider-value-range/assets/thumb-x-oblong-dark.png
  103. BIN build/slider-value-range/assets/thumb-x-oblong.png
  104. BIN build/slider-value-range/assets/thumb-x-oblong2-dark.png
  105. BIN build/slider-value-range/assets/thumb-x-oblong2.png
  106. BIN build/slider-value-range/assets/thumb-y-oblong-dark.png
  107. BIN build/slider-value-range/assets/thumb-y-oblong.png
  108. BIN build/slider-value-range/assets/thumb-y-oblong2-dark.png
  109. BIN build/slider-value-range/assets/thumb-y-oblong2.png
  110. +16 −1 build/yui-base/yui-base-debug.js
  111. +3 −3 build/yui-base/yui-base-min.js
  112. +16 −1 build/yui-base/yui-base.js
  113. +16 −1 build/yui-core/yui-core-debug.js
  114. +3 −3 build/yui-core/yui-core-min.js
  115. +16 −1 build/yui-core/yui-core.js
  116. +270 −370 build/yui-nodejs/yui-nodejs-debug.js
  117. +7 −7 build/yui-nodejs/yui-nodejs-min.js
  118. +260 −356 build/yui-nodejs/yui-nodejs.js
  119. +270 −370 build/yui/yui-debug.js
  120. +7 −7 build/yui/yui-min.js
  121. +260 −356 build/yui/yui.js
  122. +18 −0 sandbox/loader/alias.html
  123. +3 −0 sandbox/loader/davglass.js
  124. +4 −4 sandbox/loader/gallery.html
  125. +41 −0 sandbox/loader/index.html
  126. +31 −0 sandbox/loader/pattern.html
  127. +75 −20 src/app/js/router.js
  128. +108 −11 src/app/tests/app-test.js
  129. +12 −0 src/base/HISTORY.md
  130. +31 −26 src/base/js/Base.js
  131. +45 −0 src/base/tests/base.html
  132. +1 −0 src/common/tests/coverage.xml
  133. +1 −1 src/common/tests/unit.xml
  134. +11 −4 src/escape/HISTORY.md
  135. +5 −2 src/escape/js/escape.js
  136. +1 −1 src/escape/tests/functional/escape-test.js
  137. +27 −0 src/get/build.xml
  138. +8 −0 src/get/get-nodejs.properties
  139. 0 src/{yui → get}/get-nodejs.xml
  140. +6 −0 src/get/get.properties
  141. 0 src/{yui → get}/get.xml
  142. 0 src/{yui → get}/js/get-nodejs.js
  143. 0 src/{yui → get}/js/get.js
  144. +5 −0 src/get/meta/get.json
  145. +156 −156 src/{yui/tests/get-tests.js → get/tests/get-test.js}
  146. +3 −3 src/{yui → get}/tests/get.html
  147. 0 src/{yui → get}/tests/getfiles/a.css
  148. 0 src/{yui → get}/tests/getfiles/a.js
  149. 0 src/{yui → get}/tests/getfiles/b.css
  150. 0 src/{yui → get}/tests/getfiles/b.js
  151. 0 src/{yui → get}/tests/getfiles/c.css
  152. 0 src/{yui → get}/tests/getfiles/c.js
  153. 0 src/{yui → get}/tests/getfiles/delay.js
  154. 0 src/{yui → get}/tests/getfiles/ib.css
  155. 0 src/{yui → get}/tests/manual/get.html
  156. +253 −368 src/loader/js/loader.js
  157. +3 −0 src/loader/tests/assets/cond.js
  158. +3 −0 src/loader/tests/assets/cond2.js
  159. +3 −0 src/loader/tests/assets/mod.js
  160. +132 −0 src/loader/tests/loader-tests.js
  161. +1 −1 src/loader/tests/server/combo_template.html
  162. +1 −1 src/loader/tests/server/loader_template.html
  163. BIN src/overlay/docs/assets/img/nevada.png
  164. +42 −19 src/overlay/docs/overlay-align.mustache
  165. +40 −5 src/overlay/docs/partials/overlay-align-source.mustache
  166. +340 −58 src/pjax/js/pjax-base.js
  167. +2 −1 src/pjax/tests/pjax-test.js
  168. +13 −13 src/sortable/docs/partials/sortable-fish-html.mustache
  169. +2 −2 src/widget/docs/index.mustache
  170. +2 −1 src/widget/docs/partials/widget-extend-source.mustache
  171. +2 −2 src/yui/build.properties
  172. +0 −15 src/yui/get-nodejs.properties
  173. +0 −15 src/yui/get.properties
  174. +16 −1 src/yui/js/yui.js
  175. +0 −3 src/yui/meta/yui.json
  176. +2 −2 src/yui/nodejs-seed.properties
  177. +2 −2 src/yui/yui-base.properties
@@ -82,33 +82,38 @@ YUI.add('base-base', function(Y) {
* </dl>
*/
function Base() {
- Y.log('constructor called', 'life', 'base');
-
- // So the object can be used as a hash key (as DD does)
- Y.stamp(this);
-
- Attribute.call(this);
-
- // If Plugin.Host has been augmented [ through base-pluginhost ], setup it's
- // initial state, but don't initialize Plugins yet. That's done after initialization.
- var PluginHost = Y.Plugin && Y.Plugin.Host;
- if (this._initPlugins && PluginHost) {
- PluginHost.call(this);
+ if (!this._BaseInvoked) {
+ this._BaseInvoked = true;
+
+ Y.log('constructor called', 'life', 'base');
+
+ // So the object can be used as a hash key (as DD does)
+ Y.stamp(this);
+
+ Attribute.call(this);
+
+ // If Plugin.Host has been augmented [ through base-pluginhost ], setup it's
+ // initial state, but don't initialize Plugins yet. That's done after initialization.
+ var PluginHost = Y.Plugin && Y.Plugin.Host;
+ if (this._initPlugins && PluginHost) {
+ PluginHost.call(this);
+ }
+
+ if (this._lazyAddAttrs !== false) { this._lazyAddAttrs = true; }
+
+ /**
+ * The string used to identify the class of this object.
+ *
+ * @deprecated Use this.constructor.NAME
+ * @property name
+ * @type String
+ */
+ this.name = this.constructor.NAME;
+ this._eventPrefix = this.constructor.EVENT_PREFIX || this.constructor.NAME;
+
+ this.init.apply(this, arguments);
}
-
- if (this._lazyAddAttrs !== false) { this._lazyAddAttrs = true; }
-
- /**
- * The string used to identify the class of this object.
- *
- * @deprecated Use this.constructor.NAME
- * @property name
- * @type String
- */
- this.name = this.constructor.NAME;
- this._eventPrefix = this.constructor.EVENT_PREFIX || this.constructor.NAME;
-
- this.init.apply(this, arguments);
+ else { Y.log('Based constructor called more than once. Ignoring duplicate calls', 'life', 'base'); }
}
/**

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

Oops, something went wrong.
@@ -82,32 +82,36 @@ YUI.add('base-base', function(Y) {
* </dl>
*/
function Base() {
-
- // So the object can be used as a hash key (as DD does)
- Y.stamp(this);
-
- Attribute.call(this);
-
- // If Plugin.Host has been augmented [ through base-pluginhost ], setup it's
- // initial state, but don't initialize Plugins yet. That's done after initialization.
- var PluginHost = Y.Plugin && Y.Plugin.Host;
- if (this._initPlugins && PluginHost) {
- PluginHost.call(this);
+ if (!this._BaseInvoked) {
+ this._BaseInvoked = true;
+
+
+ // So the object can be used as a hash key (as DD does)
+ Y.stamp(this);
+
+ Attribute.call(this);
+
+ // If Plugin.Host has been augmented [ through base-pluginhost ], setup it's
+ // initial state, but don't initialize Plugins yet. That's done after initialization.
+ var PluginHost = Y.Plugin && Y.Plugin.Host;
+ if (this._initPlugins && PluginHost) {
+ PluginHost.call(this);
+ }
+
+ if (this._lazyAddAttrs !== false) { this._lazyAddAttrs = true; }
+
+ /**
+ * The string used to identify the class of this object.
+ *
+ * @deprecated Use this.constructor.NAME
+ * @property name
+ * @type String
+ */
+ this.name = this.constructor.NAME;
+ this._eventPrefix = this.constructor.EVENT_PREFIX || this.constructor.NAME;
+
+ this.init.apply(this, arguments);
}
-
- if (this._lazyAddAttrs !== false) { this._lazyAddAttrs = true; }
-
- /**
- * The string used to identify the class of this object.
- *
- * @deprecated Use this.constructor.NAME
- * @property name
- * @type String
- */
- this.name = this.constructor.NAME;
- this._eventPrefix = this.constructor.EVENT_PREFIX || this.constructor.NAME;
-
- this.init.apply(this, arguments);
}
/**
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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 d433eff

Please sign in to comment.