| |   |
| 5 | 5 | # ENV['RAILS_ENV'] ||= 'production' |
| 6 | 6 | |
| 7 | 7 | # Specifies gem version of Rails to use when vendor/rails is not present |
| 8 | | RAILS_GEM_VERSION = '1.99.1' unless defined? RAILS_GEM_VERSION |
| 8 | RAILS_GEM_VERSION = '2.0.1' unless defined? RAILS_GEM_VERSION |
| 9 | 9 | |
| 10 | 10 | # Bootstrap the Rails environment, frameworks, and default configuration |
| 11 | 11 | require File.join(File.dirname(__FILE__), 'boot') |
| … | … | |
| 38 | 38 | # no regular words or you'll be exposed to dictionary attacks. |
| 39 | 39 | config.action_controller.session = { |
| 40 | 40 | :session_key => '_rails-skeleton_session', |
| 41 | | :secret => '5743a49340356dd047cbd67b2b9d0412b69ce923f20810e5a039c38293d0a80bafe89728fe2bde1f580dc5a5ac6f287ceaed055617ca7a268e42aa60f492397b' |
| 41 | :secret => 'd621ee17b00e1f40f6e23159735767aa4b06587e6380e8d9b153ef23a281b23d93ff52a8825e0c453d753affcbe6fedb3c71244cadfca9c8a80f1820fc455592' |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | # Use the database for sessions instead of the cookie-based default, |
| toggle raw diff |
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '1.99.1' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.0.1' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
@@ -38,7 +38,7 @@ Rails::Initializer.run do |config|
# no regular words or you'll be exposed to dictionary attacks.
config.action_controller.session = {
:session_key => '_rails-skeleton_session',
- :secret => '5743a49340356dd047cbd67b2b9d0412b69ce923f20810e5a039c38293d0a80bafe89728fe2bde1f580dc5a5ac6f287ceaed055617ca7a268e42aa60f492397b'
+ :secret => 'd621ee17b00e1f40f6e23159735767aa4b06587e6380e8d9b153ef23a281b23d93ff52a8825e0c453d753affcbe6fedb3c71244cadfca9c8a80f1820fc455592'
}
# Use the database for sessions instead of the cookie-based default, |
| |   |
| 1 | | /* Prototype JavaScript framework, version 1.6.0 |
| 1 | /* Prototype JavaScript framework, version 1.6.0.1 |
| 2 | 2 | * (c) 2005-2007 Sam Stephenson |
| 3 | 3 | * |
| 4 | 4 | * Prototype is freely distributable under the terms of an MIT-style license. |
| … | … | |
| 7 | 7 | *--------------------------------------------------------------------------*/ |
| 8 | 8 | |
| 9 | 9 | var Prototype = { |
| 10 | | Version: '1.6.0', |
| 10 | Version: '1.6.0.1', |
| 11 | 11 | |
| 12 | 12 | Browser: { |
| 13 | 13 | IE: !!(window.attachEvent && !window.opera), |
| … | … | |
| 2194 | 2194 | } |
| 2195 | 2195 | |
| 2196 | 2196 | if (Prototype.Browser.Opera) { |
| 2197 | | Element.Methods._getStyle = Element.Methods.getStyle; |
| 2198 | | Element.Methods.getStyle = function(element, style) { |
| 2199 | | switch(style) { |
| 2200 | | case 'left': |
| 2201 | | case 'top': |
| 2202 | | case 'right': |
| 2203 | | case 'bottom': |
| 2204 | | if (Element._getStyle(element, 'position') == 'static') return null; |
| 2205 | | default: return Element._getStyle(element, style); |
| 2197 | Element.Methods.getStyle = Element.Methods.getStyle.wrap( |
| 2198 | function(proceed, element, style) { |
| 2199 | switch (style) { |
| 2200 | case 'left': case 'top': case 'right': case 'bottom': |
| 2201 | if (proceed(element, 'position') === 'static') return null; |
| 2202 | case 'height': case 'width': |
| 2203 | // returns '0px' for hidden elements; we want it to return null |
| 2204 | if (!Element.visible(element)) return null; |
| 2205 | |
| 2206 | // returns the border-box dimensions rather than the content-box |
| 2207 | // dimensions, so we subtract padding and borders from the value |
| 2208 | var dim = parseInt(proceed(element, style), 10); |
| 2209 | |
| 2210 | if (dim !== element['offset' + style.capitalize()]) |
| 2211 | return dim + 'px'; |
| 2212 | |
| 2213 | var properties; |
| 2214 | if (style === 'height') { |
| 2215 | properties = ['border-top-width', 'padding-top', |
| 2216 | 'padding-bottom', 'border-bottom-width']; |
| 2217 | } |
| 2218 | else { |
| 2219 | properties = ['border-left-width', 'padding-left', |
| 2220 | 'padding-right', 'border-right-width']; |
| 2221 | } |
| 2222 | return properties.inject(dim, function(memo, property) { |
| 2223 | var val = proceed(element, property); |
| 2224 | return val === null ? memo : memo - parseInt(val, 10); |
| 2225 | }) + 'px'; |
| 2226 | default: return proceed(element, style); |
| 2227 | } |
| 2206 | 2228 | } |
| 2207 | | }; |
| 2208 | | Element.Methods._readAttribute = Element.Methods.readAttribute; |
| 2209 | | Element.Methods.readAttribute = function(element, attribute) { |
| 2210 | | if (attribute == 'title') return element.title; |
| 2211 | | return Element._readAttribute(element, attribute); |
| 2212 | | }; |
| 2229 | ); |
| 2230 | |
| 2231 | Element.Methods.readAttribute = Element.Methods.readAttribute.wrap( |
| 2232 | function(proceed, element, attribute) { |
| 2233 | if (attribute === 'title') return element.title; |
| 2234 | return proceed(element, attribute); |
| 2235 | } |
| 2236 | ); |
| 2213 | 2237 | } |
| 2214 | 2238 | |
| 2215 | 2239 | else if (Prototype.Browser.IE) { |
| … | … | |
| 2404 | 2404 | }; |
| 2405 | 2405 | |
| 2406 | 2406 | // Safari returns margins on body which is incorrect if the child is absolutely |
| 2407 | | // positioned. For performance reasons, redefine Position.cumulativeOffset for |
| 2407 | // positioned. For performance reasons, redefine Element#cumulativeOffset for |
| 2408 | 2408 | // KHTML/WebKit only. |
| 2409 | 2409 | Element.Methods.cumulativeOffset = function(element) { |
| 2410 | 2410 | var valueT = 0, valueL = 0; |
| … | … | |
| 2693 | 2693 | document.viewport = { |
| 2694 | 2694 | getDimensions: function() { |
| 2695 | 2695 | var dimensions = { }; |
| 2696 | var B = Prototype.Browser; |
| 2696 | 2697 | $w('width height').each(function(d) { |
| 2697 | 2698 | var D = d.capitalize(); |
| 2698 | | dimensions[d] = self['inner' + D] || |
| 2699 | | (document.documentElement['client' + D] || document.body['client' + D]); |
| 2699 | dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] : |
| 2700 | (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D]; |
| 2700 | 2701 | }); |
| 2701 | 2702 | return dimensions; |
| 2702 | 2703 | }, |
| toggle raw diff |
--- a/public/javascripts/prototype.js
+++ b/public/javascripts/prototype.js
@@ -1,4 +1,4 @@
-/* Prototype JavaScript framework, version 1.6.0
+/* Prototype JavaScript framework, version 1.6.0.1
* (c) 2005-2007 Sam Stephenson
*
* Prototype is freely distributable under the terms of an MIT-style license.
@@ -7,7 +7,7 @@
*--------------------------------------------------------------------------*/
var Prototype = {
- Version: '1.6.0',
+ Version: '1.6.0.1',
Browser: {
IE: !!(window.attachEvent && !window.opera),
@@ -2194,22 +2194,46 @@ if (!document.createRange || Prototype.Browser.Opera) {
}
if (Prototype.Browser.Opera) {
- Element.Methods._getStyle = Element.Methods.getStyle;
- Element.Methods.getStyle = function(element, style) {
- switch(style) {
- case 'left':
- case 'top':
- case 'right':
- case 'bottom':
- if (Element._getStyle(element, 'position') == 'static') return null;
- default: return Element._getStyle(element, style);
+ Element.Methods.getStyle = Element.Methods.getStyle.wrap(
+ function(proceed, element, style) {
+ switch (style) {
+ case 'left': case 'top': case 'right': case 'bottom':
+ if (proceed(element, 'position') === 'static') return null;
+ case 'height': case 'width':
+ // returns '0px' for hidden elements; we want it to return null
+ if (!Element.visible(element)) return null;
+
+ // returns the border-box dimensions rather than the content-box
+ // dimensions, so we subtract padding and borders from the value
+ var dim = parseInt(proceed(element, style), 10);
+
+ if (dim !== element['offset' + style.capitalize()])
+ return dim + 'px';
+
+ var properties;
+ if (style === 'height') {
+ properties = ['border-top-width', 'padding-top',
+ 'padding-bottom', 'border-bottom-width'];
+ }
+ else {
+ properties = ['border-left-width', 'padding-left',
+ 'padding-right', 'border-right-width'];
+ }
+ return properties.inject(dim, function(memo, property) {
+ var val = proceed(element, property);
+ return val === null ? memo : memo - parseInt(val, 10);
+ }) + 'px';
+ default: return proceed(element, style);
+ }
}
- };
- Element.Methods._readAttribute = Element.Methods.readAttribute;
- Element.Methods.readAttribute = function(element, attribute) {
- if (attribute == 'title') return element.title;
- return Element._readAttribute(element, attribute);
- };
+ );
+
+ Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
+ function(proceed, element, attribute) {
+ if (attribute === 'title') return element.title;
+ return proceed(element, attribute);
+ }
+ );
}
else if (Prototype.Browser.IE) {
@@ -2380,7 +2404,7 @@ else if (Prototype.Browser.WebKit) {
};
// Safari returns margins on body which is incorrect if the child is absolutely
- // positioned. For performance reasons, redefine Position.cumulativeOffset for
+ // positioned. For performance reasons, redefine Element#cumulativeOffset for
// KHTML/WebKit only.
Element.Methods.cumulativeOffset = function(element) {
var valueT = 0, valueL = 0;
@@ -2669,10 +2693,11 @@ Element.addMethods = function(methods) {
document.viewport = {
getDimensions: function() {
var dimensions = { };
+ var B = Prototype.Browser;
$w('width height').each(function(d) {
var D = d.capitalize();
- dimensions[d] = self['inner' + D] ||
- (document.documentElement['client' + D] || document.body['client' + D]);
+ dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
+ (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D];
});
return dimensions;
}, |