Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8087 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Sam Stephenson
parent
2a51c8682d
commit
fdc767d447
@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Update Prototype to 1.6.0 and script.aculo.us to 1.8.0. [sam, madrobby]
|
||||
|
||||
* Expose the cookie jar as a helper method (before the view would just get the raw cookie hash) [DHH]
|
||||
|
||||
* Integration tests: get_ and post_via_redirect take a headers hash. #9130 [simonjefford]
|
||||
|
||||
@ -33,8 +33,6 @@
|
||||
// enables autocompletion on multiple tokens. This is most
|
||||
// useful when one of the tokens is \n (a newline), as it
|
||||
// allows smart autocompletion after linebreaks.
|
||||
//
|
||||
// vim:expandtab ts=8 sw=2
|
||||
|
||||
if(typeof Effect == 'undefined')
|
||||
throw("controls.js requires including script.aculo.us' effects.js library");
|
||||
@ -623,8 +621,10 @@ Ajax.InPlaceEditor = Class.create({
|
||||
var form = this._form;
|
||||
var value = $F(this._controls.editor);
|
||||
this.prepareSubmission();
|
||||
var params = this.options.callback(form, value);
|
||||
params = (params ? params + '&' : '?') + 'editorId=' + this.element.id;
|
||||
var params = this.options.callback(form, value) || '';
|
||||
if (Object.isString(params))
|
||||
params = params.toQueryParams();
|
||||
params.editorId = this.element.id;
|
||||
if (this.options.htmlResponse) {
|
||||
var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
|
||||
Object.extend(options, {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Prototype JavaScript framework, version 1.6.0_rc1
|
||||
/* Prototype JavaScript framework, version 1.6.0
|
||||
* (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_rc1',
|
||||
Version: '1.6.0',
|
||||
|
||||
Browser: {
|
||||
IE: !!(window.attachEvent && !window.opera),
|
||||
@ -21,6 +21,7 @@ var Prototype = {
|
||||
XPath: !!document.evaluate,
|
||||
ElementExtensions: !!window.HTMLElement,
|
||||
SpecificElementExtensions:
|
||||
document.createElement('div').__proto__ &&
|
||||
document.createElement('div').__proto__ !==
|
||||
document.createElement('form').__proto__
|
||||
},
|
||||
@ -75,9 +76,13 @@ var Class = {
|
||||
Class.Methods = {
|
||||
addMethods: function(source) {
|
||||
var ancestor = this.superclass && this.superclass.prototype;
|
||||
var properties = Object.keys(source);
|
||||
|
||||
for (var property in source) {
|
||||
var value = source[property];
|
||||
if (!Object.keys({ toString: true }).length)
|
||||
properties.push("toString", "valueOf");
|
||||
|
||||
for (var i = 0, length = properties.length; i < length; i++) {
|
||||
var property = properties[i], value = source[property];
|
||||
if (ancestor && Object.isFunction(value) &&
|
||||
value.argumentNames().first() == "$super") {
|
||||
var method = value, value = Object.extend((function(m) {
|
||||
@ -561,7 +566,7 @@ var Template = Class.create({
|
||||
|
||||
var ctx = object, expr = match[3];
|
||||
var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/, match = pattern.exec(expr);
|
||||
if (match == null) return '';
|
||||
if (match == null) return before;
|
||||
|
||||
while (match != null) {
|
||||
var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
|
||||
@ -1092,6 +1097,7 @@ var Hash = Class.create(Enumerable, (function() {
|
||||
}
|
||||
})());
|
||||
|
||||
Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
|
||||
Hash.from = $H;
|
||||
var ObjectRange = Class.create(Enumerable, {
|
||||
initialize: function(start, end, exclusive) {
|
||||
@ -1399,8 +1405,10 @@ Ajax.Response = Class.create({
|
||||
|
||||
_getHeaderJSON: function() {
|
||||
var json = this.getHeader('X-JSON');
|
||||
if (!json) return null;
|
||||
json = decodeURIComponent(escape(json));
|
||||
try {
|
||||
return json ? json.evalJSON(this.request.options.sanitizeJSON) : null;
|
||||
return json.evalJSON(this.request.options.sanitizeJSON);
|
||||
} catch (e) {
|
||||
this.request.dispatchException(e);
|
||||
}
|
||||
@ -1408,11 +1416,11 @@ Ajax.Response = Class.create({
|
||||
|
||||
_getResponseJSON: function() {
|
||||
var options = this.request.options;
|
||||
try {
|
||||
if (options.evalJSON == 'force' || (options.evalJSON &&
|
||||
(this.getHeader('Content-type') || '').include('application/json')))
|
||||
return this.transport.responseText.evalJSON(options.sanitizeJSON);
|
||||
if (!options.evalJSON || (options.evalJSON != 'force' &&
|
||||
!(this.getHeader('Content-type') || '').include('application/json')))
|
||||
return null;
|
||||
try {
|
||||
return this.transport.responseText.evalJSON(options.sanitizeJSON);
|
||||
} catch (e) {
|
||||
this.request.dispatchException(e);
|
||||
}
|
||||
@ -1817,7 +1825,7 @@ Element.Methods = {
|
||||
if (!(element = $(element))) return;
|
||||
var elementClassName = element.className;
|
||||
return (elementClassName.length > 0 && (elementClassName == className ||
|
||||
elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))));
|
||||
new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
|
||||
},
|
||||
|
||||
addClassName: function(element, className) {
|
||||
@ -1859,6 +1867,20 @@ Element.Methods = {
|
||||
|
||||
descendantOf: function(element, ancestor) {
|
||||
element = $(element), ancestor = $(ancestor);
|
||||
|
||||
if (element.compareDocumentPosition)
|
||||
return (element.compareDocumentPosition(ancestor) & 8) === 8;
|
||||
|
||||
if (element.sourceIndex && !Prototype.Browser.Opera) {
|
||||
var e = element.sourceIndex, a = ancestor.sourceIndex,
|
||||
nextAncestor = ancestor.nextSibling;
|
||||
if (!nextAncestor) {
|
||||
do { ancestor = ancestor.parentNode; }
|
||||
while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
|
||||
}
|
||||
if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
|
||||
}
|
||||
|
||||
while (element = element.parentNode)
|
||||
if (element == ancestor) return true;
|
||||
return false;
|
||||
@ -2248,7 +2270,11 @@ else if (Prototype.Browser.IE) {
|
||||
return filter.replace(/alpha\([^\)]*\)/gi,'');
|
||||
}
|
||||
element = $(element);
|
||||
if (!element.currentStyle.hasLayout) element.style.zoom = 1;
|
||||
var currentStyle = element.currentStyle;
|
||||
if ((currentStyle && !currentStyle.hasLayout) ||
|
||||
(!currentStyle && element.style.zoom == 'normal'))
|
||||
element.style.zoom = 1;
|
||||
|
||||
var filter = element.getStyle('filter'), style = element.style;
|
||||
if (value == 1 || value === '') {
|
||||
(filter = stripAlpha(filter)) ?
|
||||
@ -2344,7 +2370,7 @@ else if (Prototype.Browser.IE) {
|
||||
})(Element._attributeTranslations.read.values);
|
||||
}
|
||||
|
||||
else if (Prototype.Browser.Gecko) {
|
||||
else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
|
||||
Element.Methods.setOpacity = function(element, value) {
|
||||
element = $(element);
|
||||
element.style.opacity = (value == 1) ? 0.999999 :
|
||||
@ -3121,6 +3147,7 @@ Object.extend(Selector, {
|
||||
},
|
||||
|
||||
attrPresence: function(nodes, root, attr) {
|
||||
if (!nodes) nodes = root.getElementsByTagName("*");
|
||||
var results = [];
|
||||
for (var i = 0, node; node = nodes[i]; i++)
|
||||
if (Element.hasAttribute(node, attr)) results.push(node);
|
||||
@ -3684,24 +3711,27 @@ Object.extend(Event, {
|
||||
});
|
||||
|
||||
Event.Methods = (function() {
|
||||
var isButton;
|
||||
|
||||
if (Prototype.Browser.IE) {
|
||||
function isButton(event, code) {
|
||||
return event.button == ({ 0: 1, 1: 4, 2: 2 })[code];
|
||||
}
|
||||
var buttonMap = { 0: 1, 1: 4, 2: 2 };
|
||||
isButton = function(event, code) {
|
||||
return event.button == buttonMap[code];
|
||||
};
|
||||
|
||||
} else if (Prototype.Browser.WebKit) {
|
||||
function isButton(event, code) {
|
||||
isButton = function(event, code) {
|
||||
switch (code) {
|
||||
case 0: return event.which == 1 && !event.metaKey;
|
||||
case 1: return event.which == 1 && event.metaKey;
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
} else {
|
||||
function isButton(event, code) {
|
||||
isButton = function(event, code) {
|
||||
return event.which ? (event.which === code + 1) : (event.button === code);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
@ -3735,6 +3765,7 @@ Event.Methods = (function() {
|
||||
Event.extend(event);
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
event.stopped = true;
|
||||
}
|
||||
};
|
||||
})();
|
||||
@ -3784,7 +3815,7 @@ Object.extend(Event, (function() {
|
||||
}
|
||||
|
||||
function getDOMEventName(eventName) {
|
||||
if (eventName && eventName.match(/:/)) return "dataavailable";
|
||||
if (eventName && eventName.include(':')) return "dataavailable";
|
||||
return eventName;
|
||||
}
|
||||
|
||||
@ -3803,7 +3834,8 @@ Object.extend(Event, (function() {
|
||||
if (c.pluck("handler").include(handler)) return false;
|
||||
|
||||
var wrapper = function(event) {
|
||||
if (event.eventName && event.eventName != eventName)
|
||||
if (!Event || !Event.extend ||
|
||||
(event.eventName && event.eventName != eventName))
|
||||
return false;
|
||||
|
||||
Event.extend(event);
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Update Prototype to 1.6.0 and script.aculo.us to 1.8.0. [sam, madrobby]
|
||||
|
||||
* Added db:rollback to rollback the schema one version (or multiple as specified by STEP) [Jeffrey Allan Hardy]
|
||||
|
||||
* Fix typo in test_helper. Closes #9925 [viktor tron]
|
||||
|
||||
8
railties/html/javascripts/controls.js
vendored
8
railties/html/javascripts/controls.js
vendored
@ -33,8 +33,6 @@
|
||||
// enables autocompletion on multiple tokens. This is most
|
||||
// useful when one of the tokens is \n (a newline), as it
|
||||
// allows smart autocompletion after linebreaks.
|
||||
//
|
||||
// vim:expandtab ts=8 sw=2
|
||||
|
||||
if(typeof Effect == 'undefined')
|
||||
throw("controls.js requires including script.aculo.us' effects.js library");
|
||||
@ -623,8 +621,10 @@ Ajax.InPlaceEditor = Class.create({
|
||||
var form = this._form;
|
||||
var value = $F(this._controls.editor);
|
||||
this.prepareSubmission();
|
||||
var params = this.options.callback(form, value);
|
||||
params = (params ? params + '&' : '?') + 'editorId=' + this.element.id;
|
||||
var params = this.options.callback(form, value) || '';
|
||||
if (Object.isString(params))
|
||||
params = params.toQueryParams();
|
||||
params.editorId = this.element.id;
|
||||
if (this.options.htmlResponse) {
|
||||
var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
|
||||
Object.extend(options, {
|
||||
|
||||
76
railties/html/javascripts/prototype.js
vendored
76
railties/html/javascripts/prototype.js
vendored
@ -1,4 +1,4 @@
|
||||
/* Prototype JavaScript framework, version 1.6.0_rc1
|
||||
/* Prototype JavaScript framework, version 1.6.0
|
||||
* (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_rc1',
|
||||
Version: '1.6.0',
|
||||
|
||||
Browser: {
|
||||
IE: !!(window.attachEvent && !window.opera),
|
||||
@ -21,6 +21,7 @@ var Prototype = {
|
||||
XPath: !!document.evaluate,
|
||||
ElementExtensions: !!window.HTMLElement,
|
||||
SpecificElementExtensions:
|
||||
document.createElement('div').__proto__ &&
|
||||
document.createElement('div').__proto__ !==
|
||||
document.createElement('form').__proto__
|
||||
},
|
||||
@ -75,9 +76,13 @@ var Class = {
|
||||
Class.Methods = {
|
||||
addMethods: function(source) {
|
||||
var ancestor = this.superclass && this.superclass.prototype;
|
||||
var properties = Object.keys(source);
|
||||
|
||||
for (var property in source) {
|
||||
var value = source[property];
|
||||
if (!Object.keys({ toString: true }).length)
|
||||
properties.push("toString", "valueOf");
|
||||
|
||||
for (var i = 0, length = properties.length; i < length; i++) {
|
||||
var property = properties[i], value = source[property];
|
||||
if (ancestor && Object.isFunction(value) &&
|
||||
value.argumentNames().first() == "$super") {
|
||||
var method = value, value = Object.extend((function(m) {
|
||||
@ -561,7 +566,7 @@ var Template = Class.create({
|
||||
|
||||
var ctx = object, expr = match[3];
|
||||
var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/, match = pattern.exec(expr);
|
||||
if (match == null) return '';
|
||||
if (match == null) return before;
|
||||
|
||||
while (match != null) {
|
||||
var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
|
||||
@ -1092,6 +1097,7 @@ var Hash = Class.create(Enumerable, (function() {
|
||||
}
|
||||
})());
|
||||
|
||||
Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
|
||||
Hash.from = $H;
|
||||
var ObjectRange = Class.create(Enumerable, {
|
||||
initialize: function(start, end, exclusive) {
|
||||
@ -1399,8 +1405,10 @@ Ajax.Response = Class.create({
|
||||
|
||||
_getHeaderJSON: function() {
|
||||
var json = this.getHeader('X-JSON');
|
||||
if (!json) return null;
|
||||
json = decodeURIComponent(escape(json));
|
||||
try {
|
||||
return json ? json.evalJSON(this.request.options.sanitizeJSON) : null;
|
||||
return json.evalJSON(this.request.options.sanitizeJSON);
|
||||
} catch (e) {
|
||||
this.request.dispatchException(e);
|
||||
}
|
||||
@ -1408,11 +1416,11 @@ Ajax.Response = Class.create({
|
||||
|
||||
_getResponseJSON: function() {
|
||||
var options = this.request.options;
|
||||
try {
|
||||
if (options.evalJSON == 'force' || (options.evalJSON &&
|
||||
(this.getHeader('Content-type') || '').include('application/json')))
|
||||
return this.transport.responseText.evalJSON(options.sanitizeJSON);
|
||||
if (!options.evalJSON || (options.evalJSON != 'force' &&
|
||||
!(this.getHeader('Content-type') || '').include('application/json')))
|
||||
return null;
|
||||
try {
|
||||
return this.transport.responseText.evalJSON(options.sanitizeJSON);
|
||||
} catch (e) {
|
||||
this.request.dispatchException(e);
|
||||
}
|
||||
@ -1817,7 +1825,7 @@ Element.Methods = {
|
||||
if (!(element = $(element))) return;
|
||||
var elementClassName = element.className;
|
||||
return (elementClassName.length > 0 && (elementClassName == className ||
|
||||
elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))));
|
||||
new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
|
||||
},
|
||||
|
||||
addClassName: function(element, className) {
|
||||
@ -1859,6 +1867,20 @@ Element.Methods = {
|
||||
|
||||
descendantOf: function(element, ancestor) {
|
||||
element = $(element), ancestor = $(ancestor);
|
||||
|
||||
if (element.compareDocumentPosition)
|
||||
return (element.compareDocumentPosition(ancestor) & 8) === 8;
|
||||
|
||||
if (element.sourceIndex && !Prototype.Browser.Opera) {
|
||||
var e = element.sourceIndex, a = ancestor.sourceIndex,
|
||||
nextAncestor = ancestor.nextSibling;
|
||||
if (!nextAncestor) {
|
||||
do { ancestor = ancestor.parentNode; }
|
||||
while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
|
||||
}
|
||||
if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
|
||||
}
|
||||
|
||||
while (element = element.parentNode)
|
||||
if (element == ancestor) return true;
|
||||
return false;
|
||||
@ -2248,7 +2270,11 @@ else if (Prototype.Browser.IE) {
|
||||
return filter.replace(/alpha\([^\)]*\)/gi,'');
|
||||
}
|
||||
element = $(element);
|
||||
if (!element.currentStyle.hasLayout) element.style.zoom = 1;
|
||||
var currentStyle = element.currentStyle;
|
||||
if ((currentStyle && !currentStyle.hasLayout) ||
|
||||
(!currentStyle && element.style.zoom == 'normal'))
|
||||
element.style.zoom = 1;
|
||||
|
||||
var filter = element.getStyle('filter'), style = element.style;
|
||||
if (value == 1 || value === '') {
|
||||
(filter = stripAlpha(filter)) ?
|
||||
@ -2344,7 +2370,7 @@ else if (Prototype.Browser.IE) {
|
||||
})(Element._attributeTranslations.read.values);
|
||||
}
|
||||
|
||||
else if (Prototype.Browser.Gecko) {
|
||||
else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
|
||||
Element.Methods.setOpacity = function(element, value) {
|
||||
element = $(element);
|
||||
element.style.opacity = (value == 1) ? 0.999999 :
|
||||
@ -3121,6 +3147,7 @@ Object.extend(Selector, {
|
||||
},
|
||||
|
||||
attrPresence: function(nodes, root, attr) {
|
||||
if (!nodes) nodes = root.getElementsByTagName("*");
|
||||
var results = [];
|
||||
for (var i = 0, node; node = nodes[i]; i++)
|
||||
if (Element.hasAttribute(node, attr)) results.push(node);
|
||||
@ -3684,24 +3711,27 @@ Object.extend(Event, {
|
||||
});
|
||||
|
||||
Event.Methods = (function() {
|
||||
var isButton;
|
||||
|
||||
if (Prototype.Browser.IE) {
|
||||
function isButton(event, code) {
|
||||
return event.button == ({ 0: 1, 1: 4, 2: 2 })[code];
|
||||
}
|
||||
var buttonMap = { 0: 1, 1: 4, 2: 2 };
|
||||
isButton = function(event, code) {
|
||||
return event.button == buttonMap[code];
|
||||
};
|
||||
|
||||
} else if (Prototype.Browser.WebKit) {
|
||||
function isButton(event, code) {
|
||||
isButton = function(event, code) {
|
||||
switch (code) {
|
||||
case 0: return event.which == 1 && !event.metaKey;
|
||||
case 1: return event.which == 1 && event.metaKey;
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
} else {
|
||||
function isButton(event, code) {
|
||||
isButton = function(event, code) {
|
||||
return event.which ? (event.which === code + 1) : (event.button === code);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
@ -3735,6 +3765,7 @@ Event.Methods = (function() {
|
||||
Event.extend(event);
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
event.stopped = true;
|
||||
}
|
||||
};
|
||||
})();
|
||||
@ -3784,7 +3815,7 @@ Object.extend(Event, (function() {
|
||||
}
|
||||
|
||||
function getDOMEventName(eventName) {
|
||||
if (eventName && eventName.match(/:/)) return "dataavailable";
|
||||
if (eventName && eventName.include(':')) return "dataavailable";
|
||||
return eventName;
|
||||
}
|
||||
|
||||
@ -3803,7 +3834,8 @@ Object.extend(Event, (function() {
|
||||
if (c.pluck("handler").include(handler)) return false;
|
||||
|
||||
var wrapper = function(event) {
|
||||
if (event.eventName && event.eventName != eventName)
|
||||
if (!Event || !Event.extend ||
|
||||
(event.eventName && event.eventName != eventName))
|
||||
return false;
|
||||
|
||||
Event.extend(event);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user