projects
/
pwl6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take advantage of empty attribute syntax.
[pwl6.git]
/
src
/
yuu
/
director.js
diff --git
a/src/yuu/director.js
b/src/yuu/director.js
index 872301430eeb8f4d0b0a762acbb328db0959c462..051eb539855d01da348b9b63f324cf8a2acb2427 100644
(file)
--- a/
src/yuu/director.js
+++ b/
src/yuu/director.js
@@
-17,6
+17,13
@@
if (!yuu.InputState) require("./input");
if (!yuu.Material) require("./gfx");
if (!yuu.InputState) require("./input");
if (!yuu.Material) require("./gfx");
+ function getCommand (element) {
+ var command = element.getAttribute('data-yuu-command');
+ if (!command || command === 'data-yuu-command')
+ element.setAttribute('data-yuu-command', command = element.id);
+ return command;
+ }
+
yuu.Director = yT({
constructor: function (commandStack, input, tickHz) {
/** Manage and update a set of Scenes
yuu.Director = yT({
constructor: function (commandStack, input, tickHz) {
/** Manage and update a set of Scenes
@@
-304,12
+311,8
@@
this._resized = true;
var director = this;
this._rafId = window.requestAnimationFrame(function _ (t) {
this._resized = true;
var director = this;
this._rafId = window.requestAnimationFrame(function _ (t) {
- if (!director._timerStart)
{
+ if (!director._timerStart)
director._timerStart = t;
director._timerStart = t;
- director._audioOffset = yuu.audio
- ? yuu.audio.currentTime * 1000 - t
- : 0;
- }
director._rafId = window.requestAnimationFrame(_);
director.render(t);
});
director._rafId = window.requestAnimationFrame(_);
director.render(t);
});
@@
-373,7
+376,7
@@
yuu.downloadURL(
yuu.canvas.toDataURL("image/png"),
document.title + " (" + date + ").png");
yuu.downloadURL(
yuu.canvas.toDataURL("image/png"),
document.title + " (" + date + ").png");
- this.toast("
\uf030
", 0.5, "screenshot");
+ this.toast("
📷
", 0.5, "screenshot");
} catch (exc) {
var dialog = yuu.showError(exc);
if (dialog)
} catch (exc) {
var dialog = yuu.showError(exc);
if (dialog)
@@
-385,6
+388,10
@@
/** Tick and render all scenes, bottom to top */
var i;
/** Tick and render all scenes, bottom to top */
var i;
+ this._audioOffset = yuu.audio
+ ? yuu.audio.currentTime * 1000 - t
+ : 0;
+
if (this._resized) {
this._dispatchSceneInput("resize", [yuu.canvas]);
this._resized = false;
if (this._resized) {
this._dispatchSceneInput("resize", [yuu.canvas]);
this._resized = false;
@@
-564,7
+571,7
@@
var elements = element.querySelectorAll("[data-yuu-command]");
yf.each(function (element) {
var elements = element.querySelectorAll("[data-yuu-command]");
yf.each(function (element) {
- var command =
element.getAttribute("data-yuu-command"
);
+ var command =
getCommand(element
);
switch (element.tagName.toLowerCase()) {
case "input":
switch (element.type.toLowerCase()) {
switch (element.tagName.toLowerCase()) {
case "input":
switch (element.type.toLowerCase()) {
@@
-580,13
+587,6
@@
}
}, elements);
}
}, elements);
- yf.each(function (a) {
- a.onclick = function (event) {
- yuu.openURL(this.href);
- yuu.stopPropagation(event, true);
- };
- }, element.querySelectorAll("a[href]:not([yuu-href-internal])"));
-
this._director = director;
element.className = className + " " + this.animation;
this._director = director;
element.className = className + " " + this.animation;
@@
-632,7
+632,7
@@
function handleElement (event) {
/*jshint validthis:true */
/* `this` comes from being a DOM element event handler. */
function handleElement (event) {
/*jshint validthis:true */
/* `this` comes from being a DOM element event handler. */
- var command =
this.getAttribute("data-yuu-command"
);
+ var command =
getCommand(this
);
switch (this.tagName.toLowerCase()) {
case "input":
switch (this.type.toLowerCase()) {
switch (this.tagName.toLowerCase()) {
case "input":
switch (this.type.toLowerCase()) {
@@
-681,13
+681,13
@@
yuu.defaultKeybinds.bind("f11", "++fullscreen");
yuu.defaultKeybinds.bind("f12", "screenshot");
yuu.defaultKeybinds.bind(
yuu.defaultKeybinds.bind("f11", "++fullscreen");
yuu.defaultKeybinds.bind("f12", "screenshot");
yuu.defaultKeybinds.bind(
- "control+s", "++mute && toast
\uf026 1 mute || toast \uf028
1 mute");
+ "control+s", "++mute && toast
🔈 1 mute || toast 🔊
1 mute");
var director = yuu.director = new yuu.Director();
/** The standard director */
yuu.registerInitHook(function () {
var director = yuu.director = new yuu.Director();
/** The standard director */
yuu.registerInitHook(function () {
- return yuu.ready(director.scenes);
+ return yuu.ready(director.
_
scenes);
});
});
});
});