Author: derrell Date: 2007-01-14 02:54:41 +0000 (Sun, 14 Jan 2007) New Revision: 20751
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20751 Log: It's unlikely that even 1 in 1000 users of SWAT will be running IE. That not withstanding, although many web sites ignore Gecko and work properly only when accessed via IE, we should strive to a higher standard. This check-in makes the Samba4 Web Application Framework work in IE as well. Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/main/AbstractModule.js branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Gui.js branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Main.js branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Module.js Changeset: Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/main/AbstractModule.js =================================================================== --- branches/SAMBA_4_0/webapps/swat/source/class/swat/main/AbstractModule.js 2007-01-14 02:02:06 UTC (rev 20750) +++ branches/SAMBA_4_0/webapps/swat/source/class/swat/main/AbstractModule.js 2007-01-14 02:54:41 UTC (rev 20751) @@ -84,16 +84,6 @@ "ontransition" : function(fsm, event) { - // Make the "Loading" message go away. (We need to learn how to - // remove it entirely. Just doing canvas.removeAll() leaves - // something in the widget queue and we get spurious error - // messages.) - var children = module.canvas.getVisibleChildren(); - for (var child in children) - { - children[child].hide(); - } - // Call the module's initialAppear function to build FSM and GUI. // That function should *replace* this state, State_Idle, to which // we'll transition. @@ -126,8 +116,7 @@ /** * Build the initial graphical user interface. * - * In order to prevent long load times, as minimal as possible of an initial - * GUI should be created. Generally, this is just a "Loading..." message. + * Generally, this is a no-op. * * @param module {Object} * An object containing at least the following properties: @@ -138,20 +127,13 @@ * The canvas on which to create the gui for this module * name - * The name of this module - * class - + * clazz - * The class for this module * */ qx.Proto.buildInitialGui = function(module) { - // For now, just create the "Loading" text - var o = new qx.ui.basic.Label("Loading module '" + module.name + "'..."); - o.set({ - top: 12, - left: 20 - }); - o.setFont("bold"); - module.canvas.add(o); + // nothing to do }; qx.Proto.finalize = function(module) Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Gui.js =================================================================== --- branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Gui.js 2007-01-14 02:02:06 UTC (rev 20750) +++ branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Gui.js 2007-01-14 02:54:41 UTC (rev 20751) @@ -175,7 +175,6 @@ // Set the browser title as well document.title = "Swat: " + this.moduleName; - } }); Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Main.js =================================================================== --- branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Main.js 2007-01-14 02:02:06 UTC (rev 20750) +++ branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Main.js 2007-01-14 02:54:41 UTC (rev 20751) @@ -60,7 +60,7 @@ for (moduleName in moduleList) { // ... call the module's buildInitialFsm() function - var module = moduleList[moduleName]["class"].getInstance(); + var module = moduleList[moduleName]["clazz"].getInstance(); module.buildInitialFsm(moduleList[moduleName]); } }; @@ -77,7 +77,7 @@ for (moduleName in moduleList) { // ... call the module's buildInitialGui() function - var module = moduleList[moduleName]["class"].getInstance(); + var module = moduleList[moduleName]["clazz"].getInstance(); module.buildInitialGui(moduleList[moduleName]); } }; @@ -89,7 +89,7 @@ var moduleList = swat.main.Module.getList(); for (moduleName in moduleList) { - var module = moduleList[moduleName]["class"].getInstance(); + var module = moduleList[moduleName]["clazz"].getInstance(); module.finalize(moduleList[moduleName]); } }; Modified: branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Module.js =================================================================== --- branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Module.js 2007-01-14 02:02:06 UTC (rev 20750) +++ branches/SAMBA_4_0/webapps/swat/source/class/swat/main/Module.js 2007-01-14 02:54:41 UTC (rev 20751) @@ -30,7 +30,7 @@ * The name of the module being registered. This is the name that will * appear in the Modules menu. * - * @param class {class} + * @param clazz {clazz} * The class which contains the module implementation. That class must * extend swat.main.AbstractModule and implement a singleton interface * that provides a public method called initialAppear() which takes this @@ -39,7 +39,7 @@ * the module. */ qx.OO.defineClass("swat.main.Module", qx.core.Object, -function(moduleName, class) +function(moduleName, clazz) { qx.core.Object.call(this); @@ -52,7 +52,7 @@ this.name = moduleName; // Save this class name - this.class = class; + this.clazz = clazz; // Add this new module to the module list. swat.main.Module._list[moduleName] = this;