summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/book/book.js11
-rw-r--r--modules/color/color.js2
-rw-r--r--modules/comment/comment.js2
-rw-r--r--modules/node/node.admin.inc2
-rw-r--r--modules/node/node.js12
-rw-r--r--modules/system/system.js2
-rw-r--r--modules/upload/upload.module2
-rw-r--r--modules/user/user.admin.inc2
-rw-r--r--modules/user/user.js2
9 files changed, 15 insertions, 22 deletions
diff --git a/modules/book/book.js b/modules/book/book.js
index a0524b572..ada21404d 100644
--- a/modules/book/book.js
+++ b/modules/book/book.js
@@ -24,9 +24,12 @@ Drupal.bookFillSelect = function() {
pb.setProgress(-1, Drupal.t('Updating parents...'));
$('#edit-book-plid-wrapper').html(pb.element);
- $.get(Drupal.settings.book.formCallback +'/'+ $('#'+ Drupal.settings.book.formId +' input[@name=form_build_id]').val() +'/'+ $('#edit-book-bid').val(), {}, function(data) {
- parsedData = Drupal.parseJson(data);
- // Insert the new select, and remove the progress bar.
- $('#edit-book-plid-wrapper').after(parsedData['book']).remove();
+ $.ajax({
+ url: Drupal.settings.book.formCallback +'/'+ $('#'+ Drupal.settings.book.formId +' input[name=form_build_id]').val() +'/'+ $('#edit-book-bid').val(),
+ dataType: 'json',
+ success: function(data) {
+ // Insert the new select, and remove the progress bar.
+ $('#edit-book-plid-wrapper').after(data['book']).remove();
+ }
});
};
diff --git a/modules/color/color.js b/modules/color/color.js
index c64f41481..38148160d 100644
--- a/modules/color/color.js
+++ b/modules/color/color.js
@@ -188,7 +188,7 @@ Drupal.behaviors.color = function (context) {
// Add new bindings
focused = this;
- farb.linkTo(function (color) { callback(input, color, true, false) });
+ farb.linkTo(function (color) { callback(input, color, true, false); });
farb.setColor(this.value);
$(focused).keyup(farb.updateValue).keyup(preview).keyup(resetScheme)
.parent().addClass('item-selected');
diff --git a/modules/comment/comment.js b/modules/comment/comment.js
index ead327ec9..cb1d1ab20 100644
--- a/modules/comment/comment.js
+++ b/modules/comment/comment.js
@@ -6,7 +6,7 @@ Drupal.behaviors.comment = function (context) {
for (i=0;i<3;i++) {
cookie = Drupal.comment.getCookie('comment_info_' + parts[i]);
if (cookie != '') {
- $("#comment-form input[@name=" + parts[i] + "]:not(.comment-processed)", context)
+ $("#comment-form input[name=" + parts[i] + "]:not(.comment-processed)", context)
.val(cookie)
.addClass('comment-processed');
}
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index b2c39568c..eeac16e56 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -268,7 +268,7 @@ function node_filter_form() {
$form['filters']['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset'));
}
- drupal_add_js(drupal_get_path('module', 'node') .'/node.js');
+ drupal_add_js('misc/form.js', 'core');
return $form;
}
diff --git a/modules/node/node.js b/modules/node/node.js
deleted file mode 100644
index b8b352000..000000000
--- a/modules/node/node.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-if (Drupal.jsEnabled) {
- $(function() {
- // Automatically selects the right radio button in the filter section of
- // the admin content list.
- $('#node-admin-filter select').change(function() {
- $('#node-admin-filter input:radio[@value="'+ this.id.substr(5) +'"]')
- .attr('checked', true);
- });
- });
-}
diff --git a/modules/system/system.js b/modules/system/system.js
index d261b49e1..2db886eee 100644
--- a/modules/system/system.js
+++ b/modules/system/system.js
@@ -41,7 +41,7 @@ Drupal.behaviors.cleanURLsSettingsCheck = function(context) {
*/
Drupal.cleanURLsInstallCheck = function() {
var pathname = location.pathname +"";
- var url = pathname.replace(/\/[^/]*$/, "/") +"node";
+ var url = pathname.replace(/\/[^\/]*$/, "/") +"node";
$("#clean-url .description").append('<span><div id="testing">'+ Drupal.settings.cleanURL.testing +"</div></span>");
$("#clean-url.install").css("display", "block");
$.ajax({url: location.protocol +"//"+ location.host + url, type: "GET", data: " ", complete: function(response) {
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index becab2228..7fefac962 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -585,7 +585,7 @@ function upload_js() {
$output = theme('status_messages') . drupal_render($form);
// We send the updated file attachments form.
- // Don't call drupal_json(). upload.js uses an iframe and
+ // Don't call drupal_json(). ahah.js uses an iframe and
// the header output by drupal_json() causes problems in some browsers.
print drupal_to_js(array('status' => TRUE, 'data' => $output));
exit;
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 1ec09bf1f..c0174618b 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -83,6 +83,8 @@ function user_filter_form() {
);
}
+ drupal_add_js('misc/form.js', 'core');
+
return $form;
}
diff --git a/modules/user/user.js b/modules/user/user.js
index 21b2b96ca..371474d7c 100644
--- a/modules/user/user.js
+++ b/modules/user/user.js
@@ -181,7 +181,7 @@ Drupal.setDefaultTimezone = function() {
* "Picture support" radio buttons.
*/
Drupal.behaviors.userSettings = function (context) {
- $('div.user-admin-picture-radios input[@type=radio]:not(.userSettings-processed)', context).addClass('userSettings-processed').click(function () {
+ $('div.user-admin-picture-radios input[type=radio]:not(.userSettings-processed)', context).addClass('userSettings-processed').click(function () {
$('div.user-admin-picture-settings', context)[['hide', 'show'][this.value]]();
});
};