Changeset 7262

Timestamp:

02/08/07 22:18:09 (19 months ago)

Author:

jburke

Message:

(merge from branch) References #2366. More web build plumbing. Got file save to work. UI still needs lots of work

Location:

trunk/buildscripts

Files:

• makeDojoJsWeb.js (copied) (copied from branches/0.4/buildscripts/makeDojoJsWeb.js)
• webbuild.php (copied) (copied from branches/0.4/buildscripts/webbuild.php)
• webbuild/index.html (modified) (6 diffs)
• webbuild/webbuild.js (modified) (1 diff)

trunk/buildscripts/webbuild/index.html

@@ -16 +16 @@
                 }
 
+                #xdDojoUrlDisplay {
+                        display: none;
+                }
         </style>
         <script type="text/javascript">
@@ -32 +35 @@
                 dojo.require("dojo.widget.TreeSelectorV3");
                 dojo.require("dojo.widget.TreeEmphasizeOnSelect");
-        
+                dojo.require("dojo.html.iframe");
+
                 function output(message){
                         dojo.debug(message);
+                }
+
+                function sendDependencyResultToServer(dependencyResult){
+                        var depListForm = document.depListForm;
+                        depListForm.action = "../webbuild.php";
+                        depListForm.depList.value = dependencyResult.depList.join(",");
+                        depListForm.provideList.value = dependencyResult.provideList.join(",");
+                        depListForm.version.value = version;
+                        depListForm.xdDojoUrl.value = xdDojoUrl;
+
+                        //reset the hidden frame so we can do another build.
+                        setTimeout(function(){
+                                dojo.html.iframeContentWindow(dojo.byId("builderFrame")).location = "../webbuild.html?random=" + (new Date()).getTime();
+                        }, 1000);
+
+                        depListForm.submit();
                 }
 
@@ -64 +84 @@
                         
                         //Set up XD Dojo URL if available.
-                        var xdDojoUrl = "@XD_DOJO_URL@";
+                        xdDojoUrl = "@XD_DOJO_URL@";
                         if(xdDojoUrl != ("@" + "XD_DOJO_URL" + "@")){
-                                dojo.byId("xdDojoPath").value = xdDojoUrl;
+                                dojo.byId("xdDojoUrl").innerHTML = xdDojoUrl;
+                                dojo.byId("xdDojoUrlDisplay").style.display = "block";
+                        }else{
+                                xdDojoUrl = "";
                         }
+                        
+                        version = "@VERSION@";
+                        if(xdDojoUrl == ("@" + "VERSION" + "@")){
+                                version = "";
+                        }
+
                 });
         </script>
@@ -82 +111 @@
         </div>
         <div id="buildControls">
-                <p>
-                        <b>XDomain Dojo path (example: http://some.domain.com/dojo-xdversion/src):</b><br />
-                        <input type="text" id="xdDojoPath" value="" size="30" />
+                <p id="xdDojoUrlDisplay">
+                        <b>XDomain Dojo path:</b><br />
+                        <span id="xdDojoUrl"></span>
                 </p>
                 <p>
@@ -96 +125 @@
                 </p>
                 <p>
-                        <button onclick="builderFrame.startBuild(dojo.byId('dependencyList').value, '0.4.2dev', dojo.byId('xdDojoPath').value)">Go</button>
+                        <button onclick="builderFrame.startBuild(dojo.byId('dependencyList').value, version, xdDojoUrl)">Go</button>
                 </p>
         </div>
@@ -104 +133 @@
         </div>
 
+        <form name="depListForm" action="" method="POST">
+                <input type="hidden" name="depList" value="" />
+                <input type="hidden" name="provideList" value="" />
+                <input type="hidden" name="version" value="" />         
+                <input type="hidden" name="compress" value="false" />
+                <input type="hidden" name="xdDojoUrl" value="" />
+        </form>
+
         <iframe id="builderFrame" name="builderFrame" src="../webbuild.html" style="visibility: hidden"></iframe>
 </body>

trunk/buildscripts/webbuild/webbuild.js

@@ -42 +42 @@
                 
                 var dependencyResult = buildUtil.getDependencyList(dependencies, null, true);
-                var dojoResult = buildUtil.makeDojoJs(dependencyResult, version);
+                
+                if(location.toString().indexOf("file:") == 0){
+                        var dojoResult = buildUtil.makeDojoJs(dependencyResult, version);
+        
+                        //Intern strings, and add license
+                        dojoResult.dojoContents = new String(readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", dojoResult.dojoContents, djConfig.baseRelativePath, [["dojo", "src"]], []);
+        
+                        //Print out the file list.
+                        dojo.debug("files in the profile:");
+                        for(var i = 0; i < dojoResult.resourceDependencies.length; i++){
+                                print(dojoResult.resourceDependencies[i]);
+                        }
+                        
+                        //Return the dojo contents
+                        webbuild.dojoContents = dojoResult.dojoContents;
+        
+                        //See if we should add in xd dojo module path.
+                        xdDojoPath = dojo.string.trim(xdDojoPath);
+                        if(xdDojoPath){
+                                webbuild.dojoContents = buildUtilXd.setXdDojoConfig(webbuild.dojoContents, xdDojoPath);
+                        }
 
-                //Intern strings, and add license
-                dojoResult.dojoContents = new String(readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", dojoResult.dojoContents, djConfig.baseRelativePath, [["dojo", "src"]], []);
+                        var outputWindow = window.open("webbuild/dojo.js.html", "dojoOutput");
+                        outputWindow.focus();
+        
+                        //FAILED attempts:
+                        //Using a javascript: url, FF 2.0 wraps the content in some HTML, so not really
+                        //good for file save operations (get HTML in the saved file).
+                        //var outputWindow = window.open("javascript:opener.webbuild.getDojoContents()", "dojoOutput");
+        
+                        //using data: urls seem to add funky text to the beginning of the file, at least in OSX FF 2.0
+                        //Same issue if application/octet-stream is used instead of text/javascript.
+                        //var outputWindow = window.open("data:text/javascript;" + webbuild.dojoContents, "dojoOutput");
+                }else{
+                        parent.sendDependencyResultToServer(dependencyResult);
+                }
+        },
 
-                //Print out the file list.
-                dojo.debug("files in the profile:");
-                for(var i = 0; i < dojoResult.resourceDependencies.length; i++){
-                        print(dojoResult.resourceDependencies[i]);
-                }
-                
-                //Return the dojo contents
-                webbuild.dojoContents = dojoResult.dojoContents;
-
-                //See if we should add in xd dojo module path.
-                xdDojoPath = dojo.string.trim(xdDojoPath);
-                if(xdDojoPath){
-                        webbuild.dojoContents = buildUtilXd.setXdDojoConfig(webbuild.dojoContents, xdDojoPath);
-                }
-
-
-
-                var outputWindow = window.open("webbuild/dojo.js.html", "dojoOutput");
-                outputWindow.focus();
-
-                //FAILED attempts:
-                //Using a javascript: url, FF 2.0 wraps the content in some HTML, so not really
-                //good for file save operations (get HTML in the saved file).
-                //var outputWindow = window.open("javascript:opener.webbuild.getDojoContents()", "dojoOutput");
-
-                //using data: urls seem to add funky text to the beginning of the file, at least in OSX FF 2.0
-                //Same issue if application/octet-stream is used instead of text/javascript.
-                //var outputWindow = window.open("data:text/javascript;" + webbuild.dojoContents, "dojoOutput");
-        },
-        
         getDojoContents: function(){
                 return webbuild.dojoContents;