Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#69786: jQuery JavaScript Library in Drupal core

5.x
Steven Wittens 2006-08-31 23:31:25 +00:00
parent 291c7b8bb1
commit 7fd9aa5c8a
12 changed files with 474 additions and 669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.txt
View File

@ -8,6 +8,7 @@ Drupal x.x.x, xxxx-xx-xx (development version)
* automatically generate the database configuration file * automatically generate the database configuration file
* install pre-made 'install profiles' or distributions * install pre-made 'install profiles' or distributions
* import the database structure with automatic table prefixing * import the database structure with automatic table prefixing
- included the jQuery JavaScript library and converted all core JavaScript to use it
- introduced the ability to alter mail sent from system - introduced the ability to alter mail sent from system
- moved core modules to their own directories to allow additional flexibility - moved core modules to their own directories to allow additional flexibility
- added support for different cache backends - added support for different cache backends

3
includes/common.inc
View File

@ -1369,7 +1369,8 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer
$javascript[$scope] = array('core' => array(), 'module' => array(), 'theme' => array(), 'setting' => array(), 'inline' => array()); $javascript[$scope] = array('core' => array(), 'module' => array(), 'theme' => array(), 'setting' => array(), 'inline' => array());
if (empty($javascript['header']['core']['misc/drupal.js'])) { if (empty($javascript['header']['core']['misc/drupal.js'])) {
drupal_add_js('misc/drupal.js', 'core'); drupal_add_js('misc/jquery.js', 'core', 'header', FALSE, $cache);
drupal_add_js('misc/drupal.js', 'core', 'header', FALSE, $cache);
} }
} }

223
misc/autocomplete.js
View File

@ -1,76 +1,51 @@
// $Id$ // $Id$
// Global Killswitch
if (isJsEnabled()) {
addLoadEvent(autocompleteAutoAttach);
}
/** /**
* Attaches the autocomplete behaviour to all required fields * Attaches the autocomplete behaviour to all required fields
*/ */
function autocompleteAutoAttach() { Drupal.autocompleteAutoAttach = function () {
var acdb = []; var acdb = [];
var inputs = document.getElementsByTagName('input'); $('input.autocomplete').each(function () {
for (i = 0; input = inputs[i]; i++) { var uri = this.value;
if (input && hasClass(input, 'autocomplete')) {
uri = input.value;
if (!acdb[uri]) { if (!acdb[uri]) {
acdb[uri] = new ACDB(uri); acdb[uri] = new Drupal.ACDB(uri);
}
input = $(input.id.substr(0, input.id.length - 13));
input.setAttribute('autocomplete', 'OFF');
addSubmitEvent(input.form, autocompleteSubmit);
new jsAC(input, acdb[uri]);
}
} }
var input = $('#' + this.id.substr(0, this.id.length - 13))
.attr('autocomplete', 'OFF')[0];
$(input.form).submit(Drupal.autocompleteSubmit);
new Drupal.jsAC(input, acdb[uri]);
});
} }
/** /**
* Prevents the form from submitting if the suggestions popup is open * Prevents the form from submitting if the suggestions popup is open
* and closes the suggestions popup when doing so.
*/ */
function autocompleteSubmit() { Drupal.autocompleteSubmit = function () {
var popup = document.getElementById('autocomplete'); return $('#autocomplete').each(function () {
if (popup) { this.owner.hidePopup();
popup.owner.hidePopup(); }).size() == 0;
return false;
} }
return true;
}
/** /**
* An AutoComplete object * An AutoComplete object
*/ */
function jsAC(input, db) { Drupal.jsAC = function (input, db) {
var ac = this; var ac = this;
this.input = input; this.input = input;
this.db = db; this.db = db;
this.input.onkeydown = function (event) { return ac.onkeydown(this, event); };
this.input.onkeyup = function (event) { ac.onkeyup(this, event) }; $(this.input)
this.input.onblur = function () { ac.hidePopup(); ac.db.cancel(); }; .keydown(function (event) { return ac.onkeydown(this, event); })
this.popup = document.createElement('div'); .keyup(function (event) { ac.onkeyup(this, event) })
this.popup.id = 'autocomplete'; .blur(function () { ac.hidePopup(); ac.db.cancel(); });
this.popup.owner = this;
}; };
/**
* Hides the autocomplete suggestions
*/
jsAC.prototype.hidePopup = function (keycode) {
if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
this.input.value = this.selected.autocompleteValue;
}
if (this.popup.parentNode && this.popup.parentNode.tagName) {
removeNode(this.popup);
}
this.selected = false;
}
/** /**
* Handler for the "keydown" event * Handler for the "keydown" event
*/ */
jsAC.prototype.onkeydown = function (input, e) { Drupal.jsAC.prototype.onkeydown = function (input, e) {
if (!e) { if (!e) {
e = window.event; e = window.event;
} }
@ -89,7 +64,7 @@ jsAC.prototype.onkeydown = function (input, e) {
/** /**
* Handler for the "keyup" event * Handler for the "keyup" event
*/ */
jsAC.prototype.onkeyup = function (input, e) { Drupal.jsAC.prototype.onkeyup = function (input, e) {
if (!e) { if (!e) {
e = window.event; e = window.event;
} }
@ -126,21 +101,21 @@ jsAC.prototype.onkeyup = function (input, e) {
/** /**
* Puts the currently highlighted suggestion into the autocomplete field * Puts the currently highlighted suggestion into the autocomplete field
*/ */
jsAC.prototype.select = function (node) { Drupal.jsAC.prototype.select = function (node) {
this.input.value = node.autocompleteValue; this.input.value = node.autocompleteValue;
} }
/** /**
* Highlights the next suggestion * Highlights the next suggestion
*/ */
jsAC.prototype.selectDown = function () { Drupal.jsAC.prototype.selectDown = function () {
if (this.selected && this.selected.nextSibling) { if (this.selected && this.selected.nextSibling) {
this.highlight(this.selected.nextSibling); this.highlight(this.selected.nextSibling);
} }
else { else {
var lis = this.popup.getElementsByTagName('li'); var lis = $('li', this.popup);
if (lis.length > 0) { if (lis.size() > 0) {
this.highlight(lis[0]); this.highlight(lis.get(0));
} }
} }
} }
@ -148,7 +123,7 @@ jsAC.prototype.selectDown = function () {
/** /**
* Highlights the previous suggestion * Highlights the previous suggestion
*/ */
jsAC.prototype.selectUp = function () { Drupal.jsAC.prototype.selectUp = function () {
if (this.selected && this.selected.previousSibling) { if (this.selected && this.selected.previousSibling) {
this.highlight(this.selected.previousSibling); this.highlight(this.selected.previousSibling);
} }
@ -157,30 +132,61 @@ jsAC.prototype.selectUp = function () {
/** /**
* Highlights a suggestion * Highlights a suggestion
*/ */
jsAC.prototype.highlight = function (node) { Drupal.jsAC.prototype.highlight = function (node) {
removeClass(this.selected, 'selected'); if (this.selected) {
addClass(node, 'selected'); $(this.selected).removeClass('selected');
}
$(node).addClass('selected');
this.selected = node; this.selected = node;
} }
/** /**
* Unhighlights a suggestion * Unhighlights a suggestion
*/ */
jsAC.prototype.unhighlight = function (node) { Drupal.jsAC.prototype.unhighlight = function (node) {
removeClass(node, 'selected'); $(node).removeClass('selected');
this.selected = false;
}
/**
* Hides the autocomplete suggestions
*/
Drupal.jsAC.prototype.hidePopup = function (keycode) {
// Select item if the right key or mousebutton was pressed
if (this.selected && ((keycode && keycode != 46 && keycode != 8 && keycode != 27) || !keycode)) {
this.input.value = this.selected.autocompleteValue;
}
// Hide popup
var popup = this.popup;
if (popup) {
this.popup = null;
$(popup).fadeOut('fast', function() { $(popup).remove(); });
}
this.selected = false; this.selected = false;
} }
/** /**
* Positions the suggestions popup and starts a search * Positions the suggestions popup and starts a search
*/ */
jsAC.prototype.populatePopup = function () { Drupal.jsAC.prototype.populatePopup = function () {
var ac = this; // Show popup
var pos = absolutePosition(this.input); if (this.popup) {
$(this.popup).remove();
}
var pos = Drupal.absolutePosition(this.input);
this.selected = false; this.selected = false;
this.popup.style.top = (pos.y + this.input.offsetHeight) +'px'; this.popup = document.createElement('div');
this.popup.style.left = pos.x +'px'; this.popup.id = 'autocomplete';
this.popup.style.width = (this.input.offsetWidth - 4) +'px'; this.popup.owner = this;
$(this.popup).css({
top: (pos.y + this.input.offsetHeight) +'px',
left: pos.x +'px',
width: (this.input.offsetWidth - 4) +'px',
display: 'none'
});
$('body').append(this.popup);
// Do search
this.db.owner = this; this.db.owner = this;
this.db.search(this.input.value); this.db.search(this.input.value);
} }
@ -188,45 +194,40 @@ jsAC.prototype.populatePopup = function () {
/** /**
* Fills the suggestion popup with any matches received * Fills the suggestion popup with any matches received
*/ */
jsAC.prototype.found = function (matches) { Drupal.jsAC.prototype.found = function (matches) {
while (this.popup.hasChildNodes()) { // Prepare matches
this.popup.removeChild(this.popup.childNodes[0]);
}
if (!this.popup.parentNode || !this.popup.parentNode.tagName) {
document.getElementsByTagName('body')[0].appendChild(this.popup);
}
var ul = document.createElement('ul'); var ul = document.createElement('ul');
var ac = this; var ac = this;
for (key in matches) { for (key in matches) {
var li = document.createElement('li'); var li = document.createElement('li');
var div = document.createElement('div'); $(li)
div.innerHTML = matches[key]; .html('<div>'+ matches[key] +'</div>')
li.appendChild(div); .mousedown(function () { ac.select(this); })
.mouseover(function () { ac.highlight(this); })
.mouseout(function () { ac.unhighlight(this); });
li.autocompleteValue = key; li.autocompleteValue = key;
li.onmousedown = function() { ac.select(this); }; $(ul).append(li);
li.onmouseover = function() { ac.highlight(this); };
li.onmouseout = function() { ac.unhighlight(this); };
ul.appendChild(li);
} }
// Show popup with matches, if any
if (ul.childNodes.length > 0) { if (ul.childNodes.length > 0) {
this.popup.appendChild(ul); $(this.popup).empty().append(ul).show();
} }
else { else {
$(this.popup).css({visibility: 'hidden'});
this.hidePopup(); this.hidePopup();
} }
} }
jsAC.prototype.setStatus = function (status) { Drupal.jsAC.prototype.setStatus = function (status) {
switch (status) { switch (status) {
case 'begin': case 'begin':
addClass(this.input, 'throbbing'); $(this.input).addClass('throbbing');
break; break;
case 'cancel': case 'cancel':
case 'error': case 'error':
case 'found': case 'found':
removeClass(this.input, 'throbbing'); $(this.input).removeClass('throbbing');
break; break;
} }
} }
@ -234,7 +235,7 @@ jsAC.prototype.setStatus = function (status) {
/** /**
* An AutoComplete DataBase object * An AutoComplete DataBase object
*/ */
function ACDB(uri) { Drupal.ACDB = function (uri) {
this.uri = uri; this.uri = uri;
this.delay = 300; this.delay = 300;
this.cache = {}; this.cache = {};
@ -243,47 +244,55 @@ function ACDB(uri) {
/** /**
* Performs a cached and delayed search * Performs a cached and delayed search
*/ */
ACDB.prototype.search = function(searchString) { Drupal.ACDB.prototype.search = function (searchString) {
var db = this;
this.searchString = searchString; this.searchString = searchString;
// See if this key has been searched for before
if (this.cache[searchString]) { if (this.cache[searchString]) {
return this.owner.found(this.cache[searchString]); return this.owner.found(this.cache[searchString]);
} }
// Initiate delayed search
if (this.timer) { if (this.timer) {
clearTimeout(this.timer); clearTimeout(this.timer);
} }
var db = this;
this.timer = setTimeout(function() { this.timer = setTimeout(function() {
db.owner.setStatus('begin'); db.owner.setStatus('begin');
db.transport = HTTPGet(db.uri +'/'+ encodeURIComponent(searchString), db.receive, db);
}, this.delay);
}
/** // Ajax GET request for autocompletion
* HTTP callback function. Passes suggestions to the autocomplete object $.ajax({
*/ type: "GET",
ACDB.prototype.receive = function(string, xmlhttp, acdb) { url: db.uri +'/'+ Drupal.encodeURIComponent(searchString),
// Note: Safari returns 'undefined' status if the request returns no data. success: function (xmlhttp) {
if (xmlhttp.status != 200 && typeof xmlhttp.status != 'undefined') {
acdb.owner.setStatus('error');
return alert('An HTTP error '+ xmlhttp.status +' occured.\n'+ acdb.uri);
}
// Parse back result // Parse back result
var matches = parseJson(string); var matches = Drupal.parseJson(xmlhttp.responseText);
if (typeof matches['status'] == 'undefined' || matches['status'] != 0) { if (typeof matches['status'] == 'undefined' || matches['status'] != 0) {
acdb.cache[acdb.searchString] = matches; db.cache[searchString] = matches;
acdb.owner.found(matches); // Verify if these are still the matches the user wants to see
acdb.owner.setStatus('found'); if (db.searchString == searchString) {
db.owner.found(matches);
} }
db.owner.setStatus('found');
}
},
error: function (xmlhttp) {
alert('An HTTP error '+ xmlhttp.status +' occured.\n'+ db.uri);
}
});
}, this.delay);
} }
/** /**
* Cancels the current autocomplete request * Cancels the current autocomplete request
*/ */
ACDB.prototype.cancel = function() { Drupal.ACDB.prototype.cancel = function() {
if (this.owner) this.owner.setStatus('cancel'); if (this.owner) this.owner.setStatus('cancel');
if (this.timer) clearTimeout(this.timer); if (this.timer) clearTimeout(this.timer);
if (this.transport) { this.searchString = '';
this.transport.onreadystatechange = function() {};
this.transport.abort();
} }
// Global Killswitch
if (Drupal.jsEnabled) {
$(document).ready(Drupal.autocompleteAutoAttach);
} }

132
misc/collapse.js
View File

@ -1,70 +1,100 @@
// $Id$ // $Id$
if (isJsEnabled()) { Drupal.collapseAutoAttach = function () {
addLoadEvent(collapseAutoAttach); $('fieldset.collapsible legend').each(function () {
} // Turn the legend into clickable link
function collapseAutoAttach() {
var fieldsets = document.getElementsByTagName('fieldset');
var legend, fieldset;
for (var i = 0; fieldset = fieldsets[i]; i++) {
if (!hasClass(fieldset, 'collapsible')) {
continue;
}
legend = fieldset.getElementsByTagName('legend');
if (legend.length == 0) {
continue;
}
legend = legend[0];
var a = document.createElement('a'); var a = document.createElement('a');
a.href = '#'; a.href = '#';
a.onclick = function() { $(a)
toggleClass(this.parentNode.parentNode, 'collapsed'); .click(function() {
if (!hasClass(this.parentNode.parentNode, 'collapsed')) { var fieldset = this.parentNode.parentNode;
collapseScrollIntoView(this.parentNode.parentNode);
if (typeof textAreaAutoAttach != 'undefined') { // Prevent double animations
// Add the grippie to a textarea in a collapsed fieldset. if (fieldset.animating) {
textAreaAutoAttach(null, this.parentNode.parentNode); return false;
} }
fieldset.animating = true;
if ($(fieldset).is('.collapsed')) {
// Open fieldset with animation
$(fieldset.contentWrapper).hide();
$(fieldset).removeClass('collapsed');
$(fieldset.contentWrapper).slideDown(300,
{
// Make sure we open to height auto
complete: function() {
$(fieldset.contentWrapper).css('height', 'auto');
Drupal.collapseScrollIntoView(fieldset);
fieldset.animating = false;
},
// Scroll the fieldset into view
step: function() {
Drupal.collapseScrollIntoView(fieldset);
}
}
);
if (typeof Drupal.textareaAttach != 'undefined') {
// Initialize resizable textareas that are now revealed
Drupal.textareaAttach(null, fieldset);
}
}
else {
// Collapse fieldset with animation (reverse of opening)
$(fieldset.contentWrapper)
.slideUp('medium', function () { $(fieldset).addClass('collapsed'); fieldset.animating = false; } )
.show();
} }
this.blur(); this.blur();
return false; return false;
}; })
a.innerHTML = legend.innerHTML; .html(this.innerHTML);
while (legend.hasChildNodes()) { $(this)
removeNode(legend.childNodes[0]); .empty()
.append(a);
// Wrap fieldsets contents (except for the legend) into wrapper divs for animating.
// div1 is used to avoid margin problems inside fieldsets,
// div2 is the one that is actually animated.
var div1 = document.createElement('div');
var div2 = document.createElement('div');
this.parentNode.contentWrapper = div2;
$(this).after(div1);
$(div1).append(div2);
var el = div1.nextSibling;
while (el != null) {
var next = el.nextSibling;
$(el).remove();
$(div2).append(el);
el = next;
} }
legend.appendChild(a); // Avoid jumping around due to margins collapsing into fieldset border
collapseEnsureErrorsVisible(fieldset); $(div1).css('overflow', 'hidden');
// Expand if there are errors inside
if ($('input.error, textarea.error, select.error', this.parentNode).size() > 0) {
$(this.parentNode).removeClass('collapsed');
} }
});
} }
function collapseEnsureErrorsVisible(fieldset) { /**
if (!hasClass(fieldset, 'collapsed')) { * Scroll a given fieldset into view as much as possible.
return; */
} Drupal.collapseScrollIntoView = function (node) {
var inputs = [];
inputs = inputs.concat(fieldset.getElementsByTagName('input'));
inputs = inputs.concat(fieldset.getElementsByTagName('textarea'));
inputs = inputs.concat(fieldset.getElementsByTagName('select'));
for (var j = 0; j<3; j++) {
for (var i = 0; i < inputs[j].length; i++) {
if (hasClass(inputs[j][i], 'error')) {
return removeClass(fieldset, 'collapsed');
}
}
}
}
function collapseScrollIntoView(node) {
var h = self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight || 0; var h = self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight || 0;
var offset = self.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0; var offset = self.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
var pos = absolutePosition(node); var pos = Drupal.absolutePosition(node);
if (pos.y + node.scrollHeight > h + offset) { var fudge = 55;
if (node.scrollHeight > h) { if (pos.y + node.offsetHeight + fudge > h + offset) {
if (node.offsetHeight > h) {
window.scrollTo(0, pos.y); window.scrollTo(0, pos.y);
} else { } else {
window.scrollTo(0, pos.y + node.scrollHeight - h); window.scrollTo(0, pos.y + node.offsetHeight - h + fudge);
} }
} }
} }
// Global Killswitch
if (Drupal.jsEnabled) {
$(document).ready(Drupal.collapseAutoAttach);
}

357
misc/drupal.js
View File

@ -1,39 +1,14 @@
// $Id$ // $Id$
var Drupal = Drupal || {};
/** /**
* Only enable Javascript functionality if all required features are supported. * Set the variable that indicates if JavaScript behaviors should be applied
*/ */
function isJsEnabled() { Drupal.jsEnabled = document.getElementsByTagName && document.createElement && document.createTextNode && document.documentElement && document.getElementById;
if (typeof document.jsEnabled == 'undefined') {
// Note: ! casts to boolean implicitly.
document.jsEnabled = !(
!document.getElementsByTagName ||
!document.createElement ||
!document.createTextNode ||
!document.documentElement ||
!document.getElementById);
}
return document.jsEnabled;
}
// Global Killswitch on the <html> element
if (isJsEnabled()) {
document.documentElement.className = 'js';
}
/** /**
* The global Drupal variable. * Extends the current object with the parameter. Works recursively.
*/
Drupal = { };
/**
* Merge an object into the Drupal namespace.
*
* @param obj
* The object that should be merged into the Drupal namespace. Arbitrary objects
* containing functions, variables or other objects can be used. An example object
* would be { settings: { tree: { '/js/menu/tree': { mid: 206 } } } }. This item
* can now be accessed at Drupal.settings.tree['/js/menu/tree'].mid.
*/ */
Drupal.extend = function(obj) { Drupal.extend = function(obj) {
for (var i in obj) { for (var i in obj) {
@ -44,109 +19,26 @@ Drupal.extend = function(obj) {
this[i] = obj[i]; this[i] = obj[i];
} }
} }
}; },
/**
* Make IE's XMLHTTP object accessible through XMLHttpRequest()
*/
if (typeof XMLHttpRequest == 'undefined') {
XMLHttpRequest = function () {
var msxmls = ['MSXML3', 'MSXML2', 'Microsoft']
for (var i=0; i < msxmls.length; i++) {
try {
return new ActiveXObject(msxmls[i]+'.XMLHTTP')
}
catch (e) { }
}
throw new Error("No XML component installed!");
}
}
/**
* Creates an HTTP GET request and sends the response to the callback function.
*
* Note that dynamic arguments in the URI should be escaped with encodeURIComponent().
*/
function HTTPGet(uri, callbackFunction, callbackParameter) {
var xmlHttp = new XMLHttpRequest();
var bAsync = true;
if (!callbackFunction) {
bAsync = false;
}
xmlHttp.open('GET', uri, bAsync);
xmlHttp.send(null);
if (bAsync) {
xmlHttp.onreadystatechange = function() {
if (xmlHttp.readyState == 4) {
callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter);
}
}
return xmlHttp;
}
else {
return xmlHttp.responseText;
}
}
/**
* Creates an HTTP POST request and sends the response to the callback function
*
* Note: passing null or undefined for 'object' makes the request fail in Opera 8.
* Pass an empty string instead.
*/
function HTTPPost(uri, callbackFunction, callbackParameter, object) {
var xmlHttp = new XMLHttpRequest();
var bAsync = true;
if (!callbackFunction) {
bAsync = false;
}
xmlHttp.open('POST', uri, bAsync);
var toSend = '';
if (typeof object == 'object') {
xmlHttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
for (var i in object) {
toSend += (toSend ? '&' : '') + i + '=' + encodeURIComponent(object[i]);
}
}
else {
toSend = object;
}
xmlHttp.send(toSend);
if (bAsync) {
xmlHttp.onreadystatechange = function() {
if (xmlHttp.readyState == 4) {
callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter);
}
}
return xmlHttp;
}
else {
return xmlHttp.responseText;
}
}
/** /**
* Redirects a button's form submission to a hidden iframe and displays the result * Redirects a button's form submission to a hidden iframe and displays the result
* in a given wrapper. The iframe should contain a call to * in a given wrapper. The iframe should contain a call to
* window.parent.iframeHandler() after submission. * window.parent.iframeHandler() after submission.
*/ */
function redirectFormButton(uri, button, handler) { Drupal.redirectFormButton = function (uri, button, handler) {
// (Re)create an iframe to target.
createIframe();
// Trap the button // Trap the button
button.onmouseover = button.onfocus = function() { button.onmouseover = button.onfocus = function() {
button.onclick = function() { button.onclick = function() {
// Create target iframe
Drupal.createIframe();
// Prepare variables for use in anonymous function. // Prepare variables for use in anonymous function.
var button = this; var button = this;
var action = button.form.action; var action = button.form.action;
var target = button.form.target; var target = button.form.target;
// Redirect form submission // Redirect form submission to iframe
this.form.action = uri; this.form.action = uri;
this.form.target = 'redirect-target'; this.form.target = 'redirect-target';
@ -154,7 +46,7 @@ function redirectFormButton(uri, button, handler) {
// Set iframe handler for later // Set iframe handler for later
window.iframeHandler = function () { window.iframeHandler = function () {
var iframe = $('redirect-target'); var iframe = $('#redirect-target').get(0);
// Restore form submission // Restore form submission
button.form.action = action; button.form.action = action;
button.form.target = target; button.form.target = target;
@ -173,16 +65,15 @@ function redirectFormButton(uri, button, handler) {
response = null; response = null;
} }
$('redirect-target').onload = null; response = Drupal.parseJson(response);
$('redirect-target').src = 'about:blank';
response = parseJson(response);
// Check response code // Check response code
if (response.status == 0) { if (response.status == 0) {
handler.onerror(response.data); handler.onerror(response.data);
return; return;
} }
handler.oncomplete(response.data); handler.oncomplete(response.data);
return true;
} }
return true; return true;
@ -191,43 +82,12 @@ function redirectFormButton(uri, button, handler) {
button.onmouseout = button.onblur = function() { button.onmouseout = button.onblur = function() {
button.onclick = null; button.onclick = null;
} }
} },
/**
* Adds a function to the window onload event
*/
function addLoadEvent(func) {
var oldOnload = window.onload;
if (typeof window.onload != 'function') {
window.onload = func;
}
else {
window.onload = function() {
oldOnload();
func();
}
}
}
/**
* Adds a function to a given form's submit event
*/
function addSubmitEvent(form, func) {
var oldSubmit = form.onsubmit;
if (typeof oldSubmit != 'function') {
form.onsubmit = func;
}
else {
form.onsubmit = function() {
return oldSubmit() && func();
}
}
}
/** /**
* Retrieves the absolute position of an element on the screen * Retrieves the absolute position of an element on the screen
*/ */
function absolutePosition(el) { Drupal.absolutePosition = function (el) {
var sLeft = 0, sTop = 0; var sLeft = 0, sTop = 0;
var isDiv = /^div$/i.test(el.tagName); var isDiv = /^div$/i.test(el.tagName);
if (isDiv && el.scrollLeft) { if (isDiv && el.scrollLeft) {
@ -238,152 +98,109 @@ function absolutePosition(el) {
} }
var r = { x: el.offsetLeft - sLeft, y: el.offsetTop - sTop }; var r = { x: el.offsetLeft - sLeft, y: el.offsetTop - sTop };
if (el.offsetParent) { if (el.offsetParent) {
var tmp = absolutePosition(el.offsetParent); var tmp = Drupal.absolutePosition(el.offsetParent);
r.x += tmp.x; r.x += tmp.x;
r.y += tmp.y; r.y += tmp.y;
} }
return r; return r;
}; },
function dimensions(el) { /**
* Return the dimensions of an element on the screen
*/
Drupal.dimensions = function (el) {
return { width: el.offsetWidth, height: el.offsetHeight }; return { width: el.offsetWidth, height: el.offsetHeight };
} },
/** /**
* Returns true if an element has a specified class name * Returns the position of the mouse cursor based on the event object passed
*/ */
function hasClass(node, className) { Drupal.mousePosition = function(e) {
if (node.className == className) { return { x: e.clientX + document.documentElement.scrollLeft, y: e.clientY + document.documentElement.scrollTop };
return true; },
}
var reg = new RegExp('(^| )'+ className +'($| )')
if (reg.test(node.className)) {
return true;
}
return false;
}
/**
* Adds a class name to an element
*/
function addClass(node, className) {
if (hasClass(node, className)) {
return false;
}
node.className += ' '+ className;
return true;
}
/**
* Removes a class name from an element
*/
function removeClass(node, className) {
if (!hasClass(node, className)) {
return false;
}
// Replaces words surrounded with whitespace or at a string border with a space. Prevents multiple class names from being glued together.
node.className = eregReplace('(^|\\s+)'+ className +'($|\\s+)', ' ', node.className);
return true;
}
/**
* Toggles a class name on or off for an element
*/
function toggleClass(node, className) {
if (!removeClass(node, className) && !addClass(node, className)) {
return false;
}
return true;
}
/**
* Emulate PHP's ereg_replace function in javascript
*/
function eregReplace(search, replace, subject) {
return subject.replace(new RegExp(search,'g'), replace);
}
/**
* Removes an element from the page
*/
function removeNode(node) {
if (typeof node == 'string') {
node = $(node);
}
if (node && node.parentNode) {
return node.parentNode.removeChild(node);
}
else {
return false;
}
}
/**
* Prevents an event from propagating.
*/
function stopEvent(event) {
if (event.preventDefault) {
event.preventDefault();
event.stopPropagation();
}
else {
event.returnValue = false;
event.cancelBubble = true;
}
}
/** /**
* Parse a JSON response. * Parse a JSON response.
* *
* The result is either the JSON object, or an object with 'status' 0 and 'data' an error message. * The result is either the JSON object, or an object with 'status' 0 and 'data' an error message.
*/ */
function parseJson(data) { Drupal.parseJson = function (data) {
if ((data.substring(0, 1) != '{') && (data.substring(0, 1) != '[')) { if ((data.substring(0, 1) != '{') && (data.substring(0, 1) != '[')) {
return { status: 0, data: data.length ? data : 'Unspecified error' }; return { status: 0, data: data.length ? data : 'Unspecified error' };
} }
return eval('(' + data + ');'); return eval('(' + data + ');');
} },
/** /**
* Create an invisible iframe for form submissions. * Create an invisible iframe for form submissions.
*/ */
function createIframe() { Drupal.createIframe = function () {
// Delete any previous iframe if ($('#redirect-holder').size()) {
deleteIframe(); return;
}
// Note: some browsers require the literal name/id attributes on the tag, // Note: some browsers require the literal name/id attributes on the tag,
// some want them set through JS. We do both. // some want them set through JS. We do both.
window.iframeHandler = function () {}; window.iframeHandler = function () {};
var div = document.createElement('div'); var div = document.createElement('div');
div.id = 'redirect-holder'; div.id = 'redirect-holder';
div.innerHTML = '<iframe name="redirect-target" id="redirect-target" class="redirect" onload="window.iframeHandler();"></iframe>'; $(div).html('<iframe name="redirect-target" id="redirect-target" class="redirect" onload="window.iframeHandler();"></iframe>');
var iframe = div.firstChild; var iframe = div.firstChild;
with (iframe) { $(iframe)
name = 'redirect-target'; .attr({
setAttribute('name', 'redirect-target'); name: 'redirect-target',
id = 'redirect-target'; id: 'redirect-target'
} })
with (iframe.style) { .css({
position = 'absolute'; position: 'absolute',
height = '1px'; height: '1px',
width = '1px'; width: '1px',
visibility = 'hidden'; visibility: 'hidden'
} });
document.body.appendChild(div); $('body').append(div);
},
/**
* Delete the invisible iframe
*/
Drupal.deleteIframe = function () {
$('#redirect-holder').remove();
},
/**
* Freeze the current body height (as minimum height). Used to prevent
* unnecessary upwards scrolling when doing DOM manipulations.
*/
Drupal.freezeHeight = function () {
Drupal.unfreezeHeight();
var div = document.createElement('div');
$(div).css({
position: 'absolute',
top: '0px',
left: '0px',
width: '1px',
height: $('body').css('height')
}).attr('id', 'freeze-height');
$('body').append(div);
},
/**
* Unfreeze the body height
*/
Drupal.unfreezeHeight = function () {
$('#freeze-height').remove();
} }
/** /**
* Delete the invisible iframe for form submissions. * Wrapper to address the mod_rewrite url encoding bug
* (equivalent of drupal_urlencode() in PHP).
*/ */
function deleteIframe() { Drupal.encodeURIComponent = function (item, uri) {
var holder = $('redirect-holder'); uri = uri || location.href;
if (holder != null) { item = encodeURIComponent(item).replace('%2F', '/');
removeNode(holder); return uri.indexOf('?q=') ? item : item.replace('%26', '%2526').replace('%23', '%2523');
}
} }
/** // Global Killswitch on the <html> element
* Wrapper around document.getElementById(). if (Drupal.jsEnabled) {
*/ document.documentElement.className = 'js';
function $(id) {
return document.getElementById(id);
} }

67
misc/progress.js
View File

@ -5,45 +5,35 @@
* the DOM afterwards through progressBar.element. * the DOM afterwards through progressBar.element.
* *
* method is the function which will perform the HTTP request to get the * method is the function which will perform the HTTP request to get the
* progress bar state. Either HTTPGet or HTTPPost. * progress bar state. Either "GET" or "POST".
* *
* e.g. pb = new progressBar('myProgressBar'); * e.g. pb = new progressBar('myProgressBar');
* some_element.appendChild(pb.element); * some_element.appendChild(pb.element);
*/ */
function progressBar(id, updateCallback, method, errorCallback) { Drupal.progressBar = function (id, updateCallback, method, errorCallback) {
var pb = this; var pb = this;
this.id = id; this.id = id;
this.method = method ? method : HTTPGet; this.method = method || "GET";
this.updateCallback = updateCallback; this.updateCallback = updateCallback;
this.errorCallback = errorCallback; this.errorCallback = errorCallback;
this.element = document.createElement('div'); this.element = document.createElement('div');
this.element.id = id; this.element.id = id;
this.element.className = 'progress'; this.element.className = 'progress';
this.element.innerHTML = '<div class="percentage"></div>'+ $(this.element).html('<div class="percentage"></div>'+
'<div class="message">&nbsp;</div>'+ '<div class="message">&nbsp;</div>'+
'<div class="bar"><div class="filled"></div></div>'; '<div class="bar"><div class="filled"></div></div>');
} }
/** /**
* Set the percentage and status message for the progressbar. * Set the percentage and status message for the progressbar.
*/ */
progressBar.prototype.setProgress = function (percentage, message) { Drupal.progressBar.prototype.setProgress = function (percentage, message) {
var divs = this.element.getElementsByTagName('div'); if (percentage >= 0 && percentage <= 100) {
var div; $('div.filled', this.element).css('width', percentage +'%');
for (var i = 0; div = divs[i]; ++i) { $('div.percentage', this.element).html(percentage +'%');
if (percentage >= 0) {
if (hasClass(divs[i], 'filled')) {
divs[i].style.width = percentage + '%';
}
if (hasClass(divs[i], 'percentage')) {
divs[i].innerHTML = percentage + '%';
}
}
if (hasClass(divs[i], 'message')) {
divs[i].innerHTML = message;
}
} }
$('div.message', this.element).html(message);
if (this.updateCallback) { if (this.updateCallback) {
this.updateCallback(percentage, message, this); this.updateCallback(percentage, message, this);
} }
@ -52,7 +42,7 @@ progressBar.prototype.setProgress = function (percentage, message) {
/** /**
* Start monitoring progress via Ajax. * Start monitoring progress via Ajax.
*/ */
progressBar.prototype.startMonitoring = function (uri, delay) { Drupal.progressBar.prototype.startMonitoring = function (uri, delay) {
this.delay = delay; this.delay = delay;
this.uri = uri; this.uri = uri;
this.sendPing(); this.sendPing();
@ -61,7 +51,7 @@ progressBar.prototype.startMonitoring = function (uri, delay) {
/** /**
* Stop monitoring progress via Ajax. * Stop monitoring progress via Ajax.
*/ */
progressBar.prototype.stopMonitoring = function () { Drupal.progressBar.prototype.stopMonitoring = function () {
clearTimeout(this.timer); clearTimeout(this.timer);
// This allows monitoring to be stopped from within the callback // This allows monitoring to be stopped from within the callback
this.uri = null; this.uri = null;
@ -70,47 +60,44 @@ progressBar.prototype.stopMonitoring = function () {
/** /**
* Request progress data from server. * Request progress data from server.
*/ */
progressBar.prototype.sendPing = function () { Drupal.progressBar.prototype.sendPing = function () {
if (this.timer) { if (this.timer) {
clearTimeout(this.timer); clearTimeout(this.timer);
} }
if (this.uri) { if (this.uri) {
this.method(this.uri, this.receivePing, this, ''); var pb = this;
} $.ajax({
} type: this.method,
url: this.uri,
/** success: function (xmlhttp) {
* HTTP callback function. Passes data back to the progressbar and sets a new
* timer for the next ping.
*/
progressBar.prototype.receivePing = function (string, xmlhttp, pb) {
if (xmlhttp.status != 200) {
return pb.displayError('An HTTP error '+ xmlhttp.status +' occured.\n'+ pb.uri);
}
// Parse response // Parse response
var progress = parseJson(string); var progress = Drupal.parseJson(xmlhttp.responseText);
// Display errors // Display errors
if (progress.status == 0) { if (progress.status == 0) {
pb.displayError(progress.data); pb.displayError(progress.data);
return; return;
} }
// Update display // Update display
pb.setProgress(progress.percentage, progress.message); pb.setProgress(progress.percentage, progress.message);
// Schedule next timer // Schedule next timer
pb.timer = setTimeout(function() { pb.sendPing(); }, pb.delay); pb.timer = setTimeout(function() { pb.sendPing(); }, pb.delay);
},
error: function (xmlhttp) {
pb.displayError('An HTTP error '+ xmlhttp.status +' occured.\n'+ pb.uri);
}
});
}
} }
/** /**
* Display errors on the page. * Display errors on the page.
*/ */
progressBar.prototype.displayError = function (string) { Drupal.progressBar.prototype.displayError = function (string) {
var error = document.createElement('div'); var error = document.createElement('div');
error.className = 'error'; error.className = 'error';
error.innerHTML = string; error.innerHTML = string;
this.element.style.display = 'none'; $(this.element).before(error).hide();
this.element.parentNode.insertBefore(error, this.element);
if (this.errorCallback) { if (this.errorCallback) {
this.errorCallback(this); this.errorCallback(this);

136
misc/textarea.js
View File

@ -1,122 +1,34 @@
// $Id$ // $Id$
if (isJsEnabled()) { Drupal.textareaAttach = function() {
addLoadEvent(textAreaAutoAttach); $('textarea.resizable:not(.processed)').each(function() {
var textarea = $(this).addClass('processed'), staticOffset = null;
$(this).wrap('<div class="resizable-textarea"></div>')
.parent().append($('<div class="grippie"></div>').mousedown(startDrag));
var grippie = $('div.grippie', $(this).parent())[0];
grippie.style.marginRight = (grippie.offsetWidth - $(this)[0].offsetWidth) +'px';
function startDrag(e) {
staticOffset = textarea.height() - Drupal.mousePosition(e).y;
textarea.css('opacity', 0.25);
$(document).mousemove(performDrag).mouseup(endDrag);
return false;
} }
function textAreaAutoAttach(event, parent) { function performDrag(e) {
if (typeof parent == 'undefined') { textarea.height(Math.max(32, staticOffset + Drupal.mousePosition(e).y) + 'px');
// Attach to all visible textareas. return false;
textareas = document.getElementsByTagName('textarea');
}
else {
// Attach to all visible textareas inside parent.
textareas = parent.getElementsByTagName('textarea');
}
var textarea;
for (var i = 0; textarea = textareas[i]; ++i) {
if (hasClass(textarea, 'resizable') && !hasClass(textarea.nextSibling, 'grippie')) {
if (typeof dimensions(textarea).width != 'undefined' && dimensions(textarea).width != 0) {
new textArea(textarea);
}
}
}
} }
function textArea(element) { function endDrag(e) {
var ta = this; $(document).unmousemove(performDrag).unmouseup(endDrag);
this.element = element; textarea.css('opacity', 1);
this.parent = this.element.parentNode;
this.dimensions = dimensions(element);
// Prepare wrapper
this.wrapper = document.createElement('div');
this.wrapper.className = 'resizable-textarea';
this.parent.insertBefore(this.wrapper, this.element);
// Add grippie and measure it
this.grippie = document.createElement('div');
this.grippie.className = 'grippie';
this.wrapper.appendChild(this.grippie);
this.grippie.dimensions = dimensions(this.grippie);
this.grippie.onmousedown = function (e) { ta.beginDrag(e); };
// Set wrapper and textarea dimensions
this.wrapper.style.height = this.dimensions.height + this.grippie.dimensions.height + 1 +'px';
this.element.style.marginBottom = '0px';
this.element.style.width = '100%';
this.element.style.height = this.dimensions.height +'px';
// Wrap textarea
removeNode(this.element);
this.wrapper.insertBefore(this.element, this.grippie);
// Measure difference between desired and actual textarea dimensions to account for padding/borders
this.widthOffset = dimensions(this.wrapper).width - this.dimensions.width;
// Make the grippie line up in various browsers
if (window.opera) {
// Opera
this.grippie.style.marginRight = '4px';
} }
if (document.all && !window.opera) { });
// IE
this.grippie.style.width = '100%';
this.grippie.style.paddingLeft = '2px';
}
// Mozilla
this.element.style.MozBoxSizing = 'border-box';
this.heightOffset = absolutePosition(this.grippie).y - absolutePosition(this.element).y - this.dimensions.height;
} }
textArea.prototype.beginDrag = function (event) { if (Drupal.jsEnabled) {
if (document.isDragging) { $(document).ready(Drupal.textareaAttach);
return;
} }
document.isDragging = true;
event = event || window.event;
// Capture mouse
var cp = this;
this.oldMoveHandler = document.onmousemove;
document.onmousemove = function(e) { cp.handleDrag(e); };
this.oldUpHandler = document.onmouseup;
document.onmouseup = function(e) { cp.endDrag(e); };
// Store drag offset from grippie top
var pos = absolutePosition(this.grippie);
this.dragOffset = event.clientY - pos.y;
// Make transparent
this.element.style.opacity = 0.5;
// Process
this.handleDrag(event);
}
textArea.prototype.handleDrag = function (event) {
event = event || window.event;
// Get coordinates relative to text area
var pos = absolutePosition(this.element);
var y = event.clientY - pos.y;
// Set new height
var height = Math.max(32, y - this.dragOffset - this.heightOffset);
this.wrapper.style.height = height + this.grippie.dimensions.height + 1 + 'px';
this.element.style.height = height + 'px';
// Avoid text selection
stopEvent(event);
}
textArea.prototype.endDrag = function (event) {
// Uncapture mouse
document.onmousemove = this.oldMoveHandler;
document.onmouseup = this.oldUpHandler;
// Restore opacity
this.element.style.opacity = 1.0;
document.isDragging = false;
}

23
misc/update.js
View File

@ -1,12 +1,11 @@
// $Id$ // $Id$
if (isJsEnabled()) { if (Drupal.jsEnabled) {
addLoadEvent(function() { $(document).ready(function() {
if ($('edit-has_js')) { $('#edit-has_js').each(function() { this.value = 1; });
$('edit-has_js').value = 1; $('#progress').each(function () {
} var holder = this;
if ($('progress')) {
// Success: redirect to the summary. // Success: redirect to the summary.
var updateCallback = function (progress, status, pb) { var updateCallback = function (progress, status, pb) {
if (progress == 100) { if (progress == 100) {
@ -19,15 +18,15 @@ if (isJsEnabled()) {
var errorCallback = function (pb) { var errorCallback = function (pb) {
var div = document.createElement('p'); var div = document.createElement('p');
div.className = 'error'; div.className = 'error';
div.innerHTML = 'An unrecoverable error has occured. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the <a href="update.php?op=error">update summary</a>'; $(div).html('An unrecoverable error has occured. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the <a href="update.php?op=error">update summary</a>');
$('progress').insertBefore(div, $('progress').firstChild); $(holder).prepend(div);
$('wait').style.display = 'none'; $('#wait').hide();
} }
var progress = new progressBar('updateprogress', updateCallback, HTTPPost, errorCallback); var progress = new Drupal.progressBar('updateprogress', updateCallback, "POST", errorCallback);
progress.setProgress(-1, 'Starting updates'); progress.setProgress(-1, 'Starting updates');
$('progress').appendChild(progress.element); $(holder).append(progress.element);
progress.startMonitoring('update.php?op=do_update', 0); progress.startMonitoring('update.php?op=do_update', 0);
} });
}); });
} }

118
misc/upload.js
View File

@ -1,76 +1,116 @@
// $Id$ // $Id$
// Global killswitch
if (isJsEnabled()) {
addLoadEvent(uploadAutoAttach);
}
/** /**
* Attaches the upload behaviour to the upload form. * Attaches the upload behaviour to the upload form.
*/ */
function uploadAutoAttach() { Drupal.uploadAutoAttach = function() {
var inputs = document.getElementsByTagName('input'); $('input.upload').each(function () {
for (i = 0; input = inputs[i]; i++) { var uri = this.value;
if (input && hasClass(input, 'upload')) {
var uri = input.value;
// Extract the base name from the id (edit-attach-url -> attach). // Extract the base name from the id (edit-attach-url -> attach).
var base = input.id.substring(5, input.id.length - 4); var base = this.id.substring(5, this.id.length - 4);
var button = base + '-button'; var button = base + '-button';
var wrapper = base + '-wrapper'; var wrapper = base + '-wrapper';
var hide = base + '-hide'; var hide = base + '-hide';
var upload = new jsUpload(uri, button, wrapper, hide); var upload = new Drupal.jsUpload(uri, button, wrapper, hide);
} });
}
} }
/** /**
* JS upload object. * JS upload object.
*/ */
function jsUpload(uri, button, wrapper, hide) { Drupal.jsUpload = function(uri, button, wrapper, hide) {
this.button = button; // Note: these elements are replaced after an upload, so we re-select them
this.wrapper = wrapper; // everytime they are needed.
this.hide = hide; this.button = '#'+ button;
redirectFormButton(uri, $(button), this); this.wrapper = '#'+ wrapper;
this.hide = '#'+ hide;
Drupal.redirectFormButton(uri, $(this.button).get(0), this);
} }
/** /**
* Handler for the form redirection submission. * Handler for the form redirection submission.
*/ */
jsUpload.prototype.onsubmit = function () { Drupal.jsUpload.prototype.onsubmit = function () {
var hide = $(this.hide);
// Insert progressbar and stretch to take the same space. // Insert progressbar and stretch to take the same space.
this.progress = new progressBar('uploadprogress'); this.progress = new Drupal.progressBar('uploadprogress');
this.progress.setProgress(-1, 'Uploading file'); this.progress.setProgress(-1, 'Uploading file');
this.progress.element.style.width = '28em';
this.progress.element.style.height = hide.offsetHeight +'px'; var hide = this.hide;
hide.parentNode.insertBefore(this.progress.element, hide); var el = this.progress.element;
// Hide file form (cannot use display: none, this mysteriously aborts form var offset = $(hide).get(0).offsetHeight;
// submission in Konqueror) $(el).css({
hide.style.position = 'absolute'; width: '28em',
hide.style.left = '-2000px'; height: offset +'px',
paddingTop: '10px',
display: 'none'
});
$(hide).css('position', 'absolute');
$(hide).after(el);
$(el).fadeIn('slow');
$(hide).fadeOut('slow');
} }
/** /**
* Handler for the form redirection completion. * Handler for the form redirection completion.
*/ */
jsUpload.prototype.oncomplete = function (data) { Drupal.jsUpload.prototype.oncomplete = function (data) {
// Remove progressbar // Remove old form
removeNode(this.progress.element); Drupal.freezeHeight(); // Avoid unnecessary scrolling
this.progress = null; $(this.wrapper).html('');
// Place HTML into temporary div
var div = document.createElement('div');
$(div).html(data);
// If uploading the first attachment fade in everything
if ($('tr', div).size() == 2) {
// Replace form and re-attach behaviour // Replace form and re-attach behaviour
$(this.wrapper).innerHTML = data; $(div).hide();
uploadAutoAttach(); $(this.wrapper).append(div);
$(div).fadeIn('slow');
Drupal.uploadAutoAttach();
}
// Else fade in only the last table row
else {
// Hide form and last table row
$('table tr:last-of-type td', div).hide();
// Note: workaround because jQuery's #id selector does not work outside of 'document'
// Should be: $(this.hide, div).hide();
var hide = this.hide;
$('div', div).each(function() {
if (('#'+ this.id) == hide) {
this.style.display = 'none';
}
});
// Replace form, fade in items and re-attach behaviour
$(this.wrapper).append(div);
$('table tr:last-of-type td', div).fadeIn('slow');
$(this.hide, div).fadeIn('slow');
Drupal.uploadAutoAttach();
}
Drupal.unfreezeHeight();
} }
/** /**
* Handler for the form redirection error. * Handler for the form redirection error.
*/ */
jsUpload.prototype.onerror = function (error) { Drupal.jsUpload.prototype.onerror = function (error) {
alert('An error occurred:\n\n'+ error); alert('An error occurred:\n\n'+ error);
// Remove progressbar // Remove progressbar
removeNode(this.progress.element); $(this.progress.element).remove();
this.progress = null; this.progress = null;
// Undo hide // Undo hide
$(this.hide).style.position = 'static'; $(this.hide).css({
$(this.hide).style.left = '0px'; position: 'static',
left: '0px'
});
}
// Global killswitch
if (Drupal.jsEnabled) {
$(document).ready(Drupal.uploadAutoAttach);
} }

21
modules/system/system.css
View File

@ -235,24 +235,29 @@ html.js fieldset.collapsed {
border-left-width: 0; border-left-width: 0;
border-right-width: 0; border-right-width: 0;
margin-bottom: 0; margin-bottom: 0;
height: 1em;
} }
html.js fieldset.collapsed * { html.js fieldset.collapsed * {
display: none; display: none;
} }
html.js fieldset.collapsed table *, html.js fieldset.collapsed legend {
html.js fieldset.collapsed legend, display: block;
html.js fieldset.collapsed legend * {
display: inline;
} }
html.js fieldset.collapsible legend a { html.js fieldset.collapsible legend a {
padding-left: 15px; padding-left: 15px;
background: url(../../misc/menu-expanded.png) 5px 50% no-repeat; background: url(../../misc/menu-expanded.png) 5px 75% no-repeat;
} }
html.js fieldset.collapsed legend a { html.js fieldset.collapsed legend a {
background-image: url(../../misc/menu-collapsed.png); background-image: url(../../misc/menu-collapsed.png);
background-position: 5px 50%;
} }
/* Note: IE-only fix due to '* html' (breaks Konqueror otherwise). */ /* Note: IE-only fix due to '* html' (breaks Konqueror otherwise). */
* html.js fieldset.collapsible legend a { * html.js fieldset.collapsed legend,
* html.js fieldset.collapsed legend *,
* html.js fieldset.collapsed table * {
display: inline;
}
html.js fieldset.collapsible legend a {
display: block; display: block;
} }
@ -269,6 +274,10 @@ html.js fieldset.collapsed legend a {
border-top-width: 0; border-top-width: 0;
cursor: s-resize; cursor: s-resize;
} }
html.js .resizable-textarea textarea {
margin-bottom: 0;
width: 100%;
}
/* /*
** Progressbar styles ** Progressbar styles

2
modules/user/user.module
View File

@ -2358,7 +2358,7 @@ function _user_forms(&$edit, $account, $category, $hook = 'form') {
/** /**
* Retrieve a pipe delimited string of autocomplete suggestions for existing users * Retrieve a pipe delimited string of autocomplete suggestions for existing users
*/ */
function user_autocomplete($string) { function user_autocomplete($string = '') {
$matches = array(); $matches = array();
$result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string, 0, 10); $result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string, 0, 10);
while ($user = db_fetch_object($result)) { while ($user = db_fetch_object($result)) {

6
update.php
View File

@ -322,7 +322,7 @@ function update_selection_page() {
drupal_set_title('Drupal database update'); drupal_set_title('Drupal database update');
// Prevent browser from using cached drupal.js or update.js // Prevent browser from using cached drupal.js or update.js
drupal_add_js('misc/update.js', TRUE); drupal_add_js('misc/update.js', 'core', 'header', FALSE, TRUE);
$output .= drupal_get_form('update_script_selection_form'); $output .= drupal_get_form('update_script_selection_form');
return $output; return $output;
@ -403,8 +403,8 @@ function update_update_page() {
function update_progress_page() { function update_progress_page() {
// Prevent browser from using cached drupal.js or update.js // Prevent browser from using cached drupal.js or update.js
drupal_add_js('misc/progress.js', TRUE); drupal_add_js('misc/progress.js', 'core', 'header', FALSE, TRUE);
drupal_add_js('misc/update.js', TRUE); drupal_add_js('misc/update.js', 'core', 'header', FALSE, TRUE);
drupal_set_title('Updating'); drupal_set_title('Updating');
$output = '<div id="progress"></div>'; $output = '<div id="progress"></div>';