http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65474

Revision: 65474
Author:   jeroendedauw
Date:     2010-04-23 18:45:36 +0000 (Fri, 23 Apr 2010)

Log Message:
-----------
Tested and applied patch from pdhanda to fix story batch load when scrolling 
down.

Modified Paths:
--------------
    trunk/extensions/Storyboard/api/ApiQueryStories.php
    trunk/extensions/Storyboard/tags/Storyboard/storyboard.js

Modified: trunk/extensions/Storyboard/api/ApiQueryStories.php
===================================================================
--- trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-04-23 18:43:08 UTC 
(rev 65473)
+++ trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-04-23 18:45:36 UTC 
(rev 65474)
@@ -54,7 +54,8 @@
                        'story_author_image',
                        'story_title',
                        'story_text',
-                       'story_created'
+                       'story_created',
+                       'story_modified'
                ) );
                $this->addWhere( array(
                        'story_state' => Storyboard_STORY_PUBLISHED
@@ -73,11 +74,12 @@
                        
                        $storyModified = $continueParams[0];
                        $storyId = intval( $continueParams[1] );
-                       var_dump($storyModified);exit;
+                       /* FIXME
                        $this->addWhere(
                                "story_modified > $storyModified OR " .
                                "(story_modified = $storyId AND story_id <= 
$storyModified)"
                        );
+                       */
                        
                }
                
@@ -88,7 +90,7 @@
                        if ( ++$count > $params['limit'] ) {
                                // We've reached the one extra which shows that
                                // there are additional pages to be had. Stop 
here...
-                               $this->setContinueEnumParameter( 'continue', 
wfTimestamp( TS_MW, $row->story_modified ) . '-' . $row->story_id );
+                               $this->setContinueEnumParameter( 'continue', 
wfTimestamp( TS_MW, $story->story_modified ) . '-' . $story->story_id );
                                break;
                        }
                        $res = array(

Modified: trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
===================================================================
--- trunk/extensions/Storyboard/tags/Storyboard/storyboard.js   2010-04-23 
18:43:08 UTC (rev 65473)
+++ trunk/extensions/Storyboard/tags/Storyboard/storyboard.js   2010-04-23 
18:45:36 UTC (rev 65474)
@@ -9,13 +9,17 @@
        $( document ).ready( function() {
                $( '.storyboard' ).ajaxScroll( {
                        updateBatch: updateStoryboard,
+                       maxOffset: 500,
                        batchSize: 4,
-                       batchNum: 2
+                       batchNum: 2,
+                       batchClass: "batch",
+                       boxClass: "storyboard-box",
+                       emptyBatchClass: "storyboard-empty",
+                       scrollPaneClass: "scrollpane"
                } );
        } );
        
        function updateStoryboard( $storyboard ) {
-               // TODO: fix eternal load, broken when swicthing from .load to 
.getJSON.        
                $.getJSON( wgScriptPath + '/api.php',
                        {
                                'action': 'query',



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to