WordPress.org
Get WordPress

Plugin Directory

Changeset 835991


Ignore:
Timestamp:
01/10/2014 09:21:56 AM (12 years ago)
Author:
WingerSpeed
Message:

Update trunk to version 2.7.0.1

Location:
slimjetpack/trunk
Files:
11 added
5 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • slimjetpack/trunk/class.jetpack.php

    r821676 r835991  
    283283
    284284        add_action( 'wp_loaded', array( $this, 'register_assets' ) );
    285         add_action( 'wp_enqueue_scripts', array( $this, 'devicepx' ) );
    286         add_action( 'customize_controls_enqueue_scripts', array( $this, 'devicepx' ) );
    287         add_action( 'admin_enqueue_scripts', array( $this, 'devicepx' ) );
     285        //slim//add_action( 'wp_enqueue_scripts', array( $this, 'devicepx' ) );
     286        //slim//add_action( 'customize_controls_enqueue_scripts', array( $this, 'devicepx' ) );
     287        //slim//add_action( 'admin_enqueue_scripts', array( $this, 'devicepx' ) );
    288288
    289289        add_filter( 'jetpack_require_lib_dir', array( $this, 'require_lib_dir' ) );
    … …  
    379379     * This improves the resolution of gravatars and wordpress.com uploads on hi-res and zoomed browsers.
    380380     */
     381     //slim//
    381382    function devicepx() {
    382         wp_enqueue_script( 'devicepx', ( is_ssl() ? 'https' : 'http' ) . '://s0.wp.com/wp-content/js/devicepx-jetpack.js', array(), gmdate( 'oW' ), true );
     383        wp_enqueue_script( 'devicepx', plugins_url( '_inc/devicepx-jetpack.js', __FILE__ ), array(), gmdate( 'oW' ), true );
    383384    }
    384385
    … …  
    16761677        //slim// Move the admin menu to settings
    16771678        $hook = add_submenu_page( 'options-general.php', $title, $title, 'read', 'jetpack', array( $this, 'admin_page' ), 'div' );
    1678 
    16791679        $debugger_hook = add_submenu_page( null, __( 'Jetpack Debugging Center', 'jetpack' ), '', 'manage_options', 'jetpack-debugger', array( $this, 'debugger_page' ) );
    16801680        add_action( "admin_head-$debugger_hook", array( 'Jetpack_Debugger', 'jetpack_debug_admin_head' ) );
    … …  
    16971697        add_action( "admin_print_scripts-$hook", array( $this, 'admin_scripts' ) );
    16981698
     1699        if ( function_exists('akismet_conf') ) {
     1700            function akismet_reload_menu() {   
     1701                add_submenu_page('options-general.php', __('Akismet'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf');
     1702                add_submenu_page('edit-comments.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
     1703                }
     1704            add_action( 'jetpack_admin_menu', 'akismet_reload_menu' );
     1705        }
     1706       
    16991707        do_action( 'jetpack_admin_menu', $hook );
    17001708    }

  • slimjetpack/trunk/modules/custom-css/custom-css.php

    r821676 r835991  
    605605        $hook = add_theme_page( $title, $title, 'edit_theme_options', 'editcss', array( 'Jetpack_Custom_CSS', 'admin' ) );
    606606
     607        add_action( "admin_head-$hook", array( 'Jetpack_Custom_CSS', 'admin_head' ) );
    607608        add_action( "load-revision.php", array( 'Jetpack_Custom_CSS', 'prettify_post_revisions' ) );
    608609        add_action( "load-$hook", array( 'Jetpack_Custom_CSS', 'update_title' ) );
    … …  
    647648
    648649        if ( defined( 'SAFECSS_USE_ACE' ) && SAFECSS_USE_ACE ) {
    649             wp_register_style( 'jetpack-css-codemirror', plugins_url( 'custom-css/css/codemirror.css', __FILE__ ), array(), '20120905' );
    650             wp_enqueue_style( 'jetpack-css-use-codemirror', plugins_url( 'custom-css/css/use-codemirror.css', __FILE__ ), array( 'jetpack-css-codemirror' ), '20120905' );
    651 
    652             wp_register_script( 'jetpack-css-codemirror', plugins_url( 'custom-css/js/codemirror.min.js', __FILE__ ), array(), '3.16', true );
    653             wp_enqueue_script( 'jetpack-css-use-codemirror', plugins_url( 'custom-css/js/use-codemirror.js', __FILE__ ), array( 'jquery', 'underscore', 'jetpack-css-codemirror' ), '20131009', true );
     650            $url = plugins_url( 'custom-css/js/', __FILE__ );
     651
     652            wp_enqueue_script( 'jquery.spin' );
     653            wp_enqueue_script( 'safecss-ace', $url . 'ace/ace.js', array(), '20130213', true );
     654            wp_enqueue_script( 'safecss-ace-css', $url . 'ace/mode-css.js', array( 'safecss-ace' ), '20130213', true );
     655            wp_enqueue_script( 'safecss-ace-less', $url . 'ace/mode-less.js', array( 'safecss-ace' ), '20130213', true );
     656            wp_enqueue_script( 'safecss-ace-scss', $url . 'ace/mode-scss.js', array( 'safecss-ace' ), '20130213', true );
     657            wp_enqueue_script( 'safecss-ace-use', $url . 'safecss-ace.js', array( 'jquery', 'safecss-ace-css' ), '20130213', true );
     658
     659            wp_enqueue_style( 'custom-css-ace', plugins_url( 'custom-css/css/ace.css', __FILE__ ) );
     660        }
     661    }
     662
     663    static function admin_head() {
     664        if ( defined( 'SAFECSS_USE_ACE' ) && SAFECSS_USE_ACE ) {
     665            ?>
     666            <script type="text/javascript">
     667                /*<![CDATA[*/
     668                var SAFECSS_USE_ACE = true;
     669                var safecssAceSrcPath = <?php echo json_encode( parse_url( plugins_url( 'custom-css/js/ace/', __FILE__ ), PHP_URL_PATH ) ); ?>;
     670                /*]]>*/
     671            </script>
     672            <?php
    654673        }
    655674    }
    … …  
    685704                        <div id="post-body-content">
    686705                            <div class="postarea">
    687                                 <textarea id="safecss" name="safecss"<?php if ( SAFECSS_USE_ACE ) echo ' class="hide-if-js"'; ?>><?php echo esc_textarea( Jetpack_Custom_CSS::get_css() ); ?></textarea>
    688                                 <div class="clear"></div>
     706                                <?php if ( defined( 'SAFECSS_USE_ACE' ) && SAFECSS_USE_ACE ) { ?>
     707                                    <div id="safecss-container">
     708                                        <div id="safecss-ace"></div>
     709                                    </div>
     710                                    <script type="text/javascript">
     711                                        jQuery.fn.spin && jQuery("#safecss-container").spin( 'large' );
     712                                    </script>
     713                                    <textarea id="safecss" name="safecss" class="hide-if-js"><?php echo esc_textarea( Jetpack_Custom_CSS::get_css() ); ?></textarea>
     714                                    <div class="clear"></div>
     715                                <?php } else { ?>
     716                                    <p><textarea id="safecss" name="safecss"><?php echo str_replace('</textarea>', '&lt;/textarea&gt', Jetpack_Custom_CSS::get_css()); ?></textarea></p>
     717                                <?php } ?>
    689718                            </div>
    690719                        </div>

  • slimjetpack/trunk/modules/omnisearch/omnisearch-core.php

    r773855 r835991  
    1212        add_action( 'wp_loaded',          array( $this, 'wp_loaded' ) );
    1313        add_action( 'admin_init',         array( $this, 'add_providers' ) );
    14         add_action( 'jetpack_admin_menu', array( $this, 'jetpack_admin_menu' ) );
     14        //slim//add_action( 'jetpack_admin_menu', array( $this, 'jetpack_admin_menu' ) );
    1515        add_action( 'admin_menu',         array( $this, 'admin_menu' ), 20 );
    1616        if( ! jetpack_is_mobile() ) {

  • slimjetpack/trunk/readme.txt

    r821676 r835991  
    44Requires at least: 3.6
    55Tested up to: 3.8
    6 Stable tag: 2.7
     6Stable tag: 2.7.0.1
    77
    88Slim version of Jetpack unlinked from WordPress.com :)
    … …  
    2222SlimJetpack 2.1.1.x is corresponding to Jetpack 2.1.1 and the x is the bugfix mark.
    2323
    24 If you need the wordpress.com likes/stats, subscription and push notification services etc., please deactivate Slim Jetpack
    25 and use the original Jetpack instead.
     24If you find any bug, please submit a ticket here: https://github.com/HowardMei/slimjetpack/issues 
     25Or just fork the repository and send me pull requests ;)
     26
     27Please deactivate Slim Jetpack and use the original Jetpack instead if you need the wordpress.com likes/stats, 
     28subscription and push notification services etc.,
    2629
    2730==Modules Included==
    … …  
    9497http://plugins.svn.wordpress.org/slimjetpack/assets/SlimJetpack.png
    9598
    96 == Weight-loss Diary ==
     99== Changelog ==
     100
     101= 2.7.0.1 =
     102* Change custom-css editor back to ACE for better CSS Hint
     103* Completely remove photon to avoid confusion
     104* Remove the devicepx js calling back to s0.wp.com
     105* Fix the Akismet & Omnisearch menu dependency issue
    97106
    98107= 2.7 =
    … …  
    191200* Bug Fix: Shortcodes: improvements to Archives, Google+, Presentations, Vine and Youtube.
    192201* Bug Fix: Tiled Galleries: improve display of panoramic images and fix errors when an image is not uploaded properly.
    193 
    194 

  • slimjetpack/trunk/slimjetpack.php

    r821676 r835991  
    44 * Plugin Name: Slim Jetpack
    55 * Plugin URI: http://wordpress.org/extend/plugins/slimjetpack/
    6  * Description: Plug-n-pay Slim Jetpack totally unlinked with WordPress.Com API with less obtrusive admin page.
     6 * Description: Plug-n-pay Slim Jetpack totally unlinked from WordPress.Com with less obtrusive admin page.
    77 * Author: WingerSpeed
    8  * Version: 2.7
    9  * Author URI: http://whitelabelecms.com
     8 * Version: 2.7.0.1
     9 * Author URI: https://github.com/HowardMei/slimjetpack
    1010 * License: GPL2+
    1111 * Text Domain: jetpack
    … …  
    4848require_once( JETPACK__PLUGIN_DIR . 'class.jetpack-debugger.php'      );
    4949require_once( JETPACK__PLUGIN_DIR . 'class.jetpack-heartbeat.php'     );
    50 require_once( JETPACK__PLUGIN_DIR . 'class.photon.php'                );
    51 require_once( JETPACK__PLUGIN_DIR . 'functions.photon.php'            );
     50//slim//require_once( JETPACK__PLUGIN_DIR . 'class.photon.php'                );
     51//slim//require_once( JETPACK__PLUGIN_DIR . 'functions.photon.php'            );
    5252require_once( JETPACK__PLUGIN_DIR . 'functions.compat.php'            );
    5353require_once( JETPACK__PLUGIN_DIR . 'functions.gallery.php'           );
    … …  
    7171 * See: http://jetpack.me/2013/07/11/photon-and-themes/
    7272 */
     73/*
     74//slim//
    7375if ( Jetpack::init()->is_module_active( 'photon' ) ) {
    7476    add_filter( 'jetpack_photon_url', 'jetpack_photon_url', 10, 3 );
    … …  
    7678    remove_filter( 'jetpack_photon_url', 'jetpack_photon_url', 10, 3 );
    7779}
    78 
     80*/
    7981/*
    8082if ( is_admin() && ! Jetpack::check_identity_crisis() ) {
Note: See TracChangeset for help on using the changeset viewer.