| Index: branches/wmf/1.18wmf1/extensions/ApiSandbox/ext.apiSandbox.js |
| — | — | @@ -282,17 +282,6 @@ |
| 283 | 283 | return typeof x != 'undefined'; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | | - /** |
| 287 | | - * Merges several objects into one that gets returned |
| 288 | | - */ |
| 289 | | - function merge( /* ... */ ) { |
| 290 | | - var res = {}; |
| 291 | | - for ( var i = 0; i < arguments.length; i++ ) { |
| 292 | | - $.extend( res, arguments[i] ); |
| 293 | | - } |
| 294 | | - return res; |
| 295 | | - } |
| 296 | | - |
| 297 | 286 | function showLoading( $element ) { |
| 298 | 287 | $element.html( |
| 299 | 288 | mw.html.element( 'img', |
| — | — | @@ -394,6 +383,9 @@ |
| 395 | 384 | * @return {String} |
| 396 | 385 | */ |
| 397 | 386 | function smartEscape( s ) { |
| | 387 | + if ( !s ) { |
| | 388 | + return ''; // @todo: fully verify paraminfo output |
| | 389 | + } |
| 398 | 390 | s = mw.html.escape( s ); |
| 399 | 391 | if ( s.indexOf( '\n ' ) >= 0 ) { |
| 400 | 392 | // turns *-bulleted list into a HTML list |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 401 | 393 | Merged /trunk/extensions:r104863 |