Renamed !!js/func to !!js/function (revert)

mk-pmb · Nov 29, 2011 · 29fb905 · 29fb905
1 parent 04f7326
commit 29fb905
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,7 +2,7 @@
 ------------------
 
 * Added jsyaml executable.
-* Added !!js/func support. Finally resolves #12.
+* Added !!js/function support. Finally resolves #12.
 
 0.3.1 / 2011-11-18
 ------------------

diff --git a/README.md b/README.md
@@ -147,9 +147,9 @@ The list of standard YAML tags and corresponding JavaScipt types. See also
 **JavaScript-specific tags**
 
 ```
-!!js/regexp /pattern/gim    # RegExp
-!!js/undefined ''           # Undefined
-!!js/func   function () {}  # Function
+!!js/regexp /pattern/gim            # RegExp
+!!js/undefined ''                   # Undefined
+!!js/function 'function () {...}'   # Function
 ```
 
 ### Caveats

diff --git a/demo/index.html b/demo/index.html
@@ -208,7 +208,7 @@ <h5><a href="#" id="permalink">permalink</a> Edit source here (YAML):</h5>
 
 # https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function
 
-function: !!js/func >
+function: !!js/function >
   function foobar() {
     return 'Wow! JS-YAML Rocks!';
   }

diff --git a/demo/js/js-yaml.js b/demo/js/js-yaml.js
@@ -5086,7 +5086,7 @@ Constructor.addConstructor(
   Constructor.prototype.constructJavascriptRegExp);
 
 Constructor.addConstructor(
-  'tag:yaml.org,2002:js/func',
+  'tag:yaml.org,2002:js/function',
   Constructor.prototype.constructJavascriptFunction);
 
 

diff --git a/examples/single.yml b/examples/single.yml
@@ -189,7 +189,7 @@ undefined: !!js/undefined ~
 
 # https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function
 
-function: !!js/func >
+function: !!js/function >
   function foobar() {
     return 'Wow! JS-YAML Rocks!';
   }
diff --git a/js-yaml.js b/js-yaml.js
@@ -5086,7 +5086,7 @@ Constructor.addConstructor(
   Constructor.prototype.constructJavascriptRegExp);
 
 Constructor.addConstructor(
-  'tag:yaml.org,2002:js/func',
+  'tag:yaml.org,2002:js/function',
   Constructor.prototype.constructJavascriptFunction);
 
 

diff --git a/js-yaml.min.js b/js-yaml.min.js
diff --git a/lib/js-yaml/constructor.js b/lib/js-yaml/constructor.js
@@ -631,7 +631,7 @@ Constructor.addConstructor(
   Constructor.prototype.constructJavascriptRegExp);
 
 Constructor.addConstructor(
-  'tag:yaml.org,2002:js/func',
+  'tag:yaml.org,2002:js/function',
   Constructor.prototype.constructJavascriptFunction);