| Index: trunk/phase3/skins/common/ajaxwatch.js |
| — | — | @@ -52,6 +52,14 @@ |
| 53 | 53 | } else if (wgAjaxWatch.inprogress) { |
| 54 | 54 | return false; |
| 55 | 55 | } |
| | 56 | + if(!wfSupportsAjax()) { |
| | 57 | + // Lazy initialization so we don't toss up |
| | 58 | + // ActiveX warnings on initial page load |
| | 59 | + // for IE 6 users with security settings. |
| | 60 | + wgAjaxWatch.supported = false; |
| | 61 | + return true; |
| | 62 | + } |
| | 63 | + |
| 56 | 64 | wgAjaxWatch.inprogress = true; |
| 57 | 65 | wgAjaxWatch.setLinkText( wgAjaxWatch.watching |
| 58 | 66 | ? wgAjaxWatch.unwatchingMsg : wgAjaxWatch.watchingMsg); |
| — | — | @@ -120,11 +128,6 @@ |
| 121 | 129 | } |
| 122 | 130 | } |
| 123 | 131 | |
| 124 | | - if(!wfSupportsAjax()) { |
| 125 | | - wgAjaxWatch.supported = false; |
| 126 | | - return; |
| 127 | | - } |
| 128 | | - |
| 129 | 132 | // The id can be either for the parent (Monobook-based) or the element |
| 130 | 133 | // itself (non-Monobook) |
| 131 | 134 | wgAjaxWatch.watchLinks.push( el1.tagName.toLowerCase() == "a" |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1198,7 +1198,7 @@ |
| 1199 | 1199 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1200 | 1200 | * styles. |
| 1201 | 1201 | */ |
| 1202 | | -$wgStyleVersion = '79'; |
| | 1202 | +$wgStyleVersion = '80'; |
| 1203 | 1203 | |
| 1204 | 1204 | |
| 1205 | 1205 | # Server-side caching: |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -229,6 +229,8 @@ |
| 230 | 230 | * Use native XMLHttpRequest class in preference to ActiveX on IE 7; this |
| 231 | 231 | avoids the "ActiveX "Do you want to allow ActiveX?" prompt when something |
| 232 | 232 | security settings are cranked this way and AJAX-y gets used. |
| | 233 | +* Delay AJAX watch initialization until click so IE 6 with ugly security |
| | 234 | + settings doesn't prompt you until you use the link. |
| 233 | 235 | |
| 234 | 236 | |
| 235 | 237 | == API changes since 1.10 == |