svn commit: r633420 - in /incubator/shindig/trunk/features: core/json.js rpc/rpc.js

[et...@apache.org]

Author: etnu
Date: Tue Mar  4 02:45:27 2008
New Revision: 633420

URL: http://svn.apache.org/viewvc?rev=633420&view=rev
Log:
Updated rpc.js to allow empty / missing parent parameters.
Updated license in json.js to reflect the migration to the public domain implementation.

Modified:
    incubator/shindig/trunk/features/core/json.js
    incubator/shindig/trunk/features/rpc/rpc.js

Modified: incubator/shindig/trunk/features/core/json.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/core/json.js?rev=633420&r1=633419&r2=633420&view=diff
==============================================================================
--- incubator/shindig/trunk/features/core/json.js (original)
+++ incubator/shindig/trunk/features/core/json.js Tue Mar  4 02:45:27 2008
@@ -1,23 +1,21 @@
 /*
-Copyright (c) 2005 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
 
 /**
  * @fileoverview

Modified: incubator/shindig/trunk/features/rpc/rpc.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/rpc/rpc.js?rev=633420&r1=633419&r2=633420&view=diff
==============================================================================
--- incubator/shindig/trunk/features/rpc/rpc.js (original)
+++ incubator/shindig/trunk/features/rpc/rpc.js Tue Mar  4 02:45:27 2008
@@ -162,13 +162,15 @@
         // case. Because of this, parent may only be passed in the query, not
         // the fragment.
         var params = document.location.search.substring(0).split("&");
+        var parentParam = "";
         for (var i = 0, param; param = params[i]; ++i) {
           // Only the first parent can be validated.
           if (param.indexOf("parent=") === 0) {
-            relayUrl['..'] = param.substring(7) + config.rpc.parentRelayUrl;
+            parentParam = param.substring(7);
             break;
           }
         }
+        relayUrl['..'] = parentParam + config.rpc.parentRelayUrl;
       }
       useLegacyProtocol['..'] = !!config.rpc.useLegacyProtocol;
     }