Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents df947e1 + 130d9cd commit 29093c5cf2530eabf471b84e44f154564779fd99 @jbuck jbuck committed Jul 14, 2011
Showing with 22 additions and 21 deletions.
  1. +2 −1 CHANGELOG
  2. +3 −3 example.html
  3. +16 −16 examples/seneca/loading (95)/index.html
  4. +1 −1 processing.js
View
@@ -1,4 +1,4 @@
-July 13, 2011 - Release 1.2.2
+July 14, 2011 - Release 1.2.3
* Added a note to the test suite about Opera failing Cursor
* Added httpd.py to the distribution in order to run a local http server for testing
@@ -7,6 +7,7 @@ July 13, 2011 - Release 1.2.2
* Added both inline and external loading samples to the example.html example
* Add JavaScript event hooks to Sketch
* Changed Processing.logger back to tinyLogLite
+ * Changed the script attribute used to target a canvas from data-target to data-processing-target
* Converted test suite #113 and #114 to ref tests
* Converted README to README.md
* Converted ref tests to have proper draw loops with exit() in them
View
@@ -7,9 +7,9 @@
<!--
This is a source-file-less sketch, loaded from inline source code in
- the html header. This only works if the script specifies a data-target
+ the html header. This only works if the script specifies a data-processing-target
-->
- <script type="text/processing" data-target="targetcanvas">
+ <script type="text/processing" data-processing-target="targetcanvas">
// Processing.js example sketch
int fontsize = 24;
@@ -84,7 +84,7 @@
<p>This sketch is loaded from a &lt;script&gt; in the html header block
which specifies this canvas as its target, referencing its id:</p>
- <pre> &lt;script type="text/processing" data-target="targetcanvas"&gt;...&lt;/script&gt;</pre>
+ <pre> &lt;script type="text/processing" data-processing-target="targetcanvas"&gt;...&lt;/script&gt;</pre>
<canvas id="targetcanvas" style="border: 1px solid black;"></canvas>
</body>
@@ -6,8 +6,8 @@
<script type="text/javascript" src="../../../processing.js"></script>
- <script type="text/processing" src="c1.pde" data-target="c1"></script>
- <script type="text/processing" data-target="c2">
+ <script type="text/processing" src="c1.pde" data-processing-target="c1"></script>
+ <script type="text/processing" data-processing-target="c2">
String lstring = "C2 loaded successfully!";
void setup() {
size(200,100);
@@ -18,8 +18,8 @@
float tw = textWidth(lstring);
text(lstring, (width-tw)/2, height/2); }
</script>
- <script type="application/processing" src="c3.pde" data-target="c3"></script>
- <script type="application/processing" data-target="c4">
+ <script type="application/processing" src="c3.pde" data-processing-target="c3"></script>
+ <script type="application/processing" data-processing-target="c4">
String lstring = "C4 loaded successfully!";
void setup() {
size(200,100);
@@ -42,7 +42,7 @@
to see if they are linked to the correct <canvas> elements
-->
<body>
- <script type="text/processing" data-target="c5">
+ <script type="text/processing" data-processing-target="c5">
String lstring = "C5 loaded successfully!";
void setup() {
size(200,100);
@@ -53,7 +53,7 @@
float tw = textWidth(lstring);
text(lstring, (width-tw)/2, height/2); }
</script>
- <script type="application/processing" data-target="c6">
+ <script type="application/processing" data-processing-target="c6">
String lstring = "C6 loaded successfully!";
void setup() {
size(200,100);
@@ -64,8 +64,8 @@
float tw = textWidth(lstring);
text(lstring, (width-tw)/2, height/2); }
</script>
- <script type="text/processing" data-target="c7" src="c7.pde"></script>
- <script type="application/processing" data-target="c8" src="c8.pde"></script>
+ <script type="text/processing" data-processing-target="c7" src="c7.pde"></script>
+ <script type="application/processing" data-processing-target="c8" src="c8.pde"></script>
<h1>Sketch loading test; both inline and from source</h1>
@@ -74,23 +74,23 @@
<h2>canvas 1 - script-src from head for text/processing</h2>
<pre>&lt;head&gt;
...
- &lt;script type="text/processing" src="c1.pde" data-target="c1"&gt;&lt;/script&gt;
+ &lt;script type="text/processing" src="c1.pde" data-processing-target="c1"&gt;&lt;/script&gt;
...
&lt;/head&gt;</pre>
<canvas id="c1"></canvas>
<h2>canvas 2 - script block from head for text/processing</h2>
<pre>&lt;head&gt;
...
- &lt;script type="text/processing" data-target="c2"&gt; /*code*/ &lt;/script&gt;
+ &lt;script type="text/processing" data-processing-target="c2"&gt; /*code*/ &lt;/script&gt;
...
&lt;/head&gt;</pre>
<canvas id="c2"></canvas>
<h2>canvas 3 - script-src from head for application/processing</h2>
<pre>&lt;head&gt;
...
- &lt;script type="application/processing" src="c3.pde" data-target="c3"&gt;&lt;/script&gt;
+ &lt;script type="application/processing" src="c3.pde" data-processing-target="c3"&gt;&lt;/script&gt;
...
&lt;/head&gt;</pre>
<canvas id="c3"></canvas>
@@ -99,7 +99,7 @@
<h2>canvas 4 - script block from head for application/processing</h2>
<pre>&lt;head&gt;
...
- &lt;script type="application/processing" data-target="c4"&gt; /*code*/ &lt;/script&gt;
+ &lt;script type="application/processing" data-processing-target="c4"&gt; /*code*/ &lt;/script&gt;
...
&lt;/head&gt;</pre>
<canvas id="c4"></canvas>
@@ -169,7 +169,7 @@
<h2>canvas 5 - inline sketch with target for text/processing</h2>
<pre>&lt;body&gt;
- &lt;script type="text/processing" data-target="c5"&gt;
+ &lt;script type="text/processing" data-processing-target="c5"&gt;
String lstring = "C5 loaded successfully!";
void setup() {
size(200,100);
@@ -191,7 +191,7 @@
<h2>canvas 6 - inline sketch with target for application/processing</h2>
<pre>&lt;body&gt;
- &lt;script type="application/processing" data-target="c6"&gt;
+ &lt;script type="application/processing" data-processing-target="c6"&gt;
String lstring = "C6 loaded successfully!";
void setup() {
size(200,100);
@@ -212,7 +212,7 @@
<h2>canvas 7 - script-src from body for text/processing, using target</h2>
<pre>&lt;body&gt;
- &lt;script type="text/processing" src="c7.pde" data-target="c7"&gt;&lt;/script&gt;
+ &lt;script type="text/processing" src="c7.pde" data-processing-target="c7"&gt;&lt;/script&gt;
...
&lt;canvas id="c7"&gt;&lt;/canvas&gt;
...
@@ -221,7 +221,7 @@
<h2>canvas 8 - script-src from body for application/processing, using target</h2>
<pre>&lt;body&gt;
- &lt;script type="application/processing" src="c8.pde" data-target="c8"&gt;&lt;/script&gt;
+ &lt;script type="application/processing" src="c8.pde" data-processing-target="c8"&gt;&lt;/script&gt;
...
&lt;canvas id="c8"&gt;&lt;/canvas&gt;
...
View
@@ -19479,7 +19479,7 @@
var type = script.getAttribute("type");
if (type && (type.toLowerCase() === "text/processing" || type.toLowerCase() === "application/processing")) {
- var target = script.getAttribute("data-target");
+ var target = script.getAttribute("data-processing-target");
canvas = undef;
if (target) {
canvas = document.getElementById(target);

0 comments on commit 29093c5

Please sign in to comment.