[Phoenix-commits] rev 16968 - public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content

[andi at wyona.com]

Author: andi
Date: 2006-08-23 15:43:45 +0200 (Wed, 23 Aug 2006)
New Revision: 16968

Modified:
   public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atom.js
   public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atomsidebar.xml
Log:
Fixed bug with relative APP URIs.


Modified: public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atom.js
===================================================================
--- public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atom.js	2006-08-23 13:29:58 UTC (rev 16967)
+++ public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atom.js	2006-08-23 13:43:45 UTC (rev 16968)
@@ -210,7 +210,7 @@
     /* DEBUG */ dump("Ulysses:atom.js:APPIntrospection(\"" + aBaseURI + "\", \"" + aLang + "\") invoked\n");
 
     // call super constructor
-    this.__proto__.__proto__.constructor.call(this, aBaseURI, aLang);
+    APPCommon.call(this, aBaseURI, aLang);
 
     this.workspaces = new Array();
 }
@@ -330,7 +330,7 @@
     /* DEBUG */ dump("Ulysses:atom.js:APPWorkspace(\"" + aBaseURI + "\", \"" + aLang + "\") invoked\n");
 
     // call super constructor
-    this.__proto__.__proto__.constructor.call(this, aBaseURI, aLang);
+    APPCommon.call(this, aBaseURI, aLang);
 
     this.collections = new Array();
 }
@@ -382,7 +382,7 @@
     /* DEBUG */ dump("Ulysses:atom.js:APPCollection(\"" + aBaseURI + "\", \"" + aLang + "\") invoked\n");
 
     // call super constructor
-    this.__proto__.__proto__.constructor.call(this, aBaseURI, aLang);
+    APPCommon.call(this, aBaseURI, aLang);
 }
 
 APPCollection.prototype = {
@@ -398,6 +398,7 @@
     },
 
     set uri(aURI) {
+        /* DEBUG */ dump("Ulysses:atom.js:APPCollection.uri[setter]: aURI = \"" + aURI + "\", this.base = \"" + this.base.spec + "\"\n");
         if (aURI) {
             this.__uri = (Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService)).newURI(aURI, null, this.base);
         }
@@ -478,7 +479,7 @@
     /* DEBUG */ dump("Ulysses:atom.js:APPAccept(\"" + aBaseURI + "\", \"" + aLang + "\") invoked\n");
 
     // call super constructor
-    this.__proto__.__proto__.constructor.call(this, aBaseURI, aLang);
+    APPCommon.call(this, aBaseURI, aLang);
 }
 
 APPAccept.prototype = {

Modified: public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atomsidebar.xml
===================================================================
--- public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atomsidebar.xml	2006-08-23 13:29:58 UTC (rev 16967)
+++ public/ulysses/src/trunk/ulysses/prototypes/prototype1/src/chrome/content/atomsidebar.xml	2006-08-23 13:43:45 UTC (rev 16968)
@@ -105,7 +105,7 @@
                    for (var i in atomTreeView) {
                        dump(i + ": " + atomTreeView[i] + "\n");
                    }
-            
+
                    document.getElementById("uiUlyssesAtomSidebarFeedEntriesTree").view = atomTreeView;
                }
             } else {