https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114735

Revision: 114735
Author:   kaldari
Date:     2012-04-05 07:24:33 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
making the more button work, fixing some context issues

Modified Paths:
--------------
    trunk/extensions/PageTriage/SpecialPageTriage.php
    trunk/extensions/PageTriage/api/ApiPageTriageList.php
    
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listStatsNav.css
    
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.js

Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php   2012-04-05 06:50:52 UTC 
(rev 114734)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php   2012-04-05 07:24:33 UTC 
(rev 114735)
@@ -215,13 +215,6 @@
                                        <span 
class="mwe-pt-control-label-right"><b><%= gM( 'pagetriage-viewing' ) %></b> 
Sort Controls</span>
                                </script>
                                
-                               <!-- load more link template -->
-                               <script type="text/template" 
id="listMoreLinkTemplate">
-                                       <div id="mwe-pt-list-more">
-                                               <a href="#" style="display: 
none;"> <%= gM( 'pagetriage-more' ) %> </a>
-                                       </div>
-                               </script>
-                               
                                <!-- bottom nav template -->
                                <script type="text/template" 
id="listStatsNavTemplate">
                                        <div id="mwe-pt-top-triager">

Modified: trunk/extensions/PageTriage/api/ApiPageTriageList.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageList.php       2012-04-05 
06:50:52 UTC (rev 114734)
+++ trunk/extensions/PageTriage/api/ApiPageTriageList.php       2012-04-05 
07:24:33 UTC (rev 114735)
@@ -148,7 +148,7 @@
                        'limit' => array(
                                ApiBase::PARAM_MAX => '200',
                                ApiBase::PARAM_DFLT => '20',
-                               ApiBase::PARAM_MIN => '10',
+                               ApiBase::PARAM_MIN => '1',
                                ApiBase::PARAM_TYPE => 'integer',
                        ),
                        'offset' => array(

Modified: 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
===================================================================
--- 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
 2012-04-05 06:50:52 UTC (rev 114734)
+++ 
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
 2012-04-05 07:24:33 UTC (rev 114735)
@@ -48,7 +48,7 @@
                apiParams: {
                        namespace: 0,
                        limit: 50,
-                       dir: 'oldestfirst',
+                       dir: 'newestfirst',
                        /*
                        showbots: null,
                        showredirs: null,

Modified: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listStatsNav.css
===================================================================
--- 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listStatsNav.css
    2012-04-05 06:50:52 UTC (rev 114734)
+++ 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listStatsNav.css
    2012-04-05 07:24:33 UTC (rev 114735)
@@ -1,5 +1,4 @@
 #mwe-pt-list-stats-nav {
-       border-top: none;
 }
 
 .stickyBottom #mwe-pt-list-stats-nav {

Modified: 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.js
===================================================================
--- 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.js
 2012-04-05 06:50:52 UTC (rev 114734)
+++ 
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.js
 2012-04-05 07:24:33 UTC (rev 114735)
@@ -37,8 +37,24 @@
                        
                        var controlNav = new mw.pageTriage.ListControlNav( { 
eventBus: this.eventBus, model: articles } );
                        controlNav.render();
+                       
+                       // create the more link
+                       _this = this;
+                       $( '#mwe-pt-list-view' ).after( $( '<div 
id="mwe-pt-list-more"></div>' )
+                               .append( $( '<a></a>' ).msg( 'pagetriage-more' )
+                                       .click( function() {
+                                               _this.loadMore();
+                                       } )
+                               )
+                       );
                },
                
+               loadMore: function() {
+                       var lastArticle = articles.last(1);
+                       articles.apiParams.offset = 
lastArticle[0].attributes.creation_date;
+                       articles.fetch( {add: true} );
+               },
+               
                // add stats data to the navigation
                addStats: function( stats ) {
                        var statsNav = new mw.pageTriage.ListStatsNav( { 
eventBus: this.eventBus, model: stats } );
@@ -53,11 +69,10 @@
                                this.position = 0;
                        }
                        article.set( 'position', this.position++ );
-                       
                        // pass in the specific article instance
                        var view = new mw.pageTriage.ListItem( { eventBus: 
this.eventBus, model: article } );
-                       this.$( "#mwe-pt-list-view" ).append( view.render().el 
);
-                       this.$( ".mwe-pt-list-triage-button" ).button({
+                       $( "#mwe-pt-list-view" ).append( view.render().el );
+                       $( ".mwe-pt-list-triage-button" ).button({
                                label: mw.msg( 'pagetriage-triage' ),
                                icons: { primary:'ui-icon-search' }
                        });
@@ -66,7 +81,7 @@
                // add all the items in the articles collection
                addAll: function() {
                        $("#mwe-pt-list-view").empty(); // remove the spinner 
before displaying.
-                       articles.each( this.addOne );
+                       articles.forEach( this.addOne, this );
                        this.eventBus.trigger( 'listAddAll' );
            }
 


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to