Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111367
Change subject: WIP: Allow switching from VisualEditor to Wikitext editor
......................................................................
WIP: Allow switching from VisualEditor to Wikitext editor
TODO:
* style switch button and i18n it
* Deal with back button behaviour from VisualEditor
Change-Id: I084d305ba543fdc37f1a921c2814a3e8b825fceb
---
M javascripts/modules/editor/VisualEditorOverlay.js
M less/common/OverlayNew.less
M templates/modules/editor/VisualEditorOverlayHeader.html
3 files changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/67/111367/1
diff --git a/javascripts/modules/editor/VisualEditorOverlay.js
b/javascripts/modules/editor/VisualEditorOverlay.js
index c96983a..27d67bb 100644
--- a/javascripts/modules/editor/VisualEditorOverlay.js
+++ b/javascripts/modules/editor/VisualEditorOverlay.js
@@ -15,6 +15,11 @@
this.hasChanged = false;
this.$spinner = self.$( '.spinner' );
this.$continueBtn = self.$( '.continue' ).prop(
'disabled', true );
+ this.$switcher = self.$( '.editor-switcher' ).on(
'click', function( ev ) {
+ if ( $( this ).hasClass( 'disabled' ) ) {
+ ev.preventDefault();
+ }
+ } );
},
show: function() {
this._super();
@@ -108,6 +113,7 @@
onTransact: function () {
this.hasChanged = true;
this.$continueBtn.prop( 'disabled', false );
+ this.$switcher.addClass( 'disabled' );
},
onLoadError: function () {
this.reportError( mw.msg(
'mobile-frontend-editor-error-loading' ) );
diff --git a/less/common/OverlayNew.less b/less/common/OverlayNew.less
index 9394669..02b49f3 100644
--- a/less/common/OverlayNew.less
+++ b/less/common/OverlayNew.less
@@ -133,6 +133,12 @@
border-bottom: 1px solid @grayLight;
}
+ > ul {
+ li {
+ display: inline-block;
+ }
+ }
+
> div {
padding: @headerTitleMarginV @headerTitleMarginH;
}
diff --git a/templates/modules/editor/VisualEditorOverlayHeader.html
b/templates/modules/editor/VisualEditorOverlayHeader.html
index b8a9342..a882dba 100644
--- a/templates/modules/editor/VisualEditorOverlayHeader.html
+++ b/templates/modules/editor/VisualEditorOverlayHeader.html
@@ -1,6 +1,7 @@
<div class="overlay-header initial-header hideable hidden">
- <ul class="v-border bottom-border">
- <li><button class="cancel icon">{{closeMsg}}</button></li>
+ <ul class="bottom-border v-border">
+ <li class="v-border"><button class="cancel
icon">{{closeMsg}}</button></li>
+ <li><a href="#editor/{{sectionId}}" class="editor-switcher
icon">Switch</a></li>
</ul>
<div class="toolbar bottom-border"></div>
{{^readOnly}}
--
To view, visit https://gerrit.wikimedia.org/r/111367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I084d305ba543fdc37f1a921c2814a3e8b825fceb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
