svn commit: r487242 [6/20] - in /tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo: ./ nls/ src/ src/behavior/ src/cal/ src/charting/ src/charting/svg/ src/charting/vml/ src/collections/ src/crypto/ src/data/ src/data/core/ src/data/old/ src/data...

[jk...@apache.org]

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Store.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Store.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Store.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/Store.js Thu Dec 14 07:45:13 2006
@@ -5,7 +5,9 @@
 return null;};this.getIndexOfData = function(obj){for(var i=0; i<data.length; i++){if(data[i].src==obj){return i;}}
 return -1;};this.getDataByIndex = function(idx){if(data[idx]){return data[idx].src;}
 return null;};this.update = function(obj, fieldPath, val, bDontFire){var parts=fieldPath.split("."), i=0, o=obj, field;if(parts.length>1) {field = parts.pop();do{if(parts[i].indexOf("()")>-1){var temp=parts[i++].split("()")[0];if(!o[temp]){dojo.raise("dojo.collections.Store.getField(obj, '" + field + "'): '" + temp + "' is not a property of the passed object.");} else {o = o[temp]();}} else {o = o[parts[i++]];}} while (i<parts.length && o != null);} else {field = parts[0];}
-obj[field] = val;if(!bDontFire){this.onUpdateField(obj, fieldPath, val);}};this.forEach = function(fn){if(Array.forEach){Array.forEach(data, fn, this);}else{for(var i=0; i<data.length; i++){fn.call(this, data[i]);}}};this.forEachData = function(fn){if(Array.forEach){Array.forEach(this.getData(), fn, this);}else{var a=this.getData();for(var i=0; i<a.length; i++){fn.call(this, a[i]);}}};this.setData = function(arr, bDontFire){data = [];for(var i=0; i<arr.length; i++){var o={ key: arr[i][this.keyField], src:arr[i] };data.push(o);items[o.key]=o;}
+obj[field] = val;if(!bDontFire){this.onUpdateField(obj, fieldPath, val);}};this.forEach = function(fn){if(Array.forEach){Array.forEach(data, fn, this);}else{for(var i=0; i<data.length; i++){fn.call(this, data[i]);}}
+};this.forEachData = function(fn){if(Array.forEach){Array.forEach(this.getData(), fn, this);}else{var a=this.getData();for(var i=0; i<a.length; i++){fn.call(this, a[i]);}}
+};this.setData = function(arr, bDontFire){data = [];for(var i=0; i<arr.length; i++){var o={ key: arr[i][this.keyField], src:arr[i] };data.push(o);items[o.key]=o;}
 if(!bDontFire){this.onSetData();}};this.clearData = function(bDontFire){data = [];items={};if(!bDontFire){this.onClearData();}};this.addData = function(obj, key, bDontFire){var k = key || obj[this.keyField];if(items[k]!=null){var o = items[k];o.src = obj;} else {var o={ key:k, src:obj };data.push(o);items[o.key] = o;}
 if(!bDontFire){this.onAddData(o);}};this.addDataRange = function(arr, bDontFire){var objects=[];for(var i=0; i<arr.length; i++){var k = arr[i][this.keyField];if(items[k]!=null){var o = items[k];o.src = obj;} else {var o = { key:k, src:arr[i] };data.push(o);items[k] = o;}
 objects.push(o);}
@@ -19,7 +21,8 @@
 return ret;};this.removeDataByKey = function(key, bDontFire){this.removeData(this.getDataByKey(key), bDontFire);};this.removeDataByIndex = function(idx, bDontFire){this.removeData(this.getDataByIndex(idx), bDontFire);};if(jsonArray && jsonArray.length && jsonArray[0]){this.setData(jsonArray, true);}};dojo.extend(dojo.collections.Store, {getField:function(obj, field){var parts=field.split("."), i=0, o=obj;do{if(parts[i].indexOf("()")>-1){var temp=parts[i++].split("()")[0];if(!o[temp]){dojo.raise("dojo.collections.Store.getField(obj, '" + field + "'): '" + temp + "' is not a property of the passed object.");} else {o = o[temp]();}} else {o = o[parts[i++]];}} while (i<parts.length && o != null);if(i < parts.length){dojo.raise("dojo.collections.Store.getField(obj, '" + field + "'): '" + field + "' is not a property of the passed object.");}
 return o;},getFromHtml:function(meta, body, fnMod){var rows = body.rows;var ctor=function(row){var obj = {};for(var i=0; i<meta.length; i++){var o = obj;var data = row.cells[i].innerHTML;var p = meta[i].getField();if(p.indexOf(".") > -1){p = p.split(".");while(p.length>1){var pr = p.shift();o[pr] = {};o = o[pr];}
 p = p[0];}
-var type = meta[i].getType();if(type == String){o[p] = data;} else {if(data){o[p] = new type(data);} else {o[p] = new type();}}}
+var type = meta[i].getType();if(type == String){o[p] = data;} else {if(data){o[p] = new type(data);} else {o[p] = new type();}}
+}
 return obj;};var arr=[];for(var i=0; i<rows.length; i++){var o = ctor(rows[i]);if(fnMod){fnMod(o, rows[i]);}
 arr.push(o);}
 return arr;},onSetData:function(){ },onClearData:function(){ },onAddData:function(obj){ },onAddDataRange:function(arr){ },onRemoveData:function(obj){ },onRemoveDataRange:function(arr){ },onUpdateField:function(obj, field, val){ }});

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/collections/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
 
 dojo.kwCompoundRequire({common: [
 "dojo.collections.Collections","dojo.collections.SortedList","dojo.collections.Dictionary","dojo.collections.Queue","dojo.collections.ArrayList","dojo.collections.Stack","dojo.collections.Set"
-]});dojo.provide("dojo.collections.*");
\ No newline at end of file
+]
+});dojo.provide("dojo.collections.*");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto.js Thu Dec 14 07:45:13 2006
@@ -1,2 +1,4 @@
 
-dojo.provide("dojo.crypto");dojo.crypto.cipherModes={ECB:0,CBC:1,PCBC:2,CFB:3,OFB:4,CTR:5};dojo.crypto.outputTypes={Base64:0,Hex:1,String:2,Raw:3};
\ No newline at end of file
+dojo.provide("dojo.crypto");dojo.crypto.cipherModes={ECB:0,CBC:1,PCBC:2,CFB:3,OFB:4,CTR:5
+};dojo.crypto.outputTypes={Base64:0,Hex:1,String:2,Raw:3
+};
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/Blowfish.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/Blowfish.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/Blowfish.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/Blowfish.js Thu Dec 14 07:45:13 2006
@@ -9,7 +9,8 @@
 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5
 d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745
 ae04, 0xd736fccc,0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,0x6fd5c7e7, 0x56e14ec4
 , 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
 ],s3:[
 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa
 93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9
 317c, 0xe0b12b4f,0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,0x90d4f869, 0xa65cdea0
 , 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-]}
+]
+}
 function add(x,y){var sum=(x+y)&0xffffffff;if (sum<0){sum=-sum;return (0x10000*((sum>>16)^0xffff))+(((sum&0xffff)^0xffff)+1);}
 return sum;}
 function split(x){var r=x&0xffffffff;if(r<0) {r=-r;return [((r&0xffff)^0xffff)+1,(r>>16)^0xffff];}
@@ -36,7 +37,8 @@
 s.push((iv[i]).toString(16));return s.join("");}
 case dojo.crypto.outputTypes.String:{return iv.join("");}
 case dojo.crypto.outputTypes.Raw:{return iv;}
-default:{return toBase64(iv);}}};this.setIV=function(data, inputType){var ip=inputType||dojo.crypto.outputTypes.Base64;var ba=null;switch(ip){case dojo.crypto.outputTypes.String:{ba=[];for (var i=0; i<data.length; i++){ba.push(data.charCodeAt(i));}
+default:{return toBase64(iv);}}
+};this.setIV=function(data, inputType){var ip=inputType||dojo.crypto.outputTypes.Base64;var ba=null;switch(ip){case dojo.crypto.outputTypes.String:{ba=[];for (var i=0; i<data.length; i++){ba.push(data.charCodeAt(i));}
 break;}
 case dojo.crypto.outputTypes.Hex:{ba=[];var i=0;while (i+1<data.length){ba.push(parseInt(data.substr(i,2),16));i+=2;}
 break;}
@@ -51,13 +53,15 @@
 |plaintext.charCodeAt(pos+5)*POW16
 |plaintext.charCodeAt(pos+6)*POW8
 |plaintext.charCodeAt(pos+7);if(isCBC){o.left=xor(o.left, vector.left);o.right=xor(o.right, vector.right);}
-eb(o, bx);if(isCBC){vector.left=o.left;vector.right=o.right;dojo.crypto.outputTypes.Hex}
+eb(o, bx);if(isCBC){vector.left=o.left;vector.right=o.right;dojo.crypto.outputTypes.Hex
+}
 cipher.push((o.left>>24)&0xff);cipher.push((o.left>>16)&0xff);cipher.push((o.left>>8)&0xff);cipher.push(o.left&0xff);cipher.push((o.right>>24)&0xff);cipher.push((o.right>>16)&0xff);cipher.push((o.right>>8)&0xff);cipher.push(o.right&0xff);pos+=8;}
 switch(out){case dojo.crypto.outputTypes.Hex:{var s=[];for(var i=0; i<cipher.length; i++)
 s.push((cipher[i]).toString(16));return s.join("");}
 case dojo.crypto.outputTypes.String:{return cipher.join("");}
 case dojo.crypto.outputTypes.Raw:{return cipher;}
-default:{return toBase64(cipher);}}};this.decrypt = function(ciphertext, key, ao){var ip=dojo.crypto.outputTypes.Base64;var mode=dojo.crypto.cipherModes.EBC;if (ao){if (ao.outputType) ip=ao.outputType;if (ao.cipherMode) mode=ao.cipherMode;}
+default:{return toBase64(cipher);}}
+};this.decrypt = function(ciphertext, key, ao){var ip=dojo.crypto.outputTypes.Base64;var mode=dojo.crypto.cipherModes.EBC;if (ao){if (ao.outputType) ip=ao.outputType;if (ao.cipherMode) mode=ao.cipherMode;}
 var bx = init(key);var pt=[];var c=null;switch(ip){case dojo.crypto.outputTypes.Hex:{c=[];var i=0;while (i+1<ciphertext.length){c.push(parseInt(ciphertext.substr(i,2),16));i+=2;}
 break;}
 case dojo.crypto.outputTypes.String:{c=[];for (var i=0; i<ciphertext.length; i++){c.push(ciphertext.charCodeAt(i));}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/MD5.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/MD5.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/MD5.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/MD5.js Thu Dec 14 07:45:13 2006
@@ -19,6 +19,8 @@
 var h=core(l.concat(toWord(data)),512+data.length*chrsz);return core(r.concat(h),640);}
 this.compute=function(data, outputType){var out=outputType||dojo.crypto.outputTypes.Base64;switch(out){case dojo.crypto.outputTypes.Hex:{return toHex(core(toWord(data),data.length*chrsz));}
 case dojo.crypto.outputTypes.String:{return toString(core(toWord(data),data.length*chrsz));}
-default:{return toBase64(core(toWord(data),data.length*chrsz));}}};this.getHMAC=function(data, key, outputType){var out=outputType||dojo.crypto.outputTypes.Base64;switch(out){case dojo.crypto.outputTypes.Hex:{return toHex(hmac(data,key));}
+default:{return toBase64(core(toWord(data),data.length*chrsz));}}
+};this.getHMAC=function(data, key, outputType){var out=outputType||dojo.crypto.outputTypes.Base64;switch(out){case dojo.crypto.outputTypes.Hex:{return toHex(hmac(data,key));}
 case dojo.crypto.outputTypes.String:{return toString(hmac(data,key));}
-default:{return toBase64(hmac(data,key));}}};}();
\ No newline at end of file
+default:{return toBase64(hmac(data,key));}}
+};}();
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/SHA1.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/SHA1.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/SHA1.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/SHA1.js Thu Dec 14 07:45:13 2006
@@ -20,6 +20,8 @@
 var h=core(l.concat(toWord(data)),512+data.length*chrsz);return core(r.concat(h),640);}
 this.compute=function(data,outputType){var out=outputType||dojo.crypto.outputTypes.Base64;switch(out){case dojo.crypto.outputTypes.Hex:{return toHex(core(toWord(data),data.length*chrsz));}
 case dojo.crypto.outputTypes.String:{return toString(core(toWord(data),data.length*chrsz));}
-default:{return toBase64(core(toWord(data),data.length*chrsz));}}};this.getHMAC=function(data,key,outputType){var out=outputType||dojo.crypto.outputTypes.Base64;switch(out){case dojo.crypto.outputTypes.Hex:{return toHex(hmac(data,key));}
+default:{return toBase64(core(toWord(data),data.length*chrsz));}}
+};this.getHMAC=function(data,key,outputType){var out=outputType||dojo.crypto.outputTypes.Base64;switch(out){case dojo.crypto.outputTypes.Hex:{return toHex(hmac(data,key));}
 case dojo.crypto.outputTypes.String:{return toString(hmac(data,key));}
-default:{return toBase64(hmac(data,key));}}};}();
\ No newline at end of file
+default:{return toBase64(hmac(data,key));}}
+};}();
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/crypto/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
 
 dojo.kwCompoundRequire({common: [
 "dojo.crypto","dojo.crypto.MD5"
-]});dojo.provide("dojo.crypto.*");
\ No newline at end of file
+]
+});dojo.provide("dojo.crypto.*");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/OpmlStore.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/OpmlStore.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/OpmlStore.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/OpmlStore.js Thu Dec 14 07:45:13 2006
@@ -1,7 +1,9 @@
 
 dojo.provide("dojo.data.OpmlStore");dojo.require("dojo.data.core.Read");dojo.require("dojo.data.core.Result");dojo.require("dojo.lang.assert");dojo.require("dojo.json");dojo.require("dojo.experimental");dojo.experimental("dojo.data.OpmlStore");dojo.declare("dojo.data.OpmlStore", dojo.data.core.Read, {initializer: function( keywordParameters) {this._arrayOfTopLevelItems = [];this._metadataNodes = null;this._loadFinished = false;this._opmlFileUrl = keywordParameters["url"];},_assertIsItem: function( item) {if (!this.isItem(item)) {throw new Error("dojo.data.OpmlStore: a function was passed an item argument that was not an item");}},_removeChildNodesThatAreNotElementNodes: function( node,  recursive) {var childNodes = node.childNodes;if (childNodes.length == 0) {return;}
 var nodesToRemove = [];var i, childNode;for (i = 0; i < childNodes.length; ++i) {childNode = childNodes[i];if (childNode.nodeType != Node.ELEMENT_NODE) {nodesToRemove.push(childNode);}};for (i = 0; i < nodesToRemove.length; ++i) {childNode = nodesToRemove[i];node.removeChild(childNode);}
-if (recursive) {for (i = 0; i < childNodes.length; ++i) {childNode = childNodes[i];this._removeChildNodesThatAreNotElementNodes(childNode, recursive);}}},_processRawXmlTree: function( rawXmlTree) {var headNodes = rawXmlTree.getElementsByTagName('head');var headNode = headNodes[0];this._removeChildNodesThatAreNotElementNodes(headNode);this._metadataNodes = headNode.childNodes;var bodyNodes = rawXmlTree.getElementsByTagName('body');var bodyNode = bodyNodes[0];this._removeChildNodesThatAreNotElementNodes(bodyNode, true);var bodyChildNodes = bodyNodes[0].childNodes;for (var i = 0; i < bodyChildNodes.length; ++i) {var node = bodyChildNodes[i];if (node.tagName == 'outline') {this._arrayOfTopLevelItems.push(node);}}},get: function( item,  attribute,  defaultValue) {this._assertIsItem(item);if (attribute == 'children') {return (item.firstChild || defaultValue);} else {var value = item.getAttribute(attribute);value = (value != undefined) ? value : defaultValue;return value;}},getValu
 es: function( item,  attribute) {this._assertIsItem(item);if (attribute == 'children') {var array = [];for (var i = 0; i < item.childNodes.length; ++i) {array.push(item.childNodes[i]);}
+if (recursive) {for (i = 0; i < childNodes.length; ++i) {childNode = childNodes[i];this._removeChildNodesThatAreNotElementNodes(childNode, recursive);}}
+},_processRawXmlTree: function( rawXmlTree) {var headNodes = rawXmlTree.getElementsByTagName('head');var headNode = headNodes[0];this._removeChildNodesThatAreNotElementNodes(headNode);this._metadataNodes = headNode.childNodes;var bodyNodes = rawXmlTree.getElementsByTagName('body');var bodyNode = bodyNodes[0];this._removeChildNodesThatAreNotElementNodes(bodyNode, true);var bodyChildNodes = bodyNodes[0].childNodes;for (var i = 0; i < bodyChildNodes.length; ++i) {var node = bodyChildNodes[i];if (node.tagName == 'outline') {this._arrayOfTopLevelItems.push(node);}}
+},get: function( item,  attribute,  defaultValue) {this._assertIsItem(item);if (attribute == 'children') {return (item.firstChild || defaultValue);} else {var value = item.getAttribute(attribute);value = (value != undefined) ? value : defaultValue;return value;}},getValues: function( item,  attribute) {this._assertIsItem(item);if (attribute == 'children') {var array = [];for (var i = 0; i < item.childNodes.length; ++i) {array.push(item.childNodes[i]);}
 return array;} else {return [item.getAttribute(attribute)];}},getAttributes: function( item) {this._assertIsItem(item);var attributes = [];var xmlNode = item;var xmlAttributes = xmlNode.attributes;for (var i = 0; i < xmlAttributes.length; ++i) {var xmlAttribute = xmlAttributes.item(i);attributes.push(xmlAttribute.nodeName);}
 if (xmlNode.childNodes.length > 0) {attributes.push('children');}
 return attributes;},hasAttribute: function( item,  attribute) {return (this.getValues(item, attribute).length > 0);},containsValue: function( item,  attribute,  value) {var values = this.getValues(item, attribute);for (var i = 0; i < values.length; ++i) {var possibleValue = values[i];if (value == possibleValue) {return true;}}
@@ -11,5 +13,6 @@
 var self = this;var bindHandler = function(type, data, evt) {var scope = result.scope || dj_global;if (type == "load") {self._processRawXmlTree(data);if (result.saveResult) {result.items = self._arrayOfTopLevelItems;}
 if (result.onbegin) {result.onbegin.call(scope, result);}
 for (var i=0; i < self._arrayOfTopLevelItems.length; i++) {var item = self._arrayOfTopLevelItems[i];if (result.onnext && !result._aborted) {result.onnext.call(scope, item, result);}}
-if (result.oncompleted && !result._aborted) {result.oncompleted.call(scope, result);}} else if(type == "error" || type == 'timeout') {var errorObject = data;if (result.onerror) {result.onerror.call(scope, data);}}};if (!this._loadFinished) {if (this._opmlFileUrl) {var bindRequest = dojo.io.bind({url: this._opmlFileUrl,handle: bindHandler,mimetype: "text/xml",sync: (result.sync || false) });result._abortFunc = bindRequest.abort;}}
+if (result.oncompleted && !result._aborted) {result.oncompleted.call(scope, result);}} else if(type == "error" || type == 'timeout') {var errorObject = data;if (result.onerror) {result.onerror.call(scope, data);}}
+};if (!this._loadFinished) {if (this._opmlFileUrl) {var bindRequest = dojo.io.bind({url: this._opmlFileUrl,handle: bindHandler,mimetype: "text/xml",sync: (result.sync || false) });result._abortFunc = bindRequest.abort;}}
 return result;},getIdentity: function( item) {dojo.unimplemented('dojo.data.OpmlStore.getIdentity()');return null;},findByIdentity: function( identity) {dojo.unimplemented('dojo.data.OpmlStore.findByIdentity()');return null;}});

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/RdfStore.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/RdfStore.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/RdfStore.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/RdfStore.js Thu Dec 14 07:45:13 2006
@@ -3,15 +3,18 @@
 dojo.declare("dojo.data.RdfStore", dojo.data.core.RemoteStore, {_datatypeMap: {literal: function(value) {var literal = value.value;if (value["xml:lang"]) {literal.lang = value["xml:lang"];}
 return literal;},uri: function(value) {return { id: value.value };},bnode: function(value) {return { id: '_:' + value.value };},'http://www.w3.org/2001/XMLSchema#int': function(value) {return parseInt(value.value);},'http://www.w3.org/2001/XMLSchema#integer': function(value) {return parseInt(value.value);},'http://www.w3.org/2001/XMLSchema#long': function(value) {return parseInt(value.value);},'http://www.w3.org/2001/XMLSchema#float': function(value) {return parseFloat(value.value);},'http://www.w3.org/2001/XMLSchema#double': function(value) {return parseFloat(value.value);},'http://www.w3.org/2001/XMLSchema#boolean': function(value) {return !value || value == "false" || value == "0" ? false : true;}},_datatypeSerializers: [
 new dojo.data.RdfDatatypeSerializer(Number, Number.toString, 'http://www.w3.org/2001/XMLSchema#float'),new dojo.data.RdfDatatypeSerializer(Boolean, Boolean.toString, 'http://www.w3.org/2001/XMLSchema#boolean')
-],_findDatatypeSerializer: function(value) {var length = this._datatypeSerializers.length;for (var i = 0; i < length; i++) {var datatype = this._datatypeSerializers[i];if (value instanceof datatype.type) {return datatype;}}},_toRDFValue: function(value) {var rdfvalue = {};if (value.id) {if (value.id.slice(0, 2) == '_:') {rdfvalue.type = 'bnode';rdfvalue.value = value.id.substring(2);} else {rdfvalue.type = 'uri';rdfvalue.value = value.id;}} else if (typeof value == "string" || value instanceof String) {rdfvalue.type = 'literal';rdfvalue.value = value;if (value.lang)
+],_findDatatypeSerializer: function(value) {var length = this._datatypeSerializers.length;for (var i = 0; i < length; i++) {var datatype = this._datatypeSerializers[i];if (value instanceof datatype.type) {return datatype;}}
+},_toRDFValue: function(value) {var rdfvalue = {};if (value.id) {if (value.id.slice(0, 2) == '_:') {rdfvalue.type = 'bnode';rdfvalue.value = value.id.substring(2);} else {rdfvalue.type = 'uri';rdfvalue.value = value.id;}} else if (typeof value == "string" || value instanceof String) {rdfvalue.type = 'literal';rdfvalue.value = value;if (value.lang)
 rdfvalue["xml:lang"] = value.lang;} else {if (typeof value == "number")
 value = new Number(value);else if (typeof value == "boolean")
-value = new Boolean(value);var datatype = this._findDatatypeSerializer(value);if (datatype) {rdfvalue = {"type": "typed-literal","datatype": datatype.uri,"value": value.toString()};} else {rdfvalue = {"type": "literal","value": value.toString() };}}
+value = new Boolean(value);var datatype = this._findDatatypeSerializer(value);if (datatype) {rdfvalue = {"type": "typed-literal","datatype": datatype.uri,"value": value.toString()
+};} else {rdfvalue = {"type": "literal","value": value.toString() };}}
 return rdfvalue;},_setupSaveRequest: function(saveKeywordArgs, requestKw) {var rdfResult = { "head":  {'vars': ['s','p','o']},"results": {'bindings': []}};var resources = [];for (var key in this._deleted) {resources.push(key);}
 rdfResult.results.deleted = resources;for (key in this._changed) {var subject = this._toRDFValue(this.getIdentity(key))
 var attributes = this._changed[key];for (var attr in attributes) {var predicate = {type:'uri', value: attr};var values = attributes[attr];if (!values.length)
 continue;var rdfvalues = [];for (var i = 0; i < values.length; i++) {var rdfvalue = this._toRDFValue(values[i]);rdfResult.results.bindings.push(
-{s: subject, p: predicate, o: rdfvalue});}}}
+{s: subject, p: predicate, o: rdfvalue});}}
+}
 var oldRegistry = dojo.json.jsonRegistry;dojo.json.jsonRegistry = this._jsonRegistry;var jsonString = dojo.json.serialize(rdfResult);dojo.json.jsonRegistry = oldRegistry;requestKw.postContent = jsonString;},_resultToQueryMetadata: function(json) {return json.head;},_resultToQueryData: function(json) {var items = {};var stmts = json.results.bindings;for (var i = 0; i < stmts.length; i++) {var stmt = stmts[i];var subject = stmt.s.value;if (stmt.s.type == 'bnode') {subject = '_:' + subject;}
 var attributes = data[subject];if (!attributes) {attributes = {};data[stmt.s] = attributes;}
 var attr = attributes[stmt.p.value];if (!attr) {attributes[stmt.p.value] = [stmt.o];} else {attr.push(stmt.o);}}
@@ -21,4 +24,5 @@
 continue;var rdfvalues = [];for (var i = 0; i < values.length; i++) {var rdfvalue = this._toRDFValue(values[i]);rdfvalues.push(rdfvalue);}
 rdfattributes[attr] = rdfvalues;}
 changes[key] = rdfattributes;}
-var oldRegistry = dojo.json.jsonRegistry;dojo.json.jsonRegistry = this._jsonRegistry;var jsonString = dojo.json.serialize(changes);dojo.json.jsonRegistry = oldRegistry;requestKw.content = {rdfFormat: 'json',resource: resources,metadata: jsonString};}});
\ No newline at end of file
+var oldRegistry = dojo.json.jsonRegistry;dojo.json.jsonRegistry = this._jsonRegistry;var jsonString = dojo.json.serialize(changes);dojo.json.jsonRegistry = oldRegistry;requestKw.content = {rdfFormat: 'json',resource: resources,metadata: jsonString
+};}});
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/core/RemoteStore.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/core/RemoteStore.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/core/RemoteStore.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/core/RemoteStore.js Thu Dec 14 07:45:13 2006
@@ -1,7 +1,8 @@
 
 dojo.provide("dojo.data.core.RemoteStore");dojo.require("dojo.data.core.Read");dojo.require("dojo.data.core.Write");dojo.require("dojo.data.core.Result");dojo.require("dojo.experimental");dojo.require("dojo.Deferred");dojo.require("dojo.lang.declare");dojo.require("dojo.json");dojo.require("dojo.io.*");dojo.experimental("dojo.data.core.RemoteStore");dojo.lang.declare("dojo.data.core.RemoteStore", [dojo.data.core.Read, dojo.data.core.Write], {_datatypeMap: {},_jsonRegistry: dojo.json.jsonRegistry,initializer: function( kwArgs) {if (!kwArgs) {kwArgs = {};}
 this._serverQueryUrl = kwArgs.queryUrl || "";this._serverSaveUrl = kwArgs.saveUrl || "";this._deleted = {};this._changed = {};this._added = {};this._results = {};this._data = {};this._numItems = 0;},_setupQueryRequest: function( result,  requestKw) {result.query = result.query || "";requestKw.url = this._serverQueryUrl + encodeURIComponent(result.query);requestKw.method = 'get';requestKw.mimetype = "text/json";},_resultToQueryMetadata: function( serverResponseData) {return serverResponseData;},_resultToQueryData: function( serverResponseData) {return serverResponseData.data;},_remoteToLocalValues: function( attributes) {for (var key in attributes) {var values = attributes[key];for (var i = 0; i < values.length; i++) {var value = values[i];var type = value.datatype || value.type;if (type) {var localValue = value.value;if (this._datatypeMap[type])
-localValue = this._datatypeMap[type](value);values[i] = localValue;}}}
+localValue = this._datatypeMap[type](value);values[i] = localValue;}}
+}
 return attributes;},_queryToQueryKey: function(query) {if (typeof query == "string")
 return query;else
 return dojo.json.serialize(query);},_assertIsItem: function( item) {if (!this.isItem(item)) {throw new Error("dojo.data.RemoteStore: a function was passed an item argument that was not an item");}},get: function( item,  attribute,  defaultValue) {var valueArray = this.getValues(item, attribute);if (valueArray.length == 0) {return defaultValue;}
@@ -18,11 +19,14 @@
 var query = result.query;var self = this;var bindfunc = function(type, data, evt) {var scope = result.scope || dj_global;if(type == "load") {result.resultMetadata = self._resultToQueryMetadata(data);var dataDict = self._resultToQueryData(data);if (result.onbegin) {result.onbegin.call(scope, result);}
 var count = 0;var resultData = [];var newItemCount = 0;for (var key in dataDict) {if (result._aborted)  {break;}
 if (!self._deleted[key]) {var values = dataDict[key];var attributeDict = self._remoteToLocalValues(values);var existingValue = self._data[key];var refCount = 1;if (existingValue) {refCount = ++existingValue[1];} else {newItemCount++;}
-self._data[key] = [ attributeDict, refCount];resultData.push(key);count++;if (result.onnext) {result.onnext.call(scope, key, result);}}}
+self._data[key] = [ attributeDict, refCount];resultData.push(key);count++;if (result.onnext) {result.onnext.call(scope, key, result);}}
+}
 self._results[self._queryToQueryKey(query)] = resultData;self._numItems += newItemCount;result.length = count;if (result.saveResult) {result.items = resultData;}
-if (!result._aborted && result.oncompleted) {result.oncompleted.call(scope, result);}} else if(type == "error" || type == 'timeout') {dojo.debug("find error: " + dojo.json.serialize(data));if (result.onerror) {result.onerror.call(scope, data);}}};var bindKw = keywordArgs.bindArgs || {};bindKw.sync = result.sync;bindKw.handle = bindfunc;this._setupQueryRequest(result, bindKw);var request = dojo.io.bind(bindKw);result._abortFunc = request.abort;return result;},getIdentity: function(item) {if (!this.isItem(item)) {return null;}
+if (!result._aborted && result.oncompleted) {result.oncompleted.call(scope, result);}} else if(type == "error" || type == 'timeout') {dojo.debug("find error: " + dojo.json.serialize(data));if (result.onerror) {result.onerror.call(scope, data);}}
+};var bindKw = keywordArgs.bindArgs || {};bindKw.sync = result.sync;bindKw.handle = bindfunc;this._setupQueryRequest(result, bindKw);var request = dojo.io.bind(bindKw);result._abortFunc = request.abort;return result;},getIdentity: function(item) {if (!this.isItem(item)) {return null;}
 return (item.id ? item.id : item);},newItem: function( attributes,  keywordArgs) {var itemIdentity = keywordArgs['identity'];if (this._deleted[itemIdentity]) {delete this._deleted[itemIdentity];} else {this._added[itemIdentity] = 1;}
-if (attributes) {for (var attribute in attributes) {var valueOrArrayOfValues = attributes[attribute];if (dojo.lang.isArray(valueOrArrayOfValues)) {this.setValues(itemIdentity, attribute, valueOrArrayOfValues);} else {this.set(itemIdentity, attribute, valueOrArrayOfValues);}}}
+if (attributes) {for (var attribute in attributes) {var valueOrArrayOfValues = attributes[attribute];if (dojo.lang.isArray(valueOrArrayOfValues)) {this.setValues(itemIdentity, attribute, valueOrArrayOfValues);} else {this.set(itemIdentity, attribute, valueOrArrayOfValues);}}
+}
 return { id: itemIdentity };},deleteItem: function( item) {var identity = this.getIdentity(item);if (!identity) {return false;}
 if (this._added[identity]) {delete this._added[identity];} else {this._deleted[identity] = 1;}
 if (this._changed[identity]) {delete this._changed[identity];}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/Item.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/Item.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/Item.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/Item.js Thu Dec 14 07:45:13 2006
@@ -4,7 +4,8 @@
 for (var i in attributeArrayOne) {var attribute = attributeArrayOne[i];var arrayOfValuesOne = itemOne.getValues(attribute);var arrayOfValuesTwo = itemTwo.getValues(attribute);dojo.lang.assert(arrayOfValuesOne && (arrayOfValuesOne.length > 0));if (!arrayOfValuesTwo) {return 1;}
 if (arrayOfValuesOne.length != arrayOfValuesTwo.length) {if (arrayOfValuesOne.length > arrayOfValuesTwo.length) {return 1;} else {return -1;}}
 for (var j in arrayOfValuesOne) {var value = arrayOfValuesOne[j];if (!itemTwo.hasAttributeValue(value)) {return 1;}}
-return 0;}} else {if (nameOne > nameTwo) {return 1;} else {return -1;}}};dojo.data.old.Item.prototype.toString = function() {var arrayOfStrings = [];var attributes = this.getAttributes();for (var i in attributes) {var attribute = attributes[i];var arrayOfValues = this.getValues(attribute);var valueString;if (arrayOfValues.length == 1) {valueString = arrayOfValues[0];} else {valueString = '[';valueString += arrayOfValues.join(', ');valueString += ']';}
+return 0;}} else {if (nameOne > nameTwo) {return 1;} else {return -1;}}
+};dojo.data.old.Item.prototype.toString = function() {var arrayOfStrings = [];var attributes = this.getAttributes();for (var i in attributes) {var attribute = attributes[i];var arrayOfValues = this.getValues(attribute);var valueString;if (arrayOfValues.length == 1) {valueString = arrayOfValues[0];} else {valueString = '[';valueString += arrayOfValues.join(', ');valueString += ']';}
 arrayOfStrings.push('  ' + attribute + ': ' + valueString);}
 var returnString = '{ ';returnString += arrayOfStrings.join(',\n');returnString += ' }';return returnString;};dojo.data.old.Item.prototype.compare = function( otherItem) {return dojo.data.old.Item.compare(this, otherItem);};dojo.data.old.Item.prototype.isEqual = function( otherItem) {return (this.compare(otherItem) == 0);};dojo.data.old.Item.prototype.getName = function() {return this.get('name');};dojo.data.old.Item.prototype.get = function( attributeId) {var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];if (dojo.lang.isUndefined(literalOrValueOrArray)) {return null;}
 if (literalOrValueOrArray instanceof dojo.data.old.Value) {return literalOrValueOrArray.getValue();}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/__package__.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/__package__.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/__package__.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/__package__.js Thu Dec 14 07:45:13 2006
@@ -1,4 +1,5 @@
 
 dojo.require("dojo.experimental");dojo.experimental("dojo.data.old.*");dojo.kwCompoundRequire({common: [
 "dojo.data.old.Item","dojo.data.old.ResultSet","dojo.data.old.provider.FlatFile"
-]});dojo.provide("dojo.data.old.*");
\ No newline at end of file
+]
+});dojo.provide("dojo.data.old.*");
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Csv.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Csv.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Csv.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Csv.js Thu Dec 14 07:45:13 2006
@@ -5,4 +5,5 @@
 var nextField = listOfFields[j+1];listOfFields[j] = field_space + ',' + nextField;listOfFields.splice(j+1, 1);} else {if ((firstChar == '"') && (lastChar == '"')) {field = field.slice(1, (field.length - 1));field = field.replace(doubleQuotes, '"');}
 listOfFields[j] = field;j += 1;}}
 arrayOfOutputRecords.push(listOfFields);}}
-return arrayOfOutputRecords;};this.loadDataProviderFromFileContents = function( dataProvider,  csvFileContents) {dojo.lang.assertType(dataProvider, dojo.data.old.provider.Base);dojo.lang.assertType(csvFileContents, String);var arrayOfArrays = this.getArrayStructureFromCsvFileContents(csvFileContents);if (arrayOfArrays) {var arrayOfKeys = arrayOfArrays[0];for (var i = 1; i < arrayOfArrays.length; ++i) {var row = arrayOfArrays[i];var item = dataProvider.getNewItemToLoad();for (var j in row) {var value = row[j];var key = arrayOfKeys[j];item.load(key, value);}}}};this.getCsvStringFromResultSet = function( resultSet) {dojo.unimplemented('dojo.data.old.format.Csv.getCsvStringFromResultSet');var csvString = null;return csvString;};}();
\ No newline at end of file
+return arrayOfOutputRecords;};this.loadDataProviderFromFileContents = function( dataProvider,  csvFileContents) {dojo.lang.assertType(dataProvider, dojo.data.old.provider.Base);dojo.lang.assertType(csvFileContents, String);var arrayOfArrays = this.getArrayStructureFromCsvFileContents(csvFileContents);if (arrayOfArrays) {var arrayOfKeys = arrayOfArrays[0];for (var i = 1; i < arrayOfArrays.length; ++i) {var row = arrayOfArrays[i];var item = dataProvider.getNewItemToLoad();for (var j in row) {var value = row[j];var key = arrayOfKeys[j];item.load(key, value);}}
+}};this.getCsvStringFromResultSet = function( resultSet) {dojo.unimplemented('dojo.data.old.format.Csv.getCsvStringFromResultSet');var csvString = null;return csvString;};}();
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Json.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Json.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Json.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/format/Json.js Thu Dec 14 07:45:13 2006
@@ -1,3 +1,7 @@
 
-dojo.provide("dojo.data.old.format.Json");dojo.require("dojo.lang.assert");dojo.data.old.format.Json = new function() {this.loadDataProviderFromFileContents = function( dataProvider,  jsonFileContents) {dojo.lang.assertType(dataProvider, dojo.data.old.provider.Base);dojo.lang.assertType(jsonFileContents, String);var arrayOfJsonData = eval("(" + jsonFileContents + ")");this.loadDataProviderFromArrayOfJsonData(dataProvider, arrayOfJsonData);};this.loadDataProviderFromArrayOfJsonData = function( dataProvider,  arrayOfJsonData) {dojo.lang.assertType(arrayOfJsonData, Array, {optional: true});if (arrayOfJsonData && (arrayOfJsonData.length > 0)) {var firstRow = arrayOfJsonData[0];dojo.lang.assertType(firstRow, [Array, "pureobject"]);if (dojo.lang.isArray(firstRow)) {_loadDataProviderFromArrayOfArrays(dataProvider, arrayOfJsonData);} else {dojo.lang.assertType(firstRow, "pureobject");_loadDataProviderFromArrayOfObjects(dataProvider, arrayOfJsonData);}}};this.getJsonStringFromResultS
 et = function( resultSet) {dojo.unimplemented('dojo.data.old.format.Json.getJsonStringFromResultSet');var jsonString = null;return jsonString;};function _loadDataProviderFromArrayOfArrays( dataProvider,  arrayOfJsonData) {var arrayOfKeys = arrayOfJsonData[0];for (var i = 1; i < arrayOfJsonData.length; ++i) {var row = arrayOfJsonData[i];var item = dataProvider.getNewItemToLoad();for (var j in row) {var value = row[j];var key = arrayOfKeys[j];item.load(key, value);}}}
-function _loadDataProviderFromArrayOfObjects( dataProvider,  arrayOfJsonData) {for (var i in arrayOfJsonData) {var row = arrayOfJsonData[i];var item = dataProvider.getNewItemToLoad();for (var key in row) {var value = row[key];if (dojo.lang.isArray(value)) {var arrayOfValues = value;for (var j in arrayOfValues) {value = arrayOfValues[j];item.load(key, value);}} else {item.load(key, value);}}}}}();
\ No newline at end of file
+dojo.provide("dojo.data.old.format.Json");dojo.require("dojo.lang.assert");dojo.data.old.format.Json = new function() {this.loadDataProviderFromFileContents = function( dataProvider,  jsonFileContents) {dojo.lang.assertType(dataProvider, dojo.data.old.provider.Base);dojo.lang.assertType(jsonFileContents, String);var arrayOfJsonData = eval("(" + jsonFileContents + ")");this.loadDataProviderFromArrayOfJsonData(dataProvider, arrayOfJsonData);};this.loadDataProviderFromArrayOfJsonData = function( dataProvider,  arrayOfJsonData) {dojo.lang.assertType(arrayOfJsonData, Array, {optional: true});if (arrayOfJsonData && (arrayOfJsonData.length > 0)) {var firstRow = arrayOfJsonData[0];dojo.lang.assertType(firstRow, [Array, "pureobject"]);if (dojo.lang.isArray(firstRow)) {_loadDataProviderFromArrayOfArrays(dataProvider, arrayOfJsonData);} else {dojo.lang.assertType(firstRow, "pureobject");_loadDataProviderFromArrayOfObjects(dataProvider, arrayOfJsonData);}}
+};this.getJsonStringFromResultSet = function( resultSet) {dojo.unimplemented('dojo.data.old.format.Json.getJsonStringFromResultSet');var jsonString = null;return jsonString;};function _loadDataProviderFromArrayOfArrays( dataProvider,  arrayOfJsonData) {var arrayOfKeys = arrayOfJsonData[0];for (var i = 1; i < arrayOfJsonData.length; ++i) {var row = arrayOfJsonData[i];var item = dataProvider.getNewItemToLoad();for (var j in row) {var value = row[j];var key = arrayOfKeys[j];item.load(key, value);}}
+}
+function _loadDataProviderFromArrayOfObjects( dataProvider,  arrayOfJsonData) {for (var i in arrayOfJsonData) {var row = arrayOfJsonData[i];var item = dataProvider.getNewItemToLoad();for (var key in row) {var value = row[key];if (dojo.lang.isArray(value)) {var arrayOfValues = value;for (var j in arrayOfValues) {value = arrayOfValues[j];item.load(key, value);}} else {item.load(key, value);}}
+}}
+}();
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/Base.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/Base.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/Base.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/Base.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,7 @@
 
 dojo.provide("dojo.data.old.provider.Base");dojo.require("dojo.lang.assert");dojo.data.old.provider.Base = function() {this._countOfNestedTransactions = 0;this._changesInCurrentTransaction = null;};dojo.data.old.provider.Base.prototype.beginTransaction = function() {if (this._countOfNestedTransactions === 0) {this._changesInCurrentTransaction = [];}
-this._countOfNestedTransactions += 1;};dojo.data.old.provider.Base.prototype.endTransaction = function() {this._countOfNestedTransactions -= 1;dojo.lang.assert(this._countOfNestedTransactions >= 0);if (this._countOfNestedTransactions === 0) {var listOfChangesMade = this._saveChanges();this._changesInCurrentTransaction = null;if (listOfChangesMade.length > 0) {this._notifyObserversOfChanges(listOfChangesMade);}}};dojo.data.old.provider.Base.prototype.getNewItemToLoad = function() {return this._newItem();};dojo.data.old.provider.Base.prototype.newItem = function( itemName) {dojo.lang.assertType(itemName, String, {optional: true});var item = this._newItem();if (itemName) {item.set('name', itemName);}
+this._countOfNestedTransactions += 1;};dojo.data.old.provider.Base.prototype.endTransaction = function() {this._countOfNestedTransactions -= 1;dojo.lang.assert(this._countOfNestedTransactions >= 0);if (this._countOfNestedTransactions === 0) {var listOfChangesMade = this._saveChanges();this._changesInCurrentTransaction = null;if (listOfChangesMade.length > 0) {this._notifyObserversOfChanges(listOfChangesMade);}}
+};dojo.data.old.provider.Base.prototype.getNewItemToLoad = function() {return this._newItem();};dojo.data.old.provider.Base.prototype.newItem = function( itemName) {dojo.lang.assertType(itemName, String, {optional: true});var item = this._newItem();if (itemName) {item.set('name', itemName);}
 return item;};dojo.data.old.provider.Base.prototype.newAttribute = function( attributeId) {dojo.lang.assertType(attributeId, String, {optional: true});var attribute = this._newAttribute(attributeId);return attribute;};dojo.data.old.provider.Base.prototype.getAttribute = function( attributeId) {dojo.unimplemented('dojo.data.old.provider.Base');var attribute;return attribute;};dojo.data.old.provider.Base.prototype.getAttributes = function() {dojo.unimplemented('dojo.data.old.provider.Base');return this._arrayOfAttributes;};dojo.data.old.provider.Base.prototype.fetchArray = function() {dojo.unimplemented('dojo.data.old.provider.Base');return [];};dojo.data.old.provider.Base.prototype.fetchResultSet = function() {dojo.unimplemented('dojo.data.old.provider.Base');var resultSet;return resultSet;};dojo.data.old.provider.Base.prototype.noteChange = function( item,  attribute,  value) {var change = {item: item, attribute: attribute, value: value};if (this._countOfNestedTransactions =
 == 0) {this.beginTransaction();this._changesInCurrentTransaction.push(change);this.endTransaction();} else {this._changesInCurrentTransaction.push(change);}};dojo.data.old.provider.Base.prototype.addItemObserver = function( item,  observer) {dojo.lang.assertType(item, dojo.data.old.Item);item.addObserver(observer);};dojo.data.old.provider.Base.prototype.removeItemObserver = function( item,  observer) {dojo.lang.assertType(item, dojo.data.old.Item);item.removeObserver(observer);};dojo.data.old.provider.Base.prototype._newItem = function() {var item = new dojo.data.old.Item(this);return item;};dojo.data.old.provider.Base.prototype._newAttribute = function( attributeId) {var attribute = new dojo.data.old.Attribute(this);return attribute;};dojo.data.old.provider.Base.prototype._saveChanges = function() {var arrayOfChangesMade = this._changesInCurrentTransaction;return arrayOfChangesMade;};dojo.data.old.provider.Base.prototype._notifyObserversOfChanges = function( arrayOfChanges)
  {var arrayOfResultSets = this._getResultSets();for (var i in arrayOfChanges) {var change = arrayOfChanges[i];var changedItem = change.item;var arrayOfItemObservers = changedItem.getObservers();for (var j in arrayOfItemObservers) {var observer = arrayOfItemObservers[j];observer.observedObjectHasChanged(changedItem, change);}
-for (var k in arrayOfResultSets) {var resultSet = arrayOfResultSets[k];var arrayOfResultSetObservers = resultSet.getObservers();for (var m in arrayOfResultSetObservers) {observer = arrayOfResultSetObservers[m];observer.observedObjectHasChanged(resultSet, change);}}}};dojo.data.old.provider.Base.prototype._getResultSets = function() {dojo.unimplemented('dojo.data.old.provider.Base');return [];};
\ No newline at end of file
+for (var k in arrayOfResultSets) {var resultSet = arrayOfResultSets[k];var arrayOfResultSetObservers = resultSet.getObservers();for (var m in arrayOfResultSetObservers) {observer = arrayOfResultSetObservers[m];observer.observedObjectHasChanged(resultSet, change);}}
+}};dojo.data.old.provider.Base.prototype._getResultSets = function() {dojo.unimplemented('dojo.data.old.provider.Base');return [];};
\ No newline at end of file

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/FlatFile.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/FlatFile.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/FlatFile.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/data/old/provider/FlatFile.js Thu Dec 14 07:45:13 2006
@@ -3,7 +3,9 @@
 if (jsonString) {dojo.data.old.format.Json.loadDataProviderFromFileContents(this, jsonString);}
 if (fileUrl) {var arrayOfParts = fileUrl.split('.');var lastPart = arrayOfParts[(arrayOfParts.length - 1)];var formatParser = null;if (lastPart == "json") {formatParser = dojo.data.old.format.Json;}
 if (lastPart == "csv") {formatParser = dojo.data.old.format.Csv;}
-if (formatParser) {var fileContents = dojo.hostenv.getText(fileUrl);formatParser.loadDataProviderFromFileContents(this, fileContents);} else {dojo.lang.assert(false, "new dojo.data.old.provider.FlatFile({url: }) was passed a file without a .csv or .json suffix");}}}};dojo.inherits(dojo.data.old.provider.FlatFile, dojo.data.old.provider.Base);dojo.data.old.provider.FlatFile.prototype.getProviderCapabilities = function( keyword) {dojo.lang.assertType(keyword, String, {optional: true});if (!this._ourCapabilities) {this._ourCapabilities = {transactions: false,undo: false,login: false,versioning: false,anonymousRead: true,anonymousWrite: false,permissions: false,queries: false,strongTyping: false,datatypes: [String, Date, Number]};}
+if (formatParser) {var fileContents = dojo.hostenv.getText(fileUrl);formatParser.loadDataProviderFromFileContents(this, fileContents);} else {dojo.lang.assert(false, "new dojo.data.old.provider.FlatFile({url: }) was passed a file without a .csv or .json suffix");}}
+}};dojo.inherits(dojo.data.old.provider.FlatFile, dojo.data.old.provider.Base);dojo.data.old.provider.FlatFile.prototype.getProviderCapabilities = function( keyword) {dojo.lang.assertType(keyword, String, {optional: true});if (!this._ourCapabilities) {this._ourCapabilities = {transactions: false,undo: false,login: false,versioning: false,anonymousRead: true,anonymousWrite: false,permissions: false,queries: false,strongTyping: false,datatypes: [String, Date, Number]
+};}
 if (keyword) {return this._ourCapabilities[keyword];} else {return this._ourCapabilities;}};dojo.data.old.provider.FlatFile.prototype.registerAttribute = function( attributeId) {var registeredAttribute = this.getAttribute(attributeId);if (!registeredAttribute) {var newAttribute = new dojo.data.old.Attribute(this, attributeId);this._dictionaryOfAttributes[attributeId] = newAttribute;registeredAttribute = newAttribute;}
 return registeredAttribute;};dojo.data.old.provider.FlatFile.prototype.getAttribute = function( attributeId) {var attribute = (this._dictionaryOfAttributes[attributeId] || null);return attribute;};dojo.data.old.provider.FlatFile.prototype.getAttributes = function() {var arrayOfAttributes = [];for (var key in this._dictionaryOfAttributes) {var attribute = this._dictionaryOfAttributes[key];arrayOfAttributes.push(attribute);}
 return arrayOfAttributes;};dojo.data.old.provider.FlatFile.prototype.fetchArray = function(query) {return this._arrayOfItems;};dojo.data.old.provider.FlatFile.prototype.fetchResultSet = function(query) {if (!this._resultSet) {this._resultSet = new dojo.data.old.ResultSet(this, this.fetchArray(query));}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/common.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/common.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/common.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/common.js Thu Dec 14 07:45:13 2006
@@ -17,13 +17,15 @@
 dojo.date.isLeapYear = function(dateObject){var year = dateObject.getFullYear();return (year%400 == 0) ? true : (year%100 == 0) ? false : (year%4 == 0) ? true : false;}
 dojo.date.getTimezoneName = function(dateObject){var str = dateObject.toString();var tz = '';var match;var pos = str.indexOf('(');if (pos > -1) {pos++;tz = str.substring(pos, str.indexOf(')'));}
 else{var pat = /([A-Z\/]+) \d{4}$/;if((match = str.match(pat))) {tz = match[1];}
-else{str = dateObject.toLocaleString();pat = / ([A-Z\/]+)$/;if((match = str.match(pat))) {tz = match[1];}}}
+else{str = dateObject.toLocaleString();pat = / ([A-Z\/]+)$/;if((match = str.match(pat))) {tz = match[1];}}
+}
 return tz == 'AM' || tz == 'PM' ? '' : tz;}
 dojo.date.getOrdinal = function(dateObject){var date = dateObject.getDate();if(date%100 != 11 && date%10 == 1){ return "st"; }
 else if(date%100 != 12 && date%10 == 2){ return "nd"; }
 else if(date%100 != 13 && date%10 == 3){ return "rd"; }
 else{ return "th"; }}
-dojo.date.compareTypes={DATE:1, TIME:2};dojo.date.compare=function( dateA,  dateB,  options){var dA=dateA;var dB=dateB||new Date();var now=new Date();with(dojo.date.compareTypes){var opt=options||(DATE|TIME);var d1=new Date(
+dojo.date.compareTypes={DATE:1, TIME:2
+};dojo.date.compare=function( dateA,  dateB,  options){var dA=dateA;var dB=dateB||new Date();var now=new Date();with(dojo.date.compareTypes){var opt=options||(DATE|TIME);var d1=new Date(
 (opt&DATE)?dA.getFullYear():now.getFullYear(),(opt&DATE)?dA.getMonth():now.getMonth(),(opt&DATE)?dA.getDate():now.getDate(),(opt&TIME)?dA.getHours():0,(opt&TIME)?dA.getMinutes():0,(opt&TIME)?dA.getSeconds():0
 );var d2=new Date(
 (opt&DATE)?dB.getFullYear():now.getFullYear(),(opt&DATE)?dB.getMonth():now.getMonth(),(opt&DATE)?dB.getDate():now.getDate(),(opt&TIME)?dB.getHours():0,(opt&TIME)?dB.getMinutes():0,(opt&TIME)?dB.getSeconds():0
@@ -31,7 +33,8 @@
 if(d1.valueOf()>d2.valueOf()){return 1;}
 if(d1.valueOf()<d2.valueOf()){return -1;}
 return 0;}
-dojo.date.dateParts={YEAR:0, MONTH:1, DAY:2, HOUR:3, MINUTE:4, SECOND:5, MILLISECOND:6, QUARTER:7, WEEK:8, WEEKDAY:9};dojo.date.add = function( dt,  interv,  incr){if(typeof dt == 'number'){dt = new Date(dt);}
+dojo.date.dateParts={YEAR:0, MONTH:1, DAY:2, HOUR:3, MINUTE:4, SECOND:5, MILLISECOND:6, QUARTER:7, WEEK:8, WEEKDAY:9
+};dojo.date.add = function( dt,  interv,  incr){if(typeof dt == 'number'){dt = new Date(dt);}
 function fixOvershoot(){if (sum.getDate() < dt.getDate()){sum.setDate(0);}}
 var sum = new Date(dt);with(dojo.date.dateParts){switch(interv){case YEAR:
 sum.setFullYear(dt.getFullYear()+incr);fixOvershoot();break;case QUARTER:

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/format.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/format.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/format.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/format.js Thu Dec 14 07:45:13 2006
@@ -1,10 +1,10 @@
 
-dojo.provide("dojo.date.format");dojo.require("dojo.date.common");dojo.require("dojo.date.supplemental");dojo.require("dojo.lang.array");dojo.require("dojo.lang.common");dojo.require("dojo.lang.func");dojo.require("dojo.string.common");dojo.require("dojo.i18n.common");dojo.requireLocalization("dojo.i18n.calendar", "gregorian", null, "en,es,fr,de,sv,nl,ja,fi,zh-cn,ROOT,zh,zh-hk,hu,zh-tw,pt,pt-br,ko,it");dojo.requireLocalization("dojo.i18n.calendar", "gregorianExtras", null, "ja,zh,ROOT");(function(){dojo.date.format = function(dateObject, options){function formatPattern(dateObject, pattern){return pattern.replace(/([a-z])\1*/ig, function(match){var s;var c = match.charAt(0);var l = match.length;var pad;var widthList = ["abbr", "wide", "narrow"];switch(c){case 'G':
+dojo.provide("dojo.date.format");dojo.require("dojo.date.common");dojo.require("dojo.date.supplemental");dojo.require("dojo.lang.array");dojo.require("dojo.lang.common");dojo.require("dojo.lang.func");dojo.require("dojo.string.common");dojo.require("dojo.i18n.common");dojo.requireLocalization("dojo.i18n.cldr", "gregorian", null, "zh-cn,zh,zh-hk,pt,pt-br,de,sv,ja,fi,en,fr,es,nl,ko,zh-tw,it,hu,ROOT");dojo.requireLocalization("dojo.i18n.cldr", "gregorianExtras", null, "zh,ja,ROOT");(function(){dojo.date.format = function(dateObject, options){function formatPattern(dateObject, pattern){return pattern.replace(/([a-z])\1*/ig, function(match){var s;var c = match.charAt(0);var l = match.length;var pad;var widthList = ["abbr", "wide", "narrow"];switch(c){case 'G':
 if(l>3){dojo.unimplemented("Era format not implemented");}
 s = info.eras[dateObject.getFullYear() < 0 ? 1 : 0];break;case 'y':
 s = dateObject.getFullYear();switch(l){case 1:
 break;case 2:
-s = String(s).substr(-2);break;default:
+s = String(s); s = s.substr(s.length - 2);break;default:
 pad = true;}
 break;case 'Q':
 case 'q':
@@ -83,7 +83,7 @@
 break;case 'd':
 result.setDate(v);expected.date = v;break;case 'D':
 dojo.date.setDayOfYear(result, v);break;case 'w':
-var firstDay = 0;dojo.date.setWeekOfYear(dateObject, v, firstDay);break;case 'a':
+var firstDay = 0;dojo.date.setWeekOfYear(result, v, firstDay);break;case 'a':
 var am = options.am || info.am;var pm = options.pm || info.pm;if(!options.strict){v = v.replace(/\./g,'').toLowerCase();am = am.replace(/\./g,'').toLowerCase();pm = pm.replace(/\./g,'').toLowerCase();}
 if(options.strict && v != am && v != pm){dojo.debug("dojo.date.parse: Could not parse am/pm part.");return null;}
 var hours = result.getHours();if(v == pm && hours < 12){result.setHours(hours + 12);} else if(v == am && hours == 12){result.setHours(0);}
@@ -185,7 +185,7 @@
 property = swapString;break;default:
 break;}
 switchCase = null;string += property;i = index;}
-string += format.substring(i);return string;};(function(){var _customFormats = [];dojo.date.addCustomFormats = function(packageName, bundleName){_customFormats.push({pkg:packageName,name:bundleName});};dojo.date._getGregorianBundle = function(locale){var gregorian = {};dojo.lang.forEach(_customFormats, function(desc){var bundle = dojo.i18n.getLocalization(desc.pkg, desc.name, locale);gregorian = dojo.lang.mixin(gregorian, bundle);}, this);return gregorian;};})();dojo.date.addCustomFormats("dojo.i18n.calendar","gregorian");dojo.date.addCustomFormats("dojo.i18n.calendar","gregorianExtras");dojo.date.getNames = function(item, type, use, locale){var label;var lookup = dojo.date._getGregorianBundle(locale);var props = [item, use, type];if(use == 'standAlone'){label = lookup[props.join('-')];}
+string += format.substring(i);return string;};(function(){var _customFormats = [];dojo.date.addCustomFormats = function(packageName, bundleName){_customFormats.push({pkg:packageName,name:bundleName});};dojo.date._getGregorianBundle = function(locale){var gregorian = {};dojo.lang.forEach(_customFormats, function(desc){var bundle = dojo.i18n.getLocalization(desc.pkg, desc.name, locale);gregorian = dojo.lang.mixin(gregorian, bundle);}, this);return gregorian;};})();dojo.date.addCustomFormats("dojo.i18n.cldr","gregorian");dojo.date.addCustomFormats("dojo.i18n.cldr","gregorianExtras");dojo.date.getNames = function(item, type, use, locale){var label;var lookup = dojo.date._getGregorianBundle(locale);var props = [item, use, type];if(use == 'standAlone'){label = lookup[props.join('-')];}
 props[1] = 'format';return (label || lookup[props.join('-')]).concat();};dojo.date.getDayName = function(dateObject, locale){return dojo.date.getNames('days', 'wide', 'format', locale)[dateObject.getDay()];};dojo.date.getDayShortName = function(dateObject, locale){return dojo.date.getNames('days', 'abbr', 'format', locale)[dateObject.getDay()];};dojo.date.getMonthName = function(dateObject, locale){return dojo.date.getNames('months', 'wide', 'format', locale)[dateObject.getMonth()];};dojo.date.getMonthShortName = function(dateObject, locale){return dojo.date.getNames('months', 'abbr', 'format', locale)[dateObject.getMonth()];};dojo.date.toRelativeString = function(dateObject){var now = new Date();var diff = (now - dateObject) / 1000;var end = " ago";var future = false;if(diff < 0){future = true;end = " from now";diff = -diff;}
 if(diff < 60){diff = Math.round(diff);return diff + " second" + (diff == 1 ? "" : "s") + end;}
 if(diff < 60*60){diff = Math.round(diff/60);return diff + " minute" + (diff == 1 ? "" : "s") + end;}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/supplemental.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/supplemental.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/supplemental.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/date/supplemental.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,8 @@
 
-dojo.provide("dojo.date.supplemental");dojo.date.getFirstDayOfWeek = function(locale){var firstDay = {mv:5,ae:6,af:6,bh:6,dj:6,dz:6,eg:6,er:6,et:6,iq:6,ir:6,jo:6,ke:6,kw:6,lb:6,ly:6,ma:6,om:6,qa:6,sa:6,sd:6,so:6,tn:6,ye:6,as:0,au:0,az:0,bw:0,ca:0,cn:0,fo:0,ge:0,gl:0,gu:0,hk:0,ie:0,il:0,is:0,jm:0,jp:0,kg:0,kr:0,la:0,mh:0,mo:0,mp:0,mt:0,nz:0,ph:0,pk:0,sg:0,th:0,tt:0,tw:0,um:0,us:0,uz:0,vi:0,za:0,zw:0,et:0,mw:0,ng:0,tj:0,gb:0,sy:4};locale = dojo.hostenv.normalizeLocale(locale);var country = locale.split("-")[1];var dow = firstDay[country];return (typeof dow == 'undefined') ? 1 : dow;};dojo.date.getWeekend = function(locale){var weekendStart = {eg:5,il:5,sy:5,'in':0,ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4};var weekendEnd = {ae:5,bh:5,dz:5,iq:5,jo:5,kw:5,lb:5,ly:5,ma:5,om:5,qa:5,sa:5,sd:5,tn:5,ye:5,af:5,ir:5,eg:6,il:6,sy:6};locale = dojo.hostenv.normalizeLocale(locale);var country = locale.split("-")[1];var start = weekendStart[country];var end 
 = weekendEnd[country];if(typeof start == 'undefined'){start=6;}
+dojo.provide("dojo.date.supplemental");dojo.date.getFirstDayOfWeek = function(locale){var firstDay = {mv:5,ae:6,af:6,bh:6,dj:6,dz:6,eg:6,er:6,et:6,iq:6,ir:6,jo:6,ke:6,kw:6,lb:6,ly:6,ma:6,om:6,qa:6,sa:6,sd:6,so:6,tn:6,ye:6,as:0,au:0,az:0,bw:0,ca:0,cn:0,fo:0,ge:0,gl:0,gu:0,hk:0,ie:0,il:0,is:0,jm:0,jp:0,kg:0,kr:0,la:0,mh:0,mo:0,mp:0,mt:0,nz:0,ph:0,pk:0,sg:0,th:0,tt:0,tw:0,um:0,us:0,uz:0,vi:0,za:0,zw:0,et:0,mw:0,ng:0,tj:0,gb:0,sy:4
+};locale = dojo.hostenv.normalizeLocale(locale);var country = locale.split("-")[1];var dow = firstDay[country];return (typeof dow == 'undefined') ? 1 : dow;};dojo.date.getWeekend = function(locale){var weekendStart = {eg:5,il:5,sy:5,'in':0,ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4
+};var weekendEnd = {ae:5,bh:5,dz:5,iq:5,jo:5,kw:5,lb:5,ly:5,ma:5,om:5,qa:5,sa:5,sd:5,tn:5,ye:5,af:5,ir:5,eg:6,il:6,sy:6
+};locale = dojo.hostenv.normalizeLocale(locale);var country = locale.split("-")[1];var start = weekendStart[country];var end = weekendEnd[country];if(typeof start == 'undefined'){start=6;}
 if(typeof end == 'undefined'){end=0;}
 return {start:start, end:end};};dojo.date.isWeekend = function(dateObj, locale){var weekend = dojo.date.getWeekend(locale);var day = (dateObj || new Date()).getDay();if(weekend.end<weekend.start){weekend.end+=7;if(day<weekend.start){ day+=7; }}
 return day >= weekend.start && day <= weekend.end;};

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug.js Thu Dec 14 07:45:13 2006
@@ -3,7 +3,8 @@
 var args = arguments;if(dj_undef("println", dojo.hostenv)){dojo.raise("dojo.debug not available (yet?)");}
 var isJUM = dj_global["jum"] && !dj_global["jum"].isBrowser;var s = [(isJUM ? "": "DEBUG: ")];for(var i=0;i<args.length;++i){if(!false && args[i] && args[i] instanceof Error){var msg = "[" + args[i].name + ": " + dojo.errorToString(args[i]) +
 (args[i].fileName ? ", file: " + args[i].fileName : "") +
-(args[i].lineNumber ? ", line: " + args[i].lineNumber : "") + "]";} else {try {var msg = String(args[i]);} catch(e) {if(dojo.render.html.ie) {var msg = "[ActiveXObject]";} else {var msg = "[unknown]";}}}
+(args[i].lineNumber ? ", line: " + args[i].lineNumber : "") + "]";} else {try {var msg = String(args[i]);} catch(e) {if(dojo.render.html.ie) {var msg = "[ActiveXObject]";} else {var msg = "[unknown]";}}
+}
 s.push(msg);}
 dojo.hostenv.println(s.join(" "));}
 dojo.debugShallow = function(obj){if (!djConfig.isDebug) { return; }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug/console.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug/console.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug/console.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/debug/console.js Thu Dec 14 07:45:13 2006
@@ -1,11 +1,11 @@
 
-dojo.provide("dojo.debug.console");dojo.require("dojo.lang.*");dojo.require("dojo.logging.ConsoleLogger");if (window.console) {if (console.info != null) {dojo.hostenv.println = function() {if (!djConfig.isDebug)	{	 return;	}
+dojo.provide("dojo.debug.console");dojo.require("dojo.lang.*");dojo.require("dojo.logging.ConsoleLogger");if (window.console) {if (console.info != null) {dojo.hostenv.println = function() {if (!djConfig.isDebug){ return;}
 console.info.apply(console, arguments);}
 dojo.debug=dojo.hostenv.println;dojo.debugDeep = dojo.debug;dojo.debugShallow = function( obj, showMethods, sort) {if (!djConfig.isDebug) { return; }
 showMethods = (showMethods != false);sort = (sort != false);if (obj == null || obj.constructor == null) {return dojo.debug(obj);}
-var type = obj.declaredClass;if (type == null) {type = obj.constructor.toString().match(/function\s*(.*)\(/);if (type) {	type = type[1]	};}
+var type = obj.declaredClass;if (type == null) {type = obj.constructor.toString().match(/function\s*(.*)\(/);if (type) {type = type[1]};}
 if (type) {if (type == "String" || type == "Number") {return dojo.debug(type+": ", obj);}
-if (showMethods && !sort) {var sortedObj = obj;} else {var propNames = [];if (showMethods) {for (var prop in obj) {propNames.push(prop);}} else {for (var prop in obj) {if (typeof obj[prop] != "function") { propNames.push(prop);	}
+if (showMethods && !sort) {var sortedObj = obj;} else {var propNames = [];if (showMethods) {for (var prop in obj) {propNames.push(prop);}} else {for (var prop in obj) {if (typeof obj[prop] != "function") { propNames.push(prop);}
 else dojo.debug(prop);}}
 if (sort) propNames.sort();var sortedObj = {};dojo.lang.forEach(propNames, function(prop) {sortedObj[prop] = obj[prop];});}
 return dojo.debug(type+": %o\n%2.o",obj,sortedObj);}

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/DragAndDrop.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/DragAndDrop.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/DragAndDrop.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/DragAndDrop.js Thu Dec 14 07:45:13 2006
@@ -1,5 +1,7 @@
 
-dojo.require("dojo.lang.common");dojo.require("dojo.lang.func");dojo.require("dojo.lang.declare");dojo.provide("dojo.dnd.DragAndDrop");dojo.declare("dojo.dnd.DragSource", null, {type: "",onDragEnd: function(evt){},onDragStart: function(evt){},onSelected: function(evt){},unregister: function(){dojo.dnd.dragManager.unregisterDragSource(this);},reregister: function(){dojo.dnd.dragManager.registerDragSource(this);}});dojo.declare("dojo.dnd.DragObject", null, {type: "",register: function(){var dm = dojo.dnd.dragManager;if(dm["registerDragObject"]){dm.registerDragObject(this);}},onDragStart: function(evt){},onDragMove: function(evt){},onDragOver: function(evt){},onDragOut: function(evt){},onDragEnd: function(evt){},onDragLeave: dojo.lang.forward("onDragOut"),onDragEnter: dojo.lang.forward("onDragOver"),ondragout: dojo.lang.forward("onDragOut"),ondragover: dojo.lang.forward("onDragOver")});dojo.declare("dojo.dnd.DropTarget", null,function(){this.acceptedTypes = [];},{acceptsType: f
 unction(type){if(!dojo.lang.inArray(this.acceptedTypes, "*")){if(!dojo.lang.inArray(this.acceptedTypes, type)) { return false; }}
-return true;},accepts: function(dragObjects){if(!dojo.lang.inArray(this.acceptedTypes, "*")){for (var i = 0; i < dragObjects.length; i++) {if (!dojo.lang.inArray(this.acceptedTypes,dragObjects[i].type)) { return false; }}}
+dojo.require("dojo.lang.common");dojo.require("dojo.lang.func");dojo.require("dojo.lang.declare");dojo.provide("dojo.dnd.DragAndDrop");dojo.declare("dojo.dnd.DragSource", null, {type: "",onDragEnd: function(evt){},onDragStart: function(evt){},onSelected: function(evt){},unregister: function(){dojo.dnd.dragManager.unregisterDragSource(this);},reregister: function(){dojo.dnd.dragManager.registerDragSource(this);}});dojo.declare("dojo.dnd.DragObject", null, {type: "",register: function(){var dm = dojo.dnd.dragManager;if(dm["registerDragObject"]){dm.registerDragObject(this);}},onDragStart: function(evt){},onDragMove: function(evt){},onDragOver: function(evt){},onDragOut: function(evt){},onDragEnd: function(evt){},onDragLeave: dojo.lang.forward("onDragOut"),onDragEnter: dojo.lang.forward("onDragOver"),ondragout: dojo.lang.forward("onDragOut"),ondragover: dojo.lang.forward("onDragOver")
+});dojo.declare("dojo.dnd.DropTarget", null,function(){this.acceptedTypes = [];},{acceptsType: function(type){if(!dojo.lang.inArray(this.acceptedTypes, "*")){if(!dojo.lang.inArray(this.acceptedTypes, type)) { return false; }}
+return true;},accepts: function(dragObjects){if(!dojo.lang.inArray(this.acceptedTypes, "*")){for (var i = 0; i < dragObjects.length; i++) {if (!dojo.lang.inArray(this.acceptedTypes,dragObjects[i].type)) { return false; }}
+}
 return true;},unregister: function(){dojo.dnd.dragManager.unregisterDropTarget(this);},onDragOver: function(evt){},onDragOut: function(evt){},onDragMove: function(evt){},onDropStart: function(evt){},onDrop: function(evt){},onDropEnd: function(){}});dojo.dnd.DragEvent = function(){this.dragSource = null;this.dragObject = null;this.target = null;this.eventStatus = "success";}
 dojo.declare("dojo.dnd.DragManager", null, {selectedSources: [],dragObjects: [],dragSources: [],registerDragSource: function( source){},dropTargets: [],registerDropTarget: function( target){},lastDragTarget: null,currentDragTarget: null,onKeyDown: function(){},onMouseOut: function(){},onMouseMove: function(){},onMouseUp: function(){}});

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragAndDrop.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragAndDrop.js?view=diff&rev=487242&r1=487241&r2=487242
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragAndDrop.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/dojo/src/dnd/HtmlDragAndDrop.js Thu Dec 14 07:45:13 2006
@@ -1,7 +1,8 @@
 
 dojo.provide("dojo.dnd.HtmlDragAndDrop");dojo.require("dojo.dnd.HtmlDragManager");dojo.require("dojo.dnd.DragAndDrop");dojo.require("dojo.html.*");dojo.require("dojo.html.display");dojo.require("dojo.html.util");dojo.require("dojo.html.selection");dojo.require("dojo.html.iframe");dojo.require("dojo.lang.extras");dojo.require("dojo.lfx.*");dojo.require("dojo.event.*");dojo.declare("dojo.dnd.HtmlDragSource", dojo.dnd.DragSource,function(node, type){node = dojo.byId(node);this.dragObjects = [];this.constrainToContainer = false;if(node){this.domNode = node;this.dragObject = node;this.type = (type)||(this.domNode.nodeName.toLowerCase());dojo.dnd.DragSource.prototype.reregister.call(this);}},{dragClass: "",onDragStart: function(){var dragObj = new dojo.dnd.HtmlDragObject(this.dragObject, this.type);if(this.dragClass){dragObj.dragClass = this.dragClass;}
 if(this.constrainToContainer){dragObj.constrainTo(this.constrainingContainer || this.domNode.parentNode);}
-return dragObj;},setDragHandle: function(node){node = dojo.byId(node);dojo.dnd.dragManager.unregisterDragSource(this);this.domNode = node;dojo.dnd.dragManager.registerDragSource(this);},setDragTarget: function(node){this.dragObject = node;},constrainTo: function(container){this.constrainToContainer = true;if(container){this.constrainingContainer = container;}},onSelected: function(){for(var i=0; i<this.dragObjects.length; i++){dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragSource(this.dragObjects[i]));}},addDragObjects: function( el){for(var i=0; i<arguments.length; i++){this.dragObjects.push(dojo.byId(arguments[i]));}}}
+return dragObj;},setDragHandle: function(node){node = dojo.byId(node);dojo.dnd.dragManager.unregisterDragSource(this);this.domNode = node;dojo.dnd.dragManager.registerDragSource(this);},setDragTarget: function(node){this.dragObject = node;},constrainTo: function(container){this.constrainToContainer = true;if(container){this.constrainingContainer = container;}},onSelected: function(){for(var i=0; i<this.dragObjects.length; i++){dojo.dnd.dragManager.selectedSources.push(new dojo.dnd.HtmlDragSource(this.dragObjects[i]));}},addDragObjects: function( el){for(var i=0; i<arguments.length; i++){this.dragObjects.push(dojo.byId(arguments[i]));}}
+}
 );dojo.declare("dojo.dnd.HtmlDragObject",dojo.dnd.DragObject,function(node, type){this.domNode = dojo.byId(node);this.type = type;this.constrainToContainer = false;this.dragSource = null;dojo.dnd.DragObject.prototype.register.call(this);},{dragClass: "",opacity: 0.5,createIframe: true,disableX: false,disableY: false,createDragNode: function() {var node = this.domNode.cloneNode(true);if(this.dragClass) { dojo.html.addClass(node, this.dragClass); }
 if(this.opacity < 1) { dojo.html.setOpacity(node, this.opacity); }
 var ltn = node.tagName.toLowerCase();var isTr = (ltn == "tr");if((isTr)||(ltn == "tbody")){var doc = this.domNode.ownerDocument;var table = doc.createElement("table");if(isTr){var tbody = doc.createElement("tbody");table.appendChild(tbody);tbody.appendChild(node);}else{table.appendChild(node);}
@@ -19,7 +20,8 @@
 this.containingBlockPosition.y +
 dojo.html.getPixelValue(this.constrainingContainer, "padding-top", true) +
 dojo.html.getBorderExtent(this.constrainingContainer, "top");}
-var mb = dojo.html.getMarginBox(this.domNode);return {minX: x,minY: y,maxX: x + width - mb.width,maxY: y + height - mb.height}},updateDragOffset: function(){var scroll = dojo.html.getScroll().offset;if(scroll.y != this.scrollOffset.y){var diff = scroll.y - this.scrollOffset.y;this.dragOffset.y += diff;this.scrollOffset.y = scroll.y;}
+var mb = dojo.html.getMarginBox(this.domNode);return {minX: x,minY: y,maxX: x + width - mb.width,maxY: y + height - mb.height
+}},updateDragOffset: function(){var scroll = dojo.html.getScroll().offset;if(scroll.y != this.scrollOffset.y){var diff = scroll.y - this.scrollOffset.y;this.dragOffset.y += diff;this.scrollOffset.y = scroll.y;}
 if(scroll.x != this.scrollOffset.x){var diff = scroll.x - this.scrollOffset.x;this.dragOffset.x += diff;this.scrollOffset.x = scroll.x;}},onDragMove: function(e){this.updateDragOffset();var x = this.dragOffset.x + e.pageX;var y = this.dragOffset.y + e.pageY;if (this.constrainToContainer) {if (x < this.constraints.minX) { x = this.constraints.minX; }
 if (y < this.constraints.minY) { y = this.constraints.minY; }
 if (x > this.constraints.maxX) { x = this.constraints.maxX; }
@@ -28,22 +30,27 @@
 if(!this.disableX) { this.dragClone.style.left = x + "px"; }},onDragEnd: function(e){switch(e.dragStatus){case "dropSuccess":
 dojo.html.removeNode(this.dragClone);this.dragClone = null;break;case "dropFailure":
 var startCoords = dojo.html.getAbsolutePosition(this.dragClone, true);var endCoords = { left: this.dragStartPosition.x + 1,top: this.dragStartPosition.y + 1};var anim = dojo.lfx.slideTo(this.dragClone, endCoords, 300);var dragObject = this;dojo.event.connect(anim, "onEnd", function(e){dojo.html.removeNode(dragObject.dragClone);dragObject.dragClone = null;});anim.play();break;}
-dojo.event.topic.publish('dragEnd', { source: this } );},constrainTo: function(container){this.constrainToContainer=true;if(container){this.constrainingContainer = container;}else{this.constrainingContainer = this.domNode.parentNode;}}}
+dojo.event.topic.publish('dragEnd', { source: this } );},constrainTo: function(container){this.constrainToContainer=true;if(container){this.constrainingContainer = container;}else{this.constrainingContainer = this.domNode.parentNode;}}
+}
 );dojo.declare("dojo.dnd.HtmlDropTarget",dojo.dnd.DropTarget,function(node, types){if(arguments.length == 0){ return; }
 this.domNode = dojo.byId(node);dojo.dnd.DropTarget.call(this);if(types && dojo.lang.isString(types)) {types = [types];}
 this.acceptedTypes = types || [];dojo.dnd.dragManager.registerDropTarget(this);},{vertical: false,onDragOver: function(e){if(!this.accepts(e.dragObjects)){ return false; }
 this.childBoxes = [];for(var i = 0, child; i < this.domNode.childNodes.length; i++){child = this.domNode.childNodes[i];if(child.nodeType != dojo.html.ELEMENT_NODE){ continue; }
 var pos = dojo.html.getAbsolutePosition(child, true);var inner = dojo.html.getBorderBox(child);this.childBoxes.push({top: pos.y, bottom: pos.y+inner.height,left: pos.x, right: pos.x+inner.width, height: inner.height,width: inner.width, node: child});}
 return true;},_getNodeUnderMouse: function(e){for(var i = 0, child; i < this.childBoxes.length; i++){with(this.childBoxes[i]){if (e.pageX >= left && e.pageX <= right &&
-e.pageY >= top && e.pageY <= bottom){ return i; }}}
-return -1;},createDropIndicator: function(){this.dropIndicator = document.createElement("div");with(this.dropIndicator.style){position = "absolute";zIndex = 999;if(this.vertical){borderLeftWidth = "1px";borderLeftColor = "black";borderLeftStyle = "solid";height = dojo.html.getBorderBox(this.domNode).height + "px";top = dojo.html.getAbsolutePosition(this.domNode, true).y + "px";}else{borderTopWidth = "1px";borderTopColor = "black";borderTopStyle = "solid";width = dojo.html.getBorderBox(this.domNode).width + "px";left = dojo.html.getAbsolutePosition(this.domNode, true).x + "px";}}},onDragMove: function(e, dragObjects){var i = this._getNodeUnderMouse(e);if(!this.dropIndicator){this.createDropIndicator();}
+e.pageY >= top && e.pageY <= bottom){ return i; }}
+}
+return -1;},createDropIndicator: function(){this.dropIndicator = document.createElement("div");with(this.dropIndicator.style){position = "absolute";zIndex = 999;if(this.vertical){borderLeftWidth = "1px";borderLeftColor = "black";borderLeftStyle = "solid";height = dojo.html.getBorderBox(this.domNode).height + "px";top = dojo.html.getAbsolutePosition(this.domNode, true).y + "px";}else{borderTopWidth = "1px";borderTopColor = "black";borderTopStyle = "solid";width = dojo.html.getBorderBox(this.domNode).width + "px";left = dojo.html.getAbsolutePosition(this.domNode, true).x + "px";}}
+},onDragMove: function(e, dragObjects){var i = this._getNodeUnderMouse(e);if(!this.dropIndicator){this.createDropIndicator();}
 var gravity = this.vertical ? dojo.html.gravity.WEST : dojo.html.gravity.NORTH;var hide = false;if(i < 0){if(this.childBoxes.length){var before = (dojo.html.gravity(this.childBoxes[0].node, e) & gravity);if(before){ hide = true; }}else{var before = true;}}else{var child = this.childBoxes[i];var before = (dojo.html.gravity(child.node, e) & gravity);if(child.node === dragObjects[0].dragSource.domNode){hide = true;}else{var currentPosChild = before ?
 (i>0?this.childBoxes[i-1]:child) :
-(i<this.childBoxes.length-1?this.childBoxes[i+1]:child);if(currentPosChild.node === dragObjects[0].dragSource.domNode){hide = true;}}}
+(i<this.childBoxes.length-1?this.childBoxes[i+1]:child);if(currentPosChild.node === dragObjects[0].dragSource.domNode){hide = true;}}
+}
 if(hide){this.dropIndicator.style.display="none";return;}else{this.dropIndicator.style.display="";}
 this.placeIndicator(e, dragObjects, i, before);if(!dojo.html.hasParent(this.dropIndicator)) {dojo.body().appendChild(this.dropIndicator);}},placeIndicator: function(e, dragObjects, boxIndex, before) {var targetProperty = this.vertical ? "left" : "top";var child;if(boxIndex < 0){if(this.childBoxes.length){child = before ? this.childBoxes[0]
 : this.childBoxes[this.childBoxes.length - 1];}else{this.dropIndicator.style[targetProperty] = dojo.html.getAbsolutePosition(this.domNode, true)[this.vertical?"x":"y"] + "px";}}else{child = this.childBoxes[boxIndex];}
-if(child){this.dropIndicator.style[targetProperty] = (before ? child[targetProperty] : child[this.vertical?"right":"bottom"]) + "px";if(this.vertical){this.dropIndicator.style.height = child.height + "px";this.dropIndicator.style.top = child.top + "px";}else{this.dropIndicator.style.width = child.width + "px";this.dropIndicator.style.left = child.left + "px";}}},onDragOut: function(e) {if(this.dropIndicator) {dojo.html.removeNode(this.dropIndicator);delete this.dropIndicator;}},onDrop: function(e){this.onDragOut(e);var i = this._getNodeUnderMouse(e);var gravity = this.vertical ? dojo.html.gravity.WEST : dojo.html.gravity.NORTH;if(i < 0){if(this.childBoxes.length){if(dojo.html.gravity(this.childBoxes[0].node, e) & gravity){return this.insert(e, this.childBoxes[0].node, "before");}else{return this.insert(e, this.childBoxes[this.childBoxes.length-1].node, "after");}}
+if(child){this.dropIndicator.style[targetProperty] = (before ? child[targetProperty] : child[this.vertical?"right":"bottom"]) + "px";if(this.vertical){this.dropIndicator.style.height = child.height + "px";this.dropIndicator.style.top = child.top + "px";}else{this.dropIndicator.style.width = child.width + "px";this.dropIndicator.style.left = child.left + "px";}}
+},onDragOut: function(e) {if(this.dropIndicator) {dojo.html.removeNode(this.dropIndicator);delete this.dropIndicator;}},onDrop: function(e){this.onDragOut(e);var i = this._getNodeUnderMouse(e);var gravity = this.vertical ? dojo.html.gravity.WEST : dojo.html.gravity.NORTH;if(i < 0){if(this.childBoxes.length){if(dojo.html.gravity(this.childBoxes[0].node, e) & gravity){return this.insert(e, this.childBoxes[0].node, "before");}else{return this.insert(e, this.childBoxes[this.childBoxes.length-1].node, "after");}}
 return this.insert(e, this.domNode, "append");}
 var child = this.childBoxes[i];if(dojo.html.gravity(child.node, e) & gravity){return this.insert(e, child.node, "before");}else{return this.insert(e, child.node, "after");}},insert: function(e, refNode, position){var node = e.dragObject.domNode;if(position == "before"){return dojo.html.insertBefore(node, refNode);}else if(position == "after"){return dojo.html.insertAfter(node, refNode);}else if(position == "append"){refNode.appendChild(node);return true;}
 return false;}}