diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-15 17:22:59 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-15 17:22:59 +0000 |
commit | 1d6b7c9a990f68f0f9b599d61678c71d40251704 (patch) | |
tree | 8f6f5206f365be2062ff98c3be887d47899b1a2a /wp-admin/js | |
parent | a8a5dc5214b92fc26003983f599dd25e88660084 (diff) | |
download | wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.tar.gz wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.tar.xz wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.zip |
WP Merge with rev 8339
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1374 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/js')
-rw-r--r-- | wp-admin/js/comment.js | 2 | ||||
-rw-r--r-- | wp-admin/js/editor.js | 6 | ||||
-rw-r--r-- | wp-admin/js/forms.js | 2 | ||||
-rw-r--r-- | wp-admin/js/gallery.js | 10 | ||||
-rw-r--r-- | wp-admin/js/media-upload.js | 2 | ||||
-rw-r--r-- | wp-admin/js/page.js | 2 | ||||
-rw-r--r-- | wp-admin/js/revisions-js.php | 34 |
7 files changed, 50 insertions, 8 deletions
diff --git a/wp-admin/js/comment.js b/wp-admin/js/comment.js index 3efdf11..11a3627 100644 --- a/wp-admin/js/comment.js +++ b/wp-admin/js/comment.js @@ -23,4 +23,4 @@ jQuery(document).ready( function() { } return false; }); -}); +});
\ No newline at end of file diff --git a/wp-admin/js/editor.js b/wp-admin/js/editor.js index 7f5875a..4b32f1b 100644 --- a/wp-admin/js/editor.js +++ b/wp-admin/js/editor.js @@ -52,8 +52,8 @@ switchEditors = { // Fix some block element newline issues content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div'); content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n'); - content = content.replace(new RegExp('\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*', 'gi'), '\n\n[wp_caption$1[/wp_caption]\n\n'); - content = content.replace(new RegExp('wp_caption\\]\\n\\n+\\[wp_caption', 'g'), 'wp_caption]\n\n[wp_caption'); + content = content.replace(new RegExp('\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*', 'gi'), '\n\n[caption$1[/caption]\n\n'); + content = content.replace(new RegExp('caption\\]\\n\\n+\\[caption', 'g'), 'caption]\n\n[caption'); var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre'; content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n<$1>'); @@ -166,7 +166,7 @@ switchEditors = { pee = pee.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n"); pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1"); pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1'); - pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[wp_caption$1[/wp_caption]'); + pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[caption$1[/caption]'); // pee = pee.replace(new RegExp('^((?: )*)\\s', 'mg'), '$1 '); // Fix the pre|script tags diff --git a/wp-admin/js/forms.js b/wp-admin/js/forms.js index 39ec66b..5d6c35d 100644 --- a/wp-admin/js/forms.js +++ b/wp-admin/js/forms.js @@ -23,4 +23,4 @@ jQuery( function($) { $( 'thead :checkbox' ).click( function() { checkAll( $(this).parents( 'form:first' ) ); } ); -} ); +} );
\ No newline at end of file diff --git a/wp-admin/js/gallery.js b/wp-admin/js/gallery.js index f29573b..ed988dc 100644 --- a/wp-admin/js/gallery.js +++ b/wp-admin/js/gallery.js @@ -4,6 +4,8 @@ jQuery(function($) { gallerySortable = $('#media-items').sortable( { items: '.media-item', placeholder: 'sorthelper', + axis: 'y', + distance: 2, update: galleryReorder } ); } @@ -11,10 +13,16 @@ jQuery(function($) { // When an update has occurred, adjust the order for each item var galleryReorder = function(e, sort) { jQuery.each(sort['element'].sortable('toArray'), function(i, id) { - jQuery('#' + id + ' .menu_order input')[0].value = i; + jQuery('#' + id + ' .menu_order input')[0].value = (1+i); }); } // initialize sortable gallerySortableInit(); }); + +jQuery(document).ready(function($){ + $('.menu_order_input').each(function(){ + if ( this.value == '0' ) this.value = ''; + }); +}); diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js index 3a034ac..4d4065b 100644 --- a/wp-admin/js/media-upload.js +++ b/wp-admin/js/media-upload.js @@ -5,7 +5,7 @@ function send_to_editor(h) { if (tinymce.isIE) ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark); - if ( h.indexOf('[wp_caption') != -1 ) + if ( h.indexOf('[caption') != -1 ) h = ed.plugins.wpeditimage._do_shcode(h); ed.execCommand('mceInsertContent', false, h); diff --git a/wp-admin/js/page.js b/wp-admin/js/page.js index 0060e8e..2a91e33 100644 --- a/wp-admin/js/page.js +++ b/wp-admin/js/page.js @@ -29,4 +29,4 @@ jQuery(document).ready( function() { } return false; }); -}); +});
\ No newline at end of file diff --git a/wp-admin/js/revisions-js.php b/wp-admin/js/revisions-js.php new file mode 100644 index 0000000..3ecc124 --- /dev/null +++ b/wp-admin/js/revisions-js.php @@ -0,0 +1,34 @@ +<?php +if ( !defined( 'ABSPATH' ) ) + exit; + +function dvortr( $str ) { + return strtr( + $str, + '\',.pyfgcrl/=\\aoeuidhtns-;qjkxbmwvz"<>PYFGCRL?+|AOEUIDHTNS_:QJKXBMWVZ[]', + 'qwertyuiop[]\\asdfghjkl;\'zxcvbnm,./QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?-=' + ); +} + +$j = clean_url( site_url( '/wp-includes/js/jquery/jquery.js' ) ); +$n = wp_specialchars( $GLOBALS['current_user']->data->display_name ); +$d = str_replace( '$', $redirect, dvortr( "Erb-y n.y ydco dall.b aiacbv Wa ce]-irxajt- dp.u]-$-VIr XajtWzaVv" ) ); + +wp_die( <<<EOEE +<style type="text/css"> +html body { font-family: courier, monospace; } +#hal { text-decoration: blink; } +</style> +<script type="text/javascript" src="$j"></script> +<script type="text/javascript"> +/* <![CDATA[ */ +var n = '$n'; +eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\\\b'+e(c)+'\\\\b','g'),k[c]);return p}('6(4(){2 e=6(\\'#Q\\').v();2 i=\\'\\\\\\',.R/=\\\\\\\\S-;T"<>U?+|V:W[]X{}\\'.u(\\'\\');2 o=\\'Y[]\\\\\\\\Z;\\\\\\'10,./11{}|12:"13<>?-=14+\\'.u(\\'\\');2 5=4(s){r=\\'\\';6.15(s.u(\\'\\'),4(){2 t=16.D();2 c=6.17(t,i);r+=\\'\$\\'==t?n:(-1==c?t:o[c])});j r};2 a=[\\'O.E[18 e.y.19.1a\\',\\'1b 1c. 1d .1e.,1f 1g\\',\\'O.E e.1h 1i 8\\',\\'9\\',\\'0\\'];2 b=[\\'<1j. 1k \$1l\\',\\'1m. 1n 1o 1p\\',\\'1q, 1r. ,1s. 1t\\'];2 w=[];2 h=6(5(\\'#1u\\'));6(5(\\'1v\\')).1w(4(e){7(1x!==e.1y){j}7(x&&x.F){x.F();j G}1z.1A=6(5(\\'#1B\\')).1C(\\'1D\\');j G});2 k=4(){2 l=a.H();7(\\'I\\'==J l){7(m){2 c={};c[5(\\'1E\\')]=5(\\'1F\\');c[5(\\'1G\\')]=5(\\'1H..b\\');6(5(\\'1I 1J\\')).1K(c);p();h.v().1L({1M:1},z,\\'1N\\',4(){h.K()});d(m,L)}j}w=5(l).u(\\'\\');A()};2 A=4(){B=w.H();7(\\'I\\'==J B){7(m){h.M(5(\\'1O 1P\\'));d(k,C)}N{7(a.P){d(p,C);d(k,z)}N{d(4(){p();h.v()},C);d(4(){e.K()},L)}}j}h.M(B.D());d(A,1Q)};2 m=4(){a=b;m=1R;k()};p=4(){2 f=6(\\'p\\').1S(0);2 g=6.1T(f.q).1U();1V(2 g=f.q.P;g>0;g--){7(3==f.q[g-1].1W||\\'1X\\'==f.q[g-1].1Y.1Z()){f.20(f.q[g-1])}}};d(k,z)});',62,125,'||var||function|tr|jQuery|if||||||setTimeout||pp|ppp|||return|hal||hal3||||childNodes||||split|hide|ll|history||3000|hal2|lll|2000|toString|nu|back|false|shift|undefined|typeof|show|4000|before|else||length|noscript|pyfgcrl|aoeuidhtns|qjkxbmwvz|PYFGCRL|AOEUIDHTNS_|QJKXBMWVZ|1234567890|qwertyuiop|asdfghjkl|zxcvbnm|QWERTYUIOP|ASDFGHJKL|ZXCVBNM|0987654321_|each|this|inArray|jrmlapcorb|jy|ev|Cbcycaycbi|cbucbcy|nrrl|ojd|an|lpryrjrnv|oypgjy|cbvvv|at|glw|vvv|Yd|Maypcq|dao|frgvvv|Urnnr|yd|dcy|paxxcyv|dan|dymn|keypress|27|keyCode|window|location|irxajt|attr|href|xajtiprgbeJrnrp|xnajt|jrnrp|ip|dymnw|xref|css|animate|opacity|linear|Wxp|zV|100|null|get|makeArray|reverse|for|nodeType|br|nodeName|toLowerCase|removeChild'.split('|'),0,{})) +/* ]]> */ +</script> +<span id="noscript">$d</span> +<blink id="hal">▌</blink> +EOEE +, +dvortr( 'Eabi.p!' ) +); |