http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73355
Revision: 73355
Author: dale
Date: 2010-09-20 04:13:21 +0000 (Mon, 20 Sep 2010)
Log Message:
-----------
* fixed disabled selection binding to just target menu items ( not search text
)
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerMenu.js
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
2010-09-20 00:11:28 UTC (rev 73354)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
2010-09-20 04:13:21 UTC (rev 73355)
@@ -31,7 +31,7 @@
this.sequencer = sequencer;
this.setupKeyBindigs()
},
- onFocus: function( ){
+ onFocus: function( ){
this.inputFocus = true;
},
onBlur: function(){
@@ -56,8 +56,7 @@
// Paste cips on v + ctrl while not focused on a text
area:
if ( ( e.which == 86 && _this.ctrlDown ) &&
!_this.inputFocus )
- $j( _this ).trigger( 'paste ');
-
+ $j( _this ).trigger( 'paste ');
} );
$j( window ).keyup( function( e ) {
mw.log( 'SequencerKeyBindings::key up on ' + e.which );
@@ -76,6 +75,7 @@
// Backspace or Delete key while not focused on a text
area:
if ( ( e.which == 8 || e.which == 46 ) &&
!_this.inputFocus )
$j( _this ).trigger( 'delete' );
+
} );
}
};
\ No newline at end of file
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerMenu.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerMenu.js
2010-09-20 00:11:28 UTC (rev 73354)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerMenu.js
2010-09-20 04:13:21 UTC (rev 73355)
@@ -125,7 +125,7 @@
var _this = this;
var $menuTarget = this.sequencer.getMenuTarget();
// empty and disable select for menu items
- $menuTarget.empty().disableSelection();
+ $menuTarget.empty();
for( var menuKey in this.menuConfig ){
// Create a closure to preserve menuKey binding scope
@@ -142,6 +142,7 @@
.attr( 'id', _this.sequencer.id + '_' +
menuKey + '_topMenuItem')
.addClass( 'ui-state-default' )
.buttonHover()
+ .disableSelection()
// Add menu binding:
.menu({
content: _this.getMenuSet(
menuKey ),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
