summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Lenz <cmlenz@apache.org>2008-06-06 13:18:56 +0000
committerChristopher Lenz <cmlenz@apache.org>2008-06-06 13:18:56 +0000
commitb6c013c89fba0a5ac0e52def10be2869b3a61581 (patch)
treee51e2d41e6f8918427e0e2582d06f1fc651b7df1
parent88c8ac08c164307005a3fff68541fb1f556bdb06 (diff)
Add version tags for CSS and Javascript references in Futon to avoid stale caches.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@663929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat
-rw-r--r--share/www/browse/database.html18
-rw-r--r--share/www/browse/document.html16
-rw-r--r--share/www/browse/index.html14
-rw-r--r--share/www/couch_tests.html8
-rw-r--r--share/www/index.html6
-rw-r--r--share/www/replicator.html8
-rw-r--r--share/www/script/jquery.js43
7 files changed, 59 insertions, 54 deletions
diff --git a/share/www/browse/database.html b/share/www/browse/database.html
index b0351bca..d39bd3f9 100644
--- a/share/www/browse/database.html
+++ b/share/www/browse/database.html
@@ -17,16 +17,16 @@ specific language governing permissions and limitations under the License.
<head>
<title>Browse Database</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <link rel="stylesheet" href="../style/layout.css" type="text/css">
+ <link rel="stylesheet" href="../style/layout.css?0.8.0a" type="text/css">
<script src="../script/json2.js"></script>
- <script src="../script/jquery.js"></script>
- <script src="../script/jquery.cookies.js"></script>
- <script src="../script/jquery.couch.js"></script>
- <script src="../script/jquery.dialog.js"></script>
- <script src="../script/jquery.resizer.js"></script>
- <script src="../script/jquery.suggest.js"></script>
- <script src="../script/browse.js"></script>
- <script src="../script/pprint.js"></script>
+ <script src="../script/jquery.js?1.2.6"></script>
+ <script src="../script/jquery.cookies.js?0.8.0a"></script>
+ <script src="../script/jquery.couch.js?0.8.0a"></script>
+ <script src="../script/jquery.dialog.js?0.8.0a"></script>
+ <script src="../script/jquery.resizer.js?0.8.0a"></script>
+ <script src="../script/jquery.suggest.js?0.8.0a"></script>
+ <script src="../script/browse.js?0.8.0a"></script>
+ <script src="../script/pprint.js?0.8.0a"></script>
<script>
var page = new CouchDatabasePage();
if (window != parent) {
diff --git a/share/www/browse/document.html b/share/www/browse/document.html
index db3de935..b107775b 100644
--- a/share/www/browse/document.html
+++ b/share/www/browse/document.html
@@ -17,15 +17,15 @@ specific language governing permissions and limitations under the License.
<head>
<title>View Document</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <link rel="stylesheet" href="../style/layout.css" type="text/css">
+ <link rel="stylesheet" href="../style/layout.css?0.8.0a" type="text/css">
<script src="../script/json2.js"></script>
- <script src="../script/jquery.js"></script>
- <script src="../script/jquery.cookies.js"></script>
- <script src="../script/jquery.couch.js"></script>
- <script src="../script/jquery.dialog.js"></script>
- <script src="../script/jquery.resizer.js"></script>
- <script src="../script/browse.js"></script>
- <script src="../script/pprint.js"></script>
+ <script src="../script/jquery.js?1.2.6"></script>
+ <script src="../script/jquery.cookies.js?0.8.0a"></script>
+ <script src="../script/jquery.couch.js?0.8.0a"></script>
+ <script src="../script/jquery.dialog.js?0.8.0a"></script>
+ <script src="../script/jquery.resizer.js?0.8.0a"></script>
+ <script src="../script/browse.js?0.8.0a"></script>
+ <script src="../script/pprint.js?0.8.0a"></script>
<script>
var page = new CouchDocumentPage();
if (window != parent) {
diff --git a/share/www/browse/index.html b/share/www/browse/index.html
index 1d583825..3d31779d 100644
--- a/share/www/browse/index.html
+++ b/share/www/browse/index.html
@@ -17,14 +17,14 @@ specific language governing permissions and limitations under the License.
<head>
<title>Welcome</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <link rel="stylesheet" href="../style/layout.css" type="text/css">
+ <link rel="stylesheet" href="../style/layout.css?0.8.0a" type="text/css">
<script src="../script/json2.js"></script>
- <script src="../script/jquery.js"></script>
- <script src="../script/jquery.cookies.js"></script>
- <script src="../script/jquery.couch.js"></script>
- <script src="../script/jquery.dialog.js"></script>
- <script src="../script/browse.js"></script>
- <script src="../script/pprint.js"></script>
+ <script src="../script/jquery.js?1.2.6"></script>
+ <script src="../script/jquery.cookies.js?0.8.0a"></script>
+ <script src="../script/jquery.couch.js?0.8.0a"></script>
+ <script src="../script/jquery.dialog.js?0.8.0a"></script>
+ <script src="../script/browse.js?0.8.0a"></script>
+ <script src="../script/pprint.js?0.8.0a"></script>
<script>
var page = new CouchIndexPage();
$(document).ready(function() {
diff --git a/share/www/couch_tests.html b/share/www/couch_tests.html
index 83a47771..66620d8e 100644
--- a/share/www/couch_tests.html
+++ b/share/www/couch_tests.html
@@ -17,11 +17,11 @@ specific language governing permissions and limitations under the License.
<head>
<title>Test Suite</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <link rel="stylesheet" href="style/layout.css" type="text/css">
+ <link rel="stylesheet" href="style/layout.css?0.8.0a" type="text/css">
<script src="script/json2.js"></script>
- <script src="script/jquery.js"></script>
- <script src="script/couch.js"></script>
- <script src="script/pprint.js"></script>
+ <script src="script/jquery.js?1.2.6"></script>
+ <script src="script/couch.js?0.8.0a"></script>
+ <script src="script/pprint.js?0.8.0a"></script>
<script>
$(document).ready(function() {
$("#toolbar button.load").click(function() {
diff --git a/share/www/index.html b/share/www/index.html
index c75dac5b..26de6fe2 100644
--- a/share/www/index.html
+++ b/share/www/index.html
@@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License.
<head>
<title>Apache CouchDB: Futon Utility Client</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <link rel="stylesheet" href="style/layout.css" type="text/css">
+ <link rel="stylesheet" href="style/layout.css?0.8.0a" type="text/css">
<style type="text/css">
html { height: 100%; overflow: hidden; }
body { background: #fff url(image/bg.png) 100% 0 repeat-y;
@@ -27,8 +27,8 @@ specific language governing permissions and limitations under the License.
iframe { background: transparent; border: none; width: 100%; height: 100%; }
</style>
<script src="script/json2.js"></script>
- <script src="script/jquery.js"></script>
- <script src="script/jquery.couch.js"></script>
+ <script src="script/jquery.js?1.2.6"></script>
+ <script src="script/jquery.couch.js?0.8.0a"></script>
<script>
function updateDatabaseList() {
var list = $("#dbs").empty();
diff --git a/share/www/replicator.html b/share/www/replicator.html
index 25ede91d..360e0235 100644
--- a/share/www/replicator.html
+++ b/share/www/replicator.html
@@ -17,11 +17,11 @@ specific language governing permissions and limitations under the License.
<head>
<title>Replicator</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <link rel="stylesheet" href="style/layout.css" type="text/css">
+ <link rel="stylesheet" href="style/layout.css?0.8.0a" type="text/css">
<script src="script/json2.js"></script>
- <script src="script/jquery.js"></script>
- <script src="script/jquery.couch.js"></script>
- <script src="script/pprint.js"></script>
+ <script src="script/jquery.js?1.2.6"></script>
+ <script src="script/jquery.couch.js?0.8.0a"></script>
+ <script src="script/pprint.js?0.8.0a"></script>
<script>
$(document).ready(function() {
if (window !== parent) parent.updateNavigation();
diff --git a/share/www/script/jquery.js b/share/www/script/jquery.js
index f975de2b..88e661ee 100644
--- a/share/www/script/jquery.js
+++ b/share/www/script/jquery.js
@@ -1,13 +1,13 @@
(function(){
/*
- * jQuery 1.2.5 - New Wave Javascript
+ * jQuery 1.2.6 - New Wave Javascript
*
* Copyright (c) 2008 John Resig (jquery.com)
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
*
- * $Date: 2008-05-20 23:14:54 -0400 (Tue, 20 May 2008) $
- * $Rev: 5651 $
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
*/
// Map over jQuery in case of overwrite
@@ -84,7 +84,7 @@ jQuery.fn = jQuery.prototype = {
},
// The current version of jQuery being used
- jquery: "1.2.5",
+ jquery: "1.2.6",
// The number of elements contained in the matched element set
size: function() {
@@ -402,6 +402,9 @@ jQuery.fn = jQuery.prototype = {
return undefined;
}
+ if( value.constructor == Number )
+ value += '';
+
return this.each(function(){
if ( this.nodeType != 1 )
return;
@@ -428,7 +431,7 @@ jQuery.fn = jQuery.prototype = {
html: function( value ) {
return value == undefined ?
- (this.length ?
+ (this[0] ?
this[0].innerHTML :
null) :
this.empty().append( value );
@@ -505,9 +508,9 @@ jQuery.fn = jQuery.prototype = {
this;
// execute all scripts after the elements have been injected
- if ( jQuery.nodeName( elem, "script" ) ) {
+ if ( jQuery.nodeName( elem, "script" ) )
scripts = scripts.add( elem );
- } else {
+ else {
// Remove any inner scripts for later evaluation
if ( elem.nodeType == 1 )
scripts = scripts.add( jQuery( "script", elem ).remove() );
@@ -746,14 +749,14 @@ jQuery.extend({
},
prop: function( elem, value, type, i, name ) {
- // Handle executable functions
- if ( jQuery.isFunction( value ) )
- value = value.call( elem, i );
+ // Handle executable functions
+ if ( jQuery.isFunction( value ) )
+ value = value.call( elem, i );
- // Handle passing in a number to a CSS property
- return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
- value + "px" :
- value;
+ // Handle passing in a number to a CSS property
+ return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
+ value + "px" :
+ value;
},
className: {
@@ -1058,7 +1061,7 @@ jQuery.extend({
elem.parentNode.selectedIndex;
// If applicable, access the attribute via the DOM 0 way
- if ( notxml && !special && name in elem ) {
+ if ( name in elem && notxml && !special ) {
if ( set ){
// We can't allow the type property to be changed (since it causes problems in IE)
if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
@@ -1081,11 +1084,13 @@ jQuery.extend({
// convert the value to a string (all browsers do this but IE) see #1070
elem.setAttribute( name, "" + value );
- if ( msie && special && notxml )
- return elem.getAttribute( name, 2 );
-
- return elem.getAttribute( name );
+ var attr = msie && notxml && special
+ // Some attributes require a special call on IE
+ ? elem.getAttribute( name, 2 )
+ : elem.getAttribute( name );
+ // Non-existent attributes return null, we normalize to undefined
+ return attr === null ? undefined : attr;
}
// elem is actually elem.style ... set the style
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 00:12:12 +0000