Permalink
Browse files

Bring out the shears.

git-svn-id: http://svn.automattic.com/wordpress/trunk@17228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 8066547 commit 85f1feed8499559d03764ad9f43c7eba762d164b ryan committed Jan 6, 2011
View
@@ -673,7 +673,7 @@ function _wp_ajax_add_hierarchical_term() {
} else {
if ( 'single' == $_REQUEST['mode'] ) {
$wp_list_table = get_list_table('WP_Post_Comments_List_Table');
- } else {
+ } else {
$wp_list_table = get_list_table('WP_Comments_List_Table');
}
$wp_list_table->single_row( $comment );
@@ -1464,7 +1464,7 @@ body.press-this .stuffbox:hover .handlediv,
background-color: #f5f5f5;
}
-#post-body ul.category-tabs li.tabs a,
+#post-body ul.category-tabs li.tabs a,
#post-body ul.add-menu-item-tabs li.tabs a,
body.press-this ul.category-tabs li.tabs a {
color: #333;
@@ -66,13 +66,13 @@ function prepare_items() {
}
$page = $this->get_pagenum();
-
+
if ( isset( $_REQUEST['start'] ) ) {
$start = $_REQUEST['start'];
} else {
$start = ( $page - 1 ) * $comments_per_page;
}
-
+
if ( $doing_ajax && isset( $_REQUEST['offset'] ) ) {
$start += $_REQUEST['offset'];
}
@@ -115,7 +115,7 @@ function prepare_items() {
'per_page' => $comments_per_page,
) );
}
-
+
function get_per_page( $comment_status = 'all' ) {
$comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
$comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
@@ -513,24 +513,24 @@ function column_default( $comment, $column_name ) {
class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
function get_column_info() {
- $this->_column_headers = array(
+ $this->_column_headers = array(
array(
'author' => __( 'Author' ),
'comment' => _x( 'Comment', 'column name' ),
),
array(),
array(),
);
-
+
return $this->_column_headers;
}
-
+
function get_table_classes() {
$classes = parent::get_table_classes();
$classes[] = 'comments-box';
return $classes;
}
-
+
function display( $output_empty = false ) {
extract( $this->_args );
?>
@@ -541,7 +541,7 @@ function display( $output_empty = false ) {
</table>
<?php
}
-
+
function get_per_page( $comment_status = false ) {
return 10;
}
@@ -185,7 +185,7 @@ function no_items() {
* @access public
*
* @param string $text The search button text
- * @param string $input_id The search input id
+ * @param string $input_id The search input id
*/
function search_box( $text, $input_id ) {
if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
@@ -291,7 +291,7 @@ function single_row( $key, $theme ) {
$actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme_key, $theme, $context );
$actions = apply_filters( "theme_action_links_$theme_key", $actions, $theme_key, $theme, $context );
-
+
$class = empty( $theme['enabled'] ) ? 'inactive' : 'active';
$checkbox_id = "checkbox_" . md5($theme['Name']);
$checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $theme_key ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme['Name'] . "</label>";
@@ -233,7 +233,7 @@ function get_views() {
$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
break;
}
-
+
if ( 'search' != $type ) {
$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
add_query_arg('plugin_status', $type, 'plugins.php'),
@@ -71,7 +71,7 @@ function prepare_items() {
'per_page' => $tags_per_page,
) );
}
-
+
function has_items() {
// todo: populate $this->items in prepare_items()
return true;
@@ -139,7 +139,7 @@ function display_rows_or_placeholder() {
// convert it to table rows
$out = '';
$count = 0;
-
+
$terms = array();
if ( is_taxonomy_hierarchical( $taxonomy ) && !isset( $orderby ) ) {
@@ -160,7 +160,7 @@ function display_rows_or_placeholder() {
$out .= $this->single_row( $term, 0, $taxonomy );
$count = $number; // Only displaying a single page.
}
-
+
if ( empty( $terms ) ) {
echo '<tr class="no-items"><td colspan="2">';
$this->no_items();
View
@@ -349,7 +349,7 @@ function upload_size_limit_filter( $size ) {
$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
if ( get_site_option( 'upload_space_check_disabled' ) )
return min( $size, $fileupload_maxk );
-
+
return min( $size, $fileupload_maxk, get_upload_space_available() );
}
/**
@@ -1221,7 +1221,7 @@ function wp_check_post_lock( $post_id ) {
$lock = explode( ':', $lock );
$time = $lock[0];
$user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
-
+
$time_window = apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 );
if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
@@ -330,7 +330,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
echo $content;
return;
}
-
+
if ( $mode == 'single' ) {
$wp_list_table = get_list_table('WP_Post_Comments_List_Table');
} else {
@@ -213,10 +213,10 @@ setCommentsList = function() {
refillTheExtraList();
};
-
+
var refillTheExtraList = function(ev) {
var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val();
-
+
if (args.paged > total_pages) {
return;
}
@@ -228,7 +228,7 @@ setCommentsList = function() {
args.number = 1;
args.offset = per_page - 1; // fetch only the last item of the next page
}
-
+
args.no_placeholder = true;
args.paged ++;
@@ -277,7 +277,7 @@ commentReply = {
});
this.comments_listing = $('#comments-form > input[name="comment_status"]').val() || '';
-
+
$(listTable).bind('beforeChangePage', function(){
commentReply.close();
});
@@ -160,7 +160,7 @@ listTable.init();
listTable.update_rows({'paged': paged}, false, function() {
if ( $el.parents('.tablenav.bottom').length )
scrollTo(0, 0);
-
+
$(listTable).trigger('changePage');
});
}
@@ -256,20 +256,20 @@ listTable.init();
if ( $('h2.nav-tab-wrapper').length )
return;
- if ( 'site-users-network' == pagenow || 'site-themes-network' == pagenow ) {
+ if ( 'site-users-network' == pagenow || 'site-themes-network' == pagenow ) {
$('h4.search-text').remove();
if ( data.s )
- $('ul.subsubsub').after($('<h4 class="clear search-text">').html(
- listTableL10n.search.replace('%s', this.htmlencode(data.s))
+ $('ul.subsubsub').after($('<h4 class="clear search-text">').html(
+ listTableL10n.search.replace('%s', this.htmlencode(data.s))
));
- } else {
+ } else {
$('h2 .subtitle').remove();
- if ( data.s )
- $('h2').append($('<span class="subtitle">').html(
- listTableL10n.search.replace('%s', this.htmlencode(data.s))
- ));
+ if ( data.s )
+ $('h2').append($('<span class="subtitle">').html(
+ listTableL10n.search.replace('%s', this.htmlencode(data.s))
+ ));
}
});
}
View
@@ -162,7 +162,7 @@ function redirect_post($post_id = '') {
$parent_file = "edit.php";
$submenu_file = "edit.php";
} else {
- if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+ if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
$parent_file = $post_type_object->show_in_menu;
else
$parent_file = "edit.php?post_type=$post_type";
@@ -356,7 +356,7 @@ function _get_admin_bar_pref( $context, $user = 0 ) {
$pref = get_user_option( "show_admin_bar_{$context}", $user );
if ( false === $pref )
return 'admin' != $context || is_multisite();
-
+
return 'true' === $pref;
}
@@ -1313,11 +1313,11 @@ function antispambot($emailaddy, $mailto=0) {
function _make_url_clickable_cb($matches) {
$url = $matches[2];
$suffix = '';
-
+
/** Include parentheses in the URL only if paired **/
while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
- $suffix = strrchr( $url, ')' ) . $suffix;
- $url = substr( $url, 0, strrpos( $url, ')' ) );
+ $suffix = strrchr( $url, ')' ) . $suffix;
+ $url = substr( $url, 0, strrpos( $url, ')' ) );
}
$url = esc_url($url);
@@ -4,10 +4,10 @@
}
#wp-link ol,
-#wp-link ul {
+#wp-link ul {
list-style: none;
margin: 0;
- padding: 0;
+ padding: 0;
}
#wp-link input[type="text"] {
@@ -251,22 +251,22 @@ var wpLink;
// We're about to toggle visibility; it's currently the opposite
visible = !panel.is(':visible'),
win = $(window);
-
+
$(this).toggleClass('toggle-arrow-active', visible);
-
+
inputs.dialog.height('auto');
panel.slideToggle( 300, function() {
setUserSetting('wplink', visible ? '1' : '0');
inputs[ visible ? 'search' : 'url' ].focus();
-
+
// Move the box if the box is now expanded, was opened in a collapsed state,
// and if it needs to be moved. (Judged by bottom not being positive or
// bottom being smaller than top.)
var scroll = win.scrollTop(),
top = widget.offset().top,
bottom = top + widget.outerHeight(),
diff = bottom - win.height();
-
+
if ( diff > scroll ) {
widget.animate({'top': diff < top ? top - diff : scroll }, 200);
}
@@ -323,15 +323,15 @@ wpList = {
process: function(el) {
var list = this,
$el = $(el || document);
-
+
$el.delegate( "form[class^=add:" + list.id + ":]", 'submit', function(){
return list.wpList.add(this);
});
$el.delegate( "[class^=add:" + list.id + ":]:not(form)", 'click', function(){
return list.wpList.add(this);
});
-
+
$el.delegate( "[class^=delete:" + list.id + ":]", 'click', function(){
return list.wpList.del(this);
});
View
@@ -17,7 +17,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit
* http://www.gnu.org/licenses/gpl.html
- *
+ *
* [kses strips evil scripts!]
*
* Added wp_ prefix to avoid conflicts with existing kses users
@@ -274,8 +274,8 @@ function _get_page_link( $id = false, $leavename = false, $sample = false ) {
$draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
$link = $wp_rewrite->get_page_permastruct();
-
- if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
+
+ if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
if ( ! $leavename ) {
$link = str_replace('%pagename%', get_page_uri($id), $link);
}
Oops, something went wrong.

0 comments on commit 85f1fee

Please sign in to comment.