Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.537.2.8
diff -u -F^f -r1.537.2.8 common.inc
--- includes/common.inc 26 Aug 2006 14:19:09 -0000 1.537.2.8
+++ includes/common.inc 23 Sep 2006 13:57:09 -0000
@@ -116,7 +116,7 @@ function drupal_set_html_head($data = NU
function drupal_get_html_head() {
$output = "\n";
$output .= theme('stylesheet_import', base_path() .'misc/drupal.css');
- return $output . drupal_set_html_head();
+ return $output . drupal_get_js() . drupal_set_html_head();
}
/**
@@ -1216,24 +1216,145 @@ function drupal_add_link($attributes) {
}
/**
- * Add a JavaScript file to the output.
+ * Add a JavaScript file, setting or inline code to the page.
*
- * The first time this function is invoked per page request,
- * it adds "misc/drupal.js" to the output. Other scripts
- * depends on the 'killswitch' inside it.
- */
-function drupal_add_js($file, $nocache = FALSE) {
- static $sent = array();
-
- $postfix = $nocache ? '?'. time() : '';
- if (!isset($sent['misc/drupal.js'])) {
- drupal_set_html_head('');
- $sent['misc/drupal.js'] = true;
- }
- if (!isset($sent[$file])) {
- drupal_set_html_head('');
- $sent[$file] = true;
+ * The behavior of this function depends on the parameters it is called with.
+ * Generally, it handles the addition of JavaScript to the page, either as
+ * reference to an existing file or as inline code. The following actions can be
+ * performed using this function:
+ *
+ * - Add a file ('core', 'module' and 'theme'):
+ * Adds a reference to a JavaScript file to the page. JavaScript files
+ * are placed in a certain order, from 'core' first, to 'module' and finally
+ * 'theme' so that files, that are added later, can override previously added
+ * files with ease.
+ *
+ * - Add inline JavaScript code ('inline'):
+ * Executes a piece of JavaScript code on the current page by placing the code
+ * directly in the page. This can, for example, be useful to tell the user that
+ * a new message arrived, by opening a pop up, alert box etc.
+ *
+ * - Add settings ('setting'):
+ * Adds a setting to Drupal's global storage of JavaScript settings. Per-page
+ * settings are required by some modules to function properly. The settings
+ * will be accessible at Drupal.settings.
+ *
+ * @param $data
+ * (optional) If given, the value depends on the $type parameter:
+ * - 'core', 'module' or 'theme': Path to the file relative to base_path().
+ * - 'inline': The JavaScript code that should be placed in the given scope.
+ * - 'setting': An array with configuration options as associative array. The
+ * array is directly placed in Drupal.settings. You might want to wrap your
+ * actual configuration settings in another variable to prevent the pollution
+ * of the Drupal.settings namespace.
+ * @param $type
+ * (optional) The type of JavaScript that should be added to the page. Allowed
+ * values are 'core', 'module', 'theme', 'inline' and 'setting'. You
+ * can, however, specify any value. It is treated as a reference to a JavaScript
+ * file. Defaults to 'module'.
+ * @param $scope
+ * (optional) The location in which you want to place the script. Possible
+ * values are 'header' and 'footer' by default. If your theme implements
+ * different locations, however, you can also use these.
+ * @param $defer
+ * (optional) If set to TRUE, the defer attribute is set on the \n";
+ break;
+ case 'inline':
+ foreach ($data as $info) {
+ $output .= '\n";
+ }
+ break;
+ default:
+ foreach ($data as $path => $info) {
+ $output .= '\n";
+ }
+ }
+ }
+
+ return $output;
}
/**
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.292.2.7
diff -u -F^f -r1.292.2.7 theme.inc
--- includes/theme.inc 5 Sep 2006 10:22:24 -0000 1.292.2.7
+++ includes/theme.inc 23 Sep 2006 13:57:09 -0000
@@ -919,7 +919,7 @@ function theme_feed_icon($url) {
*/
function theme_closure($main = 0) {
$footer = module_invoke_all('footer', $main);
- return implode("\n", $footer);
+ return implode("\n", $footer) . drupal_get_js('footer');
}
/**
Index: misc/autocomplete.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/autocomplete.js,v
retrieving revision 1.11
diff -u -F^f -r1.11 autocomplete.js
--- misc/autocomplete.js 17 Apr 2006 20:48:25 -0000 1.11
+++ misc/autocomplete.js 23 Sep 2006 13:57:09 -0000
@@ -1,76 +1,51 @@
-// $Id: autocomplete.js,v 1.11 2006/04/17 20:48:25 dries Exp $
-
-// Global Killswitch
-if (isJsEnabled()) {
- addLoadEvent(autocompleteAutoAttach);
-}
+// $Id: autocomplete.js,v 1.13 2006/08/31 23:31:24 unconed Exp $
/**
* Attaches the autocomplete behaviour to all required fields
*/
-function autocompleteAutoAttach() {
+Drupal.autocompleteAutoAttach = function () {
var acdb = [];
- var inputs = document.getElementsByTagName('input');
- for (i = 0; input = inputs[i]; i++) {
- if (input && hasClass(input, 'autocomplete')) {
- uri = input.value;
- if (!acdb[uri]) {
- acdb[uri] = new ACDB(uri);
- }
- input = $(input.id.substr(0, input.id.length - 13));
- input.setAttribute('autocomplete', 'OFF');
- addSubmitEvent(input.form, autocompleteSubmit);
- new jsAC(input, acdb[uri]);
+ $('input.autocomplete').each(function () {
+ var uri = this.value;
+ if (!acdb[uri]) {
+ acdb[uri] = new Drupal.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
+ * and closes the suggestions popup when doing so.
*/
-function autocompleteSubmit() {
- var popup = document.getElementById('autocomplete');
- if (popup) {
- popup.owner.hidePopup();
- return false;
- }
- return true;
+Drupal.autocompleteSubmit = function () {
+ return $('#autocomplete').each(function () {
+ this.owner.hidePopup();
+ }).size() == 0;
}
-
/**
* An AutoComplete object
*/
-function jsAC(input, db) {
+Drupal.jsAC = function (input, db) {
var ac = this;
this.input = input;
this.db = db;
- this.input.onkeydown = function (event) { return ac.onkeydown(this, event); };
- this.input.onkeyup = function (event) { ac.onkeyup(this, event) };
- this.input.onblur = function () { ac.hidePopup(); ac.db.cancel(); };
- this.popup = document.createElement('div');
- this.popup.id = 'autocomplete';
- 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;
-}
+ $(this.input)
+ .keydown(function (event) { return ac.onkeydown(this, event); })
+ .keyup(function (event) { ac.onkeyup(this, event) })
+ .blur(function () { ac.hidePopup(); ac.db.cancel(); });
+};
/**
* Handler for the "keydown" event
*/
-jsAC.prototype.onkeydown = function (input, e) {
+Drupal.jsAC.prototype.onkeydown = function (input, e) {
if (!e) {
e = window.event;
}
@@ -89,7 +64,7 @@ function jsAC(input, db) {
/**
* Handler for the "keyup" event
*/
-jsAC.prototype.onkeyup = function (input, e) {
+Drupal.jsAC.prototype.onkeyup = function (input, e) {
if (!e) {
e = window.event;
}
@@ -126,21 +101,21 @@ function jsAC(input, db) {
/**
* 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;
}
/**
* Highlights the next suggestion
*/
-jsAC.prototype.selectDown = function () {
+Drupal.jsAC.prototype.selectDown = function () {
if (this.selected && this.selected.nextSibling) {
this.highlight(this.selected.nextSibling);
}
else {
- var lis = this.popup.getElementsByTagName('li');
- if (lis.length > 0) {
- this.highlight(lis[0]);
+ var lis = $('li', this.popup);
+ if (lis.size() > 0) {
+ this.highlight(lis.get(0));
}
}
}
@@ -148,7 +123,7 @@ function jsAC(input, db) {
/**
* Highlights the previous suggestion
*/
-jsAC.prototype.selectUp = function () {
+Drupal.jsAC.prototype.selectUp = function () {
if (this.selected && this.selected.previousSibling) {
this.highlight(this.selected.previousSibling);
}
@@ -157,30 +132,61 @@ function jsAC(input, db) {
/**
* Highlights a suggestion
*/
-jsAC.prototype.highlight = function (node) {
- removeClass(this.selected, 'selected');
- addClass(node, 'selected');
+Drupal.jsAC.prototype.highlight = function (node) {
+ if (this.selected) {
+ $(this.selected).removeClass('selected');
+ }
+ $(node).addClass('selected');
this.selected = node;
}
/**
* Unhighlights a suggestion
*/
-jsAC.prototype.unhighlight = function (node) {
- removeClass(node, 'selected');
+Drupal.jsAC.prototype.unhighlight = function (node) {
+ $(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;
}
/**
* Positions the suggestions popup and starts a search
*/
-jsAC.prototype.populatePopup = function () {
- var ac = this;
- var pos = absolutePosition(this.input);
+Drupal.jsAC.prototype.populatePopup = function () {
+ // Show popup
+ if (this.popup) {
+ $(this.popup).remove();
+ }
+ var pos = Drupal.absolutePosition(this.input);
this.selected = false;
- this.popup.style.top = (pos.y + this.input.offsetHeight) +'px';
- this.popup.style.left = pos.x +'px';
- this.popup.style.width = (this.input.offsetWidth - 4) +'px';
+ this.popup = document.createElement('div');
+ this.popup.id = 'autocomplete';
+ 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.search(this.input.value);
}
@@ -188,41 +194,48 @@ function jsAC(input, db) {
/**
* Fills the suggestion popup with any matches received
*/
-jsAC.prototype.found = function (matches) {
- while (this.popup.hasChildNodes()) {
- this.popup.removeChild(this.popup.childNodes[0]);
- }
- if (!this.popup.parentNode || !this.popup.parentNode.tagName) {
- document.getElementsByTagName('body')[0].appendChild(this.popup);
- }
+Drupal.jsAC.prototype.found = function (matches) {
+ // Prepare matches
var ul = document.createElement('ul');
var ac = this;
-
for (key in matches) {
var li = document.createElement('li');
- var div = document.createElement('div');
- div.innerHTML = matches[key];
- li.appendChild(div);
+ $(li)
+ .html(''+ matches[key] +'
')
+ .mousedown(function () { ac.select(this); })
+ .mouseover(function () { ac.highlight(this); })
+ .mouseout(function () { ac.unhighlight(this); });
li.autocompleteValue = key;
- li.onmousedown = function() { ac.select(this); };
- li.onmouseover = function() { ac.highlight(this); };
- li.onmouseout = function() { ac.unhighlight(this); };
- ul.appendChild(li);
+ $(ul).append(li);
}
+ // Show popup with matches, if any
if (ul.childNodes.length > 0) {
- this.popup.appendChild(ul);
+ $(this.popup).empty().append(ul).show();
}
else {
+ $(this.popup).css({visibility: 'hidden'});
this.hidePopup();
}
- removeClass(this.input, 'throbbing');
+}
+
+Drupal.jsAC.prototype.setStatus = function (status) {
+ switch (status) {
+ case 'begin':
+ $(this.input).addClass('throbbing');
+ break;
+ case 'cancel':
+ case 'error':
+ case 'found':
+ $(this.input).removeClass('throbbing');
+ break;
+ }
}
/**
* An AutoComplete DataBase object
*/
-function ACDB(uri) {
+Drupal.ACDB = function (uri) {
this.uri = uri;
this.delay = 300;
this.cache = {};
@@ -231,46 +244,55 @@ function ACDB(uri) {
/**
* Performs a cached and delayed search
*/
-ACDB.prototype.search = function(searchString) {
+Drupal.ACDB.prototype.search = function (searchString) {
+ var db = this;
this.searchString = searchString;
+
+ // See if this key has been searched for before
if (this.cache[searchString]) {
return this.owner.found(this.cache[searchString]);
}
+
+ // Initiate delayed search
if (this.timer) {
clearTimeout(this.timer);
}
- var db = this;
this.timer = setTimeout(function() {
- addClass(db.owner.input, 'throbbing');
- db.transport = HTTPGet(db.uri +'/'+ encodeURIComponent(searchString), db.receive, db);
- }, this.delay);
-}
+ db.owner.setStatus('begin');
-/**
- * HTTP callback function. Passes suggestions to the autocomplete object
- */
-ACDB.prototype.receive = function(string, xmlhttp, acdb) {
- // Note: Safari returns 'undefined' status if the request returns no data.
- if (xmlhttp.status != 200 && typeof xmlhttp.status != 'undefined') {
- removeClass(acdb.owner.input, 'throbbing');
- return alert('An HTTP error '+ xmlhttp.status +' occured.\n'+ acdb.uri);
- }
- // Parse back result
- var matches = parseJson(string);
- if (typeof matches['status'] == 'undefined' || matches['status'] != 0) {
- acdb.cache[acdb.searchString] = matches;
- acdb.owner.found(matches);
- }
+ // Ajax GET request for autocompletion
+ $.ajax({
+ type: "GET",
+ url: db.uri +'/'+ Drupal.encodeURIComponent(searchString),
+ success: function (xmlhttp) {
+ // Parse back result
+ var matches = Drupal.parseJson(xmlhttp.responseText);
+ if (typeof matches['status'] == 'undefined' || matches['status'] != 0) {
+ db.cache[searchString] = matches;
+ // Verify if these are still the matches the user wants to see
+ 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
*/
-ACDB.prototype.cancel = function() {
- if (this.owner) removeClass(this.owner.input, 'throbbing');
+Drupal.ACDB.prototype.cancel = function() {
+ if (this.owner) this.owner.setStatus('cancel');
if (this.timer) clearTimeout(this.timer);
- if (this.transport) {
- this.transport.onreadystatechange = function() {};
- this.transport.abort();
- }
+ this.searchString = '';
+}
+
+// Global Killswitch
+if (Drupal.jsEnabled) {
+ $(document).ready(Drupal.autocompleteAutoAttach);
}
Index: misc/collapse.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/collapse.js,v
retrieving revision 1.6
diff -u -F^f -r1.6 collapse.js
--- misc/collapse.js 14 Apr 2006 13:48:56 -0000 1.6
+++ misc/collapse.js 23 Sep 2006 13:57:09 -0000
@@ -1,70 +1,100 @@
-// $Id: collapse.js,v 1.6 2006/04/14 13:48:56 killes Exp $
+// $Id: collapse.js,v 1.7 2006/08/31 23:31:24 unconed Exp $
-if (isJsEnabled()) {
- addLoadEvent(collapseAutoAttach);
-}
-
-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];
+Drupal.collapseAutoAttach = function () {
+ $('fieldset.collapsible legend').each(function () {
+ // Turn the legend into clickable link
var a = document.createElement('a');
a.href = '#';
- a.onclick = function() {
- toggleClass(this.parentNode.parentNode, 'collapsed');
- if (!hasClass(this.parentNode.parentNode, 'collapsed')) {
- collapseScrollIntoView(this.parentNode.parentNode);
- if (typeof textAreaAutoAttach != 'undefined') {
- // Add the grippie to a textarea in a collapsed fieldset.
- textAreaAutoAttach(null, this.parentNode.parentNode);
+ $(a)
+ .click(function() {
+ var fieldset = this.parentNode.parentNode;
+
+ // Prevent double animations
+ if (fieldset.animating) {
+ 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();
- return false;
- };
- a.innerHTML = legend.innerHTML;
- while (legend.hasChildNodes()) {
- removeNode(legend.childNodes[0]);
+ this.blur();
+ return false;
+ })
+ .html(this.innerHTML);
+ $(this)
+ .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);
- collapseEnsureErrorsVisible(fieldset);
- }
-}
+ // Avoid jumping around due to margins collapsing into fieldset border
+ $(div1).css('overflow', 'hidden');
-function collapseEnsureErrorsVisible(fieldset) {
- if (!hasClass(fieldset, 'collapsed')) {
- return;
- }
- 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');
- }
+ // Expand if there are errors inside
+ if ($('input.error, textarea.error, select.error', this.parentNode).size() > 0) {
+ $(this.parentNode).removeClass('collapsed');
}
- }
+ });
}
-function collapseScrollIntoView(node) {
+/**
+ * Scroll a given fieldset into view as much as possible.
+ */
+Drupal.collapseScrollIntoView = function (node) {
var h = self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight || 0;
var offset = self.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
- var pos = absolutePosition(node);
- if (pos.y + node.scrollHeight > h + offset) {
- if (node.scrollHeight > h) {
+ var pos = Drupal.absolutePosition(node);
+ var fudge = 55;
+ if (pos.y + node.offsetHeight + fudge > h + offset) {
+ if (node.offsetHeight > h) {
window.scrollTo(0, pos.y);
} 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);
+}
Index: misc/drupal.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/drupal.js,v
retrieving revision 1.22.2.2
diff -u -F^f -r1.22.2.2 drupal.js
--- misc/drupal.js 19 Aug 2006 19:55:20 -0000 1.22.2.2
+++ misc/drupal.js 23 Sep 2006 13:57:10 -0000
@@ -1,127 +1,44 @@
// $Id: drupal.js,v 1.22.2.2 2006/08/19 19:55:20 killes Exp $
-/**
- * Only enable Javascript functionality if all required features are supported.
- */
-function isJsEnabled() {
- 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 element
-if (isJsEnabled()) {
- document.documentElement.className = 'js';
-}
+var Drupal = Drupal || {};
/**
- * Make IE's XMLHTTP object accessible through XMLHttpRequest()
+ * Set the variable that indicates if JavaScript behaviors should be applied
*/
-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!");
- }
-}
+Drupal.jsEnabled = document.getElementsByTagName && document.createElement && document.createTextNode && document.documentElement && document.getElementById;
/**
- * 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().
+ * Extends the current object with the parameter. Works recursively.
*/
-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);
- }
+Drupal.extend = function(obj) {
+ for (var i in obj) {
+ if (this[i]) {
+ Drupal.extend.apply(this[i], [obj[i]]);
}
- 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 {
+ this[i] = obj[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
* in a given wrapper. The iframe should contain a call to
* window.parent.iframeHandler() after submission.
*/
-function redirectFormButton(uri, button, handler) {
- // (Re)create an iframe to target.
- createIframe();
-
+Drupal.redirectFormButton = function (uri, button, handler) {
// Trap the button
button.onmouseover = button.onfocus = function() {
button.onclick = function() {
+ // Create target iframe
+ Drupal.createIframe();
+
// Prepare variables for use in anonymous function.
var button = this;
var action = button.form.action;
var target = button.form.target;
- // Redirect form submission
+ // Redirect form submission to iframe
this.form.action = uri;
this.form.target = 'redirect-target';
@@ -129,7 +46,7 @@ function redirectFormButton(uri, button,
// Set iframe handler for later
window.iframeHandler = function () {
- var iframe = $('redirect-target');
+ var iframe = $('#redirect-target').get(0);
// Restore form submission
button.form.action = action;
button.form.target = target;
@@ -148,16 +65,15 @@ function redirectFormButton(uri, button,
response = null;
}
- $('redirect-target').onload = null;
- $('redirect-target').src = 'about:blank';
-
- response = parseJson(response);
+ response = Drupal.parseJson(response);
// Check response code
if (response.status == 0) {
handler.onerror(response.data);
return;
}
handler.oncomplete(response.data);
+
+ return true;
}
return true;
@@ -166,43 +82,12 @@ function redirectFormButton(uri, button,
button.onmouseout = button.onblur = function() {
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
*/
-function absolutePosition(el) {
+Drupal.absolutePosition = function (el) {
var sLeft = 0, sTop = 0;
var isDiv = /^div$/i.test(el.tagName);
if (isDiv && el.scrollLeft) {
@@ -213,152 +98,109 @@ function absolutePosition(el) {
}
var r = { x: el.offsetLeft - sLeft, y: el.offsetTop - sTop };
if (el.offsetParent) {
- var tmp = absolutePosition(el.offsetParent);
+ var tmp = Drupal.absolutePosition(el.offsetParent);
r.x += tmp.x;
r.y += tmp.y;
}
return r;
-};
-
-function dimensions(el) {
- return { width: el.offsetWidth, height: el.offsetHeight };
-}
-
-/**
- * Returns true if an element has a specified class name
- */
-function hasClass(node, className) {
- if (node.className == className) {
- 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
+ * Return the dimensions of an element on the screen
*/
-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;
- }
-}
+Drupal.dimensions = function (el) {
+ return { width: el.offsetWidth, height: el.offsetHeight };
+},
/**
- * Prevents an event from propagating.
+ * Returns the position of the mouse cursor based on the event object passed
*/
-function stopEvent(event) {
- if (event.preventDefault) {
- event.preventDefault();
- event.stopPropagation();
- }
- else {
- event.returnValue = false;
- event.cancelBubble = true;
- }
-}
+Drupal.mousePosition = function(e) {
+ return { x: e.clientX + document.documentElement.scrollLeft, y: e.clientY + document.documentElement.scrollTop };
+},
/**
* Parse a JSON response.
*
* The result is either the JSON object, or an object with 'status' 0 and 'data' an error message.
*/
-function parseJson(data) {
- if (data.substring(0,1) != '{') {
+Drupal.parseJson = function (data) {
+ if ((data.substring(0, 1) != '{') && (data.substring(0, 1) != '[')) {
return { status: 0, data: data.length ? data : 'Unspecified error' };
}
return eval('(' + data + ');');
-}
+},
/**
* Create an invisible iframe for form submissions.
*/
-function createIframe() {
- // Delete any previous iframe
- deleteIframe();
+Drupal.createIframe = function () {
+ if ($('#redirect-holder').size()) {
+ return;
+ }
// Note: some browsers require the literal name/id attributes on the tag,
// some want them set through JS. We do both.
window.iframeHandler = function () {};
var div = document.createElement('div');
div.id = 'redirect-holder';
- div.innerHTML = '';
+ $(div).html('');
var iframe = div.firstChild;
- with (iframe) {
- name = 'redirect-target';
- setAttribute('name', 'redirect-target');
- id = 'redirect-target';
- }
- with (iframe.style) {
- position = 'absolute';
- height = '1px';
- width = '1px';
- visibility = 'hidden';
- }
- document.body.appendChild(div);
-}
+ $(iframe)
+ .attr({
+ name: 'redirect-target',
+ id: 'redirect-target'
+ })
+ .css({
+ position: 'absolute',
+ height: '1px',
+ width: '1px',
+ visibility: 'hidden'
+ });
+ $('body').append(div);
+},
+
+/**
+ * Delete the invisible iframe
+ */
+Drupal.deleteIframe = function () {
+ $('#redirect-holder').remove();
+},
/**
- * Delete the invisible iframe for form submissions.
+ * Freeze the current body height (as minimum height). Used to prevent
+ * unnecessary upwards scrolling when doing DOM manipulations.
*/
-function deleteIframe() {
- var holder = $('redirect-holder');
- if (holder != null) {
- removeNode(holder);
- }
+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();
}
/**
- * Wrapper around document.getElementById().
+ * Wrapper to address the mod_rewrite url encoding bug
+ * (equivalent of drupal_urlencode() in PHP).
*/
-function $(id) {
- return document.getElementById(id);
+Drupal.encodeURIComponent = function (item, uri) {
+ uri = uri || location.href;
+ item = encodeURIComponent(item).replace('%2F', '/');
+ return uri.indexOf('?q=') ? item : item.replace('%26', '%2526').replace('%23', '%2523');
+}
+
+// Global Killswitch on the element
+if (Drupal.jsEnabled) {
+ document.documentElement.className = 'js';
}
Index: misc/jquery.js
===================================================================
RCS file: misc/jquery.js
diff -N misc/jquery.js
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc/jquery.js 23 Sep 2006 13:57:10 -0000
@@ -0,0 +1,2 @@
+// $Id: jquery.js,v 1.2 2006/09/08 23:16:14 drumm Exp $
+eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('1Q.11=1Q.11;q 6(a,c){l(a&&a.I==1e&&6.C.1X)v 6(16).1X(a);a=a||6.1c||16;l(a.3k)v $(6.21(a,[]));l(c&&c.3k)v $(c).27(a);l(1Q==7)v 17 6(a,c);u m=/^[^<]*(<.+>)[^>]*$/.2W(a);l(m)a=6.37([m[1]]);7.1t(a.I==2r||a.D&&!a.1R&&a[0]!=11&&a[0].1R?6.21(a,[]):6.27(a,c));u C=1b[1b.D-1];l(C&&C.I==1e)7.R(C)}l(45 $!="11")6.3J$=$;u $=6;6.C=6.5C={3k:"$7V: 7p $",4P:q(){v 7.D},1t:q(24){l(24&&24.I==2r){7.D=0;[].1i.15(7,24);v 7}H v 24==11?6.2d(7,q(a){v a}):7[24]},R:q(C,1y){v 6.R(7,C,1y)},5F:q(12){u 2a=-1;7.R(q(i){l(7==12)2a=i});v 2a},1F:q(1J,19,B){v 1J.I!=1M||19!=11?7.R(q(){l(19==11)E(u G 1o 1J)6.1F(B?7.1d:7,G,1J[G]);H 6.1F(B?7.1d:7,1J,19)}):6[B||"1F"](7[0],1J)},1g:q(1J,19){v 7.1F(1J,19,"1U")},42:q(e){e=e||7;u t="";E(u j=0;j0:7.D>0},2x:q(1y,1j,2E,C){u 3O=7.4P()>1;u a=6.37(1y);v 7.R(q(){u 12=7;l(1j&&7.3X=="5P"&&a[0].3X!="5Q"){u 22=7.4y("22");l(!22.D){12=16.4q("22");7.3L(12)}H 12=22[0]}E(u i=(2E<0?a.D-1:0);i!=(2E<0?2E:a.D);i+=2E){C.15(12,[3O?a[i].3q(V):a[i]])}})},2i:q(a,1y){u C=1y&&1y[1y.D-1];l(!C||C.I!=1e){l(!7.2P)7.2P=[];7.2P.1i(7.1t());7.1t(a)}H{u 25=7.1t();7.1t(a);l(C.I==1e)v 7.R(C);7.1t(25)}v 7}};6.1T=6.C.1T=q(12,G){l(!G){G=12;12=7}E(u i 1o G)12[i]=G[i];v 12};6.1T({5e:q(){6.5S=V;6.R(6.2f.4e,q(i,n){6.C[i]=q(a){u L=6.2d(7,n);l(a&&a.I==1M)L=6.1k(a,L).r;v 7.2i(L,1b)}});6.R(6.2f.2q,q(i,n){6.C[i]=q(){u a=1b;v 7.R(q(){E(u j=0;j"}H l(!a[i].1a("<3i")){1j="3i";a[i]="<1j>"+a[i]+""}H l(!a[i].1a("<3y")||!a[i].1a("<6g")){1j="3y";a[i]="<1j><22><3i>"+a[i]+""}u 1A=16.4q("1A");1A.2v=a[i];l(1j){1A=1A.1H;l(1j!="43")1A=1A.1H;l(1j=="3y")1A=1A.1H}E(u j=0;j<1A.2c.D;j++)r.1i(1A.2c[j])}H l(a[i].3k||a[i].D&&!a[i].1R)E(u k=0;km[3]-0",4s:"m[3]-0==i",51:"m[3]-0==i",2b:"i==0",1K:"i==r.D-1",4G:"i%2==0",4H:"i%2","4s-3b":"6.1q(a,m[3]).1f","2b-3b":"6.1q(a,0).1f","1K-3b":"6.1q(a,0).1K","6l-3b":"6.1q(a).D==1",57:"a.2c.D",5d:"!a.2c.D",54:"(a.6n||a.2v).1a(m[3])>=0",6o:"a.B!=\'1V\'&&6.1g(a,\'1m\')!=\'1Z\'&&6.1g(a,\'3B\')!=\'1V\'",1V:"a.B==\'1V\'||6.1g(a,\'1m\')==\'1Z\'||6.1g(a,\'3B\')==\'1V\'",6p:"!a.2A",2A:"a.2A",59:"a.59",4u:"a.4u"},".":"6.1h.3p(a,m[2])","@":{"=":"z==m[4]","!=":"z!=m[4]","^=":"!z.1a(m[4])","$=":"z.2H(z.D - m[4].D,m[4].D)==m[4]","*=":"z.1a(m[4])>=0","":"z"},"[":"6.27(m[2],a).D"},3d:["\\\\.\\\\.|/\\\\.\\\\.","a.1u",">|/","6.1q(a.1H)","\\\\+","6.1q(a).3a","~",q(a){u r=[];u s=6.1q(a);l(s.n>0)E(u i=s.n;i=1)t=t.2H(t.1a("/"),t.D)}u L=[1c];u 1L=[];u 1K=U;2t(t.D>0&&1K!=t){u r=[];1K=t;t=6.38(t).1r(/^\\/\\//i,"");u 2S=18;E(u i=0;i<6.3d.D;i+=2){l(2S)4F;u 2m=17 36("^("+6.3d[i]+")");u m=2m.2W(t);l(m){r=L=6.2d(L,6.3d[i+1]);t=6.38(t.1r(2m,""));2S=V}}l(!2S){l(!t.1a(",")||!t.1a("|")){l(L[0]==1c)L.3z();1L=6.21(1L,L);r=L=[1c];t=" "+t.2H(1,t.D)}H{u 3u=/^([#.]?)([a-4A-9\\\\*3J-]*)/i;u m=3u.2W(t);l(m[1]=="#"){u 3N=16.4c(m[2]);r=L=3N?[3N]:[];t=t.1r(3u,"")}H{l(!m[2]||m[1]==".")m[2]="*";E(u i=0;i<\\/2e>");u 2e=16.4c("4d");2e.2p=q(){l(7.2Q!="1D")v;7.1u.3j(7);6.1X()};2e=U}H l(6.1n.35){6.3U=3A(q(){l(16.2Q=="5E"||16.2Q=="1D"){4L(6.3U);6.3U=U;6.1X()}},10)}6.N.1W(1Q,"2J",6.1X)};6.C.1T({56:6.C.1x,1x:q(W,F){v W?7.1N({1w:"1x",28:"1x",1v:"1x"},W,F):7.56()},5t:6.C.1l,1l:q(W,F){v W?7.1N({1w:"1l",28:"1l",1v:"1l"},W,F):7.5t()},5R:q(W,F){v 7.1N({1w:"1x"},W,F)},5T:q(W,F){v 7.1N({1w:"1l"},W,F)},5U:q(W,F){v 7.R(q(){u 4g=$(7).3v(":1V")?"1x":"1l";$(7).1N({1w:4g},W,F)})},5Y:q(W,F){v 7.1N({1v:"1x"},W,F)},61:q(W,F){v 7.1N({1v:"1l"},W,F)},62:q(W,2q,F){v 7.1N({1v:2q},W,F)},1N:q(G,W,F){v 7.1p(q(){7.2z=G;E(u p 1o G){u e=17 6.2K(7,6.W(W,F),p);l(G[p].I==4o)e.2Y(e.1f(),G[p]);H e[G[p]](G)}})},1p:q(B,C){l(!C){C=B;B="2K"}v 7.R(q(){l(!7.1p)7.1p={};l(!7.1p[B])7.1p[B]=[];7.1p[B].1i(C);l(7.1p[B].D==1)C.15(7)})}});6.1T({50:q(e,p){l(e.4k)v;l(p=="1w"&&e.4h!=2V(6.1U(e,p)))v;l(p=="28"&&e.5r!=2V(6.1U(e,p)))v;u a=e.1d[p];u o=6.1U(e,p,1);l(p=="1w"&&e.4h!=o||p=="28"&&e.5r!=o)v;e.1d[p]=e.2D?"":"4i";u n=6.1U(e,p,1);l(o!=n&&n!="4i"){e.1d[p]=a;e.4k=V}},W:q(s,o){o=o||{};l(o.I==1e)o={1D:o};u 4p={6d:6e,6f:4m};o.2I=(s&&s.I==4o?s:4p[s])||5b;o.3e=o.1D;o.1D=q(){6.4r(7,"2K");l(o.3e&&o.3e.I==1e)o.3e.15(7)};v o},1p:{},4r:q(J,B){B=B||"2K";l(J.1p&&J.1p[B]){J.1p[B].3z();u f=J.1p[B][0];l(f)f.15(J)}},2K:q(J,2s,G){u z=7;z.o={2I:2s.2I||5b,1D:2s.1D,2o:2s.2o};z.T=J;u y=z.T.1d;z.a=q(){l(2s.2o)2s.2o.15(J,[z.1E]);l(G=="1v"){l(6.1n.3t&&z.1E==1)z.1E=0.6s;l(1Q.5m)y.1k="6t(1v="+z.1E*6u+")";H y.1v=z.1E}H l(2V(z.1E))y[G]=2V(z.1E)+"4W";y.1m="2L"};z.4z=q(){v 3C(6.1g(z.T,G))};z.1f=q(){u r=3C(6.1U(z.T,G));v r&&r>-6C?r:z.4z()};z.2Y=q(3H,2q){z.3P=(17 4I()).4K();z.1E=3H;z.a();z.3K=3A(q(){z.2o(3H,2q)},13)};z.1x=q(p){l(!z.T.1O)z.T.1O={};z.T.1O[G]=7.1f();z.2Y(0,z.T.1O[G]);l(G!="1v")y[G]="6J"};z.1l=q(){l(!z.T.1O)z.T.1O={};z.T.1O[G]=7.1f();z.o.1l=V;z.2Y(z.T.1O[G],0)};l(6.1n.23&&!z.T.2D.6M)y.6O="1";l(!z.T.6P)z.T.4O=6.1g(z.T,"31");y.31="1V";z.2o=q(3V,3T){u t=(17 4I()).4K();l(t>z.o.2I+z.3P){4L(z.3K);z.3K=U;z.1E=3T;z.a();z.T.2z[G]=V;u 1L=V;E(u i 1o z.T.2z)l(z.T.2z[i]!==V)1L=18;l(1L){y.31=z.T.4O;l(z.o.1l)y.1m=\'1Z\';l(z.o.1l){E(u p 1o z.T.2z){y[p]=z.T.1O[p]+(p=="1v"?"":"4W");l(p==\'1w\'||p==\'28\')6.50(z.T,p)}}}l(1L&&z.o.1D&&z.o.1D.I==1e)z.o.1D.15(z.T)}H{u p=(t-7.3P)/z.o.2I;z.1E=((-5a.7f(p*5a.7j)/2)+0.5)*(3T-3V)+3V;z.a()}}}});6.C.7o=q(O,1G,F){7.2J(O,1G,F,1)};6.C.2J=q(O,1G,F,1P){l(O.I==1e)v 7.2U("2J",O);F=F||q(){};u B="49";l(1G){l(1G.I==1e){F=1G;1G=U}H{1G=6.2N(1G);B="4b"}}u 3g=7;6.3n(B,O,1G,q(3h,14){l(14=="2u"||!1P&&14=="58"){3g.5f(3h.2O).R(F,[3h.2O,14]);$("2e",3g).R(q(){l(7.3c)$.4E(7.3c);H 30.4l(1Q,7.42||7.7u||7.2v||"")})}H F.15(3g,[3h.2O,14])},1P);v 7};l(6.1n.23&&45 32=="11")32=q(){v 17 5m(5n.5p.1a("7J 5")>=0?"7P.5u":"7R.5u")};17 q(){u e="4n,5j,5i,5g,5c".4a(\',\');E(u i=0;i0)7G(q(){l(M){M.7M();l(!48)2p("1S");M=U}},6.1S);M.5G(K)},41:0,4f:q(r){4w{v!r.14&&5V.63=="6b:"||(r.14>=4m&&r.14<6i)||r.14==4B||6.1n.35&&r.14==11}55(e){}v 18},4t:q(M,O){4w{u 4C=M.3Y("4x-3D");v M.14==4B||4C==6.2Z[O]||6.1n.35&&M.14==11}55(e){}v 18},3W:q(r,B){u 46=r.3Y("7v-B");u K=!B&&46&&46.1a("M")>=0;K=B=="M"||K?r.5B:r.2O;l(B=="2e")30.4l(1Q,K);l(B=="6K")30("K = "+K);v K},2N:q(a){u s=[];l(a.I==2r){E(u i=0;i '+
- '';
+ $(this.element).html(''+
+ '
'+
+ '');
}
/**
* Set the percentage and status message for the progressbar.
*/
-progressBar.prototype.setProgress = function (percentage, message) {
- var divs = this.element.getElementsByTagName('div');
- var div;
- for (var i = 0; div = divs[i]; ++i) {
- 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;
- }
+Drupal.progressBar.prototype.setProgress = function (percentage, message) {
+ if (percentage >= 0 && percentage <= 100) {
+ $('div.filled', this.element).css('width', percentage +'%');
+ $('div.percentage', this.element).html(percentage +'%');
}
+ $('div.message', this.element).html(message);
if (this.updateCallback) {
this.updateCallback(percentage, message, this);
}
@@ -52,7 +42,7 @@ function progressBar(id, updateCallback,
/**
* Start monitoring progress via Ajax.
*/
-progressBar.prototype.startMonitoring = function (uri, delay) {
+Drupal.progressBar.prototype.startMonitoring = function (uri, delay) {
this.delay = delay;
this.uri = uri;
this.sendPing();
@@ -61,7 +51,7 @@ function progressBar(id, updateCallback,
/**
* Stop monitoring progress via Ajax.
*/
-progressBar.prototype.stopMonitoring = function () {
+Drupal.progressBar.prototype.stopMonitoring = function () {
clearTimeout(this.timer);
// This allows monitoring to be stopped from within the callback
this.uri = null;
@@ -70,47 +60,44 @@ function progressBar(id, updateCallback,
/**
* Request progress data from server.
*/
-progressBar.prototype.sendPing = function () {
+Drupal.progressBar.prototype.sendPing = function () {
if (this.timer) {
clearTimeout(this.timer);
}
if (this.uri) {
- this.method(this.uri, this.receivePing, this, '');
- }
-}
-
-/**
- * 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
- var progress = parseJson(string);
- // Display errors
- if (progress.status == 0) {
- pb.displayError(progress.data);
- return;
+ var pb = this;
+ $.ajax({
+ type: this.method,
+ url: this.uri,
+ success: function (xmlhttp) {
+ // Parse response
+ var progress = Drupal.parseJson(xmlhttp.responseText);
+ // Display errors
+ if (progress.status == 0) {
+ pb.displayError(progress.data);
+ return;
+ }
+ // Update display
+ pb.setProgress(progress.percentage, progress.message);
+ // Schedule next timer
+ pb.timer = setTimeout(function() { pb.sendPing(); }, pb.delay);
+ },
+ error: function (xmlhttp) {
+ pb.displayError('An HTTP error '+ xmlhttp.status +' occured.\n'+ pb.uri);
+ }
+ });
}
-
- // Update display
- pb.setProgress(progress.percentage, progress.message);
- // Schedule next timer
- pb.timer = setTimeout(function() { pb.sendPing(); }, pb.delay);
}
/**
* Display errors on the page.
*/
-progressBar.prototype.displayError = function (string) {
+Drupal.progressBar.prototype.displayError = function (string) {
var error = document.createElement('div');
error.className = 'error';
error.innerHTML = string;
- this.element.style.display = 'none';
- this.element.parentNode.insertBefore(error, this.element);
+ $(this.element).before(error).hide();
if (this.errorCallback) {
this.errorCallback(this);
Index: misc/textarea.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/textarea.js,v
retrieving revision 1.9
diff -u -F^f -r1.9 textarea.js
--- misc/textarea.js 14 Apr 2006 13:48:56 -0000 1.9
+++ misc/textarea.js 23 Sep 2006 13:57:10 -0000
@@ -1,122 +1,34 @@
-// $Id: textarea.js,v 1.9 2006/04/14 13:48:56 killes Exp $
+// $Id: textarea.js,v 1.11 2006/09/07 08:05:31 dries Exp $
-if (isJsEnabled()) {
- addLoadEvent(textAreaAutoAttach);
-}
-
-function textAreaAutoAttach(event, parent) {
- if (typeof parent == 'undefined') {
- // Attach to all visible textareas.
- 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);
- }
+Drupal.textareaAttach = function() {
+ $('textarea.resizable:not(.processed)').each(function() {
+ var textarea = $(this).addClass('processed'), staticOffset = null;
+
+ $(this).wrap('')
+ .parent().append($('').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 textArea(element) {
- var ta = this;
- this.element = element;
- 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 (document.isDragging) {
- 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';
+ function performDrag(e) {
+ textarea.height(Math.max(32, staticOffset + Drupal.mousePosition(e).y) + 'px');
+ return false;
+ }
- // Avoid text selection
- stopEvent(event);
+ function endDrag(e) {
+ $(document).unmousemove(performDrag).unmouseup(endDrag);
+ textarea.css('opacity', 1);
+ }
+ });
}
-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;
+if (Drupal.jsEnabled) {
+ $(document).ready(Drupal.textareaAttach);
}
-
Index: misc/update.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/update.js,v
retrieving revision 1.8
diff -u -F^f -r1.8 update.js
--- misc/update.js 28 Mar 2006 09:29:23 -0000 1.8
+++ misc/update.js 23 Sep 2006 13:57:10 -0000
@@ -1,12 +1,11 @@
-// $Id: update.js,v 1.8 2006/03/28 09:29:23 killes Exp $
+// $Id: update.js,v 1.9 2006/08/31 23:31:25 unconed Exp $
-if (isJsEnabled()) {
- addLoadEvent(function() {
- if ($('edit-has_js')) {
- $('edit-has_js').value = 1;
- }
+if (Drupal.jsEnabled) {
+ $(document).ready(function() {
+ $('#edit-has_js').each(function() { this.value = 1; });
+ $('#progress').each(function () {
+ var holder = this;
- if ($('progress')) {
// Success: redirect to the summary.
var updateCallback = function (progress, status, pb) {
if (progress == 100) {
@@ -19,15 +18,15 @@
var errorCallback = function (pb) {
var div = document.createElement('p');
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 update summary';
- $('progress').insertBefore(div, $('progress').firstChild);
- $('wait').style.display = 'none';
+ $(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 update summary');
+ $(holder).prepend(div);
+ $('#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').appendChild(progress.element);
+ $(holder).append(progress.element);
progress.startMonitoring('update.php?op=do_update', 0);
- }
+ });
});
}
Index: misc/upload.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/upload.js,v
retrieving revision 1.8.2.1
diff -u -F^f -r1.8.2.1 upload.js
--- misc/upload.js 5 May 2006 11:57:19 -0000 1.8.2.1
+++ misc/upload.js 23 Sep 2006 13:57:10 -0000
@@ -1,75 +1,116 @@
-// $Id: upload.js,v 1.8.2.1 2006/05/05 11:57:19 killes Exp $
-
-// Global killswitch
-if (isJsEnabled()) {
- addLoadEvent(uploadAutoAttach);
-}
+// $Id: upload.js,v 1.11 2006/08/31 23:31:25 unconed Exp $
/**
* Attaches the upload behaviour to the upload form.
*/
-function uploadAutoAttach() {
- var inputs = document.getElementsByTagName('input');
- for (i = 0; input = inputs[i]; i++) {
- if (input && hasClass(input, 'upload')) {
- var uri = input.value;
- // Extract the button ID based on a substring of the input name: edit[foo][bar] -> foo-bar
- var button = input.name.substr(5, input.name.length - 6).replace('][', '-');
- var wrapper = button + '-wrapper';
- var hide = button + '-hide';
- var upload = new jsUpload(uri, button, wrapper, hide);
- }
- }
+Drupal.uploadAutoAttach = function() {
+ $('input.upload').each(function () {
+ var uri = this.value;
+ // Extract the base name from the id (edit-attach-url -> attach).
+ var base = this.id.substring(5, this.id.length - 4);
+ var button = base + '-button';
+ var wrapper = base + '-wrapper';
+ var hide = base + '-hide';
+ var upload = new Drupal.jsUpload(uri, button, wrapper, hide);
+ });
}
/**
* JS upload object.
*/
-function jsUpload(uri, button, wrapper, hide) {
- this.button = button;
- this.wrapper = wrapper;
- this.hide = hide;
- redirectFormButton(uri, $(button), this);
+Drupal.jsUpload = function(uri, button, wrapper, hide) {
+ // Note: these elements are replaced after an upload, so we re-select them
+ // everytime they are needed.
+ this.button = '#'+ button;
+ this.wrapper = '#'+ wrapper;
+ this.hide = '#'+ hide;
+ Drupal.redirectFormButton(uri, $(this.button).get(0), this);
}
/**
* Handler for the form redirection submission.
*/
-jsUpload.prototype.onsubmit = function () {
- var hide = $(this.hide);
+Drupal.jsUpload.prototype.onsubmit = function () {
// 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.element.style.width = '28em';
- this.progress.element.style.height = hide.offsetHeight +'px';
- hide.parentNode.insertBefore(this.progress.element, hide);
- // Hide file form (cannot use display: none, this mysteriously aborts form
- // submission in Konqueror)
- hide.style.position = 'absolute';
- hide.style.left = '-2000px';
+
+ var hide = this.hide;
+ var el = this.progress.element;
+ var offset = $(hide).get(0).offsetHeight;
+ $(el).css({
+ width: '28em',
+ 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.
*/
-jsUpload.prototype.oncomplete = function (data) {
- // Remove progressbar
- removeNode(this.progress.element);
- this.progress = null;
- // Replace form and re-attach behaviour
- $(this.wrapper).innerHTML = data;
- uploadAutoAttach();
+Drupal.jsUpload.prototype.oncomplete = function (data) {
+ // Remove old form
+ Drupal.freezeHeight(); // Avoid unnecessary scrolling
+ $(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
+ $(div).hide();
+ $(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.
*/
-jsUpload.prototype.onerror = function (error) {
+Drupal.jsUpload.prototype.onerror = function (error) {
alert('An error occurred:\n\n'+ error);
// Remove progressbar
- removeNode(this.progress.element);
+ $(this.progress.element).remove();
this.progress = null;
// Undo hide
- $(this.hide).style.position = 'static';
- $(this.hide).style.left = '0px';
+ $(this.hide).css({
+ position: 'static',
+ left: '0px'
+ });
+}
+
+
+// Global killswitch
+if (Drupal.jsEnabled) {
+ $(document).ready(Drupal.uploadAutoAttach);
}