| Index: branches/wmf-deployment/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 | ); |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/OptIn |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 93 | 93 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62140,62143,62146 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 94 | 94 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646 |
| /trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62139-62140,62142-62143,62145-62146 |
| /trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 95 | 95 | - /trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62143,62146 |
| 96 | 96 | + /trunk/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js:62041,62043,62139,62142-62143,62145-62146 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 97 | 97 | - /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62143,62146 |
| 98 | 98 | + /trunk/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js:62041,62043,62139,62142-62143,62145-62146 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
| — | — | @@ -273,8 +273,8 @@ |
| 274 | 274 | * processing of events which did not actually change the content of the iframe. |
| 275 | 275 | */ |
| 276 | 276 | 'keydown': function( event ) { |
| 277 | | - /* |
| 278 | 277 | switch ( event.which ) { |
| | 278 | + /* |
| 279 | 279 | case 90: // z |
| 280 | 280 | if ( ( event.ctrlKey || event.metaKey ) && context.history.length ) { |
| 281 | 281 | // HistoryPosition is a negative number between -1 and -context.history.length, in other words |
| — | — | @@ -302,8 +302,27 @@ |
| 303 | 303 | return false; |
| 304 | 304 | } |
| 305 | 305 | break; |
| | 306 | + */ |
| | 307 | + // Intercept all tab events to provide consisten behavior across browsers |
| | 308 | + // Webkit browsers insert tab characters by default into the iframe rather than changing input focus |
| | 309 | + case 9: |
| | 310 | + // if any modifier keys are pressed, allow the browser to do it's thing |
| | 311 | + if ( event.ctrlKey || event.altKey || event.shiftKey ) { |
| | 312 | + return true; |
| | 313 | + } else { |
| | 314 | + var $tabindexList = $j( '[tabindex]:visible' ).sort( function( a, b ) { |
| | 315 | + return a.tabIndex > b.tabIndex ? 1 : -1; |
| | 316 | + } ); |
| | 317 | + for( var i=0; i < $tabindexList.length; i++ ) { |
| | 318 | + if( $tabindexList.eq( i ).attr('id') == context.$iframe.attr( 'id' ) ) { |
| | 319 | + $tabindexList.get( i + 1 ).focus(); |
| | 320 | + break; |
| | 321 | + } |
| | 322 | + } |
| | 323 | + return false; |
| | 324 | + } |
| | 325 | + break; |
| 306 | 326 | } |
| 307 | | - */ |
| 308 | 327 | return true; |
| 309 | 328 | }, |
| 310 | 329 | 'change': function( event ) { |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -6706,8 +6706,8 @@ |
| 6707 | 6707 | * processing of events which did not actually change the content of the iframe. |
| 6708 | 6708 | */ |
| 6709 | 6709 | 'keydown': function( event ) { |
| 6710 | | - /* |
| 6711 | 6710 | switch ( event.which ) { |
| | 6711 | + /* |
| 6712 | 6712 | case 90: // z |
| 6713 | 6713 | if ( ( event.ctrlKey || event.metaKey ) && context.history.length ) { |
| 6714 | 6714 | // HistoryPosition is a negative number between -1 and -context.history.length, in other words |
| — | — | @@ -6735,8 +6735,27 @@ |
| 6736 | 6736 | return false; |
| 6737 | 6737 | } |
| 6738 | 6738 | break; |
| | 6739 | + */ |
| | 6740 | + // Intercept all tab events to provide consisten behavior across browsers |
| | 6741 | + // Webkit browsers insert tab characters by default into the iframe rather than changing input focus |
| | 6742 | + case 9: |
| | 6743 | + // if any modifier keys are pressed, allow the browser to do it's thing |
| | 6744 | + if ( event.ctrlKey || event.altKey || event.shiftKey ) { |
| | 6745 | + return true; |
| | 6746 | + } else { |
| | 6747 | + var $tabindexList = $j( '[tabindex]:visible' ).sort( function( a, b ) { |
| | 6748 | + return a.tabIndex > b.tabIndex ? 1 : -1; |
| | 6749 | + } ); |
| | 6750 | + for( var i=0; i < $tabindexList.length; i++ ) { |
| | 6751 | + if( $tabindexList.eq( i ).attr('id') == context.$iframe.attr( 'id' ) ) { |
| | 6752 | + $tabindexList.get( i + 1 ).focus(); |
| | 6753 | + break; |
| | 6754 | + } |
| | 6755 | + } |
| | 6756 | + return false; |
| | 6757 | + } |
| | 6758 | + break; |
| 6739 | 6759 | } |
| 6740 | | - */ |
| 6741 | 6760 | return true; |
| 6742 | 6761 | }, |
| 6743 | 6762 | 'change': function( event ) { |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -444,7 +444,10 @@ |
| 445 | 445 | return src+'?'+wgWikiEditorIconVersion;}};$.fn.wikiEditor=function(){if(!$j.wikiEditor.isSupported()){return $(this);} |
| 446 | 446 | var context=$(this).data('wikiEditor-context');if(typeof context=='undefined'){context={'$textarea':$(this),'views':{},'modules':{},'data':{},'instance':$.wikiEditor.instances.push($(this))-1,'offsets':null,'htmlToTextMap':{},'oldHTML':null,'oldDelayedHTML':null,'savedSelection':null,'history':[],'historyPosition':-1};context.api={'addModule':function(context,data){var modules={};if(typeof data=='string'){modules[data]={};}else if(typeof data=='object'){modules=data;} |
| 447 | 447 | for(var module in modules){if(typeof module=='string'&&module in $.wikiEditor.modules){if('api'in $.wikiEditor.modules[module]){for(var call in $.wikiEditor.modules[module].api){if(!(call in context.api)){context.api[call]=$.wikiEditor.modules[module].api[call];}}} |
| 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){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';} |
| | 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 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;}} |
| | 449 | +return false;} |
| | 450 | +break;} |
| | 451 | +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';} |
| 449 | 452 | switch(event.which){case 8:break;} |
| 450 | 453 | 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;} |
| 451 | 454 | context.history.push({'html':newHTML});while(context.history.length>10){context.history.shift();}} |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 452 | 455 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62143,62146 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 453 | 456 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
| /trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62139,62142-62143,62145-62146 |
| /trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |