examples/api-samples/public/docs/sample28.html in groupdocs-1.5.9 vs examples/api-samples/public/docs/sample28.html in groupdocs-1.6.0
- old
+ new
@@ -61,13 +61,14 @@
</div>
<p>Set variables</p>
</div>
- <div class="content"><div class='highlight'><pre> set <span class="symbol">:client_id</span>, params[<span class="symbol">:client_id</span>]
- set <span class="symbol">:private_key</span>, params[<span class="symbol">:private_key</span>]
+ <div class="content"><div class='highlight'><pre> set <span class="symbol">:client_id</span>, params[<span class="symbol">:clientId</span>]
+ set <span class="symbol">:private_key</span>, params[<span class="symbol">:privateKey</span>]
set <span class="symbol">:file_id</span>, params[<span class="symbol">:fileId</span>]
+ set <span class="symbol">:base_path</span>, params[<span class="symbol">:basePath</span>]
<span class="keyword">begin</span></pre></div></div>
</li>
@@ -91,13 +92,10 @@
<div class="annotation">
<div class="pilwrap ">
<a class="pilcrow" href="#section-5">¶</a>
</div>
-<<<<<<< HEAD
- <p>Configure your access to API server.</p>
-=======
<p>Prepare base path</p>
</div>
<div class="content"><div class='highlight'><pre> <span class="keyword">if</span> settings.base_path.empty?
@@ -116,31 +114,26 @@
<div class="pilwrap ">
<a class="pilcrow" href="#section-6">¶</a>
</div>
<p>Configure your access to API server</p>
->>>>>>> samples-dev
</div>
<div class="content"><div class='highlight'><pre> <span class="constant">GroupDocs</span>.configure <span class="keyword">do</span> |groupdocs|
groupdocs.client_id = settings.client_id
- groupdocs.private_key = settings.private_key
- <span class="keyword">end</span></pre></div></div>
+ groupdocs.private_key = settings.private_key</pre></div></div>
</li>
<li id="section-7">
<div class="annotation">
<div class="pilwrap ">
<a class="pilcrow" href="#section-7">¶</a>
</div>
-<<<<<<< HEAD
- <p>make a request to API using client_id and private_key</p>
-=======
<p>Optionally specify API server and version</p>
</div>
<div class="content"><div class='highlight'><pre> groupdocs.api_server = base_path <span class="comment"># default is 'https://api.groupdocs.com'</span>
@@ -154,33 +147,24 @@
<div class="pilwrap ">
<a class="pilcrow" href="#section-8">¶</a>
</div>
<p>Make a request to API using client_id and private_key</p>
->>>>>>> samples-dev
</div>
<div class="content"><div class='highlight'><pre> files_list = <span class="constant">GroupDocs::Storage::Folder</span>.list!(<span class="string">'/'</span>, {})
document = <span class="string">''</span></pre></div></div>
</li>
-<<<<<<< HEAD
- <li id="section-7">
- <div class="annotation">
-
- <div class="pilwrap ">
- <a class="pilcrow" href="#section-7">¶</a>
-=======
<li id="section-9">
<div class="annotation">
<div class="pilwrap ">
<a class="pilcrow" href="#section-9">¶</a>
->>>>>>> samples-dev
</div>
<p>Get document by file ID</p>
</div>
@@ -194,56 +178,36 @@
<span class="keyword">unless</span> document.instance_of? <span class="constant">String</span></pre></div></div>
</li>
-<<<<<<< HEAD
- <li id="section-8">
- <div class="annotation">
-
- <div class="pilwrap ">
- <a class="pilcrow" href="#section-8">¶</a>
-=======
<li id="section-10">
<div class="annotation">
<div class="pilwrap ">
<a class="pilcrow" href="#section-10">¶</a>
->>>>>>> samples-dev
</div>
<p>Get list of annotations</p>
</div>
- <div class="content"><div class='highlight'><pre> annotations = document.to_document.annotations!(<span class="symbol">:client_id</span> => settings.client_id, <span class="symbol">:private_key</span> => settings.private_key)</pre></div></div>
+ <div class="content"><div class='highlight'><pre> annotations = document.to_document.annotations!()</pre></div></div>
</li>
-<<<<<<< HEAD
- <li id="section-9">
- <div class="annotation">
-
- <div class="pilwrap ">
- <a class="pilcrow" href="#section-9">¶</a>
-=======
<li id="section-11">
<div class="annotation">
<div class="pilwrap ">
<a class="pilcrow" href="#section-11">¶</a>
->>>>>>> samples-dev
</div>
<p>Delete all annotations from document</p>
</div>
<div class="content"><div class='highlight'><pre> annotations.each <span class="keyword">do</span> |annotation|
-<<<<<<< HEAD
- annotation.remove!(<span class="symbol">:client_id</span> => settings.client_id, <span class="symbol">:private_key</span> => settings.private_key)
- <span class="keyword">end</span>
-=======
annotation.remove!()
<span class="keyword">end</span></pre></div></div>
</li>
@@ -309,11 +273,10 @@
<p>Make iframe</p>
</div>
<div class="content"><div class='highlight'><pre> iframe = <span class="string">"<iframe id='downloadframe' src='<span class="subst">#{iframe}</span>' width='800' height='1000'></iframe>"</span>
->>>>>>> samples-dev
message = <span class="string">'Annotations was deleted from document'</span>
<span class="keyword">end</span>
<span class="keyword">rescue</span> <span class="constant">Exception</span> => e
@@ -321,22 +284,14 @@
<span class="keyword">end</span></pre></div></div>
</li>
-<<<<<<< HEAD
- <li id="section-10">
- <div class="annotation">
-
- <div class="pilwrap ">
- <a class="pilcrow" href="#section-10">¶</a>
-=======
<li id="section-16">
<div class="annotation">
<div class="pilwrap ">
<a class="pilcrow" href="#section-16">¶</a>
->>>>>>> samples-dev
</div>
<p>Set variables for template</p>
</div>