Add expandContext to JsonLdOptions
authorMarkus Lanthaler <mark_lanthaler@gmx.net>
Tue, 23 Oct 2012 18:06:01 +0200
changeset 922 b039f0c8f20b
parent 921 67d20a2e3fab
child 923 0e77b0f9445d
Add expandContext to JsonLdOptions

This closes #156.
spec/latest/json-ld-api/index.html
spec/latest/json-ld-framing/index.html
--- a/spec/latest/json-ld-api/index.html	Tue Oct 23 10:53:29 2012 +0200
+++ b/spec/latest/json-ld-api/index.html	Tue Oct 23 18:06:01 2012 +0200
@@ -710,9 +710,6 @@
           <dt>object or object[] or IRI input</dt>
           <dd>The JSON-LD object or array of JSON-LD objects to perform the expansion upon or an
             <tref>IRI</tref> referencing the JSON-LD document to expand.</dd>
-          <dt>object or IRI? context</dt>
-          <dd>An optional external context to use additionally to the context embedded in
-            <code>input</code> when expanding the <code>input</code>.</dd>
           <dt>JsonLdCallback callback</dt>
           <dd>A callback that is called when processing is complete on
             the given <code>input</code>.</dd>
@@ -989,12 +986,14 @@
         an <a>IRI</a>, the base IRI defaults to the current document IRI if in a browser context,
         or the empty string if there is no document context.
       </dd>
+      <dt>object or IRI expandContext = null</dt>
+      <dd>A context that is used to initialize the active context when expanding a document.</dd>
       <dt>boolean compactArrays = true</dt>
       <dd>If set to <code>true</code>, the JSON-LD processor replaces arrays with just
         one element with that element during compaction. If set to <code>false</code>,
         all arrays will remain arrays even if they have just one element.
       </dd>
-      <dt>boolean or IRI flatten = false</dt>
+      <dt>boolean flatten = false</dt>
       <dd>If set to a value that is not <code>false</code>,
         the JSON-LD processor must modify the output of the
         <a href="#compaction-algorithm">Compaction Algorithm</a>
@@ -1624,8 +1623,9 @@
   an <tref>active property</tref>, and an <em>element</em> to be expanded. To
   begin, the <tref>active context</tref> is set to the result of performing, <a
   href="#context-processing">Context Processing</a> on the passed
-  <em>context</em>, or empty if <em>context</em> is <tref>null</tref>,
-  <tref>active property</tref> is set to <tref>null</tref>, and
+  <code class="idlMemberName"><a href="#widl-JsonLdOptions-expandContext">expandContext</a></code>,
+  or empty if <code class="idlMemberName"><a href="#widl-JsonLdOptions-expandContext">expandContext</a></code>
+  is <tref>null</tref>, <tref>active property</tref> is set to <tref>null</tref>, and
   <em>element</em> is set to the <tref>JSON-LD input</tref>.</p>
 <ol class="algorithm">
   <li>If <em>element</em> is an <tref>array</tref>, process each entry in <em>element</em> recursively
--- a/spec/latest/json-ld-framing/index.html	Tue Oct 23 10:53:29 2012 +0200
+++ b/spec/latest/json-ld-framing/index.html	Tue Oct 23 18:06:01 2012 +0200
@@ -452,9 +452,6 @@
           <dt>object or IRI frame</dt>
           <dd>The frame to use when re-arranging the data of <code>input</code>; either
             in the form of an <tref>JSON object</tref> or as <tref>IRI</tref>.</dd>
-          <dt>object or IRI? context</dt>
-          <dd>An optional external context to use additionally to the context embedded in
-            <code>input</code> when expanding the <code>input</code>.</dd>
           <dt>JsonLdCallback callback</dt>
           <dd>A callback that is called when processing is complete on
             the given <code>input</code>.</dd>