From commits-return-1628-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Wed Jan 07 21:38:08 2009
Return-Path: <commits-return-1628-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
Delivered-To: apmail-couchdb-commits-archive@www.apache.org
Received: (qmail 50191 invoked from network); 7 Jan 2009 21:38:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Jan 2009 21:38:08 -0000
Received: (qmail 41738 invoked by uid 500); 7 Jan 2009 21:38:08 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 41712 invoked by uid 500); 7 Jan 2009 21:38:08 -0000
Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@couchdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@couchdb.apache.org>
List-Post: <mailto:commits@couchdb.apache.org>
List-Id: <commits.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list commits@couchdb.apache.org
Received: (qmail 41703 invoked by uid 99); 7 Jan 2009 21:38:08 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2009 13:38:08 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2009 21:38:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 72FD9238895D; Wed,  7 Jan 2009 13:37:39 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r732510 - in /couchdb/trunk: THANKS
 share/www/browse/database.html share/www/browse/document.html
 share/www/index.html share/www/script/jquery.history.js
Date: Wed, 07 Jan 2009 21:37:39 -0000
To: commits@couchdb.apache.org
From: jchris@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090107213739.72FD9238895D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jchris
Date: Wed Jan  7 13:37:38 2009
New Revision: 732510

URL: http://svn.apache.org/viewvc?rev=732510&view=rev
Log:
backing out r732413 - Futon browse history, due to Safari incompatibility

Removed:
    couchdb/trunk/share/www/script/jquery.history.js
Modified:
    couchdb/trunk/THANKS
    couchdb/trunk/share/www/browse/database.html
    couchdb/trunk/share/www/browse/document.html
    couchdb/trunk/share/www/index.html

Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=732510&r1=732509&r2=732510&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Wed Jan  7 13:37:38 2009
@@ -12,7 +12,6 @@
  * Yoan Blanc <yoan.blanc@gmail.com>
  * Paul Carey <paul.p.carey@gmail.com>
  * Benoit Chesneau <bchesneau@gmail.com>
- * Jason Davies <jason@jasondavies.com>
  * Paul Joseph Davis <paul.joseph.davis@gmail.com>
  * Michael Gottesman <gottesmm@reed.edu>
  * Michael Hendricks <michael@ndrix.org>
@@ -24,6 +23,5 @@
  * Sam Ruby <rubys@intertwingly.net>
  * Dirk Schalge <dirk@epd-me.net>
  * Carlos Valiente <superdupont@gmail.com>
- * Luke Venediger <lukev@lukev.net>
 
 For a list of authors see the `AUTHORS` file.

Modified: couchdb/trunk/share/www/browse/database.html
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/browse/database.html?rev=732510&r1=732509&r2=732510&view=diff
==============================================================================
--- couchdb/trunk/share/www/browse/database.html [utf-8] (original)
+++ couchdb/trunk/share/www/browse/database.html [utf-8] Wed Jan  7 13:37:38 2009
@@ -103,9 +103,6 @@
         $("#toolbar button.add").click(page.addDocument);
         $("#toolbar button.compact").click(page.compactDatabase);
         $("#toolbar button.delete").click(page.deleteDatabase);
-
-        // Update title
-        document.title = "Browse Database " + page.db.name;
       });
     </script>
   </head>

Modified: couchdb/trunk/share/www/browse/document.html
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/browse/document.html?rev=732510&r1=732509&r2=732510&view=diff
==============================================================================
--- couchdb/trunk/share/www/browse/document.html [utf-8] (original)
+++ couchdb/trunk/share/www/browse/document.html [utf-8] Wed Jan  7 13:37:38 2009
@@ -64,9 +64,6 @@
         $("#toolbar button.add").click(page.addField);
         $("#toolbar button.load").click(page.uploadAttachment);
         $("#toolbar button.delete").click(page.deleteDocument);
-
-        // Update the title
-        document.title = "View Document " + page.docId; 
       });
     </script>
   </head>

Modified: couchdb/trunk/share/www/index.html
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/index.html?rev=732510&r1=732509&r2=732510&view=diff
==============================================================================
--- couchdb/trunk/share/www/index.html [utf-8] (original)
+++ couchdb/trunk/share/www/index.html [utf-8] Wed Jan  7 13:37:38 2009
@@ -30,8 +30,7 @@
     <script src="script/jquery.js?1.2.6"></script>
     <script src="script/jquery.cookies.js?0.8.0"></script>
     <script src="script/jquery.couch.js?0.8.0"></script>
-    <script src="script/jquery.history.js?0.8.0"></script>
-    <script type="text/javascript">
+    <script>
       function updateRecentDatabasesList() {
         $("#dbs").empty();
         var recentDbs = $.cookies.get("recent", "").split(",");
@@ -42,17 +41,6 @@
             "</a></li>");
         });
       }
-      var baseURL = location.pathname.match(/.*\//).toString();
-      function updateIFrame(hash) {
-        var l = frames['content'].location;
-        var title = frames['content'].document.title + " - Apache CouchDB: Futon Utility Client";        
-        document.title = title;	
-        var href = baseURL + hash;
-        // For some reason the onload event fires twice; the 2nd time with URL-decoded l.href
-        if (hash != '' && decodeURIComponent(l.pathname + l.search) != decodeURIComponent(href)) {
-          l.href = href;
-        }
-      }
       function updateNavigation(path, queryString) {
         function fixupPath(path) { // hack for IE/Win
           return (path.charAt(0) != "/") ? ("/" + path) : path;
@@ -81,11 +69,6 @@
         });
       }
       $(function() {
-        $.historyInit(updateIFrame);
-        $('#content').load(function() {
-          var l = frames["content"].location;
-          $.historyLoad(l.pathname.substring(baseURL.length) + l.search);
-        });
         $.couch.info({
           success: function(info, status) {
             $("#version").text(info.version);
@@ -112,7 +95,7 @@
     </ul>
     <div id="footer">Futon on Apache CouchDB <span id="version">?</span></div>
     <div id="view">
-      <iframe name="content" src="browse/index.html" allowtransparency="true" id="content">
+      <iframe name="content" src="browse/index.html" allowtransparency="true">
     </div>
   </body>
 </html>