| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.namespaceSelect.js', 'version' => 1 ), |
| 74 | 74 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 7 ), |
| 75 | 75 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 27 ), |
| 76 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 111 ), |
| | 76 | + array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 112 ), |
| 77 | 77 | array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 29 ), |
| 78 | 78 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 47 ), |
| 79 | 79 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 12 ), |
| — | — | @@ -82,10 +82,10 @@ |
| 83 | 83 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 2 ), |
| 84 | 84 | ), |
| 85 | 85 | 'combined' => array( |
| 86 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 229 ), |
| | 86 | + array( 'src' => 'js/plugins.combined.js', 'version' => 230 ), |
| 87 | 87 | ), |
| 88 | 88 | 'minified' => array( |
| 89 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 229 ), |
| | 89 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 230 ), |
| 90 | 90 | ), |
| 91 | 91 | ), |
| 92 | 92 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
| — | — | @@ -304,16 +304,21 @@ |
| 305 | 305 | // Intercept all tab events to provide consisten behavior across browsers |
| 306 | 306 | // Webkit browsers insert tab characters by default into the iframe rather than changing input focus |
| 307 | 307 | case 9: |
| 308 | | - var $tabindexList = $j( '[tabindex]:visible' ).sort( function( a, b ) { |
| 309 | | - return a.tabIndex > b.tabIndex ? 1 : -1; |
| 310 | | - } ); |
| 311 | | - for( var i=0; i < $tabindexList.length; i++ ) { |
| 312 | | - if( $tabindexList.eq( i ).is( '#' + context.$iframe.attr( 'id' ) ) ) { |
| 313 | | - $tabindexList.get( i + 1 ).focus(); |
| 314 | | - break; |
| | 308 | + // if any modifier keys are pressed, allow the browser to do it's thing |
| | 309 | + if ( event.ctrlKey || event.altKey || event.shiftKey ) { |
| | 310 | + return true; |
| | 311 | + } else { |
| | 312 | + var $tabindexList = $j( '[tabindex]:visible' ).sort( function( a, b ) { |
| | 313 | + return a.tabIndex > b.tabIndex ? 1 : -1; |
| | 314 | + } ); |
| | 315 | + for( var i=0; i < $tabindexList.length; i++ ) { |
| | 316 | + if( $tabindexList.eq( i ).attr('id') == context.$iframe.attr( 'id' ) ) { |
| | 317 | + $tabindexList.get( i + 1 ).focus(); |
| | 318 | + break; |
| | 319 | + } |
| 315 | 320 | } |
| | 321 | + return false; |
| 316 | 322 | } |
| 317 | | - return false; |
| 318 | 323 | break; |
| 319 | 324 | } |
| 320 | 325 | return true; |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -6737,16 +6737,21 @@ |
| 6738 | 6738 | // Intercept all tab events to provide consisten behavior across browsers |
| 6739 | 6739 | // Webkit browsers insert tab characters by default into the iframe rather than changing input focus |
| 6740 | 6740 | case 9: |
| 6741 | | - var $tabindexList = $j( '[tabindex]:visible' ).sort( function( a, b ) { |
| 6742 | | - return a.tabIndex > b.tabIndex ? 1 : -1; |
| 6743 | | - } ); |
| 6744 | | - for( var i=0; i < $tabindexList.length; i++ ) { |
| 6745 | | - if( $tabindexList.eq( i ).is( '#' + context.$iframe.attr( 'id' ) ) ) { |
| 6746 | | - $tabindexList.get( i + 1 ).focus(); |
| 6747 | | - break; |
| | 6741 | + // if any modifier keys are pressed, allow the browser to do it's thing |
| | 6742 | + if ( event.ctrlKey || event.altKey || event.shiftKey ) { |
| | 6743 | + return true; |
| | 6744 | + } else { |
| | 6745 | + var $tabindexList = $j( '[tabindex]:visible' ).sort( function( a, b ) { |
| | 6746 | + return a.tabIndex > b.tabIndex ? 1 : -1; |
| | 6747 | + } ); |
| | 6748 | + for( var i=0; i < $tabindexList.length; i++ ) { |
| | 6749 | + if( $tabindexList.eq( i ).attr('id') == context.$iframe.attr( 'id' ) ) { |
| | 6750 | + $tabindexList.get( i + 1 ).focus(); |
| | 6751 | + break; |
| | 6752 | + } |
| 6748 | 6753 | } |
| | 6754 | + return false; |
| 6749 | 6755 | } |
| 6750 | | - return false; |
| 6751 | 6756 | break; |
| 6752 | 6757 | } |
| 6753 | 6758 | return true; |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -447,8 +447,9 @@ |
| 448 | 448 | if('fn'in $.wikiEditor.modules[module]&&'create'in $.wikiEditor.modules[module].fn){context.modules[module]={};$.wikiEditor.modules[module].fn.create(context,modules[module]);}}}}};context.evt={'keydown':function(event){switch(event.which){case 90:if((event.ctrlKey||event.metaKey)&&context.history.length){if(event.shiftKey){context.historyPosition++;}else{context.historyPosition--;} |
| 449 | 449 | if(context.history.length+context.historyPosition>=0&&context.historyPosition<0){context.$content.html(context.history[context.history.length+context.historyPosition].html);}else{context.historyPosition=Math.max(-context.history.length,Math.min(context.historyPosition,-1));} |
| 450 | 450 | return false;} |
| 451 | | -break;case 9:var $tabindexList=$j('[tabindex]:visible').sort(function(a,b){return a.tabIndex>b.tabIndex?1:-1;});for(var i=0;i<$tabindexList.length;i++){if($tabindexList.eq(i).is('#'+context.$iframe.attr('id'))){$tabindexList.get(i+1).focus();break;}} |
| 452 | | -return false;break;} |
| | 451 | +break;case 9:if(event.ctrlKey||event.altKey||event.shiftKey){return true;}else{var $tabindexList=$j('[tabindex]:visible').sort(function(a,b){return a.tabIndex>b.tabIndex?1:-1;});for(var i=0;i<$tabindexList.length;i++){if($tabindexList.eq(i).attr('id')==context.$iframe.attr('id')){$tabindexList.get(i+1).focus();break;}} |
| | 452 | +return false;} |
| | 453 | +break;} |
| 453 | 454 | return true;},'change':function(event){event.data.scope='division';var newHTML=context.$content.html();if(context.oldHTML!=newHTML){context.fn.purgeOffsets();context.oldHTML=newHTML;event.data.scope='realchange';} |
| 454 | 455 | switch(event.which){case 8:break;} |
| 455 | 456 | return true;},'delayedChange':function(event){event.data.scope='division';var newHTML=context.$content.html();if(context.oldDelayedHTML!=newHTML){context.fn.purgeOffsets();context.oldDelayedHTML=newHTML;event.data.scope='realchange';if(newHTML!==context.history[context.history.length+context.historyPosition].html){context.historyPosition=-1;} |