[Yulup-commits] rev 24011 - public/yulup/src/trunk/yulup/src/chrome/content

[andi at wyona.com]

Author: andi
Date: 2007-04-26 00:01:00 +0200 (Thu, 26 Apr 2007)
New Revision: 24011

Modified:
   public/yulup/src/trunk/yulup/src/chrome/content/neutron.js
   public/yulup/src/trunk/yulup/src/chrome/content/yulup.js
Log:
Moved checking into Neutron class.


Modified: public/yulup/src/trunk/yulup/src/chrome/content/neutron.js
===================================================================
--- public/yulup/src/trunk/yulup/src/chrome/content/neutron.js	2007-04-25 22:00:06 UTC (rev 24010)
+++ public/yulup/src/trunk/yulup/src/chrome/content/neutron.js	2007-04-25 22:01:00 UTC (rev 24011)
@@ -266,6 +266,19 @@
         return this.compatibilityLevel;
     },
 
+    hasSitetreeURI: function () {
+        if (this.queryNavigation()          &&
+            this.queryNavigation().sitetree &&
+            this.queryNavigation().sitetree.uri)
+            return true;
+
+        return false;
+    },
+
+    getSitetreeURI: function () {
+        return this.queryNavigation().sitetree.uri;
+    },
+
     /**
      * Get an array of fragments which can be loaded
      * using the Neutron "open" operation.

Modified: public/yulup/src/trunk/yulup/src/chrome/content/yulup.js
===================================================================
--- public/yulup/src/trunk/yulup/src/chrome/content/yulup.js	2007-04-25 22:00:06 UTC (rev 24010)
+++ public/yulup/src/trunk/yulup/src/chrome/content/yulup.js	2007-04-25 22:01:00 UTC (rev 24011)
@@ -476,11 +476,8 @@
         var ioService       = null;
 
         // check for sitetree URI
-        if (this.currentNeutronIntrospection                            &&
-            this.currentNeutronIntrospection.queryNavigation()          &&
-            this.currentNeutronIntrospection.queryNavigation().sitetree &&
-            this.currentNeutronIntrospection.queryNavigation().sitetree.uri) {
-            sitetreeURI = this.currentNeutronIntrospection.queryNavigation().sitetree.uri;
+        if (this.currentNeutronIntrospection.hasSitetreeURI()) {
+            sitetreeURI = this.currentNeutronIntrospection.getSitetreeURI();
         } else {
             // query for server address
             serverURIString = ServerURIPrompt.showServerURIDialog();