| Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js |
| — | — | @@ -1067,6 +1067,7 @@ |
| 1068 | 1068 | $j(this) |
| 1069 | 1069 | .find( 'button:first' ) |
| 1070 | 1070 | .click(); |
| | 1071 | + e.preventDefault(); |
| 1071 | 1072 | } |
| 1072 | 1073 | }); |
| 1073 | 1074 | } |
| — | — | @@ -1093,15 +1094,6 @@ |
| 1094 | 1095 | $j(this).find( '[rel]' ).each( function() { |
| 1095 | 1096 | $j(this).text( gM( $j(this).attr( 'rel' ) ) ); |
| 1096 | 1097 | }); |
| 1097 | | - // Execute the action associated with the first button |
| 1098 | | - // when the user presses Enter |
| 1099 | | - $j(this).closest( '.ui-dialog' ).keypress( function( e ) { |
| 1100 | | - if ( ( e.keyCode || e.which ) == 13 ) { |
| 1101 | | - $j(this) |
| 1102 | | - .find( 'button:first' ) |
| 1103 | | - .click(); |
| 1104 | | - } |
| 1105 | | - }); |
| 1106 | 1098 | $j( '#edittoolbar-table-dimensions-rows' ).val( 2 ); |
| 1107 | 1099 | $j( '#edittoolbar-table-dimensions-columns' ).val( 2 ); |
| 1108 | 1100 | }, |
| — | — | @@ -1171,6 +1163,7 @@ |
| 1172 | 1164 | $j(this) |
| 1173 | 1165 | .find( 'button:first' ) |
| 1174 | 1166 | .click(); |
| | 1167 | + e.preventDefault(); |
| 1175 | 1168 | } |
| 1176 | 1169 | }); |
| 1177 | 1170 | } |
| — | — | @@ -1203,15 +1196,6 @@ |
| 1204 | 1197 | $j(this).find( '[rel]' ).each( function() { |
| 1205 | 1198 | $j(this).text( gM( $j(this).attr( 'rel' ) ) ); |
| 1206 | 1199 | }); |
| 1207 | | - // Execute the action associated with the first button |
| 1208 | | - // when the user presses Enter |
| 1209 | | - $j(this).closest( '.ui-dialog' ).keypress( function( e ) { |
| 1210 | | - if ( ( e.keyCode || e.which ) == 13 ) { |
| 1211 | | - $j(this) |
| 1212 | | - .find( 'button:first' ) |
| 1213 | | - .click(); |
| 1214 | | - } |
| 1215 | | - }); |
| 1216 | 1200 | |
| 1217 | 1201 | // TODO: Find a cleaner way to share this function |
| 1218 | 1202 | $j(this).data( 'replaceCallback', function( mode ) { |
| — | — | @@ -1286,13 +1270,16 @@ |
| 1287 | 1271 | }, |
| 1288 | 1272 | dialog: { |
| 1289 | 1273 | buttons: { |
| 1290 | | - 'edittoolbar-tool-replace-button-findnext': function() { |
| | 1274 | + 'edittoolbar-tool-replace-button-findnext': function( e ) { |
| | 1275 | + $j(this).closest( '.ui-dialog' ).data( 'dialogaction', e.target ); |
| 1291 | 1276 | $j(this).data( 'replaceCallback' ).call( this, 'find' ); |
| 1292 | 1277 | }, |
| 1293 | | - 'edittoolbar-tool-replace-button-replacenext': function() { |
| | 1278 | + 'edittoolbar-tool-replace-button-replacenext': function( e ) { |
| | 1279 | + $j(this).closest( '.ui-dialog' ).data( 'dialogaction', e.target ); |
| 1294 | 1280 | $j(this).data( 'replaceCallback' ).call( this, 'replace' ); |
| 1295 | 1281 | }, |
| 1296 | | - 'edittoolbar-tool-replace-button-replaceall': function() { |
| | 1282 | + 'edittoolbar-tool-replace-button-replaceall': function( e ) { |
| | 1283 | + $j(this).closest( '.ui-dialog' ).data( 'dialogaction', e.target ); |
| 1297 | 1284 | $j(this).data( 'replaceCallback' ).call( this, 'replaceAll' ); |
| 1298 | 1285 | }, |
| 1299 | 1286 | 'edittoolbar-tool-replace-close': function() { |
| — | — | @@ -1300,6 +1287,7 @@ |
| 1301 | 1288 | $j(this).data( 'context' ).$textarea |
| 1302 | 1289 | .unbind( 'keypress.srdialog' ) |
| 1303 | 1290 | .focus(); |
| | 1291 | + $j(this).closest( '.ui-dialog' ).data( 'dialogaction', false ); |
| 1304 | 1292 | } |
| 1305 | 1293 | }, |
| 1306 | 1294 | open: function() { |
| — | — | @@ -1312,7 +1300,8 @@ |
| 1313 | 1301 | // when the user presses Enter |
| 1314 | 1302 | $j(this).closest( '.ui-dialog' ).keypress( function( e ) { |
| 1315 | 1303 | if ( ( e.keyCode || e.which ) == 13 ) { |
| 1316 | | - $j(this).find( 'button:first' ).click(); |
| | 1304 | + var button = $j(this).data( 'dialogaction' ) || $j(this).find( 'button:first' ); |
| | 1305 | + button.click(); |
| 1317 | 1306 | e.preventDefault(); |
| 1318 | 1307 | } |
| 1319 | 1308 | }); |
| — | — | @@ -1320,7 +1309,8 @@ |
| 1321 | 1310 | var dialog = $j(this).closest( '.ui-dialog' ); |
| 1322 | 1311 | $j(this).data( 'context' ).$textarea.bind( 'keypress.srdialog', function( e ) { |
| 1323 | 1312 | if ( ( e.keyCode || e.which ) == 13 ) { |
| 1324 | | - dialog.find( 'button:first' ).click(); |
| | 1313 | + var button = dialog.data( 'dialogaction' ) || dialog.find( 'button:first' ); |
| | 1314 | + button.click(); |
| 1325 | 1315 | e.preventDefault(); |
| 1326 | 1316 | } |
| 1327 | 1317 | }); |
| Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | /* Configuration */ |
| 21 | 21 | |
| 22 | 22 | // Bump the version number every time you change any of the .css/.js files |
| 23 | | -$wgEditToolbarStyleVersion = 52; |
| | 23 | +$wgEditToolbarStyleVersion = 53; |
| 24 | 24 | |
| 25 | 25 | // Set this to true to simply override the stock toolbar for everyone |
| 26 | 26 | $wgEditToolbarGlobalEnable = false; |