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

Swap to associative array for model.

This commit is contained in:
George Stephanis 2015-08-10 16:51:06 -04:00
parent 7449bf951d
commit 97251f80b6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/js/admin/settings-views-html-settings-tax.js
View File

@ -17,7 +17,7 @@
per_page : data.limit,
page : data.page,
render : function() {
var rates = this.model.get( 'rates' ),
var rates = $.map( this.model.get( 'rates' ), function(v){return [v]} ),
qty_rates = rates.length,
qty_pages = Math.ceil( qty_rates / this.per_page ),
first_index = this.per_page * ( this.page - 1),
@ -60,7 +60,8 @@
}
},
initialize : function() {
this.qty_pages = Math.ceil( this.model.get( 'rates' ).length / this.per_page );
this.per_page = 3;
this.qty_pages = Math.ceil( $.map( this.model.get( 'rates' ), function(v){return [v]} ).length / this.per_page );
this.listenTo( this.model, 'change', this.setUnloadConfirmation );
// this.listenTo( this.model, 'saved', this.clearUnloadConfirmation );
$(window).on( 'beforeunload', { view : this }, this.unloadConfirmation );

2
includes/admin/settings/class-wc-settings-tax.php
View File

@ -149,7 +149,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
// Localize and enqueue our js.
wp_localize_script( 'wc-settings-tax', 'htmlSettingsTaxLocalizeScript', array(
'current_class' => $current_class,
'rates' => array_values( $rates ),
'rates' => $rates,
'page' => ! empty( $_GET['p'] ) ? absint( $_GET['p'] ) : 1,
'limit' => 100,
'countries' => $countries,