From 84edbca9e636cfbb825faa5c2ff763531ed343e8 Mon Sep 17 00:00:00 2001 From: Amit Deutsch Date: Mon, 26 Oct 2015 19:22:27 -0700 Subject: [PATCH 01/16] Fixed language of 'say' command to british-english, fixed bug in which 'readvoice' command was executing out of order. --- jquery-turtle.js | 77 ++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index 19ab9cb..9f4064d 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -6886,6 +6886,7 @@ var turtlefn = { var msg = new SpeechSynthesisUtterance(words); msg.addEventListener('end', complete); msg.addEventListener('error', complete); + msg.lang = 'en-GB'; speechSynthesis.speak(msg); pollTimer = setInterval(function() { // Chrome speech synthesis fails to deliver an 'end' event @@ -9702,44 +9703,6 @@ function prepareInput(name, callback, type) { return false; } } - if (type == 'voice') { - var SR = global.SpeechRecognition || global.webkitSpeechRecognition; - if ('function' == typeof(SR)) { - try { - recognition = new SR(); - recognition.continuous = false; - recognition.interimResults = true; - textbox.css({backgroundColor: 'lightyellow', - color: 'gray', - backgroundImage: "url(" + microphoneSvg + ")", - backgroundRepeat: 'no-repeat', - backgroundPosition: 'center'}); - recognition.onspeechstart = function() { - textbox.css({background: 'lightgreen'}); - }; - recognition.onend = function() { - textbox.css({color: '', backgroundColor: '', backgroundImage: '', - backgroundRepeat: '', backgroundPosition: ''}); - textbox.val(lastseen); - newval(); - }; - recognition.onresult = function(event) { - var text = event.results[0][0].transcript; - var confidence = event.results[0][0].confidence; - var shade = 128 - 128 * confidence; - if (event.results[0].isFinal) { - shade = 0; - lastseen = text; - } - textbox.css({color: componentColor('rgb', shade, shade, shade)}); - textbox.val(text); - }; - recognition.start(); - } catch (e) { - console.log(e); - } - } - } textbox.on('keypress keydown', key); textbox.on('change', newval); return { @@ -9755,6 +9718,44 @@ function prepareInput(name, callback, type) { marginwidth = textbox.outerWidth(true) - textbox.width(); textbox.width(desiredwidth - marginwidth); } + if (type == 'voice') { + var SR = global.SpeechRecognition || global.webkitSpeechRecognition; + if ('function' == typeof(SR)) { + try { + recognition = new SR(); + recognition.continuous = false; + recognition.interimResults = true; + textbox.css({backgroundColor: 'lightyellow', + color: 'gray', + backgroundImage: "url(" + microphoneSvg + ")", + backgroundRepeat: 'no-repeat', + backgroundPosition: 'center'}); + recognition.onspeechstart = function() { + textbox.css({background: 'lightgreen'}); + }; + recognition.onend = function() { + textbox.css({color: '', backgroundColor: '', backgroundImage: '', + backgroundRepeat: '', backgroundPosition: ''}); + textbox.val(lastseen); + newval(); + }; + recognition.onresult = function(event) { + var text = event.results[0][0].transcript; + var confidence = event.results[0][0].confidence; + var shade = 128 - 128 * confidence; + if (event.results[0].isFinal) { + shade = 0; + lastseen = text; + } + textbox.css({color: componentColor('rgb', shade, shade, shade)}); + textbox.val(text); + }; + recognition.start(); + } catch (e) { + console.log(e); + } + } + } // Focus, but don't cause autoscroll to occur due to focus. undoScrollAfter(function() { textbox.focus(); }); } From fd5689961c87e6d68f57db7e257b6f29ad01c1af Mon Sep 17 00:00:00 2001 From: Amit Deutsch Date: Tue, 27 Oct 2015 08:29:41 -0700 Subject: [PATCH 02/16] Added submit button to read and readnum, added type=number to readnum input box. --- jquery-turtle.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index 9f4064d..cc262a1 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -9653,8 +9653,9 @@ function prepareInput(name, callback, type) { if (!type) { type = 'auto'; } name = $.isNumeric(name) || name ? name : '⇒'; var textbox = $('').css({margin:0, padding:0}), + button = $('').css({marginLeft:4}), label = $('' + name + ' ' + - '').append(textbox), + '').append(textbox).append(button), debounce = null, lastseen = textbox.val(), recognition = null; @@ -9670,6 +9671,7 @@ function prepareInput(name, callback, type) { dodebounce(); lastseen = val; textbox.remove(); + button.remove(); label.append(val).css({display: 'table'}); if (type == 'number' || (type == 'auto' && $.isNumeric(val) && ('' + parseFloat(val) == val))) { @@ -9718,7 +9720,11 @@ function prepareInput(name, callback, type) { marginwidth = textbox.outerWidth(true) - textbox.width(); textbox.width(desiredwidth - marginwidth); } + if (type == 'number') { + textbox.attr('type', 'number'); + } if (type == 'voice') { + button.css({display:none}); var SR = global.SpeechRecognition || global.webkitSpeechRecognition; if ('function' == typeof(SR)) { try { From cf4d9317f89b805dfa8d6a40e843330e4367b828 Mon Sep 17 00:00:00 2001 From: Amit Deutsch Date: Wed, 28 Oct 2015 11:12:01 -0700 Subject: [PATCH 03/16] Added newval handler to button instead of text box blur. --- jquery-turtle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index cc262a1..ac528b6 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -9706,7 +9706,7 @@ function prepareInput(name, callback, type) { } } textbox.on('keypress keydown', key); - textbox.on('change', newval); + button.on('click', newval); return { result: label, setup: function() { From cf03900eb29f746ee61f4d5a232f5eff9f30b2de Mon Sep 17 00:00:00 2001 From: Amit Deutsch Date: Wed, 28 Oct 2015 21:34:18 -0700 Subject: [PATCH 04/16] Replaced the readvoice command with the listen command. --- jquery-turtle.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index 9f4064d..c44f712 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -8046,9 +8046,9 @@ var dollar_turtle_methods = { "converts input to a number: " + "readstr 'Enter code', (v) -> write v.length + ' long'"], doOutput, function readstr(a, b) { return prepareInput(a, b, 'text'); }), - readvoice: wrapglobalcommand('readvoice', - ["readvoice(html, fn) Reads voice input, if the browser supports it:" + - "readvoice 'Say something', (v) -> write v"], + listen: wrapglobalcommand('listen', + ["listen(html, fn) Reads voice input, if the browser supports it:" + + "listen 'Say something', (v) -> write v"], doOutput, function readstr(a, b) { return prepareInput(a, b, 'voice'); }), menu: wrapglobalcommand('menu', ["menu(map) shows a menu of choices and calls a function " + From 3a71978450e101f033b7c74e21e3ae2164583461 Mon Sep 17 00:00:00 2001 From: Amit Deutsch Date: Wed, 28 Oct 2015 22:40:46 -0700 Subject: [PATCH 05/16] Fixed broken test. --- test/globals.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/globals.html b/test/globals.html index f208663..a19cb14 100644 --- a/test/globals.html +++ b/test/globals.html @@ -60,7 +60,7 @@ "typeline", "read", "readnum", - "readvoice", + "listen", "readstr", "menu", "random", From de2c752ebc0908693e84a4fa6d83ca039bdd233f Mon Sep 17 00:00:00 2001 From: David Bau Date: Thu, 29 Oct 2015 02:47:21 -0400 Subject: [PATCH 06/16] Fix test. --- test/inputoutput.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/inputoutput.html b/test/inputoutput.html index a29c622..b3b33b4 100644 --- a/test/inputoutput.html +++ b/test/inputoutput.html @@ -20,14 +20,22 @@ equal(td.eq(2).text(), "3"); var clicked = 0; setTimeout(function() { - $('input').val('Amy').change(); + $('input').val('Amy'); + $('button').click(); }, 1); - var b; + var b, r2; var r = read('name?', function(t) { equal(t, 'Amy'); setTimeout(function() { + $('input').val('34'); + var e = jQuery.Event("keydown"); + e.which = 13; // Enter. + $('input').trigger(e); $('button').click(); }, 1); + r2 = readnum('count?', function(c) { + equal(c, 34); + }); b = button('click me!', function() { equal(equal($('button').last().text(), 'click me!')); equal(clicked++, 0); From 06dad3b5ea0a13b87768711dc32e36da44bdbc6b Mon Sep 17 00:00:00 2001 From: David Bau Date: Thu, 19 Nov 2015 06:50:19 -0500 Subject: [PATCH 07/16] Do not require /img/ for wear, and also add sync for newly written objects. --- jquery-turtle.js | 11 +++++++++-- test/wear.html | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index de99da4..506354e 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -2689,7 +2689,7 @@ function imgUrl(url) { if (/\//.test(url)) { return url; } url = '/img/' + url; if (isPencilHost(global.location.hostname)) { return url; } - return '//pencil.io' + url; + return '//pencilcode.net' + url; } // Retrieves the pencil code login cookie, if there is one. function loginCookie() { @@ -5944,6 +5944,9 @@ function wrapglobalcommand(name, helptext, fn, fnfilter) { this.plan(cc.resolver(j)); }); cc.exit(); + if (early && early.result && early.result.constructor === jQuery) { + sync(animate, early.result); + } } else { cc = setupContinuation(null, name, arguments, argcount); fn.apply(early, arguments); @@ -9026,7 +9029,7 @@ function nameToImg(name, defaultshape) { // Deal with unquoted "tan" and "dot". name = name.helpname || name.name; } - if (name.constructor === $) { + if (name.constructor === jQuery) { // Unwrap jquery objects. if (!name.length) { return null; } name = name.get(0); @@ -9057,6 +9060,10 @@ function nameToImg(name, defaultshape) { if (shape) { return shape(color); } + // Default to '/img/' URLs if it doesn't match a well-known name. + if (!/\//.test(name)) { + name = imgUrl(name); + } // Parse URLs. if (/\//.test(name)) { var hostname = absoluteUrlObject(name).hostname; diff --git a/test/wear.html b/test/wear.html index eed8ddc..12a9d3f 100644 --- a/test/wear.html +++ b/test/wear.html @@ -24,6 +24,20 @@ }); }); +asyncTest("Wears an creative commons image.", function() { + var r = new Turtle(red); + r.speed(100); + tick(60, function() { + ok(r.width() != 20 || r.getxy()[1] == 0); + }); + r.wear('t-watermelon'); // no /img/ needed. + r.done(function() { + ok(r.width() != 20); + tick(null); + setTimeout(start, 0); + }); +}); + asyncTest("Wears and hittests different shapes.", function() { speed(Infinity); dot(red, 30); From f4ba15971301c6b11cbb0c71e61be99c14436912 Mon Sep 17 00:00:00 2001 From: David Bau Date: Thu, 19 Nov 2015 07:36:23 -0500 Subject: [PATCH 08/16] Allow 'say' when there is no global turtle. --- jquery-turtle.js | 73 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index 506354e..bcf03f1 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -6427,6 +6427,39 @@ function drawArrowLine(c, w, x0, y0, x1, y1) { drawArrowHead(c, m); } +////////////////////////////////////////////////////////////////////////// +// VOICE SYNTHESIS +// Method for uttering words. +////////////////////////////////////////////////////////////////////////// +function utterSpeech(words, cb) { + var pollTimer = null; + function complete() { + if (pollTimer) { clearInterval(pollTimer); } + if (cb) { cb(); } + } + if (!global.speechSynthesis) { + console.log('No speech synthesis: ' + words); + complete(); + return; + } + try { + var msg = new global.SpeechSynthesisUtterance(words); + msg.addEventListener('end', complete); + msg.addEventListener('error', complete); + msg.lang = navigator.language || 'en-GB'; + global.speechSynthesis.speak(msg); + pollTimer = setInterval(function() { + // Chrome speech synthesis fails to deliver an 'end' event + // sometimes, so we also poll every 250ms. + if (global.speechSynthesis.pending || global.speechSynthesis.speaking) return; + complete(); + }, 250); + } catch (e) { + if (global.console) { global.console.log(e); } + complete(); + } +} + ////////////////////////////////////////////////////////////////////////// // TURTLE FUNCTIONS // Turtle methods to be registered as jquery instance methods. @@ -6876,35 +6909,13 @@ var turtlefn = { this.plan(function(j, elem) { cc.appear(j); this.queue(function(next) { - var finished = false, - pollTimer = null, - complete = function() { - if (finished) return; - clearInterval(pollTimer); - finished = true; + utterSpeech(words, function() { cc.resolve(j); next(); - }; - try { - var msg = new SpeechSynthesisUtterance(words); - msg.addEventListener('end', complete); - msg.addEventListener('error', complete); - msg.lang = 'en-GB'; - speechSynthesis.speak(msg); - pollTimer = setInterval(function() { - // Chrome speech synthesis fails to deliver an 'end' event - // sometimes, so we also poll every 250ms. - if (speechSynthesis.pending || speechSynthesis.speaking) return; - complete(); - }, 250); - } catch (e) { - if (global.console) { global.console.log(e); } - complete(); - } + }); }); }); return this; - }), play: wrapcommand('play', 1, ["play(notes) Play notes. Notes are specified in " + @@ -7863,6 +7874,20 @@ var dollar_turtle_methods = { function globalspeed(mps) { globaldefaultspeed(mps); }), + say: wrapraw('say', + ["say(words) Say something. Use English words." + + "say \"Let's go!\""], + function say(words) { + if (global_turtle) { + var sel = $(global_turtle); + sel.say.call(sel, words); + } else { + var cc = setupContinuation(null, 'say', arguments, 0); + cc.appear(null); + utterSpeech(words, function() { cc.resolve(null); }); + cc.exit(); + } + }), play: wrapraw('play', ["play(notes) Play notes. Notes are specified in " + "" + From 2a0dcce08464b3b6e729411b1c11d696e1cbb91c Mon Sep 17 00:00:00 2001 From: David Bau Date: Thu, 19 Nov 2015 09:01:52 -0500 Subject: [PATCH 09/16] Add test for speech synthesis. --- test/say.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 test/say.html diff --git a/test/say.html b/test/say.html new file mode 100644 index 0000000..a8aed1c --- /dev/null +++ b/test/say.html @@ -0,0 +1,25 @@ + + + + + +

+ + + + From 5565321dc105e6949e7483b46f3134d188fd7ca8 Mon Sep 17 00:00:00 2001 From: David Bau Date: Thu, 19 Nov 2015 09:07:55 -0500 Subject: [PATCH 10/16] Fix global_turtle sync when writing new objects. --- jquery-turtle.js | 6 +++--- test/sync.html | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index bcf03f1..8465c7e 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -5944,15 +5944,15 @@ function wrapglobalcommand(name, helptext, fn, fnfilter) { this.plan(cc.resolver(j)); }); cc.exit(); - if (early && early.result && early.result.constructor === jQuery) { - sync(animate, early.result); - } } else { cc = setupContinuation(null, name, arguments, argcount); fn.apply(early, arguments); cc.exit(); } if (early) { + if (early.result && early.result.constructor === jQuery && global_turtle) { + sync(global_turtle, early.result); + } return early.result; } }; diff --git a/test/sync.html b/test/sync.html index 87e4d1a..4808c51 100644 --- a/test/sync.html +++ b/test/sync.html @@ -46,4 +46,22 @@ start(); }); }); + +asyncTest("Moves a written object and verifies that sync works.", function() { + speed(10); + var w = write('hello'); + w.bk(100); + sync(w, turtle); + w.plan(function() { + // When w is done moving, w2 should not have moved yet. + var xy2 = w2.getxy(); + var xy = w.getxy(); + ok(xy2[1] > xy[1]); + }); + var w2 = write('hello2'); + w2.bk(100); + done(function() { + start(); + }); +}); From 89e724b6054d3aac6eb2b142144a3b54f133f23a Mon Sep 17 00:00:00 2001 From: David Bau Date: Mon, 30 Nov 2015 07:39:54 -0500 Subject: [PATCH 11/16] Add $.turtle.colors. --- jquery-turtle.js | 1 + test/random.html | 1 + 2 files changed, 2 insertions(+) diff --git a/jquery-turtle.js b/jquery-turtle.js index 8465c7e..da2d879 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -8626,6 +8626,7 @@ $.turtle = function turtle(id, options) { }; $.extend($.turtle, dollar_turtle_methods); +$.turtle.colors = colors; function seehelphook(text, result) { // Also, check the command to look for (non-CoffeeScript) help requests. diff --git a/test/random.html b/test/random.html index 0d03405..4e6e289 100644 --- a/test/random.html +++ b/test/random.html @@ -20,6 +20,7 @@ equal(random([1,2,3]), 3); equal(random(), 0.9520654011140274); equal(random(null), 0.006122341186296597); + equal($.turtle.colors.indexOf('red'), 120); start(); }); From 157acf35a1166b9fc2df8adf840a62175c2230a3 Mon Sep 17 00:00:00 2001 From: Markus Bordihn Date: Sat, 9 Jan 2016 16:12:56 +0100 Subject: [PATCH 12/16] Fix and clean up the code to avoid compiler errors and warnings. --- jquery-turtle.js | 75 +++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/jquery-turtle.js b/jquery-turtle.js index da2d879..033294b 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -772,7 +772,7 @@ function readTransformMatrix(elem) { // Reads out the css transformOrigin property, if present. function readTransformOrigin(elem, wh) { var hidden = ($.css(elem, 'display') === 'none'), - swapout, old, name, gcs, origin; + swapout, old, name; if (hidden) { // IE GetComputedStyle doesn't give pixel values for transformOrigin // unless the element is unhidden. @@ -783,13 +783,13 @@ function readTransformOrigin(elem, wh) { elem.style[name] = swapout[name]; } } - var gcs = (global.getComputedStyle ? global.getComputedStyle(elem) : null), - origin = (gcs && gcs[transformOrigin] || $.css(elem, 'transformOrigin')); + var gcs = (global.getComputedStyle ? global.getComputedStyle(elem) : null); if (hidden) { for (name in swapout) { elem.style[name] = old[name]; } } + var origin = (gcs && gcs[transformOrigin] || $.css(elem, 'transformOrigin')); if (origin && origin.indexOf('%') < 0) { return $.map(origin.split(' '), parseFloat); } @@ -960,7 +960,7 @@ function getTurtleOrigin(elem, inverseParent, extra) { { position: "absolute", visibility: "hidden", display: "block" } : {}, substTransform = swapout[transform] = (inverseParent ? 'matrix(' + $.map(inverseParent, cssNum).join(', ') + ', 0, 0)' : 'none'), - old = {}, name, gbcr, transformOrigin, result; + old = {}, name, gbcr, transformOrigin; for (name in swapout) { old[name] = elem.style[name]; elem.style[name] = swapout[name]; @@ -1250,7 +1250,7 @@ function scrollWindowToDocumentPosition(pos, limit) { if (tx < ww2) { tx = ww2; } if (ty > dh - wh2) { ty = dh - wh2; } if (ty < wh2) { ty = wh2; } - targ = { pageX: tx, pageY: ty }; + var targ = { pageX: tx, pageY: ty }; if ($.isNumeric(limit)) { targ = limitMovement(w.origin(), targ, limit); } @@ -2178,8 +2178,7 @@ function touchesPixel(elem, color) { h = (bb.bottom - bb.top), osc = getOffscreenCanvas(w, h), octx = osc.getContext('2d'), - rgba = rgbaForColor(color), - j = 1, k, data; + j = 1, k; if (!c || c.length < 3 || !w || !h) { return false; } octx.drawImage(canvas, bb.left, bb.top, w, h, 0, 0, w, h); @@ -2726,7 +2725,8 @@ var stablyLoadedImages = {}; // @param css is a dictionary of css props to set when the image is loaded. // @param cb is an optional callback, called after the loading is done. function setImageWithStableOrigin(elem, url, css, cb) { - var record, urlobj = absoluteUrlObject(url), url = urlobj.href; + var record, urlobj = absoluteUrlObject(url); + url = urlobj.href; // The data-loading attr will always reflect the last URL requested. elem.setAttribute('data-loading', url); if (url in stablyLoadedImages) { @@ -3032,7 +3032,7 @@ var Pencil = (function(_super) { } // The pencil is a sprite that just defaults to zero size. var context = canvas ? canvas.parentElement : null; - var settings = { width: 0, height: 0, color: transparent }; + var settings = { width: 0, height: 0, color: 'transparent' }; Pencil.__super__.constructor.call(this, settings, context); // Set the pencil to hidden, infinite speed, // and drawing on the specifed canvas. @@ -3072,7 +3072,7 @@ var Webcam = (function(_super) { function Webcam(opts, context) { var attrs = "", hassrc = false, hasautoplay = false, hasdims = false; if ($.isPlainObject(opts)) { - for (key in opts) { + for (var key in opts) { attrs += ' ' + key + '="' + escapeHtml(opts[key]) + '"'; } hassrc = ('src' in opts); @@ -3317,12 +3317,12 @@ var Piano = (function(_super) { // Converts a midi number to a white key position (black keys round left). function wcp(n) { - return floor((n + 7) / 12 * 7); + return Math.floor((n + 7) / 12 * 7); }; // Converts from a white key position to a midi number. function mcp(n) { - return ceil(n / 7 * 12) - 7; + return Math.ceil(n / 7 * 12) - 7; }; // True if midi #n is a black key. @@ -4517,7 +4517,7 @@ var Instrument = (function() { if (key in given) { timbre[key] = given[key]; } else { - timbre[key] = defaulTimbre[key]; + timbre[key] = defaultTimbre[key]; } } } @@ -5206,7 +5206,6 @@ function parseABCFile(str) { function syncopateStem(stem, t) { var j, note, stemtime = stem.time, newtime = stemtime + t; stem.time = newtime; - syncopateStem for (j = 0; j < stem.notes.length; ++j) { note = stem.notes[j]; // Only adjust a note's duration if it matched the stem's duration. @@ -7116,8 +7115,8 @@ var turtlefn = { // For defaults, copy inline styles of the turtle itself except for // properties in the following list (these are the properties used to // make the turtle look like a turtle). - for (var j = 0; j < currentStyles.length; ++j) { - var styleProperty = currentStyles[j]; + for (var j2 = 0; j2 < currentStyles.length; ++j2) { + var styleProperty = currentStyles[j2]; if (/^(?:width|height|opacity|background-image|background-size)$/.test( styleProperty) || /transform/.test(styleProperty)) { continue; @@ -7535,7 +7534,6 @@ var turtlefn = { callback.apply(this, arguments); } }); - sync = null; }), plan: wrapraw('plan', ["plan(fn) Runs fn in the animation queue. For planning logic: " + @@ -7958,7 +7956,6 @@ var dollar_turtle_methods = { callback.apply(this, arguments); } }); - sync = null; }), load: wrapraw('load', ["load(url, cb) Loads data from the url and passes it to cb. " + @@ -7994,7 +7991,8 @@ var dollar_turtle_methods = { "save 'intro', 'pen gold, 20\\nfd 100\\n'"], function(url, data, cb) { if (!url) throw new Error('Missing url for save'); - var payload = { }, url = apiUrl(url, 'save'), key; + var payload = { }, key; + url = apiUrl(url, 'save'); if (/\.json(?:$|\?|\#)/.test(url)) { data = JSON.stringify(data, null, 2); } @@ -8254,7 +8252,7 @@ var dollar_turtle_methods = { return (x == 0) ? NaN : ((x > 0) ? 0 : 180); } else if (x == 0) { return (y > 0) ? Infinity : -Infinity; - } else if (abs(y) == abs(x)) { + } else if (Math.abs(y) == Math.abs(x)) { return (y > 0) ? ((x > 0) ? 45 : 135) : ((x > 0) ? -45 : -135); } @@ -8608,12 +8606,6 @@ $.turtle = function turtle(id, options) { seeopt.height = options.panelheight; } see.init(seeopt); - if (wrotebody) { - /* - see.html('Turtle script should be inside body ' + - '- wrote a <body>'); - */ - } // Return an eval loop hook string if 'see' is exported. if (exportedsee) { if (global.CoffeeScript) { @@ -9355,13 +9347,12 @@ function turtleevents(prefix) { if (prefix || prefix === '') { eventsaver = (function(e) { // Keep the old instance if possible. - var names = [prefix + e.type], j, old, name, prop; + var names = [prefix + e.type], j; if ((e.originalEvent || e) instanceof MouseEvent) { names.push(prefix + 'mouse'); } for (j = 0; j < names.length; ++j) { - var name = names[j]; - old = global[name], prop; + var name = names[j], old = global[name], prop; if (old && old.__proto__ === e.__proto__) { for (prop in old) { if (old.hasOwnProperty(prop)) delete old[prop]; } for (prop in e) { if (e.hasOwnProperty(prop)) old[prop] = e[prop]; } @@ -9757,7 +9748,7 @@ function prepareInput(name, callback, type) { textbox.attr('type', 'number'); } if (type == 'voice') { - button.css({display:none}); + button.css({display: 'none'}); var SR = global.SpeechRecognition || global.webkitSpeechRecognition; if ('function' == typeof(SR)) { try { @@ -9892,40 +9883,41 @@ function componentColor(t, args) { return t + '(' + Array.prototype.join.call(args, ',') + ')'; } -function autoArgs(arguments, start, map) { +function autoArgs(args, start, map) { var j = 0; var taken = []; var result = {}; for (var key in map) { var pattern = map[key]; - for (j = start; j < arguments.length; ++j) { + for (j = start; j < args.length; ++j) { if (~taken.indexOf(j)) continue; if (pattern == '*') { break; - } else if (pattern instanceof RegExp && pattern.test(arguments[j])) { + } else if (pattern instanceof RegExp && pattern.test(args[j])) { break; - } else if (pattern instanceof Function && pattern(arguments[j])) { + } else if (pattern instanceof Function && pattern(args[j])) { break; - } else if (pattern == typeof arguments[j]) { + } else if (pattern == typeof args[j]) { break; } } - if (j < arguments.length) { + if (j < args.length) { taken.push(j); - result[key] = arguments[j]; + result[key] = args[j]; } } - if (taken.length + start < arguments.length) { + if (taken.length + start < args.length) { var extra = []; - for (j = start; j < arguments.length; ++j) { + for (j = start; j < args.length; ++j) { if (~taken.indexOf(j)) continue; - extra.push(arguments[j]); + extra.push(args[j]); } result.extra = extra; } return result; } + ////////////////////////////////////////////////////////////////////////// // DEBUGGING SUPPORT ////////////////////////////////////////////////////////////////////////// @@ -10036,7 +10028,7 @@ debug.init(); c = cnv.getContext('2d'), relative = false, p = lineend || e, - s, html, dx, dy, dd, dir, ang; + html, dx, dy, dd, dir, ang; if (linestart && 'function' == typeof(linestart.pagexy)) { var xy = linestart.getxy(), s = linestart.pagexy(); s.x = xy[0]; @@ -10763,7 +10755,6 @@ function aselement(s, def) { default: return s; } - return null; } function stickscroll() { var stick = false, a = aselement(autoscroll, null); From 04503f35404c3a709d13b3e8b3e2bb7a5f4a4c4c Mon Sep 17 00:00:00 2001 From: Markus Bordihn Date: Wed, 13 Jan 2016 21:11:19 +0100 Subject: [PATCH 13/16] Fixed smaller issues and removed jquery-turtle.min.js from .gitignore. --- .gitignore | 1 - LICENSE.txt | 2 +- README.md | 2 +- jquery-turtle.js | 24 ++++++++++-------------- jquery-turtle.min.js | 5 +++++ 5 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 jquery-turtle.min.js diff --git a/.gitignore b/.gitignore index c40cd56..a349cbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .svn node_modules -jquery-turtle.min.js diff --git a/LICENSE.txt b/LICENSE.txt index fca7187..f997494 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -2,7 +2,7 @@ jQuery-turtle version 2.0 LICENSE (MIT): -Copyright (c) 2013 Pencil Code Foundation, Google, and other contributors. +Copyright (c) 2013 Pencil Code Foundation, Google Inc., and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 91bace6..8af96ab 100644 --- a/README.md +++ b/README.md @@ -331,7 +331,7 @@ element. License (MIT) ------------- -Copyright (c) 2014 Pencil Code, Google, and other contributors +Copyright (c) 2014 Pencil Code, Google Inc., and other contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/jquery-turtle.js b/jquery-turtle.js index 033294b..b09f1ad 100644 --- a/jquery-turtle.js +++ b/jquery-turtle.js @@ -4709,16 +4709,13 @@ var Instrument = (function() { return result; } - var whiteNoiseBuf = null; function getWhiteNoiseBuf() { - if (whiteNoiseBuf == null) { - var ac = getAudioTop().ac, - bufferSize = 2 * ac.sampleRate, - whiteNoiseBuf = ac.createBuffer(1, bufferSize, ac.sampleRate), - output = whiteNoiseBuf.getChannelData(0); - for (var i = 0; i < bufferSize; i++) { - output[i] = Math.random() * 2 - 1; - } + var ac = getAudioTop().ac, + bufferSize = 2 * ac.sampleRate, + whiteNoiseBuf = ac.createBuffer(1, bufferSize, ac.sampleRate), + output = whiteNoiseBuf.getChannelData(0); + for (var i = 0; i < bufferSize; i++) { + output[i] = Math.random() * 2 - 1; } return whiteNoiseBuf; } @@ -7323,7 +7320,7 @@ var turtlefn = { if (typeof val != 'object' || !$.isNumeric(val.width) || !$.isNumeric(val.height) || !($.isArray(val.data) || val.data instanceof Uint8ClampedArray || - val.data instanceof Unit8Array)) { + val.data instanceof Uint8Array)) { return; } var imdat = ctx.createImageData( @@ -7917,7 +7914,7 @@ var dollar_turtle_methods = { sel.tone.apply(sel, arguments); } else { var instrument = getGlobalInstrument(); - instrument.play.apply(instrument, args); + instrument.play.apply(instrument); } }), silence: wrapraw('silence', @@ -8489,14 +8486,12 @@ var colors = [ $.turtle = function turtle(id, options) { var exportedsee = false; - if (!arguments.length) { - id = 'turtle'; - } if (arguments.length == 1 && typeof(id) == 'object' && id && !id.hasOwnProperty('length')) { options = id; id = 'turtle'; } + id = id || 'turtle'; options = options || {}; if ('turtle' in options) { id = options.turtle; @@ -8615,6 +8610,7 @@ $.turtle = function turtle(id, options) { } } } + return $('#' + id); }; $.extend($.turtle, dollar_turtle_methods); diff --git a/jquery-turtle.min.js b/jquery-turtle.min.js new file mode 100644 index 0000000..2718667 --- /dev/null +++ b/jquery-turtle.min.js @@ -0,0 +1,5 @@ +(function(a){function b(b,c){if(Ne>5)Oe.push({elem:b,qname:c});else{for(Ne+=1,a.dequeue(b,c);Oe.length>0;){var d=Oe.shift();a.dequeue(d.elem,d.qname),Vc()}Ne-=1}}function c(a,b){function c(){this.constructor=a}for(var d in b)Je.call(b,d)&&(a[d]=b[d]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a}function d(b){var c,d,e=b.charAt(0).toUpperCase()+b.slice(1),f=["Moz","Webkit","O","ms"],g=document.createElement("div");if(b in g.style)d=b;else for(var h=0;h<0?'"'+a+'"':"'"+a+"'":a}var c=[];for(var d in a)a.hasOwnProperty(d)&&c.push(d+":"+b(a[d])+";");return c.join(" ")}function h(a){return a}function i(a,b){var c=[a[0]*b[0]+a[2]*b[1],a[1]*b[0]+a[3]*b[1]];return 6==a.length&&(c[0]+=a[4],c[1]+=a[5]),c}function j(a,b){var c=[a[0]*b[0]+a[2]*b[1],a[1]*b[0]+a[3]*b[1],a[0]*b[2]+a[2]*b[3],a[1]*b[2]+a[3]*b[3]],d=6==a.length;return 6==b.length?(c.push(a[0]*b[4]+a[2]*b[5]+(d?a[4]:0)),c.push(a[1]*b[4]+a[3]*b[5]+(d?a[5]:0))):d&&(c.push(a[4]),c.push(a[5])),c}function k(a){return Math.abs(a)>1e-12}function l(a){return!(k(a[1])||k(a[2])||k(1-a[0])||k(1-a[3]))}function m(a){if(l(a))return[1,0,0,1];var b=u(a);return k(b[2])?j(o(-b[3]),j(p(1/b[1],1/b[2]),o(-b[0]))):null}function n(a){var b=m(a);if(4==a.length)return b;var c=i(b,[-a[4],-a[5]]);return b.push(c[0]),b.push(c[1]),b}function o(a){var b=Math.cos(a),c=Math.sin(a);return[b,c,-c,b]}function p(a,b){return 1==arguments.length&&(a=b),[a,0,0,b]}function q(a,b){return[a[0]+b[0],a[1]+b[1]]}function r(a,b){return[a[0]-b[0],a[1]-b[1]]}function s(a,b){return[a[0]*b,a[1]*b]}function t(a,b,c){return q(i(a,r(b,c)),c)}function u(a){var b,c,d=a[0]*a[0]+a[1]*a[1],e=a[0]*a[2]+a[1]*a[3],f=a[2]*a[2]+a[3]*a[3],g=-.5*Math.atan2(2*e,d-f),h=Math.cos(g),i=Math.sin(g),j=a[0]*h-a[2]*i,k=a[1]*h-a[3]*i,l=Math.atan2(k,j),m=Math.cos(l),n=Math.sin(l),o=(a[1]*i+a[3]*h)*m-(a[0]*i+a[2]*h)*n,p=(a[0]*h-a[2]*i)*m+(a[1]*h-a[3]*i)*n;return g<-Math.PI/4?(g+=Math.PI/2,c=p,b=o,l-=Math.PI/2):(b=p,c=o),l>Math.PI&&(l-=2*Math.PI),[l,b,c,g]}function v(a,b){var c=(b-a)/2,d=Math.cos(c),e=Math.sin(c),f=d,g=-e,h=1+f*d+g*e,i=f*e-g*d,j=i&&4/3*(Math.sqrt(2*h)-h)/i,k=f-j*g,l=g+j*f,m=k,n=-l,o=c+a,p=Math.cos(o),q=Math.sin(o);return[[k*p-l*q,k*q+l*p],[m*p-n*q,m*q+n*p],[Math.cos(b),Math.sin(b)]]}function w(a){var b=ra(a,!1);if(b)return[b.tx,b.ty];var c=x(a);return c?[c[4],c[5]]:[0,0]}function x(b){var c=Ie.getComputedStyle?Ie.getComputedStyle(b)[Pe]:a.css(b,"transform");if(!c||"none"===c)return null;var d=/^matrix$([\-+.\de]+),\s*([\-+.\de]+),\s*([\-+.\de]+),\s*([\-+.\de]+),\s*([\-+.\de]+)(?:px)?,\s*([\-+.\de]+)(?:px)?$$/.exec(c);return d?[parseFloat(d[1]),parseFloat(d[2]),parseFloat(d[3]),parseFloat(d[4]),parseFloat(d[5]),parseFloat(d[6])]:A(c)}function y(b,c){var d,e,f,g="none"===a.css(b,"display");if(g){d={position:"absolute",visibility:"hidden",display:"block"},e={};for(f in d)e[f]=b.style[f],b.style[f]=d[f]}var h=Ie.getComputedStyle?Ie.getComputedStyle(b):null;if(g)for(f in d)b.style[f]=e[f];var i=h&&h[Qe]||a.css(b,"transformOrigin");if(i&&i.indexOf("%")<0)return a.map(i.split(" "),parseFloat);if(c)return[c[0]/2,c[1]/2];var j=a(b);return[j.width()/2,j.height()/2]}function z(a){for(var b,c=[1,0,0,1];null!==a;)b=x(a),b&&!l(b)&&(c=j(b,c)),a=a.parentElement;return c.slice(0,4)}function A(b){var c=[1,0,0,1],d=[],e=[],f=/(?:^\s*|)(\w*)\s*$([^)]*)$\s*/g,g=b.replace(f,function(b){return d.push(b[1].toLowerCase()),e.push(a.map(b[2].split(","),function(a){var b=a.trim().toLowerCase();return{num:parseFloat(b),unit:b.replace(/^[+-.\de]*/,"")}})),""});if(g)return null;for(var h=d.length-1;h>=0;--h){var i,k,l,m=null,n=d[h],o=e[h];if("matrix"==n)o.length>=6&&(m=[o[0].num,o[1].num,o[2].num,o[3].num,o[4].num,o[5].num]);else if("rotate"==n)1==o.length&&(i=wa(o[0]),k=Math.cos(i),l=Math.sin(i),m=[k,-l,k,l]);else if("translate"==n||"translatex"==n||"translatey"==n){var p=0,q=0;if(o.length>=1){if(o[0].unit&&"px"!=o[0].unit)return null;if("translate"==n||"translatex"==n?p=o[0].num:"translatey"==n&&(q=o[0].num),"translate"==n&&o.length>=2){if(o[1].unit&&"px"!=o[1].unit)return null;q=o[1].num}m=[0,0,0,0,p,q]}}else if("scale"==n||"scalex"==n||"scaley"==n){var r=1,s=1;o.length>=1&&("scale"==n||"scalex"==n?r=o[0].num:"scaley"==n&&(s=o[0].num),"scale"==n&&o.length>=2&&(s=o[1].num),m=[r,0,0,s,0,0])}else{if("skew"!=n&&"skewx"!=n&&"skewy"!=n)return null;var t=0,u=0;o.length>=1&&("skew"==n||"skewx"==n?t=Math.tan(wa(o[0])):"skewy"==n&&(u=Math.tan(wa(o[0]))),"skew"==n&&o.length>=2&&(u=Math.tan(wa(o[0]))),m=[1,u,t,1,0,0])}c=j(c,m)}return c}function B(a,b,c){if(0>=c)return a;var d=b.pageX-a.pageX,e=b.pageY-a.pageY,f=d*d+e*e;if(c*c>=f)return b;var g=c/Math.sqrt(f);return{pageX:a.pageX+g*d,pageY:a.pageY+g*e}}function C(a,b,c){if(0>=c)b=a;else if(180>c){var d=xa(b-a);d>c?b=a+c:-c>d&&(b=a-c)}return xa(b)}function D(a,b,c,d){return{pageX:Math.floor(a+c/2),pageY:Math.floor(b+d/2)}}function E(a,b,c,d){var e=a+c,f=b+d;return[{pageX:a,pageY:b},{pageX:a,pageY:f},{pageX:e,pageY:f},{pageX:e,pageY:b}]}function F(a){if(!/e[\-+]/.exec(a))return a;var b=a.replace(/(?:\d+(?:\.\d*)?|\.\d+)e[\-+]\d+/g,function(a){return sa(parseFloat(a))});return b}function G(b,c,d){var e=a.data(b,"turtleData");if(e&&e.quickhomeorigin&&e.down&&e.style&&!d&&b.classList&&b.classList.contains("turtle"))return e.quickhomeorigin;var f,g,h,i="none"===a.css(b,"display"),j=i?{position:"absolute",visibility:"hidden",display:"block"}:{},k=(j[Pe]=c?"matrix("+a.map(c,sa).join(", ")+", 0, 0)":"none",{});for(f in j)k[f]=b.style[f],b.style[f]=j[f];g=N(b),h=y(b,[g.width,g.height]);for(f in j)b.style[f]=F(k[f]);d&&(d.gbcr=g,d.localorigin=h);var l=q([g.left,g.top],h);return e&&e.down&&e.style&&(e.quickhomeorigin=l),l}function H(){return Ie.innerHeight||a(Ie).height()}function I(){return Ie.innerWidth||a(Ie).width()}function J(){return document.body?a(document).height():document.height}function K(){return document.body?a(document).width():document.width}function L(a){return a.offsetHeight<=0&&a.offsetWidth<=0}function M(a,b,c,d){return{left:a,top:b,right:a+c,bottom:b+d,width:c,height:d}}function N(b){return mb(b)?M(b.pageX,b.pageY,0,0):a.isWindow(b)?M(a(Ie).scrollLeft(),a(Ie).scrollTop(),I(),H()):9===b.nodeType?M(0,0,K(),J()):"getBoundingClientRect"in b?T.apply(b):M(0,0,0,0)}function O(a,b,c){var d=Math.max(0,Math.max(c.top-a.pageY,a.pageY-c.bottom)),e=Math.max(0,Math.max(c.left-a.pageX,a.pageX-c.right));return e*e+d*d>b}function P(a,b,c){var d=Math.max(c.bottom-a.pageY,a.pageY-c.top),e=Math.max(c.right-a.pageX,a.pageX-c.left);return b>e*e+d*d}function Q(a,b){return b.right=a.top&&b.bottom<=a.bottom&&b.left>=a.left&&b.right<=a.right}function S(a,b){return 4===a.length&&a[0].pageX===b.left&&a[0].pageY===b.top&&a[1].pageX===b.left&&a[1].pageY===b.bottom&&a[2].pageX===b.right&&a[2].pageY===b.bottom&&a[3].pageX===b.right&&a[3].pageY===b.top}function T(){var a=this.getBoundingClientRect();return{top:a.top+Ie.pageYOffset,bottom:a.bottom+Ie.pageYOffset,left:a.left+Ie.pageXOffset,right:a.right+Ie.pageXOffset,width:a.width,height:a.height}}function U(b,c,d,e,f){var g,h,j,k,l=z(b.parentElement),n=m(l),o=G(b,n);if(n){if(a.isNumeric(d)&&(j=w(b),g=q(i(l,j),o),h={pageX:g[0],pageY:g[1]},c=B(h,c,d)),k=i(n,r([c.pageX,c.pageY],o)),e||f){var p=Gc(b);k[0]+=e*p,k[1]-=f*p}return sa(k[0])+" "+sa(k[1])}}function V(a){var b=a.offsetParent;return b?b:document}function W(b,c){c||(c=a(V(b)).pagexy());var d=z(b.parentElement),e=m(d),f=G(b,e),g=ra(b,!0),h=e&&i(e,r([c.pageX,c.pageY],f)),j=1/Gc(b);if(e)return[(g.tx-h[0])*j,(h[1]-g.ty)*j]}function X(b,c){var d,e,f=z(b.parentElement),g=(ra(b,!0),a(V(b)).pagexy()),h=Gc(b),j=[];for(e=0;ei-f&&(d=i-f),f>d&&(d=f),e>j-g&&(e=j-g),g>e&&(e=g);var l={pageX:d,pageY:e};a.isNumeric(c)&&(l=B(k.origin(),l,c)),k.scrollLeft(l.pageX-f),k.scrollTop(l.pageY-g)}function ca(a,b,c){var d=b.pageX-a.pageX,e=b.pageY-a.pageY,f=c.pageX-a.pageX,g=c.pageY-a.pageY;return f*e-d*g}function da(a,b,c){var d=c.pageX-a.pageX,e=c.pageY-a.pageY;return d*b.pageY-b.pageX*e}function ea(a,b){if(b.length<=0)return!1;if(1==b.length)return b[0].pageX==a.pageX&&b[0].pageY==a.pageY;var c=ca(a,b[b.length-1],b[0]);if(0===c)return!0;var d=c>0;if(2==b.length)return!1;for(var e=1;e0!=d)return!1}return!0}function fa(a,b){return{pageX:a.pageX-b.pageX,pageY:a.pageY-b.pageY}}function ga(a,b,c,d){var e,f,g=fa(c,b);for(e=0;e0?1:0>a?-1:0}function ia(a){if(a.length<=2)return 0;var b=ca(a[a.length-1],a[0],a[1]);if(0!==b)return ha(b);for(var c=1;c1&&1!=ha(ca(a[a.length-2],a[a.length-1],b));)a.pop();return a.length&&d(a[a.length-1],b)||a.push(b),a}function c(a,b,c){for(var d=0;d

jquery.com.'),vf;if(b&&b!=oc)return nc("No help available for "+b),vf;c=[];for(var g in e)!e[g].helptext||!e[g].helptext.length||g in Ie&&"function"!=typeof Ie[g]||c.push(g);return c.sort(function(a,b){return a.length!=b.length?a.length-b.length:b>a?-1:a>b?1:0}),nc("help available for: "+c.map(function(a){return''+a+""}).join(" ")),vf}function pc(a){return 1==a.length&&qc(a[0])&&a[0]}function qc(b){var c;return b&&0==a.queue(b).length&&(!b.parentElement||!b.parentElement.style.transform)&&(0===(c=pb(b))||0===a.fx.speeds[c])}function rc(b,c){var d;if(null==c){if(qc(b))return;d=pb(b)}else d=1e3*c;var e=a(b);d>0&&e.delay(d)}function sc(a,b){if(b=b||0,a.length<=b)return null;var c=a[a.length-1];return"function"!=typeof c||c.helpname?null:c}function tc(b,c,d,e){function f(d,e){if(null!=d){var f=b&&b[d];e&&f&&bb(f,a.data(f,"turtleData"),!0),Hf.reportEvent("resolve",[c,m,j,d,f])}0==--k&&h&&(l?(Me+=1,setTimeout(function(){Me-=1,h()},0)):h())}function g(a){null!=a&&Hf.reportEvent("appear",[c,m,j,a,b&&b[a],i])}var h=sc(d,e),i=h?Array.prototype.slice.call(d,0,d.length-1):d,j=b?b.length||0:0,k=j+1,l=!0,m=Hf.nextId();return Hf.reportEvent("enter",[c,m,j,i]),{name:c,args:i,appear:g,resolve:f,resolver:function(a,b){return function(){f(a,b)}},exit:function(){Hf.reportEvent("exit",[c,m,j,i]),f(null),l=!1}}}function uc(b,c,d,e){var f=function(){if(Vc(b),Le)throw new Error(b+" interrupted");var d,f=tc(this,b,arguments,c),g=[f].concat(a.makeArray(f.args));try{d=e.apply(this,g)}finally{f.exit()}return d};return zc(b,d,f)}function vc(a,b,c){var d=function(){if(Vc(a),Le)throw new Error(a+" interrupted");return Wc(a,this),c.apply(this,arguments)};return zc(a,b,d)}function wc(b,c,d,e){var f=function(){if(Vc(b),Le)throw new Error(b+" interrupted");var c=null,f=0,g=pf;if(e&&(c=e.apply(null,arguments),f=arguments.length,g=Yc()),g){var h=a(pf).eq(0),i=arguments,j=tc(h,b,arguments,f);h.plan(function(a,b){j.appear(a),d.apply(c,i),this.plan(j.resolver(a))}),j.exit()}else j=tc(null,b,arguments,f),d.apply(c,arguments),j.exit();return c?(c.result&&c.result.constructor===jQuery&&pf&&lc(pf,c.result),c.result):void 0};return zc(b,c,f)}function xc(b,c){return zc(b,c,function(c,d){var e=/^key/.test(b),f=/^mouse|click$/.test(b),g=f?"input,button":e?"textarea,input:not([type]),input[type=text],input[type=password]":null;e&&Nb(),null==d&&"function"==typeof c&&(d=c,c=null),a(Ie).on(b+".turtleevent",null,c,g?function(b){return Le||a(b.target).closest(g).length?void 0:d.apply(this,arguments)}:d)})}function yc(){var b=a._data(Ie,"events");if(!b)return!1;for(var c in b)for(var d=b[c],e=0;eb?-c:c,l=null;i.style&&i.down&&(l=function(){var a=Y(h),c=ra(h,!0),d=z(h.parentElement);return function(){ub(i.corners[0],a,c.rot,c.rot+(e?-b:b),k*(i.oldscale?c.sy:1),d)}}()),i.turningRadius=k,this.animate({turtleRotation:g+sa(b)+"deg"},pb(h,f),qb(h)),this.plan(function(){l&&l(),i.turningRadius=j,a.resolve(d,!0)})}),this)}function Bc(a,b){null==b&&(b=100),"bk"===a.name&&(b=-b);var c,d=Df;return(c=pc(this))?(a.appear(0),ib(c,b,0),a.resolve(0,!0),this):(this.plan(function(c,e){a.appear(c),this.animate({turtleForward:"+="+sa(b||0)+"px"},pb(e,d),qb(e),a.resolver(c,!0))}),this)}function Cc(b,c,d){a.isArray(c)&&(d=c[1],c=c[0]),d||(d=0),c||(c=0);var e=Df;return this.plan(function(a,f){b&&b.appear(a),this.animate({turtlePosition:lb(f,d,c)},pb(f,e),qb(f),b&&b.resolver(a,!0))}),this}function Dc(b,c,d){a.isArray(c)&&(d=c[1],c=c[0]),d||(d=0),c||(c=0);var e,f=Df;return(e=pc(this))?(b&&b.appear(0),jb(e,c,d),b&&b.resolve(0),this):(this.plan(function(a,e){b&&b.appear(a);var g=w(e);this.animate({turtlePosition:sa(g[0]+c)+" "+sa(g[1]-d)},pb(e,f),qb(e),b&&b.resolver(a,!0))}),this)}function Ec(b,c,d){var e=c,f=0,g=0,h=null,i=Df;return a.isNumeric(e)&&a.isNumeric(d)?(f=parseFloat(e),g=parseFloat(d),e=null,h=null):a.isArray(e)?(f=e[0],g=e[1],e=null,h=d):a.isNumeric(d)&&(h=d),this.plan(function(c,d){var j=e;if(null===j&&(j=a(V(d)).pagexy()),j&&!mb(j))try{j=a(j).pagexy()}catch(k){return}return j&&mb(j)?a.isWindow(d)?(b&&b.appear(c),ba(j,h),void(b&&b.resolve(c))):void(9!==d.nodeType&&(b&&b.appear(c),this.animate({turtlePosition:U(d,j,h,f,g)},pb(d,i),qb(d),b&&b.resolver(c,!0)))):void 0}),this}function Fc(a){return function(b,c,d){return this.plan(function(e,f){b.appear(e);var g=this.css("turtlePenDown");this.css({turtlePenDown:"up"}),a.call(this,null,c,d),this.plan(function(){this.css({turtlePenDown:g}),b.resolve(e,!0)})}),this}}function Gc(b){var c=a.data(b,"turtleData");return c&&null!=c.oldscale?c.oldscale:1}function Hc(a,b,c){Jc.call(this,!0,a,b,c)}function Ic(a,b,c){Jc.call(this,!1,a,b,c)}function Jc(b,c,d,e){e===He&&(e=d),d&&e||(d=e=1);var f=Df;return this.plan(function(g,h){if(b&&(Oa(h).oldscale*=e),c.appear(g),a.isWindow(h)||9===h.nodeType)return void c.resolve(g);var i=a.map(a.css(h,"turtleScale").split(" "),parseFloat);1===i.length&&i.push(i[0]),i[0]*=d,i[1]*=e,this.animate({turtleScale:a.map(i,sa).join(" ")},pb(h,f),qb(h),c.resolver(g))}),this}function Kc(a,b){var c=z(a.parentElement),d=l(c),e=d?1:u(c)[1];return e*Gc(a)}function Lc(b){var c=Df;return function(d,e,f){if(a.isNumeric(e)){var g=e;e=f,f=g}return null==f&&(f=8.8),this.plan(function(g,h){var i=Oa(h),j=i.style;e||(e=j&&(j.fillStyle||j.strokeStyle)||"black"),d.appear(g);var k=this.pagexy(),l=ra(h,!0),m=Ka(e,"fillStyle"),n=Da(i),o=Kc(h),p=f*o,q=Math.max(0,p-2),r=p+(m.eraseMode?2:0),s=/rgba|hsla/.test(m.fillStyle);null==m.lineWidth&&j&&j.lineWidth&&(m.lineWidth=j.lineWidth),pc(this)?(b(n,k,r,l.rot,m,!0),d.resolve(g)):this.queue(function(e){a({radius:0}).animate({radius:q},{duration:pb(h,c),step:function(){s||b(n,k,this.radius,l.rot,m,!1)},complete:function(){b(n,k,r,l.rot,m,!0),d.resolve(g),e()}})})}),this}}function Mc(a,b,c,d,e){var f=a.getContext("2d");f.save(),Xa(f,e),c===1/0?(f.setTransform(1,0,0,1,0,0),f.fillRect(0,0,a.width,a.height)):(Za(f,a),f.beginPath(),f.arc(b.pageX,b.pageY,c/2,0,2*Math.PI,!1),f.closePath(),f.fill(),e.strokeStyle&&f.stroke()),f.restore()}function Nc(a,b,c,d,e){var f=a.getContext("2d");if(f.save(),Xa(f,e),c===1/0)f.setTransform(1,0,0,1,0,0),f.fillRect(0,0,a.width,a.height);else{var g=Math.sin((d+45)/180*Math.PI),h=Math.cos((d+45)/180*Math.PI),i=c*h/Math.SQRT2,j=c*g/Math.SQRT2;Za(f,a),f.beginPath(),f.moveTo(b.pageX-i,b.pageY-j),f.lineTo(b.pageX-j,b.pageY+i),f.lineTo(b.pageX+i,b.pageY+j),f.lineTo(b.pageX+j,b.pageY-i),f.closePath(),f.fill(),e.strokeStyle&&f.stroke()}f.restore()}function Oc(a,b,c,d,e,f){var g=a.getContext("2d");if(g.save(),Xa(g,e),!e.strokeStyle&&e.fillStyle&&(g.strokeStyle=e.fillStyle),c!==1/0){var h=Math.sin(d/180*Math.PI),i=-Math.cos(d/180*Math.PI),j=e.lineWidth||1.62,k=b.pageX+c*h,l=b.pageY+c*i,m=Pc(j,k,l,h,i),n=c-m.hs,o=n*h,p=n*i;Za(g,a),n>0&&(g.beginPath(),g.moveTo(b.pageX,b.pageY),g.lineTo(b.pageX+o,b.pageY+p),g.stroke()),f&&Qc(g,m)}g.restore()}function Pc(a,b,c,d,e){var f=Math.max(1.25*a,a+2),g=2*f,h=g-f/2;return{hs:h,x1:b,y1:c,xm:b-d*h,ym:c-e*h,x2:b-e*f-d*g,y2:c+d*f-e*g,x3:b+e*f-d*g,y3:c-d*f-e*g}}function Qc(a,b){a.beginPath(),a.moveTo(b.x2,b.y2),a.lineTo(b.x1,b.y1),a.lineTo(b.x3,b.y3),a.quadraticCurveTo(b.xm,b.ym,b.x2,b.y2),a.closePath(),a.fill()}function Rc(a,b,c,d,e,f){var g=e-c,h=f-d,i=Math.sqrt(g*g+h*h),j=g/i,k=h/i,l=Pc(b,e,f,j,k);i>l.hs&&(a.beginPath(),a.moveTo(c,d),a.lineTo(l.xm,l.ym),a.lineWidth=b,a.stroke()),Qc(a,l)}function Sc(a,b){function c(){d&&clearInterval(d),b&&b()}var d=null;if(!Ie.speechSynthesis)return console.log("No speech synthesis: "+a),void c();try{var e=new Ie.SpeechSynthesisUtterance(a);e.addEventListener("end",c),e.addEventListener("error",c),e.lang=navigator.language||"en-GB",Ie.speechSynthesis.speak(e),d=setInterval(function(){Ie.speechSynthesis.pending||Ie.speechSynthesis.speaking||c()},250)}catch(f){Ie.console&&Ie.console.log(f),c()}}function Tc(){a.each(["toggle","show","hide"],function(b,c){var d=a.fn[c];a.fn[c]=function(b,c,e){var f=arguments;!f.length&&this.hasClass("turtle")&&(this.length>1||!a._data(this[0],"fxshow"))&&(f=[0]),d.apply(this,f)}})}function Uc(c,d){if(d||(d="fx"),"IMG"==c.tagName&&c.src&&!c.complete){var e=a.queue(c,d);0==e.length&&(a.queue(c,d,function(a){Ib(c,null,a)}),b(c,d))}}function Vc(b){if(!(a.turtle.hangtime==1/0||kf++<100)){kf=0;var c=(new Date).getTime();return mf?void(c-mf>a.turtle.hangtime&&(Sf.visible()&&Sf.html('Oops: program interrupted because it was hanging the browser. Try reducing the number of repetitions. Or try using await done defer() or tick to make an animation.'),a.turtle.interrupt("hung"))):(mf=c,clearTimeout(lf),void(lf=setTimeout(function(){clearTimeout(lf),lf=null,mf=null},0)))}}function Wc(b,c){if(!a.turtle.nowarn){var d,e=!0;for(d=0;e&&d=100&&(e=!1);e||(jf[b]||(jf[b]=1,Sf.visible()?Sf.html('Oops: '+b+' may not return useful results when motion is queued. Try speed Infinity or await done defer() first.'):console.warn(b+' may not return useful results when motion is queued. Try "speed Infinity" or "await done defer()".')),c.finish())}}function Xc(a,b,d){a[b]=function(){return b in jf||(Sf.html(''+b+" deprecated. Use "+d+"."),jf[b]=1),a[d].apply(this,arguments)},a[d].__super__&&c(a[b],a[d])}function Yc(){return pf&&a.queue(pf).length>0}function Zc(a){if(null===uf.pollTimer){var b=uf.sent[a],c=uf.waiting[a];c&&c.length&&b&&b.length&&(uf.pollTimer=setTimeout(function(){uf.pollTimer=null,c&&c.length&&b&&b.length&&(c.shift().apply(null,b.shift()),Zc(a))},0))}}function $c(a,b){if("function"!=typeof b&&"undefined"!=typeof b||!/^\w+\s*$/.test(a)){if("undefined"==typeof b&&/^help\s+\S+$/.test(a))return oc(/^help\s+(\S+)$/.exec(a)[1]),!0}else{if(b&&b.helptext)return oc(b),!0;if(a in tf)return oc(a),!0}return!1}function _c(a,b,c,d){return a.helptext?d.helptext=a.helptext:b in c&&(d.helptext=c[b].helptext),d.method=a,d.helpname=b,d}function ad(a,b){var c=[];for(var d in b)!b.hasOwnProperty(d)||d in Ie||(c.push(d),Ie[d]=function(b){var c=a[b],d=a;return _c(c,b,tf,function(){return c.apply(d,arguments)})}(d));return c}function bd(){pf=null;for(var a=0;a=0;i--)null===h[i]?(i--,c.moveTo(d-h[i][0],e+h[i][1])):c.lineTo(d-h[i][0],e+h[i][1])}return c.lineWidth=1.1,c.strokeStyle="rgba(255,255,255,0.75)",c.stroke(),c.beginPath(),c.arc(d,e,15.5,0,2*Math.PI,!1),c.closePath(),c.strokeStyle="rgba(0,0,0,0.4)",c.stroke(),b.toDataURL()}function gd(a){var b=Ga(40,48),c=b.getContext("2d");return c.beginPath(),c.moveTo(0,48),c.lineTo(20,0),c.lineTo(40,48),c.lineTo(20,36),c.closePath(),c.fillStyle=a,c.fill(),b.toDataURL()}function hd(a){var b=Ga(40,40),c=b.getContext("2d");return c.beginPath(),c.arc(20,20,18,-5*Math.PI/2,-Math.PI/2),c.closePath(),c.lineTo(20,20),c.stroke(),c.strokeStyle=a,c.lineWidth=4,c.stroke(),b.toDataURL()}function id(a,b){b=b||12;var c=Ga(b,b),d=c.getContext("2d"),e=b/2;return d.beginPath(),d.arc(e,e,e,0,2*Math.PI),d.closePath(),d.fillStyle=a,d.fill(),c.toDataURL()}function jd(a){function b(){e.moveTo(19.5,43),e.lineTo(20.5,43),e.lineTo(21.5,43.5),e.lineTo(25.5,36.2),e.lineTo(24,35.5),e.lineTo(23,35.5),e.lineTo(20.5,36.5),e.lineTo(19.5,36.5),e.lineTo(17,35.5),e.lineTo(16,35.5),e.lineTo(14.5,36.2),e.lineTo(18.5,43.5),e.closePath()}function c(){e.moveTo(25.5,12),e.lineTo(25.5,8),e.lineTo(14.5,8),e.lineTo(14.5,12),e.closePath()}var d=Ga(40,48),e=d.getContext("2d");return e.beginPath(),b(),e.fillStyle="#ffcb6b",e.fill(),e.beginPath(),c(),e.fillStyle="#d1ebff",e.fill(),e.beginPath(),e.moveTo(19.5,48),e.lineTo(13,36),e.lineTo(13,1),e.lineTo(14,0),e.lineTo(26,0),e.lineTo(27,1),e.lineTo(27,36),e.lineTo(20.5,48),e.closePath(),b(),e.moveTo(25.5,12),e.lineTo(25.5,8),e.lineTo(14.5,8),e.lineTo(14.5,12),e.closePath(),e.fillStyle=a,e.fill(),d.toDataURL()}function kd(a,b,c){return c||(c=1),function(d){var e=document.createElement("canvas");e.width=a,e.height=b;var f=e.getContext("2d");d||(d="rgba(128,128,128,0.125)"),"transparent"!=d&&(f.fillStyle=d,f.fillRect(0,0,a,b));var g=a/c,h=b/c,i={width:g,height:h,transformOrigin:g/2+"px + "+h/2+"px",opacity:1};return 1>c&&(i.imageRendering="pixelated"),{img:e,css:i}}}function ld(a){if(!a)return null;if(a in yf)return yf[a];var b=a.match(/^(\d+)x(\d+)(?:\/(\d+))?$/);return b?kd(parseFloat(b[1]),parseFloat(b[2]),b[3]&&parseFloat(b[3])):null}function md(a,b){var c=a.width||a.height||256,d=a.height||a.width||256,e=a.subpixel||1/(a.scale||1),f=a.color||"transparent",g=kd(c,d,e);return g(f)}function nd(b,c){if(!b)return null;if(a.isPlainObject(b))return md(b,c);if(a.isFunction(b)&&(b.helpname||b.name)&&(b=b.helpname||b.name),b.constructor===jQuery){if(!b.length)return null;b=b.get(0)}if(b.tagName)return"CANVAS"!=b.tagName&&"IMG"!=b.tagName&&"VIDEO"!=b.tagName?null:{img:b,css:{opacity:1}};var d=b.toString().trim().split(/\s+/),e=null,f=null;if(d.length&&(f=ld(d[d.length-1]),f&&d.pop()),d.length&&cd(d.join(" "))&&(e=d.join(" "),d.length=0),!f&&e&&(f=ld(c)),f)return f(e);if(/\//.test(b)||(b=Fb(b)),/\//.test(b)){var g=Ab(b).hostname;return!Cb(g)&&Cb(Ie.location.hostname)&&(b=Ie.location.protocol+"//"+Ie.location.host+"/proxy/"+Bb(b)),{url:b,css:{transformOrigin:"50% 50%",opacity:1}}}return null}function od(a){return null==a?"":String(a).replace(/[&<>"]/g,function(a){return zf[a]})}function pd(b,c,d){var e=b&&/^[a-zA-Z]\w*$/.exec(b),f=b&&/^<.*>$/.exec(b),g=nd(b,d)||null==b&&nd(d);e&&a("#"+b).length&&(e=!1);var h;g?(h=a("