← All changes | blocks/Post_Grid_2.php +23 -25 2.1.1 → 2.2.5 View file →

		@@ -34,26 +34,25 @@
34	34	'queryTax' => [
35	35	'type' => 'string',
36	36	'default' => 'category'
37	37	],
38		- 'queryCat' => [
	38	+ 'queryTaxValue' => [
39	39	'type' => 'string',
40	40	'default' => '[]',
41	41	'style' => [
42	42	(object)[
43		- 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'category']]
	43	+ 'depends' => [(object)['key' => 'queryTax','condition' => '!=','value' => '']]
44	44	],
45	45	],
46	46	],
47		- 'queryTag' => [
	47	+ 'queryCat' => [ // for compatibility
48	48	'type' => 'string',
49		- 'default' => '[]',
50		- 'style' => [
51		- (object)[
52		- 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'post_tag']]
53		- ],
54		- ],
	49	+ 'default' => '[]'
55	50	],
	51	+ 'queryTag' => [ // for compatibility
	52	+ 'type' => 'string',
	53	+ 'default' => '[]'
	54	+ ],
56	55	'queryOrderBy' => [
57	56	'type' => 'string',
58	57	'default' => 'date',
59	58	],
		@@ -987,9 +986,9 @@
987	986	'depends' => [
988	987	(object)['key'=>'catShow','condition'=>'==','value'=>true],
989	988	(object)['key'=>'customCatColor','condition'=>'!=','value'=>true],
990	989	],
991		- 'selector'=>'{{ULTP}} .ultp-category-grid a { color:{{catColor}}; }'
	990	+ 'selector'=>'{{ULTP}} .ultp-block-item .ultp-category-grid a { color:{{catColor}}; }'
992	991	],
993	992	],
994	993	],
995	994	'catBgColor' => [
		@@ -1229,9 +1228,9 @@
1229	1228	// Image Setting/Style
1230	1229	//--------------------------
1231	1230	'imgCrop' => [
1232	1231	'type' => 'string',
1233		- 'default' => 'ultp_layout_landscape',
	1232	+ 'default' => (ultimate_post()->get_setting('disable_image_size') == 'yes' ? 'full' : 'ultp_layout_landscape'),
1234	1233	'depends' => [(object)['key' => 'showImage','condition' => '==','value' => 'true']]
1235	1234	],
1236	1235	'imgAnimation' => [
1237	1236	'type' => 'string',
		@@ -1516,26 +1515,25 @@
1516	1515	'filterText' => [
1517	1516	'type' => 'string',
1518	1517	'default' => 'all'
1519	1518	],
1520		- 'filterCat' => [
	1519	+ 'filterValue' => [
1521	1520	'type' => 'string',
1522	1521	'default' => '[]',
1523	1522	'style' => [
1524	1523	(object)[
1525		- 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'category']]
	1524	+ 'depends' => [(object)['key' => 'filterType','condition' => '!=','value' => '']]
1526	1525	],
1527	1526	],
1528	1527	],
1529		- 'filterTag' => [
	1528	+ 'filterCat' => [ // for compatibility
1530	1529	'type' => 'string',
1531		- 'default' => '[]',
1532		- 'style' => [
1533		- (object)[
1534		- 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'post_tag']]
1535		- ],
1536		- ],
	1530	+ 'default' => '[]'
1537	1531	],
	1532	+ 'filterTag' => [ // for compatibility
	1533	+ 'type' => 'string',
	1534	+ 'default' => '[]'
	1535	+ ],
1538	1536	'fliterTypo' => [
1539	1537	'type' => 'object',
1540	1538	'default' => (object)['openTypography' => 1,'size' => (object)['lg' =>14, 'unit' =>'px'],'height' => (object)['lg' =>18, 'unit' =>'px'], 'decoration' => 'none','family'=>'','weight'=>500],
1541	1539	'style' => [
		@@ -1877,15 +1875,15 @@
1877	1875	],
1878	1876	],
1879	1877	'pagiHoverbg' => [
1880	1878	'type' => 'object',
1881		- 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5', 'replace'=>1],
	1879	+ 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5','replace'=>1],
1882	1880	'style' => [
1883	1881	(object)[
1884	1882	'depends' => [
1885	1883	(object)['key'=>'paginationShow','condition'=>'==','value'=>true],
1886	1884	],
1887		- 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore .ultp-loadmore-action:hover { {{pagiHoverbg}} } @media (min-width: 768px) { {{ULTP}} .ultp-pagination li a:hover { {{pagiHoverbg}} }}'
	1885	+ 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination-wrap .ultp-pagination li a:focus, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover{ {{pagiHoverbg}} }'
1888	1886	],
1889	1887	],
1890	1888	],
1891	1889	'pagiHoverBorder' => [
		@@ -1919,9 +1917,9 @@
1919	1917	(object)[
1920	1918	'depends' => [
1921	1919	(object)['key'=>'paginationShow','condition'=>'==','value'=>true],
1922	1920	],
1923		- 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }'
	1921	+ 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }'
1924	1922	],
1925	1923	],
1926	1924	],
1927	1925	'pagiPadding' => [
		@@ -2146,10 +2144,10 @@
2146	2144
2147	2145	public function content($attr, $noAjax) {
2148	2146
2149	2147	if(!$noAjax){
2150		- $paged = (get_query_var('paged')) ? get_query_var('paged') : 1;
2151		- $attr['paged'] = $paged;
	2148	+ $paged = is_front_page() ? get_query_var('page') : get_query_var('paged');
	2149	+ $attr['paged'] = $paged ? $paged : 1;
2152	2150	}
2153	2151
2154	2152	$block_name = 'post-grid-2';
2155	2153	$page_post_id = get_the_ID();