https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114768
Revision: 114768
Author: kaldari
Date: 2012-04-06 18:08:16 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
fix multi-more-button bug
Modified Paths:
--------------
trunk/extensions/PageTriage/SpecialPageTriage.php
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.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-06 17:49:48 UTC
(rev 114767)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-06 18:08:16 UTC
(rev 114768)
@@ -59,6 +59,9 @@
// TODO: this should load with a spinner instead of "please
wait"
$triageInterface .= "<div id='mwe-pt-list-view'>Please
wait...</div>";
+ $triageInterface .= "<div id='mwe-pt-list-more'>";
+ $triageInterface .= "<a href='#'
id='mwe-pt-list-more-link'>".wfMessage( 'pagetriage-more' )."</a>";
+ $triageInterface .= "</div>";
$triageInterface .= "<div
id='mwe-pt-list-load-more-anchor'></div>";
$triageInterface .= "<div id='mwe-pt-list-stats-nav'
class='mwe-pt-navigation-bar mwe-pt-control-gradient'>";
$triageInterface .= "<div
id='mwe-pt-list-stats-nav-content'></div>";
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.css
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.css
2012-04-06 17:49:48 UTC (rev 114767)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.css
2012-04-06 18:08:16 UTC (rev 114768)
@@ -4,6 +4,7 @@
*/
#mwe-pt-list-more {
+ display: none;
text-align: center;
font-size: 17px;
line-height: 20px;
@@ -15,7 +16,7 @@
min-height: 21px;
}
-#mwe-pt-list-more a {
+#mwe-pt-list-more-link {
cursor: pointer;
}
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-06 17:49:48 UTC (rev 114767)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listView.js
2012-04-06 18:08:16 UTC (rev 114768)
@@ -25,6 +25,13 @@
// this event is triggered when the collection finishes
loading.
//articles.bind( 'all', this.render, this );
+
+ // bind manualLoadMore function to 'More' link
+ _this = this;
+ $( '#mwe-pt-list-more-link' ).click( function() {
+ _this.manualLoadMore();
+ return false;
+ } );
// on init, make sure to load the contents of the
collection.
articles.fetch();
@@ -64,7 +71,7 @@
},
manualLoadMore: function() {
- $( '#mwe-pt-list-more' ).empty();
+ $( '#mwe-pt-list-more-link' ).hide();
$( '#mwe-pt-list-more' ).append( $.createSpinner(
'more-spinner' ) );
var lastArticle = articles.last(1);
articles.apiParams.offset =
lastArticle[0].attributes.creation_date;
@@ -72,11 +79,7 @@
add: true,
success: function() {
$.removeSpinner( 'more-spinner' );
- $( '#mwe-pt-list-more' ).append(
- $( '<a></a>' ).msg(
'pagetriage-more' ).click( function() {
- _this.manualLoadMore();
- } )
- );
+ $( '#mwe-pt-list-more-link' ).show();
}
} );
},
@@ -112,15 +115,8 @@
$( '.mwe-pt-article-row' ).last().css(
'border-bottom', 'none' );
this.initializeInfiniteScrolling();
} else {
- _this = this;
- // Add a 'More' link
- $( '#mwe-pt-list-view' ).after( $( '<div
id="mwe-pt-list-more"></div>' )
- .append( $( '<a></a>' ).msg(
'pagetriage-more' )
- .click( function() {
- _this.manualLoadMore();
- } )
- )
- );
+ // Show 'More' link
+ $( '#mwe-pt-list-more' ).show();
}
this.eventBus.trigger( 'listAddAll' );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
