wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite

Browse source
This commit is contained in:
Catrope 2012-06-13 18:31:05 -07:00
parent d0adb112c0 75ac5b03e6
commit 9d9c06f4e2
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
VisualEditor.php
View file

@ -90,6 +90,9 @@ $wgResourceModules += array(
),
'styles' => array(
've2/init/styles/ve.init.ViewPageTarget.css',
've2/init/styles/ve.init.ViewPageTarget-hd.css' => array(
'media' => 'screen and (min-width: 982px)'
),
),
'dependencies' => array(
'ext.visualEditor.init',

3
modules/ve2/init/styles/ve.init.ViewPageTarget-hd.css Normal file
View file

@ -0,0 +1,3 @@
.es-toolbar-wrapper {
margin: -1.25em -1.5em 1.25em -1.5em;
}

8
modules/ve2/init/styles/ve.init.ViewPageTarget.css
View file

@ -1,8 +1,13 @@
.es-toolbar-wrapper {
margin: -1.25em -1.5em -1.5em -1.5em;
margin: -1em -1em 1em -1em;
transition: margin 250ms, height 250ms;
-moz-transition: margin 250ms, height 250ms;
-webkit-transition: margin 250ms, height 250ms;
-o-transition: margin 250ms, height 250ms;
}
.es-toolbar {
display: none;
margin-left: 1px;
}
@ -11,6 +16,7 @@
-moz-transition: opacity 200ms ease-out, margin-top 200ms ease-out;
-o-transition: opacity 200ms ease-out, margin-top 200ms ease-out;
transition: opacity 200ms ease-out, margin-top 200ms ease-out;
cursor: default;
}
.ve-init-viewPageTarget-loadingSpinner {

14
modules/ve2/init/targets/ve.init.ViewPageTarget.js
View file

@ -19,6 +19,7 @@ ve.init.ViewPageTarget = function() {
this.surface = null;
this.active = false;
this.edited = false;
this.activating = false;
this.proxiedOnSurfaceModelTransact = ve.proxy( this.onSurfaceModelTransact, this );
this.surfaceOptions = {
'toolbars': {
@ -80,7 +81,8 @@ ve.init.ViewPageTarget.saveDialogTemplate = '\
*/
ve.init.ViewPageTarget.prototype.onEditTabClick = function( e ) {
// Ignore multiple clicks while editor is active
if ( !this.active ) {
if ( !this.active && !this.activating ) {
this.activating = true;
// UI updates
this.setSelectedTab( 'ca-edit' );
this.showSpinner();
@ -173,6 +175,7 @@ ve.init.ViewPageTarget.prototype.onSaveDialogCloseButtonClick = function( e ) {
* @method
*/
ve.init.ViewPageTarget.prototype.onLoad = function( error, dom ) {
this.activating = false;
if ( error ) {
// TODO: Error handling in the UI
} else {
@ -212,10 +215,11 @@ ve.init.ViewPageTarget.prototype.setUpSurface = function( dom ) {
this.surface.getModel().on( 'transact', this.proxiedOnSurfaceModelTransact );
// Transplant the toolbar
this.$toolbar = this.$surface.find( '.es-toolbar-wrapper' );
this.$toolbar.find( '.es-toolbar' ).slideDown( 'fast' );
this.$heading
.before( this.$toolbar )
.addClass( 've-init-viewPageTarget-pageTitle' )
.css( { 'margin-top': this.$toolbar.outerHeight(), 'opacity': 0.5 } );
.fadeTo( 'fast', 0.5 );
// Update UI
this.$view.hide();
this.$spinner.remove();
@ -288,11 +292,13 @@ ve.init.ViewPageTarget.prototype.tearDownSurface = function( content ) {
this.setSelectedTab( 'ca-view' );
// Update UI
this.$surface.empty().detach();
this.$toolbar.remove();
this.$toolbar.find( '.es-toolbar' ).slideUp( 'fast', function() {
$(this).parent().remove();
} );
this.$spinner.remove();
$( '.es-contextView' ).remove();
this.$view.show().fadeTo( 'fast', 1 );
this.$heading.css( { 'margin-top': 'auto', 'opacity': 1 } );
this.$heading.fadeTo( 'fast', 1 );
setTimeout( ve.proxy( function() {
$(this).removeClass( 've-init-viewPageTarget-pageTitle' );
}, this.$heading ), 1000 );