dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mediawiki.api.edit: Remove dependency on 'mediawiki.Title'"
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki
/
api
/
category.js
diff --git
a/resources/src/mediawiki/api/category.js
b/resources/src/mediawiki/api/category.js
index
04462e3
..
85df90e
100644
(file)
--- a/
resources/src/mediawiki/api/category.js
+++ b/
resources/src/mediawiki/api/category.js
@@
-16,12
+16,16
@@
var apiPromise = this.get( {
formatversion: 2,
prop: 'categoryinfo',
var apiPromise = this.get( {
formatversion: 2,
prop: 'categoryinfo',
- titles:
String( title )
+ titles:
[ String( title ) ]
} );
return apiPromise
.then( function ( data ) {
} );
return apiPromise
.then( function ( data ) {
- return !!data.query.pages[ 0 ].categoryinfo;
+ return !!(
+ data.query && // query is missing on title=""
+ data.query.pages && // query.pages is missing on title="#" or title="mw:"
+ data.query.pages[ 0 ].categoryinfo
+ );
} )
.promise( { abort: apiPromise.abort } );
},
} )
.promise( { abort: apiPromise.abort } );
},
@@
-67,13
+71,17
@@
var apiPromise = this.get( {
formatversion: 2,
prop: 'categories',
var apiPromise = this.get( {
formatversion: 2,
prop: 'categories',
- titles:
String( title )
+ titles:
[ String( title ) ]
} );
return apiPromise
.then( function ( data ) {
} );
return apiPromise
.then( function ( data ) {
- var page
= data.query.pages[ 0 ]
;
+ var page;
+ if ( !data.query || !data.query.pages ) {
+ return false;
+ }
+ page = data.query.pages[ 0 ];
if ( !page.categories ) {
return false;
}
if ( !page.categories ) {
return false;
}