Changeset 13701

Timestamp:

05/12/08 09:24:09 (6 months ago)

Author:

ttrenka

Message:

Fixes to get QuickTime? version information in Opera without entirely killing the browser. I love race conditions. !strict.

Location:

dojox/trunk/embed

Files:

• Quicktime.js (modified) (4 diffs)
• tests/quicktime.html (modified) (2 diffs)

dojox/trunk/embed/Quicktime.js

@@ -162 +162 @@
         if(!dojo.isIE){
                 // FIXME: Opera does not like this at all for some reason, and of course there's no event references easily found.
-                qtVersion = { major: 0, minor: 0, rev: 0 };
+                qtVersion = dojox.embed._quicktime.version = { major: 0, minor: 0, rev: 0 };
                 var o = qtMarkup({ path: testMovieUrl, width:4, height:4 });
-                if(!dojo._initFired){
-                        var s='<div style="top:0;left:0;width:1px;height:1px;overflow:hidden;position:absolute;" id="-qt-version-test">'
-                                + o.markup
-                                + '</div>';
-                        document.write(s);
-                } else {
-                        var n = document.createElement("div");
-                        n.id="-qt-version-test";
-                        n.style.cssText = "top:0;left:0;width:1px;height:1px;overflow:hidden;position:absolute;";
-                        dojo.body().appendChild(n);
-                        n.innerHTML = o.markup;
-                }
-
-                function qtGetInfo(){
-                        var qt=document[o.id], n=dojo.byId("-qt-version-test"), v = [ 0, 0, 0 ];
+
+                function qtInsert(){
+                        if(!dojo._initFired){
+                                var s='<div style="top:0;left:0;width:1px;height:1px;;overflow:hidden;position:absolute;" id="-qt-version-test">'
+                                        + o.markup
+                                        + '</div>';
+                                document.write(s);
+                        } else {
+                                var n = document.createElement("div");
+                                n.id="-qt-version-test";
+                                n.style.cssText = "top:0;left:0;width:1px;height:1px;overflow:hidden;position:absolute;";
+                                dojo.body().appendChild(n);
+                                n.innerHTML = o.markup;
+                        }
+                }
+
+                function qtGetInfo(mv){
+                        var qt, n, v = [ 0, 0, 0 ];
+                        if(mv){
+                                qt=mv, n=qt.parentNode;
+                        } else {
+                                qtInsert();
+                                if(!dojo.isOpera){
+                                        setTimeout(function(){ qtGetInfo(document[o.id]); }, 50);
+                                } else {
+                                        var fn=function(){ 
+                                                setTimeout(function(){ qtGetInfo(document[o.id]) }, 50); 
+                                        };
+                                        if(!dojo._initFired){
+                                                dojo.addOnLoad(fn);
+                                        } else {
+                                                dojo.connect(document[o.id], "onload", fn);
+                                        }
+                                }
+                                return;
+                        }
+
                         if(qt){
                                 try {
@@ -196 +218 @@
                         }
 
-                        // dojo.body().removeChild(n);
-                }
-
-                if(dojo.isOpera){
-                        setTimeout(qtGetInfo, 50);
-                } else {
-                        qtGetInfo();
-                }
-        }
-        
-        if(dojo.isIE && installed){
+                        try {
+                                if(!mv){
+                                        dojo.body().removeChild(n);
+                                }
+                        } catch(e){ }
+                }
+
+                qtGetInfo();
+        }
+        else if(dojo.isIE && installed){
                 dojox.embed._quicktime.onInitialize();
         }
@@ -238 +259 @@
                 //              Returns a reference to the HTMLObject/HTMLEmbed that is created to 
                 //              place the movie in the document.  You can use this either with or
-                //              without the new operator.  Note that if the QuickTime engine isn't
-                //              available yet, this will throw an Error.
+                //              without the new operator.  Note that with any other DOM manipulation,
+                //              you must wait until the document is finished loading before trying
+                //              to use this.
                 //
                 //      example:
@@ -257 +279 @@
                 //      |       }, myWrapperNode);
 
-                if(dojox.embed._quicktime.initialized){
-                        return dojox.embed._quicktime.place(kwArgs, node);      //      HTMLObject
-                }
-                throw new Error("dojox.embed.Quicktime:: you must wait for the Quicktime engine to be initialized.");
+                return dojox.embed._quicktime.place(kwArgs, node);      //      HTMLObject
         };
 })();

dojox/trunk/embed/tests/quicktime.html

@@ -11 +11 @@
                         dojo.require("dojox.embed.Quicktime");
                         
-                        var v=dojox.embed._quicktime.version;
-                        console.log("while loading: ", v);
-
-                        dojo.addOnLoad(function(){
+                        function getVersion(){
                                 var v=dojox.embed._quicktime.version || { major: 0, minor: 0, rev: 0 };
                                 dojo.byId("results").innerHTML = v.major
                                         + '.' + v.minor
                                         + '.' + v.rev;
-                        });
+                        };
                 </script>
         </head>
@@ -27 +24 @@
                         This page is testing the base QuickTime movie generator.  See the Firebug log for details.
                 </p>
-                <p>Note that at this time, version detection before load in Opera is not supported.</p> 
+                <input type="submit" value="Get Quicktime Version" onclick="getVersion()" />    
                 <p>Installed QuickTime version: <span id="results"></span></p>
         </body>