From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- lib/dojo/OpenAjax.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lib/dojo/OpenAjax.js') diff --git a/lib/dojo/OpenAjax.js b/lib/dojo/OpenAjax.js index c777f3ea8..f99af1a13 100644 --- a/lib/dojo/OpenAjax.js +++ b/lib/dojo/OpenAjax.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ @@ -9,18 +9,18 @@ * OpenAjax.js * * Reference implementation of the OpenAjax Hub, as specified by OpenAjax Alliance. - * Specification is under development at: + * Specification is under development at: * * http://www.openajax.org/member/wiki/OpenAjax_Hub_Specification * * Copyright 2006-2007 OpenAjax Alliance * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 . Unless - * required by applicable law or agreed to in writing, software distributed - * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 . Unless + * required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. * ******************************************************************************/ @@ -51,7 +51,7 @@ if(!window["OpenAjax"]){ prefix: prefix, namespaceURI: nsURL, version: version, - extraData: extra + extraData: extra }; this.publish(ooh+"registerLibrary", libs[prefix]); } @@ -82,7 +82,7 @@ if(!window["OpenAjax"]){ this._publish(this._subscriptions, path, 0, name, message); this._pubDepth--; if((this._cleanup.length > 0) && (this._pubDepth == 0)){ - for(var i = 0; i < this._cleanup.length; i++){ + for(var i = 0; i < this._cleanup.length; i++){ this.unsubscribe(this._cleanup[i].hdl); } delete(this._cleanup); @@ -100,12 +100,12 @@ if(!window["OpenAjax"]){ var token = path[index]; if(index == path.length){ tree.s.push(sub); - }else{ + }else{ if(typeof tree.c == "undefined"){ tree.c = {}; } if(typeof tree.c[token] == "undefined"){ - tree.c[token] = { c: {}, s: [] }; + tree.c[token] = { c: {}, s: [] }; this._subscribe(tree.c[token], path, index + 1, sub); }else{ this._subscribe( tree.c[token], path, index + 1, sub); @@ -120,7 +120,7 @@ if(!window["OpenAjax"]){ node = tree; }else{ this._publish(tree.c[path[index]], path, index + 1, name, msg); - this._publish(tree.c["*"], path, index + 1, name, msg); + this._publish(tree.c["*"], path, index + 1, name, msg); node = tree.c["**"]; } if(typeof node != "undefined"){ @@ -140,7 +140,7 @@ if(!window["OpenAjax"]){ // get a function object fcb = sc[fcb]; } - if((!fcb) || + if((!fcb) || (fcb.call(sc, name, msg, d))) { cb.call(sc, name, msg, d); } @@ -156,24 +156,24 @@ if(!window["OpenAjax"]){ var childNode = tree.c[path[index]]; this._unsubscribe(childNode, path, index + 1, sid); if(childNode.s.length == 0) { - for(var x in childNode.c) - return; - delete tree.c[path[index]]; + for(var x in childNode.c) + return; + delete tree.c[path[index]]; } return; } else { var callbacks = tree.s; var max = callbacks.length; - for(var i = 0; i < max; i++) + for(var i = 0; i < max; i++) if(sid == callbacks[i].sid) { if(this._pubDepth > 0) { - callbacks[i].cb = null; - this._cleanup.push(callbacks[i]); + callbacks[i].cb = null; + this._cleanup.push(callbacks[i]); } else callbacks.splice(i, 1); - return; + return; } } } -- cgit v1.2.3