Changeset 1996

Timestamp:

03/14/2009 03:19:11 AM (17 years ago)

Author:

sambauers

Message:

Updated Javascript from WordPress

Location:

trunk/bb-includes/js

Files:

• wp-ajax-response.js (modified) (4 diffs)
• wp-lists.js (modified) (21 diffs)

trunk/bb-includes/js/wp-ajax-response.js

@@ -1 @@
-wpAjax = jQuery.extend( {
+var wpAjax = jQuery.extend( {
     unserialize: function( s ) {
-        var r = {}; if ( !s ) { return r; }
-        var q = s.split('?'); if ( q[1] ) { s = q[1]; }
-        var pp = s.split('&');
-        for ( var i in pp ) {
+        var r = {}, q, pp, i, p;
+        if ( !s ) { return r; }
+        q = s.split('?'); if ( q[1] ) { s = q[1]; }
+        pp = s.split('&');
+        for ( i in pp ) {
             if ( jQuery.isFunction(pp.hasOwnProperty) && !pp.hasOwnProperty(i) ) { continue; }
-            var p = pp[i].split('=');
+            p = pp[i].split('=');
             r[p[0]] = p[1];
         }
@@ -12 +13 @@
     },
     parseAjaxResponse: function( x, r, e ) { // 1 = good, 0 = strange (bad data?), -1 = you lack permission
-        var parsed = {};
-        var re = jQuery('#' + r).html('');
+        var parsed = {}, re = jQuery('#' + r).html(''), err = '';
+
         if ( x && typeof x == 'object' && x.getElementsByTagName('wp_ajax') ) {
             parsed.responses = [];
             parsed.errors = false;
-            var err = '';
             jQuery('response', x).each( function() {
-                var th = jQuery(this);
-                var child = jQuery(this.firstChild);
-                var response = { action: th.attr('action'), what: child.get(0).nodeName, id: child.attr('id'), oldId: child.attr('old_id'), position: child.attr('position') };
+                var th = jQuery(this), child = jQuery(this.firstChild), response;
+                response = { action: th.attr('action'), what: child.get(0).nodeName, id: child.attr('id'), oldId: child.attr('old_id'), position: child.attr('position') };
                 response.data = jQuery( 'response_data', child ).text();
                 response.supplemental = {};
@@ -29 +28 @@
                 response.errors = [];
                 if ( !jQuery('wp_error', child).each( function() {
-                    var code = jQuery(this).attr('code');
-                    var anError = { code: code, message: this.firstChild.nodeValue, data: false };
-                    var errorData = jQuery('wp_error_data[code="' + code + '"]', x);
+                    var code = jQuery(this).attr('code'), anError, errorData, formField;
+                    anError = { code: code, message: this.firstChild.nodeValue, data: false };
+                    errorData = jQuery('wp_error_data[code="' + code + '"]', x);
                     if ( errorData ) { anError.data = errorData.get(); }
-                    var formField = jQuery( 'form-field', errorData ).text();
+                    formField = jQuery( 'form-field', errorData ).text();
                     if ( formField ) { code = formField; }
                     if ( e ) { wpAjax.invalidateForm( jQuery('#' + e + ' :input[name="' + code + '"]' ).parents('.form-field:first') ); }
@@ -56 +55 @@
     validateForm: function( selector ) {
         selector = jQuery( selector );
-        return !wpAjax.invalidateForm( selector.find('.form-required').andSelf().filter('.form-required:has(:input[value=""]), .form-required:input[value=""]') ).size();
+        return !wpAjax.invalidateForm( selector.find('.form-required').filter( function() { return jQuery('input:visible', this).val() == ''; } ) ).size();
     }
 }, wpAjax || { noPerm: 'You do not have permission to do that.', broken: 'An unidentified error has occurred.' } );
+
+// Basic form validation
+jQuery(document).ready( function($){
+    $('form.validate').submit( function() { return wpAjax.validateForm( $(this) ); } );
+});

trunk/bb-includes/js/wp-lists.js

@@ -1 +1 @@
 (function($) {
-var currentFormEl = false;
-var fs = {add:'ajaxAdd',del:'ajaxDel',dim:'ajaxDim',process:'process',recolor:'recolor'};
-
-var wpList = {
+var currentFormEl = false, fs = {add:'ajaxAdd',del:'ajaxDel',dim:'ajaxDim',process:'process',recolor:'recolor'}, wpList;
+
+wpList = {
     settings: {
         url: wpListL10n.url, type: 'POST',
@@ -34 +33 @@
 
     pre: function(e,s,a) {
-        var bg; var r;
+        var bg, r;
         s = $.extend( {}, this.wpList.settings, {
             element: null,
@@ -53 +52 @@
 
     ajaxAdd: function( e, s ) {
-        var list = this; e = $(e); s = s || {};
-        var cls = wpList.parseClass(e,'add');
+        e = $(e);
+        s = s || {};
+        var list = this, cls = wpList.parseClass(e,'add'), es, valid, formData;
         s = wpList.pre.call( list, e, s, 'add' );
 
@@ -71 +71 @@
         s.nonce = wpList.nonce(e,s);
 
-        var es = $('#' + s.element + ' :input').not('[name=_ajax_nonce], [name=_wpnonce], [name=action]');
-        var valid = wpAjax.validateForm( '#' + s.element );
+        es = $('#' + s.element + ' :input').not('[name=_ajax_nonce], [name=_wpnonce], [name=action]');
+        valid = wpAjax.validateForm( '#' + s.element );
         if ( !valid ) { return false; }
 
         s.data = $.param( $.extend( { _ajax_nonce: s.nonce, action: s.action }, wpAjax.unserialize( cls[4] || '' ) ) );
-        var formData = $.isFunction(es.fieldSerialize) ? es.fieldSerialize() : es.serialize();
+        formData = $.isFunction(es.fieldSerialize) ? es.fieldSerialize() : es.serialize();
         if ( formData ) { s.data += '&' + formData; }
 
@@ -86 +86 @@
 
         s.success = function(r) {
-            var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+            var res = wpAjax.parseAjaxResponse(r, s.response, s.element), o;
             if ( !res || res.errors ) { return false; }
 
@@ -100 +100 @@
 
             if ( $.isFunction(s.addAfter) ) {
-                var o = this.complete;
+                o = this.complete;
                 this.complete = function(x,st) {
                     var _s = $.extend( { xml: x, status: st, parsed: res }, s );
@@ -116 +116 @@
 
     ajaxDel: function( e, s ) {
-        var list = this; e = $(e); s = s || {};
-        var cls = wpList.parseClass(e,'delete');
+        e = $(e); s = s || {};
+        var list = this, cls = wpList.parseClass(e,'delete'), element, anim;
         s = wpList.pre.call( list, e, s, 'delete' );
 
@@ -141 +141 @@
         if ( !s.data._ajax_nonce ) { return true; }
 
-        var element = $('#' + s.element);
+        element = $('#' + s.element);
 
         if ( 'none' != s.delColor ) {
-            var anim = 'slideUp';
+            anim = 'slideUp';
             if ( element.css( 'display' ).match(/table/) )
                 anim = 'fadeOut'; // Can't slideup table rows and other table elements.  Known jQuery bug
@@ -155 +155 @@
 
         s.success = function(r) {
-            var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+            var res = wpAjax.parseAjaxResponse(r, s.response, s.element), o;
             if ( !res || res.errors ) {
                 element.stop().stop().css( 'backgroundColor', '#FF3333' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
@@ -161 +161 @@
             }
             if ( $.isFunction(s.delAfter) ) {
-                var o = this.complete;
+                o = this.complete;
                 this.complete = function(x,st) {
                     element.queue( function() {
@@ -178 +178 @@
         if ( $(e).parent().css('display') == 'none' ) // Prevent hidden links from being clicked by hotkeys
             return false;
-        var list = this; e = $(e); s = s || {};
-        var cls = wpList.parseClass(e,'dim');
+        e = $(e); s = s || {};
+        var list = this, cls = wpList.parseClass(e,'dim'), element, isClass, color, dimColor;
         s = wpList.pre.call( list, e, s, 'dim' );
 
@@ -205 +205 @@
         }
 
-        var element = $('#' + s.element);
-        var isClass = element.toggleClass(s.dimClass).is('.' + s.dimClass);
-        var color = wpList.getColor( element );
+        element = $('#' + s.element);
+        isClass = element.toggleClass(s.dimClass).is('.' + s.dimClass);
+        color = wpList.getColor( element );
         element.toggleClass( s.dimClass )
-        var dimColor = isClass ? s.dimAddColor : s.dimDelColor;
+        dimColor = isClass ? s.dimAddColor : s.dimDelColor;
         if ( 'none' != dimColor ) {
             element
@@ -220 +220 @@
 
         s.success = function(r) {
-            var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+            var res = wpAjax.parseAjaxResponse(r, s.response, s.element), o;
             if ( !res || res.errors ) {
                 element.stop().stop().css( 'backgroundColor', '#FF3333' )[isClass?'removeClass':'addClass'](s.dimClass).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
@@ -226 +226 @@
             }
             if ( $.isFunction(s.dimAfter) ) {
-                var o = this.complete;
+                o = this.complete;
                 this.complete = function(x,st) {
                     element.queue( function() {
@@ -255 +255 @@
 
     add: function( e, s ) {
-        var list = $(this);
         e = $(e);
 
-        var old = false;
-        var _s = { pos: 0, id: 0, oldId: null };
+        var list = $(this), old = false, _s = { pos: 0, id: 0, oldId: null }, ba, ref, color;
         if ( 'string' == typeof s ) { s = { what: s }; }
         s = $.extend(_s, this.wpList.settings, s);
@@ -269 +267 @@
             old.replaceWith(e);
         } else if ( isNaN(s.pos) ) {
-            var ba = 'after';
+            ba = 'after';
             if ( '-' == s.pos.substr(0,1) ) {
                 s.pos = s.pos.substr(1);
                 ba = 'before';
             }
-            var ref = list.find( '#' + s.pos );
+            ref = list.find( '#' + s.pos );
             if ( 1 === ref.size() ) { ref[ba](e); }
             else { list.append(e); }
@@ -289 +287 @@
 
         if ( 'none' != s.addColor ) {
-            var color = wpList.getColor( e );
+            color = wpList.getColor( e );
             e.css( 'backgroundColor', s.addColor ).animate( { backgroundColor: color }, { complete: function() { $(this).css( 'backgroundColor', '' ); } } );
         }
@@ -297 +295 @@
 
     clear: function(e) {
-        var list = this;
+        var list = this, t, tag;
         e = $(e);
         if ( list.wpList && e.parents( '#' + list.id ).size() ) { return; }
@@ -303 +301 @@
             if ( $(this).parents('.form-no-clear').size() )
                 return;
-            var t = this.type.toLowerCase(); var tag = this.tagName.toLowerCase();
+            t = this.type.toLowerCase();
+            tag = this.tagName.toLowerCase();
             if ( 'text' == t || 'password' == t || 'textarea' == tag ) { this.value = ''; }
             else if ( 'checkbox' == t || 'radio' == t ) { this.checked = false; }
@@ -315 +314 @@
             .filter('form').submit( function() { return list.wpList.add(this); } ).end()
             .not('form').click( function() { return list.wpList.add(this); } ).each( function() {
-                var addEl = this;
-                var c = wpList.parseClass(this,'add')[2] || addEl.id;
+                var addEl = this, c = wpList.parseClass(this,'add')[2] || addEl.id, forms = [], ins = [];
                 if ( !c ) { return; }
-                var forms = []; var ins = []; // this is all really inefficient
+                // this is all really inefficient
                 $('#' + c + ' :input').focus( function() { currentFormEl = this; } ).blur( function() { currentFormEl = false; } ).each( function() {
                     ins.push(this);
@@ -337 +335 @@
 
     recolor: function() {
-        var list = this;
+        var list = this, items, eo;
         if ( !list.wpList.settings.alt ) { return; }
-        var items = $('.list-item:visible', list);
+        items = $('.list-item:visible', list);
         if ( !items.size() ) { items = $(list).children(':visible'); }
-        var eo = [':even',':odd'];
+        eo = [':even',':odd'];
         if ( list.wpList.settings.altOffset % 2 ) { eo.reverse(); }
         items.filter(eo[0]).addClass(list.wpList.settings.alt).end().filter(eo[1]).removeClass(list.wpList.settings.alt);