| Index: trunk/phase3/skins/common/ajax.js |
| — | — | @@ -39,16 +39,21 @@ |
| 40 | 40 | sajax_debug("sajax_init_object() called..") |
| 41 | 41 | var A; |
| 42 | 42 | try { |
| 43 | | - A=new ActiveXObject("Msxml2.XMLHTTP"); |
| | 43 | + // Try the new style before ActiveX so we don't |
| | 44 | + // unnecessarily trigger warnings in IE 7 when |
| | 45 | + // set to prompt about ActiveX usage |
| | 46 | + A = new XMLHttpRequest(); |
| 44 | 47 | } catch (e) { |
| 45 | 48 | try { |
| 46 | | - A=new ActiveXObject("Microsoft.XMLHTTP"); |
| 47 | | - } catch (oc) { |
| 48 | | - A=null; |
| | 49 | + A=new ActiveXObject("Msxml2.XMLHTTP"); |
| | 50 | + } catch (e) { |
| | 51 | + try { |
| | 52 | + A=new ActiveXObject("Microsoft.XMLHTTP"); |
| | 53 | + } catch (oc) { |
| | 54 | + A=null; |
| | 55 | + } |
| 49 | 56 | } |
| 50 | 57 | } |
| 51 | | - if(!A && typeof XMLHttpRequest != "undefined") |
| 52 | | - A = new XMLHttpRequest(); |
| 53 | 58 | if (!A) |
| 54 | 59 | sajax_debug("Could not create connection object."); |
| 55 | 60 | |
| 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 = '78'; |
| | 1202 | +$wgStyleVersion = '79'; |
| 1203 | 1203 | |
| 1204 | 1204 | |
| 1205 | 1205 | # Server-side caching: |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -226,6 +226,9 @@ |
| 227 | 227 | * (bug 10397) Fix AJAX watch error fallback when we receive a bogus result |
| 228 | 228 | * (bug 10396) Fix AJAX error when $wgScriptPath/index.php is not valid; |
| 229 | 229 | using $wgScript now included in JS info |
| | 230 | +* Use native XMLHttpRequest class in preference to ActiveX on IE 7; this |
| | 231 | + avoids the "ActiveX "Do you want to allow ActiveX?" prompt when something |
| | 232 | + security settings are cranked this way and AJAX-y gets used. |
| 230 | 233 | |
| 231 | 234 | |
| 232 | 235 | == API changes since 1.10 == |