Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bye bye ajax loader gif.

This commit is contained in:
James Koster 2014-11-13 18:28:15 +00:00
parent 258d7f4482
commit 30a5c4bfdb
18 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
assets/css/_mixins.scss
View File

@ -213,3 +213,26 @@
margin-left: 7px; margin-left: 7px;
content: $glyph; content: $glyph;
} }
@mixin loader() {
&:before {
height: 1em;
width: 1em;
display: block;
position: absolute;
top: 50%;
left: 50%;
margin-left: -.5em;
margin-top: -.5em;
display: block;
-webkit-animation: spin 2s linear infinite;
-moz-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
font-family: "WooCommerce";
content: "\e01c";
line-height: 1;
text-align: center;
font-size: 1.618em;
color: rgba(#000,0.75);
}
}

2
assets/css/admin.css
View File

File diff suppressed because one or more lines are too long

5
assets/css/admin.scss
View File

@ -3,6 +3,7 @@
@import "bourbon"; @import "bourbon";
@import "mixins"; @import "mixins";
@import "variables"; @import "variables";
@import "animation";
/* =Custom Font /* =Custom Font
@ -18,6 +19,10 @@
font-style: normal; font-style: normal;
} }
.blockUI.blockOverlay {
@include loader();
}
/* Addons */ /* Addons */
.wc_addons_wrap { .wc_addons_wrap {
.products { .products {

2
assets/css/prettyPhoto.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/prettyPhoto.scss
View File

@ -44,7 +44,7 @@ div.pp_woocommerce {
} }
.pp_loaderIcon { .pp_loaderIcon {
background: url(../images/ajax-loader.gif) center no-repeat; @include loader();
} }
div.ppt { div.ppt {

2
assets/css/woocommerce.css
View File

File diff suppressed because one or more lines are too long

8
assets/css/woocommerce.scss
View File

@ -78,6 +78,14 @@ p.demo_store {
/* =Main Styles (namespace to avoid conflict with common global class names) /* =Main Styles (namespace to avoid conflict with common global class names)
-------------------------------------------------------------- */ -------------------------------------------------------------- */
.woocommerce { .woocommerce {
.blockUI.blockOverlay {
@include loader();
}
.loader {
@include loader();
}
.woocommerce-message, .woocommerce-message,
.woocommerce-error, .woocommerce-error,
.woocommerce-info { .woocommerce-info {

BIN
assets/images/ajax-loader.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 885 B

BIN
assets/images/ajax-loader@2x.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

14
assets/js/admin/meta-boxes-order.js
View File

@ -8,7 +8,7 @@ jQuery( function ( $ ) {
$( '#woocommerce-order-items' ).block({ $( '#woocommerce-order-items' ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -893,7 +893,7 @@ jQuery( function ( $ ) {
$( '.order_download_permissions' ).block({ $( '.order_download_permissions' ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -940,7 +940,7 @@ jQuery( function ( $ ) {
$( el ).block({ $( el ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -990,7 +990,7 @@ jQuery( function ( $ ) {
$( this ).closest( '.edit_address' ).block({ $( this ).closest( '.edit_address' ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -1044,7 +1044,7 @@ jQuery( function ( $ ) {
$( this ).closest( '.edit_address' ).block({ $( this ).closest( '.edit_address' ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -1118,7 +1118,7 @@ jQuery( function ( $ ) {
$( '#woocommerce-order-notes' ).block({ $( '#woocommerce-order-notes' ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -1146,7 +1146,7 @@ jQuery( function ( $ ) {
$( note ).block({ $( note ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });

2
assets/js/admin/meta-boxes-order.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
assets/js/admin/meta-boxes-product-variation.js
View File

@ -26,7 +26,7 @@ jQuery( function ( $ ) {
$('.woocommerce_variations').block({ $('.woocommerce_variations').block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes_variations.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -84,7 +84,7 @@ jQuery( function ( $ ) {
$( '#variable_product_options' ).block({ $( '#variable_product_options' ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes_variations.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -144,7 +144,7 @@ jQuery( function ( $ ) {
$( el ).block({ $( el ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes_variations.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });
@ -212,7 +212,7 @@ jQuery( function ( $ ) {
$( '.woocommerce_variations .woocommerce_variation' ).block({ $( '.woocommerce_variations .woocommerce_variation' ).block({
message: null, message: null,
overlayCSS: { overlayCSS: {
background: '#fff url(' + woocommerce_admin_meta_boxes_variations.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', background: '#fff',
opacity: 0.6 opacity: 0.6
} }
}); });

2
assets/js/admin/meta-boxes-product-variation.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
assets/js/admin/meta-boxes-product.js
View File

@ -389,7 +389,7 @@ jQuery( function( $ ){
// Add a new attribute (via ajax) // Add a new attribute (via ajax)
$('.product_attributes').on('click', 'button.add_new_attribute', function() { $('.product_attributes').on('click', 'button.add_new_attribute', function() {
$('.product_attributes').block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', opacity: 0.6 } }); $('.product_attributes').block({ message: null, overlayCSS: { background: '#fff', opacity: 0.6 } });
var attribute = $(this).attr('data-attribute'); var attribute = $(this).attr('data-attribute');
var $wrapper = $(this).closest('.woocommerce_attribute_data'); var $wrapper = $(this).closest('.woocommerce_attribute_data');
@ -430,7 +430,7 @@ jQuery( function( $ ){
// Save attributes and update variations // Save attributes and update variations
$('.save_attributes').on('click', function(){ $('.save_attributes').on('click', function(){
$('.product_attributes').block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', opacity: 0.6 } }); $('.product_attributes').block({ message: null, overlayCSS: { background: '#fff', opacity: 0.6 } });
var data = { var data = {
post_id: woocommerce_admin_meta_boxes.post_id, post_id: woocommerce_admin_meta_boxes.post_id,
@ -446,7 +446,7 @@ jQuery( function( $ ){
this_page = this_page.replace( 'post-new.php?', 'post.php?post=' + woocommerce_admin_meta_boxes.post_id + '&action=edit&' ); this_page = this_page.replace( 'post-new.php?', 'post.php?post=' + woocommerce_admin_meta_boxes.post_id + '&action=edit&' );
// Load variations panel // Load variations panel
$('#variable_product_options').block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_admin_meta_boxes.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', opacity: 0.6 } }); $('#variable_product_options').block({ message: null, overlayCSS: { background: '#fff', opacity: 0.6 } });
$('#variable_product_options').load( this_page + ' #variable_product_options_inner', function() { $('#variable_product_options').load( this_page + ' #variable_product_options_inner', function() {
$('#variable_product_options').unblock(); $('#variable_product_options').unblock();
} ); } );

2
assets/js/admin/meta-boxes-product.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
assets/js/frontend/add-payment-method.js
View File

@ -26,7 +26,7 @@ jQuery( function( $ ) {
.find( 'input[name=payment_method]:checked' ).click(); .find( 'input[name=payment_method]:checked' ).click();
$( '#add_payment_method' ).submit( function() { $( '#add_payment_method' ).submit( function() {
$( '#add_payment_method' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_params.plugin_url + '/assets/images/ajax-loader.gif) no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } }); $( '#add_payment_method' ).block({ message: null, overlayCSS: { background: '#fff', opacity: 0.6 } });
}); });
$( 'body' ).trigger( 'init_add_payment_method' ); $( 'body' ).trigger( 'init_add_payment_method' );

2
assets/js/frontend/add-payment-method.min.js vendored
View File

@ -1 +1 @@
jQuery(function(a){return"undefined"==typeof woocommerce_params?!1:(a("#add_payment_method").on("click init_add_payment_method",".payment_methods input.input-radio",function(){if(a(".payment_methods input.input-radio").length>1){var b=a("div.payment_box."+a(this).attr("ID"));a(this).is(":checked")&&!b.is(":visible")&&(a("div.payment_box").filter(":visible").slideUp(250),a(this).is(":checked")&&a("div.payment_box."+a(this).attr("ID")).slideDown(250))}else a("div.payment_box").show()}).find("input[name=payment_method]:checked").click(),a("#add_payment_method").submit(function(){a("#add_payment_method").block({message:null,overlayCSS:{background:"#fff url("+woocommerce_params.plugin_url+"/assets/images/ajax-loader.gif) no-repeat center",backgroundSize:"16px 16px",opacity:.6}})}),void a("body").trigger("init_add_payment_method"))}); jQuery(function(a){return"undefined"==typeof woocommerce_params?!1:(a("#add_payment_method").on("click init_add_payment_method",".payment_methods input.input-radio",function(){if(a(".payment_methods input.input-radio").length>1){var b=a("div.payment_box."+a(this).attr("ID"));a(this).is(":checked")&&!b.is(":visible")&&(a("div.payment_box").filter(":visible").slideUp(250),a(this).is(":checked")&&a("div.payment_box."+a(this).attr("ID")).slideDown(250))}else a("div.payment_box").show()}).find("input[name=payment_method]:checked").click(),a("#add_payment_method").submit(function(){a("#add_payment_method").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})}),void a("body").trigger("init_add_payment_method"))});

8
includes/class-wc-frontend-scripts.php
View File

@ -189,10 +189,8 @@ class WC_Frontend_Scripts {
switch ( $handle ) { switch ( $handle ) {
case 'woocommerce' : case 'woocommerce' :
$assets_path = str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/';
return array( return array(
'ajax_url' => WC()->ajax_url(), 'ajax_url' => WC()->ajax_url(),
'ajax_loader_url' => apply_filters( 'woocommerce_ajax_loader_url', $assets_path . 'images/ajax-loader@2x.gif' ),
); );
break; break;
case 'wc-single-product' : case 'wc-single-product' :
@ -202,10 +200,8 @@ class WC_Frontend_Scripts {
); );
break; break;
case 'wc-checkout' : case 'wc-checkout' :
$assets_path = str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/';
return array( return array(
'ajax_url' => WC()->ajax_url(), 'ajax_url' => WC()->ajax_url(),
'ajax_loader_url' => apply_filters( 'woocommerce_ajax_loader_url', $assets_path . 'images/ajax-loader@2x.gif' ),
'update_order_review_nonce' => wp_create_nonce( "update-order-review" ), 'update_order_review_nonce' => wp_create_nonce( "update-order-review" ),
'apply_coupon_nonce' => wp_create_nonce( "apply-coupon" ), 'apply_coupon_nonce' => wp_create_nonce( "apply-coupon" ),
'option_guest_checkout' => get_option( 'woocommerce_enable_guest_checkout' ), 'option_guest_checkout' => get_option( 'woocommerce_enable_guest_checkout' ),
@ -221,10 +217,8 @@ class WC_Frontend_Scripts {
); );
break; break;
case 'wc-cart' : case 'wc-cart' :
$assets_path = str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/';
return array( return array(
'ajax_url' => WC()->ajax_url(), 'ajax_url' => WC()->ajax_url(),
'ajax_loader_url' => apply_filters( 'woocommerce_ajax_loader_url', $assets_path . 'images/ajax-loader@2x.gif' ),
'update_shipping_method_nonce' => wp_create_nonce( "update-shipping-method" ), 'update_shipping_method_nonce' => wp_create_nonce( "update-shipping-method" ),
); );
break; break;
@ -235,10 +229,8 @@ class WC_Frontend_Scripts {
); );
break; break;
case 'wc-add-to-cart' : case 'wc-add-to-cart' :
$assets_path = str_replace( array( 'http:', 'https:' ), '', WC()->plugin_url() ) . '/assets/';
return array( return array(
'ajax_url' => WC()->ajax_url(), 'ajax_url' => WC()->ajax_url(),
'ajax_loader_url' => apply_filters( 'woocommerce_ajax_loader_url', $assets_path . 'images/ajax-loader@2x.gif' ),
'i18n_view_cart' => esc_attr__( 'View Cart', 'woocommerce' ), 'i18n_view_cart' => esc_attr__( 'View Cart', 'woocommerce' ),
'cart_url' => get_permalink( wc_get_page_id( 'cart' ) ), 'cart_url' => get_permalink( wc_get_page_id( 'cart' ) ),
'is_cart' => is_cart(), 'is_cart' => is_cart(),