jenkins-bot has submitted this change and it was merged.

Change subject: demo: Add device switcher between desktop and mobile
......................................................................


demo: Add device switcher between desktop and mobile

Desktop using Apex, Mobile using MediaWiki.
Bonus: fix margins for last-childs

Change-Id: I5c3d2634e58421cb73c2e9dc9c9601e3ed4c3c48
---
M demos/ve/demo.css
M demos/ve/demo.js
2 files changed, 20 insertions(+), 2 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index 17a3c1a..7572eb2 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -68,6 +68,11 @@
        margin-right: 1em;
 }
 
+.ve-demo-toolbar-commands > .oo-ui-widget:last-child,
+.ve-demo-toolbar-commands > .oo-ui-widget > .oo-ui-fieldLayout:last-child > 
.oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field {
+       margin-right: 0;
+}
+
 .ve-demo-toolbar .oo-ui-textInputWidget {
        width: 4em;
 }
diff --git a/demos/ve/demo.js b/demos/ve/demo.js
index 9d61783..534b0c8 100644
--- a/demos/ve/demo.js
+++ b/demos/ve/demo.js
@@ -16,6 +16,7 @@
 
                currentLang = $.i18n().locale,
                currentDir = target.$element.css( 'direction' ) || 'ltr',
+               device = ve.init.sa.Target.static.defaultSurfaceType,
 
                // Menu widgets
                addSurfaceContainerButton = new OO.ui.ButtonWidget( {
@@ -31,7 +32,11 @@
                        requireDir: true,
                        availableLanguages: ve.availableLanguages,
                        dialogManager: new OO.ui.WindowManager( { factory: 
ve.ui.windowFactory, classes: ['ve-demo-languageSearchDialogManager'] } )
-               } );
+               } ),
+               deviceSelect = new OO.ui.ButtonSelectWidget().addItems( [
+                       new OO.ui.ButtonOptionWidget( { data: 'desktop', label: 
'Desktop' } ),
+                       new OO.ui.ButtonOptionWidget( { data: 'mobile', label: 
'Mobile' } )
+               ] );
 
        function updateStylesFromDir() {
                var oldDir = currentDir === 'ltr' ? 'rtl' : 'ltr';
@@ -45,6 +50,12 @@
        }
 
        // Initialization
+
+       deviceSelect.selectItem( deviceSelect.getItemFromData( device ) );
+
+       deviceSelect.on( 'select', function ( item ) {
+               location.href = location.href.replace( device, item.getData() );
+       } );
 
        addSurfaceContainerButton.on( 'click', function () {
                addSurfaceContainer();
@@ -98,7 +109,9 @@
                        addSurfaceContainerButton.$element,
                        $( '<span 
class="ve-demo-toolbar-divider">&nbsp;</span>' ),
                        messageKeyButton.$element,
-                       languageInput.$element
+                       languageInput.$element,
+                       $( '<span 
class="ve-demo-toolbar-divider">&nbsp;</span>' ),
+                       deviceSelect.$element
                )
        );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/205007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c3d2634e58421cb73c2e9dc9c9601e3ed4c3c48
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to