Changeset 20417

Timestamp:

04/10/2012 01:19:30 AM (15 years ago)

Author:

azaozz

Message:

Introduce wp_is_mobile() and use it instead of $is_iphone global, see #20014

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (2 diffs)
• wp-admin/css/wp-admin.dev.css (modified) (1 diff)
• wp-admin/includes/media.php (modified) (5 diffs)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/js/postbox.dev.js (modified) (1 diff)
• wp-admin/media-new.php (modified) (1 diff)
• wp-admin/menu.php (modified) (1 diff)
• wp-includes/class-wp-admin-bar.php (modified) (2 diffs)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/vars.php (modified) (1 diff)
• wp-login.php (modified) (4 diffs)

trunk/wp-admin/admin-header.php

@@ -12 +12 @@
 
 // In case admin-header.php is included in a function.
-global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, $is_iphone,
+global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version,
         $current_site, $update_title, $total_update_count, $parent_file;
 
@@ -88 +88 @@
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
-if ( $is_iphone ) { ?>
-<style type="text/css">.row-actions{visibility:visible;}</style>
-<?php } ?>
+if ( wp_is_mobile() )
+        $admin_body_class .= ' mobile';
+
+?>
 </head>
 <body class="wp-admin no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">

trunk/wp-admin/css/wp-admin.dev.css

@@ -5324 +5324 @@
 }
 
+.mobile .row-actions {
+        visibility: visible;
+}
+
 tr:hover .row-actions,
 div.comment-item:hover .row-actions {

trunk/wp-admin/includes/media.php

@@ -63 +63 @@
  */
 function the_media_upload_tabs() {
-        global $redir_tab, $is_iphone;
+        global $redir_tab;
         $tabs = media_upload_tabs();
 
-        if ( $is_iphone ) {
+        if ( wp_is_mobile() ) {
                 unset($tabs['type']);
                 $default = 'type_url';
@@ -529 +529 @@
  */
 function wp_media_upload_handler() {
-        global $is_iphone;
-
         $errors = array();
         $id = 0;
@@ -601 +599 @@
         }
 
-        if ( $is_iphone )
+        if ( wp_is_mobile() )
                 return wp_iframe( 'media_upload_type_url_form', 'image', $errors, $id );
         else
@@ -1307 +1305 @@
  */
 function media_upload_form( $errors = null ) {
-        global $type, $tab, $pagenow, $is_IE, $is_opera, $is_iphone;
-
-        if ( $is_iphone )
+        global $type, $tab, $pagenow, $is_IE, $is_opera;
+
+        if ( wp_is_mobile() )
                 return;
 
@@ -1441 +1439 @@
  */
 function media_upload_type_form($type = 'file', $errors = null, $id = null) {
-        global $is_iphone;
-
-        if ( $is_iphone )
+        if ( wp_is_mobile() )
                 return;
 

trunk/wp-admin/includes/misc.php

@@ -584 +584 @@
 
 function _ipad_meta() {
-        if ( strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') !== false ) { ?>
-                <meta name="viewport" id="ipad-viewportmeta" content="width=device-width, initial-scale=1">
-        <?php
+        if ( wp_is_mobile() ) {
+                ?>
+                <meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1">
+                <?php
         }
 }

trunk/wp-admin/js/postbox.dev.js

@@ -1 @@
-var postboxes, is_iPad = navigator.userAgent.match(/iPad/);
+var postboxes;
 
 (function($) {

trunk/wp-admin/media-new.php

@@ -7 +7 @@
  */
 
-global $is_iphone;
-
-if ( $is_iphone ) // cannot upload files from iPhone/iPad
+if ( wp_is_mobile() ) // cannot upload files from mobile devices
         return;
 

trunk/wp-admin/menu.php

@@ -57 +57 @@
         $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
         /* translators: add new file */
-        if ( !$is_iphone )
+        if ( ! wp_is_mobile() )
                 $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
 

trunk/wp-includes/class-wp-admin-bar.php

@@ -322 +322 @@
 
         final protected function _render( $root ) {
-                global $is_IE, $is_iphone;
+                global $is_IE;
 
                 // Add browser classes.
@@ -334 +334 @@
                         elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
                                 $class .= ' ie9';
-                } elseif ( $is_iphone ) {
+                } elseif ( wp_is_mobile() ) {
                         $class .= ' mobile';
                 }

trunk/wp-includes/general-template.php

@@ -1747 +1747 @@
  */
 function user_can_richedit() {
-        global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_iphone, $is_IE;
+        global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE;
 
         if ( !isset($wp_rich_edit) ) {
@@ -1754 +1754 @@
                 if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
                         if ( $is_safari ) {
-                                if ( $is_iphone || false !== strpos( $_SERVER['HTTP_USER_AGENT'], '; Silk/' ) )
+                                if ( wp_is_mobile() || false !== strpos( $_SERVER['HTTP_USER_AGENT'], '; Silk/' ) )
                                         $wp_rich_edit = ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
                                 else

trunk/wp-includes/vars.php

@@ -98 +98 @@
  */
 $is_iis7 = $is_IIS && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
+
+/**
+ * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
+ *
+ * @return bool true|false
+ */
+function wp_is_mobile() {
+        static $is_mobile;
+
+        if ( isset($is_mobile) )
+                return $is_mobile;
+
+        if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
+                $is_mobile = false;
+        } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
+                || strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false
+                || strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
+                || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false ) {
+                        $is_mobile = true;
+        } else {
+                $is_mobile = false;
+        }
+
+        return $is_mobile;
+}

trunk/wp-login.php

@@ -40 +40 @@
  */
 function login_header($title = 'Log In', $message = '', $wp_error = '') {
-        global $error, $is_iphone, $interim_login, $current_site;
+        global $error, $interim_login, $current_site;
 
         // Don't index any of these forms
@@ -55 +55 @@
                 add_action( 'login_head', 'wp_shake_js', 12 );
 
-        ?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
-<head>
+        ?><!DOCTYPE html>
+        <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+        <head>
         <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
         <title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title>
-<?php
+        <?php
+
         wp_admin_css( 'wp-admin', true );
         wp_admin_css( 'colors-fresh', true );
 
-        if ( $is_iphone ) { ?>
-        <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" />
-        <style type="text/css" media="screen">
-        .login form, .login .message, #login_error { margin-left: 0px; }
-        .login #nav, .login #backtoblog { margin-left: 8px; }
-        .login h1 a { width: auto; }
-        #login { padding: 20px 0; }
-        </style>
-<?php
+        if ( wp_is_mobile() ) {
+                ?>
+                <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" />
+                <style type="text/css" media="screen">
+                .login form, .login .message, #login_error { margin-left: 0px; }
+                .login #nav, .login #backtoblog { margin-left: 8px; }
+                .login h1 a { width: auto; }
+                #login { padding: 20px 0; }
+                </style>
+                <?php
         }
 
@@ -89 +90 @@
         $login_header_url   = apply_filters( 'login_headerurl',   $login_header_url   );
         $login_header_title = apply_filters( 'login_headertitle', $login_header_title );
-?>
-</head>
-<body class="login">
+
+        ?>
+        </head>
+        <body class="login">
         <div id="login">
                 <h1><a href="<?php echo esc_url( $login_header_url ); ?>" title="<?php echo esc_attr( $login_header_title ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
-<?php
+        <?php
+
         unset( $login_header_url, $login_header_title );
 
         $message = apply_filters('login_message', $message);
-        if ( !empty( $message ) ) echo $message . "\n";
+        if ( !empty( $message ) )
+                echo $message . "\n";
 
         // In case a plugin uses $error rather than the $wp_errors object
@@ -135 +139 @@
         </div>
 
-<?php if ( !empty($input_id) ) : ?>
-<script type="text/javascript">
-try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
-if(typeof wpOnload=='function')wpOnload();
-</script>
-<?php endif; ?>
-
-<?php do_action('login_footer'); ?>
-<div class="clear"></div>
-</body>
-</html>
-<?php
+        <?php if ( !empty($input_id) ) : ?>
+        <script type="text/javascript">
+        try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
+        if(typeof wpOnload=='function')wpOnload();
+        </script>
+        <?php endif; ?>
+
+        <?php do_action('login_footer'); ?>
+        <div class="clear"></div>
+        </body>
+        </html>
+        <?php
 }
 
 function wp_shake_js() {
-        global $is_iphone;
-        if ( $is_iphone )
+        if ( wp_is_mobile() )
                 return;
 ?>