| Index: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderUserOptionsModule.php |
| — | — | @@ -85,11 +85,4 @@ |
| 86 | 86 | public function getGroup() { |
| 87 | 87 | return 'private'; |
| 88 | 88 | } |
| 89 | | - |
| 90 | | - /** |
| 91 | | - * @return array |
| 92 | | - */ |
| 93 | | - public function getDependencies() { |
| 94 | | - return array( 'mediawiki.user' ); |
| 95 | | - } |
| 96 | 89 | } |
| Index: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderUserTokensModule.php |
| — | — | @@ -60,11 +60,4 @@ |
| 61 | 61 | public function getGroup() { |
| 62 | 62 | return 'private'; |
| 63 | 63 | } |
| 64 | | - |
| 65 | | - /** |
| 66 | | - * @return array |
| 67 | | - */ |
| 68 | | - public function getDependencies() { |
| 69 | | - return array( 'mediawiki.user' ); |
| 70 | | - } |
| 71 | 64 | } |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 72 | 65 | Merged /trunk/phase3/includes:r111695,111697 |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.user.js |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | /** |
| 9 | 9 | * User object |
| 10 | 10 | */ |
| 11 | | - function User() { |
| | 11 | + function User( options, tokens ) { |
| 12 | 12 | |
| 13 | 13 | /* Private Members */ |
| 14 | 14 | |
| — | — | @@ -15,9 +15,9 @@ |
| 16 | 16 | |
| 17 | 17 | /* Public Members */ |
| 18 | 18 | |
| 19 | | - this.options = new mw.Map(); |
| | 19 | + this.options = options || new mw.Map(); |
| 20 | 20 | |
| 21 | | - this.tokens = new mw.Map(); |
| | 21 | + this.tokens = tokens || new mw.Map(); |
| 22 | 22 | |
| 23 | 23 | /* Public Methods */ |
| 24 | 24 | |
| — | — | @@ -176,6 +176,8 @@ |
| 177 | 177 | }; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | | - mw.user = new User(); |
| | 180 | + // Extend the skeleton mw.user from mediawiki.js |
| | 181 | + // This is kind of ugly but we're stuck with this for b/c reasons |
| | 182 | + mw.user = new User( mw.user.options, mw.user.tokens ); |
| 181 | 183 | |
| 182 | 184 | })(jQuery); |
| \ No newline at end of file |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js |
| — | — | @@ -648,17 +648,21 @@ |
| 649 | 649 | |
| 650 | 650 | done = true; |
| 651 | 651 | |
| 652 | | - // Handle memory leak in IE |
| 653 | | - script.onload = script.onreadystatechange = null; |
| 654 | | - |
| 655 | 652 | callback(); |
| 656 | 653 | |
| 657 | | - if ( script.parentNode ) { |
| 658 | | - script.parentNode.removeChild( script ); |
| 659 | | - } |
| 660 | | - |
| 661 | | - // Dereference the script |
| 662 | | - script = undefined; |
| | 654 | + // Handle memory leak in IE. This seems to fail in |
| | 655 | + // IE7 sometimes (Permission Denied error when |
| | 656 | + // accessing script.parentNode) so wrap it in |
| | 657 | + // a try catch. |
| | 658 | + try { |
| | 659 | + script.onload = script.onreadystatechange = null; |
| | 660 | + if ( script.parentNode ) { |
| | 661 | + script.parentNode.removeChild( script ); |
| | 662 | + } |
| | 663 | + |
| | 664 | + // Dereference the script |
| | 665 | + script = undefined; |
| | 666 | + } catch ( e ) { } |
| 663 | 667 | } |
| 664 | 668 | }; |
| 665 | 669 | } |
| — | — | @@ -1419,7 +1423,13 @@ |
| 1420 | 1424 | return s; |
| 1421 | 1425 | } |
| 1422 | 1426 | }; |
| 1423 | | - })() |
| | 1427 | + }() ), |
| | 1428 | + |
| | 1429 | + // Skeleton user object. mediawiki.user.js extends this |
| | 1430 | + user: { |
| | 1431 | + options: new Map(), |
| | 1432 | + tokens: new Map() |
| | 1433 | + } |
| 1424 | 1434 | }; |
| 1425 | 1435 | |
| 1426 | 1436 | })( jQuery ); |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1427 | 1437 | Merged /trunk/phase3:r111695,111697 |