チェンジセット 2191: ruby

コミット日時:

2009/01/29 16:11:00 (3 年前)

コミッタ:

gyuque

ログメッセージ:

added loading indicator

ファイル:

• ruby/jsplash/trunk/client2/jsplash/objects.js (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/player.js (更新) (3 diffs)

ruby/jsplash/trunk/client2/jsplash/objects.js

@@ -19 +19 @@
-        decls.push("with(this){\n");
-        
-
+
-        var func2;
-        eval( "func2=" + (func.toString()+"__END__").replace("{", "{"+decls.join('')).replace(/} *__END__$/m, saves.join('')+"}") );

ruby/jsplash/trunk/client2/jsplash/player.js

@@ -152 +152 @@
-
-JSplash.launch = function() {
+        JSplash.showLoadingText("Loading data... (movie1 and script)");
-        JSplash.require('./'+JSplash.LOAD_DIR+'/asblock.js');
-        JSplash.require('./'+JSplash.LOAD_DIR+'/movie1.js');
+}
+
+JSplash.showLoadingText = function(s) {
+        var box = $('loading-text');
+        if (!box) return;
+
+        if (!s)
+        {
+                box.style.display = "none";
+                return;
+        }
+
+        box.style.display = "";
+        box.innerHTML = s;
-}
-
@@ -223 +238 @@
-                JSplash.swfdata = dat;
-                if (next_file) {
+                        JSplash.showLoadingText("Loading data... (movie2)");
+
-                        JSplash.$next(function(){
-                                JSplash.require('./'+JSplash.LOAD_DIR+'/'+next_file);
@@ -240 +257 @@
-        }
-
+        JSplash.showLoadingText(null);
-        JSplash.$next( JSplash.initPlayer );
-}