Changeset 6582

Timestamp:

01/09/2008 12:12:35 PM (17 years ago)

Author:

matt

Message:

Replacing FAT with jQuery effects, new styling for alerts. See #5369.

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/js/common.js (added)
• wp-admin/wp-admin.css (modified) (3 diffs)
• wp-includes/js/fat.js (deleted)
• wp-includes/js/jquery/jquery.color.js (added)
• wp-includes/js/wp-lists.js (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (3 diffs)

trunk/wp-admin/admin.php

@@ -29 +29 @@
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
 
-wp_enqueue_script( 'fat' );
+wp_enqueue_script( 'common' );
+wp_enqueue_script( 'jquery-color' );
 
 $editing = false;

trunk/wp-admin/wp-admin.css

@@ -318 +318 @@
 
 .updated {
-    background: #ddedfa;
-    border: 1px solid #c6d9e9;
+    background: #ffffe0;
+    border: 1px solid #e6db55;
 }
 
 .updated a {
-    color: #448abd;
-    font-weight: bold;
+    color: #2583ad;
+    text-decoration: none;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #2583ad;
 }
 
@@ -1178 +1180 @@
 
 #poststuff h2 {
+    margin-top: 20px;
     margin-bottom: 20px;
 }
@@ -1275 +1278 @@
     background-color:#2583ad;
     background-image:url(images/toggle-arrow.gif);
-    background-position: 5px 18px;
-}
+    background-position: 4px 18px;
+}

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

@@ -173 +173 @@
         if ( !s.data._ajax_nonce ) { return true; }
 
-        var func = function() { $('#' + s.element).css( 'background-color', '' ).hide(); list.wpList.recolor(); };
+        var func = function() { list.wpList.recolor(); };
         var hideTO = -1;
         if ( 'none' != s.delColor ) {
-            Fat.fade_element(s.element,null,700,s.delColor);
-            hideTO = setTimeout(func, 705);
+            $('#' + s.element).animate( { backgroundColor:  s.delColor }, 100 ).slideUp();
+            hideTO = setTimeout(func, 500);
         } else {
             func();
@@ -228 +228 @@
         }
 
+        var thisclass = $('#' + s.element).attr('class');
+        if ( thisclass && thisclass.match(/alternate/) )
+            var color = '#f1f1f1';
+        else
+            var color =  '#fff';
+        var isClass = $('#' + s.element).toggleClass(s.dimClass).is('.' + s.dimClass);
+        if ( isClass && 'none' != s.dimAddColor ) { 
+            $('#' + s.element).animate( { backgroundColor:  s.dimAddColor }, 50 ).animate( { backgroundColor: color }, 400 );
+        }
+        else if ( !isClass && 'none' != s.dimDelColor ) {
+            $('#' + s.element).animate( { backgroundColor:  s.dimDelColor }, 50 ).animate( { backgroundColor: color }, 400 );
+        }
+
         if ( !s.data._ajax_nonce ) { return true; }
-
-        var isClass = $('#' + s.element).toggleClass(s.dimClass).is('.' + s.dimClass);
-        if ( isClass && 'none' != s.dimAddColor ) { Fat.fade_element(s.element,null,700,s.dimAddColor); }
-        else if ( !isClass && 'none' != s.dimDelColor ) { Fat.fade_element(s.element,null,700,s.dimDelColor); }
-
-        var dimTO = setTimeout( function() { $('#' + s.element).css( 'background-color', '' ); }, 705 );
 
         s.success = function(r) {
@@ -303 +310 @@
             var b = e.css( 'background-color' );
             if ( b == 'transparent' ) { b = ''; }
-            Fat.fade_element(e.attr('id'),null,700,s.addColor);
-            setTimeout( function() {
-                var g = e.css( 'background-color', '' ).css( 'background-color' );
-                if ( b != g ) { e.css( 'background-color', b ); }
-            }, 705 );
+            
+            $('#' + s.element).css('background-color', s.addColor).animate( { backgroundColor: '#fff' }, 300 );
         }
         list.each( function() { this.wpList.process( e ); } );

trunk/wp-includes/script-loader.php

@@ -12 +12 @@
 
     function default_scripts() {
-        $this->add( 'fat', '/wp-includes/js/fat.js', false, '1.0-RC1_3660' );
-
+        $this->add( 'common', '/wp-admin/js/common.js', false, '1.0' );
         $this->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
 
@@ -57 +56 @@
         ) );
 
-        $this->add( 'listman', '/wp-includes/js/list-manipulation.js', array('wp-ajax', 'fat'), '20070306' );
+        $this->add( 'listman', '/wp-includes/js/list-manipulation.js', array('wp-ajax', 'jquery-color'), '20070306' );
         $this->localize( 'listman', 'listManL10n', array(
             'jumpText' => __('Jump to new item'),
@@ -79 +78 @@
         $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118');
 
-        $this->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.2.2b2');
+        $this->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.2.2b2-color');
         $this->add( 'jquery-form', '/wp-includes/js/jquery/jquery.form.js', array('jquery'), '2.02');
+        $this->add( 'jquery-color', '/wp-includes/js/jquery/jquery.color.js', array('jquery'), '2.0');
         $this->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2' );
         $this->add( 'dimensions', '/wp-includes/js/jquery/jquery.dimensions.min.js', array('jquery'), '1.1.2');