From cf673a69857ba80f5484cc3765e912b737b65a14 Mon Sep 17 00:00:00 2001 From: "Dominik Schilling (ocean90)" Date: Mon, 14 Jul 2014 20:08:38 +0000 Subject: [PATCH] Fix wrong indentation in [29136]. git-svn-id: https://develop.svn.wordpress.org/trunk@29172 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/upload.php | 8 ++++---- src/wp-includes/js/media-grid.js | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php index e2a314a4f1..886ecd27c5 100644 --- a/src/wp-admin/upload.php +++ b/src/wp-admin/upload.php @@ -35,10 +35,10 @@ if ( 'grid' === $mode ) { add_screen_option( 'mime', array( 'label' => __( 'Mime-type' ) ) ); get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __( 'Overview' ), - 'content' => - '

' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '

' + 'id' => 'overview', + 'title' => __( 'Overview' ), + 'content' => + '

' . __( 'All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '

' ) ); get_current_screen()->set_help_sidebar( diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js index 3c05aed0f3..3521bbcb4b 100644 --- a/src/wp-includes/js/media-grid.js +++ b/src/wp-includes/js/media-grid.js @@ -440,10 +440,8 @@ this.on( 'content:render:edit-metadata', this.editMetadataContent, this ); this.on( 'content:render:edit-image', this.editImageContentUgh, this ); this.on( 'close', this.detach ); - - - this.on( 'router:create', this.createRouter, this ); - this.on( 'router:render', this.browseRouter, this ); + this.on( 'router:create', this.createRouter, this ); + this.on( 'router:render', this.browseRouter, this ); this.options.hasPrevious = this.hasPrevious(); this.options.hasNext = this.hasNext(); @@ -560,11 +558,11 @@ // Only need a tab to Edit Image for images. if ( 'undefined' !== typeof this.model && this.model.get( 'type' ) === 'image' ) { view.set({ - 'edit-image': { + 'edit-image': { text: l10n.editImage, - priority: 40 - } - }); + priority: 40 + } + }); } },