Skip to content
This repository was archived by the owner on Feb 16, 2021. It is now read-only.

Commit 711a0fc

Browse files
committed
v1.2.0
1 parent cfc7083 commit 711a0fc

9 files changed

+83
-410
lines changed

index.html

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1>ZeroClipboard</h1>
3232

3333
<p>This library is fully compatible with Flash Player 10, which requires that the clipboard copy operation be initiated by a user click event inside the Flash movie. This is achieved by automatically floating the invisible movie on top of a <a href="http://en.wikipedia.org/wiki/Document_Object_Model">DOM</a> element of your choice. Standard mouse events are even propagated out to your DOM element, so you can still have rollover and mouse down effects.</p>
3434

35-
<p>See the <a href="https://github.com/zeroclipboard/ZeroClipboard/blob/master/docs/instructions.md">Instructions</a> for instructions on how to use the library on your site.</p>
35+
<p>See the <a href="https://github.com/zeroclipboard/zeroclipboard/blob/master/docs/instructions.md">Instructions</a> for instructions on how to use the library on your site.</p>
3636

3737
<h3>Testing this page locally</h3>
3838

@@ -42,11 +42,12 @@ <h3 id="demo">Versions</h3>
4242
<!--
4343
IMPORTANT!!!
4444
The version numbers listed in the following `code` blocks control the actual script and SWF version
45-
targetting (see "boot.js"). This is the only place you need to change the version numbers!
45+
targeting (see "boot.js"). This is the only place you need to change the version numbers!
46+
Double-check the `optgroup`s in the below `select` element for unwarranted `disabled` attributes.
4647
-->
4748
<ul id="versions">
48-
<li class="stable"><strong>Stable:</strong> <code>v1.1.7</code></li>
49-
<li class="beta"><strong>Beta:</strong> <code>v1.2.0-beta.3</code></li>
49+
<li class="stable"><strong>Stable:</strong> <code>v1.2.0</code></li>
50+
<li class="beta"><strong>Beta:</strong> <code>N/A</code></li>
5051
<li class="edge"><strong>Edge:</strong> <code>git:master</code></li>
5152
</ul>
5253

@@ -55,24 +56,18 @@ <h3 id="demo">Versions</h3>
5556
<select id="demo-type">
5657
<optgroup label="Stable (Released)">
5758
<option value="?release=stable&type=traditional">Traditional - Stable</option>
58-
<!--
5959
<option value="?release=stable&type=amd">AMD - Stable</option>
60-
<option value="?release=stable&type=commonjs">CommonJS - Stable</option>
61-
-->
60+
<option value="?release=stable&type=commonjs" disabled="disabled">CommonJS - Stable</option>
6261
</optgroup>
63-
<optgroup label="Beta (Pre-Release)">
62+
<optgroup label="Beta (Pre-Release)" disabled="disabled">
6463
<option value="?release=beta&type=traditional">Traditional - Beta</option>
6564
<option value="?release=beta&type=amd">AMD - Beta</option>
66-
<!--
67-
<option value="?release=beta&type=commonjs">CommonJS - Beta</option>
68-
-->
65+
<option value="?release=beta&type=commonjs" disabled="disabled">CommonJS - Beta</option>
6966
</optgroup>
7067
<optgroup label="Edge (master/git/Alpha)">
7168
<option value="?release=edge&type=traditional">Traditional - Edge</option>
7269
<option value="?release=edge&type=amd">AMD - Edge</option>
73-
<!--
74-
<option value="?release=edge&type=commonjs">CommonJS - Edge</option>
75-
-->
70+
<option value="?release=edge&type=commonjs" disabled="disabled">CommonJS - Edge</option>
7671
</optgroup>
7772
</select>
7873

javascripts/config-amd-edge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
ZeroClipboard.setDefaults({
3333

34-
// Allow SWF-JS/JS-SWF interactions between this demo's hosted domain and the SWF's hosted domain (`rawgithub.com`)
35-
trustedDomains: [window.location.protocol + "//" + window.location.host],
34+
// Allow SWF-JS/JS-SWF interactions between this demo's hosted domain and the SWF's hosted domain (`http://zeroclipboard.org`)
35+
trustedOrigins: [window.location.protocol + "//" + window.location.host],
3636

3737
// The path must be relative to the PAGE, NOT to the current AMD module!
3838
// Or, it could be an absolute path on the domain, e.g.:

javascripts/config-traditional-edge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Configure the root ZeroClipboard object
22
ZeroClipboard.setDefaults({
33

4-
// Allow SWF-JS/JS-SWF interactions between this demo's hosted domain and the SWF's hosted domain (`rawgithub.com`)
5-
trustedDomains: [window.location.protocol + "//" + window.location.host],
4+
// Allow SWF-JS/JS-SWF interactions between this demo's hosted domain and the SWF's hosted domain (`http://zeroclipboard.org`)
5+
trustedOrigins: [window.location.protocol + "//" + window.location.host],
66

77
// The path must be relative to the PAGE, NOT to the current AMD module!
88
// Or, it could be an absolute path on the domain, e.g.:

0 commit comments

Comments
 (0)