Changeset 9578
- Timestamp:
- 11/09/2008 02:54:39 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 1 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/css/colors-classic.css
r9548 r9578 1 1 2 2 .find-box-search { 3 background-color: #e4f2fd; 4 border-color: #c6d9e9; 3 border-color: #dfdfdf; 4 background-color: #f1f1f1; 5 } 6 7 .find-box { 8 background-color: #f1f1f1; 9 } 10 11 .find-box-inside { 12 background-color: #fff; 5 13 } 6 14 … … 11 19 body, 12 20 #wpbody, 13 .form-table .pre, 14 .find-box-inside { 21 .form-table .pre { 15 22 color: #333; 16 23 } … … 40 47 #poststuff .inside .approved { 41 48 color: green; 49 } 50 51 #postcustomstuff table { 52 border-color: #dfdfdf; 53 background-color: #F9F9F9; 54 } 55 56 #postcustomstuff thead th { 57 background-color: #F1F1F1; 58 } 59 60 #postcustomstuff table input, 61 #postcustomstuff table textarea { 62 border-color: #dfdfdf; 63 background-color: #fff; 42 64 } 43 65 … … 245 267 } 246 268 247 .button { 269 .button, 270 .submit input { 248 271 border-color: #DCDCDC; 249 272 color: #464646; … … 258 281 259 282 .button, 283 .submit input, 260 284 .button-secondary { 261 285 background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; … … 268 292 } 269 293 270 .button[disabled], .button:disabled { 294 .button[disabled], 295 .button:disabled { 271 296 background-color: #999; 272 297 } 273 298 274 299 .button:hover, 275 #edit-slug-buttons a.save:hover { 300 .submit input:hover, 301 #edit-slug-buttons a.save:hover, 302 #postcustomstuff .submit input:hover { 276 303 border-color: #535353; 277 304 } … … 339 366 340 367 .tablenav .dots { 341 background-color: #e4f2fd; 342 border-color: #e4f2fd; 368 border-color: transparent; 343 369 } 344 370 345 371 .tablenav .next, 346 372 .tablenav .prev { 347 background-color: #e4f2fd; 348 border-bottom-color: #2583ad; 349 border-color: #e4f2fd; 373 border-color: transparent; 350 374 color: #2583ad; 351 375 } … … 353 377 .tablenav .next:hover, 354 378 .tablenav .prev:hover { 355 border-bottom-color: #d54e21; 356 border-color: #e4f2fd; 379 border-color: transparent; 357 380 color: #d54e21; 358 381 } … … 904 927 } 905 928 906 #adminmenu li.wp-has-current-submenu .wp-menu-toggle,929 #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, 907 930 #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { 908 background: transparent url(../images/menu-bits.gif) repeat-xscroll left -206px;931 background: transparent url(../images/menu-bits.gif) no-repeat scroll left -206px; 909 932 } 910 933 911 934 #adminmenu .wp-has-submenu:hover .wp-menu-toggle, 912 935 #adminmenu .wp-menu-open .wp-menu-toggle { 913 background: transparent url(../images/menu-bits.gif) repeat-xscroll left -108px;914 } 915 916 #adminmenu a. wp-has-submenu{936 background: transparent url(../images/menu-bits.gif) no-repeat scroll left -108px; 937 } 938 939 #adminmenu a.menu-top { 917 940 background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px; 918 941 } … … 922 945 } 923 946 924 #adminmenu li.current a, 925 #adminmenu .wp-submenu a:hover { 947 #adminmenu .wp-has-current-submenu .wp-has-submenu, 948 #adminmenu .menu-top .current { 949 background-color: #c0c0c0; 950 background-image: none; 951 border-color: #B5B5B5; 952 color: #fff; 953 } 954 955 #adminmenu li.menu-top .current:hover { 956 background: #c0c0c0 none repeat scroll 0 0; 957 border-color: #B5B5B5; 958 } 959 960 #adminmenu .wp-submenu .current a.current { 926 961 background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px; 927 }928 929 #adminmenu li.wp-has-current-submenu a.wp-has-submenu {930 background: #b5b5b5 url(../images/menu-bits.gif) repeat-x scroll left top;931 color: #fff;932 962 } 933 963 … … 937 967 } 938 968 939 #adminmenu li.current a, 940 #adminmenu li.current a:hover { 969 #adminmenu .wp-submenu li.current, 970 #adminmenu .wp-submenu li.current a, 971 #adminmenu .wp-submenu li.current a:hover { 941 972 color: #d54e21; 942 973 background-color: #fff; 943 } 944 945 #adminmenu .wp-submenu { 974 border-color: #e3e3e3; 975 } 976 977 #adminmenu .wp-submenu ul { 946 978 background-color: #fff; 947 979 } 948 980 949 #adminmenu.folded li.wp-has-submenu { 981 #adminmenu.folded li.menu-top, 982 #adminmenu .wp-submenu .wp-submenu-head { 950 983 background-color: #F1F1F1; 951 984 } 952 985 953 #adminmenu .wp-submenu li.wp-submenu-head { 954 background-color: #F1F1F1; 955 } 956 957 #adminmenu.folded .wp-submenu { 958 background-color: #fff; 986 #adminmenu div.wp-submenu { 987 background-color: transparent; 988 } 989 990 /* menu icons */ 991 #adminmenu #menu-dashboard div.wp-menu-image { 992 background: transparent url("../images/menu.png") no-repeat scroll -61px -34px; 993 } 994 995 #adminmenu #menu-dashboard:hover div.wp-menu-image { 996 background: transparent url("../images/menu.png") no-repeat scroll -61px -2px; 997 } 998 999 #adminmenu #menu-posts div.wp-menu-image { 1000 background: transparent url("../images/menu.png") no-repeat scroll -272px -33px; 1001 } 1002 1003 #adminmenu #menu-posts:hover div.wp-menu-image { 1004 background: transparent url("../images/menu.png") no-repeat scroll -272px -1px; 1005 } 1006 1007 #adminmenu #menu-media div.wp-menu-image { 1008 background: transparent url("../images/menu.png") no-repeat scroll -121px -33px; 1009 } 1010 1011 #adminmenu #menu-media:hover div.wp-menu-image { 1012 background: transparent url("../images/menu.png") no-repeat scroll -121px -1px; 1013 } 1014 1015 #adminmenu #menu-links div.wp-menu-image { 1016 background: transparent url("../images/menu.png") no-repeat scroll -91px -33px; 1017 } 1018 1019 #adminmenu #menu-links:hover div.wp-menu-image { 1020 background: transparent url("../images/menu.png") no-repeat scroll -91px -1px; 1021 } 1022 1023 #adminmenu #menu-pages div.wp-menu-image { 1024 background: transparent url("../images/menu.png") no-repeat scroll -151px -33px; 1025 } 1026 1027 #adminmenu #menu-pages:hover div.wp-menu-image { 1028 background: transparent url("../images/menu.png") no-repeat scroll -151px -1px; 1029 } 1030 1031 #adminmenu #menu-comments div.wp-menu-image { 1032 background: transparent url("../images/menu.png") no-repeat scroll -31px -33px; 1033 } 1034 1035 #adminmenu #menu-comments:hover div.wp-menu-image { 1036 background: transparent url("../images/menu.png") no-repeat scroll -31px -1px; 1037 } 1038 1039 #adminmenu #menu-appearance div.wp-menu-image { 1040 background: transparent url("../images/menu.png") no-repeat scroll -1px -32px; 1041 } 1042 1043 #adminmenu #menu-appearance:hover div.wp-menu-image { 1044 background: transparent url("../images/menu.png") no-repeat scroll -1px 0; 1045 } 1046 1047 #adminmenu #menu-plugins div.wp-menu-image { 1048 background: transparent url("../images/menu.png") no-repeat scroll -181px -33px; 1049 } 1050 1051 #adminmenu #menu-plugins:hover div.wp-menu-image { 1052 background: transparent url("../images/menu.png") no-repeat scroll -181px -1px; 1053 } 1054 1055 #adminmenu #menu-users div.wp-menu-image { 1056 background: transparent url("../images/menu.png") no-repeat scroll -301px -33px; 1057 } 1058 1059 #adminmenu #menu-users:hover div.wp-menu-image { 1060 background: transparent url("../images/menu.png") no-repeat scroll -301px -1px; 1061 } 1062 1063 #adminmenu #menu-tools div.wp-menu-image { 1064 background: transparent url("../images/menu.png") no-repeat scroll -211px -33px; 1065 } 1066 1067 #adminmenu #menu-tools:hover div.wp-menu-image { 1068 background: transparent url("../images/menu.png") no-repeat scroll -211px -1px; 1069 } 1070 1071 #adminmenu #menu-settings div.wp-menu-image { 1072 background: transparent url("../images/menu.png") no-repeat scroll -241px -33px; 1073 } 1074 1075 #adminmenu #menu-settings:hover div.wp-menu-image { 1076 background: transparent url("../images/menu.png") no-repeat scroll -241px -1px; 959 1077 } 960 1078 /* end menu */ … … 1026 1144 } 1027 1145 1028 #plugin-information .fyi ul, 1029 .find-box { 1146 #plugin-information .fyi ul { 1030 1147 background-color: #eaf3fa; 1031 1148 } … … 1075 1192 color: #D54E21; 1076 1193 } 1194 1195 .ui-sortable .postbox:hover .handlediv { 1196 background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px; 1197 } -
trunk/wp-admin/css/colors-fresh.css
r9564 r9578 927 927 } 928 928 929 #adminmenu li.wp-has-current-submenu .wp-menu-toggle,929 #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, 930 930 #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { 931 background: transparent url(../images/menu-bits.gif) repeat-xscroll left -206px;931 background: transparent url(../images/menu-bits.gif) no-repeat scroll left -206px; 932 932 } 933 933 934 934 #adminmenu .wp-has-submenu:hover .wp-menu-toggle, 935 935 #adminmenu .wp-menu-open .wp-menu-toggle { 936 background: transparent url(../images/menu-bits.gif) repeat-xscroll left -108px;937 } 938 939 #adminmenu a. wp-has-submenu{936 background: transparent url(../images/menu-bits.gif) no-repeat scroll left -108px; 937 } 938 939 #adminmenu a.menu-top { 940 940 background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px; 941 941 } … … 945 945 } 946 946 947 #adminmenu li.current a, 948 #adminmenu .wp-submenu a:hover { 947 #adminmenu .wp-has-current-submenu .wp-has-submenu, 948 #adminmenu .menu-top .current { 949 background-color: #c0c0c0; 950 background-image: none; 951 border-color: #B5B5B5; 952 color: #fff; 953 } 954 955 #adminmenu li.menu-top .current:hover { 956 background: #c0c0c0 none repeat scroll 0 0; 957 border-color: #B5B5B5; 958 } 959 960 #adminmenu .wp-submenu .current a.current { 949 961 background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px; 950 }951 952 #adminmenu li.wp-has-current-submenu a.wp-has-submenu {953 background: #b5b5b5 url(../images/menu-bits.gif) repeat-x scroll left top;954 color: #fff;955 962 } 956 963 … … 960 967 } 961 968 962 #adminmenu li.current a, 963 #adminmenu li.current a:hover { 969 #adminmenu .wp-submenu li.current, 970 #adminmenu .wp-submenu li.current a, 971 #adminmenu .wp-submenu li.current a:hover { 964 972 color: #d54e21; 965 973 background-color: #fff; 966 } 967 968 #adminmenu .wp-submenu { 974 border-color: #e3e3e3; 975 } 976 977 #adminmenu .wp-submenu ul { 969 978 background-color: #fff; 970 979 } 971 980 972 #adminmenu.folded li.wp-has-submenu { 981 #adminmenu.folded li.menu-top, 982 #adminmenu .wp-submenu .wp-submenu-head { 973 983 background-color: #F1F1F1; 974 984 } 975 985 976 #adminmenu .wp-submenu li.wp-submenu-head { 977 background-color: #F1F1F1; 978 } 979 980 #adminmenu.folded .wp-submenu { 981 background-color: #fff; 986 #adminmenu div.wp-submenu { 987 background-color: transparent; 988 } 989 990 /* menu icons */ 991 #adminmenu #menu-dashboard div.wp-menu-image { 992 background: transparent url("../images/menu.png") no-repeat scroll -61px -34px; 993 } 994 995 #adminmenu #menu-dashboard:hover div.wp-menu-image { 996 background: transparent url("../images/menu.png") no-repeat scroll -61px -2px; 997 } 998 999 #adminmenu #menu-posts div.wp-menu-image { 1000 background: transparent url("../images/menu.png") no-repeat scroll -272px -33px; 1001 } 1002 1003 #adminmenu #menu-posts:hover div.wp-menu-image { 1004 background: transparent url("../images/menu.png") no-repeat scroll -272px -1px; 1005 } 1006 1007 #adminmenu #menu-media div.wp-menu-image { 1008 background: transparent url("../images/menu.png") no-repeat scroll -121px -33px; 1009 } 1010 1011 #adminmenu #menu-media:hover div.wp-menu-image { 1012 background: transparent url("../images/menu.png") no-repeat scroll -121px -1px; 1013 } 1014 1015 #adminmenu #menu-links div.wp-menu-image { 1016 background: transparent url("../images/menu.png") no-repeat scroll -91px -33px; 1017 } 1018 1019 #adminmenu #menu-links:hover div.wp-menu-image { 1020 background: transparent url("../images/menu.png") no-repeat scroll -91px -1px; 1021 } 1022 1023 #adminmenu #menu-pages div.wp-menu-image { 1024 background: transparent url("../images/menu.png") no-repeat scroll -151px -33px; 1025 } 1026 1027 #adminmenu #menu-pages:hover div.wp-menu-image { 1028 background: transparent url("../images/menu.png") no-repeat scroll -151px -1px; 1029 } 1030 1031 #adminmenu #menu-comments div.wp-menu-image { 1032 background: transparent url("../images/menu.png") no-repeat scroll -31px -33px; 1033 } 1034 1035 #adminmenu #menu-comments:hover div.wp-menu-image { 1036 background: transparent url("../images/menu.png") no-repeat scroll -31px -1px; 1037 } 1038 1039 #adminmenu #menu-appearance div.wp-menu-image { 1040 background: transparent url("../images/menu.png") no-repeat scroll -1px -32px; 1041 } 1042 1043 #adminmenu #menu-appearance:hover div.wp-menu-image { 1044 background: transparent url("../images/menu.png") no-repeat scroll -1px 0; 1045 } 1046 1047 #adminmenu #menu-plugins div.wp-menu-image { 1048 background: transparent url("../images/menu.png") no-repeat scroll -181px -33px; 1049 } 1050 1051 #adminmenu #menu-plugins:hover div.wp-menu-image { 1052 background: transparent url("../images/menu.png") no-repeat scroll -181px -1px; 1053 } 1054 1055 #adminmenu #menu-users div.wp-menu-image { 1056 background: transparent url("../images/menu.png") no-repeat scroll -301px -33px; 1057 } 1058 1059 #adminmenu #menu-users:hover div.wp-menu-image { 1060 background: transparent url("../images/menu.png") no-repeat scroll -301px -1px; 1061 } 1062 1063 #adminmenu #menu-tools div.wp-menu-image { 1064 background: transparent url("../images/menu.png") no-repeat scroll -211px -33px; 1065 } 1066 1067 #adminmenu #menu-tools:hover div.wp-menu-image { 1068 background: transparent url("../images/menu.png") no-repeat scroll -211px -1px; 1069 } 1070 1071 #adminmenu #menu-settings div.wp-menu-image { 1072 background: transparent url("../images/menu.png") no-repeat scroll -241px -33px; 1073 } 1074 1075 #adminmenu #menu-settings:hover div.wp-menu-image { 1076 background: transparent url("../images/menu.png") no-repeat scroll -241px -1px; 982 1077 } 983 1078 /* end menu */ … … 1097 1192 color: #D54E21; 1098 1193 } 1194 1195 .ui-sortable .postbox:hover .handlediv { 1196 background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px; 1197 } -
trunk/wp-admin/css/ie.css
r9498 r9578 35 35 } 36 36 37 * html #wpbody-content #screen-options-link-wrap { 38 display: inline-block; 39 width: 150px; 40 text-align: center; 41 } 42 43 * html #wpbody-content #contextual-help-link-wrap { 44 display: inline-block; 45 width: 100px; 46 text-align: center; 47 } 48 37 49 /* 38 50 * html body.minwidth { … … 47 59 * html #adminmenu { 48 60 z-index: 1; 49 width: 1 25px;61 width: 145px; 50 62 margin: 12px; 51 63 padding: 0; 52 64 } 53 65 54 * html #wpcontent #adminmenu.folded {55 width: 28px;56 }57 58 66 ul#adminmenu li.wp-has-submenu { 59 67 padding: 0; … … 61 69 } 62 70 63 #wpcontent #adminmenu ul.wp-submenu li { 64 padding: 0; 65 } 71 #wpcontent #adminmenu .wp-submenu li { 72 padding: 0; 73 } 74 66 75 #adminmenu, 67 76 #adminmenu .wp-menu-toggle, 68 ul.wp-submenu li,69 ul.wp-submenu {77 .wp-submenu li, 78 .wp-submenu { 70 79 zoom: 100%; 71 80 } … … 75 84 } 76 85 77 #wpcontent #adminmenu ul.wp-submenu li.wp-submenu-head {86 #wpcontent #adminmenu .wp-submenu li.wp-submenu-head { 78 87 padding: 3px 4px 4px 10px; 79 88 zoom: 100%; 80 89 } 81 90 82 #adminmenu.folded ul.wp-submenu { 83 margin: -1px 0 0 13px; 91 #wpcontent #adminmenu.folded .menu-top { 92 height: 30px; 93 } 94 95 #adminmenu.folded .wp-submenu { 96 margin: -1px 0 0 0; 84 97 } 85 98 -
trunk/wp-admin/includes/media.php
r9465 r9578 1253 1253 custom_settings : { 1254 1254 degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable 1255 swfupload_element_id : "flash-upload-ui" ,// id of the element displayed when swfupload is available1255 swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available 1256 1256 }, 1257 1257 debug: false … … 1263 1263 <div id="flash-upload-ui"> 1264 1264 <?php do_action('pre-flash-upload-ui'); ?> 1265 <div id="flash-browse-button"></div>1266 < p><?php _e( 'Choose files to upload' ); ?></p>1265 1266 <div><?php _e( 'Choose files to upload' ); ?> <div id="flash-browse-button"></div></div> 1267 1267 <?php do_action('post-flash-upload-ui'); ?> 1268 1268 <p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p> -
trunk/wp-admin/includes/plugin.php
r9537 r9578 550 550 551 551 if ( empty($icon_url) ) 552 $icon_url = 'images/ menu/generic.png';552 $icon_url = 'images/generic.png'; 553 553 554 $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top-single ' . $hookname, $hookname, $icon_url ); 555 $menu[] = array ( '', $access_level, '', '', 'wp-menu-separator-last' ); 554 $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url ); 556 555 557 556 return $hookname; -
trunk/wp-admin/includes/template.php
r9564 r9578 2653 2653 $style = 'style="display:none;"'; 2654 2654 echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . '" ' . $style . '>' . "\n"; 2655 echo "< h3 class='hndle'><span>{$box['title']}</span></h3>\n";2655 echo "<div class='handlediv'><br /></div><h3 class='hndle'><span>{$box['title']}</span></h3>\n"; 2656 2656 echo '<div class="inside">' . "\n"; 2657 2657 call_user_func($box['callback'], $object, $box); -
trunk/wp-admin/js/menu.js
r9539 r9578 5 5 init : function() { 6 6 $('#adminmenu a').attr('tabindex', '10'); 7 $('#adminmenu div.wp-menu-toggle').click( function() { return adminMenu.toggle( $(this).siblings('ul') ); } ); 8 $('#adminmenu li.wp-has-submenu img.wp-menu-image').click( function() { window.location = $(this).siblings('a.wp-has-submenu')[0].href; } ); 7 $('#adminmenu div.wp-menu-toggle').each( function() { 8 if ( $(this).siblings('.wp-submenu').length ) 9 $(this).click(function(){ adminMenu.toggle( $(this).siblings('.wp-submenu') ); }); 10 else 11 $(this).hide(); 12 }); 13 $('#adminmenu li.menu-top .wp-menu-image').click( function() { window.location = $(this).siblings('a.menu-top')[0].href; } ); 14 this.favorites(); 9 15 10 16 $('.wp-menu-separator').click(function(){ … … 35 41 }, 36 42 37 toggle : function(ul, effect) { 38 if ( !effect ) 39 effect = 'slideToggle'; 43 toggle : function(el) { 40 44 41 ul[effect](150).parent().toggleClass( 'wp-menu-open' );45 el['slideToggle'](150, function(){el.css('display','');}).parent().toggleClass( 'wp-menu-open' ); 42 46 43 47 $('#adminmenu li.wp-has-submenu').each(function(i, e) { … … 52 56 if (off) { 53 57 $('#adminmenu').removeClass('folded'); 54 $('#adminmenu li.wp-submenu-head').hide(); 55 $('#adminmenu a.wp-has-submenu, #adminmenu .wp-menu-open .wp-submenu, #adminmenu div.wp-menu-toggle').show(); 56 $('#adminmenu li.wp-has-submenu').unbind().css('width', ''); 57 this.restoreMenuState(); 58 $('#adminmenu li.wp-has-submenu').unbind(); 58 59 } else { 59 60 $('#adminmenu').addClass('folded'); 60 $('#adminmenu a.wp-has-submenu, #adminmenu .wp-submenu, #adminmenu div.wp-menu-toggle').hide(); 61 $('#adminmenu li.wp-submenu-head').show(); 62 $('#adminmenu li.wp-has-submenu').css({'width':'28px'}).hoverIntent({ 61 $('#adminmenu li.wp-has-submenu').hoverIntent({ 63 62 over: function(e){ 64 63 var m = $(this).find('.wp-submenu'), t = e.clientY, H = $(window).height(), h = m.height(), o; … … 66 65 if ( (t+h+10) > H ) { 67 66 o = (t+h+10) - H; 68 m.css({'marginTop':'-'+o+'px'}) 67 m.css({'marginTop':'-'+o+'px'}); 68 } else if ( m.css('marginTop') ) { 69 m.css({'marginTop':''}) 69 70 } 70 m. show();71 m.addClass('sub-open'); 71 72 }, 72 out: function(){ $(this).find('.wp-submenu'). hide(); },73 out: function(){ $(this).find('.wp-submenu').removeClass('sub-open'); }, 73 74 timeout: 220, 74 75 sensitivity: 8, 75 76 interval: 100 76 77 }); 78 77 79 } 80 }, 81 82 favorites : function() { 83 $('#favorite-inside').width($('#favorite-actions').width()-4); 84 $('#favorite-toggle, #favorite-inside').bind( 'mouseenter', function(){$('#favorite-inside').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideDown') ) { $('#favorite-inside').slideDown(100); $('#favorite-first').addClass('slide-down'); }}, 200) } ); 85 86 $('#favorite-toggle, #favorite-inside').bind( 'mouseleave', function(){$('#favorite-inside').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideUp') ) { $('#favorite-inside').slideUp(100, function(){ $('#favorite-first').removeClass('slide-down'); } ); }}, 300) } ); 78 87 } 79 88 }; 80 89 81 $(document).ready(function(){ 82 adminMenu.init(); 90 $(document).ready(function(){adminMenu.init();}); 83 91 84 $('#favorite-inside').width($('#favorite-actions').width()-4);85 $('#favorite-toggle, #favorite-inside').bind( 'mouseenter', function(){$('#favorite-inside').removeClass('slideUp').addClass('slideDown'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideDown') ) { $('#favorite-inside').slideDown(100); $('#favorite-first').addClass('slide-down'); }}, 200) } );86 87 $('#favorite-toggle, #favorite-inside').bind( 'mouseleave', function(){$('#favorite-inside').removeClass('slideDown').addClass('slideUp'); setTimeout(function(){if ( $('#favorite-inside').hasClass('slideUp') ) { $('#favorite-inside').slideUp(100, function(){ $('#favorite-first').removeClass('slide-down'); } ); }}, 300) } );88 });89 92 })(jQuery); -
trunk/wp-admin/js/postbox.js
r9510 r9578 2 2 postboxes = { 3 3 add_postbox_toggles : function(page,args) { 4 $('.postbox h3 ').click( function() {4 $('.postbox h3, .postbox .handlediv').click( function() { 5 5 $($(this).parent().get(0)).toggleClass('closed'); 6 6 postboxes.save_state(page); -
trunk/wp-admin/menu-header.php
r9363 r9578 58 58 $class = $class ? ' class="' . join( ' ', $class ) . '"' : ''; 59 59 $id = isset($item[5]) && ! empty($item[5]) ? ' id="' . $item[5] . '"' : ''; 60 $img = isset($item[6]) && ! empty($item[6]) ? '<img class="wp-menu-image" src="' . $item[6] . '" alt="" />' : ''; 60 $img = ''; 61 if ( isset($item[6]) && ! empty($item[6]) ) { 62 if ( 'div' === $item[6] ) 63 $img = '<div class="wp-menu-image"><br /></div>'; 64 else 65 $img = '<img class="wp-menu-image" src="' . $item[6] . '" alt="" />'; 66 } 61 67 $toggle = '<div class="wp-menu-toggle"><br /></div>'; 62 68 … … 85 91 86 92 if ( !empty($submenu[$item[2]]) ) { 87 echo "\n\t< ul class='wp-submenu'><li class='wp-submenu-head' style='display:none;'>{$item[0]}</li>";93 echo "\n\t<div class='wp-submenu'><div class='wp-submenu-head'>{$item[0]}</div><ul>"; 88 94 $first = true; 89 95 foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) { … … 122 128 } 123 129 } 124 echo "</ul> ";130 echo "</ul></div>"; 125 131 } 126 132 echo "</li>"; -
trunk/wp-admin/menu.php
r9543 r9578 26 26 $awaiting_mod = $awaiting_mod->moderated; 27 27 28 $menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'wp-menu-open menu-top-single', 'menu-dashboard', 'images/menu/home.png' ); 29 $submenu['index.php'][5] = array( __('Dashboard'), 'read' , 'index.php' ); 28 $menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top', 'menu-dashboard', 'div' ); 30 29 31 30 $menu[4] = array( '', 'read', '', '', 'wp-menu-separator' ); 32 31 33 $menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', '', 'wp-menu-open menu-top -first', 'menu-posts', 'images/menu/posts.png' );32 $menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', '', 'wp-menu-open menu-top', 'menu-posts', 'div' ); 34 33 $submenu['post-new.php'][5] = array( _c('Add New|post'), 'edit_posts', 'post-new.php' ); 35 34 //$submenu['post-new.php'][10] = array( __('Drafts'), 'edit_posts', 'edit-post-drafts.php' ); … … 38 37 $submenu['post-new.php'][25] = array( __('Categories'), 'manage_categories', 'categories.php' ); 39 38 40 $menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', ' ', 'menu-media', 'images/menu/media.png' );39 $menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', 'menu-top', 'menu-media', 'div' ); 41 40 $submenu['media-new.php'][5] = array( _c('Add New|file'), 'upload_files', 'media-new.php'); 42 41 $submenu['media-new.php'][10] = array( __('Edit'), 'upload_files', 'upload.php'); 43 42 44 $menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', ' ', 'menu-links', 'images/menu/links.png' );43 $menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', 'menu-top', 'menu-links', 'div' ); 45 44 $submenu['link-add.php'][5] = array( _c('Add New|links'), 'manage_links', 'link-add.php' ); 46 45 $submenu['link-add.php'][10] = array( __('Edit'), 'manage_links', 'link-manager.php' ); 47 46 $submenu['link-add.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' ); 48 47 49 $menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', ' ', 'menu-pages', 'images/menu/pages.png' );48 $menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', 'menu-top', 'menu-pages', 'div' ); 50 49 $submenu['page-new.php'][5] = array( _c('Add New|page'), 'edit_pages', 'page-new.php' ); 51 50 //$submenu['page-new.php'][10] = array( __('Drafts'), 'edit_pages', 'edit-page-drafts.php' ); 52 51 $submenu['page-new.php'][15] = array( __('Edit'), 'edit_pages', 'edit-pages.php' ); 53 52 54 $menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top-last', 'menu-comments', 'images/menu/comments.png' ); 55 $submenu['edit-comments.php'][15] = array( __('Comments'), 'edit_posts', 'edit-comments.php' ); 53 $menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='comment-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top', 'menu-comments', 'div' ); 56 54 57 55 $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group … … 59 57 $menu[29] = array( '', 'read', '', '', 'wp-menu-separator' ); 60 58 61 $menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top -first', 'menu-appearance', 'images/menu/appearance.png' );59 $menu[30] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top', 'menu-appearance', 'div' ); 62 60 $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php'); 63 61 $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php'); … … 68 66 $update_count = count( $update_plugins->response ); 69 67 70 $menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', ' ', 'menu-plugins', 'images/menu/plugins.png' );68 $menu[35] = array( sprintf( __('Plugins %s'), "<span id='update-plugins' class='count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' ); 71 69 $submenu['plugins.php'][5] = array( __('Installed'), 'activate_plugins', 'plugins.php' ); 72 70 $submenu['plugins.php'][10] = array(_c('Add New|plugin'), 'install_plugins', 'plugin-install.php'); … … 74 72 75 73 if ( current_user_can('edit_users') ) 76 $menu[40] = array( __('Users'), 'edit_users', 'users.php', '', ' ', 'menu-users', 'images/menu/users.png' );74 $menu[40] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-top', 'menu-users', 'div' ); 77 75 else 78 $menu[40] = array( __('Profile'), 'read', 'profile.php', '', ' ', 'menu-users', 'images/menu/users.png' );76 $menu[40] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top', 'menu-users', 'div' ); 79 77 80 78 if ( current_user_can('edit_users') ) { … … 87 85 } 88 86 89 $menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', ' ', 'menu-tools', 'images/menu/tools.png' );87 $menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', 'menu-top', 'menu-tools', 'div' ); 90 88 $submenu['import.php'][5] = array( __('Import'), 'import', 'import.php' ); 91 89 $submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' ); 92 90 if ( ! $is_opera ) 93 91 $submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' ); 94 $submenu['import.php'][30] = array( __('Update'), ' read', 'update-core.php');95 96 $menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top -last', 'menu-settings', 'images/menu/settings.png' );92 $submenu['import.php'][30] = array( __('Update'), 'install_plugins', 'update-core.php'); 93 94 $menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' ); 97 95 $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php'); 98 96 $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php'); … … 173 171 $_wp_menu_nopriv[$data[2]] = true; 174 172 unset($menu[$id]); 175 } elseif ( !empty($data[0]) ) {176 $submenu[$data[2]][0] = $data;177 173 } 178 174 } … … 180 176 181 177 unset($id); 178 179 function add_cssclass($add, $class) { 180 $class = empty($class) ? $add : $class .= ' ' . $add; 181 return $class; 182 } 183 184 function add_menu_classes($menu) { 185 186 $first = $lastorder = false; 187 $i = 0; 188 $mc = count($menu); 189 foreach ( $menu as $order => $top ) { 190 $i++; 191 192 if ( 0 == $order ) { // dashboard is always shown/single 193 $menu[0][4] = add_cssclass('menu-top-first menu-top-last', $top[4]); 194 continue; 195 } 196 197 if ( empty($top[2]) ) { // if separator 198 $first = true; 199 if ( $lastorder ) { 200 $c = $menu[$lastorder][4]; 201 $menu[$lastorder][4] = add_cssclass('menu-top-last', $c); 202 } 203 continue; 204 } 205 206 if ( $first ) { 207 $c = $menu[$order][4]; 208 $menu[$order][4] = add_cssclass('menu-top-first', $c); 209 $first = false; 210 } 211 212 if ( $mc == $i ) { // last item 213 $c = $menu[$order][4]; 214 $menu[$order][4] = add_cssclass('menu-top-last', $c); 215 } 216 217 $lastorder = $order; 218 } 219 220 return apply_filters( 'add_menu_classes', $menu ); 221 } 222 223 $menu = add_menu_classes($menu); 182 224 183 225 uksort($menu, "strnatcasecmp"); // make it all pretty -
trunk/wp-admin/wp-admin.css
r9569 r9578 863 863 } 864 864 865 /* menu stuff*/865 /* side admin menu */ 866 866 #adminmenu .wp-submenu { 867 867 display: none; 868 868 list-style: none; 869 margin: 2px 0 0; 870 padding: 0; 871 } 872 873 /* side admin menu */ 869 padding: 0; 870 margin: 0; 871 position: relative; 872 z-index: 2; 873 border-width: 1px 0 0; 874 border-style: solid none none; 875 } 876 874 877 #adminmenu { 875 878 padding: 0; 879 width: 12em; 876 880 list-style: none; 877 881 font: normal 11.5px/16px Georgia, "Times New Roman", Times, serif; 878 882 } 879 883 884 #adminmenu.folded, 885 #adminmenu.folded li.menu-top { 886 width: 28px; 887 } 888 889 #adminmenu div.wp-submenu-head { 890 display: none; 891 } 892 893 #adminmenu.folded div.wp-submenu-head, 894 #adminmenu.folded li.wp-has-submenu div.sub-open { 895 display: block; 896 } 897 898 #adminmenu.folded a.menu-top, 899 #adminmenu.folded .wp-submenu, 900 #adminmenu.folded li.wp-menu-open .wp-submenu, 901 #adminmenu.folded div.wp-menu-toggle { 902 display: none; 903 } 904 880 905 #adminmenu li.wp-menu-open .wp-submenu { 881 906 display: block; 882 907 } 908 909 #adminmenu div.wp-menu-image { 910 float: left; 911 width: 28px; 912 height: 30px; 913 } 914 883 915 /* 884 916 #adminmenu a { … … 903 935 } 904 936 905 #adminmenu li.wp-has-submenu { 906 width: 135px; 937 #adminmenu li.menu-top { 907 938 min-height: 28px; 908 939 } 909 940 910 #adminmenu a. wp-has-submenu{941 #adminmenu a.menu-top { 911 942 line-height: 18px; 912 943 padding: 6px 5px; … … 926 957 } 927 958 928 #adminmenu .menu-top-last ul.wp-submenu, 929 #adminmenu .menu-top-single ul.wp-submenu { 959 #adminmenu .menu-top-last ul.wp-submenu { 930 960 border-width: 0 0 1px; 931 961 border-style: none none solid; 932 }933 934 #adminmenu .wp-submenu {935 margin: 0;936 position: relative;937 z-index: 2;938 border-width: 1px 0 0;939 border-style: solid none none;940 962 } 941 963 … … 954 976 } 955 977 956 #adminmenu .menu-top-first a. wp-has-submenu,978 #adminmenu .menu-top-first a.menu-top, 957 979 #adminmenu.folded li.menu-top-first, 958 #adminmenu .wp-submenu li.wp-submenu-head {980 #adminmenu .wp-submenu .wp-submenu-head { 959 981 border-width: 1px 1px 0; 960 982 border-style: solid solid none; 961 -moz-border-radius: 8px 8px 0 0; 983 -moz-border-radius-topleft :8px; 984 -moz-border-radius-topright: 8px; 962 985 -webkit-border-top-right-radius: 8px; 963 986 -webkit-border-top-left-radius: 8px; … … 968 991 } 969 992 970 #adminmenu .menu-top-last a. wp-has-submenu,993 #adminmenu .menu-top-last a.menu-top, 971 994 #adminmenu.folded li.menu-top-last { 972 995 border-width: 1px; 973 996 border-style: solid; 974 -moz-border-radius: 0 0 8px 8px; 997 -moz-border-radius-bottomleft: 8px; 998 -moz-border-radius-bottomright: 8px; 975 999 -webkit-border-bottom-right-radius: 8px; 976 1000 -webkit-border-bottom-left-radius: 8px; … … 981 1005 } 982 1006 983 #adminmenu .menu-top-single a.wp-has-submenu, 984 #adminmenu.folded li.menu-top-single { 985 border-width: 1px; 986 border-style: solid; 987 -moz-border-radius: 8px; 988 -webkit-border-radius: 8px; 989 -khtml-border-radius: 8px; 990 border-radius: 8px; 991 } 992 993 #adminmenu li.wp-menu-open a.menu-top-last, 994 #adminmenu li.wp-menu-open a.menu-top-single { 1007 #adminmenu li.wp-menu-open a.menu-top-last { 1008 border-bottom: 0 none; 995 1009 -moz-border-radius-bottomright: 0; 996 1010 -moz-border-radius-bottomleft: 0; … … 1003 1017 } 1004 1018 1005 #adminmenu .wp-menu-image {1019 #adminmenu img.wp-menu-image { 1006 1020 float: left; 1007 1021 padding: 8px 6px 0; 1008 1022 } 1009 1023 1010 #adminmenu.folded .wp-menu-image {1024 #adminmenu.folded img.wp-menu-image { 1011 1025 padding: 7px 0 0 6px; 1012 1026 } … … 1023 1037 } 1024 1038 1025 #adminmenu .wp-submenu li.wp-submenu-head {1039 #adminmenu .wp-submenu .wp-submenu-head { 1026 1040 border-width: 1px; 1027 1041 border-style: solid; … … 1032 1046 #adminmenu.folded .wp-submenu { 1033 1047 position: absolute; 1034 margin: -1px 0 0 33px; 1048 margin: -1px 0 0 28px; 1049 padding: 0 8px 8px; 1035 1050 z-index: 999; 1036 width: 135px; 1051 border: 0 none; 1052 } 1053 1054 #adminmenu.folded .wp-submenu ul { 1055 width: 140px; 1037 1056 border-width: 0 0 1px; 1038 1057 border-style: none none solid; … … 1049 1068 #adminmenu.folded a.wp-has-submenu { 1050 1069 margin-left: 40px; 1070 } 1071 1072 #adminmenu li.menu-top-last .wp-submenu ul { 1073 border-width: 0 0 1px; 1074 border-style: none none solid; 1051 1075 } 1052 1076 … … 1559 1583 .ui-sortable .postbox .hndle { 1560 1584 cursor: move; 1585 } 1586 1587 .ui-sortable .postbox .handlediv { 1588 float: right; 1589 width: 24px; 1590 height: 24px; 1561 1591 } 1562 1592 … … 3014 3044 line-height: 2px; 3015 3045 } 3046 3047 .swfupload { 3048 margin: 0 10px; 3049 vertical-align: middle; 3050 } 3051 -
trunk/wp-includes/js/hoverIntent.js
r9391 r9578 1 1 /** 2 * hoverIntent is similar to jQuery's built-in "hover" function except that 3 * instead of firing the onMouseOver event immediately, hoverIntent checks 4 * to see if the user's mouse has slowed down (beneath the sensitivity 5 * threshold) before firing the onMouseOver event. 6 * 2 7 * hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+ 3 8 * <http://cherne.net/brian/resources/jquery.hoverIntent.html> … … 7 12 * the license that best suits your project, and use it accordingly. 8 13 * 14 * // basic usage (just like .hover) receives onMouseOver and onMouseOut functions 15 * $("ul li").hoverIntent( showNav , hideNav ); 16 * 17 * // advanced usage receives configuration object only 18 * $("ul li").hoverIntent({ 19 * sensitivity: 7, // number = sensitivity threshold (must be 1 or higher) 20 * interval: 100, // number = milliseconds of polling interval 21 * over: showNav, // function = onMouseOver callback (required) 22 * timeout: 0, // number = milliseconds delay before onMouseOut function call 23 * out: hideNav // function = onMouseOut callback (required) 24 * }); 25 * 9 26 * @param f onMouseOver function || An object with configuration options 10 27 * @param g onMouseOut function || Nothing (use configuration options object) 11 28 * @author Brian Cherne <brian@cherne.net> 12 29 */ 13 (function($){$.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=$.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY;};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))<cfg.sensitivity){$(ob).unbind("mousemove",track);ob.hoverIntent_s=1;return cfg.over.apply(ob,[ev]);}else{pX=cX;pY=cY;ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}};var delay=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);ob.hoverIntent_s=0;return cfg.out.apply(ob,[ev]);};var handleHover=function(e){var p=(e.type=="mouseover"?e.fromElement:e.toElement)||e.relatedTarget;while(p&&p!=this){try{p=p.parentNode;}catch(e){p=this;}}if(p==this){return false;}var ev=jQuery.extend({},e);var ob=this;if(ob.hoverIntent_t){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);}if(e.type=="mouseover"){pX=ev.pageX;pY=ev.pageY;$(ob).bind("mousemove",track);if(ob.hoverIntent_s!=1){ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}}else{$(ob).unbind("mousemove",track);if(ob.hoverIntent_s==1){ob.hoverIntent_t=setTimeout(function(){delay(ev,ob);},cfg.timeout);}}};return this.mouseover(handleHover).mouseout(handleHover);};})(jQuery); 30 (function($) { 31 $.fn.hoverIntent = function(f,g) { 32 // default configuration options 33 var cfg = { 34 sensitivity: 7, 35 interval: 100, 36 timeout: 0 37 }; 38 // override configuration options with user supplied object 39 cfg = $.extend(cfg, g ? { over: f, out: g } : f ); 40 41 // instantiate variables 42 // cX, cY = current X and Y position of mouse, updated by mousemove event 43 // pX, pY = previous X and Y position of mouse, set by mouseover and polling interval 44 var cX, cY, pX, pY; 45 46 // A private function for getting mouse position 47 var track = function(ev) { 48 cX = ev.pageX; 49 cY = ev.pageY; 50 }; 51 52 // A private function for comparing current and previous mouse position 53 var compare = function(ev,ob) { 54 ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); 55 // compare mouse positions to see if they've crossed the threshold 56 if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) { 57 $(ob).unbind("mousemove",track); 58 // set hoverIntent state to true (so mouseOut can be called) 59 ob.hoverIntent_s = 1; 60 return cfg.over.apply(ob,[ev]); 61 } else { 62 // set previous coordinates for next time 63 pX = cX; pY = cY; 64 // use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs) 65 ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval ); 66 } 67 }; 68 69 // A private function for delaying the mouseOut function 70 var delay = function(ev,ob) { 71 ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); 72 ob.hoverIntent_s = 0; 73 return cfg.out.apply(ob,[ev]); 74 }; 75 76 // workaround for Mozilla bug: not firing mouseout/mouseleave on absolute positioned elements over textareas and input type="text" 77 var handleHover = function(e) { 78 var t = this; 79 80 // next two lines copied from jQuery.hover, ignore children onMouseOver/onMouseOut 81 var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget; 82 while ( p && p != this ) { try { p = p.parentNode; } catch(e) { p = this; } } 83 if ( p == this ) { 84 if ( $.browser.mozilla ) { 85 if ( e.type == "mouseout" ) { 86 t.mtout = setTimeout( function(){doHover(e,t);}, 30 ); 87 } else { 88 if (t.mtout) { t.mtout = clearTimeout(t.mtout); } 89 } 90 } 91 return; 92 } else { 93 if (t.mtout) { t.mtout = clearTimeout(t.mtout); } 94 doHover(e,t); 95 } 96 }; 97 98 // A private function for handling mouse 'hovering' 99 var doHover = function(e,ob) { 100 101 // copy objects to be passed into t (required for event object to be passed in IE) 102 var ev = jQuery.extend({},e); 103 104 // cancel hoverIntent timer if it exists 105 if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); } 106 107 // else e.type == "onmouseover" 108 if (e.type == "mouseover") { 109 // set "previous" X and Y position based on initial entry point 110 pX = ev.pageX; pY = ev.pageY; 111 // update "current" X and Y position based on mousemove 112 $(ob).bind("mousemove",track); 113 // start polling interval (self-calling timeout) to compare mouse coordinates over time 114 if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );} 115 116 // else e.type == "onmouseout" 117 } else { 118 // unbind expensive mousemove event 119 $(ob).unbind("mousemove",track); 120 // if hoverIntent state is true, then call the mouseOut function after the specified delay 121 if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );} 122 } 123 }; 124 125 // bind the function to the two event listeners 126 return this.mouseover(handleHover).mouseout(handleHover); 127 }; 128 })(jQuery); -
trunk/wp-includes/script-loader.php
r9573 r9578 167 167 $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' ); 168 168 $scripts->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' ); 169 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '2008110 4' );169 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081109' ); 170 170 $scripts->localize( 'postbox', 'postboxL10n', array( 171 171 'requestFile' => admin_url('admin-ajax.php'), … … 297 297 $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081016' ); 298 298 299 $scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '200 70327' );300 $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '2008110 5' );299 $scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20081109' ); 300 $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081109' ); 301 301 302 302 } … … 329 329 $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie', 'plugin-install', 'farbtastic' ); 330 330 331 $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '2008110 7' );331 $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081109' ); 332 332 $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); 333 333 … … 336 336 337 337 $styles->add( 'colors', true ); // Register "meta" stylesheet for admin colors 338 $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081 031'); // for login.php. Is there a better way?338 $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081109'); // for login.php. Is there a better way? 339 339 $styles->add_data( 'colors-fresh', 'rtl', true ); 340 340
Note: See TracChangeset
for help on using the changeset viewer.