2002/08/07 18:21:48

darcs-hash:20040130064956-2ba56-79770d36962c81897b5022bd7c108202d46e8b69.gz

diff --git a/src/org/xwt/builtin/splash.xwt b/src/org/xwt/builtin/splash.xwt
index e100e7f..7ecd8ae 100644 (file)
--- a/src/org/xwt/builtin/splash.xwt
+++ b/src/org/xwt/builtin/splash.xwt
@@ -12,35 +12,41 @@
         }
 
         xwt.thread = function() {
-            var origin = xwt.origin;
-            if (origin.substring(0, 21) == "http://launch.xwt.org") {
-                origin = origin.substring(22);
-                origin = "http://" + origin.substring(origin.indexOf('/') + 1);
+            try {
+                var origin = xwt.origin;
+                if (origin.substring(0, 21) == "http://launch.xwt.org") {
+                    origin = origin.substring(22);
+                    origin = "http://" + origin.substring(origin.indexOf('/') + 1);
+                }
+                xwt.println("origin is " + origin);
+    
+                xwt.loadArchive(origin, function(num, den) {
+                        $left.flex = 50 * (num / den);
+                        $right.flex = 50 + 50 * (1.0 - num /den);
+                        var pct = xwt.math.ceil(num * 100 / den);
+                        if (1024 > num) {
+                            num = "" + num + " bytes";
+                        } else if (1024 * 1024 > num) {
+                            num = "" + xwt.math.ceil(num / 1024) + "kb";
+                        } else {
+                            num = "" + xwt.math.ceil(num / (1024 * 1024)) + "Mb";
+                        }
+                        $status.text = "Downloading: " + pct + "% [" + num + "]";
+                    });
+    
+                    xwt.newBox("main", function(num, den) {
+                        $left.flex = 50 + 50 * (num / den);
+                        $right.flex = 50 * (1.0 - num / den);
+                        if ($right.flex == 0) $right.width = 0;
+                        $status.text = "Initializing: " + xwt.math.ceil(num * 100 / den) + "%";
+                    });
+                    thisbox = null;
+
+            } catch (e) {
+                $status.text = "Error: " + e;
+                if ($status.text.substring(0, 13) == "Error: Error:") $status.text = $status.text.substring(7);
             }
-            xwt.println("origin is " + origin);
-
-            xwt.loadArchive(origin, function(num, den) {
-                    $left.flex = 50 * (num / den);
-                    $right.flex = 50 + 50 * (1.0 - num /den);
-                    var pct = xwt.math.ceil(num * 100 / den);
-                    if (1024 > num) {
-                        num = "" + num + " bytes";
-                    } else if (1024 * 1024 > num) {
-                        num = "" + xwt.math.ceil(num / 1024) + "kb";
-                    } else {
-                        num = "" + xwt.math.ceil(num / (1024 * 1024)) + "Mb";
-                    }
-                    $status.text = "Downloading: " + pct + "% [" + num + "]";
-                });
-
-            xwt.newBox("main", function(num, den) {
-                    $left.flex = 50 + 50 * (num / den);
-                    $right.flex = 50 * (1.0 - num / den);
-                    if ($right.flex == 0) $right.width = 0;
-                    $status.text = "Initializing: " + xwt.math.ceil(num * 100 / den) + "%";
-                });
-
-            thisbox = null;
+
         }
 
         <box absolute="true" sizetoimage="true" id="inner" image="org.xwt.builtin.lithium"/>