Merge "Changes to show the display settings in the sidebar"

resources/css/ext.uls.css

@@ -52,6 +52,24 @@ x:-o-prefocus, body.rtl li#pt-uls {
 	cursor: pointer;
 }
 
+.uls-menu .caret-before {
+	border-top: 20px solid transparent;
+	border-right: 20px solid #AAA;
+	border-bottom: 20px solid transparent;
+	display: inline-block;
+	left: -21px;
+	position: absolute;
+}
+
+.uls-menu .caret-after {
+	border-top: 20px solid transparent;
+	border-right: 20px solid #FCFCFC;
+	border-bottom: 20px solid transparent;
+	display: inline-block;
+	left: -20px;
+	position: absolute;
+}
+
 #settings-block div.display-settings-block,
 #settings-block div.input-settings-block {
 	display: inline-block;

resources/js/ext.uls.displaysettings.js

@@ -465,7 +465,10 @@
 
 			displaySettings.$template.find( 'button.uls-display-settings-cancel' ).on( 'click', function () {
 				mw.webfonts.preferences.setFont( displaySettings.contentLanguage, oldFont );
+
+				if ( displaySettings.$webfonts ) {
 					displaySettings.$webfonts.refresh();
+				}
 
 				displaySettings.$template.find( 'div.uls-ui-languages button.button' ).each( function () {
 					var $button = $( this );
@@ -578,8 +581,11 @@
 		 */
 		onSave: function ( success ) {
 			if ( success ) {
+				if ( this.$webfonts !== undefined ) {
 					// Live font update
 					this.$webfonts.refresh();
+				}
+
 				this.$parent.hide();
 				// we delay change UI language to here, because it causes a page refresh
 				if ( this.uiLanguage !== this.getUILanguage() ) {

resources/js/ext.uls.interface.js

@@ -22,12 +22,13 @@
 
 	$( document ).ready( function () {
 		var $ulsTrigger, $pLang,
-			uls, ulsOptions,
+			ulsOptions,
 			previousLanguages, previousLang,
+			rtlPage = $( 'body' ).hasClass( 'rtl' ),
 			ulsPosition = mw.config.get( 'wgULSPosition' ),
 			tipsyGravity = {
 				personal: 'n',
-				interlanguage: $( 'body' ).hasClass( 'rtl' ) ? 'e' : 'w'
+				interlanguage: rtlPage ? 'e' : 'w'
 			},
 			currentLang = mw.config.get( 'wgUserLanguage' );
 
@@ -78,21 +79,23 @@
 		}
 
 		function addDisplaySettings( uls ) {
-			var $displaySettings, position;
+			var $displaySettings = displaySettings(),
+				displaySettingsOptions = {
+					defaultModule: 'display'
+				};
 
-			$displaySettings = displaySettings();
+			// If the ULS trigger is shown in the top personal menu,
-			uls.$menu.find( '#settings-block' ).append( $displaySettings );
+			// closing the display settings must show the main ULS
-			position = uls.position();
+			// languages list
-
+			if ( ulsPosition === 'personal' ) {
-			$displaySettings.languagesettings( {
+				displaySettingsOptions.onClose = function () {
-				defaultModule: 'display',
-				onClose: function () {
 					uls.show();
-				},
+				};
-				top: position.top,
+			}
-				left: position.left
+			$.extend( displaySettingsOptions, uls.position() );
-			} );
 
+			uls.$menu.find( '#settings-block' ).append( $displaySettings );
+			$displaySettings.languagesettings( displaySettingsOptions );
 			$displaySettings.on( 'click', function () {
 				uls.hide();
 			} );
@@ -119,6 +122,7 @@
 			} );
 		}
 
+		// ULS options that are common to all modes of showing
 		ulsOptions = {
 			onReady: function () {
 				if ( $.fn.languagesettings ) {
@@ -142,21 +146,45 @@
 			// This is a hook that runs in the ULS scope
 			ulsOptions.onVisible = function () {
 				var scrollPosition,
+					$currentMenu,
+					ulsHeight, ulsTop, ulsBottom,
+					$languageSettingsTrigger = this.$menu.find( '#display-settings-block' ),
 					padding = 10,
 					$window = $( window ),
 					windowHeight = $window.height(),
 					windowScrollTop = $window.scrollTop(),
 					windowBottom = windowScrollTop + windowHeight,
-					ulsHeight = this.$menu.height(),
+					ulsTriggerOffset = this.$element.offset();
-					ulsTop = this.$menu.offset().top,
+
+				// Reposition the element -
+				// the sidebar elements may have changed
+				this.top = ulsTriggerOffset.top - 45;
+				this.left = rtlPage ?
+					ulsTriggerOffset.left - 22 - this.$menu.width() :
+					ulsTriggerOffset.left + 50;
+				this.$menu.css( this.position() );
+
+				// Show the Display settings panel:
+				// We are using the ULS trigger in the sidebar,
+				// so we don't want to switch the language, but
+				// to change the settings.
+				$languageSettingsTrigger.click();
+
+				$currentMenu = $( '.uls-menu:visible' );
+				$currentMenu.css( this.position() );
+				ulsHeight = $currentMenu.height();
+				ulsTop = $currentMenu.offset().top;
 				ulsBottom = ulsTop + ulsHeight;
 
+				// If the ULS panel is out of the viewport,
+				// scroll the window to show it
 				if ( ( ulsTop < windowScrollTop ) || ( ulsBottom > windowBottom ) ) {
 					if ( ulsHeight > windowHeight ) {
 						// Scroll to show as much of the upper
-						// side of ULS as possible
+						// part of ULS as possible
 						scrollPosition = ulsTop - padding;
 					} else {
+						// Scroll just enough to show the ULS panel
 						scrollPosition = ulsBottom - windowHeight + padding;
 					}
 
@@ -164,12 +192,26 @@
 						scrollTop: scrollPosition
 					}, 500 );
 				}
+
+				// Set the position of the caret according to the height
+				// of the top row of the menu
+				$currentMenu.find( '.caret-before, .caret-after' ).css( 'top',
+					$currentMenu.find( '.row' ).height()
+				);
+
 			};
 		}
 
 		$ulsTrigger.uls( ulsOptions );
 
-		uls = $ulsTrigger.data( 'uls' );
+		if ( ulsPosition === 'interlanguage' ) {
+			$( '.uls-menu' ).each( function () {
+				$( this ).prepend(
+					$( '<span>' ).addClass( 'caret-before' ),
+					$( '<span>' ).addClass( 'caret-after' )
+				);
+			} );
+		}
 
 		if ( previousLang === currentLang  ) {
 			// Do not show tooltip nor update language list
@@ -244,7 +286,7 @@
 		// manually show the tooltip
 		$ulsTrigger.on( 'mouseover', function () {
 			// show only if the ULS panel is not shown
-			if ( !uls.shown ) {
+			if ( !$ulsTrigger.data( 'uls' ).shown ) {
 				showTipsy( 3000 );
 			}
 		} );

resources/js/ext.uls.languagesettings.js

@@ -67,7 +67,7 @@
 			// Register all event listeners to the ULS language settings here.
 			langSettings.$element.on( 'click', $.proxy( langSettings.show, langSettings ) );
 			langSettings.$window.find( '#languagesettings-close' )
-				.on( 'click', $.proxy( langSettings.hide, langSettings ) );
+				.on( 'click', $.proxy( langSettings.close, langSettings ) );
 
 		},