Click Here to Begin Editing

+ Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/storage/editor.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/storage/Attic/editor.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/storage/editor.js 22 Nov 2006 01:49:00 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/storage/editor.js 25 Dec 2006 16:39:50 -0000 1.2 @@ -12,7 +12,7 @@ dojo.require("dojo.event.*"); dojo.require("dojo.html"); dojo.require("dojo.lfx.*"); -dojo.require("dojo.widget.Editor"); +dojo.require("dojo.widget.Editor2"); dojo.require("dojo.storage.*"); var Moxie = { @@ -58,9 +58,9 @@ // get the new values var key = dojo.byId("storageKey").value; - var value = dojo.widget.byId("storageValue").getEditorContent(); + var richTextControl = dojo.widget.byId("storageValue"); + var value = richTextControl.getEditorContent(); - if(key == null || typeof key == "undefined" || key == ""){ alert("Please enter a file name"); return; @@ -183,9 +183,12 @@ var results = dojo.storage.get(key); // set the new Editor widget value - var storageValue = dojo.widget.byId("storageValue"); - storageValue._richText.editNode.innerHTML = results; - storageValue._richText._updateHeight(); + var richTextControl = dojo.widget.byId("storageValue") + richTextControl.replaceEditorContent(results); + // FIXME: Editor2 should be reflowing this height + // internally; we shouldn't be exposed to this - fix + // bug in Editor2 + richTextControl._updateHeight(); // print out that we are done this._printStatus("Loaded '" + key + "'"); Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/widget/Fisheye.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/widget/Attic/Fisheye.html,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/widget/Fisheye.html 22 Nov 2006 02:12:20 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/demos/widget/Fisheye.html 25 Dec 2006 16:39:51 -0000 1.2 @@ -8,9 +8,8 @@ var djConfig = {isDebug: true, debugAtAllCosts: false}; - @@ -195,6 +249,6 @@

This file is used for Dojo's XMLHttpRequest Iframe Proxy. This is the "client" file used internally by dojo.io.XhrIframeProxy.

- + Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/io/xip_server.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/io/Attic/xip_server.html,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/io/xip_server.html 6 Nov 2006 14:50:09 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/io/xip_server.html 25 Dec 2006 16:39:53 -0000 1.2 @@ -42,23 +42,20 @@ - data: The URL-encoded data for the request. For a GET request, this would be the querystring parameters. For a POST request, it wll be the body data. + + See xip_client.html for more info on the xip fragment identifier protocol. --> @@ -333,5 +366,6 @@

This file is used for Dojo's XMLHttpRequest Iframe Proxy. This is the the file that should go on the server that will actually be doing the XHR request.

Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/array.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/Attic/array.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/array.js 6 Nov 2006 14:50:09 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/array.js 25 Dec 2006 16:39:53 -0000 1.2 @@ -14,173 +14,271 @@ // FIXME: Is this worthless since you can do: if(name in obj) // is this the right place for this? -dojo.lang.has = function(/*Object*/obj, /*String*/name){ - try{ - return typeof obj[name] != "undefined"; - }catch(e){ return false; } -} -dojo.lang.isEmpty = function(/*Object*/obj){ - if(dojo.lang.isObject(obj)){ - var tmp = {}; - var count = 0; - for(var x in obj){ - if(obj[x] && (!tmp[x])){ - count++; - break; - } +dojo.lang.mixin(dojo.lang, { + has: function(/*Object*/obj, /*String*/name){ + // summary: is there a property with the passed name in obj? + try{ + return typeof obj[name] != "undefined"; // Boolean + }catch(e){ return false; } // Boolean + }, + + isEmpty: function(/*Object*/obj){ + // summary: + // can be used to determine if the passed object is "empty". In + // the case of array-like objects, the length, property is + // examined, but for other types of objects iteration is used to + // examine the iterable "surface area" to determine if any + // non-prototypal properties have been assigned. This iteration is + // prototype-extension safe. + if(dojo.lang.isObject(obj)){ + var tmp = {}; + var count = 0; + for(var x in obj){ + if(obj[x] && (!tmp[x])){ + count++; + break; + } + } + return count == 0; // boolean + }else if(dojo.lang.isArrayLike(obj) || dojo.lang.isString(obj)){ + return obj.length == 0; // boolean } - return count == 0; - }else if(dojo.lang.isArrayLike(obj) || dojo.lang.isString(obj)){ - return obj.length == 0; - } -} + }, -dojo.lang.map = function(/*Array*/arr, /*Object|Function*/obj, /*Function?*/unary_func){ - var isString = dojo.lang.isString(arr); - if(isString){ - // arr: String - arr = arr.split(""); - } - if(dojo.lang.isFunction(obj)&&(!unary_func)){ - unary_func = obj; - obj = dj_global; - }else if(dojo.lang.isFunction(obj) && unary_func){ - // ff 1.5 compat - var tmpObj = obj; - obj = unary_func; - unary_func = tmpObj; - } - if(Array.map){ - var outArr = Array.map(arr, unary_func, obj); - }else{ - var outArr = []; - for(var i=0;i1; }); + // // returns false + // dojo.lang.every([1, 2, 3, 4], function(item){ return item>0; }); + // // returns true + return this._everyOrSome(true, arr, callback, thisObject); // Boolean + }, -dojo.lang.some = function(/*Array*/arr, /*Function*/callback, /*Object?*/thisObject){ - return this._everyOrSome(false, arr, callback, thisObject); // Boolean -} + some: function(/*Array*/arr, /*Function*/callback, /*Object?*/thisObject){ + // summary: + // determines whether or not any item in the array satisfies the + // condition implemented by callback. thisObject may be used to + // scope the call to callback. The function signature is derived + // from the JavaScript 1.6 Array.some() function. More + // information on this can be found here: + // http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:some + // examples: + // dojo.lang.some([1, 2, 3, 4], function(item){ return item>1; }); + // // returns true + // dojo.lang.some([1, 2, 3, 4], function(item){ return item<1; }); + // // returns false + return this._everyOrSome(false, arr, callback, thisObject); // Boolean + }, -dojo.lang.filter = function(/*Array*/arr, /*Function*/callback, /*Object?*/thisObject){ - var isString = dojo.lang.isString(arr); - if(isString){ /*arr: String*/arr = arr.split(""); } - var outArr; - if(Array.filter){ - outArr = Array.filter(arr, callback, thisObject); - } else { - if(!thisObject){ - if(arguments.length >= 3){ dojo.raise("thisObject doesn't exist!"); } - thisObject = dj_global; - } + filter: function(/*Array*/arr, /*Function*/callback, /*Object?*/thisObject){ + // summary: + // returns a new Array with those items from arr that match the + // condition implemented by callback.thisObject may be used to + // scope the call to callback. The function signature is derived + // from the JavaScript 1.6 Array.filter() function, although + // special accomidation is made in our implementation for strings. + // More information on the JS 1.6 API can be found here: + // http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:filter + // examples: + // dojo.lang.some([1, 2, 3, 4], function(item){ return item>1; }); + // // returns [2, 3, 4] + var isString = dojo.lang.isString(arr); + if(isString){ /*arr: String*/arr = arr.split(""); } + var outArr; + if(Array.filter){ + outArr = Array.filter(arr, callback, thisObject); + }else{ + if(!thisObject){ + if(arguments.length >= 3){ dojo.raise("thisObject doesn't exist!"); } + thisObject = dj_global; + } - outArr = []; - for(var i = 0; i < arr.length; i++){ - if(callback.call(thisObject, arr[i], i, arr)){ - outArr.push(arr[i]); + outArr = []; + for(var i = 0; i < arr.length; i++){ + if(callback.call(thisObject, arr[i], i, arr)){ + outArr.push(arr[i]); + } } } - } - if(isString){ - return outArr.join(""); // String - } else { - return outArr; // Array - } -} + if(isString){ + return outArr.join(""); // String + } else { + return outArr; // Array + } + }, -dojo.lang.unnest = function(/* ... */){ - // summary: - // Creates a 1-D array out of all the arguments passed, - // unravelling any array-like objects in the process - // - // usage: - // unnest(1, 2, 3) ==> [1, 2, 3] - // unnest(1, [2, [3], [[[4]]]]) ==> [1, 2, 3, 4] + unnest: function(/* ... */){ + // summary: + // Creates a 1-D array out of all the arguments passed, + // unravelling any array-like objects in the process + // usage: + // unnest(1, 2, 3) ==> [1, 2, 3] + // unnest(1, [2, [3], [[[4]]]]) ==> [1, 2, 3, 4] - var out = []; - for(var i = 0; i < arguments.length; i++){ - if(dojo.lang.isArrayLike(arguments[i])){ - var add = dojo.lang.unnest.apply(this, arguments[i]); - out = out.concat(add); - }else{ - out.push(arguments[i]); + var out = []; + for(var i = 0; i < arguments.length; i++){ + if(dojo.lang.isArrayLike(arguments[i])){ + var add = dojo.lang.unnest.apply(this, arguments[i]); + out = out.concat(add); + }else{ + out.push(arguments[i]); + } } - } - return out; // Array -} + return out; // Array + }, -dojo.lang.toArray = function(/*Object*/arrayLike, /*Number*/startOffset){ - // summary: - // Converts an array-like object (i.e. arguments, DOMCollection) - // to an array - var array = []; - for(var i = startOffset||0; i < arrayLike.length; i++){ - array.push(arrayLike[i]); + toArray: function(/*Object*/arrayLike, /*Number*/startOffset){ + // summary: + // Converts an array-like object (i.e. arguments, DOMCollection) + // to an array. Returns a new Array object. + var array = []; + for(var i = startOffset||0; i < arrayLike.length; i++){ + array.push(arrayLike[i]); + } + return array; // Array } - return array; // Array -} +}); Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/common.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/Attic/common.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/common.js 6 Nov 2006 14:50:09 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/lang/common.js 25 Dec 2006 16:39:53 -0000 1.2 @@ -10,9 +10,9 @@ dojo.provide("dojo.lang.common"); -dojo.lang.inherits = function(/*Function*/ subclass, /*Function*/ superclass){ +dojo.lang.inherits = function(/*Function*/subclass, /*Function*/superclass){ // summary: Set up inheritance between two classes. - if(typeof superclass != 'function'){ + if(!dojo.lang.isFunction(superclass)){ dojo.raise("dojo.inherits: superclass argument ["+superclass+"] must be a function (subclass: ["+subclass+"']"); } subclass.prototype = new superclass(); @@ -23,7 +23,10 @@ } dojo.lang._mixin = function(/*Object*/ obj, /*Object*/ props){ - // summary: Adds all properties and methods of props to obj. + // summary: + // Adds all properties and methods of props to obj. This addition is + // "prototype extension safe", so that instances of objects will not + // pass along prototype defaults. var tobj = {}; for(var x in props){ // the "tobj" condition avoid copying properties in "props" @@ -45,17 +48,19 @@ return obj; // Object } -dojo.lang.mixin = function(/*Object*/ obj, /*Object...*/props){ - // summary: Adds all properties and methods of props to obj. +dojo.lang.mixin = function(/*Object*/obj, /*Object...*/props){ + // summary: Adds all properties and methods of props to obj. for(var i=1, l=arguments.length; i 0 && dojo.lang.isString(msg[0])){ - this.message=msg.shift(); + if(dojo.lang.isArray(message)){ + if(message.length > 0 && dojo.lang.isString(message[0])){ + this.message=message.shift(); } - this.msgArgs=msg; + this.msgArgs = message; }else{ - this.message=msg; + this.message = message; } // FIXME: what other information can we receive/discover here? } -// an empty parent (abstract) class which concrete filters should inherit from. dojo.logging.LogFilter = function(loggerChain){ + // summary: + // An empty parent (abstract) class which concrete filters should + // inherit from. Filters should have only a single method, filter(), + // which processes a record and returns true or false to denote + // whether or not it should be handled by the next step in a filter + // chain. this.passChain = loggerChain || ""; this.filter = function(record){ // FIXME: need to figure out a way to enforce the loggerChain @@ -99,44 +106,63 @@ } dojo.extend(dojo.logging.Logger,{ - argsToArr: function(args){ - // utility function, reproduced from __util__ here to remove dependency + _argsToArr: function(args){ var ret = []; for(var x=0; x= this.cutOffLevel; + isEnabledFor: function(/*Integer*/lvl){ + // summary: + // will a message at the specified level be emitted? + return parseInt(lvl) >= this.cutOffLevel; // boolean }, getEffectiveLevel: function(){ + // summary: + // gets the effective cutoff level, including that of any + // potential parent loggers in the chain. if((this.cutOffLevel==0)&&(this.parent)){ - return this.parent.getEffectiveLevel(); + return this.parent.getEffectiveLevel(); // Integer } - return this.cutOffLevel; + return this.cutOffLevel; // Integer }, - addFilter: function(flt){ + addFilter: function(/*dojo.logging.LogFilter*/flt){ + // summary: + // registers a new LogFilter object. All records will be passed + // through this filter from now on. this.filters.push(flt); - return this.filters.length-1; + return this.filters.length-1; // Integer }, - removeFilterByIndex: function(fltIndex){ + removeFilterByIndex: function(/*Integer*/fltIndex){ + // summary: + // removes the filter at the specified index from the filter + // chain. Returns whether or not removal was successful. if(this.filters[fltIndex]){ delete this.filters[fltIndex]; - return true; + return true; // boolean } - return false; + return false; // boolean }, - removeFilter: function(fltRef){ + removeFilter: function(/*dojo.logging.LogFilter*/fltRef){ + // summary: + // removes the passed LogFilter. Returns whether or not removal + // was successful. for(var x=0; x=this.cutOffLevel)){ this.parent.log(lvl, msg); @@ -194,27 +233,47 @@ }, // logger helpers - debug:function(msg){ - return this.logType("DEBUG", this.argsToArr(arguments)); + debug:function(/*string*/msg){ + // summary: + // log the msg and any other arguments at the "debug" logging + // level. + return this.logType("DEBUG", this._argsToArr(arguments)); }, info: function(msg){ - return this.logType("INFO", this.argsToArr(arguments)); + // summary: + // log the msg and any other arguments at the "info" logging + // level. + return this.logType("INFO", this._argsToArr(arguments)); }, warning: function(msg){ - return this.logType("WARNING", this.argsToArr(arguments)); + // summary: + // log the msg and any other arguments at the "warning" logging + // level. + return this.logType("WARNING", this._argsToArr(arguments)); }, error: function(msg){ - return this.logType("ERROR", this.argsToArr(arguments)); + // summary: + // log the msg and any other arguments at the "error" logging + // level. + return this.logType("ERROR", this._argsToArr(arguments)); }, critical: function(msg){ - return this.logType("CRITICAL", this.argsToArr(arguments)); + // summary: + // log the msg and any other arguments at the "critical" logging + // level. + return this.logType("CRITICAL", this._argsToArr(arguments)); }, - exception: function(msg, e, squelch){ + exception: function(/*string*/msg, /*Error*/e, /*boolean*/squelch){ + // summary: + // logs the error and the message at the "exception" logging + // level. If squelch is true, also prevent bubbling of the + // exception. + // FIXME: this needs to be modified to put the exception in the msg // if we're on Moz, we can get the following from the exception object: // lineNumber @@ -243,18 +302,24 @@ } }, - logType: function(type, args){ + logType: function(/*string*/type, /*array*/args){ + // summary: + // a more "user friendly" version of the log() function. Takes the + // named log level instead of the corresponding integer. return this.log.apply(this, [dojo.logging.log.getLevel(type), args]); }, warn:function(){ + // summary: shorthand for warning() this.warning.apply(this,arguments); }, err:function(){ + // summary: shorthand for error() this.error.apply(this,arguments); }, crit:function(){ + // summary: shorthand for critical() this.critical.apply(this,arguments); } }); @@ -272,17 +337,42 @@ dojo.unimplemented("setFormatter"); }, - flush:function(){}, - close:function(){}, - handleError:function(){}, + flush:function(){ + // summary: + // Unimplemented. Should be implemented by subclasses to handle + // finishing a transaction or otherwise comitting pending log + // messages to whatevery underlying transport or storage system is + // available. + }, + close:function(){ + // summary: + // Unimplemented. Should be implemented by subclasses to handle + // shutting down the logger, including a call to flush() + }, + handleError:function(){ + // summary: + // Unimplemented. Should be implemented by subclasses. + dojo.deprecated("dojo.logging.LogHandler.handleError", "use handle()", "0.6"); + }, - handle:function(record){ + handle:function(/*dojo.logging.Record*/record){ + // summary: + // Emits the record object passed in should the record meet the + // current logging level cuttof, as specified in cutOffLevel. if((this.filter(record))&&(record.level>=this.cutOffLevel)){ this.emit(record); } }, - emit:function(record){ + emit:function(/*dojo.logging.Record*/record){ + // summary: + // Unimplemented. Should be implemented by subclasses to handle + // an individual record. Subclasses may batch records and send + // them to their "substrate" only when flush() is called, but this + // is generally not a good idea as losing logging messages may + // make debugging significantly more difficult. Tuning the volume + // of logging messages written to storage should be accomplished + // with log levels instead. dojo.unimplemented("emit"); } }); @@ -312,74 +402,71 @@ dojo.logging.log.loggers = {}; -dojo.logging.log.getLogger = function(name){ +dojo.logging.log.getLogger = function(/*string*/name){ + // summary: + // returns a named dojo.logging.Logger instance. If one is not already + // available with that name in the global map, one is created and + // returne. if(!this.loggers[name]){ this.loggers[name] = new dojo.logging.Logger(); this.loggers[name].parent = this; } - return this.loggers[name]; + return this.loggers[name]; // dojo.logging.Logger } -dojo.logging.log.getLevelName = function(lvl){ +dojo.logging.log.getLevelName = function(/*integer*/lvl){ + // summary: turns integer logging level into a human-friendly name for(var x=0; xinteger conversion for log levels for(var x=0; xthis.numRecords){ - this.data.shift(); +dojo.declare("dojo.logging.MemoryLogHandler", + dojo.logging.LogHandler, + { + initializer: function(level, recordsToKeep, postType, postInterval){ + // mixin style inheritance + dojo.logging.LogHandler.call(this, level); + // default is unlimited + this.numRecords = (typeof djConfig['loggingNumRecords'] != 'undefined') ? djConfig['loggingNumRecords'] : ((recordsToKeep) ? recordsToKeep : -1); + // 0=count, 1=time, -1=don't post TODO: move this to a better location for prefs + this.postType = (typeof djConfig['loggingPostType'] != 'undefined') ? djConfig['loggingPostType'] : ( postType || -1); + // milliseconds for time, interger for number of records, -1 for non-posting, + this.postInterval = (typeof djConfig['loggingPostInterval'] != 'undefined') ? djConfig['loggingPostInterval'] : ( postType || -1); + }, + emit: function(record){ + if(!djConfig.isDebug){ return; } + var logStr = String(dojo.log.getLevelName(record.level)+": " + +record.time.toLocaleTimeString())+": "+record.message; + if(!dj_undef("println", dojo.hostenv)){ + dojo.hostenv.println(logStr, record.msgArgs); } + + this.data.push(record); + if(this.numRecords != -1){ + while(this.data.length>this.numRecords){ + this.data.shift(); + } + } } } -}); +); dojo.logging.logQueueHandler = new dojo.logging.MemoryLogHandler(0,50,0,10000); Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/namespaces/dojo.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/namespaces/Attic/dojo.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/namespaces/dojo.js 6 Nov 2006 14:50:11 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/namespaces/dojo.js 25 Dec 2006 16:39:54 -0000 1.2 @@ -12,76 +12,75 @@ dojo.require("dojo.ns"); (function(){ - //mapping of all widget short names to their full package names + // Mapping of all widget short names to their full package names // This is used for widget autoloading - no dojo.require() is necessary. // If you use a widget in markup or create one dynamically, then this // mapping is used to find and load any dependencies not already loaded. // You should use your own namespace for any custom widgets. // For extra widgets you use, dojo.declare() may be used to explicitly load them. + // Experimental and deprecated widgets are not included in this table var map = { html: { "accordioncontainer": "dojo.widget.AccordionContainer", + "animatedpng": "dojo.widget.AnimatedPng", "button": "dojo.widget.Button", "chart": "dojo.widget.Chart", "checkbox": "dojo.widget.Checkbox", + "clock": "dojo.widget.Clock", "colorpalette": "dojo.widget.ColorPalette", "combobox": "dojo.widget.ComboBox", "combobutton": "dojo.widget.Button", "contentpane": "dojo.widget.ContentPane", - "contextmenu": "dojo.widget.ContextMenu", "currencytextbox": "dojo.widget.CurrencyTextbox", "datepicker": "dojo.widget.DatePicker", "datetextbox": "dojo.widget.DateTextbox", "debugconsole": "dojo.widget.DebugConsole", "dialog": "dojo.widget.Dialog", - "docpane": "dojo.widget.DocPane", "dropdownbutton": "dojo.widget.Button", "dropdowndatepicker": "dojo.widget.DropdownDatePicker", "dropdowntimepicker": "dojo.widget.DropdownTimePicker", "emaillisttextbox": "dojo.widget.InternetTextbox", "emailtextbox": "dojo.widget.InternetTextbox", - "editor2": "dojo.widget.Editor2", - "editor2toolbar": "dojo.widget.Editor2Toolbar", "editor": "dojo.widget.Editor", - "editortree": "dojo.widget.EditorTree", - "editortreecontextmenu": "dojo.widget.EditorTreeContextMenu", - "editortreenode": "dojo.widget.EditorTreeNode", + "editor2": "dojo.widget.Editor2", "filteringtable": "dojo.widget.FilteringTable", "fisheyelist": "dojo.widget.FisheyeList", - "editortreecontroller": "dojo.widget.EditorTreeController", - "googlemap": "dojo.widget.GoogleMap", - "editortreeselector": "dojo.widget.EditorTreeSelector", + "fisheyelistitem": "dojo.widget.FisheyeList", "floatingpane": "dojo.widget.FloatingPane", + "modalfloatingpane": "dojo.widget.FloatingPane", "form": "dojo.widget.Form", - "hslcolorpicker": "dojo.widget.HslColorPicker", + "googlemap": "dojo.widget.GoogleMap", "inlineeditbox": "dojo.widget.InlineEditBox", - "integerspinner": "dojo.widget.IntegerSpinner", + "integerspinner": "dojo.widget.Spinner", "integertextbox": "dojo.widget.IntegerTextbox", "ipaddresstextbox": "dojo.widget.InternetTextbox", "layoutcontainer": "dojo.widget.LayoutContainer", "linkpane": "dojo.widget.LinkPane", - "pagecontainer": "dojo.widget.PageContainer", - "pagecontroller": "dojo.widget.PageContainer", - "popupcontainer": "dojo.widget.Menu2", "popupmenu2": "dojo.widget.Menu2", "menuitem2": "dojo.widget.Menu2", "menuseparator2": "dojo.widget.Menu2", "menubar2": "dojo.widget.Menu2", "menubaritem2": "dojo.widget.Menu2", - "monthlyCalendar": "dojo.widget.MonthlyCalendar", + "pagecontainer": "dojo.widget.PageContainer", + "pagecontroller": "dojo.widget.PageContainer", + "popupcontainer": "dojo.widget.PopupContainer", + "progressbar": "dojo.widget.ProgressBar", "radiogroup": "dojo.widget.RadioGroup", "realnumbertextbox": "dojo.widget.RealNumberTextbox", "regexptextbox": "dojo.widget.RegexpTextbox", "repeater": "dojo.widget.Repeater", - "richtext": "dojo.widget.RichText", - "remotetabcontroller": "dojo.widget.RemoteTabController", - "resizehandle": "dojo.widget.ResizeHandle", "resizabletextarea": "dojo.widget.ResizableTextarea", + "richtext": "dojo.widget.RichText", "select": "dojo.widget.Select", + "show": "dojo.widget.Show", + "showaction": "dojo.widget.ShowAction", + "showslide": "dojo.widget.ShowSlide", + "slidervertical": "dojo.widget.Slider", + "sliderhorizontal": "dojo.widget.Slider", + "slider":"dojo.widget.Slider", "slideshow": "dojo.widget.SlideShow", "sortabletable": "dojo.widget.SortableTable", "splitcontainer": "dojo.widget.SplitContainer", - "svgbutton": "dojo.widget.SvgButton", "tabcontainer": "dojo.widget.TabContainer", "tabcontroller": "dojo.widget.TabContainer", "taskbar": "dojo.widget.TaskBar", @@ -92,42 +91,53 @@ "toaster": "dojo.widget.Toaster", "toggler": "dojo.widget.Toggler", "toolbar": "dojo.widget.Toolbar", + "toolbarcontainer": "dojo.widget.Toolbar", + "toolbaritem": "dojo.widget.Toolbar", + "toolbarbuttongroup": "dojo.widget.Toolbar", + "toolbarbutton": "dojo.widget.Toolbar", + "toolbardialog": "dojo.widget.Toolbar", + "toolbarmenu": "dojo.widget.Toolbar", + "toolbarseparator": "dojo.widget.Toolbar", + "toolbarspace": "dojo.widget.Toolbar", + "toolbarselect": "dojo.widget.Toolbar", + "toolbarcolordialog": "dojo.widget.Toolbar", "tooltip": "dojo.widget.Tooltip", "tree": "dojo.widget.Tree", "treebasiccontroller": "dojo.widget.TreeBasicController", "treecontextmenu": "dojo.widget.TreeContextMenu", - "treeselector": "dojo.widget.TreeSelector", - "treecontrollerextension": "dojo.widget.TreeControllerExtension", + "treedisablewrapextension": "dojo.widget.TreeDisableWrapExtension", + "treedociconextension": "dojo.widget.TreeDocIconExtension", + "treeeditor": "dojo.widget.TreeEditor", + "treeemphasizeonselect": "dojo.widget.TreeEmphasizeOnSelect", + "treeexpandtonodeonselect": "dojo.widget.TreeExpandToNodeOnSelect", + "treelinkextension": "dojo.widget.TreeLinkExtension", + "treeloadingcontroller": "dojo.widget.TreeLoadingController", + "treemenuitem": "dojo.widget.TreeContextMenu", "treenode": "dojo.widget.TreeNode", "treerpccontroller": "dojo.widget.TreeRPCController", + "treeselector": "dojo.widget.TreeSelector", + "treetoggleonselect": "dojo.widget.TreeToggleOnSelect", + "treev3": "dojo.widget.TreeV3", "treebasiccontrollerv3": "dojo.widget.TreeBasicControllerV3", "treecontextmenuv3": "dojo.widget.TreeContextMenuV3", - "treedeselectondblselect": "dojo.widget.TreeDeselectOnDblselect", - "treedisablewrapextension": "dojo.widget.TreeDisableWrapExtension", "treedndcontrollerv3": "dojo.widget.TreeDndControllerV3", - "treedociconextension": "dojo.widget.TreeDocIconExtension", - "treeeditor": "dojo.widget.TreeEditor", - "treeemphaseonselect": "dojo.widget.TreeEmphaseOnSelect", - "treelinkextension": "dojo.widget.TreeLinkExtension", "treeloadingcontrollerv3": "dojo.widget.TreeLoadingControllerV3", "treemenuitemv3": "dojo.widget.TreeContextMenuV3", "treerpccontrollerv3": "dojo.widget.TreeRpcControllerV3", "treeselectorv3": "dojo.widget.TreeSelectorV3", - "treev3": "dojo.widget.TreeV3", "urltextbox": "dojo.widget.InternetTextbox", "usphonenumbertextbox": "dojo.widget.UsTextbox", "ussocialsecuritynumbertextbox": "dojo.widget.UsTextbox", "usstatetextbox": "dojo.widget.UsTextbox", "usziptextbox": "dojo.widget.UsTextbox", "validationtextbox": "dojo.widget.ValidationTextbox", "treeloadingcontroller": "dojo.widget.TreeLoadingController", - "widget": "dojo.widget.Widget", - "wizard": "dojo.widget.Wizard", + "wizardcontainer": "dojo.widget.Wizard", + "wizardpane": "dojo.widget.Wizard", "yahoomap": "dojo.widget.YahooMap" }, svg: { - "chart": "dojo.widget.svg.Chart", - "hslcolorpicker": "dojo.widget.svg.HslColorPicker" + "chart": "dojo.widget.svg.Chart" }, vml: { "chart": "dojo.widget.vml.Chart" Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/rpc/yahoo.smd =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/rpc/Attic/yahoo.smd,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/rpc/yahoo.smd 6 Nov 2006 14:50:11 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/rpc/yahoo.smd 25 Dec 2006 16:39:54 -0000 1.2 @@ -86,9 +86,6 @@ // // WEB SEARCH // - - // NOTE: contextual search and term extraction are not stubbed out - // becaues I'm not sure if we can POST via script src inclusion method { // http://developer.yahoo.com/search/web/V1/webSearch.html "name":"webSearch", @@ -124,6 +121,35 @@ { "name":"results", "type":"INTEGER" } // 1-50, defaults to 10 ] }, + { + // http://developer.yahoo.com/search/content/V1/termExtraction.html + "name":"termExtraction", + "serviceURL": "http://search.yahooapis.com/ContentAnalysisService/V1/termExtraction", + "parameters":[ + { "name":"query", "type":"STRING" }, + { "name":"context", "type":"STRING" }, + { "name":"results", "type":"INTEGER" } // 1-50, defaults to 10 + ] + }, + { + // http://developer.yahoo.com/search/web/V1/contextSearch.html + "name":"contextSearch", + "serviceURL": "http://search.yahooapis.com/WebSearchService/V1/contextSearch", + "parameters":[ + { "name":"query", "type":"STRING" }, + { "name":"context", "type":"STRING" }, + { "name":"type", "type":"STRING" }, // defaults to "all" + { "name":"results", "type":"INTEGER" }, // defaults to 10 + { "name":"start", "type":"INTEGER" }, // defaults to 1 + { "name":"format", "type":"STRING" }, // defaults to "any", can be "html", "msword", "pdf", "ppt", "rst", "txt", or "xls" + { "name":"adult_ok", "type":"INTEGER" }, // defaults to null + { "name":"similar_ok", "type":"INTEGER" }, // defaults to null + { "name":"language", "type":"STRING" }, // defaults to null + { "name":"country", "type":"STRING" }, // defaults to null + { "name":"site", "type":"STRING" }, // defaults to null + { "name":"license", "type":"STRING" } // defaults to "any", could be "cc_any", "cc_commercial", "cc_modifiable" + ] + }, // // IMAGE SEARCH // Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/selection/Selection.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/selection/Attic/Selection.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/selection/Selection.js 7 Nov 2006 02:38:03 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/selection/Selection.js 25 Dec 2006 16:39:54 -0000 1.2 @@ -11,415 +11,462 @@ dojo.provide("dojo.selection.Selection"); dojo.require("dojo.lang.array"); dojo.require("dojo.lang.func"); +dojo.require("dojo.lang.common"); dojo.require("dojo.math"); -dojo.selection.Selection = function(items, isCollection) { - this.items = []; - this.selection = []; - this._pivotItems = []; - this.clearItems(); +dojo.declare("dojo.selection.Selection", null, + { + initializer: function(items, isCollection){ + this.items = []; + this.selection = []; + this._pivotItems = []; + this.clearItems(); - if(items) { - if(isCollection) { - this.setItemsCollection(items); - } else { - this.setItems(items); - } - } -} -dojo.lang.extend(dojo.selection.Selection, { - items: null, // items to select from, order matters for growable selections + if(items) { + if(isCollection) { + this.setItemsCollection(items); + } else { + this.setItems(items); + } + } + }, - selection: null, // items selected, aren't stored in order (see sorted()) - lastSelected: null, // last item selected + // Array: items to select from, order matters for growable selections + items: null, - allowImplicit: true, // if true, grow selection will start from 0th item when nothing is selected - length: 0, // number of *selected* items + // Array: items selected, aren't stored in order (see sorted()) + selection: null, + lastSelected: null, // last item selected - // if true, the selection is treated as an in-order and can grow by ranges, not just by single item - isGrowable: true, + // Boolean: if true, grow selection will start from 0th item when nothing is selected + allowImplicit: true, - _pivotItems: null, // stack of pivot items - _pivotItem: null, // item we grow selections from, top of stack + // Integer: number of *selected* items + length: 0, - // event handlers - onSelect: function(item) {}, - onDeselect: function(item) {}, - onSelectChange: function(item, selected) {}, + // Boolean: + // if true, the selection is treated as an in-order and can grow + // by ranges, not just by single item + isGrowable: true, - _find: function(item, inSelection) { - if(inSelection) { - return dojo.lang.find(this.selection, item); - } else { - return dojo.lang.find(this.items, item); - } - }, + _pivotItems: null, // stack of pivot items + _pivotItem: null, // item we grow selections from, top of stack - isSelectable: function(item) { - // user-customizable, will filter items through this - return true; - }, + // event handlers + onSelect: function(item){ + // summary: slot to be connect()'d to + }, + onDeselect: function(item){ + // summary: slot to be connect()'d to + }, + onSelectChange: function(item, selected){ + // summary: slot to be connect()'d to + }, - setItems: function(/* ... */) { - this.clearItems(); - this.addItems.call(this, arguments); - }, + _find: function(item, inSelection) { + if(inSelection) { + return dojo.lang.find(this.selection, item); + } else { + return dojo.lang.find(this.items, item); + } + }, - // this is in case you have an active collection array-like object - // (i.e. getElementsByTagName collection) that manages its own order - // and item list - setItemsCollection: function(collection) { - this.items = collection; - }, + isSelectable: function(/*Object*/item){ + // summary: + // user-customizable and should be over-ridden, will filter + // items through this + return true; // boolean + }, - addItems: function(/* ... */) { - var args = dojo.lang.unnest(arguments); - for(var i = 0; i < args.length; i++) { - this.items.push(args[i]); - } - }, + setItems: function(/* ... */){ + // summary: + // adds all passed arguments to the items array, removing any + // previously selected items. + this.clearItems(); + this.addItems.call(this, arguments); + }, - addItemsAt: function(item, before /* ... */) { - if(this.items.length == 0) { // work for empy case - return this.addItems(dojo.lang.toArray(arguments, 2)); - } + + setItemsCollection: function(/*Object*/collection){ + // summary: + // like setItems, but use in case you have an active + // collection array-like object (i.e. getElementsByTagName + // collection) that manages its own order and item list + this.items = collection; + }, - if(!this.isItem(item)) { - item = this.items[item]; - } - if(!item) { throw new Error("addItemsAt: item doesn't exist"); } - var idx = this._find(item); - if(idx > 0 && before) { idx--; } - for(var i = 2; i < arguments.length; i++) { - if(!this.isItem(arguments[i])) { - this.items.splice(idx++, 0, arguments[i]); + addItems: function(/* ... */){ + // summary: + // adds all passed arguments to the items array + var args = dojo.lang.unnest(arguments); + for(var i = 0; i < args.length; i++){ + this.items.push(args[i]); } - } - }, + }, - removeItem: function(item) { - // remove item - var idx = this._find(item); - if(idx > -1) { - this.items.splice(idx, 1); - } - // remove from selection - // FIXME: do we call deselect? I don't think so because this isn't how - // you usually want to deselect an item. For example, if you deleted an - // item, you don't really want to deselect it -- you want it gone. -DS - idx = this._find(item, true); - if(idx > -1) { - this.selection.splice(idx, 1); - } - }, + addItemsAt: function(/*Object*/item, /*Object*/before /* ... */){ + // summary: + // add items to the array after the the passed "before" item. + if(this.items.length == 0){ // work for empy case + return this.addItems(dojo.lang.toArray(arguments, 2)); + } - clearItems: function() { - this.items = []; - this.deselectAll(); - }, + if(!this.isItem(item)){ + item = this.items[item]; + } + if(!item){ throw new Error("addItemsAt: item doesn't exist"); } + var idx = this._find(item); + if(idx > 0 && before){ idx--; } + for(var i = 2; i < arguments.length; i++){ + if(!this.isItem(arguments[i])){ + this.items.splice(idx++, 0, arguments[i]); + } + } + }, - isItem: function(item) { - return this._find(item) > -1; - }, + removeItem: function(/*Object*/item){ + // summary: remove item + var idx = this._find(item); + if(idx > -1) { + this.items.splice(idx, 1); + } + // remove from selection + // FIXME: do we call deselect? I don't think so because this isn't how + // you usually want to deselect an item. For example, if you deleted an + // item, you don't really want to deselect it -- you want it gone. -DS + idx = this._find(item, true); + if(idx > -1) { + this.selection.splice(idx, 1); + } + }, - isSelected: function(item) { - return this._find(item, true) > -1; - }, + clearItems: function(){ + // summary: remove and uselect all items + this.items = []; + this.deselectAll(); + }, - /** - * allows you to filter item in or out of the selection - * depending on the current selection and action to be taken - **/ - selectFilter: function(item, selection, add, grow) { - return true; - }, + isItem: function(/*Object*/item){ + // summary: do we already "know" about the passed item? + return this._find(item) > -1; // boolean + }, - /** - * update -- manages selections, most selecting should be done here - * item => item which may be added/grown to/only selected/deselected - * add => behaves like ctrl in windows selection world - * grow => behaves like shift - * noToggle => if true, don't toggle selection on item - **/ - update: function(item, add, grow, noToggle) { - if(!this.isItem(item)) { return false; } + isSelected: function(/*Object*/item){ + // summary: + // do we know about the item and is it selected by this + // selection? + return this._find(item, true) > -1; // boolean + }, - if(this.isGrowable && grow) { - if(!this.isSelected(item) - && this.selectFilter(item, this.selection, false, true)) { - this.grow(item); - this.lastSelected = item; - } - } else if(add) { - if(this.selectFilter(item, this.selection, true, false)) { - if(noToggle) { - if(this.select(item)) { + /** + * allows you to filter item in or out of the selection + * depending on the current selection and action to be taken + **/ + selectFilter: function(item, selection, add, grow) { + return true; + }, + + update: function(/*Object*/item, /*Boolean*/add, /*Boolean*/grow, noToggle) { + // summary: manages selections, most selecting should be done here + // item: item which may be added/grown to/only selected/deselected + // add: behaves like ctrl in windows selection world + // grow: behaves like shift + // noToggle: if true, don't toggle selection on item + if(!this.isItem(item)){ return false; } // boolean + + if(this.isGrowable && grow){ + if( (!this.isSelected(item)) && + this.selectFilter(item, this.selection, false, true) ){ + this.grow(item); + this.lastSelected = item; + } + }else if(add){ + if(this.selectFilter(item, this.selection, true, false)){ + if(noToggle){ + if(this.select(item)){ + this.lastSelected = item; + } + }else if(this.toggleSelected(item)){ this.lastSelected = item; } - } else if(this.toggleSelected(item)) { - this.lastSelected = item; } + }else{ + this.deselectAll(); + this.select(item); } - } else { - this.deselectAll(); - this.select(item); - } - this.length = this.selection.length; - }, + this.length = this.selection.length; + return true; // Boolean + }, - /** - * Grow a selection. - * toItem => which item to grow selection to - * fromItem => which item to start the growth from (it won't be selected) - * - * Any items in (fromItem, lastSelected] that aren't part of - * (fromItem, toItem] will be deselected - **/ - grow: function(toItem, fromItem) { - if(!this.isGrowable) { return; } + grow: function(/*Object*/toItem, /*Object*/fromItem){ + // summary: + // Grow a selection. Any items in (fromItem, lastSelected] + // that aren't part of (fromItem, toItem] will be deselected + // toItem: which item to grow selection to + // fromItem: which item to start the growth from (it won't be selected) + if(!this.isGrowable){ return; } - if(arguments.length == 1) { - fromItem = this._pivotItem; - if(!fromItem && this.allowImplicit) { - fromItem = this.items[0]; + if(arguments.length == 1){ + fromItem = this._pivotItem; + if(!fromItem && this.allowImplicit){ + fromItem = this.items[0]; + } } - } - if(!toItem || !fromItem) { return false; } + if(!toItem || !fromItem){ return false; } - var fromIdx = this._find(fromItem); + var fromIdx = this._find(fromItem); - // get items to deselect (fromItem, lastSelected] - var toDeselect = {}; - var lastIdx = -1; - if(this.lastSelected) { - lastIdx = this._find(this.lastSelected); - var step = fromIdx < lastIdx ? -1 : 1; - var range = dojo.math.range(lastIdx, fromIdx, step); - for(var i = 0; i < range.length; i++) { - toDeselect[range[i]] = true; + // get items to deselect (fromItem, lastSelected] + var toDeselect = {}; + var lastIdx = -1; + if(this.lastSelected){ + lastIdx = this._find(this.lastSelected); + var step = fromIdx < lastIdx ? -1 : 1; + var range = dojo.math.range(lastIdx, fromIdx, step); + for(var i = 0; i < range.length; i++){ + toDeselect[range[i]] = true; + } } - } - // add selection (fromItem, toItem] - var toIdx = this._find(toItem); - var step = fromIdx < toIdx ? -1 : 1; - var shrink = lastIdx >= 0 && step == 1 ? lastIdx < toIdx : lastIdx > toIdx; - var range = dojo.math.range(toIdx, fromIdx, step); - if(range.length) { - for(var i = range.length-1; i >= 0; i--) { - var item = this.items[range[i]]; - if(this.selectFilter(item, this.selection, false, true)) { - if(this.select(item, true) || shrink) { - this.lastSelected = item; + // add selection (fromItem, toItem] + var toIdx = this._find(toItem); + var step = fromIdx < toIdx ? -1 : 1; + var shrink = lastIdx >= 0 && step == 1 ? lastIdx < toIdx : lastIdx > toIdx; + var range = dojo.math.range(toIdx, fromIdx, step); + if(range.length){ + for(var i = range.length-1; i >= 0; i--){ + var item = this.items[range[i]]; + if(this.selectFilter(item, this.selection, false, true)){ + if(this.select(item, true) || shrink){ + this.lastSelected = item; + } + if(range[i] in toDeselect){ + delete toDeselect[range[i]]; + } } - if(range[i] in toDeselect) { - delete toDeselect[range[i]]; - } } + }else{ + this.lastSelected = fromItem; } - } else { - this.lastSelected = fromItem; - } - // now deselect... - for(var i in toDeselect) { - if(this.items[i] == this.lastSelected) { - //dojo.debug("oops!"); + // now deselect... + for(var i in toDeselect){ + if(this.items[i] == this.lastSelected){ + //dojo.debug("oops!"); + } + this.deselect(this.items[i]); } - this.deselect(this.items[i]); - } - // make sure everything is all kosher after selections+deselections - this._updatePivot(); - }, + // make sure everything is all kosher after selections+deselections + this._updatePivot(); + }, - /** - * Grow selection upwards one item from lastSelected - **/ - growUp: function() { - if(!this.isGrowable) { return; } + growUp: function(){ + // summary: Grow selection upwards one item from lastSelected + if(!this.isGrowable){ return; } - var idx = this._find(this.lastSelected) - 1; - while(idx >= 0) { - if(this.selectFilter(this.items[idx], this.selection, false, true)) { - this.grow(this.items[idx]); - break; + var idx = this._find(this.lastSelected) - 1; + while(idx >= 0){ + if(this.selectFilter(this.items[idx], this.selection, false, true)){ + this.grow(this.items[idx]); + break; + } + idx--; } - idx--; - } - }, + }, - /** - * Grow selection downwards one item from lastSelected - **/ - growDown: function() { - if(!this.isGrowable) { return; } + growDown: function(){ + // summary: Grow selection downwards one item from lastSelected + if(!this.isGrowable){ return; } - var idx = this._find(this.lastSelected); - if(idx < 0 && this.allowImplicit) { - this.select(this.items[0]); - idx = 0; - } - idx++; - while(idx > 0 && idx < this.items.length) { - if(this.selectFilter(this.items[idx], this.selection, false, true)) { - this.grow(this.items[idx]); - break; + var idx = this._find(this.lastSelected); + if(idx < 0 && this.allowImplicit){ + this.select(this.items[0]); + idx = 0; } idx++; - } - }, + while(idx > 0 && idx < this.items.length){ + if(this.selectFilter(this.items[idx], this.selection, false, true)){ + this.grow(this.items[idx]); + break; + } + idx++; + } + }, - toggleSelected: function(item, noPivot) { - if(this.isItem(item)) { - if(this.select(item, noPivot)) { return 1; } - if(this.deselect(item)) { return -1; } - } - return 0; - }, + toggleSelected: function(/*Object*/item, /*Boolean*/noPivot){ + // summary: + // like it says on the tin. If noPivot is true, no selection + // pivot is added (or removed) from the selection. Returns 1 + // if the item is selected, -1 if it is deselected, and 0 if + // the item is not under management. + if(this.isItem(item)){ + if(this.select(item, noPivot)){ return 1; } + if(this.deselect(item)){ return -1; } + } + return 0; + }, - select: function(item, noPivot) { - if(this.isItem(item) && !this.isSelected(item) - && this.isSelectable(item)) { - this.selection.push(item); - this.lastSelected = item; - this.onSelect(item); - this.onSelectChange(item, true); - if(!noPivot) { - this._addPivot(item); + select: function(/*Object*/item, /*Boolean*/noPivot){ + // summary: + // like it says on the tin. If noPivot is true, no selection + // pivot is added from the selection. + if(this.isItem(item) && !this.isSelected(item) + && this.isSelectable(item)){ + this.selection.push(item); + this.lastSelected = item; + this.onSelect(item); + this.onSelectChange(item, true); + if(!noPivot){ + this._addPivot(item); + } + this.length = this.selection.length; + return true; } - this.length = this.selection.length; - return true; - } - return false; - }, + return false; + }, - deselect: function(item) { - var idx = this._find(item, true); - if(idx > -1) { - this.selection.splice(idx, 1); - this.onDeselect(item); - this.onSelectChange(item, false); - if(item == this.lastSelected) { - this.lastSelected = null; + deselect: function(item){ + // summary: deselects the item if it's selected. + var idx = this._find(item, true); + if(idx > -1){ + this.selection.splice(idx, 1); + this.onDeselect(item); + this.onSelectChange(item, false); + if(item == this.lastSelected){ + this.lastSelected = null; + } + this._removePivot(item); + this.length = this.selection.length; + return true; } - this._removePivot(item); - this.length = this.selection.length; - return true; - } - return false; - }, + return false; + }, - selectAll: function() { - for(var i = 0; i < this.items.length; i++) { - this.select(this.items[i]); - } - }, + selectAll: function(){ + // summary: selects all known items + for(var i = 0; i < this.items.length; i++){ + this.select(this.items[i]); + } + }, - deselectAll: function() { - while(this.selection && this.selection.length) { - this.deselect(this.selection[0]); - } - }, + deselectAll: function(){ + // summary: deselects all currently selected items + while(this.selection && this.selection.length){ + this.deselect(this.selection[0]); + } + }, - selectNext: function() { - var idx = this._find(this.lastSelected); - while(idx > -1 && ++idx < this.items.length) { - if(this.isSelectable(this.items[idx])) { - this.deselectAll(); - this.select(this.items[idx]); - return true; + selectNext: function(){ + // summary: + // clobbers the existing selection (if any) and selects the + // next item "below" the previous "bottom" selection. Returns + // whether or not selection was successful. + var idx = this._find(this.lastSelected); + while(idx > -1 && ++idx < this.items.length){ + if(this.isSelectable(this.items[idx])){ + this.deselectAll(); + this.select(this.items[idx]); + return true; + } } - } - return false; - }, + return false; + }, - selectPrevious: function() { - //debugger; - var idx = this._find(this.lastSelected); - while(idx-- > 0) { - if(this.isSelectable(this.items[idx])) { - this.deselectAll(); - this.select(this.items[idx]); - return true; + selectPrevious: function(){ + // summary: + // clobbers the existing selection (if any) and selects the + // item "above" the previous "top" selection. Returns whether + // or not selection was successful. + var idx = this._find(this.lastSelected); + while(idx-- > 0){ + if(this.isSelectable(this.items[idx])){ + this.deselectAll(); + this.select(this.items[idx]); + return true; + } } - } - return false; - }, + return false; + }, - // select first selectable item - selectFirst: function() { - this.deselectAll(); - var idx = 0; - while(this.items[idx] && !this.select(this.items[idx])) { - idx++; - } - return this.items[idx] ? true : false; - }, + selectFirst: function(){ + // summary: + // select first selectable item. Returns whether or not an + // item was selected. + this.deselectAll(); + var idx = 0; + while(this.items[idx] && !this.select(this.items[idx])){ + idx++; + } + return this.items[idx] ? true : false; + }, - // select last selectable item - selectLast: function() { - this.deselectAll(); - var idx = this.items.length-1; - while(this.items[idx] && !this.select(this.items[idx])) { - idx--; - } - return this.items[idx] ? true : false; - }, + selectLast: function(){ + // summary: select last selectable item + this.deselectAll(); + var idx = this.items.length-1; + while(this.items[idx] && !this.select(this.items[idx])) { + idx--; + } + return this.items[idx] ? true : false; + }, - _addPivot: function(item, andClear) { - this._pivotItem = item; - if(andClear) { - this._pivotItems = [item]; - } else { - this._pivotItems.push(item); - } - }, + _addPivot: function(item, andClear){ + this._pivotItem = item; + if(andClear){ + this._pivotItems = [item]; + }else{ + this._pivotItems.push(item); + } + }, - _removePivot: function(item) { - var i = dojo.lang.find(this._pivotItems, item); - if(i > -1) { - this._pivotItems.splice(i, 1); - this._pivotItem = this._pivotItems[this._pivotItems.length-1]; - } + _removePivot: function(item){ + var i = dojo.lang.find(this._pivotItems, item); + if(i > -1){ + this._pivotItems.splice(i, 1); + this._pivotItem = this._pivotItems[this._pivotItems.length-1]; + } - this._updatePivot(); - }, + this._updatePivot(); + }, - _updatePivot: function() { - if(this._pivotItems.length == 0) { - if(this.lastSelected) { - this._addPivot(this.lastSelected); + _updatePivot: function(){ + if(this._pivotItems.length == 0){ + if(this.lastSelected){ + this._addPivot(this.lastSelected); + } } - } - }, + }, - sorted: function() { - return dojo.lang.toArray(this.selection).sort( - dojo.lang.hitch(this, function(a, b) { - var A = this._find(a), B = this._find(b); - if(A > B) { - return 1; - } else if(A < B) { - return -1; - } else { - return 0; - } - }) - ); - }, + sorted: function(){ + // summary: returns an array of items in sort order + return dojo.lang.toArray(this.selection).sort( + dojo.lang.hitch(this, function(a, b){ + var A = this._find(a), B = this._find(b); + if(A > B){ + return 1; + }else if(A < B){ + return -1; + }else{ + return 0; + } + }) + ); + }, - // remove any items from the selection that are no longer in this.items - updateSelected: function() { - for(var i = 0; i < this.selection.length; i++) { - if(this._find(this.selection[i]) < 0) { - var removed = this.selection.splice(i, 1); + updateSelected: function(){ + // summary: + // remove any items from the selection that are no longer in + // this.items + for(var i = 0; i < this.selection.length; i++) { + if(this._find(this.selection[i]) < 0) { + var removed = this.selection.splice(i, 1); - this._removePivot(removed[0]); + this._removePivot(removed[0]); + } } + this.length = this.selection.length; } - - this.length = this.selection.length; } -}); +); Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/__package__.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/Attic/__package__.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/__package__.js 7 Nov 2006 02:38:04 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/__package__.js 25 Dec 2006 16:39:54 -0000 1.2 @@ -10,8 +10,7 @@ dojo.kwCompoundRequire({ common: ["dojo.storage"], - browser: ["dojo.storage.browser"], - dashboard: ["dojo.storage.dashboard"] + browser: ["dojo.storage.browser"] }); dojo.provide("dojo.storage.*"); Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/browser.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/Attic/browser.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/browser.js 7 Nov 2006 02:38:04 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/storage/browser.js 25 Dec 2006 16:39:54 -0000 1.2 @@ -15,19 +15,188 @@ dojo.require("dojo.json"); dojo.require("dojo.uri.*"); -/** - Storage provider that uses features in Flash to achieve permanent storage. + + +dojo.storage.browser.WhatWGStorageProvider = function(){ + // summary: + // Storage provider that uses WHAT Working Group features in Firefox 2 + // to achieve permanent storage. + // description: + // The WHAT WG storage API is documented at + // http://www.whatwg.org/specs/web-apps/current-work/#scs-client-side + // + // You can disable this storage provider with the following djConfig + // variable: + // var djConfig = { disableWhatWGStorage: true }; + // + // Authors of this storage provider- + // JB Boisseau, jb.boisseau@eutech-ssii.com + // Brad Neuberg, bkn3@columbia.edu +} + +dojo.inherits(dojo.storage.browser.WhatWGStorageProvider, dojo.storage); + +// instance methods and properties +dojo.lang.extend(dojo.storage.browser.WhatWGStorageProvider, { + namespace: "default", + initialized: false, + + _domain: null, + _available: null, + _statusHandler: null, + + initialize: function(){ + if(djConfig["disableWhatWGStorage"] == true){ + return; + } - @author Brad Neuberg, bkn3@columbia.edu -*/ + // get current domain + this._domain = location.hostname; + + // indicate that this storage provider is now loaded + this.initialized = true; + dojo.storage.manager.loaded(); + }, + + isAvailable: function(){ + try{ + var myStorage = globalStorage[location.hostname]; + }catch(e){ + this._available = false; + return this._available; + } + + this._available = true; + return this._available; + }, + + put: function(key, value, resultsHandler){ + if(this.isValidKey(key) == false){ + dojo.raise("Invalid key given: " + key); + } + + this._statusHandler = resultsHandler; + + // serialize the value; + // handle strings differently so they have better performance + if(dojo.lang.isString(value)){ + value = "string:" + value; + }else{ + value = dojo.json.serialize(value); + } + + // register for successful storage events + window.addEventListener("storage", function(evt){ + // indicate we succeeded + resultsHandler.call(null, dojo.storage.SUCCESS, key); + }, false); + + // try to store the value + try{ + var myStorage = globalStorage[this._domain]; + myStorage.setItem(key,value); + }catch(e){ + // indicate we failed + this._statusHandler.call(null, dojo.storage.FAILED, + key, e.toString()); + } + }, + + get: function(key){ + if(this.isValidKey(key) == false){ + dojo.raise("Invalid key given: " + key); + } + + var myStorage = globalStorage[this._domain]; + + var results = myStorage.getItem(key); + + if(results == null){ + return null; + } + + results = results.value; + + // destringify the content back into a + // real JavaScript object; + // handle strings differently so they have better performance + if(!dojo.lang.isUndefined(results) && results != null + && /^string:/.test(results)){ + results = results.substring("string:".length); + }else{ + results = dojo.json.evalJson(results); + } + + return results; + }, + + getKeys: function(){ + var myStorage = globalStorage[this._domain]; + var keysArray = new Array(); + for(i=0; i 0; this.canRedo = this._redoStack.length > 0; }, clear: function() { + //summary: Clears this instance of dojo.undo.Manager. this._undoStack = []; this._redoStack = []; this._currentManager = this; @@ -53,7 +82,10 @@ }, undo: function() { - if(!this.canUndo) { return false; } + //summary: Call this method to go one place back in the undo + //stack. Returns true if the manager successfully completed + //the undo step. + if(!this.canUndo) { return false; /*boolean*/} this.endAllTransactions(); @@ -74,11 +106,14 @@ if(!(top instanceof dojo.undo.Manager)) { this.getTop().onUndoAny(this, top); } - return true; + return true; //boolean }, redo: function() { - if(!this.canRedo){ return false; } + //summary: Call this method to go one place forward in the redo + //stack. Returns true if the manager successfully completed + //the redo step. + if(!this.canRedo){ return false; /*boolean*/} this.isRedoing = true; var top = this._redoStack.pop(); @@ -95,22 +130,27 @@ if(!(top instanceof dojo.undo.Manager)){ this.getTop().onRedoAny(this, top); } - return true; + return true; //boolean }, undoAll: function() { + //summary: Call undo as many times as it takes to get all the + //way through the undo stack. while(this._undoStack.length > 0) { this.undo(); } }, redoAll: function() { + //summary: Call redo as many times as it takes to get all the + //way through the redo stack. while(this._redoStack.length > 0) { this.redo(); } }, - push: function(undo, redo /* optional */, description /* optional */) { + push: function(/*Function*/undo, /*Function?*/redo, /*String?*/description) { + //summary: add something to the undo manager. if(!undo) { return; } if(this._currentManager == this) { @@ -127,7 +167,9 @@ this._updateStatus(); }, - concat: function(manager) { + concat: function(/*Object*/manager) { + //summary: Adds all undo and redo stack items to another dojo.undo.Manager + //instance. if ( !manager ) { return; } if (this._currentManager == this ) { @@ -144,7 +186,12 @@ } }, - beginTransaction: function(description /* optional */) { + beginTransaction: function(/*String?*/description) { + //summary: All undo/redo items added via + //push() after this call is made but before endTransaction() is called are + //treated as one item in the undo and redo stacks. When undo() or redo() is + //called then undo/redo is called on all of the items in the transaction. + //Transactions can be nested. if(this._currentManager == this) { var mgr = new dojo.undo.Manager(this); mgr.description = description ? description : ""; @@ -158,6 +205,12 @@ }, endTransaction: function(flatten /* optional */) { + //summary: Ends a transaction started by beginTransaction(). See beginTransaction() + //for details. + + //flatten: boolean: If true, adds the current transaction to the parent's + //undo stack. + if(this._currentManager == this) { if(this._parent) { this._parent._currentManager = this._parent; @@ -184,13 +237,14 @@ }, endAllTransactions: function() { + //summary: Ends all nested transactions. while(this._currentManager != this) { this.endTransaction(); } }, - // find the top parent of an undo manager getTop: function() { + //summary: Finds the top parent of an undo manager. if(this._parent) { return this._parent.getTop(); } else { Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/undo/browser.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/undo/Attic/browser.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/undo/browser.js 7 Nov 2006 02:38:04 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/undo/browser.js 25 Dec 2006 16:39:54 -0000 1.2 @@ -21,37 +21,9 @@ dojo.debug("Opera is not supported with dojo.undo.browser, so back/forward detection will not work."); } -/* NOTES: - * Safari 1.2: - * back button "works" fine, however it's not possible to actually - * DETECT that you've moved backwards by inspecting window.location. - * Unless there is some other means of locating. - * FIXME: perhaps we can poll on history.length? - * Safari 2.0.3+ (and probably 1.3.2+): - * works fine, except when changeUrl is used. When changeUrl is used, - * Safari jumps all the way back to whatever page was shown before - * the page that uses dojo.undo.browser support. - * IE 5.5 SP2: - * back button behavior is macro. It does not move back to the - * previous hash value, but to the last full page load. This suggests - * that the iframe is the correct way to capture the back button in - * these cases. - * Don't test this page using local disk for MSIE. MSIE will not create - * a history list for iframe_history.html if served from a file: URL. - * The XML served back from the XHR tests will also not be properly - * created if served from local disk. Serve the test pages from a web - * server to test in that browser. - * IE 6.0: - * same behavior as IE 5.5 SP2 - * Firefox 1.0+: - * the back button will return us to the previous hash on the same - * page, thereby not requiring an iframe hack, although we do then - * need to run a timer to detect inter-page movement. - */ - dojo.undo.browser = { - initialHref: window.location.href, - initialHash: window.location.hash, + initialHref: (!dj_undef("window")) ? window.location.href : "", + initialHash: (!dj_undef("window")) ? window.location.hash : "", moveForward: false, historyStack: [], @@ -61,40 +33,71 @@ locationTimer: null, /** - * setInitialState sets the state object and back callback for the very first page that is loaded. - * It is recommended that you call this method as part of an event listener that is registered via - * dojo.addOnLoad(). + * */ - setInitialState: function(args){ + setInitialState: function(/*Object*/args){ + //summary: Sets the state object and back callback for the very first page that is loaded. + //description: It is recommended that you call this method as part of an event listener that is registered via + //dojo.addOnLoad(). + //args: Object + // See the addToHistory() function for the list of valid args properties. this.initialState = this._createState(this.initialHref, args, this.initialHash); }, //FIXME: Would like to support arbitrary back/forward jumps. Have to rework iframeLoaded among other things. //FIXME: is there a slight race condition in moz using change URL with the timer check and when // the hash gets set? I think I have seen a back/forward call in quick succession, but not consistent. - /** - * addToHistory takes one argument, and it is an object that defines the following functions: - * - To support getting back button notifications, the object argument should implement a - * function called either "back", "backButton", or "handle". The string "back" will be - * passed as the first and only argument to this callback. - * - To support getting forward button notifications, the object argument should implement a - * function called either "forward", "forwardButton", or "handle". The string "forward" will be - * passed as the first and only argument to this callback. - * - If you want the browser location string to change, define "changeUrl" on the object. If the - * value of "changeUrl" is true, then a unique number will be appended to the URL as a fragment - * identifier (http://some.domain.com/path#uniquenumber). If it is any other value that does - * not evaluate to false, that value will be used as the fragment identifier. For example, - * if changeUrl: 'page1', then the URL will look like: http://some.domain.com/path#page1 - * - * Full example: - * - * dojo.undo.browser.addToHistory({ - * back: function() { alert('back pressed'); }, - * forward: function() { alert('forward pressed'); }, - * changeUrl: true - * }); - */ addToHistory: function(args){ + //summary: adds a state object (args) to the history list. You must set + //djConfig.preventBackButtonFix = false to use dojo.undo.browser. + + //args: Object + // args can have the following properties: + // To support getting back button notifications, the object argument should implement a + // function called either "back", "backButton", or "handle". The string "back" will be + // passed as the first and only argument to this callback. + // - To support getting forward button notifications, the object argument should implement a + // function called either "forward", "forwardButton", or "handle". The string "forward" will be + // passed as the first and only argument to this callback. + // - If you want the browser location string to change, define "changeUrl" on the object. If the + // value of "changeUrl" is true, then a unique number will be appended to the URL as a fragment + // identifier (http://some.domain.com/path#uniquenumber). If it is any other value that does + // not evaluate to false, that value will be used as the fragment identifier. For example, + // if changeUrl: 'page1', then the URL will look like: http://some.domain.com/path#page1 + // Full example: + // dojo.undo.browser.addToHistory({ + // back: function() { alert('back pressed'); }, + // forward: function() { alert('forward pressed'); }, + // changeUrl: true + // }); + // + // BROWSER NOTES: + // Safari 1.2: + // back button "works" fine, however it's not possible to actually + // DETECT that you've moved backwards by inspecting window.location. + // Unless there is some other means of locating. + // FIXME: perhaps we can poll on history.length? + // Safari 2.0.3+ (and probably 1.3.2+): + // works fine, except when changeUrl is used. When changeUrl is used, + // Safari jumps all the way back to whatever page was shown before + // the page that uses dojo.undo.browser support. + // IE 5.5 SP2: + // back button behavior is macro. It does not move back to the + // previous hash value, but to the last full page load. This suggests + // that the iframe is the correct way to capture the back button in + // these cases. + // Don't test this page using local disk for MSIE. MSIE will not create + // a history list for iframe_history.html if served from a file: URL. + // The XML served back from the XHR tests will also not be properly + // created if served from local disk. Serve the test pages from a web + // server to test in that browser. + // IE 6.0: + // same behavior as IE 5.5 SP2 + // Firefox 1.0+: + // the back button will return us to the previous hash on the same + // page, thereby not requiring an iframe hack, although we do then + // need to run a timer to detect inter-page movement. + //If addToHistory is called, then that means we prune the //forward stack -- the user went back, then wanted to //start a new forward path. @@ -195,6 +198,7 @@ }, checkLocation: function(){ + //summary: private method. Do not call this directly. if (!this.changingUrl){ var hsl = this.historyStack.length; @@ -226,6 +230,7 @@ }, iframeLoaded: function(evt, ifrLoc){ + //summary: private method. Do not call this directly. if(!dojo.render.html.opera){ var query = this._getUrlQuery(ifrLoc.href); if(query == null){ @@ -254,6 +259,8 @@ }, handleBackButton: function(){ + //summary: private method. Do not call this directly. + //The "current" page is always at the top of the history stack. var current = this.historyStack.pop(); if(!current){ return; } @@ -274,6 +281,8 @@ }, handleForwardButton: function(){ + //summary: private method. Do not call this directly. + var last = this.forwardStack.pop(); if(!last){ return; } if(last.kwArgs["forward"]){ @@ -287,23 +296,27 @@ }, _createState: function(url, args, hash){ - return {"url": url, "kwArgs": args, "urlHash": hash}; + //summary: private method. Do not call this directly. + + return {"url": url, "kwArgs": args, "urlHash": hash}; //Object }, _getUrlQuery: function(url){ + //summary: private method. Do not call this directly. var segments = url.split("?"); if (segments.length < 2){ - return null; + return null; //null } else{ - return segments[1]; + return segments[1]; //String } }, _loadIframeHistory: function(){ + //summary: private method. Do not call this directly. var url = dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new Date()).getTime(); this.moveForward = true; dojo.io.setIFrameSrc(this.historyIframe, url, false); - return url; + return url; //String } } Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/uri/Uri.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/uri/Attic/Uri.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/uri/Uri.js 7 Nov 2006 02:38:05 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/uri/Uri.js 25 Dec 2006 16:39:54 -0000 1.2 @@ -15,11 +15,12 @@ // summary: returns a Uri object resolved relative to the dojo root return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri(), uri); } - + this.moduleUri = function(/*String*/module, /*dojo.uri.Uri||String*/uri){ - // summary: returns a Uri object relative to a (top-level) module + // summary: returns a Uri object relative to a module // description: Examples: dojo.uri.moduleUri("dojo","Editor"), or dojo.uri.moduleUri("acme","someWidget") - var loc = dojo.hostenv.getModulePrefix(module); + var loc = dojo.hostenv.getModuleSymbols(module).join('/'); + //var loc = dojo.hostenv.getModulePrefix(module); if(!loc){return null;} if(loc.lastIndexOf("/") != loc.length-1){loc += "/";} return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri()+loc,uri); @@ -49,10 +50,10 @@ relobj = uriobj; } else if (relobj.scheme == null) { relobj.scheme = uriobj.scheme; - + if (relobj.authority == null) { relobj.authority = uriobj.authority; - + if (relobj.path.charAt(0) != "/") { var path = uriobj.path.substring(0, uriobj.path.lastIndexOf("/") + 1) + relobj.path; @@ -86,25 +87,25 @@ // break the uri into its main components var regexp = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"; - var r = this.uri.match(new RegExp(regexp)); + var r = this.uri.match(new RegExp(regexp)); this.scheme = r[2] || (r[1] ? "" : null); this.authority = r[4] || (r[3] ? "" : null); this.path = r[5]; // can never be undefined this.query = r[7] || (r[6] ? "" : null); this.fragment = r[9] || (r[8] ? "" : null); - + if (this.authority != null) { // server based naming authority regexp = "^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$"; r = this.authority.match(new RegExp(regexp)); - + this.user = r[3] || null; this.password = r[4] || null; this.host = r[5]; this.port = r[7] || null; } - + this.toString = function(){ return this.uri; } } }; Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/validate/check.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/validate/Attic/check.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/validate/check.js 7 Nov 2006 02:38:05 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/validate/check.js 25 Dec 2006 16:39:55 -0000 1.2 @@ -53,39 +53,39 @@ if(profile.trim instanceof Array){ for(var i = 0; i < profile.trim.length; i++){ var elem = form[profile.trim[i]]; - if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } + if(dj_undef("type", elem) || elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } elem.value = elem.value.replace(/(^\s*|\s*$)/g, ""); } } // Convert to uppercase if(profile.uppercase instanceof Array){ for(var i = 0; i < profile.uppercase.length; i++){ var elem = form[profile.uppercase[i]]; - if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } + if(dj_undef("type", elem) || elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } elem.value = elem.value.toUpperCase(); } } // Convert to lowercase if(profile.lowercase instanceof Array){ for (var i = 0; i < profile.lowercase.length; i++){ var elem = form[profile.lowercase[i]]; - if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } + if(dj_undef("type", elem) || elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } elem.value = elem.value.toLowerCase(); } } // Uppercase first letter if(profile.ucfirst instanceof Array){ for(var i = 0; i < profile.ucfirst.length; i++){ var elem = form[profile.ucfirst[i]]; - if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } + if(dj_undef("type", elem) || elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } elem.value = elem.value.replace(/\b\w+\b/g, function(word) { return word.substring(0,1).toUpperCase() + word.substring(1).toLowerCase(); }); } } // Remove non digits characters from the input. if(profile.digit instanceof Array){ for(var i = 0; i < profile.digit.length; i++){ var elem = form[profile.digit[i]]; - if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } + if(dj_undef("type", elem) || elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } elem.value = elem.value.replace(/\D/g, ""); } } @@ -96,11 +96,11 @@ if(!dojo.lang.isString(profile.required[i])){ continue; } var elem = form[profile.required[i]]; // Are textbox, textarea, or password fields blank. - if((elem.type == "text" || elem.type == "textarea" || elem.type == "password") && /^\s*$/.test(elem.value)){ + if(!dj_undef("type", elem) && (elem.type == "text" || elem.type == "textarea" || elem.type == "password") && /^\s*$/.test(elem.value)){ missing[missing.length] = elem.name; } // Does drop-down box have option selected. - else if((elem.type == "select-one" || elem.type == "select-multiple") + else if(!dj_undef("type", elem) && (elem.type == "select-one" || elem.type == "select-multiple") && (elem.selectedIndex == -1 || /^\s*$/.test(elem.options[elem.selectedIndex].value))){ missing[missing.length] = elem.name; @@ -138,7 +138,7 @@ } } // case 2: elem is a select box - else if(elem.type == "select-multiple" ){ + else if(!dj_undef("type", elem) && elem.type == "select-multiple" ){ var selected = 0; for(var j = 0; j < elem.options.length; j++){ if (elem.options[j].selected && !/^\s*$/.test(elem.options[j].value)) { selected++; } @@ -163,6 +163,7 @@ // properties of dependencies object are the names of dependent fields to be checked for(name in profile.dependencies){ var elem = form[name]; // the dependent element + if(dj_undef("type", elem)){continue;} if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } // limited support if(/\S+/.test(elem.value)){ continue; } // has a value already if(results.isMissing(elem.name)){ continue; } // already listed as missing @@ -178,20 +179,23 @@ // constraint properties are the names of fields to bevalidated for(name in profile.constraints){ var elem = form[name]; - if( (elem.type != "text")&& - (elem.type != "textarea")&& - (elem.type != "password")){ - continue; - } + if(!elem) {continue;} + // skip if blank - its optional unless required, in which case it // is already listed as missing. - if(/^\s*$/.test(elem.value)){ continue; } - + if(!dj_undef("tagName",elem) + && (elem.tagName.toLowerCase().indexOf("input") >= 0 + || elem.tagName.toLowerCase().indexOf("textarea") >= 0) + && /^\s*$/.test(elem.value)){ + continue; + } + var isValid = true; // case 1: constraint value is validation function if(dojo.lang.isFunction(profile.constraints[name])){ isValid = profile.constraints[name](elem.value); }else if(dojo.lang.isArray(profile.constraints[name])){ + // handle nested arrays for multiple constraints if(dojo.lang.isArray(profile.constraints[name][0])){ for (var i=0; iHello world * @@ -28,36 +26,35 @@ "dojo.widget.Button", dojo.widget.HtmlWidget, { + // summary + // Basically the same thing as a normal HTML button, but with special styling. + isContainer: true, - // String + // caption: String // text to display in button caption: "", - // Boolean - // if true, cannot click button - disabled: false, - templatePath: dojo.uri.dojoUri("src/widget/templates/ButtonTemplate.html"), templateCssPath: dojo.uri.dojoUri("src/widget/templates/ButtonTemplate.css"), - // Url + // inactiveImg: Url // prefix of filename holding images (left, center, right) for button in normal state inactiveImg: "src/widget/templates/images/soriaButton-", - // Url + // activeImg: Url // prefix of filename holding images (left, center, right) for button when it's being hovered over activeImg: "src/widget/templates/images/soriaActive-", - // Url + // pressedImg: Url // prefix of filename holding images (left, center, right) for button between mouse-down and mouse-up pressedImg: "src/widget/templates/images/soriaPressed-", - // Url + // disabledImg: Url // prefix of filename holding images (left, center, right) for button when it's disabled (aka, grayed-out) disabledImg: "src/widget/templates/images/soriaDisabled-", - // Number + // widget2height: Number // shape of the button's end pieces; // the height of the end pieces is a function of the button's height (which in turn is a function of the button's content), // and then the width of the end pieces is relative to their height. @@ -150,6 +147,7 @@ return; // Ignore IE mouseOut events that dont actually leave button - Prevents hover image flicker in IE } dojo.html.removeClass(this.buttonNode, "dojoButtonHover"); + dojo.html.removeClass(this.buttonNode, "dojoButtonDepressed"); this._setImage(this.inactiveImg); }, @@ -236,8 +234,6 @@ }); /* - * summary - * push the button and a menu shows up * usage * * @@ -248,15 +244,17 @@ "dojo.widget.DropDownButton", dojo.widget.Button, { - // String + // summary + // push the button and a menu shows up + // menuId: String // widget id of the menu that this button should activate menuId: "", - // Url + // downArrow: Url // path of arrow image to display to the right of the button text downArrow: "src/widget/templates/images/whiteDownArrow.gif", - // Url + // disabledDownArray: Url // path of arrow image to display to the right of the button text, when the button is disabled disabledDownArrow: "src/widget/templates/images/whiteDownArrow.gif", @@ -284,8 +282,6 @@ }); /* - * summary - * left side is normal button, right side displays menu * usage * * @@ -296,17 +292,19 @@ "dojo.widget.ComboButton", dojo.widget.Button, { - // String + // summary + // left side is normal button, right side displays menu + // menuId: String // widget id of the menu that this button should activate menuId: "", templatePath: dojo.uri.dojoUri("src/widget/templates/ComboButtonTemplate.html"), - // Integer + // splitWidth: Integer // # of pixels between left & right part of button splitWidth: 2, - // Integer + // arrowWidth: Integer // width of segment holding down arrow arrowWidth: 5, @@ -389,6 +387,7 @@ // onMouseOut() is the callback for the left side of the button. if( this.disabled ){ return; } dojo.html.removeClass(this.rightPart, "dojoButtonHover"); + dojo.html.removeClass(this.rightPart, "dojoButtonDepressed"); this._setImageR(this.inactiveImg); }, Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Chart.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Attic/Chart.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Chart.js 7 Nov 2006 00:27:41 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Chart.js 25 Dec 2006 16:39:55 -0000 1.2 @@ -14,11 +14,11 @@ dojo.require("dojo.gfx.color"); dojo.require("dojo.gfx.color.hsl"); -// Base class for svg and vml implementations of Chart dojo.declare( "dojo.widget.Chart", null, function(){ + // summary: Base class for svg and vml implementations of Chart this.series = []; }, { @@ -104,15 +104,15 @@ } }); -/* - * Every chart has a set of data series; this is the series. Note that each - * member of value is an object and in the minimum has 2 properties: .x and - * .value. - */ dojo.declare( "dojo.widget.Chart.DataSeries", null, function(key, label, plotType, color){ + // summary: + // Every chart has a set of data series; this is the series. Note that each + // member of value is an object and in the minimum has 2 properties: .x and + // .value. + // this.id = "DataSeries"+dojo.widget.Chart.DataSeries.count++; this.key = key; this.label = label||this.id; Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Checkbox.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Attic/Checkbox.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Checkbox.js 7 Nov 2006 00:27:41 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Checkbox.js 25 Dec 2006 16:39:55 -0000 1.2 @@ -16,38 +16,34 @@ dojo.require("dojo.html.style"); dojo.require("dojo.html.selection"); -// summary -// Same as an HTML checkbox, but with fancy styling dojo.widget.defineWidget( "dojo.widget.Checkbox", dojo.widget.HtmlWidget, { + // summary + // Same as an HTML checkbox, but with fancy styling + templatePath: dojo.uri.dojoUri('src/widget/templates/Checkbox.html'), templateCssPath: dojo.uri.dojoUri('src/widget/templates/Checkbox.css'), - // Boolean - // if true, clicking will not change the state of the checkbox. - // in markup, this is specified as "disabled='disabled'", or just "disabled", - disabled: false, - - // String + // name: String // name used when submitting form; same as "name" attribute or plain HTML elements name: "", - // String + // id: String // id attached to the checkbox, used when submitting form id: "", - // Boolean + // checked: Boolean // if true, checkbox is initially marked turned on; // in markup, specified as "checked='checked'" or just "checked" checked: false, - // Integer + // tabIndex: Integer // order fields are traversed when user hits the tab key tabIndex: "", - // Value + // value: Value // equivalent to value field on normal checkbox (if checked, the value is passed as // the value when form is submitted) value: "on", @@ -105,6 +101,14 @@ this.onClick(); }, + setValue: function(/*boolean*/ bool){ + // summary: set the checkbox state + if(this.disabled == false){ + this.checked = bool; + this._setInfo(); + } + }, + onClick: function(){ // summary: user overridable callback function for checkbox being clicked }, @@ -156,12 +160,13 @@ } ); -// summary -// variation on Checkbox widget to be display on monitors in high-contrast mode (that don't display CSS background images) dojo.widget.defineWidget( "dojo.widget.a11y.Checkbox", dojo.widget.Checkbox, { + // summary + // variation on Checkbox widget to be display on monitors in high-contrast mode (that don't display CSS background images) + templatePath: dojo.uri.dojoUri('src/widget/templates/CheckboxA11y.html'), fillInTemplate: function(){ Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Clock.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Attic/Clock.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Clock.js 7 Nov 2006 00:27:41 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Clock.js 25 Dec 2006 16:39:55 -0000 1.2 @@ -20,6 +20,15 @@ "dojo.widget.Clock", dojo.widget.HtmlWidget, function(){ + // summary: A basic clock that supports offset and labels + // description: + // Uses SVG and Internet Explorer's VML implementation to render a clock + // using the gfx module. + // timeZoneOffset: Integer + // Amount (in hours) to offset the clock, relative to local time. + // date: Date + // image: String + // Location of the background image var self=this; this.timeZoneOffset=0; // this is fun. this.label=""; // optional label. @@ -54,6 +63,7 @@ this.topLabelNode=null; this.draw=function(){ + // summary: Moves the hands of the clock to the proper position based on the current date. self.date=new Date(); var h=(self.date.getHours()+self.timeZoneOffset) % 12; var m=self.date.getMinutes(); @@ -70,13 +80,20 @@ }, { set:function(/* Date */dt){ + // summary: Set the date object manually this.date=dt; if(!this.timer.isRunning){ this.draw(); } }, - start:function(){ this.timer.start(); }, - stop:function(){ this.timer.stop(); }, + start:function(){ + // summary: start the clock. + this.timer.start(); + }, + stop:function(){ + // summary: stop the clock. + this.timer.stop(); + }, _initPoly:function(parent, points){ var path = parent.createPath(); @@ -95,23 +112,27 @@ var move = { dx:this.center.x + (shift?shift.dx:0), dy:this.center.y+(shift?shift.dy:0) }; return shape.setTransform([move, dojo.gfx.matrix.rotateg(-angle)]); }, - placeHour:function(h, m, s){ + placeHour:function(/* Number */h, /* Number */m, /* number */s){ + // summary: place the hour hand at the proper point and rotation. var angle=30 *(h + m/60 + s/3600); this._placeHand(this.hands.hour, angle); this._placeHand(this.shadows.hour.shadow, angle, this.shadows.hour.shift); }, - placeMinute:function(m, s){ + placeMinute:function(/* Number */m, /* Number */s){ + // summary: place the minute hand at the proper point and rotation. var angle=6 * (m + s/60); this._placeHand(this.hands.minute, angle); this._placeHand(this.shadows.minute.shadow, angle, this.shadows.minute.shift); }, - placeSecond:function(s){ + placeSecond:function(/* Number */s){ + // summary: place the second hand at the proper point and rotation. var angle=6 * s; this._placeHand(this.hands.second, angle); this._placeHand(this.shadows.second.shadow, angle, this.shadows.second.shift); }, init:function(){ + // summary: initialize the widget by creating the initial shapes. // start by setting up the domNode if(this.domNode.style.position != "absolute"){ this.domNode.style.position = "relative"; @@ -204,6 +225,7 @@ this.draw(); }, postCreate:function(){ + // summary: Create the clock and start the timer. this.init(); this.start(); } Index: openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/ColorPalette.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/Attic/ColorPalette.js,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/ColorPalette.js 7 Nov 2006 00:27:41 -0000 1.1 +++ openacs-4/packages/ajaxhelper/www/resources/dojo-ajax/src/widget/ColorPalette.js 25 Dec 2006 16:39:55 -0000 1.2 @@ -18,11 +18,14 @@ "dojo.widget.ColorPalette", dojo.widget.HtmlWidget, { + // summary + // Grid showing various colors, so the user pick a certain color + + // palette: String + // Size of grid, either "7x10" or "3x4". palette: "7x10", - bgIframe: null, - - palettes: { + _palettes: { "7x10": [["fff", "fcc", "fc9", "ff9", "ffc", "9f9", "9ff", "cff", "ccf", "fcf"], ["ccc", "f66", "f96", "ff6", "ff3", "6f9", "3ff", "6ff", "99f", "f9f"], ["c0c0c0", "f00", "f90", "fc6", "ff0", "3f3", "6cc", "3cf", "66c", "c6c"], @@ -39,16 +42,15 @@ buildRendering: function () { this.domNode = document.createElement("table"); -// dojo.body().appendChild(this.domNode); dojo.html.disableSelection(this.domNode); dojo.event.connect(this.domNode, "onmousedown", function (e) { e.preventDefault(); }); with (this.domNode) { // set the table's properties cellPadding = "0"; cellSpacing = "1"; border = "1"; - style.backgroundColor = "white"; //style.position = "absolute"; + style.backgroundColor = "white"; } - var colors = this.palettes[this.palette]; + var colors = this._palettes[this.palette]; for (var i = 0; i < colors.length; i++) { var tr = this.domNode.insertRow(-1); for (var j = 0; j < colors[i].length; j++) { @@ -68,56 +70,22 @@ td.onmouseover = function (e) { this.style.borderColor = "white"; } td.onmouseout = function (e) { this.style.borderColor = "gray"; } - dojo.event.connect(td, "onmousedown", this, "click"); + dojo.event.connect(td, "onmousedown", this, "onClick"); td.innerHTML = " "; } } - - if(dojo.render.html.ie){ - this.bgIframe = document.createElement("