From 156b1ab0659a283146d98f6c4f85d4f887b566a5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20Kr=E6mmer=20Nielsen?= <jkkn@jkkn.dk>
Date: Mon, 7 Jan 2008 20:58:26 +0100
Subject: [PATCH] fixed flush cache feature, better support for
 default-cvs-site, auto add / after known directories

---
 content/quickbox.js     | 10 +++++++++-
 content/tv2developer.js |  4 ++--
 version                 |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/content/quickbox.js b/content/quickbox.js
index e55fad4..1ecdba7 100644
--- a/content/quickbox.js
+++ b/content/quickbox.js
@@ -380,6 +380,9 @@ var TV2DeveloperQuickBox = {
                     if (entered_root[1]=='/') {
                         // you can exclude 'webroot' by written two slashes: '//'
                         uriOnly = uriOnly.substr(1);
+                    } else if (entered_root[4]!='/') {
+                        // be clever and add the missing slash
+                        uriOnly += '/';
                     }
                 }
                 var cvs_view = (!cvs_viewsource ? 'log' : 'markup')
@@ -477,7 +480,12 @@ var TV2DeveloperQuickBox = {
                 }
                 url = tv2_sitename;
                 if (tv2_sitetype) {
-                    url += (tv2_sitetype == 'webroot' ? '' : '.'+tv2_sitetype);
+                    if (this._reg_cvs_nopostfix.exec(tv2_sitename)) {
+                        // always include sitetype
+                        url += '/'+tv2_sitetype;
+                    } else {
+                        url += (tv2_sitetype == 'webroot' ? '' : '.'+tv2_sitetype);
+                    }
                 } else if (this._reg_cvs_rootfolders.exec(tv2_rootfolder)) {
                     url += tv2_rootfolder;
                 } else {
diff --git a/content/tv2developer.js b/content/tv2developer.js
index 66e746c..67b7849 100755
--- a/content/tv2developer.js
+++ b/content/tv2developer.js
@@ -435,7 +435,7 @@ var TV2Developer = {
         links.push(new this.TV2LinkWithLabel('w3c', TV2Util.getStr('w3c'),
             'http://validator.w3.org/check?uri=' + encodedURL, TV2Util.getStr('w3c.accesskey')));
         links.push(new this.TV2LinkWithLabel('flushcache', TV2Util.getStr('flushCache'),
-           '', TV2Util.getStr('flushCache.accesskey'), 'flushCache'));
+           '-', TV2Util.getStr('flushCache.accesskey'), 'flushCache'));
 
         return links;
         
@@ -541,7 +541,7 @@ var TV2Developer = {
                 }
             }
             /* follow link */
-            if (url != '') {
+            if (url != '-') {
                 openUILink(url, event, false, true, false); /* allow ctrl, not alt, and don't google */
             }
             if (tv2linktype) {
diff --git a/version b/version
index 965065d..a602fc9 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.9.3
+0.9.4
-- 
2.52.0