Skip to content

Commit 7ea3587

Browse files
brunocantuariabrunocantuaria
committed
Controls Error
1 parent a025c73 commit 7ea3587

File tree

6 files changed

+89
-20
lines changed

6 files changed

+89
-20
lines changed

‎addons/auto-pagination/auto-pagination-functions.php‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ public function get_default_args() {
4545
$args['wrapper_tag'] = 'div';
4646
$args['wrapper_class'] = 'page-link';
4747
$args['wrapper_id'] = '';
48-
$args['link_wrapper'] = 'span';
48+
$args['link_wrapper'] = '';
4949
$args['link_wrapper_class'] = '';
50+
$args['link_wrapper_outter'] = '';
51+
$args['link_wrapper_outter_class'] = '';
5052

5153
return $args;
5254
}
@@ -420,27 +422,42 @@ public function generate_pagination($page, $pages, $args, $elipsis) {
420422
}
421423

422424

423-
// Set defaults...
425+
// Link Wrapper Inner
424426
$link_wrapper_open = "";
425427
$link_wrapper_close = "";
426-
if (!empty($args)) {
428+
if (!empty($args['link_wrapper'])) {
427429
$link_wrapper = $args['link_wrapper'];
428430
$link_class = " class=\"" . $args['link_wrapper_class'] . "\"";
429431
if ($link_wrapper) {
430432
$link_wrapper_open = "<{$link_wrapper}{$link_class}>";
431433
$link_wrapper_close = "</{$link_wrapper}>";
432434
}
433435
}
434-
436+
437+
// Link Wrapper Outter
438+
$link_wrapper_outter_open = "";
439+
$link_wrapper_outter_close = "";
440+
if (!empty($args['link_wrapper_outter'])) {
441+
$link_wrapper = $args['link_wrapper_outter'];
442+
$link_class = " class=\"" . $args['link_wrapper_outter_class'] . "\"";
443+
if ($link_wrapper) {
444+
$link_wrapper_outter_open = "<{$link_wrapper}{$link_class}>";
445+
$link_wrapper_outter_close = "</{$link_wrapper}>";
446+
}
447+
448+
}
449+
435450

436-
$link_html_formatted = " "
451+
$link_html_formatted = " "
452+
. $link_wrapper_outter_open
437453
. $link_html_open
438454
. $link_wrapper_open
439455
. str_replace(array('%page%','%title%'), array($i,$title), $args['pagelink'])
440456
. $link_wrapper_close
441457
. $link_html_close
458+
. $link_wrapper_outter_close
442459
. " ";
443-
460+
444461
if ($i != $pages)
445462
$link_html_formatted .= $args['seperator'];
446463

‎addons/pagination-styles/pagination-styles-functions.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,17 @@ public function add_arg_values($link_pages_args)
4141
{
4242

4343
global $sh_page_links, $auto_paged, $singlepage, $count, $sh_autopag_functions;
44+
4445
$options = $sh_page_links->get_options();
4546
$page_styles = $options['pagination_styles'];
47+
4648
// Get plugin defaults
4749
$page_styles_defaults = SH_PageLinks_PagStyles_Bootstrap::get_default_options();
4850
$page_styles_args = wp_parse_args($page_styles, $page_styles_defaults);
4951
$page_styles_args = apply_filters('wp_link_page_styles_args', $page_styles_args);
52+
5053
extract($page_styles_args, EXTR_SKIP);
54+
5155
$new_args = empty($link_pages_args) ? $page_styles_args : $link_pages_args;
5256
if ($wrapper_tag) {
5357
$wrapper_class = str_replace(',',' ',$wrapper_class);
@@ -60,6 +64,7 @@ public function add_arg_values($link_pages_args)
6064
. $page_styles_args['before'];
6165
$new_args['after'] = $page_styles_args['after'] . "</{$wrapper_tag}>";
6266
}
67+
6368
$new_args['link_before'] = $page_styles_args['link_before'];
6469
if ($link_wrapper) {
6570
$wrapper_class = str_replace(',',' ',$wrapper_class);
@@ -73,6 +78,14 @@ public function add_arg_values($link_pages_args)
7378
}
7479
$new_args['link_after'] .= $page_styles_args['link_after'];
7580

81+
if ($link_wrapper_outter) {
82+
$wrapper_class = str_replace(',',' ',$wrapper_class);
83+
$link_wrapper_class = empty($link_wrapper_outter_class)
84+
? "" : " class=\"{$link_wrapper_outter_class}\"";
85+
$new_args['link_before_outter'] = "<{$link_wrapper_outter}{$link_wrapper_class}>";
86+
$new_args['link_after_outter'] = "</{$link_wrapper_outter}>";
87+
}
88+
7689
if ($sh_autopag_functions)
7790
$new_args['pagelink'] = $pagelink;
7891
else

‎addons/pagination-styles/pagination-styles-options.php‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,21 +167,40 @@ public function options_fields($options = array())
167167
),
168168
'link_wrapper' => array(
169169
'id' => 'link-wrapper',
170-
'title' => __('Link Wrapper Element', SH_PAGE_LINKS_DOMAIN),
170+
'title' => __('Inner Link Wrapper Element', SH_PAGE_LINKS_DOMAIN),
171171
'type' => 'text',
172172
'valid' => 'html',
173173
'default' => '',
174-
'description' => __('Wraps each pagination link in an HTML element. (See "Sample Anatomy" below.) The single-page option and the scrolling ellipsis ("...") are unaffected. Defaults to (blank).',
174+
'description' => __('Wraps each pagination link text in an HTML element. (See "Sample Anatomy" below.) The single-page option and the scrolling ellipsis ("...") are unaffected. Defaults to (blank).',
175175
SH_PAGE_LINKS_DOMAIN),
176176
'callback' => array('SH_PageLinks_Options', 'settings_field_cb')
177177
),
178178
'link_wrapper_class' => array(
179179
'id' => 'link-wrapper-class',
180-
'title' => __('Link Wrapper Element Class', SH_PAGE_LINKS_DOMAIN),
180+
'title' => __('Inner Link Wrapper Element Class', SH_PAGE_LINKS_DOMAIN),
181+
'type' => 'text',
182+
'valid' => 'html-class',
183+
'default' => '',
184+
'description' => __('Assigns a single CSS class to the inner link wrapper element. The single-page option and the scrolling ellipsis ("...") are unaffected. Defaults to (blank).',SH_PAGE_LINKS_DOMAIN),
185+
'callback' => array('SH_PageLinks_Options', 'settings_field_cb')
186+
),
187+
'link_wrapper_outter' => array(
188+
'id' => 'link-wrapper-outter',
189+
'title' => __('Outter Link Wrapper Element', SH_PAGE_LINKS_DOMAIN),
190+
'type' => 'text',
191+
'valid' => 'html',
192+
'default' => '',
193+
'description' => __('Wraps each pagination link in an HTML element. (See "Sample Anatomy" below.) The single-page option and the scrolling ellipsis ("...") are unaffected. Defaults to (blank).',
194+
SH_PAGE_LINKS_DOMAIN),
195+
'callback' => array('SH_PageLinks_Options', 'settings_field_cb')
196+
),
197+
'link_wrapper_outter_class' => array(
198+
'id' => 'link-wrapper-outter-class',
199+
'title' => __('Outter Link Wrapper Element Class', SH_PAGE_LINKS_DOMAIN),
181200
'type' => 'text',
182201
'valid' => 'html-class',
183202
'default' => '',
184-
'description' => __('Assigns a single CSS class to the link wrapper element. The single-page option and the scrolling ellipsis ("...") are unaffected. Defaults to (blank).',SH_PAGE_LINKS_DOMAIN),
203+
'description' => __('Assigns a single CSS class to the outter link wrapper element. The single-page option and the scrolling ellipsis ("...") are unaffected. Defaults to (blank).',SH_PAGE_LINKS_DOMAIN),
185204
'callback' => array('SH_PageLinks_Options', 'settings_field_cb')
186205
),
187206
/*'archive_pages' => array(

‎addons/scrolling-pagination/scrolling-pagination-functions.php‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,47 +59,55 @@ public function generate_scrolling_pagination($content, $page, $pages, $args, $s
5959

6060
$first_num = 1;
6161
$first_num = ' '
62+
. $r['link_before_outter']
6263
. sh_wp_link_page($first_num, $r['firstpageclass'])
6364
. $r['link_before']
6465
. $r['firstpage']
6566
. $r['link_after']
6667
. '</a>'
68+
. $r['link_after_outter']
6769
. ' '
6870
. $args['seperator'];
6971

7072
$prev_link = "";
7173
if ($page > 1) {
7274
$prev_num = $page - 1;
73-
$prev_link = ' '
75+
$prev_link = ' '
76+
. $r['link_before_outter']
7477
. sh_wp_link_page($prev_num, $r['previouspageclass'])
7578
. $r['link_before']
7679
. $r['previouspagelink']
7780
. $r['link_after']
7881
. '</a>'
82+
. $r['link_after_outter']
7983
. ' '
8084
. $args['seperator'];
8185
}
8286

8387
$next_link = "";
8488
if ($page < $pages) {
8589
$next_num = $page + 1;
86-
$next_link = ' '
90+
$next_link = ' '
91+
. $r['link_before_outter']
8792
. sh_wp_link_page($next_num, $r['nextpageclass'])
8893
. $r['link_before']
8994
. $r['nextpagelink']
9095
. $r['link_after']
9196
. '</a>'
97+
. $r['link_after_outter']
9298
. ' '
9399
. $args['seperator'];
94100
}
95101

96102
$last_num = $pages;
97103
$last_num = ' '
104+
. $r['link_before_outter']
98105
. sh_wp_link_page($last_num, $r['lastpageclass'])
99106
. $r['link_before']
100107
. $r['lastpage']
101108
. $r['link_after']
102-
. '</a>';
109+
. '</a>'
110+
. $r['link_after_outter'];
103111

104112
}
105113
$output = "";
@@ -167,18 +175,22 @@ public function generate_scrolling_pagination($content, $page, $pages, $args, $s
167175
if ( ($options['pagination_styles']['use_ajax']!=0) || ( $i != $page || $singlepage ) ) {
168176

169177
$link_html_formatted = " "
178+
. $r['link_before_outter']
170179
. $link_html
171180
. $link_wrapper_open
172181
. str_replace(array('%page%','%title%'), array($i,$title), $args['pagelink'])
173182
. $link_wrapper_close
174183
. "</a>"
184+
. $r['link_after_outter']
175185
. " "
176186
. $args['seperator'];
177187

178188
} else {
179-
$link_html_formatted = ' <span class="plp-active-page">'
189+
$link_html_formatted = $r['link_before_outter']
190+
. '<span class="plp-active-page">'
180191
. str_replace(array('%page%','%title%'), array($i,$title), $args['pagelink'])
181192
. "</span> "
193+
. $r['link_after_outter']
182194
. $args['seperator'];
183195

184196
}

‎js/pagination_option_validation.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/src/pagination_option_validation.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,23 @@ function processChanges($) {
111111

112112
function processChangesAddLink(page) {
113113

114-
var changes = "";
115-
var wrap = jQuery("#link-wrapper").val();
114+
var changes = "",
115+
outterWrap = jQuery("#link-wrapper-outter").val(),
116+
wrap = jQuery("#link-wrapper").val();
116117

117118
if (wrap != "")
118-
changes = '<' + wrap + ' class="' + jQuery("#link-wrapper-class").val() + '">';
119+
page = page.replace('>', '><' + wrap + ' class="' + jQuery("#link-wrapper-class").val() + '">');
119120

120-
changes += page;
121121
if (wrap != "")
122-
changes += '</' + wrap + '>';
122+
page = page.replace('</a>', '</' + wrap + '></a>');
123+
124+
if (outterWrap != "")
125+
changes += '<' + outterWrap + ' class="' + jQuery("#link-wrapper-outter-class").val() + '">';
126+
127+
changes += page;
128+
129+
if (outterWrap != "")
130+
changes += '</' + outterWrap + '>';
123131

124132
return changes;
125133

0 commit comments

Comments
 (0)