github-migration
/
comicpress-2.8
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

multi page working

This commit is contained in:
John Bintz 2009-11-28 15:14:19 -05:00
parent b0a829ecb6
commit 14312979ad
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/widgets/GraphicalNavigationWidgetTest.php
View File

@ -98,7 +98,7 @@ class GraphicalNavigationWidgetTest extends PHPUnit_Framework_TestCase {
$w->expects($this->once())->method('_new_comicpress_storyline')->will($this->returnValue($this->getMock('Storyline', array('set_order_via_flattened_storyline')))); $w->expects($this->once())->method('_new_comicpress_storyline')->will($this->returnValue($this->getMock('Storyline', array('set_order_via_flattened_storyline'))));
$w->expects($this->once())->method('_new_comicpress_navigation')->will($this->returnValue($this->getMock('Navigation', array('init', 'get_post_nav')))); $w->expects($this->once())->method('_new_comicpress_navigation')->will($this->returnValue($this->getMock('Navigation', array('init', 'get_post_nav'))));
$this->assertEquals('test', $w->set_up_post_nav(array())); $this->assertEquals('test', array_shift($w->set_up_post_nav(array())));
} }
function providerTestSetUpPostNavStoryPrev() { function providerTestSetUpPostNavStoryPrev() {
@ -130,7 +130,7 @@ class GraphicalNavigationWidgetTest extends PHPUnit_Framework_TestCase {
* @dataProvider providerTestSetUpPostNavStoryPrev * @dataProvider providerTestSetUpPostNavStoryPrev
*/ */
function testComicPressSetUpPostNavFilterStoryPrev($instance, $post_nav, $expected_post_nav) { function testComicPressSetUpPostNavFilterStoryPrev($instance, $post_nav, $expected_post_nav) {
$this->assertEquals($expected_post_nav, array_shift($this->w->_comicpress_set_up_post_nav_story_prev($post_nav, null, $instance))); $this->assertEquals($expected_post_nav, array_shift($this->w->_comicpress_set_up_post_nav_story_prev(array($post_nav, null, $instance))));
} }
function providerTestComicPressSetUpPostNavFilterMultiPageSupport() { function providerTestComicPressSetUpPostNavFilterMultiPageSupport() {
@ -205,7 +205,7 @@ class GraphicalNavigationWidgetTest extends PHPUnit_Framework_TestCase {
$page = $_page; $page = $_page;
$numpages = $_numpages; $numpages = $_numpages;
$this->assertEquals($expected_post_nav, array_shift($this->w->_comicpress_set_up_post_nav_multi_page_support($post_nav, $post, $instance))); $this->assertEquals($expected_post_nav, array_shift($this->w->_comicpress_set_up_post_nav_multi_page_support(array($post_nav, $post, $instance))));
} }
function providerTestBuildInPostPageLink() { function providerTestBuildInPostPageLink() {

29
widgets/GraphicalNavigationWidget.inc
View File

@ -309,9 +309,9 @@ class GraphicalNavigationWidget extends WP_Widget {
$navigation->init($storyline); $navigation->init($storyline);
$post_nav = $navigation->get_post_nav($post); $post_nav = $navigation->get_post_nav($post);
$result = apply_filters('comicpress_set_up_post_nav', $post_nav, $post, $instance); $result = apply_filters('comicpress_set_up_post_nav', array($post_nav, $post, $instance));
if (is_array($result)) { if (is_array($result)) {
return array_shift(array_shift($result)); return array_shift($result);
} else { } else {
return $post_nav; return $post_nav;
} }
@ -325,7 +325,8 @@ class GraphicalNavigationWidget extends WP_Widget {
} }
} }
function _comicpress_set_up_post_nav_story_prev($post_nav, $post, $instance) { function _comicpress_set_up_post_nav_story_prev($info) {
list($post_nav, $post, $instance) = $info;
if ($instance['story_prev_acts_as_prev_in'] == 'on') { if ($instance['story_prev_acts_as_prev_in'] == 'on') {
if ($post_nav['storyline-previous'] !== false) { if ($post_nav['storyline-previous'] !== false) {
$post_nav['storyline-chapter-previous'] = $post_nav['storyline-previous']; $post_nav['storyline-chapter-previous'] = $post_nav['storyline-previous'];
@ -334,8 +335,9 @@ class GraphicalNavigationWidget extends WP_Widget {
return array($post_nav, $post, $instance); return array($post_nav, $post, $instance);
} }
function _comicpress_set_up_post_nav_multi_page_support($post_nav, $post, $instance) { function _comicpress_set_up_post_nav_multi_page_support($info) {
global $page, $numpages; global $page, $numpages;
list($post_nav, $post, $instance) = $info;
if ($instance['enable_multipage_support'] == 'on') { if ($instance['enable_multipage_support'] == 'on') {
if ($page < $numpages && $numpages != 1) { if ($page < $numpages && $numpages != 1) {
@ -371,7 +373,7 @@ class GraphicalNavigationWidget extends WP_Widget {
'first', 'story_prev', 'story_next', 'story_prev_in', 'first', 'story_prev', 'story_next', 'story_prev_in',
'story_next_in', 'previous', 'random', 'archives', 'story_next_in', 'previous', 'random', 'archives',
'comments', 'next', 'last', 'buyprint', 'comictitle', 'lastgohome', 'comments', 'next', 'last', 'buyprint', 'comictitle', 'lastgohome',
'story_prev_acts_as_prev_in' 'story_prev_acts_as_prev_in', 'enable_multipage_support'
); );
foreach ($all_fields as $field) { foreach ($all_fields as $field) {
@ -403,7 +405,8 @@ class GraphicalNavigationWidget extends WP_Widget {
'buyprint' => 'off', 'buyprint' => 'off',
'comictitle' => 'off', 'comictitle' => 'off',
'lastgohome' => 'off', 'lastgohome' => 'off',
'story_prev_acts_as_prev_in' => 'on' 'story_prev_acts_as_prev_in' => 'on',
'enable_multipage_support' => 'off',
); );
$title_defaults = array( $title_defaults = array(
@ -436,7 +439,8 @@ class GraphicalNavigationWidget extends WP_Widget {
'archives' => __('Archives', 'comicpress'), 'archives' => __('Archives', 'comicpress'),
'comments' => __('Comments', 'comicpress'), 'comments' => __('Comments', 'comicpress'),
'random' => __('Random', 'comicpress'), 'random' => __('Random', 'comicpress'),
'buyprint' => __('Buy Print', 'comicpress') 'buyprint' => __('Buy Print', 'comicpress'),
'enable_multipage_support' => __('Enable multi-page support', 'comicpress'),
) as $field => $label) { ) as $field => $label) {
$title_field = "${field}_title"; ?> $title_field = "${field}_title"; ?>
<div class="comicpress-field-holder"> <div class="comicpress-field-holder">
@ -479,6 +483,15 @@ class GraphicalNavigationWidget extends WP_Widget {
</label> </label>
</div> </div>
<?php break; <?php break;
case "enable_multipage_support": ?>
<div>
<p>
<em>
<?php _e('If using posts with multiple pages, previous/next navigation will link to pages if available.', 'comicpress') ?>
</em>
</p>
</div>
<?php break;
case "story_prev": ?> case "story_prev": ?>
<div> <div>
<label> <label>
@ -486,12 +499,12 @@ class GraphicalNavigationWidget extends WP_Widget {
name="<?php echo $this->get_field_name('story_prev_acts_as_prev_in'); ?>" name="<?php echo $this->get_field_name('story_prev_acts_as_prev_in'); ?>"
type="checkbox" class="comicpress-field" value="yes"<?php if ($instance['story_prev_acts_as_prev_in'] == "on") { echo ' checked="checked"'; } ?> /> type="checkbox" class="comicpress-field" value="yes"<?php if ($instance['story_prev_acts_as_prev_in'] == "on") { echo ' checked="checked"'; } ?> />
<strong><?php _e('Enable alternate behavior', 'comicpress'); ?></strong> <strong><?php _e('Enable alternate behavior', 'comicpress'); ?></strong>
</label>
<p> <p>
<em> <em>
<?php _e('If the current post is not at the start of a chapter, the button will act the same as &quot;Previous In Chapter&quot;.', 'comicpress') ?> <?php _e('If the current post is not at the start of a chapter, the button will act the same as &quot;Previous In Chapter&quot;.', 'comicpress') ?>
</em> </em>
</p> </p>
</label>
</div> </div>
<?php break; <?php break;
} }