wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 02:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some display issues

Browse source
This commit is contained in:
Trevor Parscal 2011-11-30 00:48:46 +00:00
parent 68c5487c61
commit d926cc7165
3 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/es/es.Surface.css
View file

@ -85,6 +85,22 @@
padding: 0.33em 0; padding: 0.33em 0;
} }
.es-contextView-position-above .es-contextView-menu {
bottom: 7px;
}
.es-contextView-position-below .es-contextView-menu {
top: 8px;
}
.es-contextView-position-left .es-contextView-menu {
left: 0;
}
.es-contextView-position-right .es-contextView-menu {
right: 0;
}
.es-contextView-menuItem { .es-contextView-menuItem {
padding: 0.33em 1em; padding: 0.33em 1em;
cursor: pointer; cursor: pointer;
@ -137,14 +153,6 @@
background-color: #b3d6f6; background-color: #b3d6f6;
} }
.es-contextView-position-above .es-contextView-menu {
bottom: 7px;
}
.es-contextView-position-below .es-contextView-menu {
top: 8px;
}
.es-contentView { .es-contentView {
position: relative; position: relative;
z-index: 1; z-index: 1;

14
modules/es/views/es.ContentView.js
View file

@ -246,12 +246,14 @@ es.ContentView.prototype.drawSelection = function( range ) {
'width': contentWidth - fromPosition.left, 'width': contentWidth - fromPosition.left,
'height': fromPosition.bottom - fromPosition.top 'height': fromPosition.bottom - fromPosition.top
} ).show(); } ).show();
this.$rangeEnd.css( { if ( toPosition.left ) {
'top': toPosition.top, this.$rangeEnd.css( {
'left': 0, 'top': toPosition.top,
'width': toPosition.left, 'left': 0,
'height': toPosition.bottom - toPosition.top 'width': toPosition.left,
} ).show(); 'height': toPosition.bottom - toPosition.top
} ).show();
}
if ( fromLineIndex + 1 < toLineIndex ) { if ( fromLineIndex + 1 < toLineIndex ) {
this.$rangeFill.css( { this.$rangeFill.css( {
'top': fromPosition.bottom, 'top': fromPosition.bottom,

10
modules/es/views/es.ContextView.js
View file

@ -37,7 +37,10 @@ es.ContextView = function( surfaceView, $overlay ) {
/* Methods */ /* Methods */
es.ContextView.prototype.set = function() { es.ContextView.prototype.set = function() {
this.$.removeClass( 'es-contextView-position-below es-contextView-position-above' ); this.$.removeClass(
'es-contextView-position-below es-contextView-position-above ' +
'es-contextView-position-left es-contextView-position-right'
);
var selection = this.surfaceView.getModel().getSelection(), var selection = this.surfaceView.getModel().getSelection(),
position, position,
offset, offset,
@ -60,6 +63,11 @@ es.ContextView.prototype.set = function() {
} }
} }
if ( position ) { if ( position ) {
if ( position.left + this.$menu.width() < $( 'body' ).width() ) {
this.$.addClass( 'es-contextView-position-left' );
} else {
this.$.addClass( 'es-contextView-position-right' );
}
this.$.css( { 'left': position.left, 'top': position.top } ); this.$.css( { 'left': position.left, 'top': position.top } );
this.$icon.fadeIn( 'fast' ); this.$icon.fadeIn( 'fast' );
} }