Changeset 7176

Timestamp:

03/06/08 23:01:22 (9 months ago)

Author:

ryan

Message:

Make cancel mean cancel. Props mdawaffe. see #5886

Files:

• trunk/wp-admin/js/widgets.js (modified) (7 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)
• trunk/wp-includes/widgets.php (modified) (4 diffs)

trunk/wp-admin/js/widgets.js

@@ -5 +5 @@
-
-    // Open or close widget control form
-
+, disableFields
-        var width = li.find('input.widget-width').val();
-
@@ -12 +12 @@
-            var t = $(this);
-            if ( t.is(':visible') ) {
+                if ( disableFields ) { t.find( ':enabled' ).not( '[name="widget-id[]"]' ).attr( 'disabled', 'disabled' ); }
-                li.css( 'marginLeft', 0 );
-                t.siblings('h4').children('a').text( widgetsL10n.edit );
-            } else {
+                t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
-                if ( width > 250 )
-                    li.css( 'marginLeft', ( width - 250 ) * -1 );
@@ -24 +26 @@
-
-            if ( t.is(':visible') ) {
+                if ( disableFields ) { t.find( ':enabled' ).not( '[name="widget-id[]"]' ).attr( 'disabled', 'disabled' ); }
-                if ( width > 250 )
-                    li.animate( { marginLeft: 0 } );
-                t.siblings('h4').children('a').text( widgetsL10n.edit );
-            } else {
+                t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
-                if ( width > 250 )
-                    li.animate( { marginLeft: ( width - 250 ) * -1 } );
@@ -38 +42 @@
-    };
-
-
+/cancel
-    var editClick = function() {
-        var q = wpAjax.unserialize( this.href );
@@ -44 +48 @@
-        if ( ( q.sidebar && q.sidebar == $('#sidebar').val() ) || q.add ) {
-            var w = q.edit || q.add;
-
+, false
-            return false;
-        } else if ( q.sidebar ) { // otherwise, redirect to correct page
@@ -51 +55 @@
-
-        // If link is in current widgets list, just open the form
-
+, true
-        return false;
-    };
@@ -93 +97 @@
-        // onclick for save links
-        $('a.widget-control-save', context).click( function() {
-
+, false
-            return false;
-        } );

trunk/wp-includes/script-loader.php

@@ -173 +173 @@
-                'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
-            ) );
-109
+305
-            $this->localize( 'admin-widgets', 'widgetsL10n', array(
-                'add' => __('Add'),

trunk/wp-includes/widgets.php

@@ -609 +609 @@
-            if ( 'wp_widget_text' == $wp_registered_widgets[$_widget_id]['callback'] && isset($wp_registered_widgets[$_widget_id]['params'][0]['number']) ) {
-                $widget_number = $wp_registered_widgets[$_widget_id]['params'][0]['number'];
-
+
+
-            }
-        }
@@ -744 +745 @@
-            if ( 'wp_widget_categories' == $wp_registered_widgets[$_widget_id]['callback'] && isset($wp_registered_widgets[$_widget_id]['params'][0]['number']) ) {
-                $widget_number = $wp_registered_widgets[$_widget_id]['params'][0]['number'];
-
+
+
-            }
-        }
@@ -1163 +1165 @@
-            if ( 'wp_widget_rss' == $wp_registered_widgets[$_widget_id]['callback'] && isset($wp_registered_widgets[$_widget_id]['params'][0]['number']) ) {
-                $widget_number = $wp_registered_widgets[$_widget_id]['params'][0]['number'];
-
+
+
-            }
-        }
@@ -1451 +1454 @@
-            if ( 'widget_many' == $wp_registered_widgets[$_widget_id]['callback'] && isset($wp_registered_widgets[$_widget_id]['params'][0]['number']) ) {
-                $widget_number = $wp_registered_widgets[$_widget_id]['params'][0]['number'];
-
+
+
-            }
-        }