Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 32 insertions, 0 deletions

diff --git a/vendor/oojs/oojs-ui/php/widgets/IndicatorWidget.php b/vendor/oojs/oojs-ui/php/widgets/IndicatorWidget.php
new file mode 100644
index 00000000..01f2055d
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/widgets/IndicatorWidget.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace OOUI;
+
+/**
+ * Indicator widget.
+ *
+ * See IndicatorElement for more information.
+ */
+class IndicatorWidget extends Widget {
+
+	/* Static properties */
+
+	public static $tagName = 'span';
+
+	/**
+	 * @param array $config Configuration options
+	 */
+	public function __construct( array $config = array() ) {
+		// Parent constructor
+		parent::__construct( $config );
+
+		// Mixins
+		$this->mixin( new IndicatorElement( $this,
+			array_merge( $config, array( 'indicatorElement' => $this ) ) ) );
+		$this->mixin( new TitledElement( $this,
+			array_merge( $config, array( 'titled' => $this ) ) ) );
+
+		// Initialization
+		$this->addClasses( array( 'oo-ui-indicatorWidget' ) );
+	}
+}