Skip to content

Commit

Permalink
Remove select2 since it's already included.
Browse files Browse the repository at this point in the history
  • Loading branch information
anderly committed Apr 8, 2015
1 parent 357bfce commit 85455dd
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 45 deletions.
1 change: 0 additions & 1 deletion assets/css/select2.min.css

This file was deleted.

Binary file removed assets/css/select2.png
Binary file not shown.
Binary file removed assets/css/select2x2.png
Binary file not shown.
23 changes: 0 additions & 23 deletions assets/js/select2.min.js

This file was deleted.

15 changes: 0 additions & 15 deletions includes/class-ss-wc-settings-mailchimp.php
Expand Up @@ -58,10 +58,6 @@ public function register_hooks() {
add_action( 'woocommerce_sections_' . $this->id, array( $this, 'output_sections' ) );
add_action( 'woocommerce_settings_saved', array( $this, 'init' ) );

if ( is_admin() ) {

}

} //end function ensure_tab

// /**
Expand Down Expand Up @@ -111,17 +107,6 @@ public function save() {

$settings = $this->get_settings( $current_section );
WC_Admin_Settings::save_fields( $settings );

$this->wc_enqueue_js("
(function($){
$(document).ready(function() {
var apiKey = $('#woocommerce_mailchimp_api_key').val();
if (apiKey === '') {
SS_WC_MailChimp.loadLists(apiKey);
}
});
})(jQuery);
");
}

/**
Expand Down
6 changes: 0 additions & 6 deletions woocommerce-mailchimp.php
Expand Up @@ -127,10 +127,6 @@ public function enqueue_scripts() {
wp_register_script( 'woocommerce-mailchimp-admin', WOOCOMMERCE_MAILCHIMP_PLUGIN_URL . '/assets/js/woocommerce-mailchimp-admin.js', array( 'jquery' ), WOOCOMMERCE_MAILCHIMP_VERSION );
wp_register_style( 'woocommerce-mailchimp', WOOCOMMERCE_MAILCHIMP_PLUGIN_URL . '/assets/css/style.css', array(), WOOCOMMERCE_MAILCHIMP_VERSION );

// Select2 scripts and styles
wp_register_script( 'woocommerce-mailchimp-jquery-select2', WOOCOMMERCE_MAILCHIMP_PLUGIN_URL . '/assets/js/select2.min.js', array( 'jquery' ), '1.0.0' );
wp_register_style( 'woocommerce-mailchimp-jquery-select2-css', WOOCOMMERCE_MAILCHIMP_PLUGIN_URL . '/assets/css/select2.min.css', array(), WOOCOMMERCE_MAILCHIMP_VERSION );

// Localize javascript messages
$translation_array = array(
'connecting_to_mailchimp' => __( 'Connecting to MailChimp', 'ss_wc_mailchimp' ),
Expand All @@ -142,11 +138,9 @@ public function enqueue_scripts() {
wp_localize_script( 'woocommerce-mailchimp-admin', 'SS_WC_MailChimp_Messages', $translation_array );

// Scripts
wp_enqueue_script( 'woocommerce-mailchimp-jquery-select2' );
wp_enqueue_script( 'woocommerce-mailchimp-admin' );

// Styles
wp_enqueue_style( 'woocommerce-mailchimp-jquery-select2-css' );
wp_enqueue_style( 'woocommerce-mailchimp' );

} //end function enqueue_scripts
Expand Down

0 comments on commit 85455dd

Please sign in to comment.