| Index: branches/MwEmbedStandAlone/mwEmbed.js |
| — | — | @@ -1191,14 +1191,8 @@ |
| 1192 | 1192 | return false; |
| 1193 | 1193 | } |
| 1194 | 1194 | } |
| 1195 | | -<<<<<<< .mine |
| 1196 | 1195 | } |
| 1197 | 1196 | // For IE: |
| 1198 | | -======= |
| 1199 | | - } |
| 1200 | | - |
| 1201 | | - // For IE: |
| 1202 | | ->>>>>>> .r76860 |
| 1203 | 1197 | var hasObj = true; |
| 1204 | 1198 | try { |
| 1205 | 1199 | var obj = new ActiveXObject( 'ShockwaveFlash.ShockwaveFlash' ); |
| — | — | @@ -1217,7 +1211,6 @@ |
| 1218 | 1212 | // No video tag or flash, return false ( normal "install flash" user flow ) |
| 1219 | 1213 | return false; |
| 1220 | 1214 | } |
| 1221 | | -<<<<<<< .mine |
| 1222 | 1215 | mw.isIphone = function(){ |
| 1223 | 1216 | return ( navigator.userAgent.indexOf('iPhone') != -1 ); |
| 1224 | 1217 | }; |
| — | — | @@ -1228,9 +1221,6 @@ |
| 1229 | 1222 | return ( navigator.userAgent.indexOf('iPad') != -1 ); |
| 1230 | 1223 | }; |
| 1231 | 1224 | // Android 2 has some restrictions vs other mobile platforms |
| 1232 | | -======= |
| 1233 | | - // Android 2 has some restrictions vs other mobile platforms |
| 1234 | | ->>>>>>> .r76860 |
| 1235 | 1225 | mw.isAndroid2 = function(){ |
| 1236 | 1226 | return ( navigator.userAgent.indexOf( 'Android 2.') != -1 ); |
| 1237 | 1227 | }; |