X-Git-Url: https://git.yukkurigames.com/?p=pwl6.git;a=blobdiff_plain;f=src%2Fyuu%2Fdirector.js;h=a078ef5c6f8eea014bd7189fb0f3dc672af5be6f;hp=cdba62cefb86282a3439a56ab8e12da92195c9bd;hb=de6ca4453d2a81955bba2436f69be912fd70efb0;hpb=5b542bda6765c3dc032990f18ea86958b9e9ece6

diff --git a/src/yuu/director.js b/src/yuu/director.js
index cdba62c..a078ef5 100644
--- a/src/yuu/director.js
+++ b/src/yuu/director.js
@@ -1,7 +1,7 @@
 /* Copyright 2014 Yukkuri Games
    Licensed under the terms of the GNU GPL v2 or later
-   @license http://www.gnu.org/licenses/gpl-2.0.html
-   @source: http://yukkurigames.com/yuu/
+   @license https://www.gnu.org/licenses/gpl-2.0.html
+   @source: https://yukkurigames.com/yuu/
 */
 
 (function (yuu) {
@@ -17,6 +17,13 @@
     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
@@ -133,7 +140,7 @@
 
         // Aside from the performance considerations, deferring
         // resizing by multiple frames fixes mis-sizing during startup
-        // and fullscreen transition in node-webkit on Windows. (And
+        // and fullscreen transition in NW.js on Windows. (And
         // probably similar bugs in other configurations.)
         _doresize: yf.debounce(function () {
             this._resized = true;
@@ -298,18 +305,14 @@
                 return;
             this._tickCount = 0;
             this._timerStart = 0;
-            // GNU/Linux with node-webkit sizes things incorrectly on
+            // GNU/Linux with NW.js sizes things incorrectly on
             // startup, so force a recalculating as soon as the render
             // loop runs.
             this._resized = true;
             var director = this;
             this._rafId = window.requestAnimationFrame(function _ (t) {
-                if (!director._timerStart) {
+                if (!director._timerStart)
                     director._timerStart = t;
-                    director._audioOffset = yuu.audio
-                        ? yuu.audio.currentTime * 1000 - t
-                        : 0;
-                }
                 director._rafId = window.requestAnimationFrame(_);
                 director.render(t);
             });
@@ -385,6 +388,10 @@
             /** 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;
@@ -564,7 +571,7 @@
             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()) {
@@ -625,7 +632,7 @@
         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()) {