Changeset 12311

Timestamp:

02/07/08 10:55:15 (6 months ago)

Author:

alex

Message:

adding support for Adobe AIR. Thanks to SitePen? and Adobe for these excellent patches. Tests in next commit. Refs #5723 !strict

Files:

• dijit/trunk/bench/benchTool.html (modified) (2 diffs)
• dijit/trunk/demos/mail.html (modified) (2 diffs)
• dijit/trunk/tests/layout/test_ContentPane.html (modified) (1 diff)
• dijit/trunk/tests/test_Dialog.html (modified) (1 diff)
• dijit/trunk/themes/themeTester.html (modified) (2 diffs)
• dijit/trunk/_editor/RichText.js (modified) (1 diff)
• dojo/trunk/tests/io/scriptJsonp.js (modified) (1 diff)
• dojo/trunk/_base/query.js (modified) (1 diff)
• dojo/trunk/_base/_loader/hostenv_browser.js (modified) (2 diffs)
• dojo/trunk/_base/_loader/loader.js (modified) (1 diff)
• dojo/trunk/_base/_loader/loader_debug.js (modified) (1 diff)
• dojo/trunk/_base/_loader/loader_xd.js (modified) (2 diffs)
• dojox/trunk/charting/tests/test_chart2d_updating.html (modified) (1 diff)
• dojox/trunk/grid/VirtualGrid.js (modified) (1 diff)
• dojox/trunk/image/SlideShow.js (modified) (1 diff)
• dojox/trunk/layout/tests/test_SizingPane.html (modified) (1 diff)
• dojox/trunk/off/ui.js (modified) (1 diff)
• dojox/trunk/presentation/tests/test_presentation.html (modified) (1 diff)
• dojox/trunk/storage/AirDBStorageProvider.js (added)
• dojox/trunk/storage/AirEncryptedLocalStorageProvider.js (added)
• dojox/trunk/storage/AirFileStorageProvider.js (added)

dijit/trunk/bench/benchTool.html

@@ -52 +52 @@
                         if(isRunning){ return; }
                         _toggleRunMsg();
-                        setTimeout("_runRealTest()",1000);
+                        setTimeout(function(){_runRealTest();},1000);
                 }
 
@@ -100 +100 @@
 
                         dojo.byId("results").innerHTML += msg;
-                        setTimeout("_toggleRunMsg()",250); 
+                        setTimeout(function(){_toggleRunMsg();},250); 
                         
                         // Nodes have to be in the document for IE7 to GC them.

dijit/trunk/demos/mail.html

@@ -96 +96 @@
                         dojo.fadeIn({ node: 'fetchMail', duration:300 }).play();
                         for (var i=0; i<=numMails; i++){
-                                setTimeout("updateFetchStatus("+i+")",((i+1)*(Math.floor(Math.random()*100)+400)));
+                                setTimeout(function(){updateFetchStatus(i);},((i+1)*(Math.floor(Math.random()*100)+400)));
                         }
                 }
@@ -110 +110 @@
                         dijit.byId('fakeSend').update({ indeterminate: true });
                         dijit.byId('sendDialog').show();
-                        setTimeout("stopSendBar()", 3000);
+                        setTimeout(function(){stopSendBar();}, 3000);
                 }
 

dijit/trunk/tests/layout/test_ContentPane.html

@@ -82 +82 @@
                         <p style='background-color:yellow;border:1px solid red;text-align:center;'>This text should automatically be replaced by downloaded content from combotab.html</p>
                 </div>
-                <input type="button" value="Change pane in 3 seconds" onClick='setTimeout("dijit.byId(\"test\").setHref(\"tab2.html\")", 3000);'>
+                <input type="button" value="Change pane in 3 seconds" onClick='setTimeout(function(){dijit.byId(\"test\").setHref(\"tab2.html\");}, 3000);'>
                 <script type="text/javascript">
                         dojo.addOnLoad(function(){

dijit/trunk/tests/test_Dialog.html

@@ -46 +46 @@
                                 },pane);
                         }
-                        setTimeout("thirdDlg.show()","3000");
+                        setTimeout(function(){thirdDlg.show();},"3000");
                 }
         </script>

dijit/trunk/themes/themeTester.html

@@ -138 +138 @@
 
                         dojo.byId('loaderInner').innerHTML += " done.";
-                        setTimeout("hideLoader()",250);
+                        setTimeout(function(){hideLoader();},250);
                         
                 });
@@ -262 +262 @@
                                         <h2>Dialogs:</h2>
                                         <ul>
-                                                <li><a href="javascript:dijit.byId('dialog1').show()">show Modal Dialog</a></li>
+                                                <li><a href="#" onclick="dijit.byId('dialog1').show()">show Modal Dialog</a></li>
                                         </ul>
 

dijit/trunk/_editor/RichText.js

@@ -493 +493 @@
                 var contentDoc = this.iframe.contentDocument;
                 contentDoc.open();
-                contentDoc.write(this._getIframeDocTxt(html));
+                if(dojo.isAIR){
+                        contentDoc.body.innerHTML = html;
+                }else{
+                        contentDoc.write(this._getIframeDocTxt(html));
+                }
                 contentDoc.close();
 

dojo/trunk/tests/io/scriptJsonp.js

@@ -55 +55 @@
 //Set a timeout to do the callback check, since MSIE won't see the SCRIPT tag until
 //we complete processing of this page.
-setTimeout('doJsonpCallback()', 300);
+setTimeout(function(){doJsonpCallback();}, 300);

dojo/trunk/_base/query.js

@@ -1015 +1015 @@
         );
         // uncomment to disable XPath for testing and tuning the DOM path
-        // _getQueryFunc = getStepQueryFunc;
+        _getQueryFunc = getStepQueryFunc;
 
         // FIXME: we've got problems w/ the NodeList query()/filter() functions if we go XPath for everything

dojo/trunk/_base/_loader/hostenv_browser.js

@@ -93 +93 @@
                         d.isSafari = parseFloat(dav.split("Version/")[1]) || 2;
                 }
+                d.isAIR = (dua.indexOf("AdobeAIR") >= 0) ? 1 : 0;
                 d.isKhtml = (dav.indexOf("Konqueror") >= 0 || d.isSafari) ? tv : 0;
                 d.isMozilla = d.isMoz = (dua.indexOf("Gecko") >= 0 && !d.isKhtml) ? tv : 0;
@@ -250 +251 @@
         }
 
-        if(/(WebKit|khtml)/i.test(navigator.userAgent)){ // sniff
+        if(dojo.isAIR){
+                window.addEventListener("load", dojo._loadInit, null);
+        }else if(/(WebKit|khtml)/i.test(navigator.userAgent)){ // sniff
                 dojo._khtmlTimer = setInterval(function(){
                         if(/loaded|complete/.test(document.readyState)){

dojo/trunk/_base/_loader/loader.js

@@ -227 +227 @@
                 //are being loaded (trac #2572)? Consider for 0.9.
                 if(typeof setTimeout == "object" || (dojo.config.useXDomain && d.isOpera)){
-                        setTimeout(dojo._scopeName + ".loaded();", 0);
+                        if(dojo.isAIR){
+                                setTimeout(function(){dojo.loaded();}, 0);
+                        }else{
+                                setTimeout(dojo._scopeName + ".loaded();", 0);
+                        }
                 }else{
                         d.loaded();

dojo/trunk/_base/_loader/loader_debug.js

@@ -13 +13 @@
                 //dojo.provide call in a module is the first line. Don't want to risk attaching
                 //another script tag until the current one finishes executing.
-                window.setTimeout(dojo._scopeName + "._xdDebugFileLoaded('" + resourceName + "')", 1);
+                if(dojo.isAIR){
+                        window.setTimeout(function(){dojo._xdDebugFileLoaded(resourceName);}, 1);
+                }else{
+                        window.setTimeout(dojo._scopeName + "._xdDebugFileLoaded('" + resourceName + "')", 1);
+                }
         }
 

dojo/trunk/_base/_loader/loader_xd.js

@@ -161 +161 @@
                 //Start timer
                 if(!this._xdTimer){
-                        this._xdTimer = setInterval(dojo._scopeName + "._xdWatchInFlight();", 100);
+                        if(dojo.isAIR){
+                                this._xdTimer = setInterval(function(){dojo._xdWatchInFlight();}, 100);
+                        }else{
+                                this._xdTimer = setInterval(dojo._scopeName + "._xdWatchInFlight();", 100);
+                        }
                 }
                 this._xdStartTime = (new Date()).getTime();
@@ -176 +180 @@
                 if(lastIndex != uri.length - 1){
                         xdUri += uri.substring(lastIndex, uri.length);
+                }
+
+                if (dojo.isAIR){
+                        xdUri = xdUri.replace("app:/", "/");
                 }
 

dojox/trunk/charting/tests/test_chart2d_updating.html

@@ -50 +50 @@
         chart.addPlot("grid", {type: "Grid", hMinorLines: true});
         chart.render();
-    setInterval("updateTest()", 200);
+    setInterval(function(){updateTest();}, 200);
 };
 

dojox/trunk/grid/VirtualGrid.js

@@ -211 +211 @@
         
         createView: function(inClass){
-                var c = eval(inClass);
+                if(dojo.isAIR){
+                        var obj = window;
+                        var names = inClass.split('.');
+                        for(var i=0;i<names.length;i++){
+                                if(typeof obj[names[i]]=='undefined'){
+                                        var undefstring = names[0];
+                                        for(var j=1;j<=i;j++){
+                                                undefstring+="."+names[j];
+                                        }
+                                        throw new Error(undefstring+" is undefined");
+                                }
+                                obj = obj[names[i]];
+                        }
+                        var c = obj;
+                }else{
+                        var c = eval(inClass);
+                }
                 var view = new c({ grid: this });
                 this.viewsNode.appendChild(view.domNode);

dojox/trunk/image/SlideShow.js

@@ -464 +464 @@
         _startTimer: function(){
                 // summary: Starts a timeout to show the next image when a slide show is active
-                this._slideId = setTimeout("dijit.byId('"+this.id +"').showNextImage(true);", this.slideshowInterval * 1000);
+                var id = this.id;
+                this._slideId = setTimeout(function(){dijit.byId(id).showNextImage(true);}, this.slideshowInterval * 1000);
         },
         

dojox/trunk/layout/tests/test_SizingPane.html

@@ -67 +67 @@
                 function hideCheck(node) {
                         if (_showing) { 
-                        setTimeout("hide('box1')",125); 
+                        setTimeout(function(){hide('box1');},125); 
                         }
                 }

dojox/trunk/off/ui.js

@@ -602 +602 @@
                         // so that the user can orient themselves
                         if(dojox.off.sync.autoSync){
-                                window.setTimeout(dojox._scopeName + ".off.sync.synchronize()", 1000);
+                                if(dojo.isAIR){
+                                        window.setTimeout(function(){dojox.off.sync.synchronize();}, 1000);
+                                }else{
+                                        window.setTimeout(dojox._scopeName + ".off.sync.synchronize()", 1000);
+                                }
                         }
                 }

dojox/trunk/presentation/tests/test_presentation.html

@@ -70 +70 @@
                                 })
                         ]);
-                        setTimeout("externalAnimation.play()",50); 
+                        setTimeout(function(){externalAnimation.play();},50); 
                 }