diff options
Diffstat (limited to 'webapps/swat/source')
15 files changed, 30 insertions, 27 deletions
diff --git a/webapps/swat/source/class/swat/main/AbstractModule.js b/webapps/swat/source/class/swat/main/AbstractModule.js index 3fd94165ae..01aae703c3 100644 --- a/webapps/swat/source/class/swat/main/AbstractModule.js +++ b/webapps/swat/source/class/swat/main/AbstractModule.js @@ -151,4 +151,4 @@ qx.Proto.finalize = function(module) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/main/AbstractModuleFsm.js b/webapps/swat/source/class/swat/main/AbstractModuleFsm.js index 5ff8e69f40..273c9ad8a3 100644 --- a/webapps/swat/source/class/swat/main/AbstractModuleFsm.js +++ b/webapps/swat/source/class/swat/main/AbstractModuleFsm.js @@ -472,10 +472,10 @@ qx.Proto.addAwaitRpcResultState = function(module, blockedEvents) * @param fsm {qx.util.fsm.FiniteStateMachine} * The finite state machine issuing this remote procedure call. * - * @param service {string} + * @param service {String} * The name of the remote service which provides the specified method. * - * @param method {string} + * @param method {String} * The name of the method within the specified service. * * @param params {Array} diff --git a/webapps/swat/source/class/swat/main/Authenticate.js b/webapps/swat/source/class/swat/main/Authenticate.js index d586ea1f4a..83e20ce97a 100644 --- a/webapps/swat/source/class/swat/main/Authenticate.js +++ b/webapps/swat/source/class/swat/main/Authenticate.js @@ -150,4 +150,4 @@ qx.Proto.setInfo = function(info) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/main/Gui.js b/webapps/swat/source/class/swat/main/Gui.js index 689edf33d5..142b8dcba2 100644 --- a/webapps/swat/source/class/swat/main/Gui.js +++ b/webapps/swat/source/class/swat/main/Gui.js @@ -105,7 +105,7 @@ qx.Class.buildGui = function(moduleList) for (moduleName in moduleList) { // create a radio button menu item - o = new qx.ui.menu.RadioButton(moduleName, null, command); + o = new qx.ui.menu.RadioButton(moduleName, command, false); // Associate this button menu item with the module list o.moduleName = moduleName; diff --git a/webapps/swat/source/class/swat/main/Main.js b/webapps/swat/source/class/swat/main/Main.js index 0ec3fccda2..bf90f32068 100644 --- a/webapps/swat/source/class/swat/main/Main.js +++ b/webapps/swat/source/class/swat/main/Main.js @@ -36,7 +36,7 @@ new swat.main.Module("LDB Browser", swat.module.ldbbrowse.LdbBrowse); //#require(swat.module.documentation.Documentation) -//#require(api.Viewer) +//#require(apiviewer.Viewer) new swat.main.Module("API Documentation", swat.module.documentation.Documentation); diff --git a/webapps/swat/source/class/swat/main/Module.js b/webapps/swat/source/class/swat/main/Module.js index 1e5c6c9daf..160e6f6ec7 100644 --- a/webapps/swat/source/class/swat/main/Module.js +++ b/webapps/swat/source/class/swat/main/Module.js @@ -26,7 +26,7 @@ * class - * The class for this module * - * @param moduleName {string} + * @param moduleName {String} * The name of the module being registered. This is the name that will * appear in the Modules menu. * diff --git a/webapps/swat/source/class/swat/module/documentation/Documentation.js b/webapps/swat/source/class/swat/module/documentation/Documentation.js index acd7e90400..696a7f0161 100644 --- a/webapps/swat/source/class/swat/module/documentation/Documentation.js +++ b/webapps/swat/source/class/swat/module/documentation/Documentation.js @@ -7,6 +7,12 @@ * LGPL 2.1: http://creativecommons.org/licenses/LGPL/2.1/ */ +/* +#embed(apiviewer.css/*) +#embed(apiviewer.image/*) +*/ + + /** * Swat statistics class */ @@ -30,21 +36,18 @@ function() */ qx.Proto.initialAppear = function(module) { - qx.manager.object.AliasManager.getInstance().add("api", "./resource/image"); + // Define alias for custom resource path + var am = qx.manager.object.AliasManager.getInstance(); + am.add("api", qx.Settings.getValueOfClass("apiviewer", "resourceUri")); - // Include CSS file. - // (This is the hard way; I can't get qx.dom.StyleSheet.includeFile to load) - var el = document.createElement("link"); - el.type = "text/css"; - el.rel = "stylesheet"; - el.href = "./resource/css/apiviewer.css"; - var head = document.getElementsByTagName("head")[0]; - head.appendChild(el); + // Include CSS file + qx.html.StyleSheet.includeFile(am.resolvePath("api/css/apiviewer.css")); + am.add("apiviewer", "./resource/image"); // avoid redundant naming by api viewer qx.Settings.setCustomOfClass("apiviewer.Viewer", "title", ""); - var viewer = new api.Viewer(); + var viewer = new apiviewer.Viewer(); module.canvas.add(viewer); viewer.load("script/data.js"); @@ -56,4 +59,4 @@ qx.Proto.initialAppear = function(module) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/module/documentation/Fsm.js b/webapps/swat/source/class/swat/module/documentation/Fsm.js index 184b438520..b58f57cf1f 100644 --- a/webapps/swat/source/class/swat/module/documentation/Fsm.js +++ b/webapps/swat/source/class/swat/module/documentation/Fsm.js @@ -67,4 +67,4 @@ qx.Proto.buildFsm = function(module) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js b/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js index b58f4bbaf6..cb62c1f976 100644 --- a/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js +++ b/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js @@ -453,4 +453,4 @@ qx.Proto.buildFsm = function(module) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js b/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js index 161b99b19a..eb3e6add28 100644 --- a/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js +++ b/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js @@ -668,4 +668,4 @@ qx.Proto._clearAllFields = function(module, rpcRequest) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js b/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js index abccbff2d0..935eb18dcd 100644 --- a/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js +++ b/webapps/swat/source/class/swat/module/ldbbrowse/LdbBrowse.js @@ -49,4 +49,4 @@ qx.Proto.initialAppear = function(module) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js b/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js index 6967a7c353..209aac4d33 100644 --- a/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js +++ b/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js @@ -69,7 +69,7 @@ qx.OO.addProperty({ name : "basedn", type : "string" }); * @param type {String} * A string containing "new" or "modify" * - * @param data {object} + * @param data {Object} * An LDB object with the current object parameters * Used only if type = "modify" * @@ -84,7 +84,7 @@ qx.Proto.isActive = function() { /** * Set the base of the object to add * - * @param type {string} + * @param type {String} * A string containing the base DN */ diff --git a/webapps/swat/source/class/swat/module/statistics/Fsm.js b/webapps/swat/source/class/swat/module/statistics/Fsm.js index a6e56c6842..c23cfb0feb 100644 --- a/webapps/swat/source/class/swat/module/statistics/Fsm.js +++ b/webapps/swat/source/class/swat/module/statistics/Fsm.js @@ -227,4 +227,4 @@ qx.Proto.buildFsm = function(module) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/module/statistics/Gui.js b/webapps/swat/source/class/swat/module/statistics/Gui.js index b5e11d4533..bad55b71c0 100644 --- a/webapps/swat/source/class/swat/module/statistics/Gui.js +++ b/webapps/swat/source/class/swat/module/statistics/Gui.js @@ -466,4 +466,4 @@ qx.Proto.displayData = function(module, result) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; diff --git a/webapps/swat/source/class/swat/module/statistics/Statistics.js b/webapps/swat/source/class/swat/module/statistics/Statistics.js index f15e180cba..99528605a1 100644 --- a/webapps/swat/source/class/swat/module/statistics/Statistics.js +++ b/webapps/swat/source/class/swat/module/statistics/Statistics.js @@ -41,4 +41,4 @@ qx.Proto.initialAppear = function(module) /** * Singleton Instance Getter */ -qx.Class.getInstance = qx.util.Return.returnInstance; +qx.Class.getInstance = qx.lang.Function.returnInstance; |