Permalink
Browse files

Merge branch 'dev-3.x' into grunt

  • Loading branch information...
davglass committed Feb 21, 2013
2 parents 60b165d + 05451b4 commit 39cc11d8fc6807f20b6e8a6a08037b5c1980663d
Showing with 2,121 additions and 758 deletions.
  1. +2 −2 build/axis-base/axis-base-coverage.js
  2. +1 −1 build/axis-base/axis-base-debug.js
  3. +1 −1 build/axis-base/axis-base.js
  4. +2 −2 build/axis-category-base/axis-category-base-coverage.js
  5. +1 −1 build/axis-category-base/axis-category-base-debug.js
  6. +1 −1 build/axis-category-base/axis-category-base.js
  7. +2 −2 build/escape/escape-coverage.js
  8. +1 −1 build/escape/escape-debug.js
  9. +1 −1 build/escape/escape.js
  10. +5 −5 build/event-simulate/event-simulate-coverage.js
  11. +4 −4 build/event-simulate/event-simulate-debug.js
  12. +4 −4 build/event-simulate/event-simulate.js
  13. +307 −309 build/gesture-simulate/gesture-simulate-coverage.js
  14. +6 −8 build/gesture-simulate/gesture-simulate-debug.js
  15. +6 −8 build/gesture-simulate/gesture-simulate.js
  16. +29 −3 build/handlebars-base/handlebars-base-debug.js
  17. +1 −1 build/handlebars-base/handlebars-base-min.js
  18. +29 −3 build/handlebars-base/handlebars-base.js
  19. +245 −86 build/handlebars-compiler/handlebars-compiler-debug.js
  20. +4 −4 build/handlebars-compiler/handlebars-compiler-min.js
  21. +245 −86 build/handlebars-compiler/handlebars-compiler.js
  22. +3 −3 build/imageloader/imageloader-coverage.js
  23. +2 −2 build/imageloader/imageloader-debug.js
  24. +2 −2 build/imageloader/imageloader.js
  25. +2 −2 build/series-cartesian/series-cartesian-coverage.js
  26. +1 −1 build/series-cartesian/series-cartesian-debug.js
  27. +1 −1 build/series-cartesian/series-cartesian.js
  28. +80 −1 build/series-fill-util/series-fill-util-coverage.js
  29. +2 −2 build/swf/swf-coverage.js
  30. +1 −1 build/swf/swf-debug.js
  31. +1 −1 build/swf/swf.js
  32. +2 −2 build/test/test-coverage.js
  33. +1 −1 build/test/test-debug.js
  34. +1 −1 build/test/test.js
  35. +69 −66 build/tree-node/tree-node-coverage.js
  36. +9 −6 build/tree-node/tree-node-debug.js
  37. +9 −6 build/tree-node/tree-node.js
  38. +2 −2 build/tree/tree-coverage.js
  39. +1 −1 build/tree/tree-debug.js
  40. +1 −1 build/tree/tree.js
  41. +1 −1 src/charts/js/AxisBase.js
  42. +1 −1 src/charts/js/CartesianSeries.js
  43. +1 −1 src/charts/js/CategoryImpl.js
  44. +4 −4 src/cssnormalize/docs/component.json
  45. +3 −3 src/cssnormalize/docs/index.mustache
  46. +1 −1 src/escape/js/escape.js
  47. +4 −4 src/event-simulate/js/event-simulate.js
  48. +6 −8 src/gesture-simulate/js/gesture-simulate.js
  49. +7 −1 src/handlebars/js/handlebars-base.js
  50. +5 −2 src/handlebars/js/handlebars-compiler-ast.js
  51. +6 −2 src/handlebars/js/handlebars-compiler-base.js
  52. +234 −82 src/handlebars/js/handlebars-compiler-compiler.js
  53. +22 −2 src/handlebars/js/handlebars-runtime.js
  54. +2 −2 src/imageloader/js/imageloader.js
  55. +1 −1 src/swf/js/swf.js
  56. +1 −1 src/test/js/TestRunner.js
  57. +9 −0 src/tree/docs/component.json
  58. +716 −0 src/tree/docs/index.mustache
  59. +9 −6 src/tree/js/tree-node.js
  60. +1 −1 src/tree/js/tree.js

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -582,7 +582,7 @@ Y.AxisBase = Y.Base.create("axisBase", Y.Base, [Y.Renderer], {
/**
* Determines whether and offset is automatically calculated for the edges of the axis.
*
- * @attr calculateEdgeOffset
+ * @attribute calculateEdgeOffset
* @type Boolean
*/
calculateEdgeOffset: {
@@ -582,7 +582,7 @@ Y.AxisBase = Y.Base.create("axisBase", Y.Base, [Y.Renderer], {
/**
* Determines whether and offset is automatically calculated for the edges of the axis.
*
- * @attr calculateEdgeOffset
+ * @attribute calculateEdgeOffset
* @type Boolean
*/
calculateEdgeOffset: {
@@ -26,7 +26,7 @@ _yuitest_coverage["build/axis-category-base/axis-category-base.js"] = {
path: "build/axis-category-base/axis-category-base.js",
code: []
};
-_yuitest_coverage["build/axis-category-base/axis-category-base.js"].code=["YUI.add('axis-category-base', function (Y, NAME) {","","/**"," * Provides functionality for the handling of category axis data for a chart."," *"," * @module charts"," * @submodule axis-category-base"," */","","/**"," * CategoryImpl contains logic for managing category data. CategoryImpl is used by the following classes:"," * <ul>"," * <li>{{#crossLink \"CategoryAxisBase\"}}{{/crossLink}}</li>"," * <li>{{#crossLink \"CategoryAxis\"}}{{/crossLink}}</li>"," * </ul>"," *"," * @class CategoryImpl"," * @constructor"," * @submodule axis-category-base"," */","function CategoryImpl()","{","}","","CategoryImpl.NAME = \"categoryImpl\";","","CategoryImpl.ATTRS = {"," /**"," * Determines whether and offset is automatically calculated for the edges of the axis."," *"," * @attr calculateEdgeOffset"," * @type Boolean"," */"," calculateEdgeOffset: {"," value: true"," }"," "," /**"," * Method used for formatting a label. This attribute allows for the default label formatting method to overridden."," * The method use would need to implement the arguments below and return a `String` or `HTMLElement`."," * <dl>"," * <dt>val</dt><dd>Label to be formatted. (`String`)</dd>"," * <dt>format</dt><dd>Template for formatting label. (optional)</dd>"," * </dl>"," *"," * @attribute labelFunction"," * @type Function"," */","};","","CategoryImpl.prototype = {"," /**"," * Formats a label based on the axis type and optionally specified format."," *"," * @method formatLabel"," * @param {Object} value"," * @param {Object} format Pattern used to format the value."," * @return String"," */"," formatLabel: function(val, format)"," {"," return val;"," },",""," /**"," * Object storing key data."," *"," * @property _indices"," * @private"," */"," _indices: null,",""," /**"," * Constant used to generate unique id."," *"," * @property GUID"," * @type String"," * @private"," */"," GUID: \"yuicategoryaxis\",",""," /**"," * Type of data used in `Data`."," *"," * @property _dataType"," * @readOnly"," * @private"," */"," _type: \"category\",",""," /**"," * Calculates the maximum and minimum values for the `Data`."," *"," * @method _updateMinAndMax"," * @private"," */"," _updateMinAndMax: function()"," {"," this._dataMaximum = Math.max(this.get(\"data\").length - 1, 0);"," this._dataMinimum = 0;"," },",""," /**"," * Gets an array of values based on a key."," *"," * @method _getKeyArray"," * @param {String} key Value key associated with the data array."," * @param {Array} data Array in which the data resides."," * @return Array"," * @private"," */"," _getKeyArray: function(key, data)"," {"," var i = 0,"," obj,"," keyArr = [],"," labels = [],"," len = data.length;"," if(!this._indices)"," {"," this._indices = {};"," }"," for(; i < len; ++i)"," {"," obj = data[i];"," keyArr[i] = i;"," labels[i] = obj[key];"," }"," this._indices[key] = keyArr;"," return labels;"," },",""," /**"," * Returns an array of values based on an identifier key."," *"," * @method getDataByKey"," * @param {String} value value used to identify the array"," * @return Array"," */"," getDataByKey: function (value)"," {"," if(!this._indices)"," {"," this.get(\"keys\");"," }"," var keys = this._indices;"," if(keys && keys[value])"," {"," return keys[value];"," }"," return null;"," },",""," /**"," * Returns the total number of majorUnits that will appear on an axis."," *"," * @method getTotalMajorUnits"," * @param {Object} majorUnit Object containing properties related to the majorUnit."," * @param {Number} len Length of the axis."," * @return Number"," */"," getTotalMajorUnits: function(majorUnit, len)"," {"," return this.get(\"data\").length;"," },",""," /**"," * Returns a value based of a key value and an index."," *"," * @method getKeyValueAt"," * @param {String} key value used to look up the correct array"," * @param {Number} index within the array"," * @return String"," */"," getKeyValueAt: function(key, index)"," {"," var value = NaN,"," keys = this.get(\"keys\");"," if(keys[key] && keys[key][index])"," {"," value = keys[key][index];"," }"," return value;"," }","};","","Y.CategoryImpl = CategoryImpl;","","/**"," * CategoryAxisBase manages category data for an axis."," *"," * @class CategoryAxisBase"," * @constructor"," * @extends AxisBase"," * @uses CategoryImpl"," * @param {Object} config (optional) Configuration parameters."," * @submodule axis-category-base"," */","Y.CategoryAxisBase = Y.Base.create(\"categoryAxisBase\", Y.AxisBase, [Y.CategoryImpl]);","","","}, '@VERSION@', {\"requires\": [\"axis-base\"]});"];
+_yuitest_coverage["build/axis-category-base/axis-category-base.js"].code=["YUI.add('axis-category-base', function (Y, NAME) {","","/**"," * Provides functionality for the handling of category axis data for a chart."," *"," * @module charts"," * @submodule axis-category-base"," */","","/**"," * CategoryImpl contains logic for managing category data. CategoryImpl is used by the following classes:"," * <ul>"," * <li>{{#crossLink \"CategoryAxisBase\"}}{{/crossLink}}</li>"," * <li>{{#crossLink \"CategoryAxis\"}}{{/crossLink}}</li>"," * </ul>"," *"," * @class CategoryImpl"," * @constructor"," * @submodule axis-category-base"," */","function CategoryImpl()","{","}","","CategoryImpl.NAME = \"categoryImpl\";","","CategoryImpl.ATTRS = {"," /**"," * Determines whether and offset is automatically calculated for the edges of the axis."," *"," * @attribute calculateEdgeOffset"," * @type Boolean"," */"," calculateEdgeOffset: {"," value: true"," }"," "," /**"," * Method used for formatting a label. This attribute allows for the default label formatting method to overridden."," * The method use would need to implement the arguments below and return a `String` or `HTMLElement`."," * <dl>"," * <dt>val</dt><dd>Label to be formatted. (`String`)</dd>"," * <dt>format</dt><dd>Template for formatting label. (optional)</dd>"," * </dl>"," *"," * @attribute labelFunction"," * @type Function"," */","};","","CategoryImpl.prototype = {"," /**"," * Formats a label based on the axis type and optionally specified format."," *"," * @method formatLabel"," * @param {Object} value"," * @param {Object} format Pattern used to format the value."," * @return String"," */"," formatLabel: function(val, format)"," {"," return val;"," },",""," /**"," * Object storing key data."," *"," * @property _indices"," * @private"," */"," _indices: null,",""," /**"," * Constant used to generate unique id."," *"," * @property GUID"," * @type String"," * @private"," */"," GUID: \"yuicategoryaxis\",",""," /**"," * Type of data used in `Data`."," *"," * @property _dataType"," * @readOnly"," * @private"," */"," _type: \"category\",",""," /**"," * Calculates the maximum and minimum values for the `Data`."," *"," * @method _updateMinAndMax"," * @private"," */"," _updateMinAndMax: function()"," {"," this._dataMaximum = Math.max(this.get(\"data\").length - 1, 0);"," this._dataMinimum = 0;"," },",""," /**"," * Gets an array of values based on a key."," *"," * @method _getKeyArray"," * @param {String} key Value key associated with the data array."," * @param {Array} data Array in which the data resides."," * @return Array"," * @private"," */"," _getKeyArray: function(key, data)"," {"," var i = 0,"," obj,"," keyArr = [],"," labels = [],"," len = data.length;"," if(!this._indices)"," {"," this._indices = {};"," }"," for(; i < len; ++i)"," {"," obj = data[i];"," keyArr[i] = i;"," labels[i] = obj[key];"," }"," this._indices[key] = keyArr;"," return labels;"," },",""," /**"," * Returns an array of values based on an identifier key."," *"," * @method getDataByKey"," * @param {String} value value used to identify the array"," * @return Array"," */"," getDataByKey: function (value)"," {"," if(!this._indices)"," {"," this.get(\"keys\");"," }"," var keys = this._indices;"," if(keys && keys[value])"," {"," return keys[value];"," }"," return null;"," },",""," /**"," * Returns the total number of majorUnits that will appear on an axis."," *"," * @method getTotalMajorUnits"," * @param {Object} majorUnit Object containing properties related to the majorUnit."," * @param {Number} len Length of the axis."," * @return Number"," */"," getTotalMajorUnits: function(majorUnit, len)"," {"," return this.get(\"data\").length;"," },",""," /**"," * Returns a value based of a key value and an index."," *"," * @method getKeyValueAt"," * @param {String} key value used to look up the correct array"," * @param {Number} index within the array"," * @return String"," */"," getKeyValueAt: function(key, index)"," {"," var value = NaN,"," keys = this.get(\"keys\");"," if(keys[key] && keys[key][index])"," {"," value = keys[key][index];"," }"," return value;"," }","};","","Y.CategoryImpl = CategoryImpl;","","/**"," * CategoryAxisBase manages category data for an axis."," *"," * @class CategoryAxisBase"," * @constructor"," * @extends AxisBase"," * @uses CategoryImpl"," * @param {Object} config (optional) Configuration parameters."," * @submodule axis-category-base"," */","Y.CategoryAxisBase = Y.Base.create(\"categoryAxisBase\", Y.AxisBase, [Y.CategoryImpl]);","","","}, '@VERSION@', {\"requires\": [\"axis-base\"]});"];
_yuitest_coverage["build/axis-category-base/axis-category-base.js"].lines = {"1":0,"21":0,"25":0,"27":0,"51":0,"62":0,"99":0,"100":0,"114":0,"119":0,"121":0,"123":0,"125":0,"126":0,"127":0,"129":0,"130":0,"142":0,"144":0,"146":0,"147":0,"149":0,"151":0,"164":0,"177":0,"179":0,"181":0,"183":0,"187":0,"199":0};
_yuitest_coverage["build/axis-category-base/axis-category-base.js"].functions = {"CategoryImpl:21":0,"formatLabel:60":0,"_updateMinAndMax:97":0,"_getKeyArray:112":0,"getDataByKey:140":0,"getTotalMajorUnits:162":0,"getKeyValueAt:175":0,"(anonymous 1):1":0};
_yuitest_coverage["build/axis-category-base/axis-category-base.js"].coveredLines = 30;
@@ -66,7 +66,7 @@ CategoryImpl.ATTRS = {
/**
* Determines whether and offset is automatically calculated for the edges of the axis.
*
- * @attr calculateEdgeOffset
+ * @attribute calculateEdgeOffset
* @type Boolean
*/
calculateEdgeOffset: {
@@ -28,7 +28,7 @@ CategoryImpl.ATTRS = {
/**
* Determines whether and offset is automatically calculated for the edges of the axis.
*
- * @attr calculateEdgeOffset
+ * @attribute calculateEdgeOffset
* @type Boolean
*/
calculateEdgeOffset: {
@@ -28,7 +28,7 @@ CategoryImpl.ATTRS = {
/**
* Determines whether and offset is automatically calculated for the edges of the axis.
*
- * @attr calculateEdgeOffset
+ * @attribute calculateEdgeOffset
* @type Boolean
*/
calculateEdgeOffset: {
@@ -26,7 +26,7 @@ _yuitest_coverage["build/escape/escape.js"] = {
path: "build/escape/escape.js",
code: []
};
-_yuitest_coverage["build/escape/escape.js"].code=["YUI.add('escape', function (Y, NAME) {","","/**","Provides utility methods for escaping strings.","","@module escape","@class Escape","@static","@since 3.3.0","**/","","var HTML_CHARS = {"," '&': '&amp;',"," '<': '&lt;',"," '>': '&gt;',"," '\"': '&quot;',"," \"'\": '&#x27;',"," '/': '&#x2F;',"," '`': '&#x60;'"," },","","Escape = {"," // -- Public Static Methods ------------------------------------------------",""," /**"," Returns a copy of the specified string with special HTML characters"," escaped. The following characters will be converted to their"," corresponding character entities:",""," & < > \" ' / `",""," This implementation is based on the [OWASP HTML escaping"," recommendations][1]. In addition to the characters in the OWASP"," recommendations, we also escape the <code>&#x60;</code> character, since IE"," interprets it as an attribute delimiter.",""," If _string_ is not already a string, it will be coerced to a string.",""," [1]: http://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet",""," @method html"," @param {String} string String to escape."," @return {String} Escaped string."," @static"," **/"," html: function (string) {"," return (string + '').replace(/[&<>\"'\\/`]/g, Escape._htmlReplacer);"," },",""," /**"," Returns a copy of the specified string with special regular expression"," 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.",""," @method regex"," @param {String} string String to escape."," @return {String} Escaped string."," @static"," **/"," regex: function (string) {"," // 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 ---------------------------------------------",""," /**"," * Regex replacer for HTML escaping."," *"," * @method _htmlReplacer"," * @param {String} match Matched character (must exist in HTML_CHARS)."," * @returns {String} HTML entity."," * @static"," * @protected"," */"," _htmlReplacer: function (match) {"," return HTML_CHARS[match];"," }","};","","Escape.regexp = Escape.regex;","","Y.Escape = Escape;","","","}, '@VERSION@', {\"requires\": [\"yui-base\"]});"];
+_yuitest_coverage["build/escape/escape.js"].code=["YUI.add('escape', function (Y, NAME) {","","/**","Provides utility methods for escaping strings.","","@module escape","@class Escape","@static","@since 3.3.0","**/","","var HTML_CHARS = {"," '&': '&amp;',"," '<': '&lt;',"," '>': '&gt;',"," '\"': '&quot;',"," \"'\": '&#x27;',"," '/': '&#x2F;',"," '`': '&#x60;'"," },","","Escape = {"," // -- Public Static Methods ------------------------------------------------",""," /**"," Returns a copy of the specified string with special HTML characters"," escaped. The following characters will be converted to their"," corresponding character entities:",""," & < > \" ' / `",""," This implementation is based on the [OWASP HTML escaping"," recommendations][1]. In addition to the characters in the OWASP"," recommendations, we also escape the <code>&#x60;</code> character, since IE"," interprets it as an attribute delimiter.",""," If _string_ is not already a string, it will be coerced to a string.",""," [1]: http://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet",""," @method html"," @param {String} string String to escape."," @return {String} Escaped string."," @static"," **/"," html: function (string) {"," return (string + '').replace(/[&<>\"'\\/`]/g, Escape._htmlReplacer);"," },",""," /**"," Returns a copy of the specified string with special regular expression"," 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.",""," @method regex"," @param {String} string String to escape."," @return {String} Escaped string."," @static"," **/"," regex: function (string) {"," // 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 ---------------------------------------------",""," /**"," * Regex replacer for HTML escaping."," *"," * @method _htmlReplacer"," * @param {String} match Matched character (must exist in HTML_CHARS)."," * @return {String} HTML entity."," * @static"," * @protected"," */"," _htmlReplacer: function (match) {"," return HTML_CHARS[match];"," }","};","","Escape.regexp = Escape.regex;","","Y.Escape = Escape;","","","}, '@VERSION@', {\"requires\": [\"yui-base\"]});"];
_yuitest_coverage["build/escape/escape.js"].lines = {"1":0,"12":0,"47":0,"68":0,"83":0,"87":0,"89":0};
_yuitest_coverage["build/escape/escape.js"].functions = {"html:46":0,"regex:64":0,"_htmlReplacer:82":0,"(anonymous 1):1":0};
_yuitest_coverage["build/escape/escape.js"].coveredLines = 7;
@@ -115,7 +115,7 @@ return (string + '').replace(/[\-$\^*()+\[\]{}|\\,.?\s]/g, '\\$&');
*
* @method _htmlReplacer
* @param {String} match Matched character (must exist in HTML_CHARS).
- * @returns {String} HTML entity.
+ * @return {String} HTML entity.
* @static
* @protected
*/
@@ -75,7 +75,7 @@ Escape = {
*
* @method _htmlReplacer
* @param {String} match Matched character (must exist in HTML_CHARS).
- * @returns {String} HTML entity.
+ * @return {String} HTML entity.
* @static
* @protected
*/
View
@@ -75,7 +75,7 @@ Escape = {
*
* @method _htmlReplacer
* @param {String} match Matched character (must exist in HTML_CHARS).
- * @returns {String} HTML entity.
+ * @return {String} HTML entity.
* @static
* @protected
*/

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 39cc11d

Please sign in to comment.