aboutsummaryrefslogtreecommitdiffstats
path: root/src/JSON.js
diff options
context:
space:
mode:
authorIgor Minar2011-09-01 00:06:09 -0700
committerIgor Minar2011-09-01 00:19:35 -0700
commita5607e3061f5b0aa7988446025dba8f89413fd9d (patch)
treef03292e33d2da71878faaa393c33ef894c01b23c /src/JSON.js
parentff2cb86d5db4150cded494728b64095d05be4a71 (diff)
downloadangular.js-a5607e3061f5b0aa7988446025dba8f89413fd9d.tar.bz2
docs(API): various api doc fixes from Toni
Diffstat (limited to 'src/JSON.js')
-rw-r--r--src/JSON.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/JSON.js b/src/JSON.js
index 34bcfd51..1dc5cc03 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -3,15 +3,14 @@
var array = [].constructor;
/**
- * @workInProgress
* @ngdoc function
* @name angular.toJson
* @function
*
* @description
- * Serializes the input into a JSON formated string.
+ * Serializes input into a JSON-formatted string.
*
- * @param {Object|Array|Date|string|number} obj Input to jsonify.
+ * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
* @param {boolean=} pretty If set to true, the JSON output will contain newlines and whitespace.
* @returns {string} Jsonified string representing `obj`.
*/
@@ -22,16 +21,15 @@ function toJson(obj, pretty) {
}
/**
- * @workInProgress
* @ngdoc function
* @name angular.fromJson
* @function
*
* @description
- * Deserializes a string in the JSON format.
+ * Deserializes a JSON string.
*
* @param {string} json JSON string to deserialize.
- * @param {boolean} [useNative=false] Use native JSON parser if available
+ * @param {boolean} [useNative=false] Use native JSON parser, if available.
* @returns {Object|Array|Date|string|number} Deserialized thingy.
*/
function fromJson(json, useNative) {