svn commit: r983123 - in /shindig/trunk/features/src/main/javascript/features: shindig.uri.ext/ shindig.uri.ext/feature.xml shindig.uri.ext/util.js shindig.uri/util.js

[jo...@apache.org]

Author: johnh
Date: Fri Aug  6 20:32:08 2010
New Revision: 983123

URL: http://svn.apache.org/viewvc?rev=983123&view=rev
Log:
Create feature shindig.uri.ext, an extended version of shindig.uri.


Added:
    shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/
    shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml
      - copied, changed from r981723, shindig/trunk/features/src/main/javascript/features/shindig.uri/feature.xml
    shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/util.js
      - copied, changed from r981723, shindig/trunk/features/src/main/javascript/features/shindig.uri/util.js
Removed:
    shindig/trunk/features/src/main/javascript/features/shindig.uri/util.js

Copied: shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml (from r981723, shindig/trunk/features/src/main/javascript/features/shindig.uri/feature.xml)
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml?p2=shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml&p1=shindig/trunk/features/src/main/javascript/features/shindig.uri/feature.xml&r1=981723&r2=983123&rev=983123&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/shindig.uri/feature.xml (original)
+++ shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml Fri Aug  6 20:32:08 2010
@@ -18,14 +18,15 @@ specific language governing permissions 
 -->
 <feature>
   <!--
-  A Pure-JS Uri implementation.
+  Augmented version of shindig.uri with various non-core, but useful, helper methods.
   -->
-  <name>shindig.uri</name>
+  <name>shindig.uri.ext</name>
   <dependency>globals</dependency>
+  <dependency>shindig.uri</dependency>
   <gadget>
-    <script src="uri.js"/>
+    <script src="util.js"/>
   </gadget>
   <container>
-    <script src="uri.js"/>
+    <script src="util.js"/>
   </container>
 </feature>

Copied: shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/util.js (from r981723, shindig/trunk/features/src/main/javascript/features/shindig.uri/util.js)
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/util.js?p2=shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/util.js&p1=shindig/trunk/features/src/main/javascript/features/shindig.uri/util.js&r1=981723&r2=983123&rev=983123&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/shindig.uri/util.js (original)
+++ shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/util.js Fri Aug  6 20:32:08 2010
@@ -35,8 +35,7 @@ shindig.uri = (function() {
    * @return {boolean} Whether the Uris have the same origin.
    */
   function hasSameOrigin(self, other) {
-    return self.getSchema() == other.getSchema() &&
-           self.getAuthority() == self.getAuthority();
+    return self.getOrigin() == other.getOrigin();
   }
 
   /**
@@ -45,7 +44,7 @@ shindig.uri = (function() {
    * @param {Uri} self The base Uri.
    * @param {Uri} base The Uri to resolve.
    */
-  function fullyQualify(self, base) {
+  function resolve(self, base) {
     if (self.getSchema() == '') {
       self.setSchema(base.getSchema());
     }
@@ -68,8 +67,8 @@ shindig.uri = (function() {
     self.hasSameOrigin = function(other) {
       return hasSameOrigin(self, other);
     };
-    self.fullyQualify = function(other) {
-      return fullyQualify(self, other);
+    self.resolve = function(other) {
+      return resolve(self, other);
     };
     return self;
   };