Permalink
Browse files

Merge branch 'master' into 3.x

  • Loading branch information...
2 parents 0af05fa + 474940b commit 96c15ae47731f55c499c8240d25b4e3d861c1b22 @ericf ericf committed Oct 26, 2012
Showing with 201 additions and 383 deletions.
  1. +16 −46 build/querystring-parse-simple/querystring-parse-simple-coverage.js
  2. +0 −30 build/querystring-parse-simple/querystring-parse-simple-debug.js
  3. +0 −30 build/querystring-parse-simple/querystring-parse-simple.js
  4. +55 −52 build/querystring-parse/querystring-parse-coverage.js
  5. +11 −8 build/querystring-parse/querystring-parse-debug.js
  6. +11 −8 build/querystring-parse/querystring-parse.js
  7. +15 −32 build/querystring-stringify-simple/querystring-stringify-simple-coverage.js
  8. +1 −18 build/querystring-stringify-simple/querystring-stringify-simple-debug.js
  9. +1 −18 build/querystring-stringify-simple/querystring-stringify-simple.js
  10. +40 −41 build/querystring-stringify/querystring-stringify-coverage.js
  11. +3 −4 build/querystring-stringify/querystring-stringify-debug.js
  12. +3 −4 build/querystring-stringify/querystring-stringify.js
  13. +1 −1 src/app/docs/app/index.mustache
  14. +2 −1 src/base/docs/assets/mycomponent.js.txt
  15. +2 −1 src/base/docs/assets/myextension.js.txt
  16. +7 −2 src/common/docs/index.mustache
  17. +9 −14 src/intl/docs/index.mustache
  18. +3 −10 src/intl/docs/intl-basic.mustache
  19. +2 −1 src/plugin/docs/assets/myplugin.js.txt
  20. +0 −30 src/querystring/js/querystring-parse-simple.js
  21. +11 −8 src/querystring/js/querystring-parse.js
  22. +1 −18 src/querystring/js/querystring-stringify-simple.js
  23. +3 −4 src/querystring/js/querystring-stringify.js
  24. +2 −1 src/widget/docs/assets/myplugin.js.txt
  25. +2 −1 src/widget/docs/assets/mywidget.js.txt
@@ -26,9 +26,9 @@ _yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"]
path: "build/querystring-parse-simple/querystring-parse-simple.js",
code: []
};
-_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].code=["YUI.add('querystring-parse-simple', function (Y, NAME) {","","// @TODO this looks like we are requiring the user to extract the querystring","// portion of the url, which isn't good. The majority use case will be to","// extract querystring from the document configured for this YUI instance.","// This should be the default if qs is not supplied.","","/*global Y */","/**"," * <p>Provides Y.QueryString.stringify method for converting objects to Query Strings."," * This is a simpler implementation than the full querystring-stringify.</p>"," * <p>Because some things may require basic query string escaping functionality,"," * this module provides the bare minimum functionality (decoding a hash of simple values),"," * without the additional support for arrays, objects, and so on.</p>"," * <p>This provides a friendly way to deserialize basic query strings, without necessitating"," * a lot of code for simple use-cases.</p>"," *"," * @module querystring"," * @submodule querystring-parse-simple"," * @for QueryString"," * @static"," */","","var QueryString = Y.namespace(\"QueryString\");","","/**"," * Provides Y.QueryString.parse method to accept Query Strings and return native"," * JavaScript objects."," *"," * @module querystring"," * @submodule querystring-parse"," * @for QueryString"," * @method parse"," * @param qs {String} Querystring to be parsed into an object."," * @param sep {String} (optional) Character that should join param k=v pairs together. Default: \"&\""," * @param eq {String} (optional) Character that should join keys to their values. Default: \"=\""," * @public"," * @static"," */","QueryString.parse = function (qs, sep, eq) {"," sep = sep || \"&\";"," eq = eq || \"=\";"," for ("," var obj = {},"," i = 0,"," pieces = qs.split(sep),"," l = pieces.length,"," tuple;"," i < l;"," i ++"," ) {"," tuple = pieces[i].split(eq);"," if (tuple.length > 0) {"," obj[QueryString.unescape(tuple.shift())] = QueryString.unescape(tuple.join(eq));"," }"," }"," return obj;","};","","/**"," * Provides Y.QueryString.unescape method to be able to override default decoding"," * method. This is important in cases where non-standard delimiters are used, if"," * the delimiters would not normally be handled properly by the builtin"," * (en|de)codeURIComponent functions."," * Default: replace \"+\" with \" \", and then decodeURIComponent behavior."," * @module querystring"," * @submodule querystring-parse"," * @for QueryString"," * @method unescape"," * @param s {String} String to be decoded."," * @public"," * @static"," **/","QueryString.unescape = function (s) {"," return decodeURIComponent(s.replace(/\\+/g, ' '));","};","","","}, '@VERSION@', {\"requires\": [\"yui-base\"]});"];
-_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].lines = {"1":0,"24":0,"40":0,"41":0,"42":0,"43":0,"52":0,"53":0,"54":0,"57":0,"74":0,"75":0};
-_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].functions = {"parse:40":0,"unescape:74":0,"(anonymous 1):1":0};
+_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].code=["YUI.add('querystring-parse-simple', function (Y, NAME) {","","// @TODO this looks like we are requiring the user to extract the querystring","// portion of the url, which isn't good. The majority use case will be to","// extract querystring from the document configured for this YUI instance.","// This should be the default if qs is not supplied.","","/*global Y */","/**"," * <p>Provides Y.QueryString.stringify method for converting objects to Query Strings."," * This is a simpler implementation than the full querystring-stringify.</p>"," * <p>Because some things may require basic query string escaping functionality,"," * this module provides the bare minimum functionality (decoding a hash of simple values),"," * without the additional support for arrays, objects, and so on.</p>"," * <p>This provides a friendly way to deserialize basic query strings, without necessitating"," * a lot of code for simple use-cases.</p>"," *"," * @module querystring"," * @submodule querystring-parse-simple"," */","","var QueryString = Y.namespace(\"QueryString\");","","QueryString.parse = function (qs, sep, eq) {"," sep = sep || \"&\";"," eq = eq || \"=\";"," for ("," var obj = {},"," i = 0,"," pieces = qs.split(sep),"," l = pieces.length,"," tuple;"," i < l;"," i ++"," ) {"," tuple = pieces[i].split(eq);"," if (tuple.length > 0) {"," obj[QueryString.unescape(tuple.shift())] = QueryString.unescape(tuple.join(eq));"," }"," }"," return obj;","};","","QueryString.unescape = function (s) {"," return decodeURIComponent(s.replace(/\\+/g, ' '));","};","","","}, '@VERSION@', {\"requires\": [\"yui-base\"]});"];
+_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].lines = {"1":0,"22":0,"24":0,"25":0,"26":0,"27":0,"36":0,"37":0,"38":0,"41":0,"44":0,"45":0};
+_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].functions = {"parse:24":0,"unescape:44":0,"(anonymous 1):1":0};
_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].coveredLines = 12;
_yuitest_coverage["build/querystring-parse-simple/querystring-parse-simple.js"].coveredFunctions = 3;
_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 1);
@@ -51,36 +51,20 @@ YUI.add('querystring-parse-simple', function (Y, NAME) {
*
* @module querystring
* @submodule querystring-parse-simple
- * @for QueryString
- * @static
*/
_yuitest_coverfunc("build/querystring-parse-simple/querystring-parse-simple.js", "(anonymous 1)", 1);
-_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 24);
+_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 22);
var QueryString = Y.namespace("QueryString");
-/**
- * Provides Y.QueryString.parse method to accept Query Strings and return native
- * JavaScript objects.
- *
- * @module querystring
- * @submodule querystring-parse
- * @for QueryString
- * @method parse
- * @param qs {String} Querystring to be parsed into an object.
- * @param sep {String} (optional) Character that should join param k=v pairs together. Default: "&"
- * @param eq {String} (optional) Character that should join keys to their values. Default: "="
- * @public
- * @static
- */
-_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 40);
+_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 24);
QueryString.parse = function (qs, sep, eq) {
- _yuitest_coverfunc("build/querystring-parse-simple/querystring-parse-simple.js", "parse", 40);
-_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 41);
+ _yuitest_coverfunc("build/querystring-parse-simple/querystring-parse-simple.js", "parse", 24);
+_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 25);
sep = sep || "&";
- _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 42);
+ _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 26);
eq = eq || "=";
- _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 43);
+ _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 27);
for (
var obj = {},
i = 0,
@@ -90,36 +74,22 @@ for (
i < l;
i ++
) {
- _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 52);
+ _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 36);
tuple = pieces[i].split(eq);
- _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 53);
+ _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 37);
if (tuple.length > 0) {
- _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 54);
+ _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 38);
obj[QueryString.unescape(tuple.shift())] = QueryString.unescape(tuple.join(eq));
}
}
- _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 57);
+ _yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 41);
return obj;
};
-/**
- * Provides Y.QueryString.unescape method to be able to override default decoding
- * method. This is important in cases where non-standard delimiters are used, if
- * the delimiters would not normally be handled properly by the builtin
- * (en|de)codeURIComponent functions.
- * Default: replace "+" with " ", and then decodeURIComponent behavior.
- * @module querystring
- * @submodule querystring-parse
- * @for QueryString
- * @method unescape
- * @param s {String} String to be decoded.
- * @public
- * @static
- **/
-_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 74);
+_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 44);
QueryString.unescape = function (s) {
- _yuitest_coverfunc("build/querystring-parse-simple/querystring-parse-simple.js", "unescape", 74);
-_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 75);
+ _yuitest_coverfunc("build/querystring-parse-simple/querystring-parse-simple.js", "unescape", 44);
+_yuitest_coverline("build/querystring-parse-simple/querystring-parse-simple.js", 45);
return decodeURIComponent(s.replace(/\+/g, ' '));
};
@@ -17,26 +17,10 @@ YUI.add('querystring-parse-simple', function (Y, NAME) {
*
* @module querystring
* @submodule querystring-parse-simple
- * @for QueryString
- * @static
*/
var QueryString = Y.namespace("QueryString");
-/**
- * Provides Y.QueryString.parse method to accept Query Strings and return native
- * JavaScript objects.
- *
- * @module querystring
- * @submodule querystring-parse
- * @for QueryString
- * @method parse
- * @param qs {String} Querystring to be parsed into an object.
- * @param sep {String} (optional) Character that should join param k=v pairs together. Default: "&"
- * @param eq {String} (optional) Character that should join keys to their values. Default: "="
- * @public
- * @static
- */
QueryString.parse = function (qs, sep, eq) {
sep = sep || "&";
eq = eq || "=";
@@ -57,20 +41,6 @@ QueryString.parse = function (qs, sep, eq) {
return obj;
};
-/**
- * Provides Y.QueryString.unescape method to be able to override default decoding
- * method. This is important in cases where non-standard delimiters are used, if
- * the delimiters would not normally be handled properly by the builtin
- * (en|de)codeURIComponent functions.
- * Default: replace "+" with " ", and then decodeURIComponent behavior.
- * @module querystring
- * @submodule querystring-parse
- * @for QueryString
- * @method unescape
- * @param s {String} String to be decoded.
- * @public
- * @static
- **/
QueryString.unescape = function (s) {
return decodeURIComponent(s.replace(/\+/g, ' '));
};
@@ -17,26 +17,10 @@ YUI.add('querystring-parse-simple', function (Y, NAME) {
*
* @module querystring
* @submodule querystring-parse-simple
- * @for QueryString
- * @static
*/
var QueryString = Y.namespace("QueryString");
-/**
- * Provides Y.QueryString.parse method to accept Query Strings and return native
- * JavaScript objects.
- *
- * @module querystring
- * @submodule querystring-parse
- * @for QueryString
- * @method parse
- * @param qs {String} Querystring to be parsed into an object.
- * @param sep {String} (optional) Character that should join param k=v pairs together. Default: "&"
- * @param eq {String} (optional) Character that should join keys to their values. Default: "="
- * @public
- * @static
- */
QueryString.parse = function (qs, sep, eq) {
sep = sep || "&";
eq = eq || "=";
@@ -57,20 +41,6 @@ QueryString.parse = function (qs, sep, eq) {
return obj;
};
-/**
- * Provides Y.QueryString.unescape method to be able to override default decoding
- * method. This is important in cases where non-standard delimiters are used, if
- * the delimiters would not normally be handled properly by the builtin
- * (en|de)codeURIComponent functions.
- * Default: replace "+" with " ", and then decodeURIComponent behavior.
- * @module querystring
- * @submodule querystring-parse
- * @for QueryString
- * @method unescape
- * @param s {String} String to be decoded.
- * @public
- * @static
- **/
QueryString.unescape = function (s) {
return decodeURIComponent(s.replace(/\+/g, ' '));
};
Oops, something went wrong.

0 comments on commit 96c15ae

Please sign in to comment.