From 95334aed4fa5507d188fdb23608a946ff612bfb8 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 15 May 2017 20:18:55 +0200
Subject: [PATCH 001/148] consistent/valid status codes

---
 libraries/joomla/application/web.php | 87 +++++++++++++++++++++++++---
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index a8b6ce9116fda..00982f12b9ea6 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -82,6 +82,9 @@ class JApplicationWeb extends JApplicationBase
 	 * @see    http://tools.ietf.org/pdf/rfc7231.pdf
 	 */
 	private $responseMap = array(
+		100	=> 'HTTP/1.1 100 Continue',
+		101	=> 'HTTP/1.1 101 Switching Protocols',
+		102	=> 'HTTP/1.1 102 Processing',
 		300 => 'HTTP/1.1 300 Multiple Choices',
 		301 => 'HTTP/1.1 301 Moved Permanently',
 		302 => 'HTTP/1.1 302 Found',
@@ -91,7 +94,54 @@ class JApplicationWeb extends JApplicationBase
 		306 => 'HTTP/1.1 306 (Unused)',
 		307 => 'HTTP/1.1 307 Temporary Redirect',
 		308 => 'HTTP/1.1 308 Permanent Redirect',
-	);
+		200	=> 'HTTP/1.1 200 OK',
+		201	=> 'HTTP/1.1 201 Created',
+		202	=> 'HTTP/1.1 202 Accepted',
+		203	=> 'HTTP/1.1 203 Non-Authoritative Information',
+		204	=> 'HTTP/1.1 204 No Content',
+		205	=> 'HTTP/1.1 205 Reset Content',
+		206	=> 'HTTP/1.1 206 Partial Content',
+		207	=> 'HTTP/1.1 207 Multi-Status',
+		208	=> 'HTTP/1.1 208 Already Reported',
+		226	=> 'HTTP/1.1 226 IM Used',
+		400	=> 'HTTP/1.1 400 Bad Request',
+		401	=> 'HTTP/1.1 401 Unauthorized',
+		402	=> 'HTTP/1.1 402 Payment Required',
+		403	=> 'HTTP/1.1 403 Forbidden',
+		404	=> 'HTTP/1.1 404 Not Found',
+		405	=> 'HTTP/1.1 405 Method Not Allowed',
+		406	=> 'HTTP/1.1 406 Not Acceptable',
+		407	=> 'HTTP/1.1 407 Proxy Authentication Required',
+		408	=> 'HTTP/1.1 408 Request Timeout',
+		409	=> 'HTTP/1.1 409 Conflict',
+		410	=> 'HTTP/1.1 410 Gone',
+		411	=> 'HTTP/1.1 411 Length Required',
+		412	=> 'HTTP/1.1 412 Precondition Failed',
+		413	=> 'HTTP/1.1 413 Payload Too Large',
+		414	=> 'HTTP/1.1 414 URI Too Long',
+		415	=> 'HTTP/1.1 415 Unsupported Media Type',
+		416	=> 'HTTP/1.1 416 Range Not Satisfiable',
+		417	=> 'HTTP/1.1 417 Expectation Failed',
+		421	=> 'HTTP/1.1 421 Misdirected Request',
+		422	=> 'HTTP/1.1 422 Unprocessable Entity',
+		423	=> 'HTTP/1.1 423 Locked',
+		424	=> 'HTTP/1.1 424 Failed Dependency',
+		426	=> 'HTTP/1.1 426 Upgrade Required',
+		428	=> 'HTTP/1.1 428 Precondition Required',
+		429	=> 'HTTP/1.1 429 Too Many Requests',
+		431	=> 'HTTP/1.1 431 Request Header Fields Too Large',
+		451	=> 'HTTP/1.1 451 Unavailable For Legal Reasons',
+		500	=> 'HTTP/1.1 500 Internal Server Error',
+		501	=> 'HTTP/1.1 501 Not Implemented',
+		502	=> 'HTTP/1.1 502 Bad Gateway',
+		503	=> 'HTTP/1.1 503 Service Unavailable',
+		504	=> 'HTTP/1.1 504 Gateway Timeout',
+		505	=> 'HTTP/1.1 505 HTTP Version Not Supported',
+		506	=> 'HTTP/1.1 506 Variant Also Negotiates',
+		507	=> 'HTTP/1.1 507 Insufficient Storage',
+		508	=> 'HTTP/1.1 508 Loop Detected',
+		510	=> 'HTTP/1.1 510 Not Extended',
+		511	=> 'HTTP/1.1 511 Network Authentication Required',	);
 
 	/**
          * A map of HTTP Response headers which may only send a single value, all others
@@ -550,7 +600,7 @@ public function redirect($url, $status = 303)
 			}
 			else
 			{
-				// Check if we have a boolean for the status variable for compatability with old $move parameter
+				// Check if we have a boolean for the status variable for compatibility with old $move parameter
 				// @deprecated 4.0
 				if (is_bool($status))
 				{
@@ -660,10 +710,10 @@ public function setHeader($name, $value, $replace = false)
 		}
 
 		/**
-                 * If no keys found, safe to insert (!$keys)
-                 * If ($keys && $replace) it's a replacement and previous have been deleted
-                 * if($keys && !in_array...) it's a multiple value header
-                 */
+         * If no keys found, safe to insert (!$keys)
+         * If ($keys && $replace) it's a replacement and previous have been deleted
+         * if($keys && !in_array...) it's a multiple value header
+         */
 		$single = in_array($name, $this->singleValueResponseHeaders);
 		if ($value && (!$keys || ($keys && ($replace || !$single))))
 		{
@@ -719,7 +769,9 @@ public function sendHeaders()
 				if ('status' == strtolower($header['name']))
 				{
 					// 'status' headers indicate an HTTP status, and need to be handled slightly differently
-					$this->header('HTTP/1.1 ' . (int) $header['value'], true);
+					$status = $this->getHttpStatusValue($header['value']);
+
+					$this->header($status, true, (int) $header['value']);
 				}
 				else
 				{
@@ -732,6 +784,27 @@ public function sendHeaders()
 		return $this;
 	}
 
+	/**
+	 * Check is a given value can be successfully mapped to a valid http status value
+	 *
+	 * @param   string  $value  The given status as int or string
+	 *
+	 * @return string
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function getHttpStatusValue($value)
+	{
+		$code = (int) $value;
+
+		if (array_key_exists($code, $this->responseMap))
+		{
+			return $this->responseMap[$code];
+		}
+
+		return 'HTTP/1.1 ' . $code;
+	}
+
 	/**
 	 * Set body content.  If body content already defined, this will replace it.
 	 *

From 16b4d2f1b108d2731f6c81c3d5722d00ffd83b19 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 15 May 2017 20:36:51 +0200
Subject: [PATCH 002/148] fix test

a bit revert and make sure that all values are checked
---
 .../cms/application/JApplicationCmsTest.php          |  8 ++++----
 .../joomla/application/JApplicationWebTest.php       | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php b/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
index bc7a74a714f3a..8ff92da68896f 100644
--- a/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
+++ b/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
@@ -447,7 +447,7 @@ public function testRedirect()
 		$this->class->redirect($url, false);
 
 		$this->assertEquals(
-			array('HTTP/1.1 303', true, null),
+			array('HTTP/1.1 303 See other', true, 303),
 			$this->class->headers[0]
 		);
 
@@ -517,7 +517,7 @@ public function testRedirectLegacy()
 		);
 
 		$this->assertEquals(
-			array('HTTP/1.1 303', true, null),
+			array('HTTP/1.1 303 See other', true, 303),
 			$this->class->headers[0]
 		);
 
@@ -583,7 +583,7 @@ public function testRedirectLegacyWithEmptyMessageAndEmptyStatus()
 
 		// The redirect gives a 303 error code
 		$this->assertEquals(
-			array('HTTP/1.1 303', true, null),
+			array('HTTP/1.1 303 See other', true, 303),
 			$this->class->headers[0]
 		);
 
@@ -701,7 +701,7 @@ public function testRedirectWithMoved()
 		$this->class->redirect($url, true);
 
 		$this->assertEquals(
-			array('HTTP/1.1 301', true, null),
+			array('HTTP/1.1 301 Moved Permanently', true, 301),
 			$this->class->headers[0]
 		);
 
diff --git a/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php b/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
index 1275a161ebb25..0e0fa4b875757 100644
--- a/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
+++ b/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
@@ -1086,7 +1086,7 @@ public function testRedirect()
 		$this->class->redirect($url, false);
 
 		$this->assertEquals(
-			array('HTTP/1.1 303', true, null),
+			array('HTTP/1.1 303 See other', true, 303),
 			$this->class->headers[0]
 		);
 
@@ -1149,12 +1149,12 @@ public function testRedirectWithExistingStatusCode1()
 
 		// It has two statuses, but the second status will be the final status
 		$this->assertEquals(
-			array('HTTP/1.1 201', true, null),
+			array('HTTP/1.1 201 Created', true, 201),
 			$this->class->headers[0]
 		);
 
 		$this->assertEquals(
-			array('HTTP/1.1 303', true, null),
+			array('HTTP/1.1 303 See other', true, 303),
 			$this->class->headers[1]
 		);
 
@@ -1216,7 +1216,7 @@ public function testRedirectWithExistingStatusCode2()
 		$this->class->redirect($url, false);
 
 		$this->assertEquals(
-			array('HTTP/1.1 303', true, null),
+			array('HTTP/1.1 303 See other', true, 303),
 			$this->class->headers[0]
 		);
 
@@ -1328,7 +1328,7 @@ public function testRedirectWithMoved()
 		$this->class->redirect($url, true);
 
 		$this->assertEquals(
-			array('HTTP/1.1 301', true, null),
+			array('HTTP/1.1 301 Moved Permanently', true, 301),
 			$this->class->headers[0]
 		);
 
@@ -1453,7 +1453,7 @@ public function testSendHeaders()
 
 		$this->assertEquals(
 			array(
-				array('HTTP/1.1 200', true, null),
+				array('HTTP/1.1 200 OK', true, 200),
 				array('X-JWeb-SendHeaders: foo', true, null),
 			),
 			$this->class->headers

From dae2a917f207f5413b706ae219065507b7fdadaa Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 15 May 2017 21:01:22 +0200
Subject: [PATCH 003/148] status code ordering

---
 libraries/joomla/application/web.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 00982f12b9ea6..64ec6c1051f73 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -85,15 +85,6 @@ class JApplicationWeb extends JApplicationBase
 		100	=> 'HTTP/1.1 100 Continue',
 		101	=> 'HTTP/1.1 101 Switching Protocols',
 		102	=> 'HTTP/1.1 102 Processing',
-		300 => 'HTTP/1.1 300 Multiple Choices',
-		301 => 'HTTP/1.1 301 Moved Permanently',
-		302 => 'HTTP/1.1 302 Found',
-		303 => 'HTTP/1.1 303 See other',
-		304 => 'HTTP/1.1 304 Not Modified',
-		305 => 'HTTP/1.1 305 Use Proxy',
-		306 => 'HTTP/1.1 306 (Unused)',
-		307 => 'HTTP/1.1 307 Temporary Redirect',
-		308 => 'HTTP/1.1 308 Permanent Redirect',
 		200	=> 'HTTP/1.1 200 OK',
 		201	=> 'HTTP/1.1 201 Created',
 		202	=> 'HTTP/1.1 202 Accepted',
@@ -104,6 +95,15 @@ class JApplicationWeb extends JApplicationBase
 		207	=> 'HTTP/1.1 207 Multi-Status',
 		208	=> 'HTTP/1.1 208 Already Reported',
 		226	=> 'HTTP/1.1 226 IM Used',
+		300 => 'HTTP/1.1 300 Multiple Choices',
+		301 => 'HTTP/1.1 301 Moved Permanently',
+		302 => 'HTTP/1.1 302 Found',
+		303 => 'HTTP/1.1 303 See other',
+		304 => 'HTTP/1.1 304 Not Modified',
+		305 => 'HTTP/1.1 305 Use Proxy',
+		306 => 'HTTP/1.1 306 (Unused)',
+		307 => 'HTTP/1.1 307 Temporary Redirect',
+		308 => 'HTTP/1.1 308 Permanent Redirect',
 		400	=> 'HTTP/1.1 400 Bad Request',
 		401	=> 'HTTP/1.1 401 Unauthorized',
 		402	=> 'HTTP/1.1 402 Payment Required',

From 103deb29a42a6b8a5833e791a97766ffd9f23c47 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 15 May 2017 21:40:04 +0200
Subject: [PATCH 004/148] check redirection state in redirect function

---
 libraries/joomla/application/web.php | 42 +++++++++++++++++++---------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 64ec6c1051f73..859d45358aa72 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -144,13 +144,13 @@ class JApplicationWeb extends JApplicationBase
 		511	=> 'HTTP/1.1 511 Network Authentication Required',	);
 
 	/**
-         * A map of HTTP Response headers which may only send a single value, all others
-         * are considered to allow multiple
-         * 
-         * @var    object
-         * @since  3.5.2
-         * @see    https://tools.ietf.org/html/rfc7230
-         */
+	 * A map of HTTP Response headers which may only send a single value, all others
+	 * are considered to allow multiple
+	 *
+	 * @var    object
+	 * @since  3.5.2
+	 * @see    https://tools.ietf.org/html/rfc7230
+	 */
 	private $singleValueResponseHeaders = array(
 		'status', // This is not a valid header name, but the representation used by Joomla to identify the HTTP Response Code
 		'Content-Length',
@@ -609,7 +609,7 @@ public function redirect($url, $status = 303)
 
 				// Now check if we have an integer status code that maps to a valid redirect. If we don't then set a 303
 				// @deprecated 4.0 From 4.0 if no valid status code is given an InvalidArgumentException will be thrown
-				if (!is_int($status) || is_int($status) && !isset($this->responseMap[$status]))
+				if (!is_int($status) || !$this->isRedirectState($status))
 				{
 					$status = 303;
 				}
@@ -627,6 +627,22 @@ public function redirect($url, $status = 303)
 		$this->close();
 	}
 
+	/**
+	 * Checks if a state is a redirect state
+	 *
+	 * @param   integer  $state  The HTTP 1.1 status code.
+	 *
+	 * @return  bool
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function isRedirectState($state)
+	{
+		$state = (int) $state;
+
+		return ($state > 299 && $state < 400);
+	}
+
 	/**
 	 * Load an object or array into the application configuration object.
 	 *
@@ -710,10 +726,10 @@ public function setHeader($name, $value, $replace = false)
 		}
 
 		/**
-         * If no keys found, safe to insert (!$keys)
-         * If ($keys && $replace) it's a replacement and previous have been deleted
-         * if($keys && !in_array...) it's a multiple value header
-         */
+		 * If no keys found, safe to insert (!$keys)
+		 * If ($keys && $replace) it's a replacement and previous have been deleted
+		 * if($keys && !in_array...) it's a multiple value header
+		 */
 		$single = in_array($name, $this->singleValueResponseHeaders);
 		if ($value && (!$keys || ($keys && ($replace || !$single))))
 		{
@@ -785,7 +801,7 @@ public function sendHeaders()
 	}
 
 	/**
-	 * Check is a given value can be successfully mapped to a valid http status value
+	 * Check if a given value can be successfully mapped to a valid http status value
 	 *
 	 * @param   string  $value  The given status as int or string
 	 *

From 3d04acd92964454911309a0c433cd1dcb2b22b3a Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Mon, 15 May 2017 22:12:38 +0100
Subject: [PATCH 005/148] correct the tab indentation

---
 libraries/joomla/application/web.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 859d45358aa72..b38c2f2bd611a 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -95,15 +95,15 @@ class JApplicationWeb extends JApplicationBase
 		207	=> 'HTTP/1.1 207 Multi-Status',
 		208	=> 'HTTP/1.1 208 Already Reported',
 		226	=> 'HTTP/1.1 226 IM Used',
-		300 => 'HTTP/1.1 300 Multiple Choices',
-		301 => 'HTTP/1.1 301 Moved Permanently',
-		302 => 'HTTP/1.1 302 Found',
-		303 => 'HTTP/1.1 303 See other',
-		304 => 'HTTP/1.1 304 Not Modified',
-		305 => 'HTTP/1.1 305 Use Proxy',
-		306 => 'HTTP/1.1 306 (Unused)',
-		307 => 'HTTP/1.1 307 Temporary Redirect',
-		308 => 'HTTP/1.1 308 Permanent Redirect',
+		300 	=> 'HTTP/1.1 300 Multiple Choices',
+		301 	=> 'HTTP/1.1 301 Moved Permanently',
+		302 	=> 'HTTP/1.1 302 Found',
+		303 	=> 'HTTP/1.1 303 See other',
+		304 	=> 'HTTP/1.1 304 Not Modified',
+		305 	=> 'HTTP/1.1 305 Use Proxy',
+		306 	=> 'HTTP/1.1 306 (Unused)',
+		307 	=> 'HTTP/1.1 307 Temporary Redirect',
+		308 	=> 'HTTP/1.1 308 Permanent Redirect',
 		400	=> 'HTTP/1.1 400 Bad Request',
 		401	=> 'HTTP/1.1 401 Unauthorized',
 		402	=> 'HTTP/1.1 402 Payment Required',

From 0b1e46a7f0080b396a6956306a9f70cf42be1772 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Tue, 16 May 2017 00:24:50 +0100
Subject: [PATCH 006/148] Add status code 418

---
 libraries/joomla/application/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index b38c2f2bd611a..8ec640f906c8b 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -122,6 +122,7 @@ class JApplicationWeb extends JApplicationBase
 		415	=> 'HTTP/1.1 415 Unsupported Media Type',
 		416	=> 'HTTP/1.1 416 Range Not Satisfiable',
 		417	=> 'HTTP/1.1 417 Expectation Failed',
+		418	=> 'HTTP/1.1 418 I\'m a teapot',
 		421	=> 'HTTP/1.1 421 Misdirected Request',
 		422	=> 'HTTP/1.1 422 Unprocessable Entity',
 		423	=> 'HTTP/1.1 423 Locked',

From b48b890edd62667b21a6c0ca2aea9a2bd148b717 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 16 May 2017 10:12:06 +0200
Subject: [PATCH 007/148] typos and indentation

---
 libraries/joomla/application/web.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 8ec640f906c8b..ad86747915f30 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -95,15 +95,15 @@ class JApplicationWeb extends JApplicationBase
 		207	=> 'HTTP/1.1 207 Multi-Status',
 		208	=> 'HTTP/1.1 208 Already Reported',
 		226	=> 'HTTP/1.1 226 IM Used',
-		300 	=> 'HTTP/1.1 300 Multiple Choices',
-		301 	=> 'HTTP/1.1 301 Moved Permanently',
-		302 	=> 'HTTP/1.1 302 Found',
-		303 	=> 'HTTP/1.1 303 See other',
-		304 	=> 'HTTP/1.1 304 Not Modified',
-		305 	=> 'HTTP/1.1 305 Use Proxy',
-		306 	=> 'HTTP/1.1 306 (Unused)',
-		307 	=> 'HTTP/1.1 307 Temporary Redirect',
-		308 	=> 'HTTP/1.1 308 Permanent Redirect',
+		300 => 'HTTP/1.1 300 Multiple Choices',
+		301 => 'HTTP/1.1 301 Moved Permanently',
+		302 => 'HTTP/1.1 302 Found',
+		303 => 'HTTP/1.1 303 See other',
+		304 => 'HTTP/1.1 304 Not Modified',
+		305 => 'HTTP/1.1 305 Use Proxy',
+		306 => 'HTTP/1.1 306 (Unused)',
+		307 => 'HTTP/1.1 307 Temporary Redirect',
+		308 => 'HTTP/1.1 308 Permanent Redirect',
 		400	=> 'HTTP/1.1 400 Bad Request',
 		401	=> 'HTTP/1.1 401 Unauthorized',
 		402	=> 'HTTP/1.1 402 Payment Required',
@@ -729,7 +729,7 @@ public function setHeader($name, $value, $replace = false)
 		/**
 		 * If no keys found, safe to insert (!$keys)
 		 * If ($keys && $replace) it's a replacement and previous have been deleted
-		 * if($keys && !in_array...) it's a multiple value header
+		 * If ($keys && !in_array...) it's a multiple value header
 		 */
 		$single = in_array($name, $this->singleValueResponseHeaders);
 		if ($value && (!$keys || ($keys && ($replace || !$single))))

From e7b72b01601340058a2188bbf15797a834128858 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 16 May 2017 10:23:47 +0200
Subject: [PATCH 008/148] cs fix

---
 libraries/joomla/application/web.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index ad86747915f30..e5921febd492d 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -142,7 +142,8 @@ class JApplicationWeb extends JApplicationBase
 		507	=> 'HTTP/1.1 507 Insufficient Storage',
 		508	=> 'HTTP/1.1 508 Loop Detected',
 		510	=> 'HTTP/1.1 510 Not Extended',
-		511	=> 'HTTP/1.1 511 Network Authentication Required',	);
+		511	=> 'HTTP/1.1 511 Network Authentication Required',
+	);
 
 	/**
 	 * A map of HTTP Response headers which may only send a single value, all others

From 1414536064fde2c828c562d728da7dd074fbbc06 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 16 May 2017 10:26:50 +0200
Subject: [PATCH 009/148] cs fix2

---
 libraries/joomla/application/web.php | 104 +++++++++++++--------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index e5921febd492d..0dd2f5b3b305a 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -82,19 +82,19 @@ class JApplicationWeb extends JApplicationBase
 	 * @see    http://tools.ietf.org/pdf/rfc7231.pdf
 	 */
 	private $responseMap = array(
-		100	=> 'HTTP/1.1 100 Continue',
-		101	=> 'HTTP/1.1 101 Switching Protocols',
-		102	=> 'HTTP/1.1 102 Processing',
-		200	=> 'HTTP/1.1 200 OK',
-		201	=> 'HTTP/1.1 201 Created',
-		202	=> 'HTTP/1.1 202 Accepted',
-		203	=> 'HTTP/1.1 203 Non-Authoritative Information',
-		204	=> 'HTTP/1.1 204 No Content',
-		205	=> 'HTTP/1.1 205 Reset Content',
-		206	=> 'HTTP/1.1 206 Partial Content',
-		207	=> 'HTTP/1.1 207 Multi-Status',
-		208	=> 'HTTP/1.1 208 Already Reported',
-		226	=> 'HTTP/1.1 226 IM Used',
+		100 => 'HTTP/1.1 100 Continue',
+		101 => 'HTTP/1.1 101 Switching Protocols',
+		102 => 'HTTP/1.1 102 Processing',
+		200 => 'HTTP/1.1 200 OK',
+		201 => 'HTTP/1.1 201 Created',
+		202 => 'HTTP/1.1 202 Accepted',
+		203 => 'HTTP/1.1 203 Non-Authoritative Information',
+		204 => 'HTTP/1.1 204 No Content',
+		205 => 'HTTP/1.1 205 Reset Content',
+		206 => 'HTTP/1.1 206 Partial Content',
+		207 => 'HTTP/1.1 207 Multi-Status',
+		208 => 'HTTP/1.1 208 Already Reported',
+		226 => 'HTTP/1.1 226 IM Used',
 		300 => 'HTTP/1.1 300 Multiple Choices',
 		301 => 'HTTP/1.1 301 Moved Permanently',
 		302 => 'HTTP/1.1 302 Found',
@@ -104,45 +104,45 @@ class JApplicationWeb extends JApplicationBase
 		306 => 'HTTP/1.1 306 (Unused)',
 		307 => 'HTTP/1.1 307 Temporary Redirect',
 		308 => 'HTTP/1.1 308 Permanent Redirect',
-		400	=> 'HTTP/1.1 400 Bad Request',
-		401	=> 'HTTP/1.1 401 Unauthorized',
-		402	=> 'HTTP/1.1 402 Payment Required',
-		403	=> 'HTTP/1.1 403 Forbidden',
-		404	=> 'HTTP/1.1 404 Not Found',
-		405	=> 'HTTP/1.1 405 Method Not Allowed',
-		406	=> 'HTTP/1.1 406 Not Acceptable',
-		407	=> 'HTTP/1.1 407 Proxy Authentication Required',
-		408	=> 'HTTP/1.1 408 Request Timeout',
-		409	=> 'HTTP/1.1 409 Conflict',
-		410	=> 'HTTP/1.1 410 Gone',
-		411	=> 'HTTP/1.1 411 Length Required',
-		412	=> 'HTTP/1.1 412 Precondition Failed',
-		413	=> 'HTTP/1.1 413 Payload Too Large',
-		414	=> 'HTTP/1.1 414 URI Too Long',
-		415	=> 'HTTP/1.1 415 Unsupported Media Type',
-		416	=> 'HTTP/1.1 416 Range Not Satisfiable',
-		417	=> 'HTTP/1.1 417 Expectation Failed',
-		418	=> 'HTTP/1.1 418 I\'m a teapot',
-		421	=> 'HTTP/1.1 421 Misdirected Request',
-		422	=> 'HTTP/1.1 422 Unprocessable Entity',
-		423	=> 'HTTP/1.1 423 Locked',
-		424	=> 'HTTP/1.1 424 Failed Dependency',
-		426	=> 'HTTP/1.1 426 Upgrade Required',
-		428	=> 'HTTP/1.1 428 Precondition Required',
-		429	=> 'HTTP/1.1 429 Too Many Requests',
-		431	=> 'HTTP/1.1 431 Request Header Fields Too Large',
-		451	=> 'HTTP/1.1 451 Unavailable For Legal Reasons',
-		500	=> 'HTTP/1.1 500 Internal Server Error',
-		501	=> 'HTTP/1.1 501 Not Implemented',
-		502	=> 'HTTP/1.1 502 Bad Gateway',
-		503	=> 'HTTP/1.1 503 Service Unavailable',
-		504	=> 'HTTP/1.1 504 Gateway Timeout',
-		505	=> 'HTTP/1.1 505 HTTP Version Not Supported',
-		506	=> 'HTTP/1.1 506 Variant Also Negotiates',
-		507	=> 'HTTP/1.1 507 Insufficient Storage',
-		508	=> 'HTTP/1.1 508 Loop Detected',
-		510	=> 'HTTP/1.1 510 Not Extended',
-		511	=> 'HTTP/1.1 511 Network Authentication Required',
+		400 => 'HTTP/1.1 400 Bad Request',
+		401 => 'HTTP/1.1 401 Unauthorized',
+		402 => 'HTTP/1.1 402 Payment Required',
+		403 => 'HTTP/1.1 403 Forbidden',
+		404 => 'HTTP/1.1 404 Not Found',
+		405 => 'HTTP/1.1 405 Method Not Allowed',
+		406 => 'HTTP/1.1 406 Not Acceptable',
+		407 => 'HTTP/1.1 407 Proxy Authentication Required',
+		408 => 'HTTP/1.1 408 Request Timeout',
+		409 => 'HTTP/1.1 409 Conflict',
+		410 => 'HTTP/1.1 410 Gone',
+		411 => 'HTTP/1.1 411 Length Required',
+		412 => 'HTTP/1.1 412 Precondition Failed',
+		413 => 'HTTP/1.1 413 Payload Too Large',
+		414 => 'HTTP/1.1 414 URI Too Long',
+		415 => 'HTTP/1.1 415 Unsupported Media Type',
+		416 => 'HTTP/1.1 416 Range Not Satisfiable',
+		417 => 'HTTP/1.1 417 Expectation Failed',
+		418 => 'HTTP/1.1 418 I\'m a teapot',
+		421 => 'HTTP/1.1 421 Misdirected Request',
+		422 => 'HTTP/1.1 422 Unprocessable Entity',
+		423 => 'HTTP/1.1 423 Locked',
+		424 => 'HTTP/1.1 424 Failed Dependency',
+		426 => 'HTTP/1.1 426 Upgrade Required',
+		428 => 'HTTP/1.1 428 Precondition Required',
+		429 => 'HTTP/1.1 429 Too Many Requests',
+		431 => 'HTTP/1.1 431 Request Header Fields Too Large',
+		451 => 'HTTP/1.1 451 Unavailable For Legal Reasons',
+		500 => 'HTTP/1.1 500 Internal Server Error',
+		501 => 'HTTP/1.1 501 Not Implemented',
+		502 => 'HTTP/1.1 502 Bad Gateway',
+		503 => 'HTTP/1.1 503 Service Unavailable',
+		504 => 'HTTP/1.1 504 Gateway Timeout',
+		505 => 'HTTP/1.1 505 HTTP Version Not Supported',
+		506 => 'HTTP/1.1 506 Variant Also Negotiates',
+		507 => 'HTTP/1.1 507 Insufficient Storage',
+		508 => 'HTTP/1.1 508 Loop Detected',
+		510 => 'HTTP/1.1 510 Not Extended',
+		511 => 'HTTP/1.1 511 Network Authentication Required',
 	);
 
 	/**

From 8b197ec98b32f76e16c1ee1245517d7401a79e57 Mon Sep 17 00:00:00 2001
From: Matias Aguirre <maguirre@matware.com.ar>
Date: Tue, 30 May 2017 10:31:52 -0300
Subject: [PATCH 010/148] Namespace document

---
 .../joomla/document/feed/renderer/atom.php    | 27 ------
 .../joomla/document/feed/renderer/rss.php     | 23 -----
 .../document/html/renderer/component.php      | 22 -----
 .../joomla/document/html/renderer/head.php    | 22 -----
 .../joomla/document/html/renderer/message.php | 22 -----
 .../joomla/document/html/renderer/module.php  | 22 -----
 .../joomla/document/html/renderer/modules.php | 22 -----
 .../Joomla/CMS/Document/Document.php}         | 97 ++++++++++---------
 .../Joomla/CMS/Document/DocumentError.php}    | 29 +++---
 .../Joomla/CMS/Document/DocumentFeed.php}     | 54 ++++++-----
 .../Joomla/CMS/Document/DocumentHtml.php}     | 66 +++++++------
 .../Joomla/CMS/Document/DocumentImage.php}    | 15 +--
 .../Joomla/CMS/Document/DocumentJson.php}     | 19 ++--
 .../CMS/Document/DocumentOpensearch.php}      | 42 ++++----
 .../Joomla/CMS/Document/DocumentRaw.php}      | 15 +--
 .../Joomla/CMS/Document/DocumentRenderer.php} | 18 ++--
 .../Joomla/CMS/Document/DocumentXml.php}      | 17 ++--
 .../Renderer/Feed/RendererFeedAtom.php}       | 32 +++---
 .../Renderer/Feed/RendererFeedRss.php}        | 38 ++++----
 .../Renderer/Html/RendererHtmlComponent.php}  | 15 +--
 .../Renderer/Html/RendererHtmlHead.php}       | 22 +++--
 .../Renderer/Html/RendererHtmlMessage.php}    | 25 +++--
 .../Renderer/Html/RendererHtmlModule.php}     | 25 +++--
 .../Renderer/Html/RendererHtmlModules.php}    | 27 +++---
 24 files changed, 311 insertions(+), 405 deletions(-)
 delete mode 100644 libraries/joomla/document/feed/renderer/atom.php
 delete mode 100644 libraries/joomla/document/feed/renderer/rss.php
 delete mode 100644 libraries/joomla/document/html/renderer/component.php
 delete mode 100644 libraries/joomla/document/html/renderer/head.php
 delete mode 100644 libraries/joomla/document/html/renderer/message.php
 delete mode 100644 libraries/joomla/document/html/renderer/module.php
 delete mode 100644 libraries/joomla/document/html/renderer/modules.php
 rename libraries/{joomla/document/document.php => src/Joomla/CMS/Document/Document.php} (87%)
 rename libraries/{joomla/document/error.php => src/Joomla/CMS/Document/DocumentError.php} (83%)
 rename libraries/{joomla/document/feed.php => src/Joomla/CMS/Document/DocumentFeed.php} (81%)
 rename libraries/{joomla/document/html.php => src/Joomla/CMS/Document/DocumentHtml.php} (90%)
 rename libraries/{joomla/document/image.php => src/Joomla/CMS/Document/DocumentImage.php} (74%)
 rename libraries/{joomla/document/json.php => src/Joomla/CMS/Document/DocumentJson.php} (77%)
 rename libraries/{joomla/document/opensearch.php => src/Joomla/CMS/Document/DocumentOpensearch.php} (83%)
 rename libraries/{joomla/document/raw.php => src/Joomla/CMS/Document/DocumentRaw.php} (66%)
 rename libraries/{joomla/document/renderer.php => src/Joomla/CMS/Document/DocumentRenderer.php} (79%)
 rename libraries/{joomla/document/xml.php => src/Joomla/CMS/Document/DocumentXml.php} (71%)
 rename libraries/{joomla/document/renderer/feed/atom.php => src/Joomla/CMS/Document/Renderer/Feed/RendererFeedAtom.php} (86%)
 rename libraries/{joomla/document/renderer/feed/rss.php => src/Joomla/CMS/Document/Renderer/Feed/RendererFeedRss.php} (86%)
 rename libraries/{joomla/document/renderer/html/component.php => src/Joomla/CMS/Document/Renderer/Html/RendererHtmlComponent.php} (57%)
 rename libraries/{joomla/document/renderer/html/head.php => src/Joomla/CMS/Document/Renderer/Html/RendererHtmlHead.php} (94%)
 rename libraries/{joomla/document/renderer/html/message.php => src/Joomla/CMS/Document/Renderer/Html/RendererHtmlMessage.php} (64%)
 rename libraries/{joomla/document/renderer/html/module.php => src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModule.php} (71%)
 rename libraries/{joomla/document/renderer/html/modules.php => src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModules.php} (60%)

diff --git a/libraries/joomla/document/feed/renderer/atom.php b/libraries/joomla/document/feed/renderer/atom.php
deleted file mode 100644
index bd81a81ac49bb..0000000000000
--- a/libraries/joomla/document/feed/renderer/atom.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Document
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDocumentRendererAtom is deprecated, use JDocumentRendererFeedAtom instead.', JLog::WARNING, 'deprecated');
-
-/**
- * JDocumentRendererAtom is a feed that implements the atom specification
- *
- * Please note that just by using this class you won't automatically
- * produce valid atom files. For example, you have to specify either an editor
- * for the feed or an author for every single feed item.
- *
- * @link        http://www.atomenabled.org/developers/syndication/atom-format-spec.php
- * @since       11.1
- * @deprecated  4.0  Use JDocumentRendererFeedAtom instead
- */
-class JDocumentRendererAtom extends JDocumentRendererFeedAtom
-{
-}
diff --git a/libraries/joomla/document/feed/renderer/rss.php b/libraries/joomla/document/feed/renderer/rss.php
deleted file mode 100644
index 65bec5a3679e8..0000000000000
--- a/libraries/joomla/document/feed/renderer/rss.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Document
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDocumentRendererRSS is deprecated, use JDocumentRendererFeedRss instead.', JLog::WARNING, 'deprecated');
-
-/**
- * JDocumentRendererRSS is a feed that implements RSS 2.0 Specification
- *
- * @link        http://www.rssboard.org/rss-specification
- * @since       11.1
- * @deprecated  4.0  Use JDocumentRendererFeedRss instead
- */
-class JDocumentRendererRSS extends JDocumentRendererFeedRss
-{
-}
diff --git a/libraries/joomla/document/html/renderer/component.php b/libraries/joomla/document/html/renderer/component.php
deleted file mode 100644
index e347182b01e75..0000000000000
--- a/libraries/joomla/document/html/renderer/component.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Document
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDocumentRendererComponent is deprecated, use JDocumentRendererHtmlComponent instead.', JLog::WARNING, 'deprecated');
-
-/**
- * Component renderer
- *
- * @since       11.1
- * @deprecated  4.0  Use JDocumentRendererHtmlComponent instead
- */
-class JDocumentRendererComponent extends JDocumentRendererHtmlComponent
-{
-}
diff --git a/libraries/joomla/document/html/renderer/head.php b/libraries/joomla/document/html/renderer/head.php
deleted file mode 100644
index 7789ad59e458e..0000000000000
--- a/libraries/joomla/document/html/renderer/head.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Document
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDocumentRendererHead is deprecated, use JDocumentRendererHtmlHead instead.', JLog::WARNING, 'deprecated');
-
-/**
- * JDocument head renderer
- *
- * @since       11.1
- * @deprecated  4.0  Use JDocumentRendererHtmlHead instead
- */
-class JDocumentRendererHead extends JDocumentRendererHtmlHead
-{
-}
diff --git a/libraries/joomla/document/html/renderer/message.php b/libraries/joomla/document/html/renderer/message.php
deleted file mode 100644
index c272114ec4f8f..0000000000000
--- a/libraries/joomla/document/html/renderer/message.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Document
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDocumentRendererMessage is deprecated, use JDocumentRendererHtmlMessage instead.', JLog::WARNING, 'deprecated');
-
-/**
- * JDocument system message renderer
- *
- * @since       11.1
- * @deprecated  4.0  Use JDocumentRendererHtmlMessage instead
- */
-class JDocumentRendererMessage extends JDocumentRendererHtmlMessage
-{
-}
diff --git a/libraries/joomla/document/html/renderer/module.php b/libraries/joomla/document/html/renderer/module.php
deleted file mode 100644
index 76bb3089fd2e2..0000000000000
--- a/libraries/joomla/document/html/renderer/module.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Document
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDocumentRendererModule is deprecated, use JDocumentRendererHtmlModule instead.', JLog::WARNING, 'deprecated');
-
-/**
- * JDocument Module renderer
- *
- * @since       11.1
- * @deprecated  4.0  Use JDocumentRendererHtmlModule instead
- */
-class JDocumentRendererModule extends JDocumentRendererHtmlModule
-{
-}
diff --git a/libraries/joomla/document/html/renderer/modules.php b/libraries/joomla/document/html/renderer/modules.php
deleted file mode 100644
index 39245c38097fa..0000000000000
--- a/libraries/joomla/document/html/renderer/modules.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Document
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDocumentRendererModules is deprecated, use JDocumentRendererHtmlModules instead.', JLog::WARNING, 'deprecated');
-
-/**
- * JDocument Modules renderer
- *
- * @since       11.1
- * @deprecated  4.0  Use JDocumentRendererHtmlModules instead
- */
-class JDocumentRendererModules extends JDocumentRendererHtmlModules
-{
-}
diff --git a/libraries/joomla/document/document.php b/libraries/src/Joomla/CMS/Document/Document.php
similarity index 87%
rename from libraries/joomla/document/document.php
rename to libraries/src/Joomla/CMS/Document/Document.php
index 1e2005aba5c05..16dbd6f472af9 100644
--- a/libraries/joomla/document/document.php
+++ b/libraries/src/Joomla/CMS/Document/Document.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -14,7 +15,7 @@
  *
  * @since  11.1
  */
-class JDocument
+class Document
 {
 	/**
 	 * Document title
@@ -199,7 +200,7 @@ class JDocument
 	public static $_buffer = null;
 
 	/**
-	 * JDocument instances container.
+	 * Document instances container.
 	 *
 	 * @var    array
 	 * @since  11.3
@@ -265,7 +266,7 @@ public function __construct($options = array())
 	}
 
 	/**
-	 * Returns the global JDocument object, only creating it
+	 * Returns the global Document object, only creating it
 	 * if it doesn't already exist.
 	 *
 	 * @param   string  $type        The document type to instantiate
@@ -285,24 +286,24 @@ public static function getInstance($type = 'html', $attributes = array())
 			$ntype = null;
 
 			// Determine the path and class
-			$class = 'JDocument' . ucfirst($type);
+			$class = 'Document' . ucfirst($type);
 
 			if (!class_exists($class))
 			{
-				// @deprecated 4.0 - JDocument objects should be autoloaded instead
+				// @deprecated 4.0 - Document objects should be autoloaded instead
 				$path = __DIR__ . '/' . $type . '/' . $type . '.php';
 
-				JLoader::register($class, $path);
+				\JLoader::register($class, $path);
 
 				if (class_exists($class))
 				{
-					JLog::add('Non-autoloadable JDocument subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
+					\JLog::add('Non-autoloadable Document subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
 				}
 				// Default to the raw format
 				else
 				{
 					$ntype = $type;
-					$class = 'JDocumentRaw';
+					$class = 'DocumentRaw';
 				}
 			}
 
@@ -324,7 +325,7 @@ public static function getInstance($type = 'html', $attributes = array())
 	 *
 	 * @param   string  $type  Type document is to set to
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -365,7 +366,7 @@ public function getBuffer()
 	 * @param   string  $content  The content to be set in the buffer.
 	 * @param   array   $options  Array of optional elements.
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -417,7 +418,7 @@ public function getMetaData($name, $attribute = 'name')
 	 * @param   string  $content    Value of the meta HTML tag
 	 * @param   string  $attribute  Attribute to use in the meta HTML tag
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -452,7 +453,7 @@ public function setMetaData($name, $content, $attribute = 'name')
 	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
 	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 * @deprecated 4.0  The (url, mime, defer, async) method signature is deprecated, use (url, options, attributes) instead.
@@ -462,7 +463,7 @@ public function addScript($url, $options = array(), $attribs = array())
 		// B/C before 3.7.0
 		if (!is_array($options) && (!is_array($attribs) || $attribs === array()))
 		{
-			JLog::add('The addScript method signature used has changed, use (url, options, attributes) instead.', JLog::WARNING, 'deprecated');
+			\JLog::add('The addScript method signature used has changed, use (url, options, attributes) instead.', \JLog::WARNING, 'deprecated');
 
 			$argList = func_get_args();
 			$options = array();
@@ -507,14 +508,14 @@ public function addScript($url, $options = array(), $attribs = array())
 	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
 	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   3.2
 	 * @deprecated 4.0  This method is deprecated, use addScript(url, options, attributes) instead.
 	 */
 	public function addScriptVersion($url, $options = array(), $attribs = array())
 	{
-		JLog::add('The method is deprecated, use addScript(url, attributes, options) instead.', JLog::WARNING, 'deprecated');
+		\JLog::add('The method is deprecated, use addScript(url, attributes, options) instead.', \JLog::WARNING, 'deprecated');
 
 		// B/C before 3.7.0
 		if (!is_array($options) && (!is_array($attribs) || $attribs === array()))
@@ -559,7 +560,7 @@ public function addScriptVersion($url, $options = array(), $attribs = array())
 	 * @param   string  $content  Script
 	 * @param   string  $type     Scripting mime (defaults to 'text/javascript')
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -584,7 +585,7 @@ public function addScriptDeclaration($content, $type = 'text/javascript')
 	 * @param   mixed   $options  Scrip options as array or string
 	 * @param   bool    $merge    Whether merge with existing (true) or replace (false)
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   3.5
 	 */
@@ -635,7 +636,7 @@ public function getScriptOptions($key = null)
 	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
 	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'stylesheet', 'data-test' => 1)
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 * @deprecated 4.0  The (url, mime, media, attribs) method signature is deprecated, use (url, options, attributes) instead.
@@ -645,7 +646,7 @@ public function addStyleSheet($url, $options = array(), $attribs = array())
 		// B/C before 3.7.0
 		if (is_string($options))
 		{
-			JLog::add('The addStyleSheet method signature used has changed, use (url, options, attributes) instead.', JLog::WARNING, 'deprecated');
+			\JLog::add('The addStyleSheet method signature used has changed, use (url, options, attributes) instead.', \JLog::WARNING, 'deprecated');
 
 			$argList = func_get_args();
 			$options = array();
@@ -698,14 +699,14 @@ public function addStyleSheet($url, $options = array(), $attribs = array())
 	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
 	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'stylesheet', 'data-test' => 1)
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   3.2
 	 * @deprecated 4.0  This method is deprecated, use addStyleSheet(url, options, attributes) instead.
 	 */
 	public function addStyleSheetVersion($url, $options = array(), $attribs = array())
 	{
-		JLog::add('The method is deprecated, use addStyleSheet(url, attributes, options) instead.', JLog::WARNING, 'deprecated');
+		\JLog::add('The method is deprecated, use addStyleSheet(url, attributes, options) instead.', \JLog::WARNING, 'deprecated');
 
 		// B/C before 3.7.0
 		if (!is_array($options) && (!is_array($attribs) || $attribs === array()))
@@ -750,7 +751,7 @@ public function addStyleSheetVersion($url, $options = array(), $attribs = array(
 	 * @param   string  $content  Style declarations
 	 * @param   string  $type     Type of stylesheet (defaults to 'text/css')
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -773,7 +774,7 @@ public function addStyleDeclaration($content, $type = 'text/css')
 	 *
 	 * @param   string  $type  Charset encoding string
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -801,7 +802,7 @@ public function getCharset()
 	 *
 	 * @param   string  $lang  The language to be set
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -829,7 +830,7 @@ public function getLanguage()
 	 *
 	 * @param   string  $dir  The language direction to be set
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -857,7 +858,7 @@ public function getDirection()
 	 *
 	 * @param   string  $title  The title to be set
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -885,7 +886,7 @@ public function getTitle()
 	 *
 	 * @param   string  $mediaVersion  Media version to use
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   3.2
 	 */
@@ -913,7 +914,7 @@ public function getMediaVersion()
 	 *
 	 * @param   string  $base  The base URI to be set
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -941,7 +942,7 @@ public function getBase()
 	 *
 	 * @param   string  $description  The description to set
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -969,7 +970,7 @@ public function getDescription()
 	 *
 	 * @param   string  $url  A url
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -997,7 +998,7 @@ public function getLink()
 	 *
 	 * @param   string  $generator  The generator to be set
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -1025,7 +1026,7 @@ public function getGenerator()
 	 *
 	 * @param   string  $date  The date to be set
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -1060,7 +1061,7 @@ public function getModifiedDate()
 	 * @param   string   $type  The document type to be sent
 	 * @param   boolean  $sync  Should the type be synced with HTML?
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 *
@@ -1096,7 +1097,7 @@ public function getMimeEncoding()
 	 *
 	 * @param   string  $style  "win", "mac", "unix" or custom string.
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -1137,7 +1138,7 @@ public function _getLineEnd()
 	 *
 	 * @param   string  $string  String used to indent ("\11", "\t", '  ', etc.).
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -1165,7 +1166,7 @@ public function _getTab()
 	 *
 	 * @param   string  $type  The renderer type
 	 *
-	 * @return  JDocumentRenderer
+	 * @return  DocumentRenderer
 	 *
 	 * @since   11.1
 	 * @throws  RuntimeException
@@ -1173,12 +1174,12 @@ public function _getTab()
 	public function loadRenderer($type)
 	{
 		// New class name format adds the format type to the class name
-		$class = 'JDocumentRenderer' . ucfirst($this->getType()) . ucfirst($type);
+		$class = 'DocumentRenderer' . ucfirst($this->getType()) . ucfirst($type);
 
 		if (!class_exists($class))
 		{
 			// "Legacy" class name structure
-			$class = 'JDocumentRenderer' . $type;
+			$class = 'DocumentRenderer' . $type;
 
 			if (!class_exists($class))
 			{
@@ -1187,17 +1188,17 @@ public function loadRenderer($type)
 
 				if (!file_exists($path))
 				{
-					throw new RuntimeException('Unable to load renderer class', 500);
+					throw new \RuntimeException('Unable to load renderer class', 500);
 				}
 
-				JLoader::register($class, $path);
+				\JLoader::register($class, $path);
 
-				JLog::add('Non-autoloadable JDocumentRenderer subclasses are deprecated, support will be removed in 4.0.', JLog::WARNING, 'deprecated');
+				\JLog::add('Non-autoloadable DocumentRenderer subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
 
 				// If the class still doesn't exist after including the path, we've got issues
 				if (!class_exists($class))
 				{
-					throw new RuntimeException('Unable to load renderer class', 500);
+					throw new \RuntimeException('Unable to load renderer class', 500);
 				}
 			}
 		}
@@ -1210,7 +1211,7 @@ public function loadRenderer($type)
 	 *
 	 * @param   array  $params  The array of parameters
 	 *
-	 * @return  JDocument instance of $this to allow chaining
+	 * @return  Document instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -1231,7 +1232,7 @@ public function parse($params = array())
 	 */
 	public function render($cache = false, $params = array())
 	{
-		$app = JFactory::getApplication();
+		$app = \JFactory::getApplication();
 
 		if ($mdate = $this->getModifiedDate())
 		{
diff --git a/libraries/joomla/document/error.php b/libraries/src/Joomla/CMS/Document/DocumentError.php
similarity index 83%
rename from libraries/joomla/document/error.php
rename to libraries/src/Joomla/CMS/Document/DocumentError.php
index 886db76fcdf24..2949e2dfa13d0 100644
--- a/libraries/joomla/document/error.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentError.php
@@ -1,20 +1,25 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Layout\LayoutHelper;
+
 /**
  * DocumentError class, provides an easy interface to parse and display an error page
  *
  * @since  11.1
  */
-class JDocumentError extends JDocument
+class DocumentError extends Document
 {
 	/**
 	 * Document base URL
@@ -131,20 +136,20 @@ public function render($cache = false, $params = array())
 			$status = 500;
 		}
 
-		$errorReporting = JFactory::getConfig()->get('error_reporting');
+		$errorReporting = \JFactory::getConfig()->get('error_reporting');
 
 		if ($errorReporting === "development" || $errorReporting === "maximum")
 		{
 			$status .= ' ' . str_replace("\n", ' ', $this->_error->getMessage());
 		}
 
-		JFactory::getApplication()->setHeader('status', $status);
+		\JFactory::getApplication()->setHeader('status', $status);
 
 		$file = 'error.php';
 
 		// Check template
 		$directory = isset($params['directory']) ? $params['directory'] : 'templates';
-		$template = isset($params['template']) ? JFilterInput::getInstance()->clean($params['template'], 'cmd') : 'system';
+		$template = isset($params['template']) ? \JFilterInput::getInstance()->clean($params['template'], 'cmd') : 'system';
 
 		if (!file_exists($directory . '/' . $template . '/' . $file))
 		{
@@ -152,15 +157,15 @@ public function render($cache = false, $params = array())
 		}
 
 		// Set variables
-		$this->baseurl = JUri::base(true);
+		$this->baseurl = Uri::base(true);
 		$this->template = $template;
 		$this->debug = isset($params['debug']) ? $params['debug'] : false;
 		$this->error = $this->_error;
 
 		// Load the language file for the template if able
-		if (JFactory::$language)
+		if (\JFactory::$language)
 		{
-			$lang = JFactory::getLanguage();
+			$lang = \JFactory::getLanguage();
 
 			// 1.5 or core then 1.6
 			$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
@@ -226,6 +231,6 @@ public function renderBacktrace()
 		// Add the position of the actual file
 		array_unshift($backtrace, array('file' => $this->_error->getFile(), 'line' => $this->_error->getLine(), 'function' => ''));
 
-		return JLayoutHelper::render('joomla.error.backtrace', array('backtrace' => $backtrace));
+		return LayoutHelper::render('joomla.error.backtrace', array('backtrace' => $backtrace));
 	}
 }
diff --git a/libraries/joomla/document/feed.php b/libraries/src/Joomla/CMS/Document/DocumentFeed.php
similarity index 81%
rename from libraries/joomla/document/feed.php
rename to libraries/src/Joomla/CMS/Document/DocumentFeed.php
index 514250d15c439..897f912dd3156 100644
--- a/libraries/joomla/document/feed.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentFeed.php
@@ -1,20 +1,24 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Document\DocumentRenderer;
+
 /**
  * DocumentFeed class, provides an easy interface to parse and display any feed document
  *
  * @since  11.1
  */
-class JDocumentFeed extends JDocument
+class DocumentFeed extends Document
 {
 	/**
 	 * Syndication URL feed element
@@ -31,7 +35,7 @@ class JDocumentFeed extends JDocument
 	 *
 	 * optional
 	 *
-	 * @var    JFeedImage
+	 * @var    FeedImage
 	 * @since  11.1
 	 */
 	public $image = null;
@@ -157,7 +161,7 @@ class JDocumentFeed extends JDocument
 	/**
 	 * The feed items collection
 	 *
-	 * @var    JFeedItem[]
+	 * @var    FeedItem[]
 	 * @since  11.1
 	 */
 	public $items = array();
@@ -192,14 +196,14 @@ public function __construct($options = array())
 	public function render($cache = false, $params = array())
 	{
 		// Get the feed type
-		$type = JFactory::getApplication()->input->get('type', 'rss');
+		$type = \JFactory::getApplication()->input->get('type', 'rss');
 
 		// Instantiate feed renderer and set the mime encoding
 		$renderer = $this->loadRenderer(($type) ? $type : 'rss');
 
-		if (!($renderer instanceof JDocumentRenderer))
+		if (!($renderer instanceof DocumentRenderer))
 		{
-			throw new Exception(JText::_('JGLOBAL_RESOURCE_NOT_FOUND'), 404);
+			throw new \Exception(JText::_('JGLOBAL_RESOURCE_NOT_FOUND'), 404);
 		}
 
 		$this->setMimeEncoding($renderer->getContentType());
@@ -224,15 +228,15 @@ public function render($cache = false, $params = array())
 	}
 
 	/**
-	 * Adds an JFeedItem to the feed.
+	 * Adds an FeedItem to the feed.
 	 *
-	 * @param   JFeedItem  $item  The feeditem to add to the feed.
+	 * @param   FeedItem  $item  The feeditem to add to the feed.
 	 *
-	 * @return  JDocumentFeed  instance of $this to allow chaining
+	 * @return  DocumentFeed  instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
-	public function addItem(JFeedItem $item)
+	public function addItem(FeedItem $item)
 	{
 		$item->source = $this->link;
 		$this->items[] = $item;
@@ -242,11 +246,11 @@ public function addItem(JFeedItem $item)
 }
 
 /**
- * JFeedItem is an internal class that stores feed item information
+ * FeedItem is an internal class that stores feed item information
  *
  * @since  11.1
  */
-class JFeedItem
+class FeedItem
 {
 	/**
 	 * Title item element
@@ -321,7 +325,7 @@ class JFeedItem
 	/**
 	 * Enclosure element
 	 *
-	 * @var    JFeedEnclosure
+	 * @var    FeedEnclosure
 	 * @since  11.1
 	 */
 	public $enclosure = null;
@@ -369,15 +373,15 @@ class JFeedItem
 	public $source;
 
 	/**
-	 * Set the JFeedEnclosure for this item
+	 * Set the FeedEnclosure for this item
 	 *
-	 * @param   JFeedEnclosure  $enclosure  The JFeedEnclosure to add to the feed.
+	 * @param   FeedEnclosure  $enclosure  The FeedEnclosure to add to the feed.
 	 *
-	 * @return  JFeedItem instance of $this to allow chaining
+	 * @return  FeedItem instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
-	public function setEnclosure(JFeedEnclosure $enclosure)
+	public function setEnclosure(FeedEnclosure $enclosure)
 	{
 		$this->enclosure = $enclosure;
 
@@ -386,11 +390,11 @@ public function setEnclosure(JFeedEnclosure $enclosure)
 }
 
 /**
- * JFeedEnclosure is an internal class that stores feed enclosure information
+ * FeedEnclosure is an internal class that stores feed enclosure information
  *
  * @since  11.1
  */
-class JFeedEnclosure
+class FeedEnclosure
 {
 	/**
 	 * URL enclosure element
@@ -424,11 +428,11 @@ class JFeedEnclosure
 }
 
 /**
- * JFeedImage is an internal class that stores feed image information
+ * FeedImage is an internal class that stores feed image information
  *
  * @since  11.1
  */
-class JFeedImage
+class FeedImage
 {
 	/**
 	 * Title image attribute
diff --git a/libraries/joomla/document/html.php b/libraries/src/Joomla/CMS/Document/DocumentHtml.php
similarity index 90%
rename from libraries/joomla/document/html.php
rename to libraries/src/Joomla/CMS/Document/DocumentHtml.php
index fdaff162b168d..810af2ba79a71 100644
--- a/libraries/joomla/document/html.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentHtml.php
@@ -1,24 +1,30 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Uri\Uri;
 use Joomla\Registry\Registry;
 
 jimport('joomla.utilities.utility');
 
 /**
- * JDocumentHtml class, provides an easy interface to parse and display a HTML document
+ * DocumentHtml class, provides an easy interface to parse and display a HTML document
  *
  * @since  11.1
  */
-class JDocumentHtml extends JDocument
+class DocumentHtml extends Document
 {
 	/**
 	 * Array of Header `<link>` tags
@@ -140,7 +146,7 @@ public function getHeadData()
 		$data['scripts']     = $this->_scripts;
 		$data['script']      = $this->_script;
 		$data['custom']      = $this->_custom;
-		$data['scriptText']  = JText::script();
+		$data['scriptText']  = \JText::script();
 
 		return $data;
 	}
@@ -150,7 +156,7 @@ public function getHeadData()
 	 *
 	 * @param   mixed  $types  type or types of the heads elements to reset
 	 *
-	 * @return  JDocumentHTML  instance of $this to allow chaining
+	 * @return  DocumentHtml  instance of $this to allow chaining
 	 *
 	 * @since   3.7.0
 	 */
@@ -223,7 +229,7 @@ private function resetHeadDatum($type)
 	 *
 	 * @param   array  $data  The document head data in array form
 	 *
-	 * @return  JDocumentHTML|null instance of $this to allow chaining or null for empty input data
+	 * @return  DocumentHtml|null instance of $this to allow chaining or null for empty input data
 	 *
 	 * @since   11.1
 	 */
@@ -249,7 +255,7 @@ public function setHeadData($data)
 		{
 			foreach ($data['scriptText'] as $key => $string)
 			{
-				JText::script($key, $string);
+				\JText::script($key, $string);
 			}
 		}
 
@@ -261,7 +267,7 @@ public function setHeadData($data)
 	 *
 	 * @param   array  $data  The document head data in array form
 	 *
-	 * @return  JDocumentHTML|null instance of $this to allow chaining or null for empty input data
+	 * @return  DocumentHtml|null instance of $this to allow chaining or null for empty input data
 	 *
 	 * @since   11.1
 	 */
@@ -345,7 +351,7 @@ public function mergeHeadData($data)
 	 * @param   string  $relType   Relation type attribute.  Either rel or rev (default: 'rel').
 	 * @param   array   $attribs   Associative array of remaining attributes.
 	 *
-	 * @return  JDocumentHTML instance of $this to allow chaining
+	 * @return  DocumentHtml instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -369,7 +375,7 @@ public function addHeadLink($href, $relation, $relType = 'rel', $attribs = array
 	 * @param   string  $type      File type
 	 * @param   string  $relation  Relation of link
 	 *
-	 * @return  JDocumentHTML instance of $this to allow chaining
+	 * @return  DocumentHtml instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -386,7 +392,7 @@ public function addFavicon($href, $type = 'image/vnd.microsoft.icon', $relation
 	 *
 	 * @param   string  $html  The HTML to add to the head
 	 *
-	 * @return  JDocumentHTML instance of $this to allow chaining
+	 * @return  DocumentHtml instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -456,13 +462,13 @@ public function getBuffer($type = null, $name = null, $attribs = array())
 
 		if ($this->_caching == true && $type == 'modules')
 		{
-			$cache = JFactory::getCache('com_modules', '');
+			$cache = \JFactory::getCache('com_modules', '');
 			$hash = md5(serialize(array($name, $attribs, null, $renderer)));
 			$cbuffer = $cache->get('cbuffer_' . $type);
 
 			if (isset($cbuffer[$hash]))
 			{
-				return JCache::getWorkarounds($cbuffer[$hash], array('mergehead' => 1));
+				return Cache::getWorkarounds($cbuffer[$hash], array('mergehead' => 1));
 			}
 			else
 			{
@@ -474,7 +480,7 @@ public function getBuffer($type = null, $name = null, $attribs = array())
 				$this->setBuffer($renderer->render($name, $attribs, null), $type, $name);
 				$data = parent::$_buffer[$type][$name][$title];
 
-				$tmpdata = JCache::setWorkarounds($data, $options);
+				$tmpdata = Cache::setWorkarounds($data, $options);
 
 				$cbuffer[$hash] = $tmpdata;
 
@@ -495,7 +501,7 @@ public function getBuffer($type = null, $name = null, $attribs = array())
 	 * @param   string  $content  The content to be set in the buffer.
 	 * @param   array   $options  Array of optional elements.
 	 *
-	 * @return  JDocumentHTML instance of $this to allow chaining
+	 * @return  DocumentHtml instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -521,7 +527,7 @@ public function setBuffer($content, $options = array())
 	 *
 	 * @param   array  $params  Parameters for fetching the template
 	 *
-	 * @return  JDocumentHTML instance of $this to allow chaining
+	 * @return  DocumentHtml instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -573,12 +579,12 @@ public function countModules($condition)
 		{
 			$name = strtolower($words[0]);
 			$result = ((isset(parent::$_buffer['modules'][$name])) && (parent::$_buffer['modules'][$name] === false))
-				? 0 : count(JModuleHelper::getModules($name));
+				? 0 : count(ModuleHelper::getModules($name));
 
 			return $result;
 		}
 
-		JLog::add('Using an expression in JDocumentHtml::countModules() is deprecated.', JLog::WARNING, 'deprecated');
+		Log::add('Using an expression in DocumentHtml::countModules() is deprecated.', Log::WARNING, 'deprecated');
 
 		for ($i = 0, $n = count($words); $i < $n; $i += 2)
 		{
@@ -586,7 +592,7 @@ public function countModules($condition)
 			$name = strtolower($words[$i]);
 			$words[$i] = ((isset(parent::$_buffer['modules'][$name])) && (parent::$_buffer['modules'][$name] === false))
 				? 0
-				: count(JModuleHelper::getModules($name));
+				: count(ModuleHelper::getModules($name));
 		}
 
 		$str = 'return ' . implode(' ', $words) . ';';
@@ -607,8 +613,8 @@ public function countMenuChildren()
 
 		if (!isset($children))
 		{
-			$db = JFactory::getDbo();
-			$app = JFactory::getApplication();
+			$db = \JFactory::getDbo();
+			$app = \JFactory::getApplication();
 			$menu = $app->getMenu();
 			$active = $menu->getActive();
 			$children = 0;
@@ -677,7 +683,7 @@ protected function _loadTemplate($directory, $filename)
 	 *
 	 * @param   array  $params  Parameters to determine the template
 	 *
-	 * @return  JDocumentHTML instance of $this to allow chaining
+	 * @return  DocumentHtml instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -685,7 +691,7 @@ protected function _fetchTemplate($params = array())
 	{
 		// Check
 		$directory = isset($params['directory']) ? $params['directory'] : 'templates';
-		$filter = JFilterInput::getInstance();
+		$filter = \JFilterInput::getInstance();
 		$template = $filter->clean($params['template'], 'cmd');
 		$file = $filter->clean($params['file'], 'cmd');
 
@@ -700,7 +706,7 @@ protected function _fetchTemplate($params = array())
 		}
 
 		// Load the language file for the template
-		$lang = JFactory::getLanguage();
+		$lang = \JFactory::getLanguage();
 
 		// 1.5 or core then 1.6
 		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
@@ -708,7 +714,7 @@ protected function _fetchTemplate($params = array())
 
 		// Assign the variables
 		$this->template = $template;
-		$this->baseurl = JUri::base(true);
+		$this->baseurl = Uri::base(true);
 		$this->params = isset($params['params']) ? $params['params'] : new Registry;
 
 		// Load
@@ -720,7 +726,7 @@ protected function _fetchTemplate($params = array())
 	/**
 	 * Parse a document template
 	 *
-	 * @return  JDocumentHTML  instance of $this to allow chaining
+	 * @return  DocumentHtml  instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -737,7 +743,7 @@ protected function _parseTemplate()
 			for ($i = count($matches[0]) - 1; $i >= 0; $i--)
 			{
 				$type = $matches[1][$i];
-				$attribs = empty($matches[2][$i]) ? array() : JUtility::parseAttributes($matches[2][$i]);
+				$attribs = empty($matches[2][$i]) ? array() : \JUtility::parseAttributes($matches[2][$i]);
 				$name = isset($attribs['name']) ? $attribs['name'] : null;
 
 				// Separate buffers to be executed first and last
diff --git a/libraries/joomla/document/image.php b/libraries/src/Joomla/CMS/Document/DocumentImage.php
similarity index 74%
rename from libraries/joomla/document/image.php
rename to libraries/src/Joomla/CMS/Document/DocumentImage.php
index e861fb32c4064..aa3121083de3c 100644
--- a/libraries/joomla/document/image.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentImage.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+
 /**
  * DocumentImage class, provides an easy interface to output image data
  *
  * @since  12.1
  */
-class JDocumentImage extends JDocument
+class DocumentImage extends Document
 {
 	/**
 	 * Class constructor
@@ -47,7 +50,7 @@ public function __construct($options = array())
 	public function render($cache = false, $params = array())
 	{
 		// Get the image type
-		$type = JFactory::getApplication()->input->get('type', 'png');
+		$type = \JFactory::getApplication()->input->get('type', 'png');
 
 		switch ($type)
 		{
diff --git a/libraries/joomla/document/json.php b/libraries/src/Joomla/CMS/Document/DocumentJson.php
similarity index 77%
rename from libraries/joomla/document/json.php
rename to libraries/src/Joomla/CMS/Document/DocumentJson.php
index 7fb5107931b3b..629c9235e6c7b 100644
--- a/libraries/joomla/document/json.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentJson.php
@@ -1,21 +1,24 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+
 /**
- * JDocumentJson class, provides an easy interface to parse and display JSON output
+ * DocumentJson class, provides an easy interface to parse and display JSON output
  *
  * @link   http://www.json.org/
  * @since  11.1
  */
-class JDocumentJson extends JDocument
+class DocumentJson extends Document
 {
 	/**
 	 * Document name
@@ -65,7 +68,7 @@ public function __construct($options = array())
 	 */
 	public function render($cache = false, $params = array())
 	{
-		$app = JFactory::getApplication();
+		$app = \JFactory::getApplication();
 
 		$app->allowCache(false);
 
@@ -97,7 +100,7 @@ public function getName()
 	 *
 	 * @param   string  $name  Document name
 	 *
-	 * @return  JDocumentJSON instance of $this to allow chaining
+	 * @return  DocumentJson instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/document/opensearch.php b/libraries/src/Joomla/CMS/Document/DocumentOpensearch.php
similarity index 83%
rename from libraries/joomla/document/opensearch.php
rename to libraries/src/Joomla/CMS/Document/DocumentOpensearch.php
index cfd04c8252606..d3a7bfa7e6a78 100644
--- a/libraries/joomla/document/opensearch.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentOpensearch.php
@@ -1,21 +1,25 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Uri\Uri;
+
 /**
  * OpenSearch class, provides an easy interface to display an OpenSearch document
  *
  * @link   http://www.opensearch.org/
  * @since  11.1
  */
-class JDocumentOpensearch extends JDocument
+class DocumentOpensearch extends Document
 {
 	/**
 	 * ShortName element
@@ -63,15 +67,15 @@ public function __construct($options = array())
 		$this->_mime = 'application/opensearchdescription+xml';
 
 		// Add the URL for self updating
-		$update = new JOpenSearchUrl;
+		$update = new OpenSearchUrl;
 		$update->type = 'application/opensearchdescription+xml';
 		$update->rel = 'self';
-		$update->template = JRoute::_(JUri::getInstance());
+		$update->template = \JRoute::_(Uri::getInstance());
 		$this->addUrl($update);
 
 		// Add the favicon as the default image
 		// Try to find a favicon by checking the template and root folder
-		$app = JFactory::getApplication();
+		$app = \JFactory::getApplication();
 		$dirs = array(JPATH_THEMES . '/' . $app->getTemplate(), JPATH_BASE);
 
 		foreach ($dirs as $dir)
@@ -80,11 +84,11 @@ public function __construct($options = array())
 			{
 				$path = str_replace(JPATH_BASE, '', $dir);
 				$path = str_replace('\\', '/', $path);
-				$favicon = new JOpenSearchImage;
+				$favicon = new OpenSearchImage;
 
 				if ($path == '')
 				{
-					$favicon->data = JUri::base() . 'favicon.ico';
+					$favicon->data = Uri::base() . 'favicon.ico';
 				}
 				else
 				{
@@ -93,7 +97,7 @@ public function __construct($options = array())
 						$path = substr($path, 1);
 					}
 
-					$favicon->data = JUri::base() . $path . '/favicon.ico';
+					$favicon->data = Uri::base() . $path . '/favicon.ico';
 				}
 
 				$favicon->height = '16';
@@ -195,13 +199,13 @@ public function setShortName($name)
 	/**
 	 * Adds a URL to the OpenSearch description.
 	 *
-	 * @param   JOpenSearchUrl  $url  The url to add to the description.
+	 * @param   OpenSearchUrl  $url  The url to add to the description.
 	 *
 	 * @return  JDocumentOpensearch instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
-	public function addUrl(JOpenSearchUrl $url)
+	public function addUrl(OpenSearchUrl $url)
 	{
 		$this->_urls[] = $url;
 
@@ -211,13 +215,13 @@ public function addUrl(JOpenSearchUrl $url)
 	/**
 	 * Adds an image to the OpenSearch description.
 	 *
-	 * @param   JOpenSearchImage  $image  The image to add to the description.
+	 * @param   OpenSearchImage  $image  The image to add to the description.
 	 *
 	 * @return  JDocumentOpensearch instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
-	public function addImage(JOpenSearchImage $image)
+	public function addImage(OpenSearchImage $image)
 	{
 		$this->_images[] = $image;
 
@@ -226,11 +230,11 @@ public function addImage(JOpenSearchImage $image)
 }
 
 /**
- * JOpenSearchUrl is an internal class that stores the search URLs for the OpenSearch description
+ * OpenSearchUrl is an internal class that stores the search URLs for the OpenSearch description
  *
  * @since  11.1
  */
-class JOpenSearchUrl
+class OpenSearchUrl
 {
 	/**
 	 * Type item element
@@ -264,11 +268,11 @@ class JOpenSearchUrl
 }
 
 /**
- * JOpenSearchImage is an internal class that stores Images for the OpenSearch Description
+ * OpenSearchImage is an internal class that stores Images for the OpenSearch Description
  *
  * @since  11.1
  */
-class JOpenSearchImage
+class OpenSearchImage
 {
 	/**
 	 * The images MIME type
diff --git a/libraries/joomla/document/raw.php b/libraries/src/Joomla/CMS/Document/DocumentRaw.php
similarity index 66%
rename from libraries/joomla/document/raw.php
rename to libraries/src/Joomla/CMS/Document/DocumentRaw.php
index eb781dc6d7b15..e6a52d21c11a1 100644
--- a/libraries/joomla/document/raw.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentRaw.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+
 /**
- * DocumentRAW class, provides an easy interface to parse and display raw output
+ * DocumentRaw class, provides an easy interface to parse and display raw output
  *
  * @since  11.1
  */
-class JDocumentRaw extends JDocument
+class DocumentRaw extends Document
 {
 	/**
 	 * Class constructor
diff --git a/libraries/joomla/document/renderer.php b/libraries/src/Joomla/CMS/Document/DocumentRenderer.php
similarity index 79%
rename from libraries/joomla/document/renderer.php
rename to libraries/src/Joomla/CMS/Document/DocumentRenderer.php
index 52075e441deaa..2d22a140d12cb 100644
--- a/libraries/joomla/document/renderer.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentRenderer.php
@@ -1,20 +1,24 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+use Joomla\CMS\Uri\Uri;
+
 /**
  * Abstract class for a renderer
  *
  * @since  11.1
  */
-class JDocumentRenderer
+class DocumentRenderer
 {
 	/**
 	 * Reference to the JDocument object that instantiated the renderer
@@ -39,7 +43,7 @@ class JDocumentRenderer
 	 *
 	 * @since   11.1
 	 */
-	public function __construct(JDocument $doc)
+	public function __construct(Document $doc)
 	{
 		$this->_doc = $doc;
 	}
@@ -82,7 +86,7 @@ public function getContentType()
 	 */
 	protected function _relToAbs($text)
 	{
-		$base = JUri::base();
+		$base = Uri::base();
 		$text = preg_replace("/(href|src)=\"(?!http|ftp|https|mailto|data|\/\/)([^\"]*)\"/", "$1=\"$base\$2\"", $text);
 
 		return $text;
diff --git a/libraries/joomla/document/xml.php b/libraries/src/Joomla/CMS/Document/DocumentXml.php
similarity index 71%
rename from libraries/joomla/document/xml.php
rename to libraries/src/Joomla/CMS/Document/DocumentXml.php
index 6a63fbf7b1bcf..42c7aa4c242b0 100644
--- a/libraries/joomla/document/xml.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentXml.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\Document;
+
 /**
- * DocumentXML class, provides an easy interface to parse and display XML output
+ * DocumentXml class, provides an easy interface to parse and display XML output
  *
  * @since  11.1
  */
-class JDocumentXml extends JDocument
+class DocumentXml extends Document
 {
 	/**
 	 * Document name
@@ -56,7 +59,7 @@ public function render($cache = false, $params = array())
 	{
 		parent::render();
 
-		JFactory::getApplication()->setHeader('Content-disposition', 'inline; filename="' . $this->getName() . '.xml"', true);
+		\JFactory::getApplication()->setHeader('Content-disposition', 'inline; filename="' . $this->getName() . '.xml"', true);
 
 		return $this->getBuffer();
 	}
diff --git a/libraries/joomla/document/renderer/feed/atom.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedAtom.php
similarity index 86%
rename from libraries/joomla/document/renderer/feed/atom.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedAtom.php
index 9e6aaade40bea..00f8b6976b0bd 100644
--- a/libraries/joomla/document/renderer/feed/atom.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedAtom.php
@@ -1,16 +1,20 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document\Renderer\Feed;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Uri\Uri;
+
 /**
- * JDocumentRendererFeedAtom is a feed that implements the atom specification
+ * RendererFeedAtom is a feed that implements the atom specification
  *
  * Please note that just by using this class you won't automatically
  * produce valid atom files. For example, you have to specify either an editor
@@ -19,9 +23,9 @@
  * @link   http://www.atomenabled.org/developers/syndication/atom-format-spec.php
  * @since  3.5
  *
- * @property-read  JDocumentFeed  $_doc  Reference to the JDocument object that instantiated the renderer
+ * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class JDocumentRendererFeedAtom extends JDocumentRenderer
+class RendererFeedAtom extends DocumentRenderer
 {
 	/**
 	 * Document mime type
@@ -40,22 +44,22 @@ class JDocumentRendererFeedAtom extends JDocumentRenderer
 	 *
 	 * @return  string  The output of the script
 	 *
-	 * @see     JDocumentRenderer::render()
+	 * @see     DocumentRenderer::render()
 	 * @since   3.5
 	 */
 	public function render($name = '', $params = null, $content = null)
 	{
-		$app = JFactory::getApplication();
+		$app = \JFactory::getApplication();
 
 		// Gets and sets timezone offset from site configuration
-		$tz  = new DateTimeZone($app->get('offset'));
-		$now = JFactory::getDate();
+		$tz  = new \DateTimeZone($app->get('offset'));
+		$now = \JFactory::getDate();
 		$now->setTimeZone($tz);
 
 		$data = $this->_doc;
 
-		$url = JUri::getInstance()->toString(array('scheme', 'user', 'pass', 'host', 'port'));
-		$syndicationURL = JRoute::_('&format=feed&type=atom');
+		$url = Uri::getInstance()->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+		$syndicationURL = \JRoute::_('&format=feed&type=atom');
 
 		$title = $data->getTitle();
 
@@ -141,7 +145,7 @@ public function render($name = '', $params = null, $content = null)
 				$data->items[$i]->date = $now->toUnix();
 			}
 
-			$itemDate = JFactory::getDate($data->items[$i]->date);
+			$itemDate = \JFactory::getDate($data->items[$i]->date);
 			$itemDate->setTimeZone($tz);
 			$feed .= "		<published>" . htmlspecialchars($itemDate->toISO8601(true), ENT_COMPAT, 'UTF-8') . "</published>\n";
 			$feed .= "		<updated>" . htmlspecialchars($itemDate->toISO8601(true), ENT_COMPAT, 'UTF-8') . "</updated>\n";
diff --git a/libraries/joomla/document/renderer/feed/rss.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedRss.php
similarity index 86%
rename from libraries/joomla/document/renderer/feed/rss.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedRss.php
index c04238b0abe3e..0a774e6f7806c 100644
--- a/libraries/joomla/document/renderer/feed/rss.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedRss.php
@@ -1,23 +1,27 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document\Renderer\Feed;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Uri\Uri;
+
 /**
- * JDocumentRendererRSS is a feed that implements RSS 2.0 Specification
+ * RendererFeedRss is a feed that implements RSS 2.0 Specification
  *
  * @link   http://www.rssboard.org/rss-specification
  * @since  3.5
  *
- * @property-read  JDocumentFeed  $_doc  Reference to the JDocument object that instantiated the renderer
+ * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class JDocumentRendererFeedRss extends JDocumentRenderer
+class RendererFeedRss extends DocumentRenderer
 {
 	/**
 	 * Renderer mime type
@@ -36,32 +40,32 @@ class JDocumentRendererFeedRss extends JDocumentRenderer
 	 *
 	 * @return  string  The output of the script
 	 *
-	 * @see     JDocumentRenderer::render()
+	 * @see     DocumentRenderer::render()
 	 * @since   3.5
 	 */
 	public function render($name = '', $params = null, $content = null)
 	{
-		$app = JFactory::getApplication();
+		$app = \JFactory::getApplication();
 
 		// Gets and sets timezone offset from site configuration
-		$tz  = new DateTimeZone($app->get('offset'));
-		$now = JFactory::getDate();
+		$tz  = new \DateTimeZone($app->get('offset'));
+		$now = \JFactory::getDate();
 		$now->setTimeZone($tz);
 
 		$data = $this->_doc;
 
-		$url = JUri::getInstance()->toString(array('scheme', 'user', 'pass', 'host', 'port'));
-		$syndicationURL = JRoute::_('&format=feed&type=rss');
+		$url = Uri::getInstance()->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+		$syndicationURL = \JRoute::_('&format=feed&type=rss');
 
 		$title = $data->getTitle();
 
 		if ($app->get('sitename_pagetitles', 0) == 1)
 		{
-			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $data->getTitle());
+			$title = \JText::sprintf('JPAGETITLE', $app->get('sitename'), $data->getTitle());
 		}
 		elseif ($app->get('sitename_pagetitles', 0) == 2)
 		{
-			$title = JText::sprintf('JPAGETITLE', $data->getTitle(), $app->get('sitename'));
+			$title = \JText::sprintf('JPAGETITLE', $data->getTitle(), $app->get('sitename'));
 		}
 
 		$feed_title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
@@ -130,7 +134,7 @@ public function render($name = '', $params = null, $content = null)
 
 		if ($data->pubDate != '')
 		{
-			$pubDate = JFactory::getDate($data->pubDate);
+			$pubDate = \JFactory::getDate($data->pubDate);
 			$pubDate->setTimeZone($tz);
 			$feed .= "		<pubDate>" . htmlspecialchars($pubDate->toRFC822(true), ENT_COMPAT, 'UTF-8') . "</pubDate>\n";
 		}
@@ -240,7 +244,7 @@ public function render($name = '', $params = null, $content = null)
 
 			if ($data->items[$i]->date != '')
 			{
-				$itemDate = JFactory::getDate($data->items[$i]->date);
+				$itemDate = \JFactory::getDate($data->items[$i]->date);
 				$itemDate->setTimeZone($tz);
 				$feed .= "			<pubDate>" . htmlspecialchars($itemDate->toRFC822(true), ENT_COMPAT, 'UTF-8') . "</pubDate>\n";
 			}
diff --git a/libraries/joomla/document/renderer/html/component.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlComponent.php
similarity index 57%
rename from libraries/joomla/document/renderer/html/component.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlComponent.php
index 2c7ce3b04f67f..882fac484e48b 100644
--- a/libraries/joomla/document/renderer/html/component.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlComponent.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document\Renderer\Html;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\DocumentRenderer;
+
 /**
- * Component renderer
+ * Document Html Component Renderer
  *
  * @since  3.5
  */
-class JDocumentRendererHtmlComponent extends JDocumentRenderer
+class RendererHtmlComponent extends DocumentRenderer
 {
 	/**
 	 * Renders a component script and returns the results as a string
diff --git a/libraries/joomla/document/renderer/html/head.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlHead.php
similarity index 94%
rename from libraries/joomla/document/renderer/html/head.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlHead.php
index 3d6f747b0192a..8bfdd3584daf8 100644
--- a/libraries/joomla/document/renderer/html/head.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlHead.php
@@ -1,22 +1,26 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document\Renderer\Html;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Helper\TagsHelper;
+use Joomla\CMS\Uri\Uri;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * JDocument head renderer
+ * Document Html Head Renderer
  *
  * @since  3.5
  */
-class JDocumentRendererHtmlHead extends JDocumentRenderer
+class RendererHtmlHead extends DocumentRenderer
 {
 	/**
 	 * Renders the document head and returns the results as a string
@@ -49,17 +53,17 @@ public function fetchHead($document)
 		// Convert the tagids to titles
 		if (isset($document->_metaTags['name']['tags']))
 		{
-			$tagsHelper = new JHelperTags;
+			$tagsHelper = new TagsHelper;
 			$document->_metaTags['name']['tags'] = implode(', ', $tagsHelper->getTagNames($document->_metaTags['name']['tags']));
 		}
 
 		if ($document->getScriptOptions())
 		{
-			JHtml::_('behavior.core');
+			\JHtml::_('behavior.core');
 		}
 
 		// Trigger the onBeforeCompileHead event
-		$app = JFactory::getApplication();
+		$app = \JFactory::getApplication();
 		$app->triggerEvent('onBeforeCompileHead');
 
 		// Get line endings
diff --git a/libraries/joomla/document/renderer/html/message.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlMessage.php
similarity index 64%
rename from libraries/joomla/document/renderer/html/message.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlMessage.php
index c6ea87b96cb6f..27c67f42c00ce 100644
--- a/libraries/joomla/document/renderer/html/message.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlMessage.php
@@ -1,20 +1,25 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document\Renderer\Html;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Layout\LayoutHelper;
+
 /**
- * JDocument system message renderer
+ * Document Html Message Renderer
  *
  * @since  3.5
  */
-class JDocumentRendererHtmlMessage extends JDocumentRenderer
+class RendererHtmlMessage extends DocumentRenderer
 {
 	/**
 	 * Renders the error stack and returns the results as a string
@@ -37,7 +42,7 @@ public function render($name, $params = array(), $content = null)
 			'content' => $content,
 		);
 
-		$app        = JFactory::getApplication();
+		$app        = \JFactory::getApplication();
 		$chromePath = JPATH_THEMES . '/' . $app->getTemplate() . '/html/message.php';
 
 		if (file_exists($chromePath))
@@ -47,12 +52,12 @@ public function render($name, $params = array(), $content = null)
 
 		if (function_exists('renderMessage'))
 		{
-			JLog::add('renderMessage() is deprecated. Override system message rendering with layouts instead.', JLog::WARNING, 'deprecated');
+			Log::add('renderMessage() is deprecated. Override system message rendering with layouts instead.', Log::WARNING, 'deprecated');
 
 			return renderMessage($msgList);
 		}
 
-		return JLayoutHelper::render('joomla.system.message', $displayData);
+		return LayoutHelper::render('joomla.system.message', $displayData);
 	}
 
 	/**
@@ -68,7 +73,7 @@ private function getData()
 		$lists = array();
 
 		// Get the message queue
-		$messages = JFactory::getApplication()->getMessageQueue();
+		$messages = \JFactory::getApplication()->getMessageQueue();
 
 		// Build the sorted message list
 		if (is_array($messages) && !empty($messages))
diff --git a/libraries/joomla/document/renderer/html/module.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModule.php
similarity index 71%
rename from libraries/joomla/document/renderer/html/module.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModule.php
index fc873510337f2..cc4cab4a8f009 100644
--- a/libraries/joomla/document/renderer/html/module.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModule.php
@@ -1,22 +1,27 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document\Renderer\Html;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\Registry\Registry;
 
 /**
- * JDocument Module renderer
+ * Document Html Module Renderer
  *
  * @since  3.5
  */
-class JDocumentRendererHtmlModule extends JDocumentRenderer
+class RendererHtmlModule extends DocumentRenderer
 {
 	/**
 	 * Renders a module script and returns the results as a string
@@ -35,7 +40,7 @@ public function render($module, $attribs = array(), $content = null)
 		{
 			$title = isset($attribs['title']) ? $attribs['title'] : null;
 
-			$module = JModuleHelper::getModule($module, $title);
+			$module = ModuleHelper::getModule($module, $title);
 
 			if (!is_object($module))
 			{
@@ -78,7 +83,7 @@ public function render($module, $attribs = array(), $content = null)
 		// Default for compatibility purposes. Set cachemode parameter or use JModuleHelper::moduleCache from within the module instead
 		$cachemode = $params->get('cachemode', 'oldstatic');
 
-		if ($params->get('cache', 0) == 1 && JFactory::getConfig()->get('caching') >= 1 && $cachemode != 'id' && $cachemode != 'safeuri')
+		if ($params->get('cache', 0) == 1 && \JFactory::getConfig()->get('caching') >= 1 && $cachemode != 'id' && $cachemode != 'safeuri')
 		{
 			// Default to itemid creating method and workarounds on
 			$cacheparams = new stdClass;
@@ -87,9 +92,9 @@ public function render($module, $attribs = array(), $content = null)
 			$cacheparams->method = 'renderModule';
 			$cacheparams->methodparams = array($module, $attribs);
 
-			return JModuleHelper::ModuleCache($module, $params, $cacheparams);
+			return ModuleHelper::ModuleCache($module, $params, $cacheparams);
 		}
 
-		return JModuleHelper::renderModule($module, $attribs);
+		return ModuleHelper::renderModule($module, $attribs);
 	}
 }
diff --git a/libraries/joomla/document/renderer/html/modules.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModules.php
similarity index 60%
rename from libraries/joomla/document/renderer/html/modules.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModules.php
index 53c9e83560915..f3a8a40626fe6 100644
--- a/libraries/joomla/document/renderer/html/modules.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModules.php
@@ -1,20 +1,25 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Document
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Document\Renderer\Html;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Layout\LayoutHelper;
+
 /**
- * JDocument Modules renderer
+ * Document Html Modules Renderer
  *
  * @since  3.5
  */
-class JDocumentRendererHtmlModules extends JDocumentRenderer
+class RendererHtmlModules extends DocumentRenderer
 {
 	/**
 	 * Renders multiple modules script and returns the results as a string
@@ -32,25 +37,25 @@ public function render($position, $params = array(), $content = null)
 		$renderer = $this->_doc->loadRenderer('module');
 		$buffer   = '';
 
-		$app          = JFactory::getApplication();
-		$user         = JFactory::getUser();
+		$app          = \JFactory::getApplication();
+		$user         = \JFactory::getUser();
 		$frontediting = ($app->isClient('site') && $app->get('frontediting', 1) && !$user->guest);
 		$menusEditing = ($app->get('frontediting', 1) == 2) && $user->authorise('core.edit', 'com_menus');
 
-		foreach (JModuleHelper::getModules($position) as $mod)
+		foreach (ModuleHelper::getModules($position) as $mod)
 		{
 			$moduleHtml = $renderer->render($mod, $params, $content);
 
 			if ($frontediting && trim($moduleHtml) != '' && $user->authorise('module.edit.frontend', 'com_modules.module.' . $mod->id))
 			{
 				$displayData = array('moduleHtml' => &$moduleHtml, 'module' => $mod, 'position' => $position, 'menusediting' => $menusEditing);
-				JLayoutHelper::render('joomla.edit.frontediting_modules', $displayData);
+				LayoutHelper::render('joomla.edit.frontediting_modules', $displayData);
 			}
 
 			$buffer .= $moduleHtml;
 		}
 
-		JEventDispatcher::getInstance()->trigger('onAfterRenderModules', array(&$buffer, &$params));
+		\JEventDispatcher::getInstance()->trigger('onAfterRenderModules', array(&$buffer, &$params));
 
 		return $buffer;
 	}

From c30156b145fa7c05203c9f5dae7d2016b56367b8 Mon Sep 17 00:00:00 2001
From: Matias Aguirre <maguirre@matware.com.ar>
Date: Tue, 30 May 2017 11:18:34 -0300
Subject: [PATCH 011/148] Fix class load

---
 libraries/classmap.php                        | 27 +++++++++++++++++++
 .../src/Joomla/CMS/Document/Document.php      | 16 ++++++++---
 .../src/Joomla/CMS/Document/DocumentHtml.php  |  2 +-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 61bb4c169a481..c18ebe6ff5c16 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -170,6 +170,33 @@
 JLoader::registerAlias('JAssociationExtensionInterface',    '\\Joomla\\CMS\\Association\\AssociationExtensionInterface', '5.0');
 JLoader::registerAlias('JAssociationExtensionHelper',       '\\Joomla\\CMS\\Association\\AssociationExtensionHelper', '5.0');
 
+JLoader::registerAlias('JDocument',                         '\\Joomla\\CMS\\Document\\Document', '5.0');
+JLoader::registerAlias('JDocumentError',                    '\\Joomla\\CMS\\Document\\DocumentError', '5.0');
+JLoader::registerAlias('JDocumentFeed',                     '\\Joomla\\CMS\\Document\\DocumentFeed', '5.0');
+JLoader::registerAlias('JDocumentHtml',                     '\\Joomla\\CMS\\Document\\DocumentHtml', '5.0');
+JLoader::registerAlias('JDocumentImage',                    '\\Joomla\\CMS\\Document\\DocumentImage', '5.0');
+JLoader::registerAlias('JDocumentJson',                     '\\Joomla\\CMS\\Document\\DocumentJson', '5.0');
+JLoader::registerAlias('JDocumentOpensearch',               '\\Joomla\\CMS\\Document\\DocumentOpensearch', '5.0');
+JLoader::registerAlias('JDocumentRaw',                      '\\Joomla\\CMS\\Document\\DocumentRaw', '5.0');
+JLoader::registerAlias('JDocumentRenderer',                 '\\Joomla\\CMS\\Document\\DocumentRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererFeedAtom',         '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedAtom', '5.0');
+JLoader::registerAlias('JDocumentRendererFeedRss',          '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedRss', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlComponent',    '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlComponent', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlHead',         '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlHead', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlMessage',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlMessage', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlModule',       '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlModules',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '5.0');
+JLoader::registerAlias('JDocumentXml',                      '\\Joomla\\CMS\\Document\\DocumentXml', '5.0');
+
+// Deprecated Joomla! 4.0
+JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedAtom', '5.0');
+JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedRss', '5.0');
+JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlComponent', '5.0');
+JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlHead', '5.0');
+JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlMessage', '5.0');
+JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '5.0');
+JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '5.0');
+
 JLoader::registerAlias('JInstaller',                        '\\Joomla\\CMS\\Installer\\Installer', '5.0');
 JLoader::registerAlias('JInstallerAdapter',                 '\\Joomla\\CMS\\Installer\\InstallerAdapter', '5.0');
 JLoader::registerAlias('JInstallerExtension',               '\\Joomla\\CMS\\Installer\\InstallerExtension', '5.0');
diff --git a/libraries/src/Joomla/CMS/Document/Document.php b/libraries/src/Joomla/CMS/Document/Document.php
index 16dbd6f472af9..8aa6c32a634d6 100644
--- a/libraries/src/Joomla/CMS/Document/Document.php
+++ b/libraries/src/Joomla/CMS/Document/Document.php
@@ -286,7 +286,12 @@ public static function getInstance($type = 'html', $attributes = array())
 			$ntype = null;
 
 			// Determine the path and class
-			$class = 'Document' . ucfirst($type);
+			$class = __NAMESPACE__ . '\\Document' . ucfirst($type);
+
+			if (!class_exists($class))
+			{
+				$class = 'JDocument' . ucfirst($type);
+			}
 
 			if (!class_exists($class))
 			{
@@ -1173,8 +1178,13 @@ public function _getTab()
 	 */
 	public function loadRenderer($type)
 	{
-		// New class name format adds the format type to the class name
-		$class = 'DocumentRenderer' . ucfirst($this->getType()) . ucfirst($type);
+		// Determine the path and class
+		$class = __NAMESPACE__ . '\\Renderer\\' . ucfirst($this->getType()) . '\\Renderer' . ucfirst($this->getType()) . ucfirst($type);
+
+		if (!class_exists($class))
+		{
+			$class = 'JDocumentRenderer' . ucfirst($this->getType()) . ucfirst($type);
+		}
 
 		if (!class_exists($class))
 		{
diff --git a/libraries/src/Joomla/CMS/Document/DocumentHtml.php b/libraries/src/Joomla/CMS/Document/DocumentHtml.php
index 810af2ba79a71..1f2bd44f60db3 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentHtml.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentHtml.php
@@ -670,7 +670,7 @@ protected function _loadTemplate($directory, $filename)
 			{
 				$path = str_replace(JPATH_BASE, '', $dir);
 				$path = str_replace('\\', '/', $path);
-				$this->addFavicon(JUri::base(true) . $path . $icon);
+				$this->addFavicon(Uri::base(true) . $path . $icon);
 				break;
 			}
 		}

From d845eb76a47a922a6a31c8b8b10b4417fc48dbcd Mon Sep 17 00:00:00 2001
From: Matias Aguirre <maguirre@matware.com.ar>
Date: Tue, 30 May 2017 11:24:49 -0300
Subject: [PATCH 012/148] Merge with upstream

---
 libraries/classmap.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index c18ebe6ff5c16..118336b3c7b96 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -197,6 +197,10 @@
 JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '5.0');
 JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '5.0');
 
+JLoader::registerAlias('JFilterInput',                      '\\Joomla\\CMS\\Filter\\InputFilter', '5.0');
+JLoader::registerAlias('JFilterOutput',                     '\\Joomla\\CMS\\Filter\\OutputFilter', '5.0');
+JLoader::registerAlias('JFilterWrapperOutput',              '\\Joomla\\CMS\\Filter\\Wrapper\\OutputFilterWrapper', '5.0');
+
 JLoader::registerAlias('JInstaller',                        '\\Joomla\\CMS\\Installer\\Installer', '5.0');
 JLoader::registerAlias('JInstallerAdapter',                 '\\Joomla\\CMS\\Installer\\InstallerAdapter', '5.0');
 JLoader::registerAlias('JInstallerExtension',               '\\Joomla\\CMS\\Installer\\InstallerExtension', '5.0');

From 6a22f8744f50d732cb3d2a3b1864be049be017a9 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Wed, 31 May 2017 10:01:58 +0100
Subject: [PATCH 013/148] Fix Joomla 4 deprecated classes

---
 libraries/classmap.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 118336b3c7b96..bab95c598bb5e 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -187,15 +187,13 @@
 JLoader::registerAlias('JDocumentRendererHtmlModule',       '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '5.0');
 JLoader::registerAlias('JDocumentRendererHtmlModules',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '5.0');
 JLoader::registerAlias('JDocumentXml',                      '\\Joomla\\CMS\\Document\\DocumentXml', '5.0');
-
-// Deprecated Joomla! 4.0
-JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedAtom', '5.0');
-JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedRss', '5.0');
-JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlComponent', '5.0');
-JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlHead', '5.0');
-JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlMessage', '5.0');
-JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '5.0');
-JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '5.0');
+JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedAtom', '4.0');
+JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedRss', '4.0');
+JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlComponent', '4.0');
+JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlHead', '4.0');
+JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlMessage', '4.0');
+JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '4.0');
+JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '4.0');
 
 JLoader::registerAlias('JFilterInput',                      '\\Joomla\\CMS\\Filter\\InputFilter', '5.0');
 JLoader::registerAlias('JFilterOutput',                     '\\Joomla\\CMS\\Filter\\OutputFilter', '5.0');

From 720134a72fc5c5f51a18ab57f222321a0b811067 Mon Sep 17 00:00:00 2001
From: Matias Aguirre <maguirre@matware.com.ar>
Date: Wed, 31 May 2017 07:50:37 -0300
Subject: [PATCH 014/148] Change of renderers names

---
 libraries/classmap.php                        | 28 +++++++++----------
 ...{RendererFeedAtom.php => AtomRenderer.php} |  4 +--
 .../{RendererFeedRss.php => RssRenderer.php}  |  4 +--
 ...tmlComponent.php => ComponentRenderer.php} |  2 +-
 ...{RendererHtmlHead.php => HeadRenderer.php} |  2 +-
 ...rerHtmlMessage.php => MessageRenderer.php} |  2 +-
 ...dererHtmlModule.php => ModuleRenderer.php} |  2 +-
 ...rerHtmlModules.php => ModulesRenderer.php} |  2 +-
 8 files changed, 23 insertions(+), 23 deletions(-)
 rename libraries/src/Joomla/CMS/Document/Renderer/Feed/{RendererFeedAtom.php => AtomRenderer.php} (98%)
 rename libraries/src/Joomla/CMS/Document/Renderer/Feed/{RendererFeedRss.php => RssRenderer.php} (98%)
 rename libraries/src/Joomla/CMS/Document/Renderer/Html/{RendererHtmlComponent.php => ComponentRenderer.php} (94%)
 rename libraries/src/Joomla/CMS/Document/Renderer/Html/{RendererHtmlHead.php => HeadRenderer.php} (99%)
 rename libraries/src/Joomla/CMS/Document/Renderer/Html/{RendererHtmlMessage.php => MessageRenderer.php} (97%)
 rename libraries/src/Joomla/CMS/Document/Renderer/Html/{RendererHtmlModule.php => ModuleRenderer.php} (98%)
 rename libraries/src/Joomla/CMS/Document/Renderer/Html/{RendererHtmlModules.php => ModulesRenderer.php} (97%)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 310eba353acb3..6d54a0074b435 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -184,21 +184,21 @@
 JLoader::registerAlias('JDocumentOpensearch',               '\\Joomla\\CMS\\Document\\DocumentOpensearch', '5.0');
 JLoader::registerAlias('JDocumentRaw',                      '\\Joomla\\CMS\\Document\\DocumentRaw', '5.0');
 JLoader::registerAlias('JDocumentRenderer',                 '\\Joomla\\CMS\\Document\\DocumentRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererFeedAtom',         '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedAtom', '5.0');
-JLoader::registerAlias('JDocumentRendererFeedRss',          '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedRss', '5.0');
-JLoader::registerAlias('JDocumentRendererHtmlComponent',    '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlComponent', '5.0');
-JLoader::registerAlias('JDocumentRendererHtmlHead',         '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlHead', '5.0');
-JLoader::registerAlias('JDocumentRendererHtmlMessage',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlMessage', '5.0');
-JLoader::registerAlias('JDocumentRendererHtmlModule',       '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '5.0');
-JLoader::registerAlias('JDocumentRendererHtmlModules',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '5.0');
+JLoader::registerAlias('JDocumentRendererFeedAtom',         '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererFeedRss',          '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlComponent',    '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlHead',         '\\Joomla\\CMS\\Document\\Renderer\\Html\\HeadRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlMessage',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlModule',       '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlModules',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '5.0');
 JLoader::registerAlias('JDocumentXml',                      '\\Joomla\\CMS\\Document\\DocumentXml', '5.0');
-JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedAtom', '4.0');
-JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RendererFeedRss', '4.0');
-JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlComponent', '4.0');
-JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlHead', '4.0');
-JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlMessage', '4.0');
-JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModule', '4.0');
-JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\RendererHtmlModules', '4.0');
+JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\HeadRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '5.0');
 
 JLoader::registerAlias('JFilterInput',                      '\\Joomla\\CMS\\Filter\\InputFilter', '5.0');
 JLoader::registerAlias('JFilterOutput',                     '\\Joomla\\CMS\\Filter\\OutputFilter', '5.0');
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedAtom.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
similarity index 98%
rename from libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedAtom.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
index 00f8b6976b0bd..d94eb401c8caf 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedAtom.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Uri\Uri;
 
 /**
- * RendererFeedAtom is a feed that implements the atom specification
+ * AtomRenderer is a feed that implements the atom specification
  *
  * Please note that just by using this class you won't automatically
  * produce valid atom files. For example, you have to specify either an editor
@@ -25,7 +25,7 @@
  *
  * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class RendererFeedAtom extends DocumentRenderer
+class AtomRenderer extends DocumentRenderer
 {
 	/**
 	 * Document mime type
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedRss.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
similarity index 98%
rename from libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedRss.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
index 0a774e6f7806c..513af91778799 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RendererFeedRss.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
@@ -14,14 +14,14 @@
 use Joomla\CMS\Uri\Uri;
 
 /**
- * RendererFeedRss is a feed that implements RSS 2.0 Specification
+ * RssRenderer is a feed that implements RSS 2.0 Specification
  *
  * @link   http://www.rssboard.org/rss-specification
  * @since  3.5
  *
  * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class RendererFeedRss extends DocumentRenderer
+class RssRenderer extends DocumentRenderer
 {
 	/**
 	 * Renderer mime type
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlComponent.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
similarity index 94%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlComponent.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
index 882fac484e48b..7a32914b268a3 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlComponent.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
@@ -17,7 +17,7 @@
  *
  * @since  3.5
  */
-class RendererHtmlComponent extends DocumentRenderer
+class ComponentRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders a component script and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlHead.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
similarity index 99%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlHead.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
index 8bfdd3584daf8..d91ed5dfc5979 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlHead.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
@@ -20,7 +20,7 @@
  *
  * @since  3.5
  */
-class RendererHtmlHead extends DocumentRenderer
+class HeadRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders the document head and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlMessage.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
similarity index 97%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlMessage.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
index 27c67f42c00ce..1a6ee5dc61c3d 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlMessage.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
@@ -19,7 +19,7 @@
  *
  * @since  3.5
  */
-class RendererHtmlMessage extends DocumentRenderer
+class MessageRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders the error stack and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModule.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
similarity index 98%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModule.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
index cc4cab4a8f009..153a541632913 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModule.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
@@ -21,7 +21,7 @@
  *
  * @since  3.5
  */
-class RendererHtmlModule extends DocumentRenderer
+class ModuleRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders a module script and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModules.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
similarity index 97%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModules.php
rename to libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
index f3a8a40626fe6..7356e9ce4ff24 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/RendererHtmlModules.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
@@ -19,7 +19,7 @@
  *
  * @since  3.5
  */
-class RendererHtmlModules extends DocumentRenderer
+class ModulesRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders multiple modules script and returns the results as a string

From ba54a4986766a191edace8fa50608b712c891593 Mon Sep 17 00:00:00 2001
From: Matias Aguirre <maguirre@matware.com.ar>
Date: Wed, 31 May 2017 15:00:29 -0300
Subject: [PATCH 015/148] Change document name formats

---
 libraries/classmap.php                        | 18 ++++++-------
 .../src/Joomla/CMS/Document/Document.php      |  2 +-
 .../{DocumentError.php => ErrorDocument.php}  |  4 +--
 .../{DocumentFeed.php => FeedDocument.php}    |  6 ++---
 .../{DocumentHtml.php => HtmlDocument.php}    | 26 +++++++++----------
 .../{DocumentImage.php => ImageDocument.php}  |  4 +--
 .../{DocumentJson.php => JsonDocument.php}    |  6 ++---
 ...tOpensearch.php => OpensearchDocument.php} |  8 +++---
 .../{DocumentRaw.php => RawDocument.php}      |  4 +--
 .../Document/Renderer/Feed/AtomRenderer.php   |  6 ++---
 .../Document/Renderer/Feed/RssRenderer.php    |  6 ++---
 .../Renderer/Html/ComponentRenderer.php       |  4 +--
 .../Document/Renderer/Html/HeadRenderer.php   |  4 +--
 .../Renderer/Html/MessageRenderer.php         |  4 +--
 .../Document/Renderer/Html/ModuleRenderer.php |  4 +--
 .../Renderer/Html/ModulesRenderer.php         |  4 +--
 ...umentRenderer.php => RendererDocument.php} |  2 +-
 .../{DocumentXml.php => XmlDocument.php}      |  6 ++---
 18 files changed, 59 insertions(+), 59 deletions(-)
 rename libraries/src/Joomla/CMS/Document/{DocumentError.php => ErrorDocument.php} (97%)
 rename libraries/src/Joomla/CMS/Document/{DocumentFeed.php => FeedDocument.php} (97%)
 rename libraries/src/Joomla/CMS/Document/{DocumentHtml.php => HtmlDocument.php} (95%)
 rename libraries/src/Joomla/CMS/Document/{DocumentImage.php => ImageDocument.php} (93%)
 rename libraries/src/Joomla/CMS/Document/{DocumentJson.php => JsonDocument.php} (92%)
 rename libraries/src/Joomla/CMS/Document/{DocumentOpensearch.php => OpensearchDocument.php} (96%)
 rename libraries/src/Joomla/CMS/Document/{DocumentRaw.php => RawDocument.php} (91%)
 rename libraries/src/Joomla/CMS/Document/{DocumentRenderer.php => RendererDocument.php} (98%)
 rename libraries/src/Joomla/CMS/Document/{DocumentXml.php => XmlDocument.php} (90%)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 6d54a0074b435..2a52d2b1c4cdf 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -176,14 +176,15 @@
 JLoader::registerAlias('JAssociationExtensionHelper',       '\\Joomla\\CMS\\Association\\AssociationExtensionHelper', '5.0');
 
 JLoader::registerAlias('JDocument',                         '\\Joomla\\CMS\\Document\\Document', '5.0');
-JLoader::registerAlias('JDocumentError',                    '\\Joomla\\CMS\\Document\\DocumentError', '5.0');
-JLoader::registerAlias('JDocumentFeed',                     '\\Joomla\\CMS\\Document\\DocumentFeed', '5.0');
-JLoader::registerAlias('JDocumentHtml',                     '\\Joomla\\CMS\\Document\\DocumentHtml', '5.0');
-JLoader::registerAlias('JDocumentImage',                    '\\Joomla\\CMS\\Document\\DocumentImage', '5.0');
-JLoader::registerAlias('JDocumentJson',                     '\\Joomla\\CMS\\Document\\DocumentJson', '5.0');
-JLoader::registerAlias('JDocumentOpensearch',               '\\Joomla\\CMS\\Document\\DocumentOpensearch', '5.0');
-JLoader::registerAlias('JDocumentRaw',                      '\\Joomla\\CMS\\Document\\DocumentRaw', '5.0');
-JLoader::registerAlias('JDocumentRenderer',                 '\\Joomla\\CMS\\Document\\DocumentRenderer', '5.0');
+JLoader::registerAlias('JDocumentError',                    '\\Joomla\\CMS\\Document\\ErrorDocument', '5.0');
+JLoader::registerAlias('JDocumentFeed',                     '\\Joomla\\CMS\\Document\\FeedDocument', '5.0');
+JLoader::registerAlias('JDocumentHtml',                     '\\Joomla\\CMS\\Document\\HtmlDocument', '5.0');
+JLoader::registerAlias('JDocumentImage',                    '\\Joomla\\CMS\\Document\\ImageDocument', '5.0');
+JLoader::registerAlias('JDocumentJson',                     '\\Joomla\\CMS\\Document\\JsonDocument', '5.0');
+JLoader::registerAlias('JDocumentOpensearch',               '\\Joomla\\CMS\\Document\\OpensearchDocument', '5.0');
+JLoader::registerAlias('JDocumentRaw',                      '\\Joomla\\CMS\\Document\\RawDocument', '5.0');
+JLoader::registerAlias('JDocumentRenderer',                 '\\Joomla\\CMS\\Document\\RendererDocument', '5.0');
+JLoader::registerAlias('JDocumentXml',                      '\\Joomla\\CMS\\Document\\XmlDocument', '5.0');
 JLoader::registerAlias('JDocumentRendererFeedAtom',         '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererFeedRss',          '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererHtmlComponent',    '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '5.0');
@@ -191,7 +192,6 @@
 JLoader::registerAlias('JDocumentRendererHtmlMessage',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererHtmlModule',       '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererHtmlModules',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '5.0');
-JLoader::registerAlias('JDocumentXml',                      '\\Joomla\\CMS\\Document\\DocumentXml', '5.0');
 JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '5.0');
diff --git a/libraries/src/Joomla/CMS/Document/Document.php b/libraries/src/Joomla/CMS/Document/Document.php
index 8aa6c32a634d6..de51cb9be78b5 100644
--- a/libraries/src/Joomla/CMS/Document/Document.php
+++ b/libraries/src/Joomla/CMS/Document/Document.php
@@ -286,7 +286,7 @@ public static function getInstance($type = 'html', $attributes = array())
 			$ntype = null;
 
 			// Determine the path and class
-			$class = __NAMESPACE__ . '\\Document' . ucfirst($type);
+			$class = __NAMESPACE__ . '\\' . ucfirst($type) . 'Document';
 
 			if (!class_exists($class))
 			{
diff --git a/libraries/src/Joomla/CMS/Document/DocumentError.php b/libraries/src/Joomla/CMS/Document/ErrorDocument.php
similarity index 97%
rename from libraries/src/Joomla/CMS/Document/DocumentError.php
rename to libraries/src/Joomla/CMS/Document/ErrorDocument.php
index 2949e2dfa13d0..081b332f54663 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentError.php
+++ b/libraries/src/Joomla/CMS/Document/ErrorDocument.php
@@ -15,11 +15,11 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 /**
- * DocumentError class, provides an easy interface to parse and display an error page
+ * ErrorDocument class, provides an easy interface to parse and display an error page
  *
  * @since  11.1
  */
-class DocumentError extends Document
+class ErrorDocument extends Document
 {
 	/**
 	 * Document base URL
diff --git a/libraries/src/Joomla/CMS/Document/DocumentFeed.php b/libraries/src/Joomla/CMS/Document/FeedDocument.php
similarity index 97%
rename from libraries/src/Joomla/CMS/Document/DocumentFeed.php
rename to libraries/src/Joomla/CMS/Document/FeedDocument.php
index 897f912dd3156..c62029c37d201 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentFeed.php
+++ b/libraries/src/Joomla/CMS/Document/FeedDocument.php
@@ -14,11 +14,11 @@
 use Joomla\CMS\Document\DocumentRenderer;
 
 /**
- * DocumentFeed class, provides an easy interface to parse and display any feed document
+ * FeedDocument class, provides an easy interface to parse and display any feed document
  *
  * @since  11.1
  */
-class DocumentFeed extends Document
+class FeedDocument extends Document
 {
 	/**
 	 * Syndication URL feed element
@@ -232,7 +232,7 @@ public function render($cache = false, $params = array())
 	 *
 	 * @param   FeedItem  $item  The feeditem to add to the feed.
 	 *
-	 * @return  DocumentFeed  instance of $this to allow chaining
+	 * @return  FeedDocument  instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/src/Joomla/CMS/Document/DocumentHtml.php b/libraries/src/Joomla/CMS/Document/HtmlDocument.php
similarity index 95%
rename from libraries/src/Joomla/CMS/Document/DocumentHtml.php
rename to libraries/src/Joomla/CMS/Document/HtmlDocument.php
index 1f2bd44f60db3..6657a13aa7343 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentHtml.php
+++ b/libraries/src/Joomla/CMS/Document/HtmlDocument.php
@@ -20,11 +20,11 @@
 jimport('joomla.utilities.utility');
 
 /**
- * DocumentHtml class, provides an easy interface to parse and display a HTML document
+ * HtmlDocument class, provides an easy interface to parse and display a HTML document
  *
  * @since  11.1
  */
-class DocumentHtml extends Document
+class HtmlDocument extends Document
 {
 	/**
 	 * Array of Header `<link>` tags
@@ -156,7 +156,7 @@ public function getHeadData()
 	 *
 	 * @param   mixed  $types  type or types of the heads elements to reset
 	 *
-	 * @return  DocumentHtml  instance of $this to allow chaining
+	 * @return  HtmlDocument  instance of $this to allow chaining
 	 *
 	 * @since   3.7.0
 	 */
@@ -229,7 +229,7 @@ private function resetHeadDatum($type)
 	 *
 	 * @param   array  $data  The document head data in array form
 	 *
-	 * @return  DocumentHtml|null instance of $this to allow chaining or null for empty input data
+	 * @return  HtmlDocument|null instance of $this to allow chaining or null for empty input data
 	 *
 	 * @since   11.1
 	 */
@@ -267,7 +267,7 @@ public function setHeadData($data)
 	 *
 	 * @param   array  $data  The document head data in array form
 	 *
-	 * @return  DocumentHtml|null instance of $this to allow chaining or null for empty input data
+	 * @return  HtmlDocument|null instance of $this to allow chaining or null for empty input data
 	 *
 	 * @since   11.1
 	 */
@@ -351,7 +351,7 @@ public function mergeHeadData($data)
 	 * @param   string  $relType   Relation type attribute.  Either rel or rev (default: 'rel').
 	 * @param   array   $attribs   Associative array of remaining attributes.
 	 *
-	 * @return  DocumentHtml instance of $this to allow chaining
+	 * @return  HtmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -375,7 +375,7 @@ public function addHeadLink($href, $relation, $relType = 'rel', $attribs = array
 	 * @param   string  $type      File type
 	 * @param   string  $relation  Relation of link
 	 *
-	 * @return  DocumentHtml instance of $this to allow chaining
+	 * @return  HtmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -392,7 +392,7 @@ public function addFavicon($href, $type = 'image/vnd.microsoft.icon', $relation
 	 *
 	 * @param   string  $html  The HTML to add to the head
 	 *
-	 * @return  DocumentHtml instance of $this to allow chaining
+	 * @return  HtmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -501,7 +501,7 @@ public function getBuffer($type = null, $name = null, $attribs = array())
 	 * @param   string  $content  The content to be set in the buffer.
 	 * @param   array   $options  Array of optional elements.
 	 *
-	 * @return  DocumentHtml instance of $this to allow chaining
+	 * @return  HtmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -527,7 +527,7 @@ public function setBuffer($content, $options = array())
 	 *
 	 * @param   array  $params  Parameters for fetching the template
 	 *
-	 * @return  DocumentHtml instance of $this to allow chaining
+	 * @return  HtmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -584,7 +584,7 @@ public function countModules($condition)
 			return $result;
 		}
 
-		Log::add('Using an expression in DocumentHtml::countModules() is deprecated.', Log::WARNING, 'deprecated');
+		Log::add('Using an expression in HtmlDocument::countModules() is deprecated.', Log::WARNING, 'deprecated');
 
 		for ($i = 0, $n = count($words); $i < $n; $i += 2)
 		{
@@ -683,7 +683,7 @@ protected function _loadTemplate($directory, $filename)
 	 *
 	 * @param   array  $params  Parameters to determine the template
 	 *
-	 * @return  DocumentHtml instance of $this to allow chaining
+	 * @return  HtmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -726,7 +726,7 @@ protected function _fetchTemplate($params = array())
 	/**
 	 * Parse a document template
 	 *
-	 * @return  DocumentHtml  instance of $this to allow chaining
+	 * @return  HtmlDocument  instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/src/Joomla/CMS/Document/DocumentImage.php b/libraries/src/Joomla/CMS/Document/ImageDocument.php
similarity index 93%
rename from libraries/src/Joomla/CMS/Document/DocumentImage.php
rename to libraries/src/Joomla/CMS/Document/ImageDocument.php
index aa3121083de3c..1c32e629160e2 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentImage.php
+++ b/libraries/src/Joomla/CMS/Document/ImageDocument.php
@@ -13,11 +13,11 @@
 use Joomla\CMS\Document\Document;
 
 /**
- * DocumentImage class, provides an easy interface to output image data
+ * ImageDocument class, provides an easy interface to output image data
  *
  * @since  12.1
  */
-class DocumentImage extends Document
+class ImageDocument extends Document
 {
 	/**
 	 * Class constructor
diff --git a/libraries/src/Joomla/CMS/Document/DocumentJson.php b/libraries/src/Joomla/CMS/Document/JsonDocument.php
similarity index 92%
rename from libraries/src/Joomla/CMS/Document/DocumentJson.php
rename to libraries/src/Joomla/CMS/Document/JsonDocument.php
index 629c9235e6c7b..f40c5a00a0e89 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentJson.php
+++ b/libraries/src/Joomla/CMS/Document/JsonDocument.php
@@ -13,12 +13,12 @@
 use Joomla\CMS\Document\Document;
 
 /**
- * DocumentJson class, provides an easy interface to parse and display JSON output
+ * JsonDocument class, provides an easy interface to parse and display JSON output
  *
  * @link   http://www.json.org/
  * @since  11.1
  */
-class DocumentJson extends Document
+class JsonDocument extends Document
 {
 	/**
 	 * Document name
@@ -100,7 +100,7 @@ public function getName()
 	 *
 	 * @param   string  $name  Document name
 	 *
-	 * @return  DocumentJson instance of $this to allow chaining
+	 * @return  JsonDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/src/Joomla/CMS/Document/DocumentOpensearch.php b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
similarity index 96%
rename from libraries/src/Joomla/CMS/Document/DocumentOpensearch.php
rename to libraries/src/Joomla/CMS/Document/OpensearchDocument.php
index d3a7bfa7e6a78..8193008957db1 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentOpensearch.php
+++ b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
@@ -19,7 +19,7 @@
  * @link   http://www.opensearch.org/
  * @since  11.1
  */
-class DocumentOpensearch extends Document
+class OpensearchDocument extends Document
 {
 	/**
 	 * ShortName element
@@ -185,7 +185,7 @@ public function render($cache = false, $params = array())
 	 *
 	 * @param   string  $name  The name.
 	 *
-	 * @return  JDocumentOpensearch instance of $this to allow chaining
+	 * @return  OpensearchDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -201,7 +201,7 @@ public function setShortName($name)
 	 *
 	 * @param   OpenSearchUrl  $url  The url to add to the description.
 	 *
-	 * @return  JDocumentOpensearch instance of $this to allow chaining
+	 * @return  OpensearchDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
@@ -217,7 +217,7 @@ public function addUrl(OpenSearchUrl $url)
 	 *
 	 * @param   OpenSearchImage  $image  The image to add to the description.
 	 *
-	 * @return  JDocumentOpensearch instance of $this to allow chaining
+	 * @return  OpensearchDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/src/Joomla/CMS/Document/DocumentRaw.php b/libraries/src/Joomla/CMS/Document/RawDocument.php
similarity index 91%
rename from libraries/src/Joomla/CMS/Document/DocumentRaw.php
rename to libraries/src/Joomla/CMS/Document/RawDocument.php
index e6a52d21c11a1..fadde6929e47b 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentRaw.php
+++ b/libraries/src/Joomla/CMS/Document/RawDocument.php
@@ -13,11 +13,11 @@
 use Joomla\CMS\Document\Document;
 
 /**
- * DocumentRaw class, provides an easy interface to parse and display raw output
+ * RawDocument class, provides an easy interface to parse and display raw output
  *
  * @since  11.1
  */
-class DocumentRaw extends Document
+class RawDocument extends Document
 {
 	/**
 	 * Class constructor
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
index d94eb401c8caf..5af21b2ba7e4a 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\RendererDocument;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -25,7 +25,7 @@
  *
  * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class AtomRenderer extends DocumentRenderer
+class AtomRenderer extends RendererDocument
 {
 	/**
 	 * Document mime type
@@ -44,7 +44,7 @@ class AtomRenderer extends DocumentRenderer
 	 *
 	 * @return  string  The output of the script
 	 *
-	 * @see     DocumentRenderer::render()
+	 * @see     RendererDocument::render()
 	 * @since   3.5
 	 */
 	public function render($name = '', $params = null, $content = null)
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
index 513af91778799..e2d31d6a581ec 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\RendererDocument;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -21,7 +21,7 @@
  *
  * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class RssRenderer extends DocumentRenderer
+class RssRenderer extends RendererDocument
 {
 	/**
 	 * Renderer mime type
@@ -40,7 +40,7 @@ class RssRenderer extends DocumentRenderer
 	 *
 	 * @return  string  The output of the script
 	 *
-	 * @see     DocumentRenderer::render()
+	 * @see     RendererDocument::render()
 	 * @since   3.5
 	 */
 	public function render($name = '', $params = null, $content = null)
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
index 7a32914b268a3..41ce0acaaefe5 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
@@ -10,14 +10,14 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\RendererDocument;
 
 /**
  * Document Html Component Renderer
  *
  * @since  3.5
  */
-class ComponentRenderer extends DocumentRenderer
+class ComponentRenderer extends RendererDocument
 {
 	/**
 	 * Renders a component script and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
index d91ed5dfc5979..5fd7a01c0fb61 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\RendererDocument;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Utilities\ArrayHelper;
@@ -20,7 +20,7 @@
  *
  * @since  3.5
  */
-class HeadRenderer extends DocumentRenderer
+class HeadRenderer extends RendererDocument
 {
 	/**
 	 * Renders the document head and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
index 1a6ee5dc61c3d..3c93ec57b07e9 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\RendererDocument;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -19,7 +19,7 @@
  *
  * @since  3.5
  */
-class MessageRenderer extends DocumentRenderer
+class MessageRenderer extends RendererDocument
 {
 	/**
 	 * Renders the error stack and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
index 153a541632913..b1a398d52b8b6 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\RendererDocument;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -21,7 +21,7 @@
  *
  * @since  3.5
  */
-class ModuleRenderer extends DocumentRenderer
+class ModuleRenderer extends RendererDocument
 {
 	/**
 	 * Renders a module script and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
index 7356e9ce4ff24..a91682cea3111 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\RendererDocument;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -19,7 +19,7 @@
  *
  * @since  3.5
  */
-class ModulesRenderer extends DocumentRenderer
+class ModulesRenderer extends RendererDocument
 {
 	/**
 	 * Renders multiple modules script and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/DocumentRenderer.php b/libraries/src/Joomla/CMS/Document/RendererDocument.php
similarity index 98%
rename from libraries/src/Joomla/CMS/Document/DocumentRenderer.php
rename to libraries/src/Joomla/CMS/Document/RendererDocument.php
index 2d22a140d12cb..40fd8b74a59f6 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/RendererDocument.php
@@ -18,7 +18,7 @@
  *
  * @since  11.1
  */
-class DocumentRenderer
+class RendererDocument
 {
 	/**
 	 * Reference to the JDocument object that instantiated the renderer
diff --git a/libraries/src/Joomla/CMS/Document/DocumentXml.php b/libraries/src/Joomla/CMS/Document/XmlDocument.php
similarity index 90%
rename from libraries/src/Joomla/CMS/Document/DocumentXml.php
rename to libraries/src/Joomla/CMS/Document/XmlDocument.php
index 42c7aa4c242b0..a2014e21df785 100644
--- a/libraries/src/Joomla/CMS/Document/DocumentXml.php
+++ b/libraries/src/Joomla/CMS/Document/XmlDocument.php
@@ -13,11 +13,11 @@
 use Joomla\CMS\Document\Document;
 
 /**
- * DocumentXml class, provides an easy interface to parse and display XML output
+ * XmlDocument class, provides an easy interface to parse and display XML output
  *
  * @since  11.1
  */
-class DocumentXml extends Document
+class XmlDocument extends Document
 {
 	/**
 	 * Document name
@@ -81,7 +81,7 @@ public function getName()
 	 *
 	 * @param   string  $name  Document name
 	 *
-	 * @return  JDocumentXml instance of $this to allow chaining
+	 * @return  JXmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */

From 6a204803747faed230a7001d5f1150dea1d71954 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Mon, 5 Jun 2017 22:25:15 +0100
Subject: [PATCH 016/148] Fix deprecated versions

---
 libraries/classmap.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 2a52d2b1c4cdf..e6871c3d6b1b5 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -192,13 +192,13 @@
 JLoader::registerAlias('JDocumentRendererHtmlMessage',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererHtmlModule',       '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererHtmlModules',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\HeadRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '5.0');
-JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\HeadRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '4.0');
 
 JLoader::registerAlias('JFilterInput',                      '\\Joomla\\CMS\\Filter\\InputFilter', '5.0');
 JLoader::registerAlias('JFilterOutput',                     '\\Joomla\\CMS\\Filter\\OutputFilter', '5.0');

From ce0e72de18b6b5eb2c557274799f491f244cf50c Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Mon, 5 Jun 2017 22:27:21 +0100
Subject: [PATCH 017/148] Fix class name

---
 libraries/src/Joomla/CMS/Document/XmlDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Joomla/CMS/Document/XmlDocument.php b/libraries/src/Joomla/CMS/Document/XmlDocument.php
index a2014e21df785..4e5577934b0cd 100644
--- a/libraries/src/Joomla/CMS/Document/XmlDocument.php
+++ b/libraries/src/Joomla/CMS/Document/XmlDocument.php
@@ -81,7 +81,7 @@ public function getName()
 	 *
 	 * @param   string  $name  Document name
 	 *
-	 * @return  JXmlDocument instance of $this to allow chaining
+	 * @return  XmlDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */

From 00d8bacf260741cef8ea8bf052f2e6347da04a90 Mon Sep 17 00:00:00 2001
From: Matias Aguirre <maguirre@matware.com.ar>
Date: Thu, 22 Jun 2017 09:51:26 -0300
Subject: [PATCH 018/148] Split Opensearch classes to files

---
 .../Document/Opensearch/OpensearchImage.php   |  59 ++++++++++
 .../CMS/Document/Opensearch/OpensearchUrl.php |  49 ++++++++
 .../CMS/Document/OpensearchDocument.php       | 110 +++---------------
 3 files changed, 121 insertions(+), 97 deletions(-)
 create mode 100644 libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php
 create mode 100644 libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php

diff --git a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php
new file mode 100644
index 0000000000000..f7af437cdba47
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Opensearch;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * OpensearchImage is an internal class that stores Images for the Opensearch Description
+ *
+ * @since  11.1
+ */
+class OpensearchImage
+{
+	/**
+	 * The images MIME type
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = '';
+
+	/**
+	 * URL of the image or the image as base64 encoded value
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $data = '';
+
+	/**
+	 * The image's width
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $width;
+
+	/**
+	 * The image's height
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $height;
+}
diff --git a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php
new file mode 100644
index 0000000000000..4d470b65d196b
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Opensearch;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * OpensearchUrl is an internal class that stores the search URLs for the OpenSearch description
+ *
+ * @since  11.1
+ */
+class OpensearchUrl
+{
+	/**
+	 * Type item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = 'text/html';
+
+	/**
+	 * Rel item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $rel = 'results';
+
+	/**
+	 * Template item element. Has to contain the {searchTerms} parameter to work.
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $template;
+}
diff --git a/libraries/src/Joomla/CMS/Document/OpensearchDocument.php b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
index 8193008957db1..b0363e38b1d04 100644
--- a/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
+++ b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
@@ -12,9 +12,11 @@
 
 use Joomla\CMS\Document\Document;
 use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Document\Opensearch\OpensearchUrl;
+use Joomla\CMS\Document\Opensearch\OpensearchImage;
 
 /**
- * OpenSearch class, provides an easy interface to display an OpenSearch document
+ * Opensearch class, provides an easy interface to display an Opensearch document
  *
  * @link   http://www.opensearch.org/
  * @since  11.1
@@ -67,7 +69,7 @@ public function __construct($options = array())
 		$this->_mime = 'application/opensearchdescription+xml';
 
 		// Add the URL for self updating
-		$update = new OpenSearchUrl;
+		$update = new OpensearchUrl;
 		$update->type = 'application/opensearchdescription+xml';
 		$update->rel = 'self';
 		$update->template = \JRoute::_(Uri::getInstance());
@@ -84,7 +86,7 @@ public function __construct($options = array())
 			{
 				$path = str_replace(JPATH_BASE, '', $dir);
 				$path = str_replace('\\', '/', $path);
-				$favicon = new OpenSearchImage;
+				$favicon = new OpensearchImage;
 
 				if ($path == '')
 				{
@@ -130,11 +132,11 @@ public function render($cache = false, $params = array())
 			$xml->formatOutput = true;
 		}
 
-		// The OpenSearch Namespace
+		// The Opensearch Namespace
 		$osns = 'http://a9.com/-/spec/opensearch/1.1/';
 
 		// Create the root element
-		$elOs = $xml->createElementNs($osns, 'OpenSearchDescription');
+		$elOs = $xml->createElementNs($osns, 'OpensearchDescription');
 
 		$elShortName = $xml->createElementNs($osns, 'ShortName');
 		$elShortName->appendChild($xml->createTextNode(htmlspecialchars($this->_shortName)));
@@ -197,15 +199,15 @@ public function setShortName($name)
 	}
 
 	/**
-	 * Adds a URL to the OpenSearch description.
+	 * Adds a URL to the Opensearch description.
 	 *
-	 * @param   OpenSearchUrl  $url  The url to add to the description.
+	 * @param   OpensearchUrl  $url  The url to add to the description.
 	 *
 	 * @return  OpensearchDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
-	public function addUrl(OpenSearchUrl $url)
+	public function addUrl(OpensearchUrl $url)
 	{
 		$this->_urls[] = $url;
 
@@ -213,104 +215,18 @@ public function addUrl(OpenSearchUrl $url)
 	}
 
 	/**
-	 * Adds an image to the OpenSearch description.
+	 * Adds an image to the Opensearch description.
 	 *
-	 * @param   OpenSearchImage  $image  The image to add to the description.
+	 * @param   OpensearchImage  $image  The image to add to the description.
 	 *
 	 * @return  OpensearchDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
 	 */
-	public function addImage(OpenSearchImage $image)
+	public function addImage(OpensearchImage $image)
 	{
 		$this->_images[] = $image;
 
 		return $this;
 	}
 }
-
-/**
- * OpenSearchUrl is an internal class that stores the search URLs for the OpenSearch description
- *
- * @since  11.1
- */
-class OpenSearchUrl
-{
-	/**
-	 * Type item element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $type = 'text/html';
-
-	/**
-	 * Rel item element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $rel = 'results';
-
-	/**
-	 * Template item element. Has to contain the {searchTerms} parameter to work.
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $template;
-}
-
-/**
- * OpenSearchImage is an internal class that stores Images for the OpenSearch Description
- *
- * @since  11.1
- */
-class OpenSearchImage
-{
-	/**
-	 * The images MIME type
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $type = '';
-
-	/**
-	 * URL of the image or the image as base64 encoded value
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $data = '';
-
-	/**
-	 * The image's width
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $width;
-
-	/**
-	 * The image's height
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $height;
-}

From 05b154298deb2509c694f069ce7112a07089e384 Mon Sep 17 00:00:00 2001
From: Matias Aguirre <maguirre@matware.com.ar>
Date: Sun, 16 Jul 2017 19:06:18 -0300
Subject: [PATCH 019/148] Fix document render in legacy mode

---
 libraries/src/Joomla/CMS/Document/Document.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Document/Document.php b/libraries/src/Joomla/CMS/Document/Document.php
index de51cb9be78b5..1ee2b66101a8b 100644
--- a/libraries/src/Joomla/CMS/Document/Document.php
+++ b/libraries/src/Joomla/CMS/Document/Document.php
@@ -308,7 +308,7 @@ public static function getInstance($type = 'html', $attributes = array())
 				else
 				{
 					$ntype = $type;
-					$class = 'DocumentRaw';
+					$class = 'JDocumentRaw';
 				}
 			}
 
@@ -1189,7 +1189,7 @@ public function loadRenderer($type)
 		if (!class_exists($class))
 		{
 			// "Legacy" class name structure
-			$class = 'DocumentRenderer' . $type;
+			$class = 'JDocumentRenderer' . $type;
 
 			if (!class_exists($class))
 			{
@@ -1203,7 +1203,7 @@ public function loadRenderer($type)
 
 				\JLoader::register($class, $path);
 
-				\JLog::add('Non-autoloadable DocumentRenderer subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
+				\JLog::add('Non-autoloadable JDocumentRenderer subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
 
 				// If the class still doesn't exist after including the path, we've got issues
 				if (!class_exists($class))

From 2bf3599f5b13fcb38ba2a32f8a152f52b58165d9 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 18 Jul 2017 15:11:33 +0200
Subject: [PATCH 020/148] Prepare 3.7.4 RC1 Release

---
 administrator/manifests/files/joomla.xml | 2 +-
 installation/language/en-GB/en-GB.ini    | 6 +++---
 libraries/cms/version/version.php        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 4291ae437e875..fa57d8e42ed3d 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.7.4-dev</version>
+	<version>3.7.4-rc1</version>
 	<creationDate>July 2017</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/installation/language/en-GB/en-GB.ini b/installation/language/en-GB/en-GB.ini
index 5f77fc8c5d45e..d303a1a524455 100644
--- a/installation/language/en-GB/en-GB.ini
+++ b/installation/language/en-GB/en-GB.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Database Configuration"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed."
 INSTL_DATABASE_HOST_DESC="This is usually &quot;localhost&quot; or a name provided by your host."
 INSTL_DATABASE_HOST_LABEL="Host Name"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You want to use a database host which is not localhost. For security reason, you need to verify the ownership of the used webhosting account. Please see here [docspagelink] for more information."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the the owner of this webhost please delete the file %s we have just created in the &quot;installation&quot; folder of your Joomla."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="For some reason we are not able to create the file. Please manually create a file called %s and upload it to the &quot;installation&quot; folder of your Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named &quot;%s&quot; and upload it to the &quot;installation&quot; folder of your Joomla site."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the the owner of this website please delete the file named &quot;%s&quot; we have just created in the &quot;installation&quot; folder of your Joomla site."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href="_QQ_"%s"_QQ_">Please read the documentation</a> for more information."
 INSTL_DATABASE_NAME_DESC="Some hosts allow only a certain DB name per site. Use table prefix in this case for distinct Joomla! sites."
 INSTL_DATABASE_NAME_LABEL="Database Name"
 INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index 5878d9dbd7d73..7751a493d92ad 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -38,7 +38,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_LEVEL = '4-dev';
+	const DEV_LEVEL = '4-rc1';
 
 	/**
 	 * Development status.
@@ -46,7 +46,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Development';
+	const DEV_STATUS = 'Release Candidate';
 
 	/**
 	 * Build number.
@@ -70,7 +70,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '11-July-2017';
+	const RELDATE = '18-July-2017';
 
 	/**
 	 * Release time.
@@ -78,7 +78,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '16:52';
+	const RELTIME = '14:05';
 
 	/**
 	 * Release timezone.

From f002c0bbc837b981a36bee7e91d974d55bb23445 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 18 Jul 2017 17:03:48 +0200
Subject: [PATCH 021/148] set dev state

---
 administrator/manifests/files/joomla.xml | 2 +-
 libraries/cms/version/version.php        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index fa57d8e42ed3d..4291ae437e875 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.7.4-rc1</version>
+	<version>3.7.4-dev</version>
 	<creationDate>July 2017</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index 7751a493d92ad..ea8187642a1ea 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -38,7 +38,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_LEVEL = '4-rc1';
+	const DEV_LEVEL = '4-dev';
 
 	/**
 	 * Development status.
@@ -46,7 +46,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Release Candidate';
+	const DEV_STATUS = 'Development';
 
 	/**
 	 * Build number.
@@ -78,7 +78,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '14:05';
+	const RELTIME = '16:03';
 
 	/**
 	 * Release timezone.

From 483f235d6a6712100f855b318fff020cd75707ed Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 19 Jul 2017 13:03:36 +0100
Subject: [PATCH 022/148] Update string in fields (#17119)

It was a bit ambiguous so I updated the string to be more explicit

### Before

### After
---
 administrator/language/en-GB/en-GB.com_fields.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini
index 9bc03ff64aeee..9f480d810e80c 100644
--- a/administrator/language/en-GB/en-GB.com_fields.ini
+++ b/administrator/language/en-GB/en-GB.com_fields.ini
@@ -48,7 +48,7 @@ COM_FIELDS_FIELD_SHOW_ON_LABEL="Show On"
 COM_FIELDS_FIELD_SHOW_ON_SITE="Site"
 COM_FIELDS_FIELD_TYPE_DESC="The type of the field."
 COM_FIELDS_FIELD_TYPE_LABEL="Type"
-COM_FIELDS_FIELD_USE_GLOBAL="Use from Plugin"
+COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin"
 COM_FIELDS_GROUP_PERMISSION_CREATE_DESC="New setting for <strong>create actions</strong> in this field group and the calculated setting based on the parent extension permissions."
 COM_FIELDS_GROUP_PERMISSION_DELETE_DESC="New setting for <strong>delete actions</strong> on this field group and the calculated setting based on the parent extension permissions."
 COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC="New setting for <strong>edit own actions</strong> on this field group and the calculated setting based on the parent extension permissions."

From e48d9aecab626b6a3879814545862afbe96e12f0 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 19 Jul 2017 13:04:07 +0100
Subject: [PATCH 023/148] Deprecated notice (#17094)

Update the deprecated notice on an unused file to indicate that it will be removed in J4
---
 layouts/joomla/edit/details.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/joomla/edit/details.php b/layouts/joomla/edit/details.php
index 5992b268d0a2e..d1aa23660ff8a 100644
--- a/layouts/joomla/edit/details.php
+++ b/layouts/joomla/edit/details.php
@@ -6,7 +6,7 @@
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
- * @deprecated  3.2
+ * @deprecated  3.2 removed without replacement in 4.0 see global.php for an alternative
  */
 
 defined('JPATH_BASE') or die;

From 8b0f499748198ebbb36ed7946a3b1e592f42183e Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Wed, 19 Jul 2017 15:07:22 +0300
Subject: [PATCH 024/148] [Plugins/system/debug] Some improvements and cleanups
 in plugins/system/debug (#16674)

* Some improvements and cleanups in plugins/system/debug
- Make use of $this->db instead of JFactory::getDbo()();
- Added missing docblocks
- Type-safety
- replace unnecessary strlen() call with simple check
- CS

* A few more changes

* A few more changes

* Changes based on reviewer's comment

* cs

* cs

* cs

* cs

* cs
---
 plugins/system/debug/debug.php | 242 ++++++++++++++++++---------------
 1 file changed, 131 insertions(+), 111 deletions(-)

diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 65ca734d3d806..3d91805f07e28 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -82,6 +82,14 @@ class PlgSystemDebug extends JPlugin
 	 */
 	protected $app;
 
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
 	/**
 	 * Container for callback functions to be triggered when rendering the console.
 	 *
@@ -120,6 +128,12 @@ public function __construct(&$subject, $config)
 			$this->app = JFactory::getApplication();
 		}
 
+		// Get the db if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
+		if (!$this->db)
+		{
+			$this->db = JFactory::getDbo();
+		}
+
 		$this->debugLang = $this->app->get('debug_lang');
 
 		// Skip the plugin if debug is off
@@ -156,13 +170,13 @@ public function __construct(&$subject, $config)
 
 			// Split into an array at any character other than alphabet, numbers, _, ., or -
 			$categories = array_filter(preg_split('/[^A-Z0-9_\.-]/i', $this->params->get('log_categories', '')));
-			$mode = $this->params->get('log_category_mode', 0);
+			$mode       = $this->params->get('log_category_mode', 0);
 
 			JLog::addLogger(array('logger' => 'callback', 'callback' => array($this, 'logger')), $priority, $categories, $mode);
 		}
 
 		// Prepare disconnect handler for SQL profiling.
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$db->addDisconnectHandler(array($this, 'mysqlDisconnectHandler'));
 
 		// Log deprecated class aliases
@@ -264,7 +278,7 @@ public function onAfterRespond()
 		$html[] = "<script>function toggleContainer(name)
 		{
 			var e = document.getElementById(name);// MooTools might not be available ;)
-			e.style.display = (e.style.display == 'none') ? 'block' : 'none';
+			e.style.display = e.style.display === 'none' ? 'block' : 'none';
 		}</script>";
 
 		$html[] = '<div id="system-debug" class="profiler">';
@@ -309,7 +323,7 @@ public function onAfterRespond()
 			if ($this->params->get('language_errorfiles', 1))
 			{
 				$languageErrors = JFactory::getLanguage()->getErrorFiles();
-				$html[] = $this->display('language_files_in_error', $languageErrors);
+				$html[]         = $this->display('language_files_in_error', $languageErrors);
 			}
 
 			if ($this->params->get('language_files', 1))
@@ -376,7 +390,7 @@ public static function removeDisplayCallback($name)
 	/**
 	 * Method to check if the current user is allowed to see the debug information or not.
 	 *
-	 * @return  boolean  True is access is allowed.
+	 * @return  boolean  True if access is allowed.
 	 *
 	 * @since   3.0
 	 */
@@ -621,14 +635,14 @@ protected function displayProfileInformation()
 		$htmlMarks = array();
 
 		$totalTime = 0;
-		$totalMem = 0;
-		$marks = array();
+		$totalMem  = 0;
+		$marks     = array();
 
 		foreach (JProfiler::getInstance('Application')->getMarks() as $mark)
 		{
 			$totalTime += $mark->time;
-			$totalMem += (float) $mark->memory;
-			$htmlMark = sprintf(
+			$totalMem  += (float) $mark->memory;
+			$htmlMark  = sprintf(
 				JText::_('PLG_DEBUG_TIME') . ': <span class="label label-time">%.2f&nbsp;ms</span> / <span class="label label-default">%.2f&nbsp;ms</span>'
 				. ' ' . JText::_('PLG_DEBUG_MEMORY') . ': <span class="label label-memory">%0.3f MB</span> / <span class="label label-default">%0.2f MB</span>'
 				. ' %s: %s',
@@ -641,63 +655,63 @@ protected function displayProfileInformation()
 			);
 
 			$marks[] = (object) array(
-				'time' => $mark->time,
+				'time'   => $mark->time,
 				'memory' => $mark->memory,
-				'html' => $htmlMark,
-				'tip' => $mark->label
+				'html'   => $htmlMark,
+				'tip'    => $mark->label,
 			);
 		}
 
 		$avgTime = $totalTime / count($marks);
-		$avgMem = $totalMem / count($marks);
+		$avgMem  = $totalMem / count($marks);
 
 		foreach ($marks as $mark)
 		{
 			if ($mark->time > $avgTime * 1.5)
 			{
-				$barClass = 'bar-danger';
+				$barClass   = 'bar-danger';
 				$labelClass = 'label-important label-danger';
 			}
 			elseif ($mark->time < $avgTime / 1.5)
 			{
-				$barClass = 'bar-success';
+				$barClass   = 'bar-success';
 				$labelClass = 'label-success';
 			}
 			else
 			{
-				$barClass = 'bar-warning';
+				$barClass   = 'bar-warning';
 				$labelClass = 'label-warning';
 			}
 
 			if ($mark->memory > $avgMem * 1.5)
 			{
-				$barClassMem = 'bar-danger';
+				$barClassMem   = 'bar-danger';
 				$labelClassMem = 'label-important label-danger';
 			}
 			elseif ($mark->memory < $avgMem / 1.5)
 			{
-				$barClassMem = 'bar-success';
+				$barClassMem   = 'bar-success';
 				$labelClassMem = 'label-success';
 			}
 			else
 			{
-				$barClassMem = 'bar-warning';
+				$barClassMem   = 'bar-warning';
 				$labelClassMem = 'label-warning';
 			}
 
-			$barClass .= " progress-$barClass";
+			$barClass    .= " progress-$barClass";
 			$barClassMem .= " progress-$barClassMem";
 
 			$bars[] = (object) array(
 				'width' => round($mark->time / ($totalTime / 100), 4),
 				'class' => $barClass,
-				'tip' => $mark->tip . ' ' . round($mark->time, 2) . ' ms'
+				'tip'   => $mark->tip . ' ' . round($mark->time, 2) . ' ms',
 			);
 
 			$barsMem[] = (object) array(
 				'width' => round((float) $mark->memory / ($totalMem / 100), 4),
 				'class' => $barClassMem,
-				'tip' => $mark->tip . ' ' . round($mark->memory, 3) . '  MB',
+				'tip'   => $mark->tip . ' ' . round($mark->memory, 3) . '  MB',
 			);
 
 			$htmlMarks[] = '<div>' . str_replace('label-time', $labelClass, str_replace('label-memory', $labelClassMem, $mark->html)) . '</div>';
@@ -710,7 +724,7 @@ protected function displayProfileInformation()
 
 		$html[] = '<div class="dbg-profile-list">' . implode('', $htmlMarks) . '</div>';
 
-		$db = JFactory::getDbo();
+		$db = $this->db;
 
 		//  fix  for support custom shutdown function via register_shutdown_function().
 		$db->disconnect();
@@ -724,7 +738,7 @@ protected function displayProfileInformation()
 			if ($timings)
 			{
 				$totalQueryTime = 0.0;
-				$lastStart = null;
+				$lastStart      = null;
 
 				foreach ($timings as $k => $v)
 				{
@@ -796,8 +810,7 @@ protected function displayMemoryUsage()
 	 */
 	protected function displayQueries()
 	{
-		$db = JFactory::getDbo();
-
+		$db  = $this->db;
 		$log = $db->getLog();
 
 		if (!$log)
@@ -805,21 +818,21 @@ protected function displayQueries()
 			return null;
 		}
 
-		$timings = $db->getTimings();
+		$timings    = $db->getTimings();
 		$callStacks = $db->getCallStacks();
 
 		$db->setDebug(false);
 
 		$selectQueryTypeTicker = array();
-		$otherQueryTypeTicker = array();
+		$otherQueryTypeTicker  = array();
 
-		$timing = array();
+		$timing  = array();
 		$maxtime = 0;
 
 		if (isset($timings[0]))
 		{
-			$startTime = $timings[0];
-			$endTime = $timings[count($timings) - 1];
+			$startTime         = $timings[0];
+			$endTime           = $timings[count($timings) - 1];
 			$totalBargraphTime = $endTime - $startTime;
 
 			if ($totalBargraphTime > 0)
@@ -829,22 +842,25 @@ protected function displayQueries()
 					if (isset($timings[$id * 2 + 1]))
 					{
 						// Compute the query time: $timing[$k] = array( queryTime, timeBetweenQueries ).
-						$timing[$id] = array(($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000, $id > 0 ? ($timings[$id * 2] - $timings[$id * 2 - 1]) * 1000 : 0);
-						$maxtime = max($maxtime, $timing[$id]['0']);
+						$timing[$id] = array(
+							($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000,
+							$id > 0 ? ($timings[$id * 2] - $timings[$id * 2 - 1]) * 1000 : 0,
+						);
+						$maxtime     = max($maxtime, $timing[$id]['0']);
 					}
 				}
 			}
 		}
 		else
 		{
-			$startTime = null;
+			$startTime         = null;
 			$totalBargraphTime = 1;
 		}
 
-		$bars = array();
-		$info = array();
+		$bars           = array();
+		$info           = array();
 		$totalQueryTime = 0;
-		$duplicates = array();
+		$duplicates     = array();
 
 		foreach ($log as $id => $query)
 		{
@@ -860,11 +876,11 @@ protected function displayQueries()
 			if ($timings && isset($timings[$id * 2 + 1]))
 			{
 				// Compute the query time.
-				$queryTime = ($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000;
+				$queryTime      = ($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000;
 				$totalQueryTime += $queryTime;
 
 				// Run an EXPLAIN EXTENDED query on the SQL query if possible.
-				$hasWarnings = false;
+				$hasWarnings          = false;
 				$hasWarningsInProfile = false;
 
 				if (isset($this->explains[$id]))
@@ -886,31 +902,31 @@ protected function displayQueries()
 				}
 
 				// How heavy should the string length count: 0 - 1.
-				$ratio = 0.5;
+				$ratio     = 0.5;
 				$timeScore = $queryTime / ((strlen($query) + 1) * $ratio) * 200;
 
 				// Determine color of bargraph depending on query speed and presence of warnings in EXPLAIN.
 				if ($timeScore > 10)
 				{
-					$barClass = 'bar-danger';
+					$barClass   = 'bar-danger';
 					$labelClass = 'label-important';
 				}
 				elseif ($hasWarnings || $timeScore > 5)
 				{
-					$barClass = 'bar-warning';
+					$barClass   = 'bar-warning';
 					$labelClass = 'label-warning';
 				}
 				else
 				{
-					$barClass = 'bar-success';
+					$barClass   = 'bar-success';
 					$labelClass = 'label-success';
 				}
 
 				// Computes bargraph as follows: Position begin and end of the bar relatively to whole execution time.
 				// TODO: $prevBar is not used anywhere. Remove?
-				$prevBar = ($id && isset($bars[$id - 1])) ? $bars[$id - 1] : 0;
+				$prevBar = $id && isset($bars[$id - 1]) ? $bars[$id - 1] : 0;
 
-				$barPre = round($timing[$id][1] / ($totalBargraphTime * 10), 4);
+				$barPre   = round($timing[$id][1] / ($totalBargraphTime * 10), 4);
 				$barWidth = round($timing[$id][0] / ($totalBargraphTime * 10), 4);
 				$minWidth = 0.3;
 
@@ -921,7 +937,7 @@ protected function displayQueries()
 					if ($barPre < 0)
 					{
 						$minWidth += $barPre;
-						$barPre = 0;
+						$barPre   = 0;
 					}
 
 					$barWidth = $minWidth;
@@ -930,14 +946,14 @@ protected function displayQueries()
 				$bars[$id] = (object) array(
 					'class' => $barClass,
 					'width' => $barWidth,
-					'pre' => $barPre,
-					'tip' => sprintf('%.2f&nbsp;ms', $queryTime)
+					'pre'   => $barPre,
+					'tip'   => sprintf('%.2f&nbsp;ms', $queryTime),
 				);
 				$info[$id] = (object) array(
-					'class' => $labelClass,
-					'explain' => $explain,
-					'profile' => $profile,
-					'hasWarnings' => $hasWarnings
+					'class'       => $labelClass,
+					'explain'     => $explain,
+					'profile'     => $profile,
+					'hasWarnings' => $hasWarnings,
 				);
 			}
 		}
@@ -966,7 +982,7 @@ protected function displayQueries()
 
 			if ($bars[1]->pre < 0)
 			{
-				$minWidth += $bars[1]->pre;
+				$minWidth     += $bars[1]->pre;
 				$bars[1]->pre = 0;
 			}
 
@@ -974,12 +990,12 @@ protected function displayQueries()
 		}
 
 		$memoryUsageNow = memory_get_usage();
-		$list = array();
+		$list           = array();
 
 		foreach ($log as $id => $query)
 		{
 			// Start query type ticker additions.
-			$fromStart = stripos($query, 'from');
+			$fromStart  = stripos($query, 'from');
 			$whereStart = stripos($query, 'where', $fromStart);
 
 			if ($whereStart === false)
@@ -993,7 +1009,7 @@ protected function displayQueries()
 			}
 
 			$fromString = substr($query, 0, $whereStart);
-			$fromString = str_replace(array("\t","\n"), ' ', $fromString);
+			$fromString = str_replace(array("\t", "\n"), ' ', $fromString);
 			$fromString = trim($fromString);
 
 			// Initialise the select/other query type counts the first time.
@@ -1030,17 +1046,18 @@ protected function displayQueries()
 				// Formats the output for the query time with EXPLAIN query results as tooltip:
 				$htmlTiming = '<div style="margin: 0 0 5px;"><span class="dbg-query-time">';
 				$htmlTiming .= JText::sprintf(
-						'PLG_DEBUG_QUERY_TIME',
-						sprintf(
-							'<span class="label %s">%.2f&nbsp;ms</span>',
-							$info[$id]->class,
-							$timing[$id]['0']
-						)
-					);
+					'PLG_DEBUG_QUERY_TIME',
+					sprintf(
+						'<span class="label %s">%.2f&nbsp;ms</span>',
+						$info[$id]->class,
+						$timing[$id]['0']
+					)
+				);
 
 				if ($timing[$id]['1'])
 				{
-					$htmlTiming .= ' ' . JText::sprintf('PLG_DEBUG_QUERY_AFTER_LAST',
+					$htmlTiming .= ' ' . JText::sprintf(
+							'PLG_DEBUG_QUERY_AFTER_LAST',
 							sprintf('<span class="label label-default">%.2f&nbsp;ms</span>', $timing[$id]['1'])
 						);
 				}
@@ -1049,7 +1066,7 @@ protected function displayQueries()
 
 				if (isset($callStacks[$id][0]['memory']))
 				{
-					$memoryUsed = $callStacks[$id][0]['memory'][1] - $callStacks[$id][0]['memory'][0];
+					$memoryUsed        = $callStacks[$id][0]['memory'][1] - $callStacks[$id][0]['memory'][0];
 					$memoryBeforeQuery = $callStacks[$id][0]['memory'][0];
 
 					// Determine colour of query memory usage.
@@ -1066,7 +1083,9 @@ protected function displayQueries()
 						$labelClass = 'label-success';
 					}
 
-					$htmlTiming .= ' ' . '<span class="dbg-query-memory">' . JText::sprintf('PLG_DEBUG_MEMORY_USED_FOR_QUERY',
+					$htmlTiming .= ' ' . '<span class="dbg-query-memory">'
+						. JText::sprintf(
+							'PLG_DEBUG_MEMORY_USED_FOR_QUERY',
 							sprintf('<span class="label ' . $labelClass . '">%.3f&nbsp;MB</span>', $memoryUsed / 1048576),
 							sprintf('<span class="label label-default">%.3f&nbsp;MB</span>', $memoryBeforeQuery / 1048576)
 						)
@@ -1095,7 +1114,8 @@ protected function displayQueries()
 						}
 
 						$htmlResultsReturned = '<span class="label ' . $labelClass . '">' . (int) $resultsReturned . '</span>';
-						$htmlTiming .= ' <span class="dbg-query-rowsnumber">' . JText::sprintf('PLG_DEBUG_ROWS_RETURNED_BY_QUERY', $htmlResultsReturned) . '</span>';
+						$htmlTiming          .= ' <span class="dbg-query-rowsnumber">'
+							. JText::sprintf('PLG_DEBUG_ROWS_RETURNED_BY_QUERY', $htmlResultsReturned) . '</span>';
 					}
 				}
 
@@ -1116,7 +1136,7 @@ protected function displayQueries()
 
 				$htmlAccordions = JHtml::_(
 					'bootstrap.startAccordion', 'dbg_query_' . $id, array(
-						'active' => $info[$id]->hasWarnings ? ('dbg_query_explain_' . $id) : ''
+						'active' => $info[$id]->hasWarnings ? ('dbg_query_explain_' . $id) : '',
 					)
 				);
 
@@ -1231,8 +1251,8 @@ protected function displayQueries()
 
 		// Get the totals for the query types.
 		$totalSelectQueryTypes = count($selectQueryTypeTicker);
-		$totalOtherQueryTypes = count($otherQueryTypeTicker);
-		$totalQueryTypes = $totalSelectQueryTypes + $totalOtherQueryTypes;
+		$totalOtherQueryTypes  = count($otherQueryTypeTicker);
+		$totalQueryTypes       = $totalSelectQueryTypes + $totalOtherQueryTypes;
 
 		$html[] = '<h4>' . JText::sprintf('PLG_DEBUG_QUERY_TYPES_LOGGED', $totalQueryTypes) . '</h4>';
 
@@ -1309,11 +1329,11 @@ protected function renderBars(&$bars, $class = '', $id = null)
 			if (isset($bar->tip) && $bar->tip)
 			{
 				$barClass .= ' hasTooltip';
-				$tip = JHtml::_('tooltipText', $bar->tip, '', 0);
+				$tip      = JHtml::_('tooltipText', $bar->tip, '', 0);
 			}
 
 			$html[] = '<a class="bar dbg-bar ' . $barClass . '" title="' . $tip . '" style="width: '
-						. $bar->width . '%;" href="#dbg-' . $class . '-' . ($i + 1) . '"></a>';
+				. $bar->width . '%;" href="#dbg-' . $class . '-' . ($i + 1) . '"></a>';
 		}
 
 		return '<div class="progress dbg-bars dbg-bars-' . $class . '">' . implode('', $html) . '</div>';
@@ -1347,9 +1367,9 @@ protected function tableToHtml($table, &$hasWarnings)
 			$html[] = '<th>' . htmlspecialchars($k) . '</th>';
 		}
 
-		$html[] = '</tr>';
-		$html[] = '</thead>';
-		$html[] = '<tbody>';
+		$html[]    = '</tr>';
+		$html[]    = '</thead>';
+		$html[]    = '<tbody>';
 		$durations = array();
 
 		foreach ($table as $tr)
@@ -1380,7 +1400,7 @@ protected function tableToHtml($table, &$hasWarnings)
 					if ($td >= 0.001 && ($td == $durations[0] || (isset($durations[1]) && $td == $durations[1])))
 					{
 						// Duration column with duration value of more than 1 ms and within 2 top duration in SQL engine: Highlight warning.
-						$html[] = '<td class="dbg-warning">';
+						$html[]      = '<td class="dbg-warning">';
 						$hasWarnings = true;
 					}
 					else
@@ -1394,7 +1414,7 @@ protected function tableToHtml($table, &$hasWarnings)
 				elseif ($k === 'Error')
 				{
 					// An error in the EXPLAIN query occurred, display it instead of the result (means original query had syntax error most probably).
-					$html[] = '<td class="dbg-warning">' . htmlspecialchars($td);
+					$html[]      = '<td class="dbg-warning">' . htmlspecialchars($td);
 					$hasWarnings = true;
 				}
 				elseif ($k === 'key')
@@ -1402,9 +1422,9 @@ protected function tableToHtml($table, &$hasWarnings)
 					if ($td === 'NULL')
 					{
 						// Displays query parts which don't use a key with warning:
-						$html[] = '<td><strong>' . '<span class="dbg-warning hasTooltip" title="'
-									. JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_NO_INDEX_DESC') . '">'
-									. JText::_('PLG_DEBUG_WARNING_NO_INDEX') . '</span>' . '</strong>';
+						$html[]      = '<td><strong>' . '<span class="dbg-warning hasTooltip" title="'
+							. JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_NO_INDEX_DESC') . '">'
+							. JText::_('PLG_DEBUG_WARNING_NO_INDEX') . '</span>' . '</strong>';
 						$hasWarnings = true;
 					}
 					else
@@ -1421,12 +1441,12 @@ protected function tableToHtml($table, &$hasWarnings)
 
 					// Displays warnings for "Using filesort":
 					$htmlTdWithWarnings = str_replace(
-											'Using&nbsp;filesort',
-											'<span class="dbg-warning hasTooltip" title="'
-												. JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_USING_FILESORT_DESC') . '">'
-												. JText::_('PLG_DEBUG_WARNING_USING_FILESORT') . '</span>',
-											$htmlTd
-										);
+						'Using&nbsp;filesort',
+						'<span class="dbg-warning hasTooltip" title="'
+						. JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_USING_FILESORT_DESC') . '">'
+						. JText::_('PLG_DEBUG_WARNING_USING_FILESORT') . '</span>',
+						$htmlTd
+					);
 
 					if ($htmlTdWithWarnings !== $htmlTd)
 					{
@@ -1503,7 +1523,7 @@ public function mysqlDisconnectHandler(&$db)
 			}
 		}
 
-		if (in_array($db->getServerType(), array('mysql', 'postgresql')))
+		if (in_array($db->getServerType(), array('mysql', 'postgresql'), true))
 		{
 			$log = $db->getLog();
 
@@ -1601,8 +1621,8 @@ protected function displayLanguageFilesLoaded()
 	protected function displayUntranslatedStrings()
 	{
 		$stripFirst = $this->params->get('strip-first');
-		$stripPref = $this->params->get('strip-prefix');
-		$stripSuff = $this->params->get('strip-suffix');
+		$stripPref  = $this->params->get('strip-prefix');
+		$stripSuff  = $this->params->get('strip-suffix');
 
 		$orphans = JFactory::getLanguage()->getOrphans();
 
@@ -1631,7 +1651,7 @@ protected function displayUntranslatedStrings()
 				if (($pos = strpos($info['string'], '=')) > 0)
 				{
 					$parts = explode('=', $info['string']);
-					$key = $parts[0];
+					$key   = $parts[0];
 					$guess = $parts[1];
 				}
 				else
@@ -1662,7 +1682,7 @@ protected function displayUntranslatedStrings()
 					}
 				}
 
-				$key = trim(strtoupper($key));
+				$key = strtoupper(trim($key));
 				$key = preg_replace('#\s+#', '_', $key);
 				$key = preg_replace('#\W#', '', $key);
 
@@ -1702,13 +1722,13 @@ protected function highlightQuery($query)
 		$regex = array(
 
 			// Tables are identified by the prefix.
-			'/(=)/' => '<b class="dbg-operator">$1</b>',
+			'/(=)/'                                        => '<b class="dbg-operator">$1</b>',
 
 			// All uppercase words have a special meaning.
-			'/(?<!\w|>)([A-Z_]{2,})(?!\w)/x' => '<span class="dbg-command">$1</span>',
+			'/(?<!\w|>)([A-Z_]{2,})(?!\w)/x'               => '<span class="dbg-command">$1</span>',
 
 			// Tables are identified by the prefix.
-			'/(' . JFactory::getDbo()->getPrefix() . '[a-z_0-9]+)/' => '<span class="dbg-table">$1</span>'
+			'/(' . $this->db->getPrefix() . '[a-z_0-9]+)/' => '<span class="dbg-table">$1</span>',
 
 		);
 
@@ -1778,13 +1798,13 @@ protected function displayLogs()
 	{
 		$priorities = array(
 			JLog::EMERGENCY => '<span class="badge badge-important">EMERGENCY</span>',
-			JLog::ALERT => '<span class="badge badge-important">ALERT</span>',
-			JLog::CRITICAL => '<span class="badge badge-important">CRITICAL</span>',
-			JLog::ERROR => '<span class="badge badge-important">ERROR</span>',
-			JLog::WARNING => '<span class="badge badge-warning">WARNING</span>',
-			JLog::NOTICE => '<span class="badge badge-info">NOTICE</span>',
-			JLog::INFO => '<span class="badge badge-info">INFO</span>',
-			JLog::DEBUG => '<span class="badge">DEBUG</span>'
+			JLog::ALERT     => '<span class="badge badge-important">ALERT</span>',
+			JLog::CRITICAL  => '<span class="badge badge-important">CRITICAL</span>',
+			JLog::ERROR     => '<span class="badge badge-important">ERROR</span>',
+			JLog::WARNING   => '<span class="badge badge-warning">WARNING</span>',
+			JLog::NOTICE    => '<span class="badge badge-info">NOTICE</span>',
+			JLog::INFO      => '<span class="badge badge-info">INFO</span>',
+			JLog::DEBUG     => '<span class="badge">DEBUG</span>',
 		);
 
 		$out = '';
@@ -1798,25 +1818,25 @@ protected function displayLogs()
 		{
 			$logEntriesDatabasequery = count(
 				array_filter(
-					$this->logEntries, function($logEntry)
+					$this->logEntries, function ($logEntry)
 					{
 						return $logEntry->category === 'databasequery';
 					}
 				)
 			);
-			$logEntriesTotal -= $logEntriesDatabasequery;
+			$logEntriesTotal         -= $logEntriesDatabasequery;
 		}
 
 		// Deprecated log entries
 		$logEntriesDeprecated = count(
 			array_filter(
-				$this->logEntries, function($logEntry)
+				$this->logEntries, function ($logEntry)
 				{
 					return $logEntry->category === 'deprecated';
 				}
 			)
 		);
-		$showDeprecated = $this->params->get('log-deprecated', 0);
+		$showDeprecated       = $this->params->get('log-deprecated', 0);
 
 		if (!$showDeprecated)
 		{
@@ -1837,7 +1857,7 @@ protected function displayLogs()
 			<br />';
 		}
 
-		$out .= '<ol>';
+		$out   .= '<ol>';
 		$count = 1;
 
 		foreach ($this->logEntries as $entry)
@@ -1855,7 +1875,7 @@ protected function displayLogs()
 			}
 
 			// Don't show everything logs if not selected.
-			if (!$showEverything && !in_array($entry->category, array('deprecated', 'databasequery')))
+			if (!$showEverything && !in_array($entry->category, array('deprecated', 'databasequery'), true))
 			{
 				continue;
 			}
@@ -1895,7 +1915,7 @@ protected function renderCallStack(array $callStack = array())
 	{
 		$htmlCallStack = '';
 
-		if (isset($callStack))
+		if ($callStack !== null)
 		{
 			$htmlCallStack .= '<div>';
 			$htmlCallStack .= '<table class="table table-striped dbg-query-table">';
@@ -2020,7 +2040,7 @@ protected function writeToFile()
 
 		// Get the queries from log.
 		$current = '';
-		$db      = JFactory::getDbo();
+		$db      = $this->db;
 		$log     = $db->getLog();
 		$timings = $db->getTimings();
 
@@ -2028,8 +2048,8 @@ protected function writeToFile()
 		{
 			if (isset($timings[$id * 2 + 1]))
 			{
-				$temp = str_replace('`', '', $log[$id]);
-				$temp = str_replace(array("\t", "\n", "\r\n"), ' ', $temp);
+				$temp    = str_replace('`', '', $log[$id]);
+				$temp    = str_replace(array("\t", "\n", "\r\n"), ' ', $temp);
 				$current .= $temp . ";\n";
 			}
 		}

From 85cca3ee22dd0dada30b5241ee479deaf449ede6 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 19 Jul 2017 13:08:15 +0100
Subject: [PATCH 025/148] Change vote plugin to disabled (#17106)

On new installs this changes the vote plugin to be disabled by default. It is not used that often and by disabling it we also benefit from a simpler article list view in the admin
---
 installation/sql/mysql/joomla.sql      | 2 +-
 installation/sql/postgresql/joomla.sql | 2 +-
 installation/sql/sqlazure/joomla.sql   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index cfdef05217d90..d402e930e97ff 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -570,7 +570,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (406, 0, 'plg_content_loadmodule', 'plugin', 'loadmodule', 'content', 0, 1, 1, 0, '', '{"style":"xhtml"}', '', '', 0, '2011-09-18 15:22:50', 0, 0),
 (407, 0, 'plg_content_pagebreak', 'plugin', 'pagebreak', 'content', 0, 1, 1, 0, '', '{"title":"1","multipage_toc":"1","showall":"1"}', '', '', 0, '0000-00-00 00:00:00', 4, 0),
 (408, 0, 'plg_content_pagenavigation', 'plugin', 'pagenavigation', 'content', 0, 1, 1, 0, '', '{"position":"1"}', '', '', 0, '0000-00-00 00:00:00', 5, 0),
-(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 6, 0),
+(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 6, 0),
 (410, 0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', '', 0, '0000-00-00 00:00:00', 1, 0),
 (411, 0, 'plg_editors_none', 'plugin', 'none', 'editors', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 2, 0),
 (412, 0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","formatselect","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","styleselect","|","formatselect","fontselect","fontsizeselect","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","template","|","print","preview","codesample","insertdatetime","removeformat"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550","html_width":"750"}', '', '', 0, '0000-00-00 00:00:00', 3, 0),
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index a397318f782a8..857308069a918 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -583,7 +583,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (406, 0, 'plg_content_loadmodule', 'plugin', 'loadmodule', 'content', 0, 1, 1, 0, '', '{"style":"xhtml"}', '', '', 0, '2011-09-18 15:22:50', 0, 0),
 (407, 0, 'plg_content_pagebreak', 'plugin', 'pagebreak', 'content', 0, 1, 1, 0, '', '{"title":"1","multipage_toc":"1","showall":"1"}', '', '', 0, '1970-01-01 00:00:00', 4, 0),
 (408, 0, 'plg_content_pagenavigation', 'plugin', 'pagenavigation', 'content', 0, 1, 1, 0, '', '{"position":"1"}', '', '', 0, '1970-01-01 00:00:00', 5, 0),
-(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 6, 0),
+(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 6, 0),
 (410, 0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', '', 0, '1970-01-01 00:00:00', 1, 0),
 (411, 0, 'plg_editors_none', 'plugin', 'none', 'editors', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 2, 0),
 (412, 0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","formatselect","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","styleselect","|","formatselect","fontselect","fontsizeselect","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","template","|","print","preview","codesample","insertdatetime","removeformat"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550","html_width":"750"}', '', '', 0, '1970-01-01 00:00:00', 3, 0),
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index da2836025b87c..ccfaf92d8b919 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -795,7 +795,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (406, 0, 'plg_content_loadmodule', 'plugin', 'loadmodule', 'content', 0, 1, 1, 0, '', '{"style":"xhtml"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (407, 0, 'plg_content_pagebreak', 'plugin', 'pagebreak', 'content', 0, 1, 1, 0, '', '{"title":"1","multipage_toc":"1","showall":"1"}', '', '', 0, '1900-01-01 00:00:00', 4, 0),
 (408, 0, 'plg_content_pagenavigation', 'plugin', 'pagenavigation', 'content', 0, 1, 1, 0, '', '{"position":"1"}', '', '', 0, '1900-01-01 00:00:00', 5, 0),
-(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 6, 0),
+(409, 0, 'plg_content_vote', 'plugin', 'vote', 'content', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 6, 0),
 (410, 0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', '', 0, '1900-01-01 00:00:00', 1, 0),
 (411, 0, 'plg_editors_none', 'plugin', 'none', 'editors', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 2, 0),
 (412, 0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","formatselect","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","styleselect","|","formatselect","fontselect","fontsizeselect","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","template","|","print","preview","codesample","insertdatetime","removeformat"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550","html_width":"750"}', '', '', 0, '1900-01-01 00:00:00', 3, 0),

From 3e77ecfdfcb585a260de0f39474e57617e8d7241 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 19 Jul 2017 13:08:54 +0100
Subject: [PATCH 026/148] Banned text strings consistency (#17108)

The text used for the banned fields in com_contacts is different in the commponent options and the individual contact options. Irrelevant of if the information is needed or not we should be consistent. So on the basis that it is important to have the extra information I have updated the individual contact strings to match the global ones.
---
 administrator/language/en-GB/en-GB.com_contact.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini
index b72ad395a0d0a..a099141281385 100644
--- a/administrator/language/en-GB/en-GB.com_contact.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.ini
@@ -86,11 +86,11 @@ COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created By Alias"
 COM_CONTACT_FIELD_CREATED_BY_DESC="Select the name of the user who created the contact."
 COM_CONTACT_FIELD_CREATED_DESC="Date when the contact was created."
 COM_CONTACT_FIELD_CREATED_LABEL="Created Date"
-COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form."
+COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form. Separate multiple email addresses with a semicolon."
 COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_LABEL="Banned Email"
-COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_DESC="Subjects not allowed in contact form."
+COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_DESC="Subjects not allowed in contact form. Separate multiple subjects with a semicolon."
 COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_LABEL="Banned Subject"
-COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_DESC="Text not allowed in contact form body."
+COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_DESC="Text not allowed in contact form body. Separate multiple words with a semicolon."
 COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_LABEL="Banned Text"
 COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC="Hide or Show checkbox to allow copy of email to be sent to submitter."
 COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL="Send Copy to Submitter"

From 919e8b0955d73979458974dcec3b946b62de9d79 Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Wed, 19 Jul 2017 17:40:35 +0530
Subject: [PATCH 027/148] Refactor database drivers - push up desctructor
 (#10962)

* Push up the destructor from various database drivers to their parent abstract class JDatabaseDriver as it almost every time just does one thing viz disconnect(). Otherwise it can always be overridden.
Never `unset` class property. $this->connection  set to null in disconnect methods.
Nosql connect return is void not bool.

* Use version macro now
---
 libraries/joomla/database/driver.php               | 10 ++++++++++
 libraries/joomla/database/driver/mysql.php         | 10 ----------
 libraries/joomla/database/driver/mysqli.php        | 10 ----------
 libraries/joomla/database/driver/oracle.php        | 14 ++------------
 libraries/joomla/database/driver/pdo.php           | 10 ----------
 libraries/joomla/database/driver/postgresql.php    | 10 ----------
 libraries/joomla/database/driver/sqlite.php        | 12 +-----------
 libraries/joomla/database/driver/sqlsrv.php        | 10 ----------
 .../joomla/database/stubs/nosqldriver.php          |  2 +-
 9 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
index 63d34b8843df7..fc9080e72c9f8 100644
--- a/libraries/joomla/database/driver.php
+++ b/libraries/joomla/database/driver.php
@@ -661,6 +661,16 @@ public function createDatabase($options, $utf = true)
 		return $this->execute();
 	}
 
+	/**
+	 * Destructor.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __destruct()
+	{
+		$this->disconnect();
+	}
+
 	/**
 	 * Disconnects the database.
 	 *
diff --git a/libraries/joomla/database/driver/mysql.php b/libraries/joomla/database/driver/mysql.php
index 3aaa798421605..9a385db064c40 100644
--- a/libraries/joomla/database/driver/mysql.php
+++ b/libraries/joomla/database/driver/mysql.php
@@ -54,16 +54,6 @@ public function __construct($options)
 		parent::__construct($options);
 	}
 
-	/**
-	 * Destructor.
-	 *
-	 * @since   12.1
-	 */
-	public function __destruct()
-	{
-		$this->disconnect();
-	}
-
 	/**
 	 * Connects to the database if needed.
 	 *
diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
index 29ca98b37709e..753ff5d60d993 100644
--- a/libraries/joomla/database/driver/mysqli.php
+++ b/libraries/joomla/database/driver/mysqli.php
@@ -87,16 +87,6 @@ public function __construct($options)
 		parent::__construct($options);
 	}
 
-	/**
-	 * Destructor.
-	 *
-	 * @since   12.1
-	 */
-	public function __destruct()
-	{
-		$this->disconnect();
-	}
-
 	/**
 	 * Connects to the database if needed.
 	 *
diff --git a/libraries/joomla/database/driver/oracle.php b/libraries/joomla/database/driver/oracle.php
index f920d36b30e24..6e9babb89060b 100644
--- a/libraries/joomla/database/driver/oracle.php
+++ b/libraries/joomla/database/driver/oracle.php
@@ -80,17 +80,6 @@ public function __construct($options)
 		parent::__construct($options);
 	}
 
-	/**
-	 * Destructor.
-	 *
-	 * @since   12.1
-	 */
-	public function __destruct()
-	{
-		$this->freeResult();
-		unset($this->connection);
-	}
-
 	/**
 	 * Connects to the database if needed.
 	 *
@@ -127,7 +116,8 @@ public function disconnect()
 	{
 		// Close the connection.
 		$this->freeResult();
-		unset($this->connection);
+
+		$this->connection = null;
 	}
 
 	/**
diff --git a/libraries/joomla/database/driver/pdo.php b/libraries/joomla/database/driver/pdo.php
index 4dacafa9c0fde..11c585c63ce3e 100644
--- a/libraries/joomla/database/driver/pdo.php
+++ b/libraries/joomla/database/driver/pdo.php
@@ -95,16 +95,6 @@ public function __construct($options)
 		parent::__construct($options);
 	}
 
-	/**
-	 * Destructor.
-	 *
-	 * @since   12.1
-	 */
-	public function __destruct()
-	{
-		$this->disconnect();
-	}
-
 	/**
 	 * Connects to the database if needed.
 	 *
diff --git a/libraries/joomla/database/driver/postgresql.php b/libraries/joomla/database/driver/postgresql.php
index dd55a6e0b3547..9d30a950a605b 100644
--- a/libraries/joomla/database/driver/postgresql.php
+++ b/libraries/joomla/database/driver/postgresql.php
@@ -90,16 +90,6 @@ public function __construct($options)
 		parent::__construct($options);
 	}
 
-	/**
-	 * Database object destructor
-	 *
-	 * @since   12.1
-	 */
-	public function __destruct()
-	{
-		$this->disconnect();
-	}
-
 	/**
 	 * Connects to the database if needed.
 	 *
diff --git a/libraries/joomla/database/driver/sqlite.php b/libraries/joomla/database/driver/sqlite.php
index 6c7dba3dce0b3..6fa12fdb81ced 100644
--- a/libraries/joomla/database/driver/sqlite.php
+++ b/libraries/joomla/database/driver/sqlite.php
@@ -44,17 +44,6 @@ class JDatabaseDriverSqlite extends JDatabaseDriverPdo
 	 */
 	protected $nameQuote = '`';
 
-	/**
-	 * Destructor.
-	 *
-	 * @since   12.1
-	 */
-	public function __destruct()
-	{
-		$this->freeResult();
-		$this->connection = null;
-	}
-
 	/**
 	 * Connects to the database if needed.
 	 *
@@ -116,6 +105,7 @@ function($init = null)
 	public function disconnect()
 	{
 		$this->freeResult();
+
 		$this->connection = null;
 	}
 
diff --git a/libraries/joomla/database/driver/sqlsrv.php b/libraries/joomla/database/driver/sqlsrv.php
index dca0d5a08b113..f601d9e6b9a8f 100644
--- a/libraries/joomla/database/driver/sqlsrv.php
+++ b/libraries/joomla/database/driver/sqlsrv.php
@@ -91,16 +91,6 @@ public function __construct($options)
 		parent::__construct($options);
 	}
 
-	/**
-	 * Destructor.
-	 *
-	 * @since   12.1
-	 */
-	public function __destruct()
-	{
-		$this->disconnect();
-	}
-
 	/**
 	 * Connects to the database if needed.
 	 *
diff --git a/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php b/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php
index 9d0029af2a13b..d53b2ed1c10ef 100644
--- a/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php
+++ b/tests/unit/suites/libraries/joomla/database/stubs/nosqldriver.php
@@ -60,7 +60,7 @@ class JDatabaseDriverNosql extends JDatabaseDriver
 	 */
 	public function connect()
 	{
-		return true;
+		return;
 	}
 
 	/**

From 26a6239ee3b156037679111d9169799faf34c259 Mon Sep 17 00:00:00 2001
From: Artem Vasiliev <kernusr@users.noreply.github.com>
Date: Wed, 19 Jul 2017 15:15:54 +0300
Subject: [PATCH 028/148] put multiple versions of the same  tag (#16583)

* put multiple versions of the same <meta> tag

* fixed code-style errors

* remove tabs

* cs: Remove tabs
---
 libraries/joomla/document/document.php           |  8 +++++++-
 libraries/joomla/document/renderer/html/head.php | 12 +++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/libraries/joomla/document/document.php b/libraries/joomla/document/document.php
index 1e2005aba5c05..10e45ca2a16a2 100644
--- a/libraries/joomla/document/document.php
+++ b/libraries/joomla/document/document.php
@@ -414,7 +414,7 @@ public function getMetaData($name, $attribute = 'name')
 	 * Sets or alters a meta tag.
 	 *
 	 * @param   string  $name       Name of the meta HTML tag
-	 * @param   string  $content    Value of the meta HTML tag
+	 * @param   mixed   $content    Value of the meta HTML tag as array or string
 	 * @param   string  $attribute  Attribute to use in the meta HTML tag
 	 *
 	 * @return  JDocument instance of $this to allow chaining
@@ -423,6 +423,12 @@ public function getMetaData($name, $attribute = 'name')
 	 */
 	public function setMetaData($name, $content, $attribute = 'name')
 	{
+		// Pop the element off the end of array if target function expects a string or this http_equiv parameter.
+		if (is_array($content) && (in_array($name, array('generator', 'description')) || !is_string($attribute)))
+		{
+			$content = array_pop($content);
+		}
+
 		// B/C old http_equiv parameter.
 		if (!is_string($attribute))
 		{
diff --git a/libraries/joomla/document/renderer/html/head.php b/libraries/joomla/document/renderer/html/head.php
index 3d6f747b0192a..b1b36d79ea60f 100644
--- a/libraries/joomla/document/renderer/html/head.php
+++ b/libraries/joomla/document/renderer/html/head.php
@@ -94,7 +94,17 @@ public function fetchHead($document)
 				}
 				elseif ($type != 'http-equiv' && !empty($content))
 				{
-					$buffer .= $tab . '<meta ' . $type . '="' . $name . '" content="' . htmlspecialchars($content, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+					if (is_array($content))
+					{
+						foreach ($content as $value)
+						{
+							$buffer .= $tab . '<meta ' . $type . '="' . $name . '" content="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+						}
+					}
+					else
+					{
+						$buffer .= $tab . '<meta ' . $type . '="' . $name . '" content="' . htmlspecialchars($content, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+					}
 				}
 			}
 		}

From ac7f0d5943ee871076d9d985c9bd0116edc37a59 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Wed, 19 Jul 2017 15:26:01 +0300
Subject: [PATCH 029/148] Work on com_finder (both admin and site) (#12254)

* Case mismatch in function call

* Elvis

* Fix nested positive ifs

* Fix static method invocation via ->

* " to '

* Remove unnecessary parentheses

* Merged isset()

* Inline redundant value

* Move disconnected code outside the foreach loop.

* Fixed Docblocks

* Replaced preg_replace() with str_replace()

* Replaced PHP4 type-casting

* Type-safe string comparisons

* More type-safe comparisons

* Removed unused call and variable.
Also Todo'd two things for someone to check

* Reverse preg_replace() replacement because there was a limit in preg and it might cause trouble...

* Codesniffer

* Fix integer

*  Changes proposed by @andrepereiradasilva and two more by me, to get function calls out of the loop or reduce calls inside the loop.

* Shouldn't this be written this way?

* Some extra work according to @andrepereiradasilva's notes

* Some more changes from @andrepereiradasilva's comments

* Some more changes from @andrepereiradasilva's comments

* Reverted removal of duplicate key entries, added TODO's

* Code formatting fixes

* More code formatting fixes

* Fix merge introduced problem.

* Additional changes according to reviewer's comments

* Additional changes according to reviewer's comments

* Changes, according to @andrepereiradasilva's suggestions

* Forgot to commit this one
---
 .../components/com_finder/controller.php      |  2 +-
 .../com_finder/controllers/filter.php         |  6 +-
 .../com_finder/controllers/indexer.json.php   | 22 +++---
 .../components/com_finder/helpers/finder.php  |  6 +-
 .../com_finder/helpers/language.php           |  4 +-
 .../com_finder/models/fields/contentmap.php   |  2 +-
 .../components/com_finder/models/filter.php   |  6 +-
 .../components/com_finder/models/index.php    | 15 ++--
 .../components/com_finder/models/maps.php     | 17 ++---
 .../components/com_finder/tables/filter.php   |  8 +-
 .../com_finder/views/filter/view.html.php     | 40 ++++++----
 .../com_finder/views/filters/tmpl/default.php | 76 ++++++++++---------
 .../com_finder/views/filters/view.html.php    | 14 +++-
 .../com_finder/views/index/tmpl/default.php   |  2 +-
 .../com_finder/views/index/view.html.php      | 16 +++-
 .../com_finder/views/maps/tmpl/default.php    |  4 +-
 .../com_finder/views/maps/view.html.php       | 10 +++
 .../views/statistics/tmpl/default.php         |  2 +-
 .../com_finder/views/statistics/view.html.php |  2 +
 components/com_finder/helpers/html/filter.php | 14 ++--
 components/com_finder/helpers/html/query.php  |  2 +-
 components/com_finder/models/search.php       | 23 +++---
 components/com_finder/router.php              |  2 +-
 .../views/search/tmpl/default_results.php     |  2 +-
 .../com_finder/views/search/view.html.php     | 65 +++++++++++++---
 25 files changed, 226 insertions(+), 136 deletions(-)

diff --git a/administrator/components/com_finder/controller.php b/administrator/components/com_finder/controller.php
index 9a02f2ddf331a..197ece9389b08 100644
--- a/administrator/components/com_finder/controller.php
+++ b/administrator/components/com_finder/controller.php
@@ -43,7 +43,7 @@ public function display($cachable = false, $urlparams = array())
 		$filterId = $this->input->get('filter_id', null, 'int');
 
 		// Check for edit form.
-		if ($view == 'filter' && $layout == 'edit' && !$this->checkEditId('com_finder.edit.filter', $filterId))
+		if ($view === 'filter' && $layout === 'edit' && !$this->checkEditId('com_finder.edit.filter', $filterId))
 		{
 			// Somehow the person just went to the form - we don't allow that.
 			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $filterId));
diff --git a/administrator/components/com_finder/controllers/filter.php b/administrator/components/com_finder/controllers/filter.php
index 3a488e82d6e07..a753539ad9a36 100644
--- a/administrator/components/com_finder/controllers/filter.php
+++ b/administrator/components/com_finder/controllers/filter.php
@@ -70,7 +70,7 @@ public function save($key = null, $urlVar = null)
 		$data[$key] = $recordId;
 
 		// The save2copy task needs to be handled slightly differently.
-		if ($task == 'save2copy')
+		if ($task === 'save2copy')
 		{
 			// Check-in the original row.
 			if ($checkin && $model->checkin($data[$key]) === false)
@@ -185,8 +185,8 @@ public function save($key = null, $urlVar = null)
 
 		$this->setMessage(
 			JText::_(
-				(JFactory::getLanguage()->hasKey($this->text_prefix . ($recordId == 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS')
-				? $this->text_prefix : 'JLIB_APPLICATION') . ($recordId == 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'
+				(JFactory::getLanguage()->hasKey($this->text_prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS')
+				? $this->text_prefix : 'JLIB_APPLICATION') . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'
 			)
 		);
 
diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php
index 71683cf008adc..594625a1d6ca9 100644
--- a/administrator/components/com_finder/controllers/indexer.json.php
+++ b/administrator/components/com_finder/controllers/indexer.json.php
@@ -55,7 +55,7 @@ public function start()
 		$app->setHeader('Pragma', 'no-cache');
 
 		// Check for a valid token. If invalid, send a 403 with the error message.
-		JSession::checkToken('request') or $this->sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+		JSession::checkToken('request') or static::sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
 
 		// Put in a buffer to silence noise.
 		ob_start();
@@ -81,12 +81,12 @@ public function start()
 			$state->start = 1;
 
 			// Send the response.
-			$this->sendResponse($state);
+			static::sendResponse($state);
 		}
 		// Catch an exception and return the response.
 		catch (Exception $e)
 		{
-			$this->sendResponse($e);
+			static::sendResponse($e);
 		}
 	}
 
@@ -126,7 +126,7 @@ public function batch()
 		$app->setHeader('Pragma', 'no-cache');
 
 		// Check for a valid token. If invalid, send a 403 with the error message.
-		JSession::checkToken('request') or $this->sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+		JSession::checkToken('request') or static::sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
 
 		// Put in a buffer to silence noise.
 		ob_start();
@@ -165,6 +165,8 @@ public function batch()
 
 		// Get the HTML document.
 		$html = JDocument::getInstance('html', $attributes);
+
+		// Todo: Why is this document fetched and immediately overwritten?
 		$doc = JFactory::getDocument();
 
 		// Swap the documents.
@@ -178,6 +180,8 @@ public function batch()
 
 		// Swap the app.
 		$app = JFactory::getApplication();
+
+		// Todo: Why is the app fetched and immediately overwritten?
 		$app = $site;
 
 		// Start the indexer.
@@ -211,7 +215,7 @@ public function batch()
 			}
 
 			// Send the response.
-			$this->sendResponse($state);
+			static::sendResponse($state);
 		}
 		// Catch an exception and return the response.
 		catch (Exception $e)
@@ -220,7 +224,7 @@ public function batch()
 			$doc = $raw;
 
 			// Send the response.
-			$this->sendResponse($e);
+			static::sendResponse($e);
 		}
 	}
 
@@ -241,7 +245,7 @@ public function optimize()
 		$app->setHeader('Pragma', 'no-cache');
 
 		// Check for a valid token. If invalid, send a 403 with the error message.
-		JSession::checkToken('request') or $this->sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+		JSession::checkToken('request') or static::sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
 
 		// Put in a buffer to silence noise.
 		ob_start();
@@ -260,12 +264,12 @@ public function optimize()
 			$state->complete = 1;
 
 			// Send the response.
-			$this->sendResponse($state);
+			static::sendResponse($state);
 		}
 		// Catch an exception and return the response.
 		catch (Exception $e)
 		{
-			$this->sendResponse($e);
+			static::sendResponse($e);
 		}
 	}
 
diff --git a/administrator/components/com_finder/helpers/finder.php b/administrator/components/com_finder/helpers/finder.php
index d58de10516bfd..c54d0a160acca 100644
--- a/administrator/components/com_finder/helpers/finder.php
+++ b/administrator/components/com_finder/helpers/finder.php
@@ -38,17 +38,17 @@ public static function addSubmenu($vName)
 		JHtmlSidebar::addEntry(
 			JText::_('COM_FINDER_SUBMENU_INDEX'),
 			'index.php?option=com_finder&view=index',
-			$vName == 'index'
+			$vName === 'index'
 		);
 		JHtmlSidebar::addEntry(
 			JText::_('COM_FINDER_SUBMENU_MAPS'),
 			'index.php?option=com_finder&view=maps',
-			$vName == 'maps'
+			$vName === 'maps'
 		);
 		JHtmlSidebar::addEntry(
 			JText::_('COM_FINDER_SUBMENU_FILTERS'),
 			'index.php?option=com_finder&view=filters',
-			$vName == 'filters'
+			$vName === 'filters'
 		);
 	}
 
diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php
index 169dc710cd41f..4589c8eb7a188 100644
--- a/administrator/components/com_finder/helpers/language.php
+++ b/administrator/components/com_finder/helpers/language.php
@@ -29,7 +29,7 @@ public static function branchPlural($branchName)
 	{
 		$return = preg_replace('/[^a-zA-Z0-9]+/', '_', strtoupper($branchName));
 
-		if ($return != '_')
+		if ($return !== '_')
 		{
 			return 'PLG_FINDER_QUERY_FILTER_BRANCH_P_' . $return;
 		}
@@ -66,7 +66,7 @@ public static function branchLanguageTitle($branchName)
 	{
 		$title = $branchName;
 
-		if ($branchName == '*')
+		if ($branchName === '*')
 		{
 			$title = JText::_('JALL_LANGUAGE');
 		}
diff --git a/administrator/components/com_finder/models/fields/contentmap.php b/administrator/components/com_finder/models/fields/contentmap.php
index 3e12dacff3a5c..4ef5607f41593 100644
--- a/administrator/components/com_finder/models/fields/contentmap.php
+++ b/administrator/components/com_finder/models/fields/contentmap.php
@@ -93,7 +93,7 @@ protected function getGroups()
 				{
 					$levelPrefix = str_repeat('- ', max(0, $branch->level - 1));
 
-					if (trim($name, '**') == 'Language')
+					if (trim($name, '**') === 'Language')
 					{
 						$text = FinderHelperLanguage::branchLanguageTitle($branch->text);
 					}
diff --git a/administrator/components/com_finder/models/filter.php b/administrator/components/com_finder/models/filter.php
index 17e1d6fe0d1a2..59c68b36a3adf 100644
--- a/administrator/components/com_finder/models/filter.php
+++ b/administrator/components/com_finder/models/filter.php
@@ -163,13 +163,11 @@ protected function loadFormData()
 	 */
 	public function getTotal()
 	{
-		$db = JFactory::getDbo();
+		$db    = JFactory::getDbo();
 		$query = $db->getQuery(true)
 			->select('MAX(link_id)')
 			->from('#__finder_links');
-		$db->setQuery($query);
-		$total = $db->loadResult();
 
-		return $total;
+		return $db->setQuery($query)->loadResult();
 	}
 }
diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php
index 04e2560dbe9db..7f9b9a67b718f 100644
--- a/administrator/components/com_finder/models/index.php
+++ b/administrator/components/com_finder/models/index.php
@@ -225,7 +225,7 @@ protected function getListQuery()
 		$listOrder = $this->getState('list.ordering', 'l.title');
 		$listDir   = $this->getState('list.direction', 'ASC');
 
-		if ($listOrder == 't.title')
+		if ($listOrder === 't.title')
 		{
 			$ordering = $db->quoteName('t.title') . ' ' . $db->escape($listDir) . ', ' . $db->quoteName('l.title') . ' ' . $db->escape($listDir);
 		}
@@ -417,16 +417,13 @@ public function publish(&$pks, $value = 1)
 		{
 			$table->reset();
 
-			if ($table->load($pk))
+			if ($table->load($pk) && !$this->canEditState($table))
 			{
-				if (!$this->canEditState($table))
-				{
-					// Prune items that you can't change.
-					unset($pks[$i]);
-					$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+				// Prune items that you can't change.
+				unset($pks[$i]);
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
 
-					return false;
-				}
+				return false;
 			}
 		}
 
diff --git a/administrator/components/com_finder/models/maps.php b/administrator/components/com_finder/models/maps.php
index 6b25455578a99..985dfce6bb613 100644
--- a/administrator/components/com_finder/models/maps.php
+++ b/administrator/components/com_finder/models/maps.php
@@ -225,11 +225,11 @@ protected function getListQuery()
 		$listOrdering = $this->getState('list.ordering', 'd.branch_title');
 		$listDirn     = $this->getState('list.direction', 'ASC');
 
-		if ($listOrdering == 'd.branch_title')
+		if ($listOrdering === 'd.branch_title')
 		{
 			$query->order("branch_title $listDirn, level ASC, a.title $listDirn");
 		}
-		elseif ($listOrdering == 'a.state')
+		elseif ($listOrdering === 'a.state')
 		{
 			$query->order("a.state $listDirn, branch_title $listDirn, level ASC");
 		}
@@ -345,16 +345,13 @@ public function publish(&$pks, $value = 1)
 		{
 			$table->reset();
 
-			if ($table->load($pk))
+			if ($table->load($pk) && !$this->canEditState($table))
 			{
-				if (!$this->canEditState($table))
-				{
-					// Prune items that you can't change.
-					unset($pks[$i]);
-					$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+				// Prune items that you can't change.
+				unset($pks[$i]);
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
 
-					return false;
-				}
+				return false;
 			}
 		}
 
diff --git a/administrator/components/com_finder/tables/filter.php b/administrator/components/com_finder/tables/filter.php
index 6ca4b0cd73490..cd3a6152babd1 100644
--- a/administrator/components/com_finder/tables/filter.php
+++ b/administrator/components/com_finder/tables/filter.php
@@ -67,14 +67,14 @@ public function bind($array, $ignore = '')
 	 */
 	public function check()
 	{
-		if (trim($this->alias) == '')
+		if (trim($this->alias) === '')
 		{
 			$this->alias = $this->title;
 		}
 
 		$this->alias = JApplicationHelper::stringURLSafe($this->alias);
 
-		if (trim(str_replace('-', '', $this->alias)) == '')
+		if (trim(str_replace('-', '', $this->alias)) === '')
 		{
 			$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
 		}
@@ -168,12 +168,12 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		}
 
 		// If checkin is supported and all rows were adjusted, check them in.
-		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		if ($checkin && count($pks) === $this->_db->getAffectedRows())
 		{
 			// Checkin the rows.
 			foreach ($pks as $pk)
 			{
-				$this->checkin($pk);
+				$this->checkIn($pk);
 			}
 		}
 
diff --git a/administrator/components/com_finder/views/filter/view.html.php b/administrator/components/com_finder/views/filter/view.html.php
index 702ab8076a1a3..f725a2464e62a 100644
--- a/administrator/components/com_finder/views/filter/view.html.php
+++ b/administrator/components/com_finder/views/filter/view.html.php
@@ -20,6 +20,8 @@ class FinderViewFilter extends JViewLegacy
 	 * The filter object
 	 *
 	 * @var  FinderTableFilter
+	 *
+	 * @since  3.6.2
 	 */
 	protected $filter;
 
@@ -27,23 +29,38 @@ class FinderViewFilter extends JViewLegacy
 	 * The JForm object
 	 *
 	 * @var  JForm
+	 *
+	 * @since  3.6.2
 	 */
 	protected $form;
 
 	/**
 	 * The active item
 	 *
-	 * @var  object
+	 * @var  JObject|boolean
+	 *
+	 * @since  3.6.2
 	 */
 	protected $item;
 
 	/**
 	 * The model state
 	 *
-	 * @var  object
+	 * @var  mixed
+	 *
+	 * @since  3.6.2
 	 */
 	protected $state;
 
+	/**
+	 * The total indexed items
+	 *
+	 * @var  integer
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $total;
+
 	/**
 	 * Method to display the view.
 	 *
@@ -114,19 +131,16 @@ protected function addToolbar()
 		else
 		{
 			// Can't save the record if it's checked out.
-			if (!$checkedOut)
+			// Since it's an existing record, check the edit permission.
+			if (!$checkedOut && $canDo->get('core.edit'))
 			{
-				// Since it's an existing record, check the edit permission.
-				if ($canDo->get('core.edit'))
+				JToolbarHelper::apply('filter.apply');
+				JToolbarHelper::save('filter.save');
+
+				// We can save this record, but check the create permission to see if we can return to make a new one.
+				if ($canDo->get('core.create'))
 				{
-					JToolbarHelper::apply('filter.apply');
-					JToolbarHelper::save('filter.save');
-
-					// We can save this record, but check the create permission to see if we can return to make a new one.
-					if ($canDo->get('core.create'))
-					{
-						JToolbarHelper::save2new('filter.save2new');
-					}
+					JToolbarHelper::save2new('filter.save2new');
 				}
 			}
 
diff --git a/administrator/components/com_finder/views/filters/tmpl/default.php b/administrator/components/com_finder/views/filters/tmpl/default.php
index c7ead6c2b3df7..07f9feeb67f1a 100644
--- a/administrator/components/com_finder/views/filters/tmpl/default.php
+++ b/administrator/components/com_finder/views/filters/tmpl/default.php
@@ -88,43 +88,47 @@
 			</tfoot>
 			<tbody>
 				<?php
+				$canCreate                  = $user->authorise('core.create', 'com_finder');
+				$canEdit                    = $user->authorise('core.edit', 'com_finder');
+				$userAuthoriseCoreManage    = $user->authorise('core.manage', 'com_checkin');
+				$userAuthoriseCoreEditState = $user->authorise('core.edit.state', 'com_finder');
+				$userId                     = $user->get('id');
 				foreach ($this->items as $i => $item) :
-				$canCreate  = $user->authorise('core.create',     'com_finder');
-				$canEdit    = $user->authorise('core.edit',       'com_finder');
-				$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
-				$canChange  = $user->authorise('core.edit.state', 'com_finder') && $canCheckin;
-				?>
-				<tr class="row<?php echo $i % 2; ?>">
-					<td class="center">
-						<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
-					</td>
-					<td class="center nowrap">
-						<?php echo JHtml::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
-					</td>
-					<td>
-						<?php if ($item->checked_out) : ?>
-							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckin); ?>
-						<?php endif; ?>
-						<?php if ($canEdit) : ?>
-							<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
-								<?php echo $this->escape($item->title); ?></a>
-						<?php else : ?>
-							<?php echo $this->escape($item->title); ?>
-						<?php endif; ?>
-					</td>
-					<td class="nowrap hidden-phone">
-						<?php echo $item->created_by_alias ?: $item->user_name; ?>
-					</td>
-					<td class="nowrap hidden-phone">
-						<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
-					</td>
-					<td class="nowrap hidden-phone">
-						<?php echo $item->map_count; ?>
-					</td>
-					<td class="hidden-phone">
-						<?php echo (int) $item->filter_id; ?>
-					</td>
-				</tr>
+					$canCheckIn   = $userAuthoriseCoreManage || $item->checked_out == $userId || $item->checked_out == 0;
+					$canChange    = $userAuthoriseCoreEditState && $canCheckIn;
+					$escapedTitle = $this->escape($item->title);
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
+						</td>
+						<td class="center nowrap">
+							<?php echo JHtml::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
+						</td>
+						<td>
+							<?php if ($item->checked_out) : ?>
+								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
+							<?php endif; ?>
+							<?php if ($canEdit) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
+									<?php echo $escapedTitle; ?></a>
+							<?php else : ?>
+								<?php echo $escapedTitle; ?>
+							<?php endif; ?>
+						</td>
+						<td class="nowrap hidden-phone">
+							<?php echo $item->created_by_alias ?: $item->user_name; ?>
+						</td>
+						<td class="nowrap hidden-phone">
+							<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+						</td>
+						<td class="nowrap hidden-phone">
+							<?php echo $item->map_count; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->filter_id; ?>
+						</td>
+					</tr>
 				<?php endforeach; ?>
 			</tbody>
 		</table>
diff --git a/administrator/components/com_finder/views/filters/view.html.php b/administrator/components/com_finder/views/filters/view.html.php
index f65859ba4fd6b..823fd40e484b1 100644
--- a/administrator/components/com_finder/views/filters/view.html.php
+++ b/administrator/components/com_finder/views/filters/view.html.php
@@ -20,6 +20,8 @@ class FinderViewFilters extends JViewLegacy
 	 * An array of items
 	 *
 	 * @var  array
+	 *
+	 * @since  3.6.1
 	 */
 	protected $items;
 
@@ -27,6 +29,8 @@ class FinderViewFilters extends JViewLegacy
 	 * The pagination object
 	 *
 	 * @var  JPagination
+	 *
+	 * @since  3.6.1
 	 */
 	protected $pagination;
 
@@ -34,20 +38,26 @@ class FinderViewFilters extends JViewLegacy
 	 * The HTML markup for the sidebar
 	 *
 	 * @var  string
+	 *
+	 * @since  3.6.1
 	 */
 	protected $sidebar;
 
 	/**
 	 * The model state
 	 *
-	 * @var  object
+	 * @var  mixed
+	 *
+	 * @since  3.6.1
 	 */
 	protected $state;
 
 	/**
 	 * The total number of items
 	 *
-	 * @var  object
+	 * @var  integer
+	 *
+	 * @since  3.6.1
 	 */
 	protected $total;
 
diff --git a/administrator/components/com_finder/views/index/tmpl/default.php b/administrator/components/com_finder/views/index/tmpl/default.php
index 7b2a066403c8a..387c51e9bfd41 100644
--- a/administrator/components/com_finder/views/index/tmpl/default.php
+++ b/administrator/components/com_finder/views/index/tmpl/default.php
@@ -118,7 +118,7 @@
 						<?php echo JHtml::_('date', $item->indexdate, JText::_('DATE_FORMAT_LC4')); ?>
 					</td>
 					<td class="center hidden-phone hidden-tablet">
-						<?php if (intval($item->publish_start_date) or intval($item->publish_end_date) or intval($item->start_date) or intval($item->end_date)) : ?>
+						<?php if ((int) $item->publish_start_date || (int) $item->publish_end_date || (int) $item->start_date || (int) $item->end_date) : ?>
 							<span class="icon-calendar pop hasPopover" aria-hidden="true" data-placement="left" title="<?php echo JText::_('COM_FINDER_INDEX_DATE_INFO_TITLE'); ?>" data-content="<?php echo JText::sprintf('COM_FINDER_INDEX_DATE_INFO', $item->publish_start_date, $item->publish_end_date, $item->start_date, $item->end_date); ?>"></span>
 							<span class="element-invisible"><?php echo JText::sprintf('COM_FINDER_INDEX_DATE_INFO', $item->publish_start_date, $item->publish_end_date, $item->start_date, $item->end_date); ?></span>
 						<?php endif; ?>
diff --git a/administrator/components/com_finder/views/index/view.html.php b/administrator/components/com_finder/views/index/view.html.php
index 880a696e19094..681718eff6a70 100644
--- a/administrator/components/com_finder/views/index/view.html.php
+++ b/administrator/components/com_finder/views/index/view.html.php
@@ -22,6 +22,8 @@ class FinderViewIndex extends JViewLegacy
 	 * An array of items
 	 *
 	 * @var  array
+	 *
+	 * @since  3.6.1
 	 */
 	protected $items;
 
@@ -29,6 +31,8 @@ class FinderViewIndex extends JViewLegacy
 	 * The pagination object
 	 *
 	 * @var  JPagination
+	 *
+	 * @since  3.6.1
 	 */
 	protected $pagination;
 
@@ -36,6 +40,8 @@ class FinderViewIndex extends JViewLegacy
 	 * The state of core Smart Search plugins
 	 *
 	 * @var  array
+	 *
+	 * @since  3.6.1
 	 */
 	protected $pluginState;
 
@@ -43,20 +49,26 @@ class FinderViewIndex extends JViewLegacy
 	 * The HTML markup for the sidebar
 	 *
 	 * @var  string
+	 *
+	 * @since  3.6.1
 	 */
 	protected $sidebar;
 
 	/**
 	 * The model state
 	 *
-	 * @var  object
+	 * @var  mixed
+	 *
+	 * @since  3.6.1
 	 */
 	protected $state;
 
 	/**
 	 * The total number of items
 	 *
-	 * @var  object
+	 * @var  integer
+	 *
+	 * @since  3.6.1
 	 */
 	protected $total;
 
diff --git a/administrator/components/com_finder/views/maps/tmpl/default.php b/administrator/components/com_finder/views/maps/tmpl/default.php
index 5835f81048dae..6c93f665429af 100644
--- a/administrator/components/com_finder/views/maps/tmpl/default.php
+++ b/administrator/components/com_finder/views/maps/tmpl/default.php
@@ -99,7 +99,7 @@
 					</td>
 					<td>
 					<?php
-					if (trim($item->parent_title, '**') == 'Language')
+					if (trim($item->parent_title, '**') === 'Language')
 					{
 						$title = FinderHelperLanguage::branchLanguageTitle($item->title);
 					}
@@ -115,7 +115,7 @@
 					<label for="cb<?php echo $i; ?>" style="display:inline-block;">
 						<?php echo $this->escape($title); ?>
 					</label>
-					<?php if ($this->escape(trim($title, '**')) == 'Language' && JLanguageMultilang::isEnabled()) : ?>
+					<?php if ($this->escape(trim($title, '**')) === 'Language' && JLanguageMultilang::isEnabled()) : ?>
 						<strong><?php echo JText::_('COM_FINDER_MAPS_MULTILANG'); ?></strong>
 					<?php endif; ?>
 					</td>
diff --git a/administrator/components/com_finder/views/maps/view.html.php b/administrator/components/com_finder/views/maps/view.html.php
index 9a5cdfe4495bc..59eb08744d323 100644
--- a/administrator/components/com_finder/views/maps/view.html.php
+++ b/administrator/components/com_finder/views/maps/view.html.php
@@ -22,6 +22,8 @@ class FinderViewMaps extends JViewLegacy
 	 * An array of items
 	 *
 	 * @var  array
+	 *
+	 * @since  3.6.1
 	 */
 	protected $items;
 
@@ -29,6 +31,8 @@ class FinderViewMaps extends JViewLegacy
 	 * The pagination object
 	 *
 	 * @var  JPagination
+	 *
+	 * @since  3.6.1
 	 */
 	protected $pagination;
 
@@ -36,6 +40,8 @@ class FinderViewMaps extends JViewLegacy
 	 * The HTML markup for the sidebar
 	 *
 	 * @var  string
+	 *
+	 * @since  3.6.1
 	 */
 	protected $sidebar;
 
@@ -43,6 +49,8 @@ class FinderViewMaps extends JViewLegacy
 	 * The model state
 	 *
 	 * @var  object
+	 *
+	 * @since  3.6.1
 	 */
 	protected $state;
 
@@ -50,6 +58,8 @@ class FinderViewMaps extends JViewLegacy
 	 * The total number of items
 	 *
 	 * @var  object
+	 *
+	 * @since  3.6.1
 	 */
 	protected $total;
 
diff --git a/administrator/components/com_finder/views/statistics/tmpl/default.php b/administrator/components/com_finder/views/statistics/tmpl/default.php
index f5597fffa26fa..9b7651253dd92 100644
--- a/administrator/components/com_finder/views/statistics/tmpl/default.php
+++ b/administrator/components/com_finder/views/statistics/tmpl/default.php
@@ -34,7 +34,7 @@
 						<?php
 						$lang_key    = 'PLG_FINDER_STATISTICS_' . str_replace(' ', '_', $type->type_title);
 						$lang_string = JText::_($lang_key);
-						echo ($lang_string == $lang_key) ? $type->type_title : $lang_string;
+						echo $lang_string === $lang_key ? $type->type_title : $lang_string;
 						?>
 					</td>
 					<td>
diff --git a/administrator/components/com_finder/views/statistics/view.html.php b/administrator/components/com_finder/views/statistics/view.html.php
index a938942bb7450..af7689fb0a1d4 100644
--- a/administrator/components/com_finder/views/statistics/view.html.php
+++ b/administrator/components/com_finder/views/statistics/view.html.php
@@ -20,6 +20,8 @@ class FinderViewStatistics extends JViewLegacy
 	 * The index statistics
 	 *
 	 * @var  JObject
+	 *
+	 * @since  3.6.1
 	 */
 	protected $data;
 
diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php
index b464cda411f4d..dbc88b2fee30c 100644
--- a/components/com_finder/helpers/html/filter.php
+++ b/components/com_finder/helpers/html/filter.php
@@ -116,7 +116,7 @@ public static function slider($options = array())
 		foreach ($branches as $bk => $bv)
 		{
 			// If the multi-lang plugin is enabled then drop the language branch.
-			if ($bv->title == 'Language' && JLanguageMultilang::isEnabled())
+			if ($bv->title === 'Language' && JLanguageMultilang::isEnabled())
 			{
 				continue;
 			}
@@ -150,7 +150,7 @@ public static function slider($options = array())
 			$lang = JFactory::getLanguage();
 			foreach ($nodes as $nk => $nv)
 			{
-				if (trim($nv->parent_title, '**') == 'Language')
+				if (trim($nv->parent_title, '**') === 'Language')
 				{
 					$title = FinderHelperLanguage::branchLanguageTitle($nv->title);
 				}
@@ -302,7 +302,7 @@ public static function select($idxQuery, $options)
 			foreach ($branches as $bk => $bv)
 			{
 				// If the multi-lang plugin is enabled then drop the language branch.
-				if ($bv->title == 'Language' && JLanguageMultilang::isEnabled())
+				if ($bv->title === 'Language' && JLanguageMultilang::isEnabled())
 				{
 					continue;
 				}
@@ -342,7 +342,7 @@ public static function select($idxQuery, $options)
 				$language = JFactory::getLanguage();
 				foreach ($branches[$bk]->nodes as $node_id => $node)
 				{
-					if (trim($node->parent_title, '**') == 'Language')
+					if (trim($node->parent_title, '**') === 'Language')
 					{
 						$title = FinderHelperLanguage::branchLanguageTitle($node->title);
 					}
@@ -375,7 +375,7 @@ public static function select($idxQuery, $options)
 		foreach ($branches as $bk => $bv)
 		{
 			// If the multi-lang plugin is enabled then drop the language branch.
-			if ($bv->title == 'Language' && JLanguageMultilang::isEnabled())
+			if ($bv->title === 'Language' && JLanguageMultilang::isEnabled())
 			{
 				continue;
 			}
@@ -394,14 +394,14 @@ public static function select($idxQuery, $options)
 
 			// Build a node.
 			$html .= '<div class="controls finder-selects">';
-			$html .= '<label for="tax-' . JFilterOutput::stringUrlSafe($bv->title) . '" class="control-label">';
+			$html .= '<label for="tax-' . JFilterOutput::stringURLSafe($bv->title) . '" class="control-label">';
 			$html .= JText::sprintf('COM_FINDER_FILTER_BRANCH_LABEL', JText::_(FinderHelperLanguage::branchSingular($bv->title)));
 			$html .= '</label>';
 			$html .= '<br />';
 			$html .= JHtml::_(
 				'select.genericlist',
 				$branches[$bk]->nodes, 't[]', 'class="inputbox advancedSelect"', 'id', 'title', $active,
-				'tax-' . JFilterOutput::stringUrlSafe($bv->title)
+				'tax-' . JFilterOutput::stringURLSafe($bv->title)
 			);
 			$html .= '</div>';
 		}
diff --git a/components/com_finder/helpers/html/query.php b/components/com_finder/helpers/html/query.php
index fb01e80cf766c..2e28d0ba4b8e1 100644
--- a/components/com_finder/helpers/html/query.php
+++ b/components/com_finder/helpers/html/query.php
@@ -50,7 +50,7 @@ public static function explained(FinderIndexerQuery $query)
 		// Process the excluded tokens.
 		foreach ($query->excluded as $token)
 		{
-			if (!isset($token->derived) || $token->derived == false)
+			if (!isset($token->derived) || $token->derived === false)
 			{
 				$parts[] = '<span class="query-excluded">' . JText::sprintf('COM_FINDER_QUERY_TOKEN_EXCLUDED', $token->term) . '</span>';
 			}
diff --git a/components/com_finder/models/search.php b/components/com_finder/models/search.php
index 0c1f9914e40d4..4699316f74920 100644
--- a/components/com_finder/models/search.php
+++ b/components/com_finder/models/search.php
@@ -264,11 +264,11 @@ protected function getListQuery()
 			$date1 = $db->quote($this->query->date1);
 
 			// Add the appropriate WHERE condition.
-			if ($this->query->when1 == 'before')
+			if ($this->query->when1 === 'before')
 			{
 				$query->where($db->quoteName('l.start_date') . ' <= ' . $date1);
 			}
-			elseif ($this->query->when1 == 'after')
+			elseif ($this->query->when1 === 'after')
 			{
 				$query->where($db->quoteName('l.start_date') . ' >= ' . $date1);
 			}
@@ -285,11 +285,11 @@ protected function getListQuery()
 			$date2 = $db->quote($this->query->date2);
 
 			// Add the appropriate WHERE condition.
-			if ($this->query->when2 == 'before')
+			if ($this->query->when2 === 'before')
 			{
 				$query->where($db->quoteName('l.start_date') . ' <= ' . $date2);
 			}
-			elseif ($this->query->when2 == 'after')
+			elseif ($this->query->when2 === 'after')
 			{
 				$query->where($db->quoteName('l.start_date') . ' >= ' . $date2);
 			}
@@ -425,7 +425,7 @@ protected function getResultsTotal()
 					$temp = $this->_db->loadObjectList();
 
 					// Set the more flag to true if any of the sets equal the limit.
-					$more = (count($temp) === $limit) ? true : false;
+					$more = count($temp) === $limit;
 
 					// We loaded the data unkeyed but we need it to be keyed for later.
 					$junk = $temp;
@@ -536,7 +536,7 @@ protected function getResultsTotal()
 						$temp = $this->_db->loadObjectList('link_id');
 
 						// Set the required token more flag to true if the set equal the limit.
-						$reqMore = (count($temp) === $limit) ? true : false;
+						$reqMore = count($temp) === $limit;
 
 						// Merge the matching set for this token.
 						$reqTemp += $temp;
@@ -544,7 +544,7 @@ protected function getResultsTotal()
 						// Increment the term offset.
 						$reqStart += $limit;
 					}
-					while ($reqMore == true);
+					while ($reqMore === true);
 
 					// Store this set in cache.
 					$this->store($setId, $reqTemp);
@@ -711,7 +711,7 @@ protected function getResultsData()
 				}
 
 				// Set the more flag to true if any of the sets equal the limit.
-				$more = (count($temp) === $limit) ? true : false;
+				$more = count($temp) === $limit;
 
 				// Merge the results.
 				$results = array_merge($results, $temp);
@@ -857,7 +857,7 @@ protected function getResultsData()
 						$temp = $this->_db->loadObjectList('link_id');
 
 						// Set the required token more flag to true if the set equal the limit.
-						$reqMore = (count($temp) === $limit) ? true : false;
+						$reqMore = count($temp) === $limit;
 
 						// Merge the matching set for this token.
 						$reqTemp += $temp;
@@ -865,7 +865,7 @@ protected function getResultsData()
 						// Increment the term offset.
 						$reqStart += $limit;
 					}
-					while ($reqMore == true);
+					while ($reqMore === true);
 
 					// Store this set in cache.
 					$this->store($setId, $reqTemp);
@@ -1048,7 +1048,6 @@ protected function populateState($ordering = null, $direction = null)
 		$input = $app->input;
 		$params = $app->getParams();
 		$user = JFactory::getUser();
-		$filter = JFilterInput::getInstance();
 
 		$this->setState('filter.language', JLanguageMultilang::isEnabled());
 
@@ -1114,7 +1113,7 @@ protected function populateState($ordering = null, $direction = null)
 				$this->setState('list.ordering', 'l.list_price');
 				break;
 
-			case ($order == 'relevance' && !empty($this->includedTerms)) :
+			case ($order === 'relevance' && !empty($this->includedTerms)) :
 				$this->setState('list.ordering', 'm.weight');
 				break;
 
diff --git a/components/com_finder/router.php b/components/com_finder/router.php
index 4e9fb54aeb15c..2c0e8dbaa4dcf 100644
--- a/components/com_finder/router.php
+++ b/components/com_finder/router.php
@@ -34,7 +34,7 @@ public function build(&$query)
 		 * route, it only provides the option and the menu item id. We don't have
 		 * to do anything to these routes.
 		 */
-		if (count($query) === 2 && isset($query['Itemid']) && isset($query['option']))
+		if (count($query) === 2 && isset($query['Itemid'], $query['option']))
 		{
 			return $segments;
 		}
diff --git a/components/com_finder/views/search/tmpl/default_results.php b/components/com_finder/views/search/tmpl/default_results.php
index 895df6aa22350..a031d7bb2d273 100644
--- a/components/com_finder/views/search/tmpl/default_results.php
+++ b/components/com_finder/views/search/tmpl/default_results.php
@@ -33,7 +33,7 @@
 <?php endif; ?>
 
 <?php // Display the 'no results' message and exit the template. ?>
-<?php if ($this->total == 0) : ?>
+<?php if ($this->total === 0) : ?>
 	<div id="search-result-empty">
 		<h2><?php echo JText::_('COM_FINDER_SEARCH_NO_RESULTS_HEADING'); ?></h2>
 		<?php $multilang = JFactory::getApplication()->getLanguageFilter() ? '_MULTILANG' : ''; ?>
diff --git a/components/com_finder/views/search/view.html.php b/components/com_finder/views/search/view.html.php
index 2d615340774fe..f2c15cf351828 100644
--- a/components/com_finder/views/search/view.html.php
+++ b/components/com_finder/views/search/view.html.php
@@ -18,14 +18,56 @@
  */
 class FinderViewSearch extends JViewLegacy
 {
+	/**
+	 * The query object
+	 *
+	 * @var  FinderIndexerQuery
+	 */
 	protected $query;
 
+	/**
+	 * The application parameters
+	 *
+	 * @var  Registry  The parameters object
+	 */
 	protected $params;
 
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
 	protected $state;
 
 	protected $user;
 
+	/**
+	 * An array of results
+	 *
+	 * @var    array
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $results;
+
+	/**
+	 * The total number of items
+	 *
+	 * @var    integer
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $total;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $pagination;
+
 	/**
 	 * Method to display the view.
 	 *
@@ -37,7 +79,7 @@ class FinderViewSearch extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$app = JFactory::getApplication();
+		$app    = JFactory::getApplication();
 		$params = $app->getParams();
 
 		// Get view data.
@@ -55,21 +97,22 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
 		// Configure the pathway.
 		if (!empty($query->input))
 		{
-			$app->getPathWay()->addItem($this->escape($query->input));
+			$app->getPathway()->addItem($this->escape($query->input));
 		}
 
 		// Push out the view data.
-		$this->state = &$state;
-		$this->params = &$params;
-		$this->query = &$query;
-		$this->results = &$results;
-		$this->total = &$total;
+		$this->state      = &$state;
+		$this->params     = &$params;
+		$this->query      = &$query;
+		$this->results    = &$results;
+		$this->total      = &$total;
 		$this->pagination = &$pagination;
 
 		// Check for a double quote in the query string.
@@ -166,7 +209,7 @@ protected function getLayoutFile($layout = null)
 		// Check if the file exists.
 		jimport('joomla.filesystem.path');
 		$filetofind = $this->_createFileName('template', array('name' => $file));
-		$exists = JPath::find($this->_path['template'], $filetofind);
+		$exists     = JPath::find($this->_path['template'], $filetofind);
 
 		return ($exists ? $layout : 'result');
 	}
@@ -182,7 +225,7 @@ protected function getLayoutFile($layout = null)
 	 */
 	protected function prepareDocument($query)
 	{
-		$app = JFactory::getApplication();
+		$app   = JFactory::getApplication();
 		$menus = $app->getMenu();
 		$title = null;
 
@@ -231,12 +274,12 @@ protected function prepareDocument($query)
 		// Configure the document meta-keywords.
 		if (!empty($query->highlight))
 		{
-			$this->document->setMetadata('keywords', implode(', ', $query->highlight));
+			$this->document->setMetaData('keywords', implode(', ', $query->highlight));
 		}
 
 		if ($this->params->get('robots'))
 		{
-			$this->document->setMetadata('robots', $this->params->get('robots'));
+			$this->document->setMetaData('robots', $this->params->get('robots'));
 		}
 
 		// Add feed link to the document head.

From c5a29d5622f58c10968faf4585aacc9f4e1de27e Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Thu, 20 Jul 2017 21:46:45 +0200
Subject: [PATCH 030/148] Updated installation language files

---
 installation/language/af-ZA/af-ZA.ini |  3 +++
 installation/language/da-DK/da-DK.ini |  3 +++
 installation/language/fr-FR/fr-FR.ini |  6 +++---
 installation/language/hr-HR/hr-HR.ini |  6 +++---
 installation/language/it-IT/it-IT.ini |  6 +++---
 installation/language/ja-JP/ja-JP.ini | 15 +++++++++++----
 installation/language/ja-JP/ja-JP.xml |  4 ++--
 installation/language/ko-KR/ko-KR.ini |  3 +++
 installation/language/ko-KR/ko-KR.xml |  4 ++--
 installation/language/mk-MK/mk-MK.ini |  6 +++---
 installation/language/sk-SK/sk-SK.ini |  6 +++---
 installation/language/sl-SI/sl-SI.ini |  4 ++--
 installation/language/sr-RS/sr-RS.ini |  3 +++
 installation/language/sr-RS/sr-RS.xml |  4 ++--
 installation/language/sr-YU/sr-YU.ini |  3 +++
 installation/language/sr-YU/sr-YU.xml |  4 ++--
 installation/language/sw-KE/sw-KE.ini |  6 +++---
 installation/language/ta-IN/ta-IN.ini | 10 +++++-----
 installation/language/th-TH/th-TH.ini |  6 +++---
 19 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/installation/language/af-ZA/af-ZA.ini b/installation/language/af-ZA/af-ZA.ini
index a732fb3a2a412..7a77b3dbbd657 100644
--- a/installation/language/af-ZA/af-ZA.ini
+++ b/installation/language/af-ZA/af-ZA.ini
@@ -316,3 +316,6 @@ JLIB_INSTALLER_ABORT="Taalpaket installeering word afgebreek: %s"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_CREATE_DIRECTORY="Paket Installeering: Kon nie vouer skep nie: %s."
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paket %1: Daar was 'n fout met die installeering van ekstensie: %2"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Paket %s: Daar was geen l&ecirc;&euml;rs om te installeer nie!"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Om een of ander rede kan ons nie die l&ecirc;er skep nie. Skep asb. per hand 'n l&ecirc;er &quot;%s&quot; en laai dit op na die &quot;installation&quot;-vouer van jou Joomla webwerf."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Sodat ons kan bevestig dat jy die eienaar van hierdie webwerf is, verwyder asb. die l&ecirc;er &quot;%s&quot; wat ons nou net in die &quot;installation&quot;-vouer van jou Joomla webwerf geskep het."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Jy wil jou databasis op 'n ander bediener huisves as waar jou webwerf gehuisves is. Vir sekuriteits-redes moet jy bevestig wie die eienaar van hierdie webhosting rekening is. <a href="_QQ_"%s"_QQ_">Gaan asb. die dokumentasie na</a> vir verdere inligting."
diff --git a/installation/language/da-DK/da-DK.ini b/installation/language/da-DK/da-DK.ini
index cbce30c66f3ac..193ee829297c8 100644
--- a/installation/language/da-DK/da-DK.ini
+++ b/installation/language/da-DK/da-DK.ini
@@ -31,6 +31,9 @@ INSTL_DATABASE="Databasekonfiguration"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database forespørgsel fejlede."
 INSTL_DATABASE_HOST_DESC="Dette er typisk "_QQ_"localhost"_QQ_" eller et navn leveret af din udbyder."
 INSTL_DATABASE_HOST_LABEL="Hostnavn"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Vi kunne ikke oprette filen. Opret venligst manuelt en fil med navnet "_QQ_"%s"_QQ_" og upload den til mappen "_QQ_"installation"_QQ_" i din Joomla websteds rod."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="For at bekræfte at du er ejeren af dette websted, så slet venligst filen der hedder "_QQ_"%s"_QQ_", som vi netop har oprettet i mappen "_QQ_"installation"_QQ_" på Joomla websted."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Du prøver på at anvende en database host, som ikke er på din lokale server. Af sikkerhedsgrunde skal du verificere ejerskabet af din webhost konto. <a href="_QQ_"%s"_QQ_">Læs venligst dokumentationen</a> for mere information."
 INSTL_DATABASE_NAME_DESC="Nogle webhosts tillader kun et bestemt databasenavn pr websted. Anvend tabelprefiks i disse situationer for at køre flere Joomla! websteder fra samme database."
 INSTL_DATABASE_NAME_LABEL="Databasenavn"
 INSTL_DATABASE_NO_SCHEMA="Intet database skema eksisterer for denne databasetype."
diff --git a/installation/language/fr-FR/fr-FR.ini b/installation/language/fr-FR/fr-FR.ini
index 5926908d70768..58211c53d66e6 100644
--- a/installation/language/fr-FR/fr-FR.ini
+++ b/installation/language/fr-FR/fr-FR.ini
@@ -30,10 +30,10 @@ INSTL_PRECHECK_ACTUAL="Actuel"
 INSTL_DATABASE="Configuration de la base de données"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Échec de requête de base de données PostgreSQL."
 INSTL_DATABASE_HOST_DESC="Généralement "_QQ_"<strong>localhost</strong>"_QQ_" sauf indication différente de l'hébergeur."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nous ne sommes pas en mesure de créer le fichier. Créez manuellement un fichier nommé '%s' et téléchargez-le dans le dossier 'installation' de votre site Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Afin de confirmer que vous êtes le propriétaire de ce site Web, supprimez le fichier '%s' que nous venons de créer dans le dossier 'installation' de votre site Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Vous souhaitez utiliser un hôte de base de données qui n'est pas sur votre serveur local. Pour des raisons de sécurité, vous devez vérifier la propriété du compte d'hébergement Web utilisé. <a href="_QQ_"%s"_QQ_">Lire la documentation</a> pour plus d'informations."
 INSTL_DATABASE_HOST_LABEL="Nom du serveur"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Pour une raison quelconque, nous ne sommes pas en mesure de créer le fichier. Créez manuellement un fichier nommé %s et téléchargez-le dans le dossier 'installation' de votre Joomla."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Afin de confirmer que vous êtes le propriétaire de ce site Web, supprimez le fichier %s que nous venons de créer dans le dossier 'installation' de votre Joomla."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Vous souhaitez utiliser un hôte de base de données qui n'est pas 'localhost'. Pour des raisons de sécurité, vous devez vérifier la propriété du compte d'hébergement Web utilisé. Consultez ici [docspagelink] pour plus d'informations."
 INSTL_DATABASE_NAME_DESC="Nom de la base de données utilisée pour Joomla!<br />Généralement, <strong>la base de données doit déjà exister sur serveur distant!</strong>"
 INSTL_DATABASE_NAME_LABEL="Nom de la base de données"
 INSTL_DATABASE_NO_SCHEMA="Ce type de base de données ne contient pas de schema de base de données."
diff --git a/installation/language/hr-HR/hr-HR.ini b/installation/language/hr-HR/hr-HR.ini
index e68c5f222d6e9..8752a5c78ac76 100644
--- a/installation/language/hr-HR/hr-HR.ini
+++ b/installation/language/hr-HR/hr-HR.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Konfiguracija baze podataka"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL upit na bazu nije uspio."
 INSTL_DATABASE_HOST_DESC="Ovo je najčešće "_QQ_"localhost"_QQ_" ili ime koje ste dobili od hostera."
 INSTL_DATABASE_HOST_LABEL="Ime servera"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Želite koristiti server baze podataka koji nije localhost. Iz sigurnosnih razloga morate potvrditi vlasništvo web hosting korisničkog računa. Za više informacija pogledaj ovdje [docspagelink]."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Kako bi potvrdili da ste vlasnik ovog web hosta, molimo da izbrišete datoteku %s koju smo upravo kreirali u "_QQ_"installation"_QQ_" direktoriju vaše Joomle."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Iz nekog razloga nismo mogli kreirati datoteku. Molimo vas da ručno kreirate datoteku naziva %s i učitate je u "_QQ_"installation"_QQ_" direktorij vaše Joomle."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nismo mogli kreirati datoteku. Molimo vas da ručno kreirate datoteku naziva "_QQ_"%s"_QQ_" i učitate je u "_QQ_"installation"_QQ_" direktorij vašeg Joomla sitea."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Kako bi potvrdili da ste vlasnik ovog web sitea, molimo da izbrišete datoteku naziva "_QQ_"%s"_QQ_" koju smo upravo kreirali u "_QQ_"installation"_QQ_" direktoriju vašeg Joomla sitea."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Želite koristiti host baze podataka koji nije na vašem lokalnom serveru. Iz sigurnosnih razloga morate potvrditi vlasništvo vašeg web hosting računa. Za više informacija <a href="_QQ_"%s"_QQ_">pročitajte dokumentaciju</a>."
 INSTL_DATABASE_NAME_DESC="Neki hosteri dozvoljavaju samo određena imena baze podataka za svaki site. Koristite drugačiji prefiks tablice za različite Joomla! stranice."
 INSTL_DATABASE_NAME_LABEL="Ime baze podataka"
 INSTL_DATABASE_NO_SCHEMA="Ne postoji shema baze podataka za ovaj tip baze podataka."
diff --git a/installation/language/it-IT/it-IT.ini b/installation/language/it-IT/it-IT.ini
index 658e66da0b168..a85565af78e15 100644
--- a/installation/language/it-IT/it-IT.ini
+++ b/installation/language/it-IT/it-IT.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Configurazione database"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Query del database PostgreSQL fallita."
 INSTL_DATABASE_HOST_DESC="Generalmente è &quot;localhost&quot; o un nome fornito dal tuo hosting."
 INSTL_DATABASE_HOST_LABEL="Nome Host"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Stai utilizzando un tipo di host del database differente da localhost. Per ragioni di sicurezza, devi verificare di avere l'autorizzazione sullo spazio web che ospita il sito. Per maggiori informazioni prendi visione di questo documento: [docspagelink] ."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Per confermare di essere il proprietario di questo spazio web cortesemente elimina il file %s che è appena stato creato nella cartella &quot;installation&quot; del tuo Joomla."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Per qualche ragione non è stato possibile creare il file. Cortesemente crea tu manualmente un file con nome %s e caricalo nella cartella &quot;installation&quot; del tuo Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Stai utilizzando un tipo di host del database differente da localhost. Per ragioni di sicurezza, devi verificare di avere l'autorizzazione sullo spazio web che ospita il sito. Per maggiori informazioni prendi visione di questo <a href="_QQ_"%s"_QQ_">Please read the documentation</a>."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Per confermare di essere il proprietario di questo spazio web cortesemente elimina il file &quot;%s&quot; che è appena stato creato nella cartella &quot;installation&quot; del tuo Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Per qualche ragione non è stato possibile creare il file. Cortesemente crea tu manualmente un file con nome &quot;%s&quot; e caricalo nella cartella &quot;installation&quot; del tuo Joomla."
 INSTL_DATABASE_NAME_DESC="Alcuni gestori di host consentono un solo nome DB per sito. Se questo è il tuo caso, utilizza il prefisso tabelle per distinguere più di un sito Joomla!®."
 INSTL_DATABASE_NAME_LABEL="Nome database"
 INSTL_DATABASE_NO_SCHEMA="Non esiste nessun schema di database per questo tipo di database."
diff --git a/installation/language/ja-JP/ja-JP.ini b/installation/language/ja-JP/ja-JP.ini
index 0043c40a7056c..5c77aae7a4455 100644
--- a/installation/language/ja-JP/ja-JP.ini
+++ b/installation/language/ja-JP/ja-JP.ini
@@ -31,6 +31,9 @@ INSTL_DATABASE="データベース設定"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQLデータベースのクエリが失敗しました。"
 INSTL_DATABASE_HOST_DESC="通常は &quot;localhost&quot; ですが、ホストで指定された名前を入力することもあります。<br />(特に日本国内の一般向けレンタルサーバなど)"
 INSTL_DATABASE_HOST_LABEL="ホスト名"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="ファイルを作成できませんでした。手動で「%s」という名前のファイルを作成して「installation」フォルダにアップロードしてください。"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="このウェブサイトの所有者であることを確認するには、「installation」フォルダ内に作成された「%s」という名前のファイルを削除してください。"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="ローカルサーバーにないデータベースホストを使用しようとしています。セキュリティ上の理由から、Webホスティングアカウントの所有権を確認する必要があります。詳細については<a href="_QQ_"%s"_QQ_">ドキュメントをお読みください</a>。"
 INSTL_DATABASE_NAME_DESC="データベース名です。"
 INSTL_DATABASE_NAME_LABEL="データベース名"
 INSTL_DATABASE_NO_SCHEMA="このデータベースタイプにはデータベーススキーマは存在しません。"
@@ -124,7 +127,7 @@ INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="installationディレクトリは
 ; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="installationディレクトリを削除することができませんでした。手動でフォルダを削除してください。"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_FOLDER_REMOVED="installationディレクトリを正常に削除しました"
+INSTL_COMPLETE_FOLDER_REMOVED="installationディレクトリを削除しました。"
 INSTL_COMPLETE_LANGUAGE_1="その他言語の追加、多言語サイトの<br/>サンプル自動作成"
 ; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_LANGUAGE_DESC="installation フォルダを削除する前に、他の言語を追加することができます。Joomla!にその他の言語を追加したい場合は、次のボタンを選択してください。"
@@ -302,9 +305,13 @@ JLIB_FILESYSTEM_ERROR_COPY_FAILED="コピーに失敗しました"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: パスはフォルダではありません。 パス: %s"
 JLIB_FORM_FIELD_INVALID="未入力箇所があります:&#160"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="<b>%s</b> は入力必須です"
+JLIB_INSTALLER_ABORT="言語インストールを中断しています: %s"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_CREATE_DIRECTORY="パッケージのインストール: フォルダの作成に失敗しました: %s"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="パッケージ %1$s: エクステンションのインストール中にエラーが発生しました: %2$s"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="パッケージ %s: インストールするファイルがありません！"
 JLIB_FORM_VALIDATE_FIELD_INVALID="無効な項目です: %s"
-JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: ファイル %1$s を %2$s にコピーできませんでした"
-JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla! 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed."
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :インストール: ファイル %1$s を %2$s にコピーできませんでした"
+JLIB_INSTALLER_NOT_ERROR="エラーがTinyMCE言語ファイルのインストールに関連している場合は、言語のインストールには影響しません。Joomla!3.2.0より前に作成された言語パックの中には、個別にTinyMCE言語ファイルをインストールしようとするものがあります。これらは現在コアに含まれているため、インストールする必要はありません。"
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: データベースに接続できませんでした <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -350,4 +357,4 @@ INSTL_SAMPLE_BLOG_JP_SET_DESC="いくつかの記事と過去の記事、ブロ
 INSTL_SAMPLE_BROCHURE_JP_SET_DESC="いくつかのページ（ホーム・私たちについて・ニュース・お問い合わせで構成されるメニュー）と検索、カスタムHTML、ログインフォームモジュールを表示したサンプルです。"
 INSTL_SAMPLE_DATA_JP_SET_DESC="1ページ（1リンクのみのメニュー）と最新の記事、ログインフォームモジュールを表示したサンプルです。"
 INSTL_SAMPLE_LEARN_JP_SET_DESC="どのようにJoomla!が動作するかの解説記事を表示したサンプルです。"
-;INSTL_SAMPLE_TESTING_JP_SET_DESC="Joomla!の動作テストに役立つすべてのメニューアイテムを表示したサンプルです。"
+;INSTL_SAMPLE_TESTING_JP_SET_DESC="Joomla!の動作テストに役立つすべてのメニューアイテムを表示したサンプルです。"
\ No newline at end of file
diff --git a/installation/language/ja-JP/ja-JP.xml b/installation/language/ja-JP/ja-JP.xml
index ab6714287c6e7..18bd481e479c0 100644
--- a/installation/language/ja-JP/ja-JP.xml
+++ b/installation/language/ja-JP/ja-JP.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="installation">
 	<name>Japanese 日本語 (Japan)</name>
-	<version>3.7.0</version>
-	<creationDate>Feburary 2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>Joomla.jp</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/ko-KR/ko-KR.ini b/installation/language/ko-KR/ko-KR.ini
index a59c16c753bdc..ca9030d10326d 100644
--- a/installation/language/ko-KR/ko-KR.ini
+++ b/installation/language/ko-KR/ko-KR.ini
@@ -30,6 +30,9 @@ INSTL_PRECHECK_ACTUAL="현재 구성된 설정"
 INSTL_DATABASE="데이터베이스 설정"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL 데이터베이스 질의가 실패했습니다."
 INSTL_DATABASE_HOST_DESC="일반적으로 &quot;localhost&quot; 혹은 호스트에서 제시된 이름입니다."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="어떤 이유에서인지 파일을 생성할 수 없습니다. %s 파일을 생성하여 Joomla의 &quot;installation&quot; 폴더에 업로드하세요."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="이 웹 호스트의 소유자임을 확인하려면 Joomla의 &quot;installation&quot; 폴더에 생성된 %s 파일을 삭제하세요."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="로컬호스트가 아닌 데이터베이스를 사용하려 합니다. 보안상의 이유로 사용된 웹호스팅 계정의 소유권을 확인해야 합니다. 자세한 내용은 [docspagelink]를 참고하세요."
 INSTL_DATABASE_HOST_LABEL="Host 이름"
 INSTL_DATABASE_NAME_DESC="일부 호스트는 사이트별로 특정 DB 이름만 허용합니다. 이 경우 Joomla! 사이트 구분을 위해 테이블 접두사를 사용하세요."
 INSTL_DATABASE_NAME_LABEL="데이터베이스 이름"
diff --git a/installation/language/ko-KR/ko-KR.xml b/installation/language/ko-KR/ko-KR.xml
index 9730ce3352e45..de7fb47445065 100644
--- a/installation/language/ko-KR/ko-KR.xml
+++ b/installation/language/ko-KR/ko-KR.xml
@@ -3,8 +3,8 @@
 	version="3.7"
 	client="installation">
 	<name>Korean (Republic of Korea)</name>
-	<version>3.7.3</version>
-	<creationDate>June 2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>Korean translation team</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/mk-MK/mk-MK.ini b/installation/language/mk-MK/mk-MK.ini
index f0e522b170384..22bbeb2ee079d 100644
--- a/installation/language/mk-MK/mk-MK.ini
+++ b/installation/language/mk-MK/mk-MK.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Поставки за базата на податоци (DB)"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Неуспешно барање до PostgreSQL базата."
 INSTL_DATABASE_HOST_DESC="Ова е најчесто "_QQ_"localhost"_QQ_" или име дадено од вашиот хостинг."
 INSTL_DATABASE_HOST_LABEL="Име на домаќин"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Сакате да користите домаќин на база кој не е localhost. Од безбедносни причини, треба да ја потврдите сопственоста на користената веб сметка. Видете тука [docspagelink] за повеќе информации."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="За да потврдите дека сте сопственик на овој хостинг ве молиме избришете го документот %s кој штотуку го креиравме во папката &quot;installation&quot; од вашата Joomla."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Од некои причини не можеме да го креираме документот. Ве молиме рачно креирајте документ наречен %s и качете го во папката &quot;installation&quot; од вашата Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Не можеме да го креираме документот. Ве молиме рачно креирајте документ наречен &quot;%s&quot; и качете го во папката &quot;installation&quot; од вашиот Joomla сајт."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="За да потврдите дека сте сопственик на овој хостинг ве молиме избришете го документот &quot;%s&quot; кој штотуку го креиравме во папката &quot;installation&quot; од вашиот Joomla сајт."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Сакате да користите домаќин на база кој не е на вашиот локален сервер. Од безбедносни причини, треба да ја потврдите сопственоста на користената веб сметка. <a href="_QQ_"%s"_QQ_">Видете тука</a> за повеќе информации."
 INSTL_DATABASE_NAME_DESC="Некои домаќини дозволуваат само одредени имиња за DB по сајт. Во таков случај користете префикс на табелата за да го разликувате Joomla! сајтот."
 INSTL_DATABASE_NAME_LABEL="Име на базата на податоци"
 INSTL_DATABASE_NO_SCHEMA="Не постои шема на база на податоци за овој тип на база."
diff --git a/installation/language/sk-SK/sk-SK.ini b/installation/language/sk-SK/sk-SK.ini
index f7661c4efc2bf..d022c5f026765 100644
--- a/installation/language/sk-SK/sk-SK.ini
+++ b/installation/language/sk-SK/sk-SK.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Nastavenie databázy"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Dotaz databázy PostgreSQL zlyhal."
 INSTL_DATABASE_HOST_DESC="Zvyčajne to je "_QQ_"localhost"_QQ_" alebo názov poskytnutý vaším hostingom."
 INSTL_DATABASE_HOST_LABEL="Meno hostiteľa"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Chcete použiť hosting databázy, ktorý nie je localhost. Z bezpečnostných dôvodov musíte overiť vlastníctvo použitého webhostingu. Pre viac informácií sa pozrite sem [docspagelink]."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Aby ste potvrdili vlastníctvo webhostingu vymažte, prosím, súbor %s, ktorý sme práve vytvorili v priečinku "_QQ_"installation"_QQ_" vo vašej Joomla."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Z nejakého dôvodu nevieme vytvoriť súbor. Vytvorte manuálne súbor nazvaný %s a nahrajte ho do adresára "_QQ_"installation"_QQ_" vašej inštalácie Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Nebolo možné vytvoriť súbor. Vytvorte manuálne súbor nazvaný "_QQ_"%s"_QQ_" a nahrajte ho do adresára "_QQ_"installation"_QQ_" vašej inštalácie Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Aby ste potvrdili vlastníctvo webhostingu vymažte, prosím, súbor "_QQ_"%s"_QQ_", ktorý sme práve vytvorili v priečinku "_QQ_"installation"_QQ_" vo vašej Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Chcete použiť hosting databázy, ktorý nie je na vašom lokálnom serveri. Z bezpečnostných dôvodov musíte overiť vlastníctvo vášho účtu k webhostingu. Pre viac informácií si <a href="_QQ_"%s"_QQ_">prečítajte dokumentáciu</a>."
 INSTL_DATABASE_NAME_DESC="Niektoré hostingové spoločnosti umožňujú vytvorenie len niekoľkých databáz na serveri. V takomto prípade môžete použiť predponu tabuľky, čím odlíšite rôzne weby."
 INSTL_DATABASE_NAME_LABEL="Názov databázy"
 INSTL_DATABASE_NO_SCHEMA="Pre tento typ databázy neexistuje schéma databázy."
diff --git a/installation/language/sl-SI/sl-SI.ini b/installation/language/sl-SI/sl-SI.ini
index 3b4f496347659..d4a4f5d44188d 100644
--- a/installation/language/sl-SI/sl-SI.ini
+++ b/installation/language/sl-SI/sl-SI.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Nastavitev baze podatkov"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL poizvedba zbirke podatkov ni uspela."
 INSTL_DATABASE_HOST_DESC="To je običajno "_QQ_"localhost"_QQ_" ali ime vašega gostitelja."
 INSTL_DATABASE_HOST_LABEL="Ime gostitelja"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Želite uporabljati zbirko podatkov, ki ni lokalna (localhost). Preveriti morate lastništvo računa gostovanja, ki ga uporabljate. Prosimo, glejte tukaj [docspagelink] za več informacij."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Za potrditev, da upravljate z računom tega gostovanja, izbrišite datoteko %s, ki smo samo ustvarili v mapi "_QQ_"namestitev"_QQ_" v vaši Joomli."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Iz neznanega razloga nismo mogli ustvariti datoteke. Prosim ročno ustvarite datoteko z imenom %s in jo naložite v mapo "_QQ_"namestitev"_QQ_" v vaši Joomli."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Za potrditev, da ste lastnik te spletne strani, izbrišite datoteko %s, ki smo samo ustvarili v mapi "_QQ_"namestitev"_QQ_" v vaši Joomli."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Želite uporabljati strežnik zbirke podatkov, ki ni v lokalnem strežniku. Zaradi varnostnih razlogov, morate preveriti lastništvo računa vašeg gostovanje. <a href="_QQ_"%s"_QQ_"> Prosimo, preberite dokumentacijo</a> za več informacij."
 INSTL_DATABASE_NAME_DESC="Nekateri gostitelji omogočajo le določeno DB ime na stran. Uporaba predpone tabele v tem primeru za izrazito Joomla! strani."
 INSTL_DATABASE_NAME_LABEL="Ime baze podatkov"
 INSTL_DATABASE_NO_SCHEMA="Ne obstaja baza shema za ta tip baze podatkov."
diff --git a/installation/language/sr-RS/sr-RS.ini b/installation/language/sr-RS/sr-RS.ini
index ee9acbcf40ea3..6be65e322913e 100644
--- a/installation/language/sr-RS/sr-RS.ini
+++ b/installation/language/sr-RS/sr-RS.ini
@@ -30,6 +30,9 @@ INSTL_PRECHECK_ACTUAL="Тренутно"
 INSTL_DATABASE="Конфигурација базе података"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL упит није успео."
 INSTL_DATABASE_HOST_DESC="Уобичајено је &quot;localhost&quot;"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Не могу аутоматски да креирам датотеку. Креирајте ручно датотеку &quot;%s&quot; и ископирајте је у инсталациони директоријум &quot;installation&quot; вашег Joomla сајта."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Да бисте доказали да сте власник овог сајта, молим вас да обришете датотеку &quot;%s&quot; креирану у  &quot;installation&quot; директоријуму вашег Joomla сајта."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Ви покушавате да користите базу података која није на вашем локалном серверу. Због безбедности, морате потврдити да сте власник вашег хостинг налога.<a href="_QQ_"%s"_QQ_">За више информација прочитајте документацију</a>."
 INSTL_DATABASE_HOST_LABEL="Име сервера"
 INSTL_DATABASE_NAME_DESC="Неки хостови дозвољавају само одређена DB имена. Користите префикс табеле за различите Joomla! сајтове."
 INSTL_DATABASE_NAME_LABEL="Назив базе података"
diff --git a/installation/language/sr-RS/sr-RS.xml b/installation/language/sr-RS/sr-RS.xml
index 546bd76d0d1bb..53f677722c035 100644
--- a/installation/language/sr-RS/sr-RS.xml
+++ b/installation/language/sr-RS/sr-RS.xml
@@ -3,8 +3,8 @@
 	version="3.7"
 	client="installation">
 	<name>Serbian Cyrillic</name>
-	<version>3.7.3</version>
-	<creationDate>2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>joomla-serbia.com</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/sr-YU/sr-YU.ini b/installation/language/sr-YU/sr-YU.ini
index c0d675f3417dc..0dfb0817a0c0e 100644
--- a/installation/language/sr-YU/sr-YU.ini
+++ b/installation/language/sr-YU/sr-YU.ini
@@ -30,6 +30,9 @@ INSTL_PRECHECK_ACTUAL="Trenutno"
 INSTL_DATABASE="Konfiguracija baze podataka"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL upit nije uspeo."
 INSTL_DATABASE_HOST_DESC="Uobičajeno je &quot;localhost&quot;"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Ne mogu automatski da kreiram datoteku. Kreirajte ručno datoteku &quot;%s&quot; i iskopirajte je u instalacioni direktorijum &quot;installation&quot; vašeg Joomla sajta."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Da biste dokazali da ste vlasnik ovog sajta, molim vas da obrišete datoteku &quot;%s&quot; kreiranu u  &quot;installation&quot; direktorijumu vašeg Joomla sajta."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Vi pokušavate da koristite bazu podataka koja nije na vašem lokalnom serveru. Zbog bezbednosti, morate potvrditi da ste vlasnik vašeg hosting naloga.<a href="_QQ_"%s"_QQ_">Za više informacija pročitajte dokumentaciju</a>."
 INSTL_DATABASE_HOST_LABEL="Ime servera"
 INSTL_DATABASE_NAME_DESC="Neki hostovi dozvoljavaju samo određena DB imena. Koristite prefiks tabele za različite Joomla! sajtove."
 INSTL_DATABASE_NAME_LABEL="Naziv baze podataka"
diff --git a/installation/language/sr-YU/sr-YU.xml b/installation/language/sr-YU/sr-YU.xml
index ba0406ae260ee..66af3972a8a82 100644
--- a/installation/language/sr-YU/sr-YU.xml
+++ b/installation/language/sr-YU/sr-YU.xml
@@ -3,8 +3,8 @@
 	version="3.7"
 	client="installation">
 	<name>Serbian Latin</name>
-	<version>3.7.3</version>
-	<creationDate>2017</creationDate>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>joomla-serbia.com</author>
  	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/sw-KE/sw-KE.ini b/installation/language/sw-KE/sw-KE.ini
index 299eeb30b50f1..ac8f8061d01e3 100644
--- a/installation/language/sw-KE/sw-KE.ini
+++ b/installation/language/sw-KE/sw-KE.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Usanidi wa hifadhidata"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Swali la hifadhidata la PostgreSQL limeshindwa."
 INSTL_DATABASE_HOST_DESC="Kwa kawaida, hii ni &quot;localhost&quot; au jina lililopeanwa na hosti yako."
 INSTL_DATABASE_HOST_LABEL="Jina la hosti"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Unataka kutumia hosti ya hifadhidata ambayo siyo localhost. Kwa sababu ya usalama, unatakiwa kuthibitisha kuwa akaunti inayotumika ni akaunti yako ya hosti ya mtandao. Tafadhali angalia hapa [docspagelink] kwa maelezo zaidi."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Kwa kudhbitisha kuwa hosti hii ya mtandao ni yako, tafadhali futa faili %s, tulioitengeza katika folda ya Joomla &quot;installation&quot;."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Kwa sababu fulani, hatuwezi kutengeza faili. Tafadhali tengeza kwa mkono faili inayoitwa %s na pakia katika folda ya Joomla &quot;installation&quot;."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Hatuwezi kutengeza faili. Tafadhali tengeza kwa mkono faili inayoitwa &quot;%s&quot; na pakia katika folda ya &quot;installation&quot; ya tovuti yako ya Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Kwa kuthibitisha kuwa tovuti hii ni yako, tafadhali futa faili inayoitwa &quot;%s&quot; tulioitengeza katika folda ya &quot;installation&quot; ya tovuti yako ya Joomla."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Unataka kutumia hosti ya hifadhidata ambayo haiko kwa seva yako ya karibu. Kwa sababu ya usalama, unatakiwa kuthibitisha kuwa akaunti inayotumika ni akaunti yako ya hosti ya tovuti. <a href="_QQ_"%s"_QQ_">Tafadhali angalia mwongozo</a> kwa maelezo zaidi."
 INSTL_DATABASE_NAME_DESC="Baadhi ya hosti zinaruhusu jina mmoja la hifadhidata pekee kwa tovuti moja. Katika hali hii, tumia prefix ya jedwali kwa tovuti tofauti za Joomla!"
 INSTL_DATABASE_NAME_LABEL="Jina la hifadhidata"
 INSTL_DATABASE_NO_SCHEMA="Hakuna muundo wa hifadhidata wa aina hii kwa hifadhidata."
diff --git a/installation/language/ta-IN/ta-IN.ini b/installation/language/ta-IN/ta-IN.ini
index c14af65c8b5cc..137c962b82716 100644
--- a/installation/language/ta-IN/ta-IN.ini
+++ b/installation/language/ta-IN/ta-IN.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="தரவுத்தள உருவாக்கம்"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL தரவுத்தள வினவல் (query) தோல்வியுற்றது."
 INSTL_DATABASE_HOST_DESC="புரவலர் கணினிப் பெயர் (Host name) ஆனது பொதுவாக &quot;localhost&quot; அல்லது தங்கள் சேவை வழங்குபவர்-ஆல் (Host service provider) வழங்கப்படும் ஒரு பெயர் ஆகும்."
 INSTL_DATABASE_HOST_LABEL="புரவலர் கணினி பெயர்"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="தாங்கள் localhost அல்லாத வேறு ஒரு தரவுத்தளப் புரவலர் கணினியைப் (database host name) பயன்படுத்த விரும்புகிறீர்கள். பாதுகாப்புக் காரணத்திற்காக, பயன்படுத்தப்படும் இணையசேவையின் சேவைக்கணக்கின் (webhosting account) உரிமையைத் (ownership) தாங்கள் உறுதிப்படுத்த வேண்டும்.  மேலும் விவரங்களுக்கு, காண்க: [docspagelink]."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="தாங்கள் இந்த இணையசேவைக்கு (webhost) உரிமையாளர் என்பதனை உறுதிசெய்ய தங்கள் Joomla-வின் &quot;installation&quot; கோப்பகத்தில் நாங்கள் தற்போது உருவாக்கியுள்ள %s கோப்பைத் தயவுசெய்து நீக்குக."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="ஏதோ ஒரு காரணத்தினால் கோப்பை உருவாக்க முடியவில்லை. தயவுசெய்து %s என்ற பெயருடைய ஒரு கோப்பைக் கைமுறையாக உருவாக்கி அதனைத் தங்கள் Joomla-வின் &quot;installation&quot; கோப்பகத்தில் பதிவேற்றுக."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="எங்களால் கோப்பை உருவாக்க முடியவில்லை. தயவுசெய்து &quot;%s&quot; என்ற பெயருடைய ஒரு கோப்பைக் கைமுறையாக உருவாக்கி அதனைத் தங்கள் Joomla தளத்தின் &quot;installation&quot; கோப்பகத்தில் பதிவேற்றுக."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="தாங்கள் இந்த இணையதளத்துக்கான (website) உரிமையாளர் என்பதனை உறுதிசெய்ய தங்கள் Joomla தளத்தின் &quot;installation&quot; கோப்பகத்தில் நாங்கள் தற்போது உருவாக்கியுள்ள &quot;%s&quot; என்ற பெயருடைய கோப்பைத் தயவுசெய்து நீக்குக."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="தாங்கள் உள்ளக (local) சேவையகத்தில் (server) அல்லாத வேறு ஒரு தரவுத்தளப் புரவலர் கணினியைப் (database host) பயன்படுத்த முயற்சிக்கிறீர்கள். பாதுகாப்புக் காரணங்களுக்காக, பயன்படுத்தப்படும் இணையசேவையின் சேவைக்கணக்கின் (webhosting account) உரிமையைத் (ownership) தாங்கள் உறுதிப்படுத்த வேண்டும்.  மேலும் விவரங்களுக்கு, <a href="_QQ_"%s"_QQ_">தயவுசெய்து ஆவணத்தைப் படிக்கவும்</a>."
 INSTL_DATABASE_NAME_DESC="சில சேவை வழங்குபவர்கள் ஒரு சேவைக்கணக்குக்கு ஒரு குறிப்பிட்ட தரவுத்தள பெயரை மட்டும் அனுமதிப்பார்கள். இவ்வாறு இருப்பின், ஒன்றுக்கு மேற்பட்ட Joomla தளத்தை வேறுபடுத்த அட்டவணை முன்-ஒட்டைப் (Table Prefix) பயன்படுத்தவும்."
 INSTL_DATABASE_NAME_LABEL="தரவுத்தள பெயர்"
 INSTL_DATABASE_NO_SCHEMA="இந்த தரவுத்தள வகைக்கு, அமைப்புமுறைகள் (schema) இல்லை."
@@ -244,7 +244,7 @@ INSTL_FTP_NOSYST="செயற்கூறு "_QQ_"SYST"_QQ_" தோல்வ
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTP வேர்க் கோப்பகத்தைத் தன்னியக்கமாகக் கண்டுபிடிக்க முடியவில்லை."
 
 ;others
-INSTL_CONFPROBLEM="தங்கள் உருவாக்கக் (configuration) கோப்பு அல்லது கோப்பகம் எழுத முடியாதது அல்லது கோப்பை எழுதுவதில் பிரச்சினை உள்ளது. தாங்கள் கீழ்க்காணும் குறிமுறையைக் கையால் பதிவேற்ற வேண்டும். அனைத்துக் குறிமுறைகளையும் உரைப் பிரதேசத்தில் தேர்வுசெய்க. பிறகு, புதிய உரைக் கோப்பில் தேர்வுசெய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயருடையு அதனைத் தங்கள் தளத்தின் வேர்க் கோப்பகத்தில் பதிவேற்றுக."
+INSTL_CONFPROBLEM="தங்கள் உருவாக்கக் (configuration) கோப்பு அல்லது கோப்பகம் எழுத முடியாதது அல்லது கோப்பை எழுதுவதில் பிரச்சினை உள்ளது. தாங்கள் கீழ்க்காணும் குறிமுறையைக் கையால் பதிவேற்ற வேண்டும். அனைத்துக் குறிமுறைகளையும் உரைப் பிரதேசத்தில் தேர்வுசெய்க. பிறகு, புதிய உரைக் கோப்பில் தேர்வுசெய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயரிட்டு அதனைத் தங்கள் தளத்தின் வேர்க் கோப்பகத்தில் பதிவேற்றுக."
 INSTL_DATABASE_SUPPORT="தரவுத்தள ஆதரவு:"
 INSTL_DISPLAY_ERRORS="Display Errors"
 INSTL_ERROR_DB="தரவுத்தளம் &quot;%s&quot;ஐ நிரப்ப முயற்சிக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன"
@@ -260,7 +260,7 @@ INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt Support"
 INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language நடு நிலையாக (neutral) அமைக்கப்படவில்லை. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.language neutral</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் அமைக்க (locally set) முடியும்."
 INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload அமைக்கப்பட்டுள்ளது. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.func_overload 0</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் நிறுத்த முடியும் (turned off locally)."
 INSTL_NOTICEMCRYPTNOTAVAILABLE="எச்சரிக்கை! PHP mcrypt நீட்சியானது நிறுவப்பட அல்லது இயலுமைப்படுத்தப்பட வேண்டும். இது இல்லாமல், Joomla!-வின் சில அம்சங்கள் கிடைக்காது."
-INSTL_NOTICEYOUCANSTILLINSTALL="<br />உருவாக்க அமைப்புகள் (Configuration Settings) இறுதியில் காட்டப்படுமாதலால், தாங்கள் நிறுவலைத் தொடரலாம். தாங்கள் குறிமுறையைத் (code) தாங்களாகவே பதிவேற்ற வேண்டும். உரைப் பிரதேசத்தில் அனைத்துக் குறிமுறைகளையும் தேர்வுசெய்து, புதிய உரைக் கோப்பில் தேர்வுசெய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயருடையு அதனைத் தங்கள் தள வேர்க் (root) கோப்பகத்தில் பதிவேற்றுக."
+INSTL_NOTICEYOUCANSTILLINSTALL="<br />உருவாக்க அமைப்புகள் (Configuration Settings) இறுதியில் காட்டப்படுமாதலால், தாங்கள் நிறுவலைத் தொடரலாம். தாங்கள் குறிமுறையைத் (code) தாங்களாகவே பதிவேற்ற வேண்டும். உரைப் பிரதேசத்தில் அனைத்துக் குறிமுறைகளையும் தேர்வுசெய்து, புதிய உரைக் கோப்பில் தேர்வுசெய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயரிட்டு அதனைத் தங்கள் தள வேர்க் (root) கோப்பகத்தில் பதிவேற்றுக."
 INSTL_OUTPUT_BUFFERING="Output Buffering"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support"
 INSTL_PHP_VERSION="PHP Version"
diff --git a/installation/language/th-TH/th-TH.ini b/installation/language/th-TH/th-TH.ini
index f733b15ee35c3..d0f4e24de4b94 100644
--- a/installation/language/th-TH/th-TH.ini
+++ b/installation/language/th-TH/th-TH.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="การตั้งค่าฐานข้อมูล"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="การคิวรีฐานข้อมูล PostgreSQL ล้มเหลว"
 INSTL_DATABASE_HOST_DESC="ซึ่งโดยปกติจะเป็น "_QQ_"localhost"_QQ_" หรือชื่อที่โฮสต์ของคุณกำหนดไว้"
 INSTL_DATABASE_HOST_LABEL="ชื่อโฮส"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="คุณต้องการใช้โฮสต์ฐานข้อมูลที่ไม่ใช่ localhost เพื่อความปลอดภัยคุณจำเป็นต้องยืนยันการเป็นเจ้าของบัญชีเว็บโฮสติ้งที่ใช้อยู่ โปรดดูที่นี่ [docspagelink] สำหรับข้อมูลเพิ่มเติม"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="เพื่อยืนยันว่าคุณเป็นเจ้าของเว็บโฮสต์นี้โปรดลบไฟล์ %s ที่ได้สร้างไว้ในโฟลเดอร์ &quot;installation&quot; ของ Joomla ของคุณ"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="ด้วยเหตุผลบางอย่างที่ไม่สามารถสร้างไฟล์ได้ โปรดสร้างไฟล์ที่ชื่อว่า %s ด้วยตนเองและอัพโหลดไปที่โฟลเดอร์ &quot;installation&quot; ของ Joomla ของคุณ"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="ด้วยเหตุผลบางอย่างที่ไม่สามารถสร้างไฟล์ได้ โปรดสร้างไฟล์ที่ชื่อว่า &quot;%s&quot; ด้วยตนเองและอัพโหลดไปที่โฟลเดอร์ &quot;installation&quot; ของ Joomla ไซต์ของคุณ"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="เพื่อยืนยันว่าคุณเป็นเจ้าของเว็บโฮสต์นี้โปรดลบไฟล์ชื่อ &quot;%s&quot; ที่ได้สร้างไว้ในโฟลเดอร์ &quot;installation&quot; ของ Joomla ไซต์ของคุณ"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="คุณต้องการใช้โฮสต์ฐานข้อมูลที่ไม่ใช่เซิร์ฟเวอร์ภายในของคุณ เพื่อความปลอดภัยคุณจำเป็นต้องยืนยันการเป็นเจ้าของบัญชีเว็บโฮสติ้งที่ใช้อยู่ <a href="_QQ_"%s"_QQ_">โปรดอ่านเอกสารประกอบ</a> สำหรับข้อมูลเพิ่มเติม"
 INSTL_DATABASE_NAME_DESC="หากคุณมีฐานข้อมูลเดียว คุณสามารถใช้คำนำหน้าตารางให้ต่างจากเดิมได้"
 INSTL_DATABASE_NAME_LABEL="ชื่อฐานข้อมูล"
 INSTL_DATABASE_NO_SCHEMA="ไม่มีโครงร่างที่ได้จากการออกแบบฐานข้อมูล (Database Schema) ในฐานข้อมูลชนิดนี้"

From a4773e4dbe34df134d3090d5c2eea71770138981 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Fri, 21 Jul 2017 09:15:32 +0200
Subject: [PATCH 031/148] Updated es-CO

---
 installation/language/es-CO/es-CO.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/installation/language/es-CO/es-CO.ini b/installation/language/es-CO/es-CO.ini
index 753b1ac0cb6c6..65215a9316c12 100644
--- a/installation/language/es-CO/es-CO.ini
+++ b/installation/language/es-CO/es-CO.ini
@@ -31,9 +31,9 @@ INSTL_DATABASE="Configuración de base de datos"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Falló la consulta a la base de datos PostgreSQL"
 INSTL_DATABASE_HOST_DESC="Normalmente "_QQ_"localhost"_QQ_" o un nombre proporcionado por el administrador de su servidor."
 INSTL_DATABASE_HOST_LABEL="Nombre del servidor"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Usted desea utilizar un servidor de base de datos que no es localhost. Por seguridad debe verificar que tiene permisos o es el dueño de dicha cuenta de hosting. Revise [docspagelink] para más información."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Para confirmar que es el dueño de dicha cuenta de hosting, por favor borre el archivo %s que acaba de ser creado en la carpeta &quot;installation&quot; de su sitio web Joomla!."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Por alguna razón no pudo ser creado el archivo. Por favor cree un archivo llamado % y súbalo a la carpeta &quot;installation&quot; de su sitio web Joomla!."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="No se pudo crear el archivo. Por favor cree un archivo llamado &quot;%&quot; y súbalo a la carpeta &quot;installation&quot; de su sitio web Joomla!."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Para confirmar que es el dueño de este sitio web, por favor borre el archivo &quot;%s&quot; que acaba de ser creado en la carpeta &quot;installation&quot; de su sitio web Joomla!."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Usted desea utilizar un servidor de base de datos que no está en su servidor local. Por seguridad debe verificar que tiene permisos o que es el dueño de dicha cuenta de hosting. <a href="_QQ_"%s"_QQ_">Revise la documentación</a> para más información."
 INSTL_DATABASE_NAME_DESC="Algunos servidores solo permiten un nombre específico de base de datos. Utilice el prefijo de tabla en este caso para instalar varios sitios Joomla."
 INSTL_DATABASE_NAME_LABEL="Nombre de la base de datos"
 INSTL_DATABASE_NO_SCHEMA="No existe esquema de base de datos para este tipo de base de datos."

From 3fffe1a2c6430538ec6ae63d2ba6b23e1f05a2e3 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Mon, 24 Jul 2017 14:55:21 +0200
Subject: [PATCH 032/148] Updated korean installation language (#17224)

* Updated korean installation language

* Updating nb-NO
---
 installation/language/ko-KR/ko-KR.ini |  2 +-
 installation/language/nb-NO/nb-NO.ini | 17 ++++++++++-------
 installation/language/nb-NO/nb-NO.xml |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/installation/language/ko-KR/ko-KR.ini b/installation/language/ko-KR/ko-KR.ini
index ca9030d10326d..b43594a4d22c3 100644
--- a/installation/language/ko-KR/ko-KR.ini
+++ b/installation/language/ko-KR/ko-KR.ini
@@ -32,7 +32,7 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL 데이터베이스 질의가 
 INSTL_DATABASE_HOST_DESC="일반적으로 &quot;localhost&quot; 혹은 호스트에서 제시된 이름입니다."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="어떤 이유에서인지 파일을 생성할 수 없습니다. %s 파일을 생성하여 Joomla의 &quot;installation&quot; 폴더에 업로드하세요."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="이 웹 호스트의 소유자임을 확인하려면 Joomla의 &quot;installation&quot; 폴더에 생성된 %s 파일을 삭제하세요."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="로컬호스트가 아닌 데이터베이스를 사용하려 합니다. 보안상의 이유로 사용된 웹호스팅 계정의 소유권을 확인해야 합니다. 자세한 내용은 [docspagelink]를 참고하세요."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="로컬호스트가 아닌 데이터베이스를 사용하려 합니다. 보안상의 이유로 사용된 웹호스팅 계정의 소유권을 확인해야 합니다. 자세한 내용은 <a href="_QQ_"%s"_QQ_">문서를 확인</a>하세요."
 INSTL_DATABASE_HOST_LABEL="Host 이름"
 INSTL_DATABASE_NAME_DESC="일부 호스트는 사이트별로 특정 DB 이름만 허용합니다. 이 경우 Joomla! 사이트 구분을 위해 테이블 접두사를 사용하세요."
 INSTL_DATABASE_NAME_LABEL="데이터베이스 이름"
diff --git a/installation/language/nb-NO/nb-NO.ini b/installation/language/nb-NO/nb-NO.ini
index 40dfbcd36cee1..e8faa3d8927ad 100644
--- a/installation/language/nb-NO/nb-NO.ini
+++ b/installation/language/nb-NO/nb-NO.ini
@@ -31,6 +31,9 @@ INSTL_DATABASE="Databasekonfigurasjon"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL databasespørring feilet."
 INSTL_DATABASE_HOST_DESC="Dette er vanligvis 'localhost' eller et navn angitt av deres leverandør av netthotell."
 INSTL_DATABASE_HOST_LABEL="Tjenernavn"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Filen kunne ikke opprettes. Du må manuelt opprette en fil med navn '%s', for så å laste denne opp til 'installation'-mappen for deres nettsted."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="For å bekrefte at du er eieren av dette nettstedet må du slette filen '%s', som har blitt opprettet i 'installation'-mappen for deres nettsted."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Du forsøker å bruke en databasetjener som ikke er på deres lokale server. Av sikkerhetshensyn må du bekrefte eierskap for netttjenerkontoen. <a href="_QQ_"%s"_QQ_">Les dokumentasjonen</a> for mer informasjon."
 INSTL_DATABASE_NAME_DESC="Noen netthotell tillater kun et gitt antall databasenavn per nettsted. Bruk tabellprefiks i slike tilfeller for å skille Joomla-installasjonene."
 INSTL_DATABASE_NAME_LABEL="Databasenavn"
 INSTL_DATABASE_NO_SCHEMA="Ingen databaseskjema eksisterer for denne databasetypen."
@@ -120,19 +123,19 @@ INSTL_EMAIL_NOT_SENT="E-post kunne ikke sendes."
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Innloggingsdetaljer for administrasjonspanelet"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installasjonsmappen er allerede slettet."
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mappen 'installation' er allerede slettet."
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installasjonsmappen kunne ikke slettes, du må slette denne manuelt."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Mappen 'installation' kunne ikke slettes, du må slette denne manuelt."
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_FOLDER_REMOVED="Installasjonsmappen ble slettet"
-INSTL_COMPLETE_LANGUAGE_1="Joomla! i ditt eget språk?"
+INSTL_COMPLETE_FOLDER_REMOVED="Mappen 'installation' ble slettet"
+INSTL_COMPLETE_LANGUAGE_1="Joomla i ditt eget språk, og/eller automatisk grunnleggende flerspråklig sideopprettelse"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_LANGUAGE_DESC="Før du sletter installasjonsmappen kan du installere ekstra språk. Klikk følgende knapp dersom du ønsker å legge til ekstra språk for Joomla-installasjonen."
+INSTL_COMPLETE_LANGUAGE_DESC="Før du sletter mappen 'installation' kan du installere ekstra språk. Klikk følgende knapp dersom du ønsker å legge til ekstra språk for Joomla-installasjonen."
 INSTL_COMPLETE_LANGUAGE_DESC2="Merk: Installasjonsskriptet vil behøve tilgang til Internett for å kunne laste ned og installere flere språk. <br/>Noen serverkonfigurasjoner sperrer dessverre for dette. Dersom dette er tilfellet for deg er det ingen fare, du vil kunne installere flere språk senere via administrasjonspanelet."
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_REMOVE_FOLDER="Slett installasjonsmappen"
+INSTL_COMPLETE_REMOVE_FOLDER="Slett mappen 'installation'"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_REMOVE_INSTALLATION="HUSK Å SLETTE INSTALLASJONSMAPPEN<br />Du vil ikke kunne bruke nettstedet før installasjonsmappen er slettet. Dette er en sikkerhetsfunksjon for Joomla!."
+INSTL_COMPLETE_REMOVE_INSTALLATION="HUSK Å SLETTE INSTALLASJONSMAPPEN<br />Du vil ikke kunne bruke nettstedet før mappen 'installation' er slettet. Dette er en sikkerhetsfunksjon for Joomla."
 INSTL_COMPLETE_TITLE="Gratulerer! Joomla! er nå installert."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstra steg: Installer språk"
 
diff --git a/installation/language/nb-NO/nb-NO.xml b/installation/language/nb-NO/nb-NO.xml
index 7eb4828c468d1..82516dfe81ef7 100644
--- a/installation/language/nb-NO/nb-NO.xml
+++ b/installation/language/nb-NO/nb-NO.xml
@@ -2,9 +2,9 @@
 <metafile
 	version="3.7"
 	client="installation">
-	<name>Norwegian bokmål (Norway)</name>
-	<version>3.7.3</version>
-	<creationDate>June 2017</creationDate>
+	<name>Norwegian Bokmal (Norway)</name>
+	<version>3.7.4</version>
+	<creationDate>July 2017</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

From fecd219f327ad29b53b4da4ef368ce2c911cb02b Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Mon, 24 Jul 2017 08:09:56 -0500
Subject: [PATCH 033/148] Update Travis config (#17228)

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af660cf1310dc..82e8f2ab16873 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,14 @@ matrix:
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
     - php: 7.1
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
+    # Requires older Precise image
     - php: 5.3
       env: INSTALL_APC="yes"
+      sudo: true
+      dist: precise
+    # The new Trusty image has issues with running APC, do not enable it here
     - php: 5.4
-      env: INSTALL_APC="yes"
+      env: INSTALL_APC="no"
     - php: 5.5
       env: INSTALL_APCU="yes"
     - php: 5.6

From 84700138c771d500e4d5f43a45d373b0cb796d6d Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:16:12 +0200
Subject: [PATCH 034/148] Update de-AT.ini

---
 installation/language/de-AT/de-AT.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/de-AT/de-AT.ini b/installation/language/de-AT/de-AT.ini
index c2b5d42af58ed..2d292829f4f06 100644
--- a/installation/language/de-AT/de-AT.ini
+++ b/installation/language/de-AT/de-AT.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Konfiguration der Datenbank"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlagen."
 INSTL_DATABASE_HOST_DESC="Üblicherweise ist dies „localhost“ oder ein vorgegebener Name des Webhosters."
 INSTL_DATABASE_HOST_LABEL="Servername"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier [docspagelink] gefunden werden."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> gefunden werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%s“, die soeben im „installation“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%s“ manuell zu erstellen und in das Verzeichnis „installation“ hochzuladen."
 INSTL_DATABASE_NAME_DESC="Einige Webhoster erlauben nur eine Datenbank pro Website. In diesem Fall sollte ein eindeutiger Tabellenpräfix für Joomla! gewählt werden."

From bab3f8f2d56da5a6657045b9ad703648999a8ddb Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:16:36 +0200
Subject: [PATCH 035/148] Update de-CH.ini

---
 installation/language/de-CH/de-CH.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/de-CH/de-CH.ini b/installation/language/de-CH/de-CH.ini
index b1bbd7a678f46..a3e50dc9130cf 100644
--- a/installation/language/de-CH/de-CH.ini
+++ b/installation/language/de-CH/de-CH.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Konfiguration der Datenbank"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlagen."
 INSTL_DATABASE_HOST_DESC="Üblicherweise ist dies „localhost“ oder ein vorgegebener Name des Webhosters."
 INSTL_DATABASE_HOST_LABEL="Servername"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier [docspagelink] gefunden werden."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> gefunden werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%s“, die soeben im „installation“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%s“ manuell zu erstellen und in das Verzeichnis „installation“ hochzuladen."
 INSTL_DATABASE_NAME_DESC="Einige Webhoster erlauben nur eine Datenbank pro Website. In diesem Fall sollte ein eindeutiger Tabellenpräfix für Joomla! gewählt werden."

From 9f79eab4a8e8340d2f38988ae858288fdfed629e Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:17:12 +0200
Subject: [PATCH 036/148] Update de-DE.ini

---
 installation/language/de-DE/de-DE.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/de-DE/de-DE.ini b/installation/language/de-DE/de-DE.ini
index 55ddb8ce5b42f..2863eb5148ff0 100644
--- a/installation/language/de-DE/de-DE.ini
+++ b/installation/language/de-DE/de-DE.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Konfiguration der Datenbank"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlagen."
 INSTL_DATABASE_HOST_DESC="Üblicherweise ist dies „localhost“ oder ein vorgegebener Name des Webhosters."
 INSTL_DATABASE_HOST_LABEL="Servername"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier [docspagelink] gefunden werden."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> gefunden werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%s“, die soeben im „installation“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%s“ manuell zu erstellen und in das Verzeichnis „installation“ hochzuladen."
 INSTL_DATABASE_NAME_DESC="Einige Webhoster erlauben nur eine Datenbank pro Website. In diesem Fall sollte ein eindeutiger Tabellenpräfix für Joomla! gewählt werden."

From 2dd462d8e8bdaeeabae68c12d04da274499a9969 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:17:44 +0200
Subject: [PATCH 037/148] Update de-LI.ini

---
 installation/language/de-LI/de-LI.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/de-LI/de-LI.ini b/installation/language/de-LI/de-LI.ini
index 3e170e92b011b..80411210e7aa0 100644
--- a/installation/language/de-LI/de-LI.ini
+++ b/installation/language/de-LI/de-LI.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Konfiguration der Datenbank"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlagen."
 INSTL_DATABASE_HOST_DESC="Üblicherweise ist dies „localhost“ oder ein vorgegebener Name des Webhosters."
 INSTL_DATABASE_HOST_LABEL="Servername"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier [docspagelink] gefunden werden."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> gefunden werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%s“, die soeben im „installation“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%s“ manuell zu erstellen und in das Verzeichnis „installation“ hochzuladen."
 INSTL_DATABASE_NAME_DESC="Einige Webhoster erlauben nur eine Datenbank pro Website. In diesem Fall sollte ein eindeutiger Tabellenpräfix für Joomla! gewählt werden."

From 63b7fd10aff9b77ed38e4e987c580e7e1cedcead Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:18:14 +0200
Subject: [PATCH 038/148] Update de-LU.ini

---
 installation/language/de-LU/de-LU.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/de-LU/de-LU.ini b/installation/language/de-LU/de-LU.ini
index 04ebe98ed3589..d4397853df15d 100644
--- a/installation/language/de-LU/de-LU.ini
+++ b/installation/language/de-LU/de-LU.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Konfiguration der Datenbank"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL-Datenbankabfrage fehlgeschlagen."
 INSTL_DATABASE_HOST_DESC="Üblicherweise ist dies „localhost“ oder ein vorgegebener Name des Webhosters."
 INSTL_DATABASE_HOST_LABEL="Servername"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier [docspagelink] gefunden werden."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Es soll ein anderer Datenbankserver als „localhost“ verwendet werden. Aus Sicherheitsgründen muss die Eigentümerschaft des Webhostings überprüft werden. Weitere Informationen dazu können hier <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> gefunden werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Um die Eigentümerschaft zu bestätigen muss die Datei „%s“, die soeben im „installation“-Verzeichnis von Joomla! erstellt wurde, wieder gelöscht werden."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Aufgrund eines unbekannten Fehlers kann die Datei nicht automatisch erstellt werden. Daher ist die Datei mit dem Namen „%s“ manuell zu erstellen und in das Verzeichnis „installation“ hochzuladen."
 INSTL_DATABASE_NAME_DESC="Einige Webhoster erlauben nur eine Datenbank pro Website. In diesem Fall sollte ein eindeutiger Tabellenpräfix für Joomla! gewählt werden."

From 1604e227c37c270012711f261b9e6fd97e4bfc21 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:18:54 +0200
Subject: [PATCH 039/148] Update eu-ES.ini

---
 installation/language/eu-ES/eu-ES.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/eu-ES/eu-ES.ini b/installation/language/eu-ES/eu-ES.ini
index 33902524b4548..3444c58ec85a0 100644
--- a/installation/language/eu-ES/eu-ES.ini
+++ b/installation/language/eu-ES/eu-ES.ini
@@ -30,7 +30,7 @@ INSTL_PRECHECK_ACTUAL="Benetakoa"
 INSTL_DATABASE="Datu-basearen konfigurazioa"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL datu-basearen kontsultak huts egin du."
 INSTL_DATABASE_HOST_DESC="Normalean hau izaten da &quot;localhost&quot; edo zure ostalariak emandako izena."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Ostalari lokala ez den ostalari bat erabili nahi duzu zure datu-basearentzat. Segurtasun arrazoiengatik, egiaztatu egin behar duzu web ostalaritza kontuaren jabetza. Ikus hemen  [docspagelink] informazio gehiago."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Ostalari lokala ez den ostalari bat erabili nahi duzu zure datu-basearentzat. Segurtasun arrazoiengatik, egiaztatu egin behar duzu web ostalaritza kontuaren jabetza. Ikus hemen <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> informazio gehiago."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Arrazoiren batengatik ezin dugu fitxategia sortu. Sor ezazu eskuz %s izeneko fitxategia eta jaso ezazu zure Joomlako &quot;installation&quot; karpetara."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Webgune honen jabea zarela egiaztatzeko, ezaba ezazu zure Joomlako &quot;installation&quot; karpetan sortuberri dugun %s izeneko fitxategia"
 INSTL_DATABASE_HOST_LABEL="Ostalariaren izena"

From 00aea4fea8838055754e2062658944a0e46564a1 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:19:40 +0200
Subject: [PATCH 040/148] Update hy-AM.ini

---
 installation/language/hy-AM/hy-AM.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/hy-AM/hy-AM.ini b/installation/language/hy-AM/hy-AM.ini
index 54d2290e709a4..fff0057fe1a10 100644
--- a/installation/language/hy-AM/hy-AM.ini
+++ b/installation/language/hy-AM/hy-AM.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="ՏԲ-ի կազմաձևում"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL ՏԲ-ի հարցումը ձախողվեց։"
 INSTL_DATABASE_HOST_DESC="Սովորաբար՝ &quot;localhost&quot; կամ Ձեր խնամորդի կողմից տրամադրված մեկ այլ անվանում։"
 INSTL_DATABASE_HOST_LABEL="Խնամորդի անուն"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Դուք ցանկանում եք օգտագործել ՏԲ-ն, որը localhost չէ։ Ելնելով անվտանգության պահանջներից Ձեզ հարկավոր է հաստատել օգտագործվող հոսթինգային հաշվի Ձեր սեփականությունը։ Ավելին իմանալու համար խնդրում ենք այցելել [docspagelink]։"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Դուք ցանկանում եք օգտագործել ՏԲ-ն, որը localhost չէ։ Ելնելով անվտանգության պահանջներից Ձեզ հարկավոր է հաստատել օգտագործվող հոսթինգային հաշվի Ձեր սեփականությունը։ Ավելին իմանալու համար խնդրում ենք այցելել <a href="_QQ_"%s"_QQ_">docs.joomla.org</a>։"
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Տվյալ հոսթինգային հաշվի Ձեր սեփականությունը հաստատելու համար խնդրում ենք ջնջել %s ֆայլը, որը հենց նոր ստեղծվեց Ձեր Joomla-ի &quot;installation&quot; պանակում։"
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Որոշ պատճառներով մենք չենք կարող ստեղծել ֆայլը։ Խնդրում ենք ձեռքով ստեղծել %s ֆայլը և վերբեռնել այն Ձեր Joomla-ի &quot;installation&quot; պանակը։"
 INSTL_DATABASE_NAME_DESC="Որոշ հոսթինգի մատակարարները տրամադրում են մեկ ՏԲ մի քանի կայքերի համար։ Նման դեպքերում օգտագործեք աղյուսակների նախածանցները՝ Joomla-ի աղյուսակները նույն ՏԲ-ում տարբեկակելու համար։"

From 125bb7cb2bbf382fd6c85203d5844219ab88eeaf Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:20:29 +0200
Subject: [PATCH 041/148] Update ka-GE.ini

---
 installation/language/ka-GE/ka-GE.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/ka-GE/ka-GE.ini b/installation/language/ka-GE/ka-GE.ini
index 8548b1a3d8216..57533a0efd462 100644
--- a/installation/language/ka-GE/ka-GE.ini
+++ b/installation/language/ka-GE/ka-GE.ini
@@ -33,7 +33,7 @@ INSTL_DATABASE_HOST_DESC="როგორც წესი ეს არის &q
 INSTL_DATABASE_HOST_LABEL="მონაცემთა ბაზის სერვერის სახელი"
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="რაღაც მიზეზის გამო ფაილის შექმნა ვერ მოხერხდა. გთხოვთ ხელით შექმნათ ფაილი სახელით %s და ატვირთოთ თქვენს Joomla! &quot;installation&quot; საქაღალდეში."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="იმის დასადასტურებლად, რომ თქვენ ხართ ამ ვებ-ჰოსტის მფლობელი, გთხოვთ წაშალოთ ფაილი %s, რომელიც ჩვენ შევქმენით ახლახანს თქვენს Joomla! &quot;installation&quot; საქაღალდეში."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="თქვენ გსურთ გამოიყენოთ მონაცემთა ბაზის ჰოსტი, რომელიც არ არის localhost. უსაფრთხოების მიზნით, თქვენ უნდა დაადასტუროთ გამოყენებული ვებ-ჰოსტის ანგარიშის მფლობელობა. დამატებითი ინფორმაცია გთხოვთ იხილოთ აქ [docspagelink]."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="თქვენ გსურთ გამოიყენოთ მონაცემთა ბაზის ჰოსტი, რომელიც არ არის localhost. უსაფრთხოების მიზნით, თქვენ უნდა დაადასტუროთ გამოყენებული ვებ-ჰოსტის ანგარიშის მფლობელობა. დამატებითი ინფორმაცია გთხოვთ იხილოთ აქ <a href="_QQ_"%s"_QQ_">docs.joomla.org</a>."
 INSTL_DATABASE_NAME_DESC="ზოგიერთ ჰოსტზე დაწესებულია შეზღუდვა გამოსაყენებელი მონაცემთა ბაზების რაოდენობაზე.  ცხრილის პრეფიქსის გამოყენება საშუალებას იძლევა ერთ მონაცემთა ბაზაში დააყენოთ რამოდენიმე საიტი Joomla!-ზე"
 INSTL_DATABASE_NAME_LABEL="მონაცემთა ბაზის სახელი"
 INSTL_DATABASE_NO_SCHEMA="ამ მონაცემთა ბაზის ტიპისთვის მონაცემთა ბაზის სქემა არ არსებობს."

From 9d55c9ef91c5612413ce1bb72df3b44e3948b646 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:22:10 +0200
Subject: [PATCH 042/148] Update ca-ES.ini

---
 installation/language/ca-ES/ca-ES.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/ca-ES/ca-ES.ini b/installation/language/ca-ES/ca-ES.ini
index fdcca835731bf..ecce1963cdae1 100644
--- a/installation/language/ca-ES/ca-ES.ini
+++ b/installation/language/ca-ES/ca-ES.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Configuració de la Base de Dades"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Ha fallat la consulta de base de dades PostgreSQL."
 INSTL_DATABASE_HOST_DESC="Això acostuma a ser "_QQ_"localhost"_QQ_" o un nom proveït pel teu servidor."
 INSTL_DATABASE_HOST_LABEL="Nom del servidor"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Vols utilitzar un hostatjament de base de dades que no és localhost. Per raons de seguretat, cal verificar la propietat del compte utilitzat. Consulta aquí [docspagelink] per a més informació."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Vols utilitzar un hostatjament de base de dades que no és localhost. Per raons de seguretat, cal verificar la propietat del compte utilitzat. Consulta aquí <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> per a més informació."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Per tal de confirmar que ets el propietari d'aquest hostatjament suprimeix el fitxer %s que hem creat a la carpeta "_QQ_"installation"_QQ_" de Joomla."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Per alguna raó no som capaços de crear l'arxiu. Crea manualment un arxiu anomenat %s i puja'l a la carpeta "_QQ_"installation"_QQ_" de Joomla."
 INSTL_DATABASE_NAME_DESC="Alguns hostatjaments permeten només un nom determinat de BD per lloc. Utilitza un prefix de taula en aquest cas per llocs diversos de Joomla!"

From 19f78795ee86cdaf8feca428495c08eb1bb8cb11 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:23:25 +0200
Subject: [PATCH 043/148] Update fa-IR.ini

---
 installation/language/fa-IR/fa-IR.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installation/language/fa-IR/fa-IR.ini b/installation/language/fa-IR/fa-IR.ini
index 9fc679b942766..f13a1e57dac59 100644
--- a/installation/language/fa-IR/fa-IR.ini
+++ b/installation/language/fa-IR/fa-IR.ini
@@ -31,7 +31,7 @@ INSTL_PRECHECK_ACTUAL="واقعی"
 ; Database view
 INSTL_DATABASE="تنظیمات پایگاه داده"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="جستجوی پایگاه داده PostgreSQL با مشکل روبرو شد."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="شما می خواهید از یک پایگاه داده میزبان هاست استفاده کنید که محلی نیست. به دلایل امنیتی، شما باید مالکیت حساب کاربری مورد استفاده را تایید کنید. لطفا برای اطلاعات بیشتر [docspagelink] را ببینید."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="شما می خواهید از یک پایگاه داده میزبان هاست استفاده کنید که محلی نیست. به دلایل امنیتی، شما باید مالکیت حساب کاربری مورد استفاده را تایید کنید. لطفا برای اطلاعات بیشتر <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> را ببینید."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="به منظور تایید اینکه شما مالکیت این سایت را به عهده دارید لطفا فایل %s را که ما در پوشه &quot;نصب&quot; جوملا قرار داده ایم حذف کنید."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="به دلایلی ما قادر به ایجاد فایل نیستیم. لطفا به صورت دستی یک فایل با نام %s ایجاد و در پوشه &quot;نصب&quot; جوملا آپلود کنید."
 INSTL_DATABASE_HOST_DESC="این گزینه معمولا &quot;localhost&quot; یا یک نام ارائه شه توسط میزبان است."
@@ -353,4 +353,4 @@ JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="خاتمه ناگهانی در اتصال 
 JLIB_JS_AJAX_ERROR_NO_CONTENT="هیچ محتوای بازگردانده نشد."
 JLIB_JS_AJAX_ERROR_OTHER="خطایی در اتصال با داده های JSON رخ داده است: HTTP %s وضعیت کد."
 JLIB_JS_AJAX_ERROR_PARSE="خطایی درخصوص پردازش داده های JSON رخ داده است:<br/><code style="_QQ_"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0; background:inherit;"_QQ_">%s</code>"
-JLIB_JS_AJAX_ERROR_TIMEOUT="مهلت زمانی برای داده های JSON رخ داده است."
\ No newline at end of file
+JLIB_JS_AJAX_ERROR_TIMEOUT="مهلت زمانی برای داده های JSON رخ داده است."

From 580bca2f7a6a457c1006b0e9bdac6d9971ab7e2a Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:24:19 +0200
Subject: [PATCH 044/148] Update lv-LV.ini

---
 installation/language/lv-LV/lv-LV.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/lv-LV/lv-LV.ini b/installation/language/lv-LV/lv-LV.ini
index 8f1daede49102..75e266cd167c3 100644
--- a/installation/language/lv-LV/lv-LV.ini
+++ b/installation/language/lv-LV/lv-LV.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Datu bāzes konfigurācija"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL datu bāzes vaicājums ir neveiksmīgs."
 INSTL_DATABASE_HOST_DESC="Tas parasti būs "_QQ_"localhost"_QQ_""
 INSTL_DATABASE_HOST_LABEL="Servera adrese"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Jūs vēlaties izmantot datu bāzes serveri, kas nav tas pats, kas web lapai. Drošības apsvērumu dēļ, jums ir jāpierāda valdījums pār izmantojamo kontu. Lasiet šeit [docspagelink], lai uzzinātu vairāk."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Jūs vēlaties izmantot datu bāzes serveri, kas nav tas pats, kas web lapai. Drošības apsvērumu dēļ, jums ir jāpierāda valdījums pār izmantojamo kontu. Lasiet šeit <a href="_QQ_"%s"_QQ_">docs.joomla.org</a>, lai uzzinātu vairāk."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Lai pierādītu, ka esat šī lietotāja konta īpašnieks, lūdzu izdzēsiet datni %s, kas tikko tika izveidota jūsu Joomla mapē "_QQ_"installation"_QQ_"."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Kaut kādu iemeslu dēļ nav iespējams izveidot datni. Lūdzu manuāli izveidojiet datni %s, un ielādējiet to savā Joomla "_QQ_"installation"_QQ_" mapē."
 INSTL_DATABASE_NAME_DESC="Dažiem tīmekļa mitināšanas plāniem ir pieejama tikai viena datu bāze. Lai instalētu vairākas Joomla vietnes, katrai izmantojiet savādāku tabulu prefiksu."

From 686e92a6f182af36855ba29fcf8fadb755e75b6e Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:25:11 +0200
Subject: [PATCH 045/148] Update pt-BR.ini

---
 installation/language/pt-BR/pt-BR.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/pt-BR/pt-BR.ini b/installation/language/pt-BR/pt-BR.ini
index 77d2305164d01..88efd8a380936 100644
--- a/installation/language/pt-BR/pt-BR.ini
+++ b/installation/language/pt-BR/pt-BR.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Configuração do Banco de Dados"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Consulta ao banco PostgreSQL falhou."
 INSTL_DATABASE_HOST_DESC="Isso geralmente é "_QQ_"localhost"_QQ_" ou um nome fornecido pela empresa de hospedagem."
 INSTL_DATABASE_HOST_LABEL="Nome do servidor"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Você quer usar um servidor do banco de dados que não é localhost. Por motivo de segurança, confirme a propriedade da conta de hospedagem usada. Por favor, veja aqui [docspagelink] para obter mais informações."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Você quer usar um servidor do banco de dados que não é localhost. Por motivo de segurança, confirme a propriedade da conta de hospedagem usada. Por favor, veja aqui <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> para obter mais informações."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Para confirmar que você é o proprietário deste serviço de hospedagem, por favor, apague o arquivo %s que acabamos de criar na pasta "_QQ_"installation"_QQ_" do Joomla."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Por algum motivo não foi possível criar o arquivo. Por favor, crie manualmente um arquivo chamado %s e faça o upload para a pasta "_QQ_"installation"_QQ_" do Joomla."
 INSTL_DATABASE_NAME_DESC="Alguns servidores permitem apenas um nome específico de Banco de Dados por site. Neste caso, use o prefixo de tabelas para diferentes sites Joomla."

From 9a9bfc94db4ebc5bfd2edc24db92e96427e654d7 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:25:57 +0200
Subject: [PATCH 046/148] Update sv-SE.ini

---
 installation/language/sv-SE/sv-SE.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/language/sv-SE/sv-SE.ini b/installation/language/sv-SE/sv-SE.ini
index a717e9d6a049b..6cd45c8085007 100644
--- a/installation/language/sv-SE/sv-SE.ini
+++ b/installation/language/sv-SE/sv-SE.ini
@@ -31,7 +31,7 @@ INSTL_DATABASE="Databasinställningar"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL databasfrågan misslyckades."
 INSTL_DATABASE_HOST_DESC="Detta är ofta "_QQ_"localhost"_QQ_" eller ett namn du fått från webhotellet."
 INSTL_DATABASE_HOST_LABEL="Värdnamn"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Du vill använda en databasvärd som inte är localhost. Av säkerhetsskäl måste du verifiera äganderätten till webhosting kontot. [docspagelink] för mer information se här."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Du vill använda en databasvärd som inte är localhost. Av säkerhetsskäl måste du verifiera äganderätten till webhosting kontot. <a href="_QQ_"%s"_QQ_">docs.joomla.org</a> för mer information se här."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="För att bekräfta att du är ägare av detta webbhotellkonto, måste du radera filen %s vi just nu har skapat i mappen ”installation” i din Joomla."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Av någon anledning kan vi inte skapa filen. Du måste manuellt skapa en fil som heter %s och överföra den till mappen ”installation” i din Joomla."
 INSTL_DATABASE_NAME_DESC="Vissa webbhotell tillåter bara ett databasnamn per konto. Använd i så fall tabellprefix för att särskilja flera Joomla-installationer."

From 65c81594b41c1291a160f96d1d43b6fa1377f8de Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 25 Jul 2017 12:16:48 +0200
Subject: [PATCH 047/148] fixed a logic change in #12294, thanks @Hoffi1

---
 components/com_users/helpers/html/users.php | 34 +++++++++------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/components/com_users/helpers/html/users.php b/components/com_users/helpers/html/users.php
index e8f06333af88d..29adb3e3c4117 100644
--- a/components/com_users/helpers/html/users.php
+++ b/components/com_users/helpers/html/users.php
@@ -72,35 +72,29 @@ public static function helpsite($value)
 		{
 			return static::value($value);
 		}
-		else
-		{
-			$pathToXml = JPATH_ADMINISTRATOR . '/help/helpsites.xml';
 
-			$text = $value;
+		$text = $value;
 
-			if (!empty($pathToXml) && $xml = simplexml_load_file($pathToXml))
+		if ($xml = simplexml_load_file(JPATH_ADMINISTRATOR . '/help/helpsites.xml'))
+		{
+			foreach ($xml->sites->site as $site)
 			{
-				foreach ($xml->sites->site as $site)
+				if ((string) $site->attributes()->url == $value)
 				{
-					if ((string) $site->attributes()->url == $value)
-					{
-						$text = (string) $site;
-						break;
-					}
+					$text = (string) $site;
+					break;
 				}
 			}
+		}
 
-			$value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
+		$value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
 
-			if (strpos($value, 'http') !== 0)
-			{
-				return '<a href="' . $value . '">' . $text . '</a>';
-			}
-			else
-			{
-				return '<a href="http://' . $value . '">' . $text . '</a>';
-			}
+		if (strpos($value, 'http') === 0)
+		{
+			return '<a href="' . $value . '">' . $text . '</a>';
 		}
+
+		return '<a href="http://' . $value . '">' . $text . '</a>';
 	}
 
 	/**

From ea0304a36ed979283b5ffb8daa50ed6c9733cada Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 25 Jul 2017 12:20:08 +0200
Subject: [PATCH 048/148] Prepare 3.7.4 Stable Release

---
 administrator/manifests/files/joomla.xml      |  2 +-
 installation/model/database.php               | 65 +++++++++++++++++++
 libraries/cms/version/version.php             |  8 +--
 .../vendor/joomla/filter/src/InputFilter.php  |  1 +
 4 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 4291ae437e875..5b9d6efd48bce 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.7.4-dev</version>
+	<version>3.7.4</version>
 	<creationDate>July 2017</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/installation/model/database.php b/installation/model/database.php
index 41bdc6c6c6c1f..158231eeef13f 100644
--- a/installation/model/database.php
+++ b/installation/model/database.php
@@ -164,6 +164,71 @@ public function initialise($options)
 			return false;
 		}
 
+		// Per Default allowed DB Hosts
+		$localhost = array(
+			'localhost',
+			'127.0.0.1',
+			'::1',
+		);
+
+		// Check the security file if the db_host is not localhost / 127.0.0.1 / ::1
+		if (!in_array($options->db_host, $localhost))
+		{
+			// Add the general message
+			JFactory::getApplication()->enqueueMessage(
+				JText::sprintf(
+					'INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE',
+					'https://docs.joomla.org/Special:MyLanguage/J3.x:Secured_procedure_for_installing_Joomla_with_a_remote_database'
+				),
+				'warning'
+			);
+
+			$remoteDbFile = JFactory::getSession()->get('remoteDbFile', false);
+
+			if ($remoteDbFile === false)
+			{
+				// This is the remote database file you need to remove if you want to use a remote database
+				$remoteDbFile = '_Joomla' . JUserHelper::genRandomPassword(21) . '.txt';
+				JFactory::getSession()->set('remoteDbFile', $remoteDbFile);
+
+				// Get the path
+				$remoteDbPath = JPATH_INSTALLATION . '/' . $remoteDbFile;
+
+				// When the path is not writable the user need to create the file itself
+				if (!JFile::write($remoteDbPath, ''))
+				{
+					// Request to create the file manually
+					JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE', $remoteDbFile), 'error');
+
+					JFactory::getSession()->set('remoteDbFileUnwritable', true);
+
+					return false;
+				}
+
+				// Save the file name to the session
+				JFactory::getSession()->set('remoteDbFileWrittenByJoomla', true);
+
+				// Request to delete that file
+				JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE', $remoteDbFile), 'error');
+
+				return false;
+			}
+
+			if (JFactory::getSession()->get('remoteDbFileWrittenByJoomla', false) === true && file_exists(JPATH_INSTALLATION . '/' . $remoteDbFile))
+			{
+				JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE', $remoteDbFile), 'error');
+
+				return false;
+			}
+
+			if (JFactory::getSession()->get('remoteDbFileUnwritable', false) === true && !file_exists(JPATH_INSTALLATION . '/' . $remoteDbFile))
+			{
+				JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE', $remoteDbFile), 'error');
+
+				return false;
+			}
+		}
+
 		// Get a database object.
 		try
 		{
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index ea8187642a1ea..daebb051d20dd 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -38,7 +38,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_LEVEL = '4-dev';
+	const DEV_LEVEL = '4';
 
 	/**
 	 * Development status.
@@ -46,7 +46,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Development';
+	const DEV_STATUS = 'Stable';
 
 	/**
 	 * Build number.
@@ -70,7 +70,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '18-July-2017';
+	const RELDATE = '25-July-2017';
 
 	/**
 	 * Release time.
@@ -78,7 +78,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '16:03';
+	const RELTIME = '11:11';
 
 	/**
 	 * Release timezone.
diff --git a/libraries/vendor/joomla/filter/src/InputFilter.php b/libraries/vendor/joomla/filter/src/InputFilter.php
index 3c7aa6dd2d1b8..c3cab34457cb2 100644
--- a/libraries/vendor/joomla/filter/src/InputFilter.php
+++ b/libraries/vendor/joomla/filter/src/InputFilter.php
@@ -126,6 +126,7 @@ class InputFilter
 		'bgsound',
 		'base',
 		'basefont',
+		'canvas',
 		'embed',
 		'frame',
 		'frameset',

From 68545028b90376ec40e604fb36f2d5782d15f478 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 25 Jul 2017 16:30:10 +0200
Subject: [PATCH 049/148] set 3.8.0 Dev State

---
 README.md                                      | 2 +-
 README.txt                                     | 2 +-
 administrator/language/en-GB/en-GB.xml         | 2 +-
 administrator/language/en-GB/install.xml       | 2 +-
 administrator/manifests/files/joomla.xml       | 2 +-
 administrator/manifests/packages/pkg_en-GB.xml | 2 +-
 build.xml                                      | 2 +-
 installation/language/en-GB/en-GB.xml          | 2 +-
 language/en-GB/en-GB.xml                       | 2 +-
 language/en-GB/install.xml                     | 2 +-
 libraries/cms/version/version.php              | 8 ++++----
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 2b631d9f72d89..0ec4f92782430 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 3.7 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history).
+* Joomla! 3.8 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history).
 * Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
 
 What is Joomla?
diff --git a/README.txt b/README.txt
index a9c9c1789e1cf..31bc4fa9a35c9 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 3.7 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history
+	* Joomla! 3.8 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history
 	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
 
 2- What is Joomla?
diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
index fb6dbff2e10e9..34a6f69485f9a 100644
--- a/administrator/language/en-GB/en-GB.xml
+++ b/administrator/language/en-GB/en-GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.7.4</version>
+	<version>3.8.0</version>
 	<creationDate>July 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index b4853e7bbad4c..3005a501589af 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension version="3.7" client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.7.4</version>
+	<version>3.8.0</version>
 	<creationDate>July 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 5b9d6efd48bce..748fc4b09c3f7 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.7.4</version>
+	<version>3.8.0-dev</version>
 	<creationDate>July 2017</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
index a9c90c734c352..4b5e2c044aea8 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,7 +2,7 @@
 <extension type="package" version="3.7" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.7.4.1</version>
+	<version>3.8.0.1</version>
 	<creationDate>July 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/build.xml b/build.xml
index 43a7fe83498f2..99eb0c512d436 100644
--- a/build.xml
+++ b/build.xml
@@ -84,7 +84,7 @@
 			<arg value="--template" />
 			<arg value="joomla" />
 			<arg value="--title" />
-			<arg value="Joomla! CMS 3.7 API" />
+			<arg value="Joomla! CMS 3.8 API" />
 		</exec>
 	</target>
 
diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
index ad089fbd97bd1..3ff18268f6c2b 100644
--- a/installation/language/en-GB/en-GB.xml
+++ b/installation/language/en-GB/en-GB.xml
@@ -3,7 +3,7 @@
 	version="3.7"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.7.4</version>
+	<version>3.8.0</version>
 	<creationDate>July 2017</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
index 45a1d6618b516..a791a25e9308c 100644
--- a/language/en-GB/en-GB.xml
+++ b/language/en-GB/en-GB.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.7" client="site">
 	<name>English (en-GB)</name>
-	<version>3.7.4</version>
+	<version>3.8.0</version>
 	<creationDate>July 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 70de51a813fa0..9376a9d01ec7b 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension version="3.7" client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.7.4</version>
+	<version>3.8.0</version>
 	<creationDate>July 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index daebb051d20dd..a614097b78771 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -30,7 +30,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELEASE = '3.7';
+	const RELEASE = '3.8';
 
 	/**
 	 * Maintenance version.
@@ -38,7 +38,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_LEVEL = '4';
+	const DEV_LEVEL = '0-dev';
 
 	/**
 	 * Development status.
@@ -46,7 +46,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Stable';
+	const DEV_STATUS = 'Development';
 
 	/**
 	 * Build number.
@@ -78,7 +78,7 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '11:11';
+	const RELTIME = '15:29';
 
 	/**
 	 * Release timezone.

From d7e6fa1a65b9aa87d4412bad722623a672ed7015 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Tue, 25 Jul 2017 17:59:11 -0500
Subject: [PATCH 050/148] Update phpDocumentor build

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 99eb0c512d436..4fd02118e473f 100644
--- a/build.xml
+++ b/build.xml
@@ -76,9 +76,9 @@
 			<arg value="-i" />
 			<arg path="${basedir}/libraries/vendor/joomla/*/Tests/,${basedir}/libraries/vendor/joomla/string/src/phputf8/,${basedir}/libraries/vendor/composer/,${basedir}/libraries/vendor/joomla/event/vendor/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/_Tests/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/Tests/,${basedir}/libraries/idna_convert/" />
 			<arg value="-d" />
-			<arg path="${basedir}/libraries/cms/,${basedir}/libraries/joomla/,${basedir}/libraries/legacy/,${basedir}/libraries/vendor/joomla/" />
+			<arg path="${basedir}/libraries/cms/,${basedir}/libraries/joomla/,${basedir}/libraries/legacy/,${basedir}/libraries/src/,${basedir}/libraries/vendor/joomla/" />
 			<arg value="-f" />
-			<arg path="${basedir}/libraries/loader.php,${basedir}/libraries/platform.php" />
+			<arg path="${basedir}/libraries/loader.php" />
 			<arg value="-t" />
 			<arg path="${basedir}/build/api/" />
 			<arg value="--template" />

From 129748118638c80b6d07e8d51114eb3fe1816694 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 25 Jul 2017 18:03:19 -0500
Subject: [PATCH 051/148] remove the never working limitstart call (#17184)

---
 components/com_content/helpers/icon.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index d9eb4a81da04c..cadcc20afd556 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -174,12 +174,8 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal
 	 */
 	public static function print_popup($article, $params, $attribs = array(), $legacy = false)
 	{
-		$app = JFactory::getApplication();
-		$input = $app->input;
-		$request = $input->request;
-
 		$url  = ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language);
-		$url .= '&tmpl=component&print=1&layout=default&page=' . @ $request->limitstart;
+		$url .= '&tmpl=component&print=1&layout=default';
 
 		$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
 

From c45a67db18193bf3f29fbc45ac51b9d2875284eb Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Wed, 26 Jul 2017 01:06:01 +0200
Subject: [PATCH 052/148] fix joomla.content.options_default (#17123)

---
 layouts/joomla/content/options_default.php | 36 ++++++++--------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php
index e36532c308390..7874f71ae8f99 100644
--- a/layouts/joomla/content/options_default.php
+++ b/layouts/joomla/content/options_default.php
@@ -12,37 +12,25 @@
 
 <fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : 'form-horizontal'; ?>">
 	<legend><?php echo $displayData->name; ?></legend>
-
 	<?php if (!empty($displayData->description)) : ?>
 		<p><?php echo $displayData->description; ?></p>
 	<?php endif; ?>
-
-	<?php
-	$fieldsnames = explode(',', $displayData->fieldsname);
-
-	foreach ($fieldsnames as $fieldname)
-	{
-		foreach ($displayData->form->getFieldset($fieldname) as $field)
-		{
-			$datashowon = '';
-			$groupClass = $field->type === 'Spacer' ? ' field-spacer' : '';
-
-			if ($field->showon)
-			{
-				JHtml::_('jquery.framework');
-				JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true));
-				$datashowon = ' data-showon=\'' . json_encode(JFormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . '\'';
-			}
-			?>
+	<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
+	<?php foreach ($fieldsnames as $fieldname) : ?>
+		<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
+			<?php $datashowon = ''; ?>
+			<?php $groupClass = $field->type === 'Spacer' ? ' field-spacer' : ''; ?>
+			<?php if ($field->showon) : ?>
+				<?php JHtml::_('jquery.framework'); ?>
+				<?php JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); ?>
+				<?php $datashowon = ' data-showon=\'' . json_encode(JFormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . '\''; ?>
+			<?php endif; ?>
 			<div class="control-group<?php echo $groupClass; ?>"<?php echo $datashowon; ?>>
 				<?php if (!isset($displayData->showlabel) || $displayData->showlabel) : ?>
 					<div class="control-label"><?php echo $field->label; ?></div>
 				<?php endif; ?>
-
 				<div class="controls"><?php echo $field->input; ?></div>
 			</div>
-			<?php
-		}
-	}
-	?>
+		<?php endforeach; ?>
+	<?php endforeach; ?>
 </fieldset>

From 68f5365263e023707d5d8840c914061fe22eb869 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 26 Jul 2017 00:23:06 +0100
Subject: [PATCH 053/148] com_banners incorret tooltip (#17157)

The tooltip says that the images must be in the images/banners folder but this isnt true they can be in any folder
---
 administrator/language/en-GB/en-GB.com_banners.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini
index c2e450aecaa30..b0da025926b54 100644
--- a/administrator/language/en-GB/en-GB.com_banners.ini
+++ b/administrator/language/en-GB/en-GB.com_banners.ini
@@ -111,7 +111,7 @@ COM_BANNERS_FIELD_EXTRAINFO_DESC="Enter extra information for this client."
 COM_BANNERS_FIELD_EXTRAINFO_LABEL="Additional Information"
 COM_BANNERS_FIELD_HEIGHT_DESC="The height of the banner."
 COM_BANNERS_FIELD_HEIGHT_LABEL="Height"
-COM_BANNERS_FIELD_IMAGE_DESC="Select or upload an image for this banner. Images have to be in the /images/banners/ folder."
+COM_BANNERS_FIELD_IMAGE_DESC="Select or upload an image for this banner."
 COM_BANNERS_FIELD_IMAGE_LABEL="Image"
 COM_BANNERS_FIELD_IMPMADE_DESC="Displays the number of impressions made for the banner."
 COM_BANNERS_FIELD_IMPMADE_LABEL="Total Impressions"
@@ -137,7 +137,7 @@ COM_BANNERS_FIELD_TRACKCLICK_DESC="Record the number of clicks on the banners on
 COM_BANNERS_FIELD_TRACKCLICK_LABEL="Track Clicks"
 COM_BANNERS_FIELD_TRACKIMPRESSION_DESC="Record the impressions (views) of the banners on a daily basis."
 COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL="Track Impressions"
-COM_BANNERS_FIELD_TYPE_DESC="Choose the type of banner. Select Image to display an image from /images/banners/ folder. Select Custom to enter your custom code."
+COM_BANNERS_FIELD_TYPE_DESC="Choose the type of banner. Select Image to display an image. Select Custom to enter your custom code."
 COM_BANNERS_FIELD_TYPE_LABEL="Type"
 ; The following five strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
 COM_BANNERS_FIELD_VALUE_1="Unlimited"

From 159af43bcd339108c5fcdfe447a4f5bc07fd12dc Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 26 Jul 2017 00:23:37 +0100
Subject: [PATCH 054/148] mod_login showon option (#17153)

As seen below the option for Show Name is in the wrong place
---
 modules/mod_login/mod_login.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index 52088a17c32c3..57530b91fda93 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -84,18 +84,6 @@
 					<option value="0">JNO</option>
 				</field>
 
-				<field
-					name="profilelink"
-					type="radio"
-					label="MOD_LOGIN_FIELD_PROFILE_LABEL"
-					description="MOD_LOGIN_FIELD_PROFILE_DESC"
-					class="btn-group btn-group-yesno"
-					default="0"
-					>
-					<option value="1">JYES</option>
-					<option value="0">JNO</option>
-				</field>
-
 				<field
 					name="name"
 					type="list"
@@ -107,6 +95,18 @@
 					<option value="0">MOD_LOGIN_VALUE_NAME</option>
 					<option value="1">MOD_LOGIN_VALUE_USERNAME</option>
 				</field>
+				
+				<field
+					name="profilelink"
+					type="radio"
+					label="MOD_LOGIN_FIELD_PROFILE_LABEL"
+					description="MOD_LOGIN_FIELD_PROFILE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
 
 				<field
 					name="usesecure"

From f3b2f8d2469de71d40b9b43f6c275d3bf08e826e Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 26 Jul 2017 00:24:13 +0100
Subject: [PATCH 055/148] Text Filters layout (#17113)

* Text Filters layout

At some point in the past when layouts were added the design of the global configuration text filters  was changed and it looks odd

This PR adds a new layoout just for text filters without the big empty space

* updated as requested by @zero-24
---
 .../view/application/tmpl/default_filters.php |  2 +-
 layouts/joomla/content/text_filters.php       | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 layouts/joomla/content/text_filters.php

diff --git a/administrator/components/com_config/view/application/tmpl/default_filters.php b/administrator/components/com_config/view/application/tmpl/default_filters.php
index f6126af0ecc3f..504572e950fe4 100644
--- a/administrator/components/com_config/view/application/tmpl/default_filters.php
+++ b/administrator/components/com_config/view/application/tmpl/default_filters.php
@@ -12,4 +12,4 @@
 $this->name = JText::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
 $this->fieldsname = 'filters';
 $this->description = JText::_('COM_CONFIG_TEXT_FILTERS_DESC');
-echo JLayoutHelper::render('joomla.content.options_default', $this);
+echo JLayoutHelper::render('joomla.content.text_filters', $this);
diff --git a/layouts/joomla/content/text_filters.php b/layouts/joomla/content/text_filters.php
new file mode 100644
index 0000000000000..51ea0a43ab5f3
--- /dev/null
+++ b/layouts/joomla/content/text_filters.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+
+<fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : 'form-horizontal'; ?>">
+	<legend><?php echo $displayData->name; ?></legend>
+	<?php if (!empty($displayData->description)) : ?>
+		<p><?php echo $displayData->description; ?></p>
+	<?php endif; ?>
+	<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
+	<?php foreach ($fieldsnames as $fieldname) : ?>
+		<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
+			<div><?php echo $field->input; ?></div>
+		<?php endforeach; ?>
+	<?php endforeach; ?>
+</fieldset>

From 66c905764bb1b8542ba1be210beb85728faa5be3 Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Wed, 26 Jul 2017 00:37:44 +0100
Subject: [PATCH 056/148] Menu items list parent filter (#17060)

* removed duplicate parentId state

* New feature - Filter menu items by parent item. For issues #16882

* pre-select menu item parent if filtered by parent when creating a new menu item

* fixed slack tabbing

* Language changes as per @brianteeman

* Added parent_id to constructor so the search tools stay open when in use.

* Added new field filter for menu items which is filter dynamically by Menu Type if is filtered by Menu Type.

* Code style changes

* Code style changes

* Code style changes - Codesniffer auto

* Reverted CodeSniffer auto fix and applied single fix.

* Made changes requested by @quy

* Moved to alpha ordering.

* Updated as oer @Quy 's comments

* Updated changes as per @mbabker 's comments.

* Version placeholder, not new in 1.6 ;-)
---
 .../models/fields/menuitembytype.php          | 278 ++++++++++++++++++
 .../com_menus/models/forms/filter_items.xml   |   9 +
 .../components/com_menus/models/item.php      |   1 +
 .../components/com_menus/models/items.php     |   4 +-
 .../language/en-GB/en-GB.com_menus.ini        |   3 +
 5 files changed, 292 insertions(+), 3 deletions(-)
 create mode 100644 administrator/components/com_menus/models/fields/menuitembytype.php

diff --git a/administrator/components/com_menus/models/fields/menuitembytype.php b/administrator/components/com_menus/models/fields/menuitembytype.php
new file mode 100644
index 0000000000000..059e0308b0f44
--- /dev/null
+++ b/administrator/components/com_menus/models/fields/menuitembytype.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('groupedlist');
+
+// Import the com_menus helper.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+/**
+ * Supports an HTML grouped select list of menu item grouped by menu
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JFormFieldMenuitemByType extends JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $type = 'MenuItemByType';
+
+	/**
+	 * The menu type.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $menuType;
+
+	/**
+	 * The client id.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $clientId;
+
+	/**
+	 * The language.
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $language;
+
+	/**
+	 * The published status.
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $published;
+
+	/**
+	 * The disabled status.
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $disable;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'menuType':
+			case 'clientId':
+			case 'language':
+			case 'published':
+			case 'disable':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to the the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'menuType':
+				$this->menuType = (string) $value;
+				break;
+
+			case 'clientId':
+				$this->clientId = (int) $value;
+				break;
+
+			case 'language':
+			case 'published':
+			case 'disable':
+				$value = (string) $value;
+				$this->$name = $value ? explode(',', $value) : array();
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result == true)
+		{
+			$menuType = (string) $this->element['menu_type'];
+
+			if (!$menuType)
+			{
+				$app = JFactory::getApplication('administrator');
+				$currentMenuType = $app->getUserState('com_menus.items.menutype', '');
+				$menuType        = $app->input->getString('menutype', $currentMenuType);
+			}
+
+			$this->menuType  = $menuType;
+			$this->clientId  = (int) $this->element['client_id'];
+			$this->published = $this->element['published'] ? explode(',', (string) $this->element['published']) : array();
+			$this->disable   = $this->element['disable'] ? explode(',', (string) $this->element['disable']) : array();
+			$this->language  = $this->element['language'] ? explode(',', (string) $this->element['language']) : array();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field option groups.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+
+		$menuType = $this->menuType;
+
+		// Get the menu items.
+		$items = MenusHelper::getMenuLinks($menuType, 0, 0, $this->published, $this->language, $this->clientId);
+
+		// Build group for a specific menu type.
+		if ($menuType)
+		{
+			// If the menutype is empty, group the items by menutype.
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__menu_types'))
+				->where($db->quoteName('menutype') . ' = ' . $db->quote($menuType));
+			$db->setQuery($query);
+
+			try
+			{
+				$menuTitle = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$menuTitle = $menuType;
+			}
+
+			// Initialize the group.
+			$groups[$menuTitle] = array();
+
+			// Build the options array.
+			foreach ($items as $key => $link)
+			{
+				// Unset if item is menu_item_root
+				if ($link->text === 'Menu_Item_Root')
+				{
+					unset($items[$key]);
+					continue;
+				}
+
+				$levelPrefix = str_repeat('- ', max(0, $link->level - 1));
+
+				// Displays language code if not set to All
+				if ($link->language !== '*')
+				{
+					$lang = ' (' . $link->language . ')';
+				}
+				else
+				{
+					$lang = '';
+				}
+
+				$groups[$menuTitle][] = JHtml::_('select.option',
+					$link->value, $levelPrefix . $link->text . $lang,
+					'value',
+					'text',
+					in_array($link->type, $this->disable)
+				);
+			}
+		}
+		// Build groups for all menu types.
+		else
+		{
+			// Build the groups arrays.
+			foreach ($items as $menu)
+			{
+				// Initialize the group.
+				$groups[$menu->title] = array();
+
+				// Build the options array.
+				foreach ($menu->links as $link)
+				{
+					$levelPrefix = str_repeat('- ', $link->level - 1);
+
+					// Displays language code if not set to All
+					if ($link->language !== '*')
+					{
+						$lang = ' (' . $link->language . ')';
+					}
+					else
+					{
+						$lang = '';
+					}
+
+					$groups[$menu->title][] = JHtml::_('select.option',
+						$link->value,
+						$levelPrefix . $link->text . $lang,
+						'value',
+						'text',
+						in_array($link->type, $this->disable)
+					);
+				}
+			}
+		}
+
+		// Merge any additional groups in the XML definition.
+		$groups = array_merge(parent::getGroups(), $groups);
+
+		return $groups;
+	}
+}
diff --git a/administrator/components/com_menus/models/forms/filter_items.xml b/administrator/components/com_menus/models/forms/filter_items.xml
index 2e6e14f3906b1..28672454e21f4 100644
--- a/administrator/components/com_menus/models/forms/filter_items.xml
+++ b/administrator/components/com_menus/models/forms/filter_items.xml
@@ -74,6 +74,15 @@
 			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
+		<field
+			name="parent_id"
+			type="menuitembytype"
+			label="COM_MENUS_FILTER_PARENT_MENU_ITEM_LABEL"
+			description="COM_MENUS_FILTER_PARENT_MENU_ITEM_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM</option>
+		</field>
 	</fields>
 	<fields name="list">
 		<field
diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php
index 5e52cd274da2d..622454bf3b794 100644
--- a/administrator/components/com_menus/models/item.php
+++ b/administrator/components/com_menus/models/item.php
@@ -613,6 +613,7 @@ protected function loadFormData()
 		{
 			// Get selected fields
 			$filters = JFactory::getApplication()->getUserState('com_menus.items.filter');
+			$data['parent_id'] = (isset($filters['parent_id']) ? $filters['parent_id'] : null);
 			$data['published'] = (isset($filters['published']) ? $filters['published'] : null);
 			$data['language'] = (isset($filters['language']) ? $filters['language'] : null);
 			$data['access'] = (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access'));
diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php
index 9febfb9e122b9..20fad614a1e88 100644
--- a/administrator/components/com_menus/models/items.php
+++ b/administrator/components/com_menus/models/items.php
@@ -44,6 +44,7 @@ public function __construct($config = array())
 				'path', 'a.path',
 				'client_id', 'a.client_id',
 				'home', 'a.home',
+				'parent_id', 'a.parent_id',
 				'a.ordering'
 			);
 
@@ -90,9 +91,6 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
 			$this->context .= '.' . $forcedLanguage;
 		}
 
-		$parentId = $this->getUserStateFromRequest($this->context . '.filter.parent_id', 'filter_parent_id');
-		$this->setState('filter.parent_id', $parentId);
-
 		$search = $this->getUserStateFromRequest($this->context . '.search', 'filter_search');
 		$this->setState('filter.search', $search);
 
diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index fd1bc0b206f58..cdb8bc2f93140 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -37,6 +37,9 @@ COM_MENUS_FIELD_VALUE_NEW_WITH_NAV="New Window With Navigation"
 COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV="New Without Navigation"
 COM_MENUS_FIELD_VALUE_PARENT="Parent"
 COM_MENUS_FIELDSET_RULES="Permissions"
+COM_MENUS_FILTER_PARENT_MENU_ITEM_DESC="Filters the menu items list where the parent is this selected menu item."
+COM_MENUS_FILTER_PARENT_MENU_ITEM_LABEL="Parent Menu Item"
+COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM="- Select Parent Menu Item -"
 COM_MENUS_GRID_UNSET_LANGUAGE="Unset %s Default"
 COM_MENUS_HEADING_ASSIGN_MODULE="Module"
 COM_MENUS_HEADING_ASSOCIATION="Association"

From 5d3f4f6501bdf4f607bbd0236c8d3e65be3a6de2 Mon Sep 17 00:00:00 2001
From: Fedir Zinchuk <getthesite@gmail.com>
Date: Wed, 26 Jul 2017 01:43:18 +0200
Subject: [PATCH 057/148] Fix the path for the ajax-loader.gif (#16701)

---
 media/system/js/core-uncompressed.js | 13 +++++++------
 media/system/js/core.js              |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
index 82636b3bfacbf..2e6cf1ec710ac 100644
--- a/media/system/js/core-uncompressed.js
+++ b/media/system/js/core-uncompressed.js
@@ -722,10 +722,10 @@ Joomla.editors.instances = Joomla.editors.instances || {
 	 * Used in: /administrator/components/com_installer/views/languages/tmpl/default.php
 	 *          /installation/template/js/installation.js
 	 *
-	 * @param   string  task           The task to do [load, show, hide] (defaults to show).
-	 * @param   object  parentElement  The HTML element where we are appending the layer (defaults to body).
+	 * @param   {String}       task           The task to do [load, show, hide] (defaults to show).
+	 * @param   {HTMLElement}  parentElement  The HTML element where we are appending the layer (defaults to body).
 	 *
-	 * @return  object  The HTML loading layer element.
+	 * @return  {HTMLElement}  The HTML loading layer element.
 	 *
 	 * @since  3.6.0
 	 */
@@ -735,10 +735,11 @@ Joomla.editors.instances = Joomla.editors.instances || {
 		parentElement = parentElement || document.body;
 
 		// Create the loading layer (hidden by default).
-		if (task == 'load')
+		if (task === 'load')
 		{
-			// Gets the site base path from the body element (defaults to empty - no subfolder)
-			var basePath = document.getElementsByTagName('body')[0].getAttribute('data-basepath') || '';
+			// Gets the site base path
+			var systemPaths = Joomla.getOptions('system.paths') || {},
+				basePath    = systemPaths.root || '';
 
 			var loadingDiv = document.createElement('div');
 
diff --git a/media/system/js/core.js b/media/system/js/core.js
index fb61cd32c04bf..7bd90baa65658 100644
--- a/media/system/js/core.js
+++ b/media/system/js/core.js
@@ -1 +1 @@
-Joomla=window.Joomla||{};Joomla.editors=Joomla.editors||{};Joomla.editors.instances=Joomla.editors.instances||{};(function(Joomla,document){"use strict";Joomla.submitform=function(task,form,validate){if(!form){form=document.getElementById("adminForm")}if(task){form.task.value=task}form.noValidate=!validate;if(!validate){form.setAttribute("novalidate","")}else if(form.hasAttribute("novalidate")){form.removeAttribute("novalidate")}var button=document.createElement("input");button.style.display="none";button.type="submit";form.appendChild(button).click();form.removeChild(button)};Joomla.submitbutton=function(pressbutton){Joomla.submitform(pressbutton)};Joomla.JText={strings:{},_:function(key,def){var newStrings=Joomla.getOptions("joomla.jtext");if(newStrings){this.load(newStrings);Joomla.loadOptions({"joomla.jtext":null})}def=def===undefined?"":def;key=key.toUpperCase();return this.strings[key]!==undefined?this.strings[key]:def},load:function(object){for(var key in object){if(!object.hasOwnProperty(key))continue;this.strings[key.toUpperCase()]=object[key]}return this}};Joomla.optionsStorage=Joomla.optionsStorage||null;Joomla.getOptions=function(key,def){if(!Joomla.optionsStorage){Joomla.loadOptions()}return Joomla.optionsStorage[key]!==undefined?Joomla.optionsStorage[key]:def};Joomla.loadOptions=function(options){if(!options){var elements=document.querySelectorAll(".joomla-script-options.new"),str,element,option,counter=0;for(var i=0,l=elements.length;i<l;i++){element=elements[i];str=element.text||element.textContent;option=JSON.parse(str);if(option){Joomla.loadOptions(option);counter++}element.className=element.className.replace(" new"," loaded")}if(counter){return}}if(!Joomla.optionsStorage){Joomla.optionsStorage=options||{}}else if(options){for(var p in options){if(options.hasOwnProperty(p)){Joomla.optionsStorage[p]=options[p]}}}};Joomla.replaceTokens=function(newToken){if(!/^[0-9A-F]{32}$/i.test(newToken)){return}var els=document.getElementsByTagName("input"),i,el,n;for(i=0,n=els.length;i<n;i++){el=els[i];if(el.type=="hidden"&&el.value=="1"&&el.name.length==32){el.name=newToken}}};Joomla.isEmail=function(text){var regex=/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i;return regex.test(text)};Joomla.checkAll=function(checkbox,stub){if(!checkbox.form)return false;stub=stub?stub:"cb";var c=0,i,e,n;for(i=0,n=checkbox.form.elements.length;i<n;i++){e=checkbox.form.elements[i];if(e.type==checkbox.type&&e.id.indexOf(stub)===0){e.checked=checkbox.checked;c+=e.checked?1:0}}if(checkbox.form.boxchecked){checkbox.form.boxchecked.value=c}return true};Joomla.renderMessages=function(messages){Joomla.removeMessages();var messageContainer=document.getElementById("system-message-container"),type,typeMessages,messagesBox,title,titleWrapper,i,messageWrapper,alertClass;for(type in messages){if(!messages.hasOwnProperty(type)){continue}typeMessages=messages[type];messagesBox=document.createElement("div");alertClass=type=="notice"?"alert-info":"alert-"+type;alertClass=type=="message"?"alert-success":alertClass;messagesBox.className="alert "+alertClass;var buttonWrapper=document.createElement("button");buttonWrapper.setAttribute("type","button");buttonWrapper.setAttribute("data-dismiss","alert");buttonWrapper.className="close";buttonWrapper.innerHTML="×";messagesBox.appendChild(buttonWrapper);title=Joomla.JText._(type);if(typeof title!="undefined"){titleWrapper=document.createElement("h4");titleWrapper.className="alert-heading";titleWrapper.innerHTML=Joomla.JText._(type);messagesBox.appendChild(titleWrapper)}for(i=typeMessages.length-1;i>=0;i--){messageWrapper=document.createElement("div");messageWrapper.innerHTML=typeMessages[i];messagesBox.appendChild(messageWrapper)}messageContainer.appendChild(messagesBox)}};Joomla.removeMessages=function(){var messageContainer=document.getElementById("system-message-container");while(messageContainer.firstChild)messageContainer.removeChild(messageContainer.firstChild);messageContainer.style.display="none";messageContainer.offsetHeight;messageContainer.style.display=""};Joomla.ajaxErrorsMessages=function(xhr,textStatus,error){var msg={};if(textStatus==="parsererror"){var encodedJson=xhr.responseText.trim();var buf=[];for(var i=encodedJson.length-1;i>=0;i--){buf.unshift(["&#",encodedJson[i].charCodeAt(),";"].join(""))}encodedJson=buf.join("");msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",encodedJson)]}else if(textStatus==="nocontent"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]}else if(textStatus==="timeout"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]}else if(textStatus==="abort"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]}else if(xhr.responseJSON&&xhr.responseJSON.message){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",xhr.status)+" <em>"+xhr.responseJSON.message+"</em>"]}else if(xhr.statusText){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",xhr.status)+" <em>"+xhr.statusText+"</em>"]}else{msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",xhr.status)]}return msg};Joomla.isChecked=function(isitchecked,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.boxchecked.value=isitchecked?parseInt(form.boxchecked.value)+1:parseInt(form.boxchecked.value)-1;if(!form.elements["checkall-toggle"])return;var c=true,i,e,n;for(i=0,n=form.elements.length;i<n;i++){e=form.elements[i];if(e.type=="checkbox"&&e.name!="checkall-toggle"&&!e.checked){c=false;break}}form.elements["checkall-toggle"].checked=c};Joomla.popupWindow=function(mypage,myname,w,h,scroll){var winl=(screen.width-w)/2,wint=(screen.height-h)/2,winprops="height="+h+",width="+w+",top="+wint+",left="+winl+",scrollbars="+scroll+",resizable";window.open(mypage,myname,winprops).window.focus()};Joomla.tableOrdering=function(order,dir,task,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.filter_order.value=order;form.filter_order_Dir.value=dir;Joomla.submitform(task,form)};window.writeDynaList=function(selectParams,source,key,orig_key,orig_val,element){var html="<select "+selectParams+">",hasSelection=key==orig_key,i=0,selected,x,item;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}selected="";if(hasSelection&&orig_val==item[1]||!hasSelection&&i===0){selected='selected="selected"'}html+='<option value="'+item[1]+'" '+selected+">"+item[2]+"</option>";i++}html+="</select>";if(element){element.innerHTML=html}else{document.writeln(html)}};window.changeDynaList=function(listname,source,key,orig_key,orig_val){var list=document.adminForm[listname],hasSelection=key==orig_key,i,x,item,opt;while(list.firstChild)list.removeChild(list.firstChild);i=0;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}opt=new Option;opt.value=item[1];opt.text=item[2];if(hasSelection&&orig_val==opt.value||!hasSelection&&i===0){opt.selected=true}list.options[i++]=opt}list.length=i};window.radioGetCheckedValue=function(radioObj){if(!radioObj){return""}var n=radioObj.length,i;if(n===undefined){return radioObj.checked?radioObj.value:""}for(i=0;i<n;i++){if(radioObj[i].checked){return radioObj[i].value}}return""};window.getSelectedValue=function(frmName,srcListName){var srcList=document[frmName][srcListName],i=srcList.selectedIndex;if(i!==null&&i>-1){return srcList.options[i].value}else{return null}};window.listItemTask=function(id,task){var f=document.adminForm,i=0,cbx,cb=f[id];if(!cb)return false;while(true){cbx=f["cb"+i];if(!cbx)break;cbx.checked=false;i++}cb.checked=true;f.boxchecked.value=1;window.submitform(task);return false};window.submitbutton=function(pressbutton){Joomla.submitbutton(pressbutton)};window.submitform=function(pressbutton){Joomla.submitform(pressbutton)};window.saveorder=function(n,task){window.checkAll_button(n,task)};window.checkAll_button=function(n,task){task=task?task:"saveorder";var j,box;for(j=0;j<=n;j++){box=document.adminForm["cb"+j];if(box){box.checked=true}else{alert("You cannot change the order of items, as an item in the list is `Checked Out`");return}}Joomla.submitform(task)};Joomla.loadingLayer=function(task,parentElement){task=task||"show";parentElement=parentElement||document.body;if(task=="load"){var basePath=document.getElementsByTagName("body")[0].getAttribute("data-basepath")||"";var loadingDiv=document.createElement("div");loadingDiv.id="loading-logo";loadingDiv.style["position"]="fixed";loadingDiv.style["top"]="0";loadingDiv.style["left"]="0";loadingDiv.style["width"]="100%";loadingDiv.style["height"]="100%";loadingDiv.style["opacity"]="0.8";loadingDiv.style["filter"]="alpha(opacity=80)";loadingDiv.style["overflow"]="hidden";loadingDiv.style["z-index"]="10000";loadingDiv.style["display"]="none";loadingDiv.style["background-color"]="#fff";loadingDiv.style["background-image"]='url("'+basePath+'/media/jui/images/ajax-loader.gif")';loadingDiv.style["background-position"]="center";loadingDiv.style["background-repeat"]="no-repeat";loadingDiv.style["background-attachment"]="fixed";parentElement.appendChild(loadingDiv)}else{if(!document.getElementById("loading-logo")){Joomla.loadingLayer("load",parentElement)}document.getElementById("loading-logo").style["display"]=task=="show"?"block":"none"}return document.getElementById("loading-logo")};Joomla.extend=function(destination,source){for(var p in source){if(source.hasOwnProperty(p)){destination[p]=source[p]}}return destination};Joomla.request=function(options){options=Joomla.extend({url:"",method:"GET",data:null,perform:true},options);options.method=options.data?"POST":options.method;try{var xhr=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");xhr.open(options.method,options.url,true);xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("X-Ajax-Engine","Joomla!");if(options.method==="POST"&&(!options.headers||!options.headers["Content-Type"])){xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(options.headers){for(var p in options.headers){if(options.headers.hasOwnProperty(p)){xhr.setRequestHeader(p,options.headers[p])}}}xhr.onreadystatechange=function(){if(xhr.readyState!==4)return;if(xhr.status===200){if(options.onSuccess){options.onSuccess.call(window,xhr.responseText,xhr)}}else if(options.onError){options.onError.call(window,xhr)}};if(options.perform){if(options.onBefore&&options.onBefore.call(window,xhr)===false){return xhr}xhr.send(options.data)}}catch(error){window.console?console.log(error):null;return false}return xhr}})(Joomla,document);
\ No newline at end of file
+Joomla=window.Joomla||{};Joomla.editors=Joomla.editors||{};Joomla.editors.instances=Joomla.editors.instances||{};(function(Joomla,document){"use strict";Joomla.submitform=function(task,form,validate){if(!form){form=document.getElementById("adminForm")}if(task){form.task.value=task}form.noValidate=!validate;if(!validate){form.setAttribute("novalidate","")}else if(form.hasAttribute("novalidate")){form.removeAttribute("novalidate")}var button=document.createElement("input");button.style.display="none";button.type="submit";form.appendChild(button).click();form.removeChild(button)};Joomla.submitbutton=function(pressbutton){Joomla.submitform(pressbutton)};Joomla.JText={strings:{},_:function(key,def){var newStrings=Joomla.getOptions("joomla.jtext");if(newStrings){this.load(newStrings);Joomla.loadOptions({"joomla.jtext":null})}def=def===undefined?"":def;key=key.toUpperCase();return this.strings[key]!==undefined?this.strings[key]:def},load:function(object){for(var key in object){if(!object.hasOwnProperty(key))continue;this.strings[key.toUpperCase()]=object[key]}return this}};Joomla.optionsStorage=Joomla.optionsStorage||null;Joomla.getOptions=function(key,def){if(!Joomla.optionsStorage){Joomla.loadOptions()}return Joomla.optionsStorage[key]!==undefined?Joomla.optionsStorage[key]:def};Joomla.loadOptions=function(options){if(!options){var elements=document.querySelectorAll(".joomla-script-options.new"),str,element,option,counter=0;for(var i=0,l=elements.length;i<l;i++){element=elements[i];str=element.text||element.textContent;option=JSON.parse(str);if(option){Joomla.loadOptions(option);counter++}element.className=element.className.replace(" new"," loaded")}if(counter){return}}if(!Joomla.optionsStorage){Joomla.optionsStorage=options||{}}else if(options){for(var p in options){if(options.hasOwnProperty(p)){Joomla.optionsStorage[p]=options[p]}}}};Joomla.replaceTokens=function(newToken){if(!/^[0-9A-F]{32}$/i.test(newToken)){return}var els=document.getElementsByTagName("input"),i,el,n;for(i=0,n=els.length;i<n;i++){el=els[i];if(el.type=="hidden"&&el.value=="1"&&el.name.length==32){el.name=newToken}}};Joomla.isEmail=function(text){var regex=/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i;return regex.test(text)};Joomla.checkAll=function(checkbox,stub){if(!checkbox.form)return false;stub=stub?stub:"cb";var c=0,i,e,n;for(i=0,n=checkbox.form.elements.length;i<n;i++){e=checkbox.form.elements[i];if(e.type==checkbox.type&&e.id.indexOf(stub)===0){e.checked=checkbox.checked;c+=e.checked?1:0}}if(checkbox.form.boxchecked){checkbox.form.boxchecked.value=c}return true};Joomla.renderMessages=function(messages){Joomla.removeMessages();var messageContainer=document.getElementById("system-message-container"),type,typeMessages,messagesBox,title,titleWrapper,i,messageWrapper,alertClass;for(type in messages){if(!messages.hasOwnProperty(type)){continue}typeMessages=messages[type];messagesBox=document.createElement("div");alertClass=type=="notice"?"alert-info":"alert-"+type;alertClass=type=="message"?"alert-success":alertClass;messagesBox.className="alert "+alertClass;var buttonWrapper=document.createElement("button");buttonWrapper.setAttribute("type","button");buttonWrapper.setAttribute("data-dismiss","alert");buttonWrapper.className="close";buttonWrapper.innerHTML="×";messagesBox.appendChild(buttonWrapper);title=Joomla.JText._(type);if(typeof title!="undefined"){titleWrapper=document.createElement("h4");titleWrapper.className="alert-heading";titleWrapper.innerHTML=Joomla.JText._(type);messagesBox.appendChild(titleWrapper)}for(i=typeMessages.length-1;i>=0;i--){messageWrapper=document.createElement("div");messageWrapper.innerHTML=typeMessages[i];messagesBox.appendChild(messageWrapper)}messageContainer.appendChild(messagesBox)}};Joomla.removeMessages=function(){var messageContainer=document.getElementById("system-message-container");while(messageContainer.firstChild)messageContainer.removeChild(messageContainer.firstChild);messageContainer.style.display="none";messageContainer.offsetHeight;messageContainer.style.display=""};Joomla.ajaxErrorsMessages=function(xhr,textStatus,error){var msg={};if(textStatus==="parsererror"){var encodedJson=xhr.responseText.trim();var buf=[];for(var i=encodedJson.length-1;i>=0;i--){buf.unshift(["&#",encodedJson[i].charCodeAt(),";"].join(""))}encodedJson=buf.join("");msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",encodedJson)]}else if(textStatus==="nocontent"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]}else if(textStatus==="timeout"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]}else if(textStatus==="abort"){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]}else if(xhr.responseJSON&&xhr.responseJSON.message){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",xhr.status)+" <em>"+xhr.responseJSON.message+"</em>"]}else if(xhr.statusText){msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",xhr.status)+" <em>"+xhr.statusText+"</em>"]}else{msg.error=[Joomla.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",xhr.status)]}return msg};Joomla.isChecked=function(isitchecked,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.boxchecked.value=isitchecked?parseInt(form.boxchecked.value)+1:parseInt(form.boxchecked.value)-1;if(!form.elements["checkall-toggle"])return;var c=true,i,e,n;for(i=0,n=form.elements.length;i<n;i++){e=form.elements[i];if(e.type=="checkbox"&&e.name!="checkall-toggle"&&!e.checked){c=false;break}}form.elements["checkall-toggle"].checked=c};Joomla.popupWindow=function(mypage,myname,w,h,scroll){var winl=(screen.width-w)/2,wint=(screen.height-h)/2,winprops="height="+h+",width="+w+",top="+wint+",left="+winl+",scrollbars="+scroll+",resizable";window.open(mypage,myname,winprops).window.focus()};Joomla.tableOrdering=function(order,dir,task,form){if(typeof form==="undefined"){form=document.getElementById("adminForm")}form.filter_order.value=order;form.filter_order_Dir.value=dir;Joomla.submitform(task,form)};window.writeDynaList=function(selectParams,source,key,orig_key,orig_val,element){var html="<select "+selectParams+">",hasSelection=key==orig_key,i=0,selected,x,item;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}selected="";if(hasSelection&&orig_val==item[1]||!hasSelection&&i===0){selected='selected="selected"'}html+='<option value="'+item[1]+'" '+selected+">"+item[2]+"</option>";i++}html+="</select>";if(element){element.innerHTML=html}else{document.writeln(html)}};window.changeDynaList=function(listname,source,key,orig_key,orig_val){var list=document.adminForm[listname],hasSelection=key==orig_key,i,x,item,opt;while(list.firstChild)list.removeChild(list.firstChild);i=0;for(x in source){if(!source.hasOwnProperty(x)){continue}item=source[x];if(item[0]!=key){continue}opt=new Option;opt.value=item[1];opt.text=item[2];if(hasSelection&&orig_val==opt.value||!hasSelection&&i===0){opt.selected=true}list.options[i++]=opt}list.length=i};window.radioGetCheckedValue=function(radioObj){if(!radioObj){return""}var n=radioObj.length,i;if(n===undefined){return radioObj.checked?radioObj.value:""}for(i=0;i<n;i++){if(radioObj[i].checked){return radioObj[i].value}}return""};window.getSelectedValue=function(frmName,srcListName){var srcList=document[frmName][srcListName],i=srcList.selectedIndex;if(i!==null&&i>-1){return srcList.options[i].value}else{return null}};window.listItemTask=function(id,task){var f=document.adminForm,i=0,cbx,cb=f[id];if(!cb)return false;while(true){cbx=f["cb"+i];if(!cbx)break;cbx.checked=false;i++}cb.checked=true;f.boxchecked.value=1;window.submitform(task);return false};window.submitbutton=function(pressbutton){Joomla.submitbutton(pressbutton)};window.submitform=function(pressbutton){Joomla.submitform(pressbutton)};window.saveorder=function(n,task){window.checkAll_button(n,task)};window.checkAll_button=function(n,task){task=task?task:"saveorder";var j,box;for(j=0;j<=n;j++){box=document.adminForm["cb"+j];if(box){box.checked=true}else{alert("You cannot change the order of items, as an item in the list is `Checked Out`");return}}Joomla.submitform(task)};Joomla.loadingLayer=function(task,parentElement){task=task||"show";parentElement=parentElement||document.body;if(task==="load"){var systemPaths=Joomla.getOptions("system.paths")||{},basePath=systemPaths.root||"";var loadingDiv=document.createElement("div");loadingDiv.id="loading-logo";loadingDiv.style["position"]="fixed";loadingDiv.style["top"]="0";loadingDiv.style["left"]="0";loadingDiv.style["width"]="100%";loadingDiv.style["height"]="100%";loadingDiv.style["opacity"]="0.8";loadingDiv.style["filter"]="alpha(opacity=80)";loadingDiv.style["overflow"]="hidden";loadingDiv.style["z-index"]="10000";loadingDiv.style["display"]="none";loadingDiv.style["background-color"]="#fff";loadingDiv.style["background-image"]='url("'+basePath+'/media/jui/images/ajax-loader.gif")';loadingDiv.style["background-position"]="center";loadingDiv.style["background-repeat"]="no-repeat";loadingDiv.style["background-attachment"]="fixed";parentElement.appendChild(loadingDiv)}else{if(!document.getElementById("loading-logo")){Joomla.loadingLayer("load",parentElement)}document.getElementById("loading-logo").style["display"]=task=="show"?"block":"none"}return document.getElementById("loading-logo")};Joomla.extend=function(destination,source){for(var p in source){if(source.hasOwnProperty(p)){destination[p]=source[p]}}return destination};Joomla.request=function(options){options=Joomla.extend({url:"",method:"GET",data:null,perform:true},options);options.method=options.data?"POST":options.method;try{var xhr=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");xhr.open(options.method,options.url,true);xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("X-Ajax-Engine","Joomla!");if(options.method==="POST"&&(!options.headers||!options.headers["Content-Type"])){xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(options.headers){for(var p in options.headers){if(options.headers.hasOwnProperty(p)){xhr.setRequestHeader(p,options.headers[p])}}}xhr.onreadystatechange=function(){if(xhr.readyState!==4)return;if(xhr.status===200){if(options.onSuccess){options.onSuccess.call(window,xhr.responseText,xhr)}}else if(options.onError){options.onError.call(window,xhr)}};if(options.perform){if(options.onBefore&&options.onBefore.call(window,xhr)===false){return xhr}xhr.send(options.data)}}catch(error){window.console?console.log(error):null;return false}return xhr}})(Joomla,document);
\ No newline at end of file

From 5f5b1341bde47aedf19b3f9881839edb9720dfa2 Mon Sep 17 00:00:00 2001
From: Fedir Zinchuk <getthesite@gmail.com>
Date: Wed, 26 Jul 2017 01:43:52 +0200
Subject: [PATCH 058/148] Fix for: Repeatable field is no longer rendered with
 Chosen layout (#16471)

---
 media/system/js/repeatable-uncompressed.js | 11 +++++++++--
 media/system/js/repeatable.js              |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/media/system/js/repeatable-uncompressed.js b/media/system/js/repeatable-uncompressed.js
index 06af2de3372c3..1c9b87ee81ef2 100644
--- a/media/system/js/repeatable-uncompressed.js
+++ b/media/system/js/repeatable-uncompressed.js
@@ -437,8 +437,10 @@
         	// destroy chosen if any
         	if($.fn.chosen){
                 $row.find('select').each(function(){
-                	if ($(this).data('chosen')) {
-                        $(this).chosen('destroy');
+					var $el = $(this);
+					if ($el.data('chosen')) {
+						$el.chosen('destroy');
+						$el.addClass('here-was-chosen');
 					}
 				});
         	}
@@ -454,6 +456,11 @@
         // to the one of field that in given $row
         self.fixScripts = function($row){
 
+			// Chosen.js
+			if ($.fn.chosen) {
+				$row.find('select.here-was-chosen').removeClass('here-was-chosen').chosen();
+			}
+
         	//color picker
         	$row.find('.minicolors').each(function() {
         		var $el = $(this);
diff --git a/media/system/js/repeatable.js b/media/system/js/repeatable.js
index 739f2bfc9cee5..c5c24dab085be 100644
--- a/media/system/js/repeatable.js
+++ b/media/system/js/repeatable.js
@@ -1 +1 @@
-(function($){"use strict";$.JRepeatable=function(input,options){var self=this;if(!self||self===window){return new $.JRepeatable(input,options)}self.$input=$(input);if(self.$input.data("JRepeatable")){return self}self.$input.data("JRepeatable",self);self.init=function(){self.options=$.extend({},$.JRepeatable.defaults,options);self.$container=$(self.options.container);$("body").append(self.$container);self.$rowsContainer=self.$container.find(self.options.repeatableElement).parent();self.prepareModal();self.inputs=[];self.values={};self.prepareTemplate();var val=self.$input.val();if(val){try{self.values=JSON.parse(val)}catch(e){if(e instanceof SyntaxError){try{val=val.replace(/'/g,'"').replace(/\\"/g,"'");self.values=JSON.parse(val)}catch(e){if(window.console){console.log(e)}}}else if(window.console){console.log(e)}}}self.buildRows();$(document).on("click",self.options.btModalOpen,function(e){e.preventDefault();self.$modalWindow.modal("show")});self.$modalWindow.on("click",self.options.btModalClose,function(e){e.preventDefault();self.$modalWindow.modal("hide");self.buildRows()});self.$modalWindow.on("click",self.options.btModalSaveData,function(e){e.preventDefault();self.$modalWindow.modal("hide");self.refreshValue()});self.$container.on("click",self.options.btAdd,function(e){e.preventDefault();var after=$(this).parents(self.options.repeatableElement);if(!after.length){after=null}self.addRow(after)});self.$container.on("click",self.options.btRemove,function(e){e.preventDefault();var row=$(this).parents(self.options.repeatableElement);self.removeRow(row)});self.$input.trigger("weready")};self.prepareTemplate=function(){var $rows=self.$container.find(self.options.repeatableElement);var $row=$($rows.get(0));try{self.clearScripts($row)}catch(e){if(window.console){console.log(e)}}var inputs=$row.find("*[name]");for(var i=0,l=inputs.length;i<l;i++){var name=$(inputs[i]).attr("name");if(self.values[name]){continue}self.inputs.push({name:name,type:$(inputs[i]).attr("type")||inputs[i].tagName.toLowerCase()});self.values[name]=[]}self.template=$row.prop("outerHTML");$rows.remove();self.$input.trigger("prepare-template",self.template)};self.prepareModal=function(){var modalEl=$(self.options.modalElement);modalEl.css({position:"absolute",width:"auto","max-width":"100%"});modalEl.on("shown",function(){self.resizeModal()});$(window).resize(function(){self.resizeModal()});self.$modalWindow=modalEl.modal({show:false,backdrop:"static"});self.$input.trigger("prepare-modal",self.$modalWindow)};self.resizeModal=function(){if(!self.$modalWindow.is(":visible")){return}var docHalfWidth=$(document).width()/2,modalHalfWidth=self.$modalWindow.width()/2,rowsHalfWidth=self.$rowsContainer.width()/2,marginLeft=modalHalfWidth>=docHalfWidth?0:-modalHalfWidth,left=marginLeft?"50%":0,top=$(document).scrollTop()+$(window).height()*.2;self.$modalWindow.css({top:top,left:left,"margin-left":marginLeft,overflow:rowsHalfWidth>modalHalfWidth?"auto":"visible"})};self.buildRows=function(){var $oldRows=self.$rowsContainer.children();if($oldRows.length){self.removeRow($oldRows)}var count=self.values[Object.keys(self.values)[0]].length||1,row=null;for(var i=0;i<count;i++){row=self.addRow(row,i)}};self.addRow=function(after,valueKey){var count=self.$container.find(self.options.repeatableElement).length;if(count>=self.options.maximum){return null}var row=$.parseHTML(self.template);if(after){$(after).after(row)}else{self.$rowsContainer.append(row)}var $row=$(row);self.fixUniqueAttributes($row,count+1);if(valueKey!==null&&valueKey!==undefined){for(var i=0,l=self.inputs.length;i<l;i++){var name=self.inputs[i].name,type=self.inputs[i].type,value=null;if(self.values[name]){value=self.values[name][valueKey]}if(value===null||value===undefined){continue}if(type==="radio"){$row.find('*[name*="'+name+'"][value="'+value+'"]').attr("checked","checked")}else if(type==="checkbox"){if(value.length){for(var v=0,vl=value.length;v<vl;v++){$row.find('*[name*="'+name+'"][value="'+value[v]+'"]').attr("checked","checked")}}else{$row.find('*[name*="'+name+'"][value="'+value+'"]').attr("checked","checked")}}else{$row.find('*[name*="'+name+'"]').val(value)}}}try{self.fixScripts($row)}catch(e){if(window.console){console.log(e)}}self.$input.trigger("row-add",$row);return $row};self.removeRow=function(row){self.$input.trigger("row-remove",row);$(row).remove()};self.fixUniqueAttributes=function($row,count){var haveIds=$row.find("*[id]");self.increaseAttrName(haveIds,"id",count);var haveFor=$row.find("label[for]");self.increaseAttrName(haveFor,"for",count);var haveName=$row.find("*[name]");self.increaseAttrName(haveName,"name",count)};self.increaseAttrName=function(elements,attr,count){for(var i=0,l=elements.length;i<l;i++){var $el=$(elements[i]);var oldValue=$el.attr(attr);$el.attr(attr,count+"-"+oldValue)}};self.refreshValue=function(){var $rows=self.$container.find(self.options.repeatableElement);self.values={};for(var i=0,l=self.inputs.length;i<l;i++){var name=self.inputs[i].name,type=self.inputs[i].type;self.values[name]=[];for(var r=0,rl=$rows.length;r<rl;r++){var $row=$($rows[r]),val=null;if(type==="radio"){val=$row.find('*[name*="'+name+'"]:checked').val()}else if(type==="checkbox"){var checked=$row.find('*[name*="'+name+'"]:checked');if(checked.length>1){val=[];for(var c=0,cl=checked.length;c<cl;c++){val.push($(checked[c]).val())}}else{val=checked.val()}}else{val=$row.find('*[name*="'+name+'"]').val()}val=val===null?"":val;self.values[name].push(val)}}self.$input.val(JSON.stringify(self.values));self.$input.trigger("value-update",self.values)};self.clearScripts=function($row){if($.fn.chosen){$row.find("select").each(function(){if($(this).data("chosen")){$(this).chosen("destroy")}})}if($.fn.minicolors){$row.find(".minicolors input").each(function(){$(this).minicolors("destroy",$(this))})}};self.fixScripts=function($row){$row.find(".minicolors").each(function(){var $el=$(this);$el.minicolors({control:$el.attr("data-control")||"hue",position:$el.attr("data-position")||"right",theme:"bootstrap"})});$row.find('a[onclick*="jInsertFieldValue"]').each(function(){var $el=$(this),inputId=$el.siblings('input[type="text"]').attr("id"),$select=$el.prev(),oldHref=$select.attr("href");$el.attr("onclick","jInsertFieldValue('', '"+inputId+"');return false;");$select.attr("href",oldHref.replace(/&fieldid=(.+)&/,"&fieldid="+inputId+"&"));jMediaRefreshPreview(inputId)});if(window.SqueezeBox&&window.SqueezeBox.assign){SqueezeBox.assign($row.find("a.modal").get(),{parse:"rel"})}};self.init()};$.JRepeatable.defaults={modalElement:"#modal-container",btModalOpen:"#open-modal",btModalClose:".close-modal",btModalSaveData:".save-modal-data",btAdd:"a.add",btRemove:"a.remove",maximum:10,repeatableElement:"table tbody tr"};$.fn.JRepeatable=function(options){return this.each(function(){var options=options||{},data=$(this).data();for(var p in data){if(data.hasOwnProperty(p)){options[p]=data[p]}}new $.JRepeatable(this,options)})};$(window).on("load",function(){$("input.form-field-repeatable").JRepeatable()})})(jQuery);
\ No newline at end of file
+(function($){"use strict";$.JRepeatable=function(input,options){var self=this;if(!self||self===window){return new $.JRepeatable(input,options)}self.$input=$(input);if(self.$input.data("JRepeatable")){return self}self.$input.data("JRepeatable",self);self.init=function(){self.options=$.extend({},$.JRepeatable.defaults,options);self.$container=$(self.options.container);$("body").append(self.$container);self.$rowsContainer=self.$container.find(self.options.repeatableElement).parent();self.prepareModal();self.inputs=[];self.values={};self.prepareTemplate();var val=self.$input.val();if(val){try{self.values=JSON.parse(val)}catch(e){if(e instanceof SyntaxError){try{val=val.replace(/'/g,'"').replace(/\\"/g,"'");self.values=JSON.parse(val)}catch(e){if(window.console){console.log(e)}}}else if(window.console){console.log(e)}}}self.buildRows();$(document).on("click",self.options.btModalOpen,function(e){e.preventDefault();self.$modalWindow.modal("show")});self.$modalWindow.on("click",self.options.btModalClose,function(e){e.preventDefault();self.$modalWindow.modal("hide");self.buildRows()});self.$modalWindow.on("click",self.options.btModalSaveData,function(e){e.preventDefault();self.$modalWindow.modal("hide");self.refreshValue()});self.$container.on("click",self.options.btAdd,function(e){e.preventDefault();var after=$(this).parents(self.options.repeatableElement);if(!after.length){after=null}self.addRow(after)});self.$container.on("click",self.options.btRemove,function(e){e.preventDefault();var row=$(this).parents(self.options.repeatableElement);self.removeRow(row)});self.$input.trigger("weready")};self.prepareTemplate=function(){var $rows=self.$container.find(self.options.repeatableElement);var $row=$($rows.get(0));try{self.clearScripts($row)}catch(e){if(window.console){console.log(e)}}var inputs=$row.find("*[name]");for(var i=0,l=inputs.length;i<l;i++){var name=$(inputs[i]).attr("name");if(self.values[name]){continue}self.inputs.push({name:name,type:$(inputs[i]).attr("type")||inputs[i].tagName.toLowerCase()});self.values[name]=[]}self.template=$row.prop("outerHTML");$rows.remove();self.$input.trigger("prepare-template",self.template)};self.prepareModal=function(){var modalEl=$(self.options.modalElement);modalEl.css({position:"absolute",width:"auto","max-width":"100%"});modalEl.on("shown",function(){self.resizeModal()});$(window).resize(function(){self.resizeModal()});self.$modalWindow=modalEl.modal({show:false,backdrop:"static"});self.$input.trigger("prepare-modal",self.$modalWindow)};self.resizeModal=function(){if(!self.$modalWindow.is(":visible")){return}var docHalfWidth=$(document).width()/2,modalHalfWidth=self.$modalWindow.width()/2,rowsHalfWidth=self.$rowsContainer.width()/2,marginLeft=modalHalfWidth>=docHalfWidth?0:-modalHalfWidth,left=marginLeft?"50%":0,top=$(document).scrollTop()+$(window).height()*.2;self.$modalWindow.css({top:top,left:left,"margin-left":marginLeft,overflow:rowsHalfWidth>modalHalfWidth?"auto":"visible"})};self.buildRows=function(){var $oldRows=self.$rowsContainer.children();if($oldRows.length){self.removeRow($oldRows)}var count=self.values[Object.keys(self.values)[0]].length||1,row=null;for(var i=0;i<count;i++){row=self.addRow(row,i)}};self.addRow=function(after,valueKey){var count=self.$container.find(self.options.repeatableElement).length;if(count>=self.options.maximum){return null}var row=$.parseHTML(self.template);if(after){$(after).after(row)}else{self.$rowsContainer.append(row)}var $row=$(row);self.fixUniqueAttributes($row,count+1);if(valueKey!==null&&valueKey!==undefined){for(var i=0,l=self.inputs.length;i<l;i++){var name=self.inputs[i].name,type=self.inputs[i].type,value=null;if(self.values[name]){value=self.values[name][valueKey]}if(value===null||value===undefined){continue}if(type==="radio"){$row.find('*[name*="'+name+'"][value="'+value+'"]').attr("checked","checked")}else if(type==="checkbox"){if(value.length){for(var v=0,vl=value.length;v<vl;v++){$row.find('*[name*="'+name+'"][value="'+value[v]+'"]').attr("checked","checked")}}else{$row.find('*[name*="'+name+'"][value="'+value+'"]').attr("checked","checked")}}else{$row.find('*[name*="'+name+'"]').val(value)}}}try{self.fixScripts($row)}catch(e){if(window.console){console.log(e)}}self.$input.trigger("row-add",$row);return $row};self.removeRow=function(row){self.$input.trigger("row-remove",row);$(row).remove()};self.fixUniqueAttributes=function($row,count){var haveIds=$row.find("*[id]");self.increaseAttrName(haveIds,"id",count);var haveFor=$row.find("label[for]");self.increaseAttrName(haveFor,"for",count);var haveName=$row.find("*[name]");self.increaseAttrName(haveName,"name",count)};self.increaseAttrName=function(elements,attr,count){for(var i=0,l=elements.length;i<l;i++){var $el=$(elements[i]);var oldValue=$el.attr(attr);$el.attr(attr,count+"-"+oldValue)}};self.refreshValue=function(){var $rows=self.$container.find(self.options.repeatableElement);self.values={};for(var i=0,l=self.inputs.length;i<l;i++){var name=self.inputs[i].name,type=self.inputs[i].type;self.values[name]=[];for(var r=0,rl=$rows.length;r<rl;r++){var $row=$($rows[r]),val=null;if(type==="radio"){val=$row.find('*[name*="'+name+'"]:checked').val()}else if(type==="checkbox"){var checked=$row.find('*[name*="'+name+'"]:checked');if(checked.length>1){val=[];for(var c=0,cl=checked.length;c<cl;c++){val.push($(checked[c]).val())}}else{val=checked.val()}}else{val=$row.find('*[name*="'+name+'"]').val()}val=val===null?"":val;self.values[name].push(val)}}self.$input.val(JSON.stringify(self.values));self.$input.trigger("value-update",self.values)};self.clearScripts=function($row){if($.fn.chosen){$row.find("select").each(function(){var $el=$(this);if($el.data("chosen")){$el.chosen("destroy");$el.addClass("here-was-chosen")}})}if($.fn.minicolors){$row.find(".minicolors input").each(function(){$(this).minicolors("destroy",$(this))})}};self.fixScripts=function($row){if($.fn.chosen){$row.find("select.here-was-chosen").removeClass("here-was-chosen").chosen()}$row.find(".minicolors").each(function(){var $el=$(this);$el.minicolors({control:$el.attr("data-control")||"hue",position:$el.attr("data-position")||"right",theme:"bootstrap"})});$row.find('a[onclick*="jInsertFieldValue"]').each(function(){var $el=$(this),inputId=$el.siblings('input[type="text"]').attr("id"),$select=$el.prev(),oldHref=$select.attr("href");$el.attr("onclick","jInsertFieldValue('', '"+inputId+"');return false;");$select.attr("href",oldHref.replace(/&fieldid=(.+)&/,"&fieldid="+inputId+"&"));jMediaRefreshPreview(inputId)});if(window.SqueezeBox&&window.SqueezeBox.assign){SqueezeBox.assign($row.find("a.modal").get(),{parse:"rel"})}};self.init()};$.JRepeatable.defaults={modalElement:"#modal-container",btModalOpen:"#open-modal",btModalClose:".close-modal",btModalSaveData:".save-modal-data",btAdd:"a.add",btRemove:"a.remove",maximum:10,repeatableElement:"table tbody tr"};$.fn.JRepeatable=function(options){return this.each(function(){var options=options||{},data=$(this).data();for(var p in data){if(data.hasOwnProperty(p)){options[p]=data[p]}}new $.JRepeatable(this,options)})};$(window).on("load",function(){$("input.form-field-repeatable").JRepeatable()})})(jQuery);
\ No newline at end of file

From a46c68064eb9929cb1d0eb83bed9be4eade11847 Mon Sep 17 00:00:00 2001
From: Gavakshi Krishna <gavakshi4@gmail.com>
Date: Wed, 26 Jul 2017 05:14:16 +0530
Subject: [PATCH 059/148] Fixed typehint (#16425)

Fixed the typehint for quote functions in `JDatabaseDriver`
---
 libraries/joomla/database/driver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
index fc9080e72c9f8..c84e7a8e3990f 100644
--- a/libraries/joomla/database/driver.php
+++ b/libraries/joomla/database/driver.php
@@ -14,8 +14,8 @@
  *
  * @since  12.1
  *
- * @method      string  q()   q($text, $escape = true)  Alias for quote method
- * @method      string  qn()  qn($name, $as = null)     Alias for quoteName method
+ * @method   string|array  q()   q($text, $escape = true)  Alias for quote method
+ * @method   string|array  qn()  qn($name, $as = null)     Alias for quoteName method
  */
 abstract class JDatabaseDriver extends JDatabase implements JDatabaseInterface
 {

From 1e047dae12c5421c5cff03551ae386eaee44c40e Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Wed, 26 Jul 2017 02:46:57 +0300
Subject: [PATCH 060/148] Performance 6 (templates) (#12233)

* Type-safe string comparisons

* More type-safe comparisons

* Replace is_null with ===

* Use Elvis instead of complete ternary

* Merge nested if

* Replace single quotes with double quotes

* Remove unnecessary parentheses

* Optimize non-optimal if conditions.

* Reverted some condition flips as requested in changes of other PR (https://github.com/joomla/joomla-cms/pull/12225)

* Reverted some more condition flips as requested in changes of other PR (https://github.com/joomla/joomla-cms/pull/12225)

* Reverted even more condition flips as requested in changes of other PR (https://github.com/joomla/joomla-cms/pull/12225)

* Reverted one  more condition flips as requested in changes of other PR (https://github.com/joomla/joomla-cms/pull/12225)

* Replaced and, or with &&, ||

* Comply to change request in PR discussion:  Leave 'or' and 'and' alone

* Missed a spot...

* This way, this JS is much easier to read...

* Another HEREDOC

* Changes that were pointed out in PR discussion

* Hopefully this fixes CS...

* Formatting... ARGH!

* Reverted HEREDOC modifications. (maybe in some other PR?)

* Reverted a prior change, which was on hold, as no decision was made up to now, on if we could use HEREDOC to construct JS and CSS instead.

* Minor change

* Template code-style fix

* Replace unneeded strlen() call with cheaper is-not-empty-string check

* Changes:
- Replaced AND's and OR's with && and ||
- Modified alias function to use correct function
- Optimization: Extracted variable from multiple calls to do only one call
- Rearranged some conditions in if statements, which cost less than the ones on their left. Logic is still the same.

* Reversed AND OR to && || as per discussion in early comments of this PR..

* Corrections according to reviewer's comment

* Corrections according to reviewer's comment

* Corrections according to reviewer's comment

* Some more changes + changes according to reviewer's comments

* Changes according to reviewer's comments

* Changes according to reviewer's comments

* Changes according to reviewer's comment

* Changes according to reviewer's comment
---
 .../html/layouts/joomla/sidebars/submenu.php  |  2 +-
 administrator/templates/isis/error.php        |  2 +-
 .../com_contact/categories/default_items.php  |  4 +-
 .../html/com_contact/category/default.php     |  4 +-
 .../com_contact/category/default_children.php |  4 +-
 .../html/com_contact/contact/default.php      | 10 ++---
 .../com_contact/contact/default_address.php   |  4 +-
 .../contact/default_user_custom_fields.php    |  2 +-
 .../com_content/archive/default_items.php     |  9 ++--
 .../html/com_content/article/default.php      | 44 +++++++++++--------
 .../com_content/categories/default_items.php  |  4 +-
 .../beez3/html/com_content/category/blog.php  | 17 +++----
 .../com_content/category/blog_children.php    |  4 +-
 .../html/com_content/category/blog_item.php   | 11 +++--
 .../html/com_content/category/default.php     | 33 +++++++-------
 .../com_content/category/default_articles.php |  5 +--
 .../com_content/category/default_children.php |  2 +-
 .../html/com_content/featured/default.php     |  2 +-
 .../com_content/featured/default_item.php     | 29 ++++++------
 .../beez3/html/com_content/form/edit.php      |  6 +--
 .../categories/default_items.php              |  4 +-
 .../html/com_newsfeeds/category/default.php   |  4 +-
 .../category/default_children.php             |  4 +-
 .../com_weblinks/categories/default_items.php |  4 +-
 .../html/com_weblinks/category/default.php    |  4 +-
 .../category/default_children.php             |  4 +-
 .../beez3/html/com_weblinks/form/edit.php     |  2 +-
 .../beez3/html/mod_breadcrumbs/default.php    |  6 +--
 .../beez3/html/mod_languages/default.php      |  2 +-
 templates/beez3/html/modules.php              |  6 +--
 templates/beez3/javascript/template.js        |  2 +-
 templates/protostar/error.php                 |  2 +-
 templates/protostar/html/pagination.php       | 27 ++++++------
 templates/protostar/index.php                 | 13 +++---
 templates/protostar/js/classes.js             | 14 +++---
 templates/protostar/offline.php               |  2 +-
 templates/system/html/modules.php             |  2 +-
 37 files changed, 154 insertions(+), 146 deletions(-)

diff --git a/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php b/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
index cf3ab4d0e2db8..619eb61e46f8e 100644
--- a/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
+++ b/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
@@ -23,7 +23,7 @@
 			if ($displayData->hide) : ?>
 				<a class="nolink"><?php echo $item[0]; ?></a>
 			<?php else :
-				if (strlen($item[1])) : ?>
+				if ($item[1] !== '') : ?>
 					<a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
 				<?php else : ?>
 					<?php echo $item[0]; ?>
diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php
index c1a3af617cded..35617f64df70c 100644
--- a/administrator/templates/isis/error.php
+++ b/administrator/templates/isis/error.php
@@ -41,7 +41,7 @@
 foreach ($this->submenumodules as $submenumodule)
 {
 	$output = JModuleHelper::renderModule($submenumodule);
-	if (strlen($output))
+	if ($output !== '')
 	{
 		$showSubmenu = true;
 		break;
diff --git a/templates/beez3/html/com_contact/categories/default_items.php b/templates/beez3/html/com_contact/categories/default_items.php
index ef1379a0cd499..273f9ff06a3e8 100644
--- a/templates/beez3/html/com_contact/categories/default_items.php
+++ b/templates/beez3/html/com_contact/categories/default_items.php
@@ -9,12 +9,12 @@
 
 defined('_JEXEC') or die;
 $class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 	<?php
-	if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
 	if (!isset($this->items[$this->parent->id][$id + 1]))
 	{
 		$class = ' class="last"';
diff --git a/templates/beez3/html/com_contact/category/default.php b/templates/beez3/html/com_contact/category/default.php
index 5a8006b1b2f5f..dd5bdac9fec27 100644
--- a/templates/beez3/html/com_contact/category/default.php
+++ b/templates/beez3/html/com_contact/category/default.php
@@ -26,7 +26,7 @@
 	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
 		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
 	<?php endif; ?>
-	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
 		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_contact.category.description'); ?>
 	<?php endif; ?>
 	<div class="clr"></div>
@@ -35,7 +35,7 @@
 
 <?php echo $this->loadTemplate('items'); ?>
 
-<?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
+<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 <div class="cat-children">
 	<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
 	<?php echo $this->loadTemplate('children'); ?>
diff --git a/templates/beez3/html/com_contact/category/default_children.php b/templates/beez3/html/com_contact/category/default_children.php
index 26b10b65e8f67..04c882c5016d9 100644
--- a/templates/beez3/html/com_contact/category/default_children.php
+++ b/templates/beez3/html/com_contact/category/default_children.php
@@ -9,12 +9,12 @@
 
 defined('_JEXEC') or die;
 $class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
 	<?php
-	if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+	if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
 	if (!isset($this->children[$this->category->id][$id + 1]))
 	{
 		$class = ' class="last"';
diff --git a/templates/beez3/html/com_contact/contact/default.php b/templates/beez3/html/com_contact/contact/default.php
index 8e91433df3a74..464f54469639c 100644
--- a/templates/beez3/html/com_contact/contact/default.php
+++ b/templates/beez3/html/com_contact/contact/default.php
@@ -48,7 +48,7 @@
 		</form>
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+	<?php if (!empty($this->item->tags->itemTags) && $this->params->get('show_tags', 1)) : ?>
 		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
@@ -90,7 +90,7 @@
 			<?php echo JText::_('COM_CONTACT_VCARD');?></a>
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) : ?>
+	<?php if (($this->contact->email_to || $this->contact->user_id) && $this->params->get('show_email_form')) : ?>
 
 		<?php if ($this->params->get('presentation_style') === 'sliders') : ?>
 			<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
@@ -109,7 +109,7 @@
 		<?php echo $this->loadTemplate('links'); ?>
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_articles') && $this->contact->user_id && $this->contact->articles) : ?>
+	<?php if ($this->contact->user_id && $this->contact->articles && $this->params->get('show_articles')) : ?>
 
 		<?php if ($this->params->get('presentation_style') === 'sliders') :
 			echo JHtml::_('sliders.panel', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
@@ -125,7 +125,7 @@
 
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?>
+	<?php if ($this->contact->user_id && $this->params->get('show_profile') && JPluginHelper::isEnabled('user', 'profile')) : ?>
 
 		<?php if ($this->params->get('presentation_style') === 'sliders') :
 			echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
@@ -141,7 +141,7 @@
 
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_user_custom_fields') && $this->contactUser) : ?>
+	<?php if ($this->contactUser && $this->params->get('show_user_custom_fields')) : ?>
 		<?php echo $this->loadTemplate('user_custom_fields'); ?>
 	<?php endif; ?>
 
diff --git a/templates/beez3/html/com_contact/contact/default_address.php b/templates/beez3/html/com_contact/contact/default_address.php
index 5a4eb2287a75c..7cf43094c41c9 100644
--- a/templates/beez3/html/com_contact/contact/default_address.php
+++ b/templates/beez3/html/com_contact/contact/default_address.php
@@ -14,8 +14,8 @@
  */
 ?>
 <dl class="contact-address dl-horizontal">
-<?php if (($this->params->get('address_check') > 0) &&  ($this->contact->address || $this->contact->suburb  || $this->contact->state || $this->contact->country || $this->contact->postcode)) : ?>
-	<?php if ($this->params->get('address_check') > 0) : ?>
+<?php if (($this->contact->address || $this->contact->suburb  || $this->contact->state || $this->contact->country || $this->contact->postcode) && ($addressCheck = $this->params->get('address_check') > 0)) : ?>
+	<?php if ($addressCheck === true) : ?>
 	<dt>
 		<span class="<?php echo $this->params->get('marker_class'); ?>" >
 			<?php echo $this->params->get('marker_address'); ?>
diff --git a/templates/beez3/html/com_contact/contact/default_user_custom_fields.php b/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
index 32027c2984dde..2f3dd034c4d62 100644
--- a/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
+++ b/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
@@ -23,7 +23,7 @@
 	<?php if (!in_array('-1', $displayGroups) && (!$field->group_id || !in_array($field->group_id, $displayGroups))) : ?>
 		<?php continue; ?>
 	<?php endif; ?>
-	<?php if (!key_exists($field->group_title, $userFieldGroups)) : ?>
+	<?php if (!array_key_exists($field->group_title, $userFieldGroups)) : ?>
 		<?php $userFieldGroups[$field->group_title] = array();?>
 	<?php endif; ?>
 	<?php $userFieldGroups[$field->group_title][] = $field;?>
diff --git a/templates/beez3/html/com_content/archive/default_items.php b/templates/beez3/html/com_content/archive/default_items.php
index aba033ef5a369..01dff1b8cc00e 100644
--- a/templates/beez3/html/com_content/archive/default_items.php
+++ b/templates/beez3/html/com_content/archive/default_items.php
@@ -42,7 +42,7 @@
 		<dd class="parent-category-name">
 			<?php	$title = $this->escape($item->parent_title);
 					$url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($item->parent_slug)).'">'.$title.'</a>';?>
-			<?php if ($params->get('link_parent_category') && $item->parent_slug) : ?>
+			<?php if ($item->parent_slug && $params->get('link_parent_category')) : ?>
 				<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
 				<?php else : ?>
 				<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
@@ -54,7 +54,7 @@
 		<dd class="category-name">
 			<?php	$title = $this->escape($item->category_title);
 					$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->catslug)) . '">' . $title . '</a>'; ?>
-			<?php if ($params->get('link_category') && $item->catslug) : ?>
+			<?php if ($item->catslug && $params->get('link_category')) : ?>
 				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
 				<?php else : ?>
 				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
@@ -76,10 +76,9 @@
 		<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
 		</dd>
 <?php endif; ?>
-<?php if ($params->get('show_author') && !empty($item->author )) : ?>
+<?php if (!empty($item->author) && $params->get('show_author')) : ?>
 	<dd class="createdby">
-		<?php $author = $item->author; ?>
-		<?php $author = ($item->created_by_alias ?: $author);?>
+		<?php $author = $item->created_by_alias ?: $item->author; ?>
 			<?php if (!empty($item->contact_link ) &&  $params->get('link_author') == true):?>
 				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $item->contact_link, $author)); ?>
 			<?php else :?>
diff --git a/templates/beez3/html/com_content/article/default.php b/templates/beez3/html/com_content/article/default.php
index db97bc0885a92..2e2d6e22ae016 100644
--- a/templates/beez3/html/com_content/article/default.php
+++ b/templates/beez3/html/com_content/article/default.php
@@ -9,22 +9,27 @@
 
 defined('_JEXEC') or die;
 
-$app = JFactory::getApplication();
+$app            = JFactory::getApplication();
 $templateparams = $app->getTemplate(true)->params;
-$images = json_decode($this->item->images);
-$urls = json_decode($this->item->urls);
-$user    = JFactory::getUser();
+$images         = json_decode($this->item->images);
+$urls           = json_decode($this->item->urls);
+$user           = JFactory::getUser();
+
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
 JHtml::_('behavior.caption');
 
 // Create shortcut to parameters.
 $params = $this->item->params;
 
+$accessEdit    = $params->get('access-edit');
+$showPrintIcon = $params->get('show_print_icon');
+$showEmailIcon = $params->get('show_email_icon');
+
 ?>
 <article class="item-page<?php echo $this->pageclass_sfx?>">
-<?php if ($this->params->get('show_page_heading')) : ?>
+<?php if ($showPageHeading = $this->params->get('show_page_heading')) : ?>
 
-<?php if ($this->params->get('show_page_heading') and $params->get('show_title')) :?>
+<?php if ($showPageHeading and $params->get('show_title')) :?>
 <hgroup>
 <?php endif; ?>
 <h1>
@@ -42,23 +47,25 @@
 			<?php echo $this->escape($this->item->title); ?>
 		</h2>
 <?php endif; ?>
-<?php if ($this->params->get('show_page_heading') and $params->get('show_title')) :?>
+<?php if ($showPageHeading and $params->get('show_title')) :?>
 </hgroup>
 <?php endif; ?>
 
 <?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 <div class="pull-left"><?php echo $this->item->event->afterDisplayTitle; ?></div>
 
-<?php if ($params->get('access-edit') ||  $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+<?php
+
+if ($accessEdit || $showPrintIcon || $showEmailIcon) : ?>
 		<ul class="actions">
 		<?php if (!$this->print) : ?>
-				<?php if ($params->get('show_print_icon')) : ?>
+				<?php if ($showPrintIcon) : ?>
 				<li class="print-icon">
 						<?php echo JHtml::_('icon.print_popup', $this->item, $params, array(), true); ?>
 				</li>
 				<?php endif; ?>
 
-				<?php if ($params->get('show_email_icon')) : ?>
+				<?php if ($showEmailIcon) : ?>
 				<li class="email-icon">
 						<?php echo JHtml::_('icon.email', $this->item, $params, array(), true); ?>
 				</li>
@@ -86,7 +93,7 @@
  <dl class="article-info">
  <dt class="article-info-term"><?php  echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
 <?php endif; ?>
-<?php if ($params->get('show_parent_category') && $this->item->parent_slug !== '1:root') : ?>
+<?php if ($this->item->parent_slug !== '1:root' && $params->get('show_parent_category')) : ?>
 		<dd class="parent-category-name">
 			<?php 	$title = $this->escape($this->item->parent_title);
 					$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_slug)) . '">' . $title . '</a>';?>
@@ -123,11 +130,10 @@
 		<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
 		</dd>
 <?php endif; ?>
-<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+<?php if (!empty($this->item->author) && $params->get('show_author')) : ?>
 	<dd class="createdby">
-		<?php $author = $this->item->author; ?>
-		<?php $author = ($this->item->created_by_alias ?: $author);?>
-		<?php if (!empty($this->item->contact_link ) &&  $params->get('link_author') == true) : ?>
+		<?php $author = $this->item->created_by_alias ?: $this->item->author; ?>
+		<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
 			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
 		<?php else : ?>
 			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
@@ -175,7 +181,7 @@
 		<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
 	<?php echo JHtml::_('content.prepare', $this->item->introtext); ?>
 	<?php // Optional link to let them register to see the whole article. ?>
-	<?php if ($params->get('show_readmore') && $this->item->fulltext != null) : ?>
+	<?php if ($this->item->fulltext != null && $params->get('show_readmore')) : ?>
 		<?php $menu = JFactory::getApplication()->getMenu(); ?>
 		<?php $active = $menu->getActive(); ?>
 		<?php $itemId = $active->id; ?>
@@ -189,20 +195,20 @@
 			<?php elseif ($readmore = $attribs->alternative_readmore) : ?>
 				<?php echo $readmore; ?>
 				<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
-					<?php echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); ?>
+					<?php echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit')); ?>
 				<?php endif; ?>
 			<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
 				<?php echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); ?>
 			<?php else : ?>
 				<?php echo JText::_('COM_CONTENT_READ_MORE'); ?>
-				<?php echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit')); ?>
+				<?php echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit')); ?>
 			<?php endif; ?>
 			</a>
 		</p>
 	<?php endif; ?>
 <?php endif; ?>
 <?php // TAGS ?>
-<?php if ($params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+<?php if (!empty($this->item->tags->itemTags) && $params->get('show_tags', 1)) : ?>
 	<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
 	<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 <?php endif; ?>
diff --git a/templates/beez3/html/com_content/categories/default_items.php b/templates/beez3/html/com_content/categories/default_items.php
index 4d52e8df48d07..68fd3472321c8 100644
--- a/templates/beez3/html/com_content/categories/default_items.php
+++ b/templates/beez3/html/com_content/categories/default_items.php
@@ -10,12 +10,12 @@
 // no direct access
 defined('_JEXEC') or die;
 $class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 	<?php
-	if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
 	if (!isset($this->items[$this->parent->id][$id + 1]))
 	{
 		$class = ' class="last"';
diff --git a/templates/beez3/html/com_content/category/blog.php b/templates/beez3/html/com_content/category/blog.php
index 22029c9656f6b..2d58213ae7c48 100644
--- a/templates/beez3/html/com_content/category/blog.php
+++ b/templates/beez3/html/com_content/category/blog.php
@@ -38,7 +38,7 @@
 	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
 		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
 	<?php endif; ?>
-	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
 		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
 	<?php endif; ?>
 	<div class="clr"></div>
@@ -65,15 +65,12 @@
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
-<?php
-	$introcount = count($this->intro_items);
-	$counter = 0;
-?>
 <?php if (!empty($this->intro_items)) : ?>
-
+	<?php $introcount = count($this->intro_items); ?>
+	<?php $counter = 0; ?>
 	<?php foreach ($this->intro_items as $key => &$item) : ?>
 		<?php $rowcount = ((int) $key % (int) $this->columns) + 1; ?>
-		<?php if ($rowcount == 1) : ?>
+		<?php if ($rowcount === 1) : ?>
 			<?php $row = $counter / $this->columns; ?>
 			<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-'.$row; ?>">
 		<?php endif; ?>
@@ -84,7 +81,7 @@
 		?>
 		</article>
 		<?php $counter++; ?>
-		<?php if (($rowcount == $this->columns) or ($counter == $introcount)) : ?>
+		<?php if ($rowcount === (int) $this->columns or $counter === $introcount) : ?>
 			<span class="row-separator"></span>
 			</div>
 		<?php endif; ?>
@@ -96,7 +93,7 @@
 	<?php echo $this->loadTemplate('links'); ?>
 <?php endif; ?>
 
-<?php if (is_array($this->children[$this->category->id]) && count($this->children[$this->category->id]) > 0 && $this->params->get('maxLevel') != 0) : ?>
+<?php if ($this->params->get('maxLevel') != 0 && is_array($this->children[$this->category->id]) && count($this->children[$this->category->id]) > 0) : ?>
 	<div class="cat-children">
 
 	<?php if ($this->params->get('show_category_heading_title_text', 1) == 1) : ?>
@@ -108,7 +105,7 @@
 	</div>
 <?php endif; ?>
 
-<?php if (($this->params->def('show_pagination', 1) == 1  || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
+<?php if ($this->pagination->pagesTotal > 1 && ($this->params->def('show_pagination', 1) == 1 || $this->params->get('show_pagination') == 2)) : ?>
 	<div class="pagination">
 	<?php if ($this->params->def('show_pagination_results', 1)) : ?>
 		<p class="counter">
diff --git a/templates/beez3/html/com_content/category/blog_children.php b/templates/beez3/html/com_content/category/blog_children.php
index ef010452d01a1..8b436743bfcd4 100644
--- a/templates/beez3/html/com_content/category/blog_children.php
+++ b/templates/beez3/html/com_content/category/blog_children.php
@@ -20,7 +20,7 @@
         <ul>
         <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
                 <?php
-				if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+				if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
 					if (!isset($this->children[$this->category->id][$id + 1])) :
 						$class = ' class="last"';
 					endif;
@@ -54,7 +54,7 @@
 							$this->children[$child->id] = $child->getChildren();
 							$this->category = $child;
 							$this->maxLevel--;
-							if ($this->maxLevel != 0) :
+							if ($this->maxLevel !== 0) :
 								echo $this->loadTemplate('children');
 							endif;
 							$this->category = $child->getParent();
diff --git a/templates/beez3/html/com_content/category/blog_item.php b/templates/beez3/html/com_content/category/blog_item.php
index 9b61ab63e4d76..542417f51d1e6 100644
--- a/templates/beez3/html/com_content/category/blog_item.php
+++ b/templates/beez3/html/com_content/category/blog_item.php
@@ -18,7 +18,7 @@
 
 
 <?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
-	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?>
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
 <div class="system-unpublished">
 <?php endif; ?>
 <?php if ($params->get('show_title')) : ?>
@@ -35,7 +35,7 @@
 <?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 <div class="pull-left"><?php echo $this->item->event->afterDisplayTitle; ?></div>
 
-<?php if ($params->get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
+<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
 	<ul class="actions">
 		<?php if ($params->get('show_print_icon')) : ?>
 		<li class="print-icon">
@@ -102,9 +102,8 @@
 <?php endif; ?>
 <?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
 	<dd class="createdby">
-		<?php $author = $this->item->author; ?>
-		<?php $author = ($this->item->created_by_alias ?: $author);?>
-		<?php if (!empty($this->item->contact_link ) &&  $params->get('link_author') == true) : ?>
+		<?php $author = $this->item->created_by_alias ?: $this->item->author; ?>
+		<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
 			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
 		<?php else :?>
 			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
@@ -161,7 +160,7 @@
 <?php endif; ?>
 
 <?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
-	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?>
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
 </div>
 <?php endif; ?>
 
diff --git a/templates/beez3/html/com_content/category/default.php b/templates/beez3/html/com_content/category/default.php
index d7050aaff9055..b74aab710e657 100644
--- a/templates/beez3/html/com_content/category/default.php
+++ b/templates/beez3/html/com_content/category/default.php
@@ -9,18 +9,21 @@
 
 defined('_JEXEC') or die;
 
-$app = JFactory::getApplication();
+$app            = JFactory::getApplication();
 $templateparams = $app->getTemplate(true)->params;
 
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
 JHtml::_('behavior.caption');
 
-$pageClass = $this->params->get('pageclass_sfx');
+$showCategoryTitle            = $this->params->get('show_category_title') == 1;
+$showCategoryHeadingTitleText = $this->params->get('show_category_heading_title_text', 1) == 1;
+$pageSubHeading               = $this->params->get('page_subheading');
 ?>
 <section class="category-list<?php echo $this->pageclass_sfx;?>">
-<?php if ($this->params->get('show_page_heading')) : ?>
-<?php if ($this->params->get('show_page_heading') and ($this->params->get('show_category_title') or $this->params->get('page_subheading'))) : ?>
+<?php
+if ($showPageHeading = $this->params->get('show_page_heading')) : ?>
+<?php if ($showPageHeading and ($showCategoryTitle === true or $pageSubHeading)) : ?>
 <hgroup>
 <?php endif; ?>
 <h1>
@@ -28,16 +31,16 @@
 </h1>
 <?php endif; ?>
 
-<?php if ($this->params->get('show_category_title') or $this->params->get('page_subheading')) : ?>
+<?php if ($showCategoryTitle === true or $pageSubHeading) : ?>
 <h2>
-	<?php echo $this->escape($this->params->get('page_subheading')); ?>
-	<?php if ($this->params->get('show_category_title'))
+	<?php echo $this->escape($pageSubHeading); ?>
+	<?php if ($showCategoryTitle === true)
 	{
 		echo '<span class="subheading-category">'.JHtml::_('content.prepare', $this->category->title, '', 'com_content.category.title').'</span>';
 	}
 	?>
 </h2>
-<?php if ($this->params->get('show_page_heading') and ($this->params->get('show_category_title', 1) or $this->params->get('page_subheading'))) : ?>
+<?php if ($this->params->get('show_page_heading') and ($this->params->get('show_category_title', 1) or $pageSubHeading)) : ?>
 </hgroup>
 <?php endif; ?>
 <?php endif; ?>
@@ -47,7 +50,7 @@
 	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
 		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
 	<?php endif; ?>
-	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
 		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
 	<?php endif; ?>
 	<div class="clr"></div>
@@ -55,25 +58,25 @@
 <?php endif; ?>
 
 
-<?php if (is_array($this->children[$this->category->id]) && count($this->children[$this->category->id]) > 0 && $this->params->get('maxLevel') != 0) : ?>
+<?php if ($this->params->get('maxLevel') != 0 && is_array($this->children[$this->category->id]) && count($this->children[$this->category->id]) > 0) : ?>
 		<div class="cat-children">
 
-	<?php if ($this->params->get('show_category_title') or $this->params->get('page_subheading'))
+	<?php if ($showCategoryTitle === true or $pageSubHeading)
 	{
 		echo '<h3>';
 	}
-	elseif ($this->params->get('show_category_heading_title_text', 1) == 1)
+	elseif ($showCategoryHeadingTitleText === true)
 	{
 		echo '<h2>';
 	} ?>
-    <?php if ($this->params->get('show_category_heading_title_text', 1) == 1) : ?>
+    <?php if ($showCategoryHeadingTitleText === true) : ?>
 		<?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?>
 	<?php endif; ?>
-	<?php if ($this->params->get('show_category_title') or $this->params->get('page_subheading'))
+	<?php if ($showCategoryTitle === true or $pageSubHeading)
 	{
 		echo '</h3>';
 	}
-	elseif ($this->params->get('show_category_heading_title_text', 1) == 1)
+	elseif ($showCategoryHeadingTitleText === true)
 	{
 		echo '</h2>';
 	} ?>
diff --git a/templates/beez3/html/com_content/category/default_articles.php b/templates/beez3/html/com_content/category/default_articles.php
index c254e5cdec1ef..97b79de7494d4 100644
--- a/templates/beez3/html/com_content/category/default_articles.php
+++ b/templates/beez3/html/com_content/category/default_articles.php
@@ -154,9 +154,8 @@
 					<?php if ($this->params->get('list_show_author', 1)) : ?>
 					<td class="list-author">
 						<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
-							<?php $author = $article->author ?>
-							<?php $author = ($article->created_by_alias ?: $author); ?>
-							<?php if (!empty($article->contact_link) &&  $this->params->get('link_author') == true):?>
+							<?php $author = $article->created_by_alias ?: $article->author; ?>
+							<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true):?>
 								<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
 							<?php else :?>
 								<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
diff --git a/templates/beez3/html/com_content/category/default_children.php b/templates/beez3/html/com_content/category/default_children.php
index 8824929491c48..a529f39e5526f 100644
--- a/templates/beez3/html/com_content/category/default_children.php
+++ b/templates/beez3/html/com_content/category/default_children.php
@@ -57,7 +57,7 @@
 					$this->children[$child->id] = $child->getChildren();
 					$this->category = $child;
 					$this->maxLevel--;
-					if ($this->maxLevel != 0) :
+					if ($this->maxLevel !== 0) :
 						echo $this->loadTemplate('children');
 					endif;
 					$this->category = $child->getParent();
diff --git a/templates/beez3/html/com_content/featured/default.php b/templates/beez3/html/com_content/featured/default.php
index 15c9009f1880c..2eb3431ad7f8f 100644
--- a/templates/beez3/html/com_content/featured/default.php
+++ b/templates/beez3/html/com_content/featured/default.php
@@ -48,7 +48,7 @@
 		$rowcount = (((int) $key - 1) % (int) $this->columns) + 1;
 		$row = $counter / $this->columns;
 
-		if ($rowcount == 1) : ?>
+		if ($rowcount === 1) : ?>
 
 			<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-'.$row; ?>">
 		<?php endif; ?>
diff --git a/templates/beez3/html/com_content/featured/default_item.php b/templates/beez3/html/com_content/featured/default_item.php
index efdb7032b9395..7e73ff732c0cf 100644
--- a/templates/beez3/html/com_content/featured/default_item.php
+++ b/templates/beez3/html/com_content/featured/default_item.php
@@ -11,15 +11,19 @@
 
 // Create a shortcut for params.
 $canEdit = $this->item->params->get('access-edit');
-$params = &$this->item->params;
-$images = json_decode($this->item->images);
-$app = JFactory::getApplication();
+$params  = &$this->item->params;
+
+$showPrintIcon = $params->get('show_print_icon');
+$showEmailIcon = $params->get('show_email_icon');
+
+$images         = json_decode($this->item->images);
+$app            = JFactory::getApplication();
 $templateparams = $app->getTemplate(true)->params;
 
 ?>
 
 <?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
-	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?>
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
 <div class="system-unpublished">
 <?php endif; ?>
 <?php if ($params->get('show_title')) : ?>
@@ -36,14 +40,14 @@
 <?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 <div class="pull-left"><?php echo $this->item->event->afterDisplayTitle; ?></div>
 
-<?php if ($params->get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
+<?php if ($canEdit || $showPrintIcon || $showEmailIcon) : ?>
 	<ul class="actions">
-		<?php if ($params->get('show_print_icon')) : ?>
+		<?php if ($showPrintIcon) : ?>
 		<li class="print-icon">
 			<?php echo JHtml::_('icon.print_popup', $this->item, $params, array(), true); ?>
 		</li>
 		<?php endif; ?>
-		<?php if ($params->get('show_email_icon')) : ?>
+		<?php if ($showEmailIcon) : ?>
 		<li class="email-icon">
 			<?php echo JHtml::_('icon.email', $this->item, $params, array(), true); ?>
 		</li>
@@ -65,7 +69,7 @@
  <dl class="article-info">
  <dt class="article-info-term"><?php  echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
 <?php endif; ?>
-<?php if ($params->get('show_parent_category') && $this->item->parent_id != 1) : ?>
+<?php if ($this->item->parent_id != 1 && $params->get('show_parent_category')) : ?>
 		<dd class="parent-category-name">
 			<?php $title = $this->escape($this->item->parent_title);
 				$title = $title ?: JText::_('JGLOBAL_UNCATEGORISED');
@@ -104,10 +108,9 @@
 		<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
 		</dd>
 <?php endif; ?>
-<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+<?php if (!empty($this->item->author) && $params->get('show_author')) : ?>
 	<dd class="createdby">
-		<?php $author = $this->item->author; ?>
-		<?php $author = ($this->item->created_by_alias ?: $author);?>
+		<?php $author = $this->item->created_by_alias ?: $this->item->author; ?>
 		<?php if (!empty($this->item->contact_link ) &&  $params->get('link_author') == true) : ?>
 			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
 		<?php else :?>
@@ -137,7 +140,7 @@
 
 <?php echo $this->item->introtext; ?>
 
-<?php if ($params->get('show_readmore') && $this->item->readmore) :
+<?php if ($this->item->readmore && $params->get('show_readmore')) :
 	if ($params->get('access-view')) :
 		$link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language));
 	else :
@@ -167,7 +170,7 @@
 <?php endif; ?>
 
 <?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
-	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?>
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
 </div>
 <?php endif; ?>
 
diff --git a/templates/beez3/html/com_content/form/edit.php b/templates/beez3/html/com_content/form/edit.php
index 546ff291a56c6..b613236f8db8f 100644
--- a/templates/beez3/html/com_content/form/edit.php
+++ b/templates/beez3/html/com_content/form/edit.php
@@ -28,7 +28,7 @@
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
 	{
-		if (task == 'article.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
+		if (task === 'article.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
 		{
 			<?php echo $this->form->getField('articletext')->save(); ?>
 			Joomla.submitform(task);
@@ -55,7 +55,7 @@
 				</div>
 			</div>
 
-		<?php if (is_null($this->item->id)):?>
+		<?php if ($this->item->id === null):?>
 			<div class="control-group">
 				<div class="control-label">
 					<?php echo $this->form->getLabel('alias'); ?>
@@ -283,7 +283,7 @@
 					<?php echo $this->form->getInput('access'); ?>
 				</div>
 			</div>
-			<?php if (is_null($this->item->id)):?>
+			<?php if ($this->item->id === null):?>
 				<div class="control-group">
 					<div class="control-label">
 					</div>
diff --git a/templates/beez3/html/com_newsfeeds/categories/default_items.php b/templates/beez3/html/com_newsfeeds/categories/default_items.php
index 07cdeeb5c133f..5bbe047aa2bff 100644
--- a/templates/beez3/html/com_newsfeeds/categories/default_items.php
+++ b/templates/beez3/html/com_newsfeeds/categories/default_items.php
@@ -9,12 +9,12 @@
 
 defined('_JEXEC') or die;
 $class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 	<?php
-	if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
 	if (!isset($this->items[$this->parent->id][$id + 1]))
 	{
 		$class = ' class="last"';
diff --git a/templates/beez3/html/com_newsfeeds/category/default.php b/templates/beez3/html/com_newsfeeds/category/default.php
index 417ff22635d5e..1b5bcd9444f14 100644
--- a/templates/beez3/html/com_newsfeeds/category/default.php
+++ b/templates/beez3/html/com_newsfeeds/category/default.php
@@ -28,7 +28,7 @@
 	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
 		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
 	<?php endif; ?>
-	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
 		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_newsfeeds.category'); ?>
 	<?php endif; ?>
 	<div class="clr"></div>
@@ -37,7 +37,7 @@
 
 <?php echo $this->loadTemplate('items'); ?>
 
-<?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
+<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 <div class="cat-children">
 	<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
 	<?php echo $this->loadTemplate('children'); ?>
diff --git a/templates/beez3/html/com_newsfeeds/category/default_children.php b/templates/beez3/html/com_newsfeeds/category/default_children.php
index c3d97797dba6e..15cf9a7c0786f 100644
--- a/templates/beez3/html/com_newsfeeds/category/default_children.php
+++ b/templates/beez3/html/com_newsfeeds/category/default_children.php
@@ -10,12 +10,12 @@
 defined('_JEXEC') or die;
 
 $class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
 	<?php
-	if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+	if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
 	if (!isset($this->children[$this->category->id][$id + 1]))
 	{
 		$class = ' class="last"';
diff --git a/templates/beez3/html/com_weblinks/categories/default_items.php b/templates/beez3/html/com_weblinks/categories/default_items.php
index ab6c588c58a2b..2b65f382ebf23 100644
--- a/templates/beez3/html/com_weblinks/categories/default_items.php
+++ b/templates/beez3/html/com_weblinks/categories/default_items.php
@@ -10,12 +10,12 @@
 defined('_JEXEC') or die;
 
 $class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 	<?php
-	if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
 	if (!isset($this->items[$this->parent->id][$id + 1]))
 	{
 		$class = ' class="last"';
diff --git a/templates/beez3/html/com_weblinks/category/default.php b/templates/beez3/html/com_weblinks/category/default.php
index eab1d30f394ed..9baa95753cb42 100644
--- a/templates/beez3/html/com_weblinks/category/default.php
+++ b/templates/beez3/html/com_weblinks/category/default.php
@@ -28,14 +28,14 @@
 	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
 		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
 	<?php endif; ?>
-	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
 		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_weblinks.category'); ?>
 	<?php endif; ?>
 	<div class="clr"></div>
 	</div>
 <?php endif; ?>
 <?php echo $this->loadTemplate('items'); ?>
-<?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
+<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 	<div class="cat-children">
 	<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
 	<?php echo $this->loadTemplate('children'); ?>
diff --git a/templates/beez3/html/com_weblinks/category/default_children.php b/templates/beez3/html/com_weblinks/category/default_children.php
index efac70a140ef4..459ebed31291b 100644
--- a/templates/beez3/html/com_weblinks/category/default_children.php
+++ b/templates/beez3/html/com_weblinks/category/default_children.php
@@ -10,12 +10,12 @@
 defined('_JEXEC') or die;
 
 $class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
 	<?php
-	if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+	if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
 	if (!isset($this->children[$this->category->id][$id + 1]))
 	{
 		$class = ' class="last"';
diff --git a/templates/beez3/html/com_weblinks/form/edit.php b/templates/beez3/html/com_weblinks/form/edit.php
index ef8a067c47124..69dbab1a5ca3f 100644
--- a/templates/beez3/html/com_weblinks/form/edit.php
+++ b/templates/beez3/html/com_weblinks/form/edit.php
@@ -19,7 +19,7 @@
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
 	{
-		if (task == 'weblink.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
+		if (task === 'weblink.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
 		{
 			<?php echo $this->form->getField('description')->save(); ?>
 			Joomla.submitform(task);
diff --git a/templates/beez3/html/mod_breadcrumbs/default.php b/templates/beez3/html/mod_breadcrumbs/default.php
index 02b2fe683e7c7..a4174738640b0 100644
--- a/templates/beez3/html/mod_breadcrumbs/default.php
+++ b/templates/beez3/html/mod_breadcrumbs/default.php
@@ -19,7 +19,7 @@
 	// Get rid of duplicated entries on trail including home page when using multilanguage
 	for ($i = 0; $i < $count; $i++)
 	{
-		if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link == $list[$i - 1]->link)
+		if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link === $list[$i - 1]->link)
 		{
 			unset($list[$i]);
 		}
@@ -35,7 +35,7 @@
 	foreach ($list as $key => $item) :
 	// Make a link if not the last item in the breadcrumbs
 	$show_last = $params->get('showLast', 1);
-	if ($key != $last_item_key)
+	if ($key !== $last_item_key)
 	{
 		// Render all but last item - along with separator
 		if (!empty($item->link))
@@ -47,7 +47,7 @@
 			echo '<span>' . $item->name . '</span>';
 		}
 
-		if (($key != $penult_item_key) || $show_last)
+		if ($key !== $penult_item_key || $show_last)
 		{
 			echo ' '.$separator.' ';
 		}
diff --git a/templates/beez3/html/mod_languages/default.php b/templates/beez3/html/mod_languages/default.php
index 35eacafb65972..b3591f5242702 100644
--- a/templates/beez3/html/mod_languages/default.php
+++ b/templates/beez3/html/mod_languages/default.php
@@ -28,7 +28,7 @@
 <?php else : ?>
 	<ul class="<?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>">
 	<?php foreach ($list as $language) : ?>
-		<?php if ($params->get('show_active', 0) || !$language->active) : ?>
+		<?php if (!$language->active || $params->get('show_active', 0)) : ?>
 			<li class="<?php echo $language->active ? 'lang-active' : ''; ?>" dir="<?php echo $language->rtl ? 'rtl' : 'ltr'; ?>">
 			<a href="<?php echo $language->link; ?>">
 			<?php if ($params->get('image', 1)) : ?>
diff --git a/templates/beez3/html/modules.php b/templates/beez3/html/modules.php
index a024bb4516c5f..ac050c9141ba3 100644
--- a/templates/beez3/html/modules.php
+++ b/templates/beez3/html/modules.php
@@ -47,7 +47,7 @@ class="opencloselink" id="link_<?php echo $module->id?>"> <span
 	class="no"><img src="templates/beez3/images/plus.png"
 	alt="<?php if ($state === 1) { echo JText::_('TPL_BEEZ3_ALTOPEN');} else {echo JText::_('TPL_BEEZ3_ALTCLOSE');} ?>" />
 </span></a></h<?php echo $headerLevel; ?>> <?php endif; ?>
-<div class="module_content <?php if ($state == 1){echo 'open';} ?>"
+<div class="module_content <?php if ($state === 1){echo 'open';} ?>"
 	id="module_<?php echo $module->id; ?>" tabindex="-1"><?php echo $module->content; ?></div>
 </div>
 	<?php }
@@ -72,7 +72,7 @@ function modChrome_beezTabs($module, $params, $attribs)
 		$modules = array();
 	}
 
-	if ($modulecount == 1)
+	if ($modulecount === 1)
 	{
 		$temp = new stdClass;
 		$temp->content = $module->content;
@@ -97,7 +97,7 @@ function modChrome_beezTabs($module, $params, $attribs)
 
 			echo '<div tabindex="-1" class="tabcontent tabopen" id="module_'.$rendermodule->id.'">';
 			echo $rendermodule->content;
-			if ($counter != count($modules))
+			if ($counter !== count($modules))
 			{
 			echo '<a href="#" class="unseen" onclick="nexttab(\'module_'. $rendermodule->id.'\');return false;" id="next_'.$rendermodule->id.'">'.JText::_('TPL_BEEZ3_NEXTTAB').'</a>';
 			}
diff --git a/templates/beez3/javascript/template.js b/templates/beez3/javascript/template.js
index a05beedf58afe..4a3e6eeca8285 100644
--- a/templates/beez3/javascript/template.js
+++ b/templates/beez3/javascript/template.js
@@ -30,7 +30,7 @@
 
 			if (!input.prop('checked')) {
 				label.closest('.btn-group').find("label").removeClass('active btn-success btn-danger btn-primary');
-				if (input.val() == '') {
+				if (input.val() === '') {
 					label.addClass('active btn-primary');
 				} else if (input.val() == 0) {
 					label.addClass('active btn-danger');
diff --git a/templates/protostar/error.php b/templates/protostar/error.php
index b396d66676116..2ae67406a1ead 100644
--- a/templates/protostar/error.php
+++ b/templates/protostar/error.php
@@ -25,7 +25,7 @@
 $itemid   = $app->input->getCmd('Itemid', '');
 $sitename = $app->get('sitename');
 
-if ($task ==='edit' || $layout === 'form')
+if ($task === 'edit' || $layout === 'form')
 {
 	$fullWidth = 1;
 }
diff --git a/templates/protostar/html/pagination.php b/templates/protostar/html/pagination.php
index 1fa5b0094d77b..44522d98684ce 100644
--- a/templates/protostar/html/pagination.php
+++ b/templates/protostar/html/pagination.php
@@ -102,7 +102,7 @@ function pagination_list_render($list)
 	}
 	if ($currentPage >= $step)
 	{
-		if ($currentPage % $step == 0)
+		if ($currentPage % $step === 0)
 		{
 			$range = ceil($currentPage / $step) + 1;
 		}
@@ -118,12 +118,11 @@ function pagination_list_render($list)
 
 	foreach ($list['pages'] as $k => $page)
 	{
-		if (in_array($k, range($range * $step - ($step + 1), $range * $step)))
+		if ($k !== $currentPage && $k !== $range * $step - $step
+			&& ($k % $step === 0 || $k === $range * $step - ($step + 1))
+			&& in_array($k, range($range * $step - ($step + 1), $range * $step)))
 		{
-			if (($k % $step == 0 || $k == $range * $step - ($step + 1)) && $k != $currentPage && $k != $range * $step - $step)
-			{
-				$page['data'] = preg_replace('#(<a.*?>).*?(</a>)#', '$1...$2', $page['data']);
-			}
+			$page['data'] = preg_replace('#(<a.*?>).*?(</a>)#', '$1...$2', $page['data']);
 		}
 
 		$html .= $page['data'];
@@ -150,25 +149,25 @@ function pagination_item_active(&$item)
 	$class = '';
 
 	// Check for "Start" item
-	if ($item->text == JText::_('JLIB_HTML_START'))
+	if ($item->text === JText::_('JLIB_HTML_START'))
 	{
 		$display = '<span class="icon-first"></span>';
 	}
 
 	// Check for "Prev" item
-	if ($item->text == JText::_('JPREV'))
+	if ($item->text === JText::_('JPREV'))
 	{
 		$display = '<span class="icon-previous"></span>';
 	}
 
 	// Check for "Next" item
-	if ($item->text == JText::_('JNEXT'))
+	if ($item->text === JText::_('JNEXT'))
 	{
 		$display = '<span class="icon-next"></span>';
 	}
 
 	// Check for "End" item
-	if ($item->text == JText::_('JLIB_HTML_END'))
+	if ($item->text === JText::_('JLIB_HTML_END'))
 	{
 		$display = '<span class="icon-last"></span>';
 	}
@@ -195,25 +194,25 @@ function pagination_item_active(&$item)
 function pagination_item_inactive(&$item)
 {
 	// Check for "Start" item
-	if ($item->text == JText::_('JLIB_HTML_START'))
+	if ($item->text === JText::_('JLIB_HTML_START'))
 	{
 		return '<li class="disabled"><a><span class="icon-first"></span></a></li>';
 	}
 
 	// Check for "Prev" item
-	if ($item->text == JText::_('JPREV'))
+	if ($item->text === JText::_('JPREV'))
 	{
 		return '<li class="disabled"><a><span class="icon-previous"></span></a></li>';
 	}
 
 	// Check for "Next" item
-	if ($item->text == JText::_('JNEXT'))
+	if ($item->text === JText::_('JNEXT'))
 	{
 		return '<li class="disabled"><a><span class="icon-next"></span></a></li>';
 	}
 
 	// Check for "End" item
-	if ($item->text == JText::_('JLIB_HTML_END'))
+	if ($item->text === JText::_('JLIB_HTML_END'))
 	{
 		return '<li class="disabled"><a><span class="icon-last"></span></a></li>';
 	}
diff --git a/templates/protostar/index.php b/templates/protostar/index.php
index 7c56b4e17bc1a..f426e03bc41af 100644
--- a/templates/protostar/index.php
+++ b/templates/protostar/index.php
@@ -92,15 +92,18 @@
 JHtml::_('bootstrap.loadCss', false, $this->direction);
 
 // Adjusting content width
-if ($this->countModules('position-7') && $this->countModules('position-8'))
+$position7ModuleCount = $this->countModules('position-7');
+$position8ModuleCount = $this->countModules('position-8');
+
+if ($position7ModuleCount && $position8ModuleCount)
 {
 	$span = 'span6';
 }
-elseif ($this->countModules('position-7') && !$this->countModules('position-8'))
+elseif ($position7ModuleCount && !$position8ModuleCount)
 {
 	$span = 'span9';
 }
-elseif (!$this->countModules('position-7') && $this->countModules('position-8'))
+elseif (!$position7ModuleCount && $position8ModuleCount)
 {
 	$span = 'span9';
 }
@@ -171,7 +174,7 @@
 			<?php endif; ?>
 			<jdoc:include type="modules" name="banner" style="xhtml" />
 			<div class="row-fluid">
-				<?php if ($this->countModules('position-8')) : ?>
+				<?php if ($position8ModuleCount) : ?>
 					<!-- Begin Sidebar -->
 					<div id="sidebar" class="span3">
 						<div class="sidebar-nav">
@@ -188,7 +191,7 @@
 					<jdoc:include type="modules" name="position-2" style="none" />
 					<!-- End Content -->
 				</main>
-				<?php if ($this->countModules('position-7')) : ?>
+				<?php if ($position7ModuleCount) : ?>
 					<div id="aside" class="span3">
 						<!-- Begin Right Sidebar -->
 						<jdoc:include type="modules" name="position-7" style="well" />
diff --git a/templates/protostar/js/classes.js b/templates/protostar/js/classes.js
index 2f4677300e62b..d3a2449be09cf 100644
--- a/templates/protostar/js/classes.js
+++ b/templates/protostar/js/classes.js
@@ -3,43 +3,43 @@
 window.onload=function() {
 var input = document.getElementsByTagName("input");
 for (var i = 0; i < input.length; i++) {
-    if (input[i].className == 'button') {
+    if (input[i].className === 'button') {
         input[i].className = 'btn btn-primary';
     }
 }
 
 var button = document.getElementsByTagName("button");
 for (var i = 0; i < input.length; i++) {
-    if (button[i].className == 'button') {
+    if (button[i].className === 'button') {
         button[i].className = 'btn btn-primary';
     }
 }
 
 var p = document.getElementsByTagName("p");
 for (var i = 0; i < p.length; i++) {
-    if (p[i].className == 'readmore') {
+    if (p[i].className === 'readmore') {
         p[i].className = 'btn';
     }
 }
 
 var table = document.getElementsByTagName("table");
 for (var i = 0; i < table.length; i++) {
-    if (table[i].className == 'category') {
+    if (table[i].className === 'category') {
         table[i].className = 'table table-striped';
     }
 }
 
 var ul = document.getElementsByTagName("ul");
 for (var i = 0; i < ul.length; i++) {
-    if (ul[i].className == 'actions') {
+    if (ul[i].className === 'actions') {
         ul[i].className = 'nav nav-pills';
     }
 }
 
 var ul = document.getElementsByTagName("ul");
 for (var i = 0; i < ul.length; i++) {
-    if (ul[i].className == 'pagenav') {
+    if (ul[i].className === 'pagenav') {
         ul[i].className = 'pagination';
     }
 }
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/templates/protostar/offline.php b/templates/protostar/offline.php
index aa07b10d702e6..7dfc8ff60409b 100644
--- a/templates/protostar/offline.php
+++ b/templates/protostar/offline.php
@@ -109,7 +109,7 @@
 				<?php if ($app->get('offline_image') && file_exists($app->get('offline_image'))) : ?>
 					<img src="<?php echo $app->get('offline_image'); ?>" alt="<?php echo htmlspecialchars($app->get('sitename')); ?>" />
 				<?php endif; ?>
-				<?php if ($app->get('display_offline_message', 1) == 1 && str_replace(' ', '', $app->get('offline_message')) != '') : ?>
+				<?php if ($app->get('display_offline_message', 1) == 1 && str_replace(' ', '', $app->get('offline_message')) !== '') : ?>
 					<p><?php echo $app->get('offline_message'); ?></p>
 				<?php elseif ($app->get('display_offline_message', 1) == 2) : ?>
 					<p><?php echo JText::_('JOFFLINE_MESSAGE'); ?></p>
diff --git a/templates/system/html/modules.php b/templates/system/html/modules.php
index be6793a1d353e..0ffdca999e53d 100644
--- a/templates/system/html/modules.php
+++ b/templates/system/html/modules.php
@@ -91,7 +91,7 @@ function modChrome_xhtml($module, &$params, &$attribs)
 	$moduleTag      = $params->get('module_tag', 'div');
 	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_COMPAT, 'UTF-8');
 	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
-	$moduleClass    = $bootstrapSize != 0 ? ' span' . $bootstrapSize : '';
+	$moduleClass    = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
 
 	// Temporarily store header class in variable
 	$headerClass    = $params->get('header_class');

From bcf2dc58c7967c5c5fd4220796de3069d35b22d1 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Wed, 26 Jul 2017 02:48:07 +0300
Subject: [PATCH 061/148] Performance 2 (libraries/legacy) (#12220)

* Fixed misuses of array_push()

* Replace is_null() with ... === null

* Shortened syntax for applied operations

* Don't use strlen() to check if string is empty.

* Replace some cases of substr() with strpos()

* Merge unset() calls

* Remove unnecessary reference operator

* Remove useless return

* Optimize non-optimal if conditions.

* Inline one-time use variables

* Removed unnecessary ternary operators

* Ternary to Elvis..

* Optimize non-optimal if conditions.

* Replace doublequotes with quotes

* Remove unnecessary parentheses

* Compare strings type-safely

* Optimize non-optimal if conditions.

* Removed unnecessary ternary operators

* Compare strings type-safely

* Replaced non-optimal regular expression

* Removed unused variable

* Fix formating

* Fix strpos inversion mistake

* Fix codesniffer complaints

* A few more changes

* - Remove some parentheses
- Codestyle

* Changes according to reviewer's comment + a few more changes

* Changes according to reviewer's comment
---
 libraries/import.legacy.php                   |  6 +--
 libraries/import.php                          |  4 +-
 libraries/legacy/application/application.php  | 19 ++++------
 libraries/legacy/base/node.php                |  6 +--
 libraries/legacy/error/error.php              |  8 ++--
 libraries/legacy/exception/exception.php      |  2 +-
 libraries/legacy/form/field/category.php      |  2 +-
 .../legacy/form/field/componentlayout.php     |  4 +-
 libraries/legacy/form/field/modulelayout.php  |  2 +-
 libraries/legacy/request/request.php          |  4 +-
 libraries/legacy/response/response.php        |  2 +-
 libraries/legacy/utilities/xmlelement.php     |  2 +-
 libraries/loader.php                          | 14 +++----
 libraries/src/Joomla/CMS/Controller/Admin.php |  8 ++--
 .../src/Joomla/CMS/Controller/Controller.php  | 17 ++++-----
 libraries/src/Joomla/CMS/Controller/Form.php  | 38 ++++++++-----------
 libraries/src/Joomla/CMS/Model/Admin.php      |  8 ++--
 libraries/src/Joomla/CMS/Model/Form.php       |  4 +-
 libraries/src/Joomla/CMS/Model/ListModel.php  |  6 +--
 libraries/src/Joomla/CMS/Table/Content.php    |  2 +-
 libraries/src/Joomla/CMS/Table/Menu.php       | 18 ++++-----
 libraries/src/Joomla/CMS/Table/MenuType.php   |  6 +--
 libraries/src/Joomla/CMS/Table/Module.php     |  2 +-
 .../src/Joomla/CMS/View/CategoryFeed.php      |  6 +--
 libraries/src/Joomla/CMS/View/HtmlView.php    | 12 +++---
 25 files changed, 95 insertions(+), 107 deletions(-)

diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
index 975fe3a20272a..14887a8b6178c 100644
--- a/libraries/import.legacy.php
+++ b/libraries/import.legacy.php
@@ -20,12 +20,12 @@
 
 if (!defined('IS_WIN'))
 {
-	define('IS_WIN', ($os === 'WIN') ? true : false);
+	define('IS_WIN', $os === 'WIN');
 }
 
 if (!defined('IS_UNIX'))
 {
-	define('IS_UNIX', (($os !== 'MAC') && ($os !== 'WIN')) ? true : false);
+	define('IS_UNIX', $os !== 'MAC' && $os !== 'WIN');
 }
 
 /**
@@ -33,7 +33,7 @@
  */
 if (!defined('IS_MAC'))
 {
-	define('IS_MAC', (IS_UNIX === true && ($os === 'DAR' || $os === 'MAC')) ? true : false);
+	define('IS_MAC', IS_UNIX === true && ($os === 'DAR' || $os === 'MAC'));
 }
 
 // Import the library loader if necessary.
diff --git a/libraries/import.php b/libraries/import.php
index 3b543ffc83da6..0d6a3f2c2be65 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -20,12 +20,12 @@
 
 if (!defined('IS_WIN'))
 {
-	define('IS_WIN', ($os === 'WIN') ? true : false);
+	define('IS_WIN', $os === 'WIN');
 }
 
 if (!defined('IS_UNIX'))
 {
-	define('IS_UNIX', (IS_WIN === false) ? true : false);
+	define('IS_UNIX', IS_WIN === false);
 }
 
 // Import the library loader if necessary.
diff --git a/libraries/legacy/application/application.php b/libraries/legacy/application/application.php
index 3336e97551e0d..660e4c5dce085 100644
--- a/libraries/legacy/application/application.php
+++ b/libraries/legacy/application/application.php
@@ -351,12 +351,12 @@ public function redirect($url, $msg = '', $msgType = 'message', $moved = false)
 		 * We could validly start with something else (e.g. ftp), though this would
 		 * be unlikely and isn't supported by this API.
 		 */
-		if (!preg_match('#^http#i', $url))
+		if (stripos($url, 'http') !== 0)
 		{
 			$uri = JUri::getInstance();
 			$prefix = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 
-			if ($url[0] == '/')
+			if ($url[0] === '/')
 			{
 				// We just need the prefix since we have a path relative to the root.
 				$url = $prefix . $url;
@@ -536,7 +536,7 @@ public function getUserState($key, $default = null)
 		$session = JFactory::getSession();
 		$registry = $session->get('registry');
 
-		if (!is_null($registry))
+		if ($registry !== null)
 		{
 			return $registry->get($key, $default);
 		}
@@ -560,12 +560,10 @@ public function setUserState($key, $value)
 		$session = JFactory::getSession();
 		$registry = $session->get('registry');
 
-		if (!is_null($registry))
+		if ($registry !== null)
 		{
 			return $registry->set($key, $value);
 		}
-
-		return;
 	}
 
 	/**
@@ -681,7 +679,7 @@ public function login($credentials, $options = array())
 			 */
 			$user = JFactory::getUser();
 
-			if ($response->type == 'Cookie')
+			if ($response->type === 'Cookie')
 			{
 				$user->set('cookieLogin', true);
 			}
@@ -691,7 +689,7 @@ public function login($credentials, $options = array())
 				$options['user'] = $user;
 				$options['responseType'] = $response->type;
 
-				if (isset($response->length) && isset($response->secure) && isset($response->lifetime))
+				if (isset($response->length, $response->secure, $response->lifetime))
 				{
 					$options['length'] = $response->length;
 					$options['secure'] = $response->secure;
@@ -1015,8 +1013,7 @@ protected function _createSession($name)
 		// Check to see the the session already exists.
 		$handler = $this->get('session_handler');
 
-		if (($handler != 'database' && ($time % 2 || $session->isNew()))
-			|| ($handler == 'database' && $session->isNew()))
+		if (($handler !== 'database' && ($time % 2 || $session->isNew())) || ($handler === 'database' && $session->isNew()))
 		{
 			$this->checkSession();
 		}
@@ -1185,7 +1182,7 @@ public static function isWinOs()
 	 */
 	public function isSSLConnection()
 	{
-		return (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) || getenv('SSL_PROTOCOL_VERSION');
+		return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') || getenv('SSL_PROTOCOL_VERSION');
 	}
 
 	/**
diff --git a/libraries/legacy/base/node.php b/libraries/legacy/base/node.php
index 72f733106f5c1..18eb3f269fc73 100644
--- a/libraries/legacy/base/node.php
+++ b/libraries/legacy/base/node.php
@@ -86,16 +86,16 @@ public function setParent(&$parent)
 	{
 		JLog::add('JNode::setParent() is deprecated.', JLog::WARNING, 'deprecated');
 
-		if ($parent instanceof JNode || is_null($parent))
+		if ($parent instanceof JNode || $parent === null)
 		{
 			$hash = spl_object_hash($this);
 
-			if (!is_null($this->_parent))
+			if ($this->_parent !== null)
 			{
 				unset($this->_parent->children[$hash]);
 			}
 
-			if (!is_null($parent))
+			if ($parent !== null)
 			{
 				$parent->_children[$hash] = & $this;
 			}
diff --git a/libraries/legacy/error/error.php b/libraries/legacy/error/error.php
index bd75eb2bb1ff1..01e9765e7fd32 100644
--- a/libraries/legacy/error/error.php
+++ b/libraries/legacy/error/error.php
@@ -159,14 +159,14 @@ public static function getErrors()
 	/**
 	 * Method to add non-JError thrown JExceptions to the JError stack for debugging purposes
 	 *
-	 * @param   JException  &$e  Add an exception to the stack.
+	 * @param   JException  $e  Add an exception to the stack.
 	 *
 	 * @return  void
 	 *
 	 * @since   1.6
 	 * @deprecated  1.7
 	 */
-	public static function addToStack(JException &$e)
+	public static function addToStack(JException $e)
 	{
 		JLog::add('JError::addToStack() is deprecated.', JLog::WARNING, 'deprecated');
 
@@ -381,13 +381,13 @@ public static function setErrorHandling($level, $mode, $options = null)
 
 		foreach ($levels as $eLevel => $eTitle)
 		{
-			if (($level & $eLevel) != $eLevel)
+			if (($level & $eLevel) !== $eLevel)
 			{
 				continue;
 			}
 
 			// Set callback options
-			if ($mode == 'callback')
+			if ($mode === 'callback')
 			{
 				if (!is_array($options))
 				{
diff --git a/libraries/legacy/exception/exception.php b/libraries/legacy/exception/exception.php
index 94f9e71743bdf..6bbd80fc2a281 100644
--- a/libraries/legacy/exception/exception.php
+++ b/libraries/legacy/exception/exception.php
@@ -275,7 +275,7 @@ public function getProperties($public = true)
 		{
 			foreach ($vars as $key => $value)
 			{
-				if ('_' == substr($key, 0, 1))
+				if (strpos($key, '_') === 0)
 				{
 					unset($vars[$key]);
 				}
diff --git a/libraries/legacy/form/field/category.php b/libraries/legacy/form/field/category.php
index 4598cbd3301bc..3e44e2e53ace9 100644
--- a/libraries/legacy/form/field/category.php
+++ b/libraries/legacy/form/field/category.php
@@ -82,7 +82,7 @@ protected function getOptions()
 					 * unless the item is already in that category.
 					 * Unset the option if the user isn't authorised for it. In this field assets are always categories.
 					 */
-					if ($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
+					if ($user->authorise('core.create', $extension . '.category.' . $option->value) === false)
 					{
 						unset($options[$i]);
 					}
diff --git a/libraries/legacy/form/field/componentlayout.php b/libraries/legacy/form/field/componentlayout.php
index 701f73f17473a..cc68baa1f882b 100644
--- a/libraries/legacy/form/field/componentlayout.php
+++ b/libraries/legacy/form/field/componentlayout.php
@@ -39,7 +39,7 @@ protected function getInput()
 		// Get the client id.
 		$clientId = $this->element['client_id'];
 
-		if (is_null($clientId) && $this->form instanceof JForm)
+		if ($clientId === null && $this->form instanceof JForm)
 		{
 			$clientId = $this->form->getValue('client_id');
 		}
@@ -115,7 +115,7 @@ protected function getInput()
 			$groups = array();
 
 			// Add a Use Global option if useglobal="true" in XML file
-			if ($this->element['useglobal'] == 'true')
+			if ($this->element['useglobal'] === 'true')
 			{
 				$groups[JText::_('JOPTION_FROM_STANDARD')]['items'][] = JHtml::_('select.option', '', JText::_('JGLOBAL_USE_GLOBAL'));
 			}
diff --git a/libraries/legacy/form/field/modulelayout.php b/libraries/legacy/form/field/modulelayout.php
index cb9a97ba0f906..db26860670724 100644
--- a/libraries/legacy/form/field/modulelayout.php
+++ b/libraries/legacy/form/field/modulelayout.php
@@ -38,7 +38,7 @@ protected function getInput()
 		// Get the client id.
 		$clientId = $this->element['client_id'];
 
-		if (is_null($clientId) && $this->form instanceof JForm)
+		if ($clientId === null && $this->form instanceof JForm)
 		{
 			$clientId = $this->form->getValue('client_id');
 		}
diff --git a/libraries/legacy/request/request.php b/libraries/legacy/request/request.php
index e4f2e6fef7e05..0b5cb828cb235 100644
--- a/libraries/legacy/request/request.php
+++ b/libraries/legacy/request/request.php
@@ -141,7 +141,7 @@ public static function getVar($name, $default = null, $hash = 'default', $type =
 		}
 		elseif (!isset($GLOBALS['_JREQUEST'][$name][$sig]))
 		{
-			if (isset($input[$name]) && $input[$name] !== null)
+			if (isset($input[$name]))
 			{
 				// Get the variable from the input hash and clean it
 				$var = self::_cleanVar($input[$name], $mask, $type);
@@ -487,7 +487,7 @@ public static function set($array, $hash = 'default', $overwrite = true)
 	 */
 	public static function checkToken($method = 'post')
 	{
-		if ($method == 'default')
+		if ($method === 'default')
 		{
 			$method = 'request';
 		}
diff --git a/libraries/legacy/response/response.php b/libraries/legacy/response/response.php
index 338b50efd3fd2..a1f902076cc59 100644
--- a/libraries/legacy/response/response.php
+++ b/libraries/legacy/response/response.php
@@ -256,7 +256,7 @@ protected static function compress($data)
 		self::setHeader('Content-Encoding', $encoding);
 
 		// Header will be removed at 4.0
-		if (JFactory::getConfig()->get('MetaVersion', 0) && defined('JVERSION'))
+		if (defined('JVERSION') && JFactory::getConfig()->get('MetaVersion', 0))
 		{
 			self::setHeader('X-Content-Encoded-By', 'Joomla! ' . JVERSION);
 		}
diff --git a/libraries/legacy/utilities/xmlelement.php b/libraries/legacy/utilities/xmlelement.php
index 5ac646724f2b6..15b1d0a99fc05 100644
--- a/libraries/legacy/utilities/xmlelement.php
+++ b/libraries/legacy/utilities/xmlelement.php
@@ -64,7 +64,7 @@ public function asFormattedXml($compressed = false, $indent = "\t", $level = 0)
 		}
 
 		// If there are no children and it contains no data, end it off with a />
-		if (!count($this->children()) && !(string) $this)
+		if (!(string) $this && !count($this->children()))
 		{
 			$out .= ' />';
 		}
diff --git a/libraries/loader.php b/libraries/loader.php
index 329daf9984260..78c2a2afba01b 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -106,13 +106,13 @@ public static function discover($classPrefix, $parentPath, $force = true, $recur
 				$fileName = $file->getFilename();
 
 				// Only load for php files.
-				if ($file->isFile() && $file->getExtension() == 'php')
+				if ($file->isFile() && $file->getExtension() === 'php')
 				{
 					// Get the class name and full path for each file.
 					$class = strtolower($classPrefix . preg_replace('#\.php$#', '', $fileName));
 
 					// Register the class with the autoloader if not already registered or the force flag is set.
-					if (empty(self::$classes[$class]) || $force)
+					if ($force || empty(self::$classes[$class]))
 					{
 						self::register($class, $file->getPath() . '/' . $fileName);
 					}
@@ -191,7 +191,7 @@ public static function import($key, $base = null)
 			$path    = str_replace('.', DIRECTORY_SEPARATOR, $key);
 
 			// Handle special case for helper classes.
-			if ($class == 'helper')
+			if ($class === 'helper')
 			{
 				$class = ucfirst(array_pop($parts)) . ucfirst($class);
 			}
@@ -309,7 +309,7 @@ public static function register($class, $path, $force = true)
 		if (!empty($class) && is_file($path))
 		{
 			// Register the class with the autoloader if not already registered or the force flag is set.
-			if (empty(self::$classes[$class]) || $force)
+			if ($force || empty(self::$classes[$class]))
 			{
 				self::$classes[$class] = $path;
 			}
@@ -345,7 +345,7 @@ public static function registerPrefix($prefix, $path, $reset = false, $prepend =
 		}
 
 		// If the prefix is not yet registered or we have an explicit reset flag then set set the path.
-		if (!isset(self::$prefixes[$prefix]) || $reset)
+		if ($reset || !isset(self::$prefixes[$prefix]))
 		{
 			self::$prefixes[$prefix] = array($path);
 		}
@@ -436,7 +436,7 @@ public static function registerNamespace($namespace, $path, $reset = false, $pre
 		}
 
 		// If the namespace is not yet registered or we have an explicit reset flag then set the path.
-		if (!isset(self::$namespaces[$type][$namespace]) || $reset)
+		if ($reset || !isset(self::$namespaces[$type][$namespace]))
 		{
 			self::$namespaces[$type][$namespace] = array($path);
 		}
@@ -787,7 +787,7 @@ class_exists($alias, true);
 	 */
 	private static function stripFirstBackslash($class)
 	{
-		return $class && $class[0] == '\\' ? substr($class, 1) : $class;
+		return $class && $class[0] === '\\' ? substr($class, 1) : $class;
 	}
 }
 
diff --git a/libraries/src/Joomla/CMS/Controller/Admin.php b/libraries/src/Joomla/CMS/Controller/Admin.php
index d0a23e61a8656..b80221f9919c7 100644
--- a/libraries/src/Joomla/CMS/Controller/Admin.php
+++ b/libraries/src/Joomla/CMS/Controller/Admin.php
@@ -212,7 +212,7 @@ public function publish()
 				$errors = $model->getErrors();
 				$ntext = null;
 
-				if ($value == 1)
+				if ($value === 1)
 				{
 					if ($errors)
 					{
@@ -223,11 +223,11 @@ public function publish()
 						$ntext = $this->text_prefix . '_N_ITEMS_PUBLISHED';
 					}
 				}
-				elseif ($value == 0)
+				elseif ($value === 0)
 				{
 					$ntext = $this->text_prefix . '_N_ITEMS_UNPUBLISHED';
 				}
-				elseif ($value == 2)
+				elseif ($value === 2)
 				{
 					$ntext = $this->text_prefix . '_N_ITEMS_ARCHIVED';
 				}
@@ -265,7 +265,7 @@ public function reorder()
 		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
 
 		$ids = $this->input->post->get('cid', array(), 'array');
-		$inc = ($this->getTask() == 'orderup') ? -1 : 1;
+		$inc = $this->getTask() === 'orderup' ? -1 : 1;
 
 		$model = $this->getModel();
 		$return = $model->reorder($ids, $inc);
diff --git a/libraries/src/Joomla/CMS/Controller/Controller.php b/libraries/src/Joomla/CMS/Controller/Controller.php
index a9db2ebf41a11..f0a2c105114e1 100644
--- a/libraries/src/Joomla/CMS/Controller/Controller.php
+++ b/libraries/src/Joomla/CMS/Controller/Controller.php
@@ -174,7 +174,7 @@ protected static function createFileName($type, $parts = array())
 			case 'controller':
 				if (!empty($parts['format']))
 				{
-					if ($parts['format'] == 'html')
+					if ($parts['format'] === 'html')
 					{
 						$parts['format'] = '';
 					}
@@ -339,7 +339,7 @@ public function __construct($config = array())
 			$mName = $rMethod->getName();
 
 			// Add default display method if not explicitly declared.
-			if (!in_array($mName, $xMethods) || $mName == 'display')
+			if ($mName === 'display' || !in_array($mName, $xMethods))
 			{
 				$this->methods[] = strtolower($mName);
 
@@ -630,7 +630,7 @@ public function display($cachable = false, $urlparams = array())
 		$view->document = $document;
 
 		// Display the view
-		if ($cachable && $viewType != 'feed' && \JFactory::getConfig()->get('caching') >= 1)
+		if ($cachable && $viewType !== 'feed' && \JFactory::getConfig()->get('caching') >= 1)
 		{
 			$option = $this->input->get('option');
 
@@ -741,15 +741,12 @@ public function getModel($name = '', $prefix = '', $config = array())
 			// Let's get the application object and set menu information if it's available
 			$menu = \JFactory::getApplication()->getMenu();
 
-			if (is_object($menu))
+			if (is_object($menu) && $item = $menu->getActive())
 			{
-				if ($item = $menu->getActive())
-				{
-					$params = $menu->getParams($item->id);
+				$params = $menu->getParams($item->id);
 
-					// Set default state data
-					$model->setState('parameters.menu', $params);
-				}
+				// Set default state data
+				$model->setState('parameters.menu', $params);
 			}
 		}
 
diff --git a/libraries/src/Joomla/CMS/Controller/Form.php b/libraries/src/Joomla/CMS/Controller/Form.php
index c9413e54c26b1..333abaf3771a8 100644
--- a/libraries/src/Joomla/CMS/Controller/Form.php
+++ b/libraries/src/Joomla/CMS/Controller/Form.php
@@ -304,26 +304,20 @@ public function cancel($key = null)
 		$recordId = $this->input->getInt($key);
 
 		// Attempt to check-in the current record.
-		if ($recordId)
+		if ($recordId && property_exists($table, 'checked_out') && $model->checkin($recordId) === false)
 		{
-			if (property_exists($table, 'checked_out'))
-			{
-				if ($model->checkin($recordId) === false)
-				{
-					// Check-in failed, go back to the record and display a notice.
-					$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()));
-					$this->setMessage($this->getError(), 'error');
-
-					$this->setRedirect(
-						\JRoute::_(
-							'index.php?option=' . $this->option . '&view=' . $this->view_item
-							. $this->getRedirectToItemAppend($recordId, $key), false
-						)
-					);
-
-					return false;
-				}
-			}
+			// Check-in failed, go back to the record and display a notice.
+			$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_item
+					. $this->getRedirectToItemAppend($recordId, $key), false
+				)
+			);
+
+			return false;
 		}
 
 		// Clean the session data and redirect.
@@ -648,7 +642,7 @@ public function save($key = null, $urlVar = null)
 		$data[$key] = $recordId;
 
 		// The save2copy task needs to be handled slightly differently.
-		if ($task == 'save2copy')
+		if ($task === 'save2copy')
 		{
 			// Check-in the original row.
 			if ($checkin && $model->checkin($data[$key]) === false)
@@ -781,10 +775,10 @@ public function save($key = null, $urlVar = null)
 			return false;
 		}
 
-		$langKey = $this->text_prefix . ($recordId == 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS';
+		$langKey = $this->text_prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS';
 		$prefix  = \JFactory::getLanguage()->hasKey($langKey) ? $this->text_prefix : 'JLIB_APPLICATION';
 
-		$this->setMessage(\JText::_($prefix . ($recordId == 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'));
+		$this->setMessage(\JText::_($prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'));
 
 		// Redirect the user and adjust session state based on the chosen task.
 		switch ($task)
diff --git a/libraries/src/Joomla/CMS/Model/Admin.php b/libraries/src/Joomla/CMS/Model/Admin.php
index 0c236f51f359b..46504c4f65fa9 100644
--- a/libraries/src/Joomla/CMS/Model/Admin.php
+++ b/libraries/src/Joomla/CMS/Model/Admin.php
@@ -229,7 +229,7 @@ public function batch($commands, $pks, $contexts)
 		{
 			$cmd = ArrayHelper::getValue($commands, 'move_copy', 'c');
 
-			if ($cmd == 'c')
+			if ($cmd === 'c')
 			{
 				$result = $this->batchCopy($commands[$this->batch_copymove], $pks, $contexts);
 
@@ -246,7 +246,7 @@ public function batch($commands, $pks, $contexts)
 					return false;
 				}
 			}
-			elseif ($cmd == 'm' && !$this->batchMove($commands[$this->batch_copymove], $pks, $contexts))
+			elseif ($cmd === 'm' && !$this->batchMove($commands[$this->batch_copymove], $pks, $contexts))
 			{
 				return false;
 			}
@@ -1233,7 +1233,7 @@ public function save($data)
 			}
 
 			// Show a warning if the item isn't assigned to a language but we have associations.
-			if ($associations && ($table->language == '*'))
+			if ($associations && $table->language === '*')
 			{
 				\JFactory::getApplication()->enqueueMessage(
 					\JText::_(strtoupper($this->option) . '_ERROR_ALL_LANGUAGE_ASSOCIATED'),
@@ -1270,7 +1270,7 @@ public function save($data)
 			$db->execute();
 
 			// Adding self to the association
-			if ($table->language != '*')
+			if ($table->language !== '*')
 			{
 				$associations[$table->language] = (int) $table->$key;
 			}
diff --git a/libraries/src/Joomla/CMS/Model/Form.php b/libraries/src/Joomla/CMS/Model/Form.php
index 630feda7bf89c..20c39245bcc58 100644
--- a/libraries/src/Joomla/CMS/Model/Form.php
+++ b/libraries/src/Joomla/CMS/Model/Form.php
@@ -212,7 +212,7 @@ protected function loadForm($name, $source = null, $options = array(), $clear =
 		$hash = md5($source . serialize($sigoptions));
 
 		// Check if we can use a previously loaded form.
-		if (isset($this->_forms[$hash]) && !$clear)
+		if (!$clear && isset($this->_forms[$hash]))
 		{
 			return $this->_forms[$hash];
 		}
@@ -379,7 +379,7 @@ public function validate($form, $data, $group = null)
 		}
 
 		// Tags B/C break at 3.1.2
-		if (isset($data['metadata']['tags']) && !isset($data['tags']))
+		if (!isset($data['tags']) && isset($data['metadata']['tags']))
 		{
 			$data['tags'] = $data['metadata']['tags'];
 		}
diff --git a/libraries/src/Joomla/CMS/Model/ListModel.php b/libraries/src/Joomla/CMS/Model/ListModel.php
index 00aeb29148598..10b54ce859d56 100644
--- a/libraries/src/Joomla/CMS/Model/ListModel.php
+++ b/libraries/src/Joomla/CMS/Model/ListModel.php
@@ -384,7 +384,7 @@ protected function loadForm($name, $source = null, $options = array(), $clear =
 		$hash = md5($source . serialize($options));
 
 		// Check if we can use a previously loaded form.
-		if (isset($this->_forms[$hash]) && !$clear)
+		if (!$clear && isset($this->_forms[$hash]))
 		{
 			return $this->_forms[$hash];
 		}
@@ -700,7 +700,7 @@ public function getUserStateFromRequest($key, $request, $default = null, $type =
 		$app       = \JFactory::getApplication();
 		$input     = $app->input;
 		$old_state = $app->getUserState($key);
-		$cur_state = (!is_null($old_state)) ? $old_state : $default;
+		$cur_state = $old_state !== null ? $old_state : $default;
 		$new_state = $input->get($request, null, $type);
 
 		// BC for Search Tools which uses different naming
@@ -749,7 +749,7 @@ protected function refineSearchStringToRegex($search, $regexDelimiter = '/')
 
 		foreach ($searchArr as $key => $searchString)
 		{
-			if (strlen(trim($searchString)) == 0)
+			if (trim($searchString) === '')
 			{
 				unset($searchArr[$key]);
 				continue;
diff --git a/libraries/src/Joomla/CMS/Table/Content.php b/libraries/src/Joomla/CMS/Table/Content.php
index ab6dc2227f1cc..86e5784bf8fcf 100644
--- a/libraries/src/Joomla/CMS/Table/Content.php
+++ b/libraries/src/Joomla/CMS/Table/Content.php
@@ -240,7 +240,7 @@ public function check()
 		}
 
 		// Check the publish down date is not earlier than publish up.
-		if ($this->publish_down > $this->_db->getNullDate() && $this->publish_down < $this->publish_up)
+		if ($this->publish_down < $this->publish_up && $this->publish_down > $this->_db->getNullDate())
 		{
 			// Swap the dates.
 			$temp = $this->publish_up;
diff --git a/libraries/src/Joomla/CMS/Table/Menu.php b/libraries/src/Joomla/CMS/Table/Menu.php
index 6330dc983be24..386af891d6886 100644
--- a/libraries/src/Joomla/CMS/Table/Menu.php
+++ b/libraries/src/Joomla/CMS/Table/Menu.php
@@ -50,7 +50,7 @@ public function __construct(\JDatabaseDriver $db)
 	public function bind($array, $ignore = '')
 	{
 		// Verify that the default home menu is not unset
-		if ($this->home == '1' && $this->language == '*' && ($array['home'] == '0'))
+		if ($this->home == '1' && $this->language === '*' && $array['home'] == '0')
 		{
 			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT_DEFAULT'));
 
@@ -58,7 +58,7 @@ public function bind($array, $ignore = '')
 		}
 
 		// Verify that the default home menu set to "all" languages" is not unset
-		if ($this->home == '1' && $this->language == '*' && ($array['language'] != '*'))
+		if ($this->home == '1' && $this->language === '*' && $array['language'] !== '*')
 		{
 			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT'));
 
@@ -66,7 +66,7 @@ public function bind($array, $ignore = '')
 		}
 
 		// Verify that the default home menu is not unpublished
-		if ($this->home == '1' && $this->language == '*' && $array['published'] != '1')
+		if ($this->home == '1' && $this->language === '*' && $array['published'] != '1')
 		{
 			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_UNPUBLISH_DEFAULT_HOME'));
 
@@ -93,7 +93,7 @@ public function bind($array, $ignore = '')
 	public function check()
 	{
 		// Check for a title.
-		if (trim($this->title) == '')
+		if (trim($this->title) === '')
 		{
 			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MENUITEM'));
 
@@ -101,17 +101,17 @@ public function check()
 		}
 
 		// Check for a path.
-		if (trim($this->path) == '')
+		if (trim($this->path) === '')
 		{
 			$this->path = $this->alias;
 		}
 		// Check for params.
-		if (trim($this->params) == '')
+		if (trim($this->params) === '')
 		{
 			$this->params = '{}';
 		}
 		// Check for img.
-		if (trim($this->img) == '')
+		if (trim($this->img) === '')
 		{
 			$this->img = ' ';
 		}
@@ -120,7 +120,7 @@ public function check()
 		$this->home = (int) $this->home;
 
 		// Verify that the home item is a component.
-		if ($this->home && $this->type != 'component')
+		if ($this->home && $this->type !== 'component')
 		{
 			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_HOME_NOT_COMPONENT'));
 
@@ -279,7 +279,7 @@ public function store($updateNulls = false)
 		foreach ($pathNodes as $node)
 		{
 			// Don't include root in path
-			if ($node->alias != 'root')
+			if ($node->alias !== 'root')
 			{
 				$segments[] = $node->alias;
 			}
diff --git a/libraries/src/Joomla/CMS/Table/MenuType.php b/libraries/src/Joomla/CMS/Table/MenuType.php
index 4f77c38a9b227..3a0b28454aa55 100644
--- a/libraries/src/Joomla/CMS/Table/MenuType.php
+++ b/libraries/src/Joomla/CMS/Table/MenuType.php
@@ -51,7 +51,7 @@ public function check()
 		}
 
 		// Sanitise data.
-		if (trim($this->title) == '')
+		if (trim($this->title) === '')
 		{
 			$this->title = $this->menutype;
 		}
@@ -170,7 +170,7 @@ public function store($updateNulls = false)
 	public function delete($pk = null)
 	{
 		$k = $this->_tbl_key;
-		$pk = is_null($pk) ? $this->$k : $pk;
+		$pk = $pk === null ? $this->$k : $pk;
 
 		// If no primary key is given, return false.
 		if ($pk !== null)
@@ -283,6 +283,6 @@ protected function _getAssetParentId(Table $table = null, $id = null)
 			$assetId = $asset->id;
 		}
 
-		return is_null($assetId) ? parent::_getAssetParentId($table, $id) : $assetId;
+		return $assetId === null ? parent::_getAssetParentId($table, $id) : $assetId;
 	}
 }
diff --git a/libraries/src/Joomla/CMS/Table/Module.php b/libraries/src/Joomla/CMS/Table/Module.php
index 662051b579650..c18ca53b30af1 100644
--- a/libraries/src/Joomla/CMS/Table/Module.php
+++ b/libraries/src/Joomla/CMS/Table/Module.php
@@ -116,7 +116,7 @@ protected function _getAssetParentId(Table $table = null, $id = null)
 	public function check()
 	{
 		// Check for valid name
-		if (trim($this->title) == '')
+		if (trim($this->title) === '')
 		{
 			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MODULE'));
 
diff --git a/libraries/src/Joomla/CMS/View/CategoryFeed.php b/libraries/src/Joomla/CMS/View/CategoryFeed.php
index 689240eb686f6..672a64b5082bc 100644
--- a/libraries/src/Joomla/CMS/View/CategoryFeed.php
+++ b/libraries/src/Joomla/CMS/View/CategoryFeed.php
@@ -59,7 +59,7 @@ public function display($tpl = null)
 		$feedEmail        = $app->get('feed_email', 'none');
 		$document->editor = $fromName;
 
-		if ($feedEmail != 'none')
+		if ($feedEmail !== 'none')
 		{
 			$document->editorEmail = $siteEmail;
 		}
@@ -69,7 +69,7 @@ public function display($tpl = null)
 		$category = $this->get('Category');
 
 		// Don't display feed if category id missing or non existent
-		if ($category == false || $category->alias == "root")
+		if ($category == false || $category->alias === 'root')
 		{
 			return JError::raiseError(404, JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
 		}
@@ -116,7 +116,7 @@ public function display($tpl = null)
 			$feeditem->author      = $author;
 
 			// We don't have the author email so we have to use site in both cases.
-			if ($feedEmail == 'site')
+			if ($feedEmail === 'site')
 			{
 				$feeditem->authorEmail = $siteEmail;
 			}
diff --git a/libraries/src/Joomla/CMS/View/HtmlView.php b/libraries/src/Joomla/CMS/View/HtmlView.php
index 1653fa1f1175f..7a511ed0ca4d9 100644
--- a/libraries/src/Joomla/CMS/View/HtmlView.php
+++ b/libraries/src/Joomla/CMS/View/HtmlView.php
@@ -289,7 +289,7 @@ public function assign()
 			// Assign public properties
 			foreach (get_object_vars($arg0) as $key => $val)
 			{
-				if (substr($key, 0, 1) != '_')
+				if (strpos($key, '_') !== 0)
 				{
 					$this->$key = $val;
 				}
@@ -303,7 +303,7 @@ public function assign()
 		{
 			foreach ($arg0 as $key => $val)
 			{
-				if (substr($key, 0, 1) != '_')
+				if (strpos($key, '_') !== 0)
 				{
 					$this->$key = $val;
 				}
@@ -316,7 +316,7 @@ public function assign()
 
 		// We use array_key_exists() instead of isset() because isset()
 		// fails if the value is set to null.
-		if (is_string($arg0) && substr($arg0, 0, 1) != '_' && func_num_args() > 1)
+		if (is_string($arg0) && strpos($arg0, '_') !== 0 && func_num_args() > 1)
 		{
 			$this->$arg0 = $arg1;
 
@@ -356,7 +356,7 @@ public function assignRef($key, &$val)
 	{
 		\JLog::add(__METHOD__ . ' is deprecated. Use native PHP syntax.', \JLog::WARNING, 'deprecated');
 
-		if (is_string($key) && substr($key, 0, 1) != '_')
+		if (is_string($key) && strpos($key, '_') !== 0)
 		{
 			$this->$key = &$val;
 
@@ -401,7 +401,7 @@ public function escape($var)
 	public function get($property, $default = null)
 	{
 		// If $model is null we use the default model
-		if (is_null($default))
+		if ($default === null)
 		{
 			$model = $this->_defaultModel;
 		}
@@ -659,7 +659,7 @@ public function loadTemplate($tpl = null)
 			|| $lang->load('tpl_' . $template, JPATH_THEMES . "/$template", null, false, true);
 
 		// Change the template folder if alternative layout is in different template
-		if (isset($layoutTemplate) && $layoutTemplate != '_' && $layoutTemplate != $template)
+		if (isset($layoutTemplate) && $layoutTemplate !== '_' && $layoutTemplate != $template)
 		{
 			$this->_path['template'] = str_replace($template, $layoutTemplate, $this->_path['template']);
 		}

From a2a0d53f901f9e8669c18342485d7867e46975eb Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Wed, 26 Jul 2017 00:15:42 -0500
Subject: [PATCH 062/148] Add JCryptCipherSodium to support libsodium (#16754)

---
 .gitignore                                    |    6 +
 composer.json                                 |    3 +-
 composer.lock                                 |   83 +-
 libraries/joomla/crypt/cipher/sodium.php      |  133 +
 .../vendor/composer/autoload_classmap.php     |  196 ++
 libraries/vendor/composer/autoload_files.php  |    3 +-
 libraries/vendor/composer/autoload_static.php |  199 +-
 libraries/vendor/composer/installed.json      |   83 +
 .../vendor/paragonie/sodium_compat/LICENSE    |   21 +
 .../paragonie/sodium_compat/autoload-fast.php |    4 +
 .../sodium_compat/autoload-pedantic.php       |    6 +
 .../paragonie/sodium_compat/autoload.php      |   48 +
 .../paragonie/sodium_compat/lib/constants.php |   45 +
 .../sodium_compat/lib/namespaced.php          |   46 +
 .../sodium_compat/lib/php72compat.php         |  541 ++++
 .../sodium_compat/lib/sodium_compat.php       |  507 ++++
 .../sodium_compat/namespaced/Compat.php       |    7 +
 .../sodium_compat/namespaced/Core/BLAKE2b.php |    7 +
 .../namespaced/Core/ChaCha20.php              |    7 +
 .../namespaced/Core/ChaCha20/Ctx.php          |    7 +
 .../namespaced/Core/ChaCha20/IetfCtx.php      |    7 +
 .../namespaced/Core/Curve25519.php            |    7 +
 .../namespaced/Core/Curve25519/Fe.php         |    7 +
 .../namespaced/Core/Curve25519/Ge/Cached.php  |    7 +
 .../namespaced/Core/Curve25519/Ge/P1p1.php    |    7 +
 .../namespaced/Core/Curve25519/Ge/P2.php      |    7 +
 .../namespaced/Core/Curve25519/Ge/P3.php      |    7 +
 .../namespaced/Core/Curve25519/Ge/Precomp.php |    7 +
 .../namespaced/Core/Curve25519/H.php          |    7 +
 .../sodium_compat/namespaced/Core/Ed25519.php |    7 +
 .../namespaced/Core/HChaCha20.php             |    7 +
 .../namespaced/Core/HSalsa20.php              |    7 +
 .../namespaced/Core/Poly1305.php              |    7 +
 .../namespaced/Core/Poly1305/State.php        |    7 +
 .../sodium_compat/namespaced/Core/Salsa20.php |    7 +
 .../sodium_compat/namespaced/Core/SipHash.php |    7 +
 .../sodium_compat/namespaced/Core/Util.php    |    7 +
 .../sodium_compat/namespaced/Core/X25519.php  |    7 +
 .../namespaced/Core/XChaCha20.php             |    7 +
 .../namespaced/Core/Xsalsa20.php              |    7 +
 .../sodium_compat/namespaced/Crypto.php       |    7 +
 .../sodium_compat/namespaced/File.php         |    7 +
 .../paragonie/sodium_compat/src/Compat.php    | 2056 +++++++++++++
 .../sodium_compat/src/Core/BLAKE2b.php        |  657 +++++
 .../sodium_compat/src/Core/ChaCha20.php       |  364 +++
 .../sodium_compat/src/Core/ChaCha20/Ctx.php   |  115 +
 .../src/Core/ChaCha20/IetfCtx.php             |   37 +
 .../sodium_compat/src/Core/Curve25519.php     | 2567 +++++++++++++++++
 .../sodium_compat/src/Core/Curve25519/Fe.php  |  126 +
 .../src/Core/Curve25519/Ge/Cached.php         |   65 +
 .../src/Core/Curve25519/Ge/P1p1.php           |   64 +
 .../src/Core/Curve25519/Ge/P2.php             |   54 +
 .../src/Core/Curve25519/Ge/P3.php             |   65 +
 .../src/Core/Curve25519/Ge/Precomp.php        |   54 +
 .../sodium_compat/src/Core/Curve25519/H.php   | 1467 ++++++++++
 .../sodium_compat/src/Core/Ed25519.php        |  418 +++
 .../sodium_compat/src/Core/HChaCha20.php      |  106 +
 .../sodium_compat/src/Core/HSalsa20.php       |   95 +
 .../sodium_compat/src/Core/Poly1305.php       |   59 +
 .../sodium_compat/src/Core/Poly1305/State.php |  356 +++
 .../sodium_compat/src/Core/Salsa20.php        |  265 ++
 .../sodium_compat/src/Core/SipHash.php        |  300 ++
 .../paragonie/sodium_compat/src/Core/Util.php |  767 +++++
 .../sodium_compat/src/Core/X25519.php         |  311 ++
 .../sodium_compat/src/Core/XChaCha20.php      |   62 +
 .../sodium_compat/src/Core/Xsalsa20.php       |   53 +
 .../paragonie/sodium_compat/src/Crypto.php    | 1174 ++++++++
 .../paragonie/sodium_compat/src/File.php      | 1041 +++++++
 .../crypt/cipher/JCryptCipherSodiumTest.php   |   81 +
 69 files changed, 14881 insertions(+), 4 deletions(-)
 create mode 100644 libraries/joomla/crypt/cipher/sodium.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/LICENSE
 create mode 100644 libraries/vendor/paragonie/sodium_compat/autoload-fast.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/autoload.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/lib/constants.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/lib/namespaced.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/lib/php72compat.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/namespaced/File.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Compat.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Util.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/Crypto.php
 create mode 100644 libraries/vendor/paragonie/sodium_compat/src/File.php
 create mode 100644 tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php

diff --git a/.gitignore b/.gitignore
index d6ddb7a66e8aa..f448d6ba6997b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,6 +116,12 @@ Desktop.ini
 /libraries/vendor/paragonie/random_compat/psalm-autoload.php
 /libraries/vendor/paragonie/random_compat/psalm.xml
 /libraries/vendor/paragonie/random_compat/tests
+/libraries/vendor/paragonie/sodium_compat/.gitignore
+/libraries/vendor/paragonie/sodium_compat/composer.json
+/libraries/vendor/paragonie/sodium_compat/composer.lock
+/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
+/libraries/vendor/paragonie/sodium_compat/README.md
+/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
 /libraries/vendor/phpmailer/phpmailer/docs
 /libraries/vendor/phpmailer/phpmailer/examples
 /libraries/vendor/phpmailer/phpmailer/language
diff --git a/composer.json b/composer.json
index d27260fe815ec..04621a0ccad06 100644
--- a/composer.json
+++ b/composer.json
@@ -34,6 +34,7 @@
         "ircmaxell/password-compat": "1.*",
         "leafo/lessphp": "0.5.0",
         "paragonie/random_compat": "~1.0",
+        "paragonie/sodium_compat": "^1.0.1",
         "phpmailer/phpmailer": "^5.2.20",
         "symfony/polyfill-php55": "~1.2",
         "symfony/polyfill-php56": "~1.0",
@@ -47,4 +48,4 @@
         "squizlabs/php_codesniffer": "~1.5",
         "pear/cache_lite": "1.7.16"
     }
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 1cdd5b7158f35..8bba7e8692ad9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "508d04c9f88b696e7a08afbc3959b6ed",
+    "content-hash": "ff501849de6d0ec4a7790c7f5c42651b",
     "packages": [
         {
             "name": "ircmaxell/password-compat",
@@ -861,6 +861,87 @@
             ],
             "time": "2017-03-13T16:22:52+00:00"
         },
+        {
+            "name": "paragonie/sodium_compat",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/sodium_compat.git",
+                "reference": "3c6b3b7ffd256df19c39b0f4aa0bb28badd08aaa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/3c6b3b7ffd256df19c39b0f4aa0bb28badd08aaa",
+                "reference": "3c6b3b7ffd256df19c39b0f4aa0bb28badd08aaa",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "^1|^2",
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^3|^4|^5"
+            },
+            "suggest": {
+                "ext-libsodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com"
+                },
+                {
+                    "name": "Frank Denis",
+                    "email": "jedisct1@pureftpd.org"
+                }
+            ],
+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+            "keywords": [
+                "Authentication",
+                "BLAKE2b",
+                "ChaCha20",
+                "ChaCha20-Poly1305",
+                "Chapoly",
+                "Curve25519",
+                "Ed25519",
+                "EdDSA",
+                "Edwards-curve Digital Signature Algorithm",
+                "Elliptic Curve Diffie-Hellman",
+                "Poly1305",
+                "Pure-PHP cryptography",
+                "RFC 7748",
+                "RFC 8032",
+                "Salpoly",
+                "Salsa20",
+                "X25519",
+                "XChaCha20-Poly1305",
+                "XSalsa20-Poly1305",
+                "Xchacha20",
+                "Xsalsa20",
+                "aead",
+                "cryptography",
+                "ecdh",
+                "elliptic curve",
+                "elliptic curve cryptography",
+                "encryption",
+                "libsodium",
+                "php",
+                "public-key cryptography",
+                "secret-key cryptography",
+                "side-channel resistant"
+            ],
+            "time": "2017-06-09T22:35:18+00:00"
+        },
         {
             "name": "phpmailer/phpmailer",
             "version": "v5.2.23",
diff --git a/libraries/joomla/crypt/cipher/sodium.php b/libraries/joomla/crypt/cipher/sodium.php
new file mode 100644
index 0000000000000..671ceb2b6564d
--- /dev/null
+++ b/libraries/joomla/crypt/cipher/sodium.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Crypt
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JCrypt cipher for sodium algorithm encryption, decryption and key generation.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JCryptCipherSodium implements JCryptCipher
+{
+	/**
+	 * The message nonce to be used with encryption/decryption
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $nonce;
+
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string     $data  The encrypted string to decrypt.
+	 * @param   JCryptKey  $key   The key object to use for decryption.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 * @throws  RuntimeException
+	 */
+	public function decrypt($data, JCryptKey $key)
+	{
+		// Validate key.
+		if ($key->type !== 'sodium')
+		{
+			throw new InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
+		}
+
+		if (!$this->nonce)
+		{
+			throw new RuntimeException('Missing nonce to decrypt data');
+		}
+
+		$decrypted = \Sodium\crypto_box_open(
+			$data,
+			$this->nonce,
+			\Sodium\crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
+		);
+
+		if ($decrypted === false)
+		{
+			throw new RuntimeException('Malformed message or invalid MAC');
+		}
+
+		return $decrypted;
+	}
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string     $data  The data string to encrypt.
+	 * @param   JCryptKey  $key   The key object to use for encryption.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 * @throws  RuntimeException
+	 */
+	public function encrypt($data, JCryptKey $key)
+	{
+		// Validate key.
+		if ($key->type !== 'sodium')
+		{
+			throw new InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
+		}
+
+		if (!$this->nonce)
+		{
+			throw new RuntimeException('Missing nonce to decrypt data');
+		}
+
+		return \Sodium\crypto_box(
+			$data,
+			$this->nonce,
+			\Sodium\crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
+		);
+	}
+
+	/**
+	 * Method to generate a new encryption key object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  JCryptKey
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 * @throws  RuntimeException
+	 */
+	public function generateKey(array $options = array())
+	{
+		// Create the new encryption key object.
+		$key = new JCryptKey('sodium');
+
+		// Generate the encryption key.
+		$pair = \Sodium\crypto_box_keypair();
+
+		$key->public  = \Sodium\crypto_box_publickey($pair);
+		$key->private = \Sodium\crypto_box_secretkey($pair);
+
+		return $key;
+	}
+
+	/**
+	 * Set the nonce to use for encrypting/decrypting messages
+	 *
+	 * @param   string  $nonce  The message nonce
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function setNonce($nonce)
+	{
+		$this->nonce = $nonce;
+	}
+}
diff --git a/libraries/vendor/composer/autoload_classmap.php b/libraries/vendor/composer/autoload_classmap.php
index d6330d2166453..5a97e8f9928d9 100644
--- a/libraries/vendor/composer/autoload_classmap.php
+++ b/libraries/vendor/composer/autoload_classmap.php
@@ -8,12 +8,208 @@
 return array(
     'CallbackFilterIterator' => $vendorDir . '/joomla/compat/src/CallbackFilterIterator.php',
     'EasyPeasyICS' => $vendorDir . '/phpmailer/phpmailer/extras/EasyPeasyICS.php',
+    'Joomla\\Application\\AbstractApplication' => $vendorDir . '/joomla/application/src/AbstractApplication.php',
+    'Joomla\\Application\\AbstractCliApplication' => $vendorDir . '/joomla/application/src/AbstractCliApplication.php',
+    'Joomla\\Application\\AbstractDaemonApplication' => $vendorDir . '/joomla/application/src/AbstractDaemonApplication.php',
+    'Joomla\\Application\\AbstractWebApplication' => $vendorDir . '/joomla/application/src/AbstractWebApplication.php',
+    'Joomla\\Application\\Cli\\CliInput' => $vendorDir . '/joomla/application/src/Cli/CliInput.php',
+    'Joomla\\Application\\Cli\\CliOutput' => $vendorDir . '/joomla/application/src/Cli/CliOutput.php',
+    'Joomla\\Application\\Cli\\ColorProcessor' => $vendorDir . '/joomla/application/src/Cli/ColorProcessor.php',
+    'Joomla\\Application\\Cli\\ColorStyle' => $vendorDir . '/joomla/application/src/Cli/ColorStyle.php',
+    'Joomla\\Application\\Cli\\Output\\Processor\\ColorProcessor' => $vendorDir . '/joomla/application/src/Cli/Output/Processor/ColorProcessor.php',
+    'Joomla\\Application\\Cli\\Output\\Processor\\ProcessorInterface' => $vendorDir . '/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php',
+    'Joomla\\Application\\Cli\\Output\\Stdout' => $vendorDir . '/joomla/application/src/Cli/Output/Stdout.php',
+    'Joomla\\Application\\Cli\\Output\\Xml' => $vendorDir . '/joomla/application/src/Cli/Output/Xml.php',
+    'Joomla\\Application\\Web\\WebClient' => $vendorDir . '/joomla/application/src/Web/WebClient.php',
+    'Joomla\\Archive\\Archive' => $vendorDir . '/joomla/archive/src/Archive.php',
+    'Joomla\\Archive\\Bzip2' => $vendorDir . '/joomla/archive/src/Bzip2.php',
+    'Joomla\\Archive\\ExtractableInterface' => $vendorDir . '/joomla/archive/src/ExtractableInterface.php',
+    'Joomla\\Archive\\Gzip' => $vendorDir . '/joomla/archive/src/Gzip.php',
+    'Joomla\\Archive\\Tar' => $vendorDir . '/joomla/archive/src/Tar.php',
+    'Joomla\\Archive\\Zip' => $vendorDir . '/joomla/archive/src/Zip.php',
+    'Joomla\\DI\\Container' => $vendorDir . '/joomla/di/src/Container.php',
+    'Joomla\\DI\\ContainerAwareInterface' => $vendorDir . '/joomla/di/src/ContainerAwareInterface.php',
+    'Joomla\\DI\\ContainerAwareTrait' => $vendorDir . '/joomla/di/src/ContainerAwareTrait.php',
+    'Joomla\\DI\\Exception\\DependencyResolutionException' => $vendorDir . '/joomla/di/src/Exception/DependencyResolutionException.php',
+    'Joomla\\DI\\ServiceProviderInterface' => $vendorDir . '/joomla/di/src/ServiceProviderInterface.php',
+    'Joomla\\DI\\Tests\\AliasingTest' => $vendorDir . '/joomla/di/Tests/AliasingTest.php',
+    'Joomla\\DI\\Tests\\ContainerAccessTest' => $vendorDir . '/joomla/di/Tests/ContainerAccessTest.php',
+    'Joomla\\DI\\Tests\\ContainerAwareTraitTest' => $vendorDir . '/joomla/di/Tests/ContainerAwareTraitTest.php',
+    'Joomla\\DI\\Tests\\ContainerSetupTest' => $vendorDir . '/joomla/di/Tests/ContainerSetupTest.php',
+    'Joomla\\DI\\Tests\\HierachicalTest' => $vendorDir . '/joomla/di/Tests/HierachicalTest.php',
+    'Joomla\\DI\\Tests\\ObjectBuildingTest' => $vendorDir . '/joomla/di/Tests/ObjectBuildingTest.php',
+    'Joomla\\DI\\Tests\\ResourceDecoration' => $vendorDir . '/joomla/di/Tests/ResourceDecorationTest.php',
+    'Joomla\\DI\\Tests\\ResourceTest' => $vendorDir . '/joomla/di/Tests/ResourceTest.php',
+    'Joomla\\DI\\Tests\\ServiceProviderTest' => $vendorDir . '/joomla/di/Tests/ServiceProviderTest.php',
+    'Joomla\\DI\\Tests\\Stub1' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub2' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub3' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub4' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub5' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub6' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub7' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub8' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\Stub9' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\DI\\Tests\\StubInterface' => $vendorDir . '/joomla/di/Tests/Stubs/stubs.php',
+    'Joomla\\Data\\DataObject' => $vendorDir . '/joomla/data/src/DataObject.php',
+    'Joomla\\Data\\DataSet' => $vendorDir . '/joomla/data/src/DataSet.php',
+    'Joomla\\Data\\DumpableInterface' => $vendorDir . '/joomla/data/src/DumpableInterface.php',
+    'Joomla\\Data\\Tests\\DataObjectTest' => $vendorDir . '/joomla/data/Tests/DataObjectTest.php',
+    'Joomla\\Data\\Tests\\DataSetTest' => $vendorDir . '/joomla/data/Tests/DataSetTest.php',
+    'Joomla\\Data\\Tests\\JDataBuran' => $vendorDir . '/joomla/data/Tests/Stubs/buran.php',
+    'Joomla\\Data\\Tests\\JDataCapitaliser' => $vendorDir . '/joomla/data/Tests/Stubs/capitaliser.php',
+    'Joomla\\Data\\Tests\\JDataVostok' => $vendorDir . '/joomla/data/Tests/Stubs/vostok.php',
+    'Joomla\\Event\\AbstractEvent' => $vendorDir . '/joomla/event/src/AbstractEvent.php',
+    'Joomla\\Event\\DelegatingDispatcher' => $vendorDir . '/joomla/event/src/DelegatingDispatcher.php',
+    'Joomla\\Event\\Dispatcher' => $vendorDir . '/joomla/event/src/Dispatcher.php',
+    'Joomla\\Event\\DispatcherAwareInterface' => $vendorDir . '/joomla/event/src/DispatcherAwareInterface.php',
+    'Joomla\\Event\\DispatcherAwareTrait' => $vendorDir . '/joomla/event/src/DispatcherAwareTrait.php',
+    'Joomla\\Event\\DispatcherInterface' => $vendorDir . '/joomla/event/src/DispatcherInterface.php',
+    'Joomla\\Event\\Event' => $vendorDir . '/joomla/event/src/Event.php',
+    'Joomla\\Event\\EventImmutable' => $vendorDir . '/joomla/event/src/EventImmutable.php',
+    'Joomla\\Event\\EventInterface' => $vendorDir . '/joomla/event/src/EventInterface.php',
+    'Joomla\\Event\\ListenersPriorityQueue' => $vendorDir . '/joomla/event/src/ListenersPriorityQueue.php',
+    'Joomla\\Event\\Priority' => $vendorDir . '/joomla/event/src/Priority.php',
+    'Joomla\\Event\\Tests\\AbstractEventTest' => $vendorDir . '/joomla/event/Tests/AbstractEventTest.php',
+    'Joomla\\Event\\Tests\\DelegatingDispatcherTest' => $vendorDir . '/joomla/event/Tests/DelegatingDispatcherTest.php',
+    'Joomla\\Event\\Tests\\DispatcherTest' => $vendorDir . '/joomla/event/Tests/DispatcherTest.php',
+    'Joomla\\Event\\Tests\\EventImmutableTest' => $vendorDir . '/joomla/event/Tests/EventImmutableTest.php',
+    'Joomla\\Event\\Tests\\EventTest' => $vendorDir . '/joomla/event/Tests/EventTest.php',
+    'Joomla\\Event\\Tests\\ListenersPriorityQueueTest' => $vendorDir . '/joomla/event/Tests/ListenersPriorityQueueTest.php',
+    'Joomla\\Event\\Tests\\Stubs\\EmptyListener' => $vendorDir . '/joomla/event/Tests/Stubs/EmptyListener.php',
+    'Joomla\\Event\\Tests\\Stubs\\FirstListener' => $vendorDir . '/joomla/event/Tests/Stubs/FirstListener.php',
+    'Joomla\\Event\\Tests\\Stubs\\SecondListener' => $vendorDir . '/joomla/event/Tests/Stubs/SecondListener.php',
+    'Joomla\\Event\\Tests\\Stubs\\SomethingListener' => $vendorDir . '/joomla/event/Tests/Stubs/SomethingListener.php',
+    'Joomla\\Event\\Tests\\Stubs\\ThirdListener' => $vendorDir . '/joomla/event/Tests/Stubs/ThirdListener.php',
+    'Joomla\\Filesystem\\Buffer' => $vendorDir . '/joomla/filesystem/src/Buffer.php',
+    'Joomla\\Filesystem\\Clients\\FtpClient' => $vendorDir . '/joomla/filesystem/src/Clients/FtpClient.php',
+    'Joomla\\Filesystem\\Exception\\FilesystemException' => $vendorDir . '/joomla/filesystem/src/Exception/FilesystemException.php',
+    'Joomla\\Filesystem\\File' => $vendorDir . '/joomla/filesystem/src/File.php',
+    'Joomla\\Filesystem\\Folder' => $vendorDir . '/joomla/filesystem/src/Folder.php',
+    'Joomla\\Filesystem\\Helper' => $vendorDir . '/joomla/filesystem/src/Helper.php',
+    'Joomla\\Filesystem\\Patcher' => $vendorDir . '/joomla/filesystem/src/Patcher.php',
+    'Joomla\\Filesystem\\Path' => $vendorDir . '/joomla/filesystem/src/Path.php',
+    'Joomla\\Filesystem\\Stream' => $vendorDir . '/joomla/filesystem/src/Stream.php',
+    'Joomla\\Filesystem\\Stream\\String' => $vendorDir . '/joomla/filesystem/src/Stream/String.php',
+    'Joomla\\Filesystem\\Stream\\StringWrapper' => $vendorDir . '/joomla/filesystem/src/Stream/StringWrapper.php',
+    'Joomla\\Filesystem\\Support\\StringController' => $vendorDir . '/joomla/filesystem/src/Support/StringController.php',
+    'Joomla\\Filter\\InputFilter' => $vendorDir . '/joomla/filter/src/InputFilter.php',
+    'Joomla\\Filter\\OutputFilter' => $vendorDir . '/joomla/filter/src/OutputFilter.php',
+    'Joomla\\Input\\Cli' => $vendorDir . '/joomla/input/src/Cli.php',
+    'Joomla\\Input\\Cookie' => $vendorDir . '/joomla/input/src/Cookie.php',
+    'Joomla\\Input\\Files' => $vendorDir . '/joomla/input/src/Files.php',
+    'Joomla\\Input\\Input' => $vendorDir . '/joomla/input/src/Input.php',
+    'Joomla\\Input\\Json' => $vendorDir . '/joomla/input/src/Json.php',
+    'Joomla\\Ldap\\LdapClient' => $vendorDir . '/joomla/ldap/src/LdapClient.php',
+    'Joomla\\Ldap\\Tests\\LdapClientTest' => $vendorDir . '/joomla/ldap/Tests/LdapClientTest.php',
+    'Joomla\\Registry\\AbstractRegistryFormat' => $vendorDir . '/joomla/registry/src/AbstractRegistryFormat.php',
+    'Joomla\\Registry\\Factory' => $vendorDir . '/joomla/registry/src/Factory.php',
+    'Joomla\\Registry\\FormatInterface' => $vendorDir . '/joomla/registry/src/FormatInterface.php',
+    'Joomla\\Registry\\Format\\Ini' => $vendorDir . '/joomla/registry/src/Format/Ini.php',
+    'Joomla\\Registry\\Format\\Json' => $vendorDir . '/joomla/registry/src/Format/Json.php',
+    'Joomla\\Registry\\Format\\Php' => $vendorDir . '/joomla/registry/src/Format/Php.php',
+    'Joomla\\Registry\\Format\\Xml' => $vendorDir . '/joomla/registry/src/Format/Xml.php',
+    'Joomla\\Registry\\Format\\Yaml' => $vendorDir . '/joomla/registry/src/Format/Yaml.php',
+    'Joomla\\Registry\\Registry' => $vendorDir . '/joomla/registry/src/Registry.php',
+    'Joomla\\Session\\Session' => $vendorDir . '/joomla/session/Joomla/Session/Session.php',
+    'Joomla\\Session\\Storage' => $vendorDir . '/joomla/session/Joomla/Session/Storage.php',
+    'Joomla\\Session\\Storage\\Apc' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Apc.php',
+    'Joomla\\Session\\Storage\\Database' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Database.php',
+    'Joomla\\Session\\Storage\\Memcache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Memcache.php',
+    'Joomla\\Session\\Storage\\Memcached' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Memcached.php',
+    'Joomla\\Session\\Storage\\None' => $vendorDir . '/joomla/session/Joomla/Session/Storage/None.php',
+    'Joomla\\Session\\Storage\\Wincache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Wincache.php',
+    'Joomla\\Session\\Storage\\Xcache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Xcache.php',
+    'Joomla\\Session\\Tests\\Handler\\ApcHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/ApcHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\ApcuHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/ApcuHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\DatabaseHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/DatabaseHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\FilesystemHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/FilesystemHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\MemcacheHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/MemcacheHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\MemcachedHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/MemcachedHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\NativeStorageTest' => $vendorDir . '/joomla/session/tests/Storage/NativeStorageTest.php',
+    'Joomla\\Session\\Tests\\Handler\\RedisHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/RedisHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\WincacheHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/WincacheHandlerTest.php',
+    'Joomla\\Session\\Tests\\Handler\\XCacheHandlerTest' => $vendorDir . '/joomla/session/tests/Handler/XCacheHandlerTest.php',
+    'Joomla\\Session\\Tests\\SessionTest' => $vendorDir . '/joomla/session/tests/SessionTest.php',
+    'Joomla\\String\\Inflector' => $vendorDir . '/joomla/string/src/Inflector.php',
+    'Joomla\\String\\Normalise' => $vendorDir . '/joomla/string/src/Normalise.php',
+    'Joomla\\String\\String' => $vendorDir . '/joomla/string/src/String.php',
+    'Joomla\\String\\StringHelper' => $vendorDir . '/joomla/string/src/StringHelper.php',
+    'Joomla\\Uri\\AbstractUri' => $vendorDir . '/joomla/uri/src/AbstractUri.php',
+    'Joomla\\Uri\\Tests\\UriHelperTest' => $vendorDir . '/joomla/uri/Tests/UriHelperTest.php',
+    'Joomla\\Uri\\Tests\\UriImmuteableTest' => $vendorDir . '/joomla/uri/Tests/UriImmutableTest.php',
+    'Joomla\\Uri\\Tests\\UriTest' => $vendorDir . '/joomla/uri/Tests/UriTest.php',
+    'Joomla\\Uri\\Uri' => $vendorDir . '/joomla/uri/src/Uri.php',
+    'Joomla\\Uri\\UriHelper' => $vendorDir . '/joomla/uri/src/UriHelper.php',
+    'Joomla\\Uri\\UriImmutable' => $vendorDir . '/joomla/uri/src/UriImmutable.php',
+    'Joomla\\Uri\\UriInterface' => $vendorDir . '/joomla/uri/src/UriInterface.php',
+    'Joomla\\Utilities\\ArrayHelper' => $vendorDir . '/joomla/utilities/src/ArrayHelper.php',
     'JsonSerializable' => $vendorDir . '/joomla/compat/src/JsonSerializable.php',
     'PHPMailer' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
     'PHPMailerOAuth' => $vendorDir . '/phpmailer/phpmailer/class.phpmaileroauth.php',
     'PHPMailerOAuthGoogle' => $vendorDir . '/phpmailer/phpmailer/class.phpmaileroauthgoogle.php',
     'POP3' => $vendorDir . '/phpmailer/phpmailer/class.pop3.php',
+    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
+    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
+    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
+    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
+    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
+    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
+    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
+    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
+    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
     'SMTP' => $vendorDir . '/phpmailer/phpmailer/class.smtp.php',
+    'SimplePie' => $vendorDir . '/simplepie/simplepie/library/SimplePie.php',
+    'SimplePie_Author' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Author.php',
+    'SimplePie_Cache' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache.php',
+    'SimplePie_Cache_Base' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/Base.php',
+    'SimplePie_Cache_DB' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/DB.php',
+    'SimplePie_Cache_File' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/File.php',
+    'SimplePie_Cache_Memcache' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/Memcache.php',
+    'SimplePie_Cache_MySQL' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/MySQL.php',
+    'SimplePie_Caption' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Caption.php',
+    'SimplePie_Category' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Category.php',
+    'SimplePie_Content_Type_Sniffer' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php',
+    'SimplePie_Copyright' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Copyright.php',
+    'SimplePie_Core' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Core.php',
+    'SimplePie_Credit' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Credit.php',
+    'SimplePie_Decode_HTML_Entities' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php',
+    'SimplePie_Enclosure' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Enclosure.php',
+    'SimplePie_Exception' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Exception.php',
+    'SimplePie_File' => $vendorDir . '/simplepie/simplepie/library/SimplePie/File.php',
+    'SimplePie_HTTP_Parser' => $vendorDir . '/simplepie/simplepie/library/SimplePie/HTTP/Parser.php',
+    'SimplePie_IRI' => $vendorDir . '/simplepie/simplepie/library/SimplePie/IRI.php',
+    'SimplePie_Item' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Item.php',
+    'SimplePie_Locator' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Locator.php',
+    'SimplePie_Misc' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Misc.php',
+    'SimplePie_Net_IPv6' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Net/IPv6.php',
+    'SimplePie_Parse_Date' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Parse/Date.php',
+    'SimplePie_Parser' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Parser.php',
+    'SimplePie_Rating' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Rating.php',
+    'SimplePie_Registry' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Registry.php',
+    'SimplePie_Restriction' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Restriction.php',
+    'SimplePie_Sanitize' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Sanitize.php',
+    'SimplePie_Source' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Source.php',
+    'SimplePie_XML_Declaration_Parser' => $vendorDir . '/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php',
+    'SimplePie_gzdecode' => $vendorDir . '/simplepie/simplepie/library/SimplePie/gzdecode.php',
+    'Symfony\\Component\\Yaml\\Dumper' => $vendorDir . '/symfony/yaml/Dumper.php',
+    'Symfony\\Component\\Yaml\\Escaper' => $vendorDir . '/symfony/yaml/Escaper.php',
+    'Symfony\\Component\\Yaml\\Exception\\DumpException' => $vendorDir . '/symfony/yaml/Exception/DumpException.php',
+    'Symfony\\Component\\Yaml\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/yaml/Exception/ExceptionInterface.php',
+    'Symfony\\Component\\Yaml\\Exception\\ParseException' => $vendorDir . '/symfony/yaml/Exception/ParseException.php',
+    'Symfony\\Component\\Yaml\\Exception\\RuntimeException' => $vendorDir . '/symfony/yaml/Exception/RuntimeException.php',
+    'Symfony\\Component\\Yaml\\Inline' => $vendorDir . '/symfony/yaml/Inline.php',
+    'Symfony\\Component\\Yaml\\Parser' => $vendorDir . '/symfony/yaml/Parser.php',
+    'Symfony\\Component\\Yaml\\Unescaper' => $vendorDir . '/symfony/yaml/Unescaper.php',
+    'Symfony\\Component\\Yaml\\Yaml' => $vendorDir . '/symfony/yaml/Yaml.php',
+    'Symfony\\Polyfill\\Php55\\Php55' => $vendorDir . '/symfony/polyfill-php55/Php55.php',
+    'Symfony\\Polyfill\\Php55\\Php55ArrayColumn' => $vendorDir . '/symfony/polyfill-php55/Php55ArrayColumn.php',
+    'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
+    'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php',
+    'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
+    'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
+    'Symfony\\Polyfill\\Util\\TestListener' => $vendorDir . '/symfony/polyfill-util/TestListener.php',
     'lessc' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
     'lessc_formatter_classic' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
     'lessc_formatter_compressed' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
diff --git a/libraries/vendor/composer/autoload_files.php b/libraries/vendor/composer/autoload_files.php
index 3d72446f81c6e..fb46f771b9ea3 100644
--- a/libraries/vendor/composer/autoload_files.php
+++ b/libraries/vendor/composer/autoload_files.php
@@ -21,8 +21,9 @@
     '05d739a990f75f0c44ebe1f032b33148' => $vendorDir . '/joomla/string/src/phputf8/ucwords.php',
     '4292e2fa66516089e6006723267587b4' => $vendorDir . '/joomla/string/src/phputf8/utils/ascii.php',
     '87465e33b7551b401bf051928f220e9a' => $vendorDir . '/joomla/string/src/phputf8/utils/validation.php',
-    'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
     '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+    'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
     'edc6464955a37aa4d5fbf39d40fb6ee7' => $vendorDir . '/symfony/polyfill-php55/bootstrap.php',
     'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+    '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
 );
diff --git a/libraries/vendor/composer/autoload_static.php b/libraries/vendor/composer/autoload_static.php
index f51dd15da6a43..fbcc91e744799 100644
--- a/libraries/vendor/composer/autoload_static.php
+++ b/libraries/vendor/composer/autoload_static.php
@@ -22,10 +22,11 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
         '05d739a990f75f0c44ebe1f032b33148' => __DIR__ . '/..' . '/joomla/string/src/phputf8/ucwords.php',
         '4292e2fa66516089e6006723267587b4' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/ascii.php',
         '87465e33b7551b401bf051928f220e9a' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/validation.php',
-        'e40631d46120a9c38ea139981f8dab26' => __DIR__ . '/..' . '/ircmaxell/password-compat/lib/password.php',
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
+        'e40631d46120a9c38ea139981f8dab26' => __DIR__ . '/..' . '/ircmaxell/password-compat/lib/password.php',
         'edc6464955a37aa4d5fbf39d40fb6ee7' => __DIR__ . '/..' . '/symfony/polyfill-php55/bootstrap.php',
         'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
+        '3109cb1a231dcd04bee1f9f620d46975' => __DIR__ . '/..' . '/paragonie/sodium_compat/autoload.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -183,12 +184,208 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
     public static $classMap = array (
         'CallbackFilterIterator' => __DIR__ . '/..' . '/joomla/compat/src/CallbackFilterIterator.php',
         'EasyPeasyICS' => __DIR__ . '/..' . '/phpmailer/phpmailer/extras/EasyPeasyICS.php',
+        'Joomla\\Application\\AbstractApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractApplication.php',
+        'Joomla\\Application\\AbstractCliApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractCliApplication.php',
+        'Joomla\\Application\\AbstractDaemonApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractDaemonApplication.php',
+        'Joomla\\Application\\AbstractWebApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractWebApplication.php',
+        'Joomla\\Application\\Cli\\CliInput' => __DIR__ . '/..' . '/joomla/application/src/Cli/CliInput.php',
+        'Joomla\\Application\\Cli\\CliOutput' => __DIR__ . '/..' . '/joomla/application/src/Cli/CliOutput.php',
+        'Joomla\\Application\\Cli\\ColorProcessor' => __DIR__ . '/..' . '/joomla/application/src/Cli/ColorProcessor.php',
+        'Joomla\\Application\\Cli\\ColorStyle' => __DIR__ . '/..' . '/joomla/application/src/Cli/ColorStyle.php',
+        'Joomla\\Application\\Cli\\Output\\Processor\\ColorProcessor' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Processor/ColorProcessor.php',
+        'Joomla\\Application\\Cli\\Output\\Processor\\ProcessorInterface' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php',
+        'Joomla\\Application\\Cli\\Output\\Stdout' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Stdout.php',
+        'Joomla\\Application\\Cli\\Output\\Xml' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Xml.php',
+        'Joomla\\Application\\Web\\WebClient' => __DIR__ . '/..' . '/joomla/application/src/Web/WebClient.php',
+        'Joomla\\Archive\\Archive' => __DIR__ . '/..' . '/joomla/archive/src/Archive.php',
+        'Joomla\\Archive\\Bzip2' => __DIR__ . '/..' . '/joomla/archive/src/Bzip2.php',
+        'Joomla\\Archive\\ExtractableInterface' => __DIR__ . '/..' . '/joomla/archive/src/ExtractableInterface.php',
+        'Joomla\\Archive\\Gzip' => __DIR__ . '/..' . '/joomla/archive/src/Gzip.php',
+        'Joomla\\Archive\\Tar' => __DIR__ . '/..' . '/joomla/archive/src/Tar.php',
+        'Joomla\\Archive\\Zip' => __DIR__ . '/..' . '/joomla/archive/src/Zip.php',
+        'Joomla\\DI\\Container' => __DIR__ . '/..' . '/joomla/di/src/Container.php',
+        'Joomla\\DI\\ContainerAwareInterface' => __DIR__ . '/..' . '/joomla/di/src/ContainerAwareInterface.php',
+        'Joomla\\DI\\ContainerAwareTrait' => __DIR__ . '/..' . '/joomla/di/src/ContainerAwareTrait.php',
+        'Joomla\\DI\\Exception\\DependencyResolutionException' => __DIR__ . '/..' . '/joomla/di/src/Exception/DependencyResolutionException.php',
+        'Joomla\\DI\\ServiceProviderInterface' => __DIR__ . '/..' . '/joomla/di/src/ServiceProviderInterface.php',
+        'Joomla\\DI\\Tests\\AliasingTest' => __DIR__ . '/..' . '/joomla/di/Tests/AliasingTest.php',
+        'Joomla\\DI\\Tests\\ContainerAccessTest' => __DIR__ . '/..' . '/joomla/di/Tests/ContainerAccessTest.php',
+        'Joomla\\DI\\Tests\\ContainerAwareTraitTest' => __DIR__ . '/..' . '/joomla/di/Tests/ContainerAwareTraitTest.php',
+        'Joomla\\DI\\Tests\\ContainerSetupTest' => __DIR__ . '/..' . '/joomla/di/Tests/ContainerSetupTest.php',
+        'Joomla\\DI\\Tests\\HierachicalTest' => __DIR__ . '/..' . '/joomla/di/Tests/HierachicalTest.php',
+        'Joomla\\DI\\Tests\\ObjectBuildingTest' => __DIR__ . '/..' . '/joomla/di/Tests/ObjectBuildingTest.php',
+        'Joomla\\DI\\Tests\\ResourceDecoration' => __DIR__ . '/..' . '/joomla/di/Tests/ResourceDecorationTest.php',
+        'Joomla\\DI\\Tests\\ResourceTest' => __DIR__ . '/..' . '/joomla/di/Tests/ResourceTest.php',
+        'Joomla\\DI\\Tests\\ServiceProviderTest' => __DIR__ . '/..' . '/joomla/di/Tests/ServiceProviderTest.php',
+        'Joomla\\DI\\Tests\\Stub1' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub2' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub3' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub4' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub5' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub6' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub7' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub8' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\Stub9' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\DI\\Tests\\StubInterface' => __DIR__ . '/..' . '/joomla/di/Tests/Stubs/stubs.php',
+        'Joomla\\Data\\DataObject' => __DIR__ . '/..' . '/joomla/data/src/DataObject.php',
+        'Joomla\\Data\\DataSet' => __DIR__ . '/..' . '/joomla/data/src/DataSet.php',
+        'Joomla\\Data\\DumpableInterface' => __DIR__ . '/..' . '/joomla/data/src/DumpableInterface.php',
+        'Joomla\\Data\\Tests\\DataObjectTest' => __DIR__ . '/..' . '/joomla/data/Tests/DataObjectTest.php',
+        'Joomla\\Data\\Tests\\DataSetTest' => __DIR__ . '/..' . '/joomla/data/Tests/DataSetTest.php',
+        'Joomla\\Data\\Tests\\JDataBuran' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/buran.php',
+        'Joomla\\Data\\Tests\\JDataCapitaliser' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/capitaliser.php',
+        'Joomla\\Data\\Tests\\JDataVostok' => __DIR__ . '/..' . '/joomla/data/Tests/Stubs/vostok.php',
+        'Joomla\\Event\\AbstractEvent' => __DIR__ . '/..' . '/joomla/event/src/AbstractEvent.php',
+        'Joomla\\Event\\DelegatingDispatcher' => __DIR__ . '/..' . '/joomla/event/src/DelegatingDispatcher.php',
+        'Joomla\\Event\\Dispatcher' => __DIR__ . '/..' . '/joomla/event/src/Dispatcher.php',
+        'Joomla\\Event\\DispatcherAwareInterface' => __DIR__ . '/..' . '/joomla/event/src/DispatcherAwareInterface.php',
+        'Joomla\\Event\\DispatcherAwareTrait' => __DIR__ . '/..' . '/joomla/event/src/DispatcherAwareTrait.php',
+        'Joomla\\Event\\DispatcherInterface' => __DIR__ . '/..' . '/joomla/event/src/DispatcherInterface.php',
+        'Joomla\\Event\\Event' => __DIR__ . '/..' . '/joomla/event/src/Event.php',
+        'Joomla\\Event\\EventImmutable' => __DIR__ . '/..' . '/joomla/event/src/EventImmutable.php',
+        'Joomla\\Event\\EventInterface' => __DIR__ . '/..' . '/joomla/event/src/EventInterface.php',
+        'Joomla\\Event\\ListenersPriorityQueue' => __DIR__ . '/..' . '/joomla/event/src/ListenersPriorityQueue.php',
+        'Joomla\\Event\\Priority' => __DIR__ . '/..' . '/joomla/event/src/Priority.php',
+        'Joomla\\Event\\Tests\\AbstractEventTest' => __DIR__ . '/..' . '/joomla/event/Tests/AbstractEventTest.php',
+        'Joomla\\Event\\Tests\\DelegatingDispatcherTest' => __DIR__ . '/..' . '/joomla/event/Tests/DelegatingDispatcherTest.php',
+        'Joomla\\Event\\Tests\\DispatcherTest' => __DIR__ . '/..' . '/joomla/event/Tests/DispatcherTest.php',
+        'Joomla\\Event\\Tests\\EventImmutableTest' => __DIR__ . '/..' . '/joomla/event/Tests/EventImmutableTest.php',
+        'Joomla\\Event\\Tests\\EventTest' => __DIR__ . '/..' . '/joomla/event/Tests/EventTest.php',
+        'Joomla\\Event\\Tests\\ListenersPriorityQueueTest' => __DIR__ . '/..' . '/joomla/event/Tests/ListenersPriorityQueueTest.php',
+        'Joomla\\Event\\Tests\\Stubs\\EmptyListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/EmptyListener.php',
+        'Joomla\\Event\\Tests\\Stubs\\FirstListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/FirstListener.php',
+        'Joomla\\Event\\Tests\\Stubs\\SecondListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/SecondListener.php',
+        'Joomla\\Event\\Tests\\Stubs\\SomethingListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/SomethingListener.php',
+        'Joomla\\Event\\Tests\\Stubs\\ThirdListener' => __DIR__ . '/..' . '/joomla/event/Tests/Stubs/ThirdListener.php',
+        'Joomla\\Filesystem\\Buffer' => __DIR__ . '/..' . '/joomla/filesystem/src/Buffer.php',
+        'Joomla\\Filesystem\\Clients\\FtpClient' => __DIR__ . '/..' . '/joomla/filesystem/src/Clients/FtpClient.php',
+        'Joomla\\Filesystem\\Exception\\FilesystemException' => __DIR__ . '/..' . '/joomla/filesystem/src/Exception/FilesystemException.php',
+        'Joomla\\Filesystem\\File' => __DIR__ . '/..' . '/joomla/filesystem/src/File.php',
+        'Joomla\\Filesystem\\Folder' => __DIR__ . '/..' . '/joomla/filesystem/src/Folder.php',
+        'Joomla\\Filesystem\\Helper' => __DIR__ . '/..' . '/joomla/filesystem/src/Helper.php',
+        'Joomla\\Filesystem\\Patcher' => __DIR__ . '/..' . '/joomla/filesystem/src/Patcher.php',
+        'Joomla\\Filesystem\\Path' => __DIR__ . '/..' . '/joomla/filesystem/src/Path.php',
+        'Joomla\\Filesystem\\Stream' => __DIR__ . '/..' . '/joomla/filesystem/src/Stream.php',
+        'Joomla\\Filesystem\\Stream\\String' => __DIR__ . '/..' . '/joomla/filesystem/src/Stream/String.php',
+        'Joomla\\Filesystem\\Stream\\StringWrapper' => __DIR__ . '/..' . '/joomla/filesystem/src/Stream/StringWrapper.php',
+        'Joomla\\Filesystem\\Support\\StringController' => __DIR__ . '/..' . '/joomla/filesystem/src/Support/StringController.php',
+        'Joomla\\Filter\\InputFilter' => __DIR__ . '/..' . '/joomla/filter/src/InputFilter.php',
+        'Joomla\\Filter\\OutputFilter' => __DIR__ . '/..' . '/joomla/filter/src/OutputFilter.php',
+        'Joomla\\Input\\Cli' => __DIR__ . '/..' . '/joomla/input/src/Cli.php',
+        'Joomla\\Input\\Cookie' => __DIR__ . '/..' . '/joomla/input/src/Cookie.php',
+        'Joomla\\Input\\Files' => __DIR__ . '/..' . '/joomla/input/src/Files.php',
+        'Joomla\\Input\\Input' => __DIR__ . '/..' . '/joomla/input/src/Input.php',
+        'Joomla\\Input\\Json' => __DIR__ . '/..' . '/joomla/input/src/Json.php',
+        'Joomla\\Ldap\\LdapClient' => __DIR__ . '/..' . '/joomla/ldap/src/LdapClient.php',
+        'Joomla\\Ldap\\Tests\\LdapClientTest' => __DIR__ . '/..' . '/joomla/ldap/Tests/LdapClientTest.php',
+        'Joomla\\Registry\\AbstractRegistryFormat' => __DIR__ . '/..' . '/joomla/registry/src/AbstractRegistryFormat.php',
+        'Joomla\\Registry\\Factory' => __DIR__ . '/..' . '/joomla/registry/src/Factory.php',
+        'Joomla\\Registry\\FormatInterface' => __DIR__ . '/..' . '/joomla/registry/src/FormatInterface.php',
+        'Joomla\\Registry\\Format\\Ini' => __DIR__ . '/..' . '/joomla/registry/src/Format/Ini.php',
+        'Joomla\\Registry\\Format\\Json' => __DIR__ . '/..' . '/joomla/registry/src/Format/Json.php',
+        'Joomla\\Registry\\Format\\Php' => __DIR__ . '/..' . '/joomla/registry/src/Format/Php.php',
+        'Joomla\\Registry\\Format\\Xml' => __DIR__ . '/..' . '/joomla/registry/src/Format/Xml.php',
+        'Joomla\\Registry\\Format\\Yaml' => __DIR__ . '/..' . '/joomla/registry/src/Format/Yaml.php',
+        'Joomla\\Registry\\Registry' => __DIR__ . '/..' . '/joomla/registry/src/Registry.php',
+        'Joomla\\Session\\Session' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Session.php',
+        'Joomla\\Session\\Storage' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage.php',
+        'Joomla\\Session\\Storage\\Apc' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Apc.php',
+        'Joomla\\Session\\Storage\\Database' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Database.php',
+        'Joomla\\Session\\Storage\\Memcache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Memcache.php',
+        'Joomla\\Session\\Storage\\Memcached' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Memcached.php',
+        'Joomla\\Session\\Storage\\None' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/None.php',
+        'Joomla\\Session\\Storage\\Wincache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Wincache.php',
+        'Joomla\\Session\\Storage\\Xcache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Xcache.php',
+        'Joomla\\Session\\Tests\\Handler\\ApcHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/ApcHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\ApcuHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/ApcuHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\DatabaseHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/DatabaseHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\FilesystemHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/FilesystemHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\MemcacheHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/MemcacheHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\MemcachedHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/MemcachedHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\NativeStorageTest' => __DIR__ . '/..' . '/joomla/session/tests/Storage/NativeStorageTest.php',
+        'Joomla\\Session\\Tests\\Handler\\RedisHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/RedisHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\WincacheHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/WincacheHandlerTest.php',
+        'Joomla\\Session\\Tests\\Handler\\XCacheHandlerTest' => __DIR__ . '/..' . '/joomla/session/tests/Handler/XCacheHandlerTest.php',
+        'Joomla\\Session\\Tests\\SessionTest' => __DIR__ . '/..' . '/joomla/session/tests/SessionTest.php',
+        'Joomla\\String\\Inflector' => __DIR__ . '/..' . '/joomla/string/src/Inflector.php',
+        'Joomla\\String\\Normalise' => __DIR__ . '/..' . '/joomla/string/src/Normalise.php',
+        'Joomla\\String\\String' => __DIR__ . '/..' . '/joomla/string/src/String.php',
+        'Joomla\\String\\StringHelper' => __DIR__ . '/..' . '/joomla/string/src/StringHelper.php',
+        'Joomla\\Uri\\AbstractUri' => __DIR__ . '/..' . '/joomla/uri/src/AbstractUri.php',
+        'Joomla\\Uri\\Tests\\UriHelperTest' => __DIR__ . '/..' . '/joomla/uri/Tests/UriHelperTest.php',
+        'Joomla\\Uri\\Tests\\UriImmuteableTest' => __DIR__ . '/..' . '/joomla/uri/Tests/UriImmutableTest.php',
+        'Joomla\\Uri\\Tests\\UriTest' => __DIR__ . '/..' . '/joomla/uri/Tests/UriTest.php',
+        'Joomla\\Uri\\Uri' => __DIR__ . '/..' . '/joomla/uri/src/Uri.php',
+        'Joomla\\Uri\\UriHelper' => __DIR__ . '/..' . '/joomla/uri/src/UriHelper.php',
+        'Joomla\\Uri\\UriImmutable' => __DIR__ . '/..' . '/joomla/uri/src/UriImmutable.php',
+        'Joomla\\Uri\\UriInterface' => __DIR__ . '/..' . '/joomla/uri/src/UriInterface.php',
+        'Joomla\\Utilities\\ArrayHelper' => __DIR__ . '/..' . '/joomla/utilities/src/ArrayHelper.php',
         'JsonSerializable' => __DIR__ . '/..' . '/joomla/compat/src/JsonSerializable.php',
         'PHPMailer' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.phpmailer.php',
         'PHPMailerOAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.phpmaileroauth.php',
         'PHPMailerOAuthGoogle' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.phpmaileroauthgoogle.php',
         'POP3' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.pop3.php',
+        'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php',
+        'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php',
+        'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php',
+        'Psr\\Log\\LoggerAwareInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareInterface.php',
+        'Psr\\Log\\LoggerAwareTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareTrait.php',
+        'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
+        'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
+        'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
+        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+        'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
         'SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.smtp.php',
+        'SimplePie' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie.php',
+        'SimplePie_Author' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Author.php',
+        'SimplePie_Cache' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache.php',
+        'SimplePie_Cache_Base' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/Base.php',
+        'SimplePie_Cache_DB' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/DB.php',
+        'SimplePie_Cache_File' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/File.php',
+        'SimplePie_Cache_Memcache' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/Memcache.php',
+        'SimplePie_Cache_MySQL' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/MySQL.php',
+        'SimplePie_Caption' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Caption.php',
+        'SimplePie_Category' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Category.php',
+        'SimplePie_Content_Type_Sniffer' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php',
+        'SimplePie_Copyright' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Copyright.php',
+        'SimplePie_Core' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Core.php',
+        'SimplePie_Credit' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Credit.php',
+        'SimplePie_Decode_HTML_Entities' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php',
+        'SimplePie_Enclosure' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Enclosure.php',
+        'SimplePie_Exception' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Exception.php',
+        'SimplePie_File' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/File.php',
+        'SimplePie_HTTP_Parser' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/HTTP/Parser.php',
+        'SimplePie_IRI' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/IRI.php',
+        'SimplePie_Item' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Item.php',
+        'SimplePie_Locator' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Locator.php',
+        'SimplePie_Misc' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Misc.php',
+        'SimplePie_Net_IPv6' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Net/IPv6.php',
+        'SimplePie_Parse_Date' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Parse/Date.php',
+        'SimplePie_Parser' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Parser.php',
+        'SimplePie_Rating' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Rating.php',
+        'SimplePie_Registry' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Registry.php',
+        'SimplePie_Restriction' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Restriction.php',
+        'SimplePie_Sanitize' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Sanitize.php',
+        'SimplePie_Source' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Source.php',
+        'SimplePie_XML_Declaration_Parser' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php',
+        'SimplePie_gzdecode' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/gzdecode.php',
+        'Symfony\\Component\\Yaml\\Dumper' => __DIR__ . '/..' . '/symfony/yaml/Dumper.php',
+        'Symfony\\Component\\Yaml\\Escaper' => __DIR__ . '/..' . '/symfony/yaml/Escaper.php',
+        'Symfony\\Component\\Yaml\\Exception\\DumpException' => __DIR__ . '/..' . '/symfony/yaml/Exception/DumpException.php',
+        'Symfony\\Component\\Yaml\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/yaml/Exception/ExceptionInterface.php',
+        'Symfony\\Component\\Yaml\\Exception\\ParseException' => __DIR__ . '/..' . '/symfony/yaml/Exception/ParseException.php',
+        'Symfony\\Component\\Yaml\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/yaml/Exception/RuntimeException.php',
+        'Symfony\\Component\\Yaml\\Inline' => __DIR__ . '/..' . '/symfony/yaml/Inline.php',
+        'Symfony\\Component\\Yaml\\Parser' => __DIR__ . '/..' . '/symfony/yaml/Parser.php',
+        'Symfony\\Component\\Yaml\\Unescaper' => __DIR__ . '/..' . '/symfony/yaml/Unescaper.php',
+        'Symfony\\Component\\Yaml\\Yaml' => __DIR__ . '/..' . '/symfony/yaml/Yaml.php',
+        'Symfony\\Polyfill\\Php55\\Php55' => __DIR__ . '/..' . '/symfony/polyfill-php55/Php55.php',
+        'Symfony\\Polyfill\\Php55\\Php55ArrayColumn' => __DIR__ . '/..' . '/symfony/polyfill-php55/Php55ArrayColumn.php',
+        'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
+        'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php',
+        'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
+        'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
+        'Symfony\\Polyfill\\Util\\TestListener' => __DIR__ . '/..' . '/symfony/polyfill-util/TestListener.php',
         'lessc' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
         'lessc_formatter_classic' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
         'lessc_formatter_compressed' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json
index 3f400159e3487..935af0d6c9e1c 100644
--- a/libraries/vendor/composer/installed.json
+++ b/libraries/vendor/composer/installed.json
@@ -1293,5 +1293,88 @@
             "framework",
             "joomla"
         ]
+    },
+    {
+        "name": "paragonie/sodium_compat",
+        "version": "v1.0.1",
+        "version_normalized": "1.0.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/paragonie/sodium_compat.git",
+            "reference": "3c6b3b7ffd256df19c39b0f4aa0bb28badd08aaa"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/3c6b3b7ffd256df19c39b0f4aa0bb28badd08aaa",
+            "reference": "3c6b3b7ffd256df19c39b0f4aa0bb28badd08aaa",
+            "shasum": ""
+        },
+        "require": {
+            "paragonie/random_compat": "^1|^2",
+            "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^3|^4|^5"
+        },
+        "suggest": {
+            "ext-libsodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+        },
+        "time": "2017-06-09T22:35:18+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "autoload.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "ISC"
+        ],
+        "authors": [
+            {
+                "name": "Paragon Initiative Enterprises",
+                "email": "security@paragonie.com"
+            },
+            {
+                "name": "Frank Denis",
+                "email": "jedisct1@pureftpd.org"
+            }
+        ],
+        "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+        "keywords": [
+            "Authentication",
+            "BLAKE2b",
+            "ChaCha20",
+            "ChaCha20-Poly1305",
+            "Chapoly",
+            "Curve25519",
+            "Ed25519",
+            "EdDSA",
+            "Edwards-curve Digital Signature Algorithm",
+            "Elliptic Curve Diffie-Hellman",
+            "Poly1305",
+            "Pure-PHP cryptography",
+            "RFC 7748",
+            "RFC 8032",
+            "Salpoly",
+            "Salsa20",
+            "X25519",
+            "XChaCha20-Poly1305",
+            "XSalsa20-Poly1305",
+            "Xchacha20",
+            "Xsalsa20",
+            "aead",
+            "cryptography",
+            "ecdh",
+            "elliptic curve",
+            "elliptic curve cryptography",
+            "encryption",
+            "libsodium",
+            "php",
+            "public-key cryptography",
+            "secret-key cryptography",
+            "side-channel resistant"
+        ]
     }
 ]
diff --git a/libraries/vendor/paragonie/sodium_compat/LICENSE b/libraries/vendor/paragonie/sodium_compat/LICENSE
new file mode 100644
index 0000000000000..b97a56059df9c
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/LICENSE
@@ -0,0 +1,21 @@
+/*
+ * ISC License
+ *
+ * Copyright (c) 2016-2017
+ * Paragon Initiative Enterprises <security at paragonie dot com>
+ *
+ * Copyright (c) 2013-2017
+ * Frank Denis <j at pureftpd dot org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
\ No newline at end of file
diff --git a/libraries/vendor/paragonie/sodium_compat/autoload-fast.php b/libraries/vendor/paragonie/sodium_compat/autoload-fast.php
new file mode 100644
index 0000000000000..08724d1eddd2c
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/autoload-fast.php
@@ -0,0 +1,4 @@
+<?php
+
+require_once 'autoload.php';
+ParagonIE_Sodium_Compat::$fastMult = true;
diff --git a/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php b/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php
new file mode 100644
index 0000000000000..e4646ca8c9c46
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php
@@ -0,0 +1,6 @@
+<?php
+
+require_once 'autoload.php';
+define('DO_PEDANTIC_TEST', true);
+
+ParagonIE_Sodium_Compat::$fastMult = true;
diff --git a/libraries/vendor/paragonie/sodium_compat/autoload.php b/libraries/vendor/paragonie/sodium_compat/autoload.php
new file mode 100644
index 0000000000000..d877f74663025
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/autoload.php
@@ -0,0 +1,48 @@
+<?php
+
+if (!is_callable('sodiumCompatAutoloader')) {
+    /**
+     * Sodium_Compat autoloader.
+     *
+     * @param string $class Class name to be autoloaded.
+     *
+     * @return bool         Stop autoloading?
+     */
+    function sodiumCompatAutoader($class)
+    {
+        $namespace = 'ParagonIE_Sodium_';
+        // Does the class use the namespace prefix?
+        $len = strlen($namespace);
+        if (strncmp($namespace, $class, $len) !== 0) {
+            // no, move to the next registered autoloader
+            return false;
+        }
+
+        // Get the relative class name
+        $relative_class = substr($class, $len);
+
+        // Replace the namespace prefix with the base directory, replace namespace
+        // separators with directory separators in the relative class name, append
+        // with .php
+        $file = __DIR__ . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+        // if the file exists, require it
+        if (file_exists($file)) {
+            require_once $file;
+            return true;
+        }
+        return false;
+    }
+
+    // Now that we have an autoloader, let's register it!
+    spl_autoload_register('sodiumCompatAutoader');
+}
+
+if (PHP_VERSION_ID >= 50300) {
+    // Namespaces didn't exist before 5.3.0, so don't even try to use this
+    // unless PHP >= 5.3.0
+    require_once dirname(__FILE__) . '/lib/namespaced.php';
+    require_once dirname(__FILE__) . '/lib/sodium_compat.php';
+}
+if (PHP_VERSION_ID < 70200) {
+    require_once dirname(__FILE__) . '/lib/php72compat.php';
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/lib/constants.php b/libraries/vendor/paragonie/sodium_compat/lib/constants.php
new file mode 100644
index 0000000000000..e60d0f01c1415
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/lib/constants.php
@@ -0,0 +1,45 @@
+<?php
+namespace Sodium;
+
+use ParagonIE_Sodium_Compat;
+
+const CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES;
+const CRYPTO_AUTH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_BYTES;
+const CRYPTO_AUTH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_KEYBYTES;
+const CRYPTO_BOX_SEALBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEALBYTES;
+const CRYPTO_BOX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES;
+const CRYPTO_BOX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES;
+const CRYPTO_BOX_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES;
+const CRYPTO_BOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_MACBYTES;
+const CRYPTO_BOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES;
+const CRYPTO_BOX_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEEDBYTES;
+const CRYPTO_KX_BYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_BYTES;
+const CRYPTO_KX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_PUBLICKEYBYTES;
+const CRYPTO_KX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_SECRETKEYBYTES;
+const CRYPTO_GENERICHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES;
+const CRYPTO_GENERICHASH_BYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN;
+const CRYPTO_GENERICHASH_BYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX;
+const CRYPTO_GENERICHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES;
+const CRYPTO_GENERICHASH_KEYBYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN;
+const CRYPTO_GENERICHASH_KEYBYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX;
+const CRYPTO_SCALARMULT_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_BYTES;
+const CRYPTO_SCALARMULT_SCALARBYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_SCALARBYTES;
+const CRYPTO_SHORTHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_BYTES;
+const CRYPTO_SHORTHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_KEYBYTES;
+const CRYPTO_SECRETBOX_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES;
+const CRYPTO_SECRETBOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES;
+const CRYPTO_SECRETBOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES;
+const CRYPTO_SIGN_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES;
+const CRYPTO_SIGN_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SEEDBYTES;
+const CRYPTO_SIGN_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES;
+const CRYPTO_SIGN_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES;
+const CRYPTO_SIGN_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_KEYPAIRBYTES;
+const CRYPTO_STREAM_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_KEYBYTES;
+const CRYPTO_STREAM_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_NONCEBYTES;
diff --git a/libraries/vendor/paragonie/sodium_compat/lib/namespaced.php b/libraries/vendor/paragonie/sodium_compat/lib/namespaced.php
new file mode 100644
index 0000000000000..58f20418b6023
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/lib/namespaced.php
@@ -0,0 +1,46 @@
+<?php
+
+if (PHP_VERSION_ID < 50300) {
+    return;
+}
+
+/*
+ * This file is just for convenience, to allow developers to reduce verbosity when
+ * they add this project to their libraries.
+ *
+ * Replace this:
+ *
+ * $x = ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_encrypt(...$args);
+ *
+ * with this:
+ *
+ * use ParagonIE\Sodium\Compat;
+ *
+ * $x = Compat::crypto_aead_xchacha20poly1305_encrypt(...$args);
+ */
+spl_autoload_register(function ($class) {
+    if ($class[0] === '\\') {
+        $class = substr($class, 1);
+    }
+    $namespace = 'ParagonIE\\Sodium';
+    // Does the class use the namespace prefix?
+    $len = strlen($namespace);
+    if (strncmp($namespace, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return false;
+    }
+
+    // Get the relative class name
+    $relative_class = substr($class, $len);
+
+    // Replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = dirname(__DIR__) . '/namespaced/' . str_replace('\\', '/', $relative_class) . '.php';
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require_once $file;
+        return true;
+    }
+    return false;
+});
diff --git a/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php b/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php
new file mode 100644
index 0000000000000..b594752de2916
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php
@@ -0,0 +1,541 @@
+<?php
+
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES;
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES;
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES;
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES;
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES;
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES;
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES;
+const SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES;
+const SODIUM_CRYPTO_AUTH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_BYTES;
+const SODIUM_CRYPTO_AUTH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_KEYBYTES;
+const SODIUM_CRYPTO_BOX_SEALBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEALBYTES;
+const SODIUM_CRYPTO_BOX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES;
+const SODIUM_CRYPTO_BOX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES;
+const SODIUM_CRYPTO_BOX_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES;
+const SODIUM_CRYPTO_BOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_MACBYTES;
+const SODIUM_CRYPTO_BOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES;
+const SODIUM_CRYPTO_BOX_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEEDBYTES;
+const SODIUM_CRYPTO_KX_BYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_BYTES;
+const SODIUM_CRYPTO_KX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_PUBLICKEYBYTES;
+const SODIUM_CRYPTO_KX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_SECRETKEYBYTES;
+const SODIUM_CRYPTO_GENERICHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES;
+const SODIUM_CRYPTO_GENERICHASH_BYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN;
+const SODIUM_CRYPTO_GENERICHASH_BYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX;
+const SODIUM_CRYPTO_GENERICHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES;
+const SODIUM_CRYPTO_GENERICHASH_KEYBYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN;
+const SODIUM_CRYPTO_GENERICHASH_KEYBYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX;
+const SODIUM_CRYPTO_SCALARMULT_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_BYTES;
+const SODIUM_CRYPTO_SCALARMULT_SCALARBYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_SCALARBYTES;
+const SODIUM_CRYPTO_SHORTHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_BYTES;
+const SODIUM_CRYPTO_SHORTHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_KEYBYTES;
+const SODIUM_CRYPTO_SECRETBOX_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES;
+const SODIUM_CRYPTO_SECRETBOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES;
+const SODIUM_CRYPTO_SECRETBOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES;
+const SODIUM_CRYPTO_SIGN_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES;
+const SODIUM_CRYPTO_SIGN_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SEEDBYTES;
+const SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES;
+const SODIUM_CRYPTO_SIGN_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES;
+const SODIUM_CRYPTO_SIGN_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_KEYPAIRBYTES;
+const SODIUM_CRYPTO_STREAM_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_KEYBYTES;
+const SODIUM_CRYPTO_STREAM_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_NONCEBYTES;
+
+/**
+ * This file will monkey patch the pure-PHP implementation in place of the
+ * PECL functions, but only if they do not already exist.
+ *
+ * Thus, the functions just proxy to the appropriate ParagonIE_Sodium_Compat
+ * method.
+ */
+if (!is_callable('sodium_bin2hex')) {
+    /**
+     * @param string $string
+     * @return string
+     */
+    function sodium_bin2hex($string)
+    {
+        return ParagonIE_Sodium_Compat::bin2hex($string);
+    }
+}
+if (!is_callable('sodium_compare')) {
+    /**
+     * @param string $a
+     * @param string $b
+     * @return int
+     */
+    function sodium_compare($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::compare($a, $b);
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_decrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_auth')) {
+    /**
+     * @param string $message
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_auth($message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+    }
+}
+if (!is_callable('sodium_crypto_auth_verify')) {
+    /**
+     * @param string $mac
+     * @param string $message
+     * @param string $key
+     * @return bool
+     */
+    function sodium_crypto_auth_verify($mac, $message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+    }
+}
+if (!is_callable('sodium_crypto_box')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string
+     */
+    function sodium_crypto_box($message, $nonce, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+    }
+}
+if (!is_callable('sodium_crypto_box_keypair')) {
+    /**
+     * @return string
+     */
+    function sodium_crypto_box_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair();
+    }
+}
+if (!is_callable('sodium_crypto_box_keypair_from_secretkey_and_publickey')) {
+    /**
+     * @param string $sk
+     * @param string $pk
+     * @return string
+     */
+    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+    }
+}
+if (!is_callable('sodium_crypto_box_open')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string
+     */
+    function sodium_crypto_box_open($message, $nonce, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+    }
+}
+if (!is_callable('sodium_crypto_box_publickey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function sodium_crypto_box_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_box_publickey_from_secretkey')) {
+    /**
+     * @param string $sk
+     * @return string
+     */
+    function sodium_crypto_box_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('sodium_crypto_box_seal')) {
+    /**
+     * @param string $message
+     * @param string $publicKey
+     * @return string
+     */
+    function sodium_crypto_box_seal($message, $publicKey)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+    }
+}
+if (!is_callable('sodium_crypto_box_seal_open')) {
+    /**
+     * @param string $message
+     * @param string $kp
+     * @return string
+     */
+    function sodium_crypto_box_seal_open($message, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+    }
+}
+if (!is_callable('sodium_crypto_box_secretkey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function sodium_crypto_box_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_generichash')) {
+    /**
+     * @param string $message
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     */
+    function sodium_crypto_generichash($message, $key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+    }
+}
+if (!is_callable('sodium_crypto_generichash_final')) {
+    /**
+     * @param string|null $ctx
+     * @param int $outputLength
+     * @return string
+     */
+    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+    }
+}
+if (!is_callable('sodium_crypto_generichash_init')) {
+    /**
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     */
+    function sodium_crypto_generichash_init($key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+    }
+}
+if (!is_callable('sodium_crypto_generichash_update')) {
+    /**
+     * @param string|null $ctx
+     * @param string $message
+     * @return void
+     */
+    function sodium_crypto_generichash_update(&$ctx, $message = '')
+    {
+        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+    }
+}
+if (!is_callable('sodium_crypto_kx')) {
+    /**
+     * @param string $my_secret
+     * @param string $their_public
+     * @param string $client_public
+     * @param string $server_public
+     * @return string
+     */
+    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    {
+        return ParagonIE_Sodium_Compat::crypto_kx(
+            $my_secret,
+            $their_public,
+            $client_public,
+            $server_public
+        );
+    }
+}
+if (!is_callable('sodium_crypto_scalarmult')) {
+    /**
+     * @param string $n
+     * @param string $p
+     * @return string
+     */
+    function sodium_crypto_scalarmult($n, $p)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+    }
+}
+if (!is_callable('sodium_crypto_scalarmult_base')) {
+    /**
+     * @param string $n
+     * @return string
+     */
+    function sodium_crypto_scalarmult_base($n)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+    }
+}
+if (!is_callable('sodium_crypto_secretbox')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_secretbox($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_secretbox_open')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_secretbox_open($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_shorthash')) {
+    /**
+     * @param string $message
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_shorthash($message, $key = '')
+    {
+        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+    }
+}
+if (!is_callable('sodium_crypto_sign')) {
+    /**
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    function sodium_crypto_sign($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_detached')) {
+    /**
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    function sodium_crypto_sign_detached($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_keypair')) {
+    /**
+     * @return string
+     */
+    function sodium_crypto_sign_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+    }
+}
+if (!is_callable('sodium_crypto_sign_open')) {
+    /**
+     * @param string $signedMessage
+     * @param string $pk
+     * @return string
+     */
+    function sodium_crypto_sign_open($signedMessage, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_publickey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function sodium_crypto_sign_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_sign_publickey_from_secretkey')) {
+    /**
+     * @param string $sk
+     * @return string
+     */
+    function sodium_crypto_sign_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_secretkey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function sodium_crypto_sign_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_sign_seed_keypair')) {
+    /**
+     * @param string $seed
+     * @return string
+     */
+    function sodium_crypto_sign_seed_keypair($seed)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+    }
+}
+if (!is_callable('sodium_crypto_sign_verify_detached')) {
+    /**
+     * @param string $signature
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     */
+    function sodium_crypto_sign_verify_detached($signature, $message, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+    }
+}
+if (!is_callable('sodium_crypto_stream')) {
+    /**
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_stream($len, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_stream_xor')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_stream_xor($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_hex2bin')) {
+    /**
+     * @param string $string
+     * @return string
+     */
+    function sodium_hex2bin($string)
+    {
+        return ParagonIE_Sodium_Compat::hex2bin($string);
+    }
+}
+if (!is_callable('sodium_memcmp')) {
+    /**
+     * @param string $a
+     * @param string $b
+     * @return int
+     */
+    function sodium_memcmp($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::memcmp($a, $b);
+    }
+}
+if (!is_callable('sodium_memzero')) {
+    /**
+     * @param string &$str
+     * @return void
+     */
+    function sodium_memzero(&$str)
+    {
+        ParagonIE_Sodium_Compat::memzero($str);
+    }
+}
+if (!is_callable('sodium_randombytes_buf')) {
+    /**
+     * @param int $amount
+     * @return string
+     */
+    function sodium_randombytes_buf($amount)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+    }
+}
+
+if (!is_callable('sodium_randombytes_uniform')) {
+    /**
+     * @param int $upperLimit
+     * @return int
+     */
+    function sodium_randombytes_uniform($upperLimit)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+    }
+}
+
+if (!is_callable('sodium_randombytes_random16')) {
+    /**
+     * @return int
+     */
+    function sodium_randombytes_random16()
+    {
+        return ParagonIE_Sodium_Compat::randombytes_random16();
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php b/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php
new file mode 100644
index 0000000000000..8da9822f3af51
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php
@@ -0,0 +1,507 @@
+<?php
+namespace Sodium;
+
+use ParagonIE_Sodium_Compat;
+
+/**
+ * This file will monkey patch the pure-PHP implementation in place of the
+ * PECL functions, but only if they do not already exist.
+ *
+ * Thus, the functions just proxy to the appropriate ParagonIE_Sodium_Compat
+ * method.
+ */
+if (!is_callable('\\Sodium\\bin2hex')) {
+    /**
+     * @param string $string
+     * @return string
+     */
+    function bin2hex($string)
+    {
+        return ParagonIE_Sodium_Compat::bin2hex($string);
+    }
+}
+if (!is_callable('\\Sodium\\compare')) {
+    /**
+     * @param string $a
+     * @param string $b
+     * @return int
+     */
+    function compare($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::compare($a, $b);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_decrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_encrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt')) {
+    /**
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_auth')) {
+    /**
+     * @param string $message
+     * @param string $key
+     * @return string
+     */
+    function crypto_auth($message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_auth_verify')) {
+    /**
+     * @param string $mac
+     * @param string $message
+     * @param string $key
+     * @return bool
+     */
+    function crypto_auth_verify($mac, $message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string
+     */
+    function crypto_box($message, $nonce, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_keypair')) {
+    /**
+     * @return string
+     */
+    function crypto_box_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair();
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey')) {
+    /**
+     * @param string $sk
+     * @param string $pk
+     * @return string
+     */
+    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_open')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string
+     */
+    function crypto_box_open($message, $nonce, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_publickey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function crypto_box_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_publickey_from_secretkey')) {
+    /**
+     * @param string $sk
+     * @return string
+     */
+    function crypto_box_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_seal')) {
+    /**
+     * @param string $message
+     * @param string $publicKey
+     * @return string
+     */
+    function crypto_box_seal($message, $publicKey)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_seal_open')) {
+    /**
+     * @param string $message
+     * @param string $kp
+     * @return string
+     */
+    function crypto_box_seal_open($message, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_secretkey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function crypto_box_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash')) {
+    /**
+     * @param string $message
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     */
+    function crypto_generichash($message, $key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash_final')) {
+    /**
+     * @param string|null $ctx
+     * @param int $outputLength
+     * @return string
+     */
+    function crypto_generichash_final(&$ctx, $outputLength = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash_init')) {
+    /**
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     */
+    function crypto_generichash_init($key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash_update')) {
+    /**
+     * @param string|null $ctx
+     * @param string $message
+     * @return void
+     */
+    function crypto_generichash_update(&$ctx, $message = '')
+    {
+        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_kx')) {
+    /**
+     * @param string $my_secret
+     * @param string $their_public
+     * @param string $client_public
+     * @param string $server_public
+     * @return string
+     */
+    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    {
+        return ParagonIE_Sodium_Compat::crypto_kx(
+            $my_secret,
+            $their_public,
+            $client_public,
+            $server_public
+        );
+    }
+}
+if (!is_callable('\\Sodium\\crypto_scalarmult')) {
+    /**
+     * @param string $n
+     * @param string $p
+     * @return string
+     */
+    function crypto_scalarmult($n, $p)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_scalarmult_base')) {
+    /**
+     * @param string $n
+     * @return string
+     */
+    function crypto_scalarmult_base($n)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_secretbox')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_secretbox($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_secretbox_open')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_secretbox_open($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_shorthash')) {
+    /**
+     * @param string $message
+     * @param string $key
+     * @return string
+     */
+    function crypto_shorthash($message, $key = '')
+    {
+        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign')) {
+    /**
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    function crypto_sign($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_detached')) {
+    /**
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    function crypto_sign_detached($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_keypair')) {
+    /**
+     * @return string
+     */
+    function crypto_sign_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_open')) {
+    /**
+     * @param string $signedMessage
+     * @param string $pk
+     * @return string
+     */
+    function crypto_sign_open($signedMessage, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_publickey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function crypto_sign_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_publickey_from_secretkey')) {
+    /**
+     * @param string $sk
+     * @return string
+     */
+    function crypto_sign_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_secretkey')) {
+    /**
+     * @param string $keypair
+     * @return string
+     */
+    function crypto_sign_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_seed_keypair')) {
+    /**
+     * @param string $seed
+     * @return string
+     */
+    function crypto_sign_seed_keypair($seed)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_verify_detached')) {
+    /**
+     * @param string $signature
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     */
+    function crypto_sign_verify_detached($signature, $message, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_stream')) {
+    /**
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_stream($len, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_stream_xor')) {
+    /**
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function crypto_stream_xor($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\hex2bin')) {
+    /**
+     * @param string $string
+     * @return string
+     */
+    function hex2bin($string)
+    {
+        return ParagonIE_Sodium_Compat::hex2bin($string);
+    }
+}
+if (!is_callable('\\Sodium\\memcmp')) {
+    /**
+     * @param string $a
+     * @param string $b
+     * @return int
+     */
+    function memcmp($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::memcmp($a, $b);
+    }
+}
+if (!is_callable('\\Sodium\\memzero')) {
+    /**
+     * @param string $str
+     * @return void
+     */
+    function memzero(&$str)
+    {
+        ParagonIE_Sodium_Compat::memzero($str);
+    }
+}
+if (!is_callable('\\Sodium\\randombytes_buf')) {
+    /**
+     * @param int $amount
+     * @return string
+     */
+    function randombytes_buf($amount)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+    }
+}
+
+if (!is_callable('\\Sodium\\randombytes_uniform')) {
+    /**
+     * @param int $upperLimit
+     * @return int
+     */
+    function randombytes_uniform($upperLimit)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+    }
+}
+
+if (!is_callable('\\Sodium\\randombytes_random16')) {
+    /**
+     * @return int
+     */
+    function randombytes_random16()
+    {
+        return ParagonIE_Sodium_Compat::randombytes_random16();
+    }
+}
+
+if (!defined('\\Sodium\\CRYPTO_AUTH_BYTES')) {
+    require_once dirname(__FILE__) . '/constants.php';
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php
new file mode 100644
index 0000000000000..c40f7fb4ff006
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium;
+
+class Compat extends \ParagonIE_Sodium_Compat
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php
new file mode 100644
index 0000000000000..f152c5ad9da1a
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class BLAKE2b extends \ParagonIE_Sodium_Core_BLAKE2b
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php
new file mode 100644
index 0000000000000..08936b5f2338b
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class ChaCha20 extends \ParagonIE_Sodium_Core_ChaCha20
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php
new file mode 100644
index 0000000000000..ea07a26a1fa20
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\ChaCha20;
+
+class Ctx extends \ParagonIE_Sodium_Core_ChaCha20_Ctx
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php
new file mode 100644
index 0000000000000..c0b2de8d67c78
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\ChaCha20;
+
+class IetfCtx extends \ParagonIE_Sodium_Core_ChaCha20_IetfCtx
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php
new file mode 100644
index 0000000000000..d4a7ce1ee5ad3
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Curve25519 extends \ParagonIE_Sodium_Core_Curve25519
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php
new file mode 100644
index 0000000000000..7129065a15f05
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519;
+
+class Fe extends \ParagonIE_Sodium_Core_Curve25519_Fe
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php
new file mode 100644
index 0000000000000..269d6a77fbfa6
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class Cached extends \ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php
new file mode 100644
index 0000000000000..0b700461a4f4d
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class P1p1 extends \ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php
new file mode 100644
index 0000000000000..e0c76c6d072d6
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class P2 extends \ParagonIE_Sodium_Core_Curve25519_Ge_P2
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php
new file mode 100644
index 0000000000000..1a9cad7fb831a
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class P3 extends \ParagonIE_Sodium_Core_Curve25519_Ge_P3
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php
new file mode 100644
index 0000000000000..07e509a81eae3
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class Precomp extends \ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php
new file mode 100644
index 0000000000000..5ba7fd84edd39
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519;
+
+class H extends \ParagonIE_Sodium_Core_Curve25519_H
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php
new file mode 100644
index 0000000000000..13939883e3bf7
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Ed25519 extends \ParagonIE_Sodium_Core_Ed25519
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php
new file mode 100644
index 0000000000000..d96dc14ec33d0
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class HChaCha20 extends \ParagonIE_Sodium_Core_HChaCha20
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php
new file mode 100644
index 0000000000000..e526b99f31ede
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class HSalsa20 extends \ParagonIE_Sodium_Core_HSalsa20
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php
new file mode 100644
index 0000000000000..acfc6d09e1fb6
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Poly1305 extends \ParagonIE_Sodium_Core_Poly1305
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php
new file mode 100644
index 0000000000000..a0648e76a1b23
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Poly1305;
+
+class State extends \ParagonIE_Sodium_Core_Poly1305_State
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php
new file mode 100644
index 0000000000000..ac83f73967324
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class SipHash extends \ParagonIE_Sodium_Core_Salsa20
+{
+
+}
\ No newline at end of file
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php
new file mode 100644
index 0000000000000..4570904a3d0f3
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class SipHash extends \ParagonIE_Sodium_Core_SipHash
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php
new file mode 100644
index 0000000000000..6086a361b4ccc
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Util extends \ParagonIE_Sodium_Core_Util
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php
new file mode 100644
index 0000000000000..f17a2cf0a0ae4
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class X25519 extends \ParagonIE_Sodium_Core_X25519
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php
new file mode 100644
index 0000000000000..51b5535aac62c
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class XChaCha20 extends \ParagonIE_Sodium_Core_XChaCha20
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php
new file mode 100644
index 0000000000000..5338d52c153f6
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Xsalsa20 extends \ParagonIE_Sodium_Core_Xsalsa20
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php b/libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php
new file mode 100644
index 0000000000000..78f092d90b2a0
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium;
+
+class Crypto extends \ParagonIE_Sodium_Crypto
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/namespaced/File.php b/libraries/vendor/paragonie/sodium_compat/namespaced/File.php
new file mode 100644
index 0000000000000..6b40459d45449
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/namespaced/File.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium;
+
+class File extends \ParagonIE_Sodium_File
+{
+
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Compat.php b/libraries/vendor/paragonie/sodium_compat/src/Compat.php
new file mode 100644
index 0000000000000..9fb79a982b5d1
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Compat.php
@@ -0,0 +1,2056 @@
+<?php
+
+/**
+ * Libsodium compatibility layer
+ *
+ * This is the only class you should be interfacing with, as a user of
+ * sodium_compat.
+ *
+ * If the PHP extension for libsodium is installed, it will always use that
+ * instead of our implementations. You get better performance and stronger
+ * guarantees against side-channels that way.
+ *
+ * However, if your users don't have the PHP extension installed, we offer a
+ * compatible interface here. It will give you the correct results as if the
+ * PHP extension was installed. It won't be as fast, of course.
+ *
+ * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION *
+ *                                                                               *
+ *     Until audited, this is probably not safe to use! DANGER WILL ROBINSON     *
+ *                                                                               *
+ * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION *
+ */
+
+if (class_exists('ParagonIE_Sodium_Compat', false)) {
+    return;
+}
+
+class ParagonIE_Sodium_Compat
+{
+    /**
+     * This parameter prevents the use of the PECL extension.
+     * It should only be used for unit testing.
+     *
+     * @var bool
+     */
+    public static $disableFallbackForUnitTests = false;
+
+    /**
+     * Use fast multiplication rather than our constant-time multiplication
+     * implementation. Can be enabled at runtime. Only enable this if you
+     * are absolutely certain that there is no timing leak on your platform.
+     *
+     * @var bool
+     */
+    public static $fastMult = false;
+
+    const LIBRARY_VERSION_MAJOR = 9;
+    const LIBRARY_VERSION_MINOR = 1;
+    const VERSION_STRING = 'polyfill-1.0.8';
+
+    // From libsodium
+    const CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = 32;
+    const CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = 0;
+    const CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = 8;
+    const CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = 16;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = 32;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = 0;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = 12;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = 16;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES = 32;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NSECBYTES = 0;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES = 24;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES = 16;
+    const CRYPTO_AUTH_BYTES = 32;
+    const CRYPTO_AUTH_KEYBYTES = 32;
+    const CRYPTO_BOX_SEALBYTES = 16;
+    const CRYPTO_BOX_SECRETKEYBYTES = 32;
+    const CRYPTO_BOX_PUBLICKEYBYTES = 32;
+    const CRYPTO_BOX_KEYPAIRBYTES = 64;
+    const CRYPTO_BOX_MACBYTES = 16;
+    const CRYPTO_BOX_NONCEBYTES = 24;
+    const CRYPTO_BOX_SEEDBYTES = 32;
+    const CRYPTO_KX_BYTES = 32;
+    const CRYPTO_KX_PUBLICKEYBYTES = 32;
+    const CRYPTO_KX_SECRETKEYBYTES = 32;
+    const CRYPTO_GENERICHASH_BYTES = 32;
+    const CRYPTO_GENERICHASH_BYTES_MIN = 16;
+    const CRYPTO_GENERICHASH_BYTES_MAX = 64;
+    const CRYPTO_GENERICHASH_KEYBYTES = 32;
+    const CRYPTO_GENERICHASH_KEYBYTES_MIN = 16;
+    const CRYPTO_GENERICHASH_KEYBYTES_MAX = 64;
+    const CRYPTO_SCALARMULT_BYTES = 32;
+    const CRYPTO_SCALARMULT_SCALARBYTES = 32;
+    const CRYPTO_SHORTHASH_BYTES = 8;
+    const CRYPTO_SHORTHASH_KEYBYTES = 16;
+    const CRYPTO_SECRETBOX_KEYBYTES = 32;
+    const CRYPTO_SECRETBOX_MACBYTES = 16;
+    const CRYPTO_SECRETBOX_NONCEBYTES = 24;
+    const CRYPTO_SIGN_BYTES = 64;
+    const CRYPTO_SIGN_SEEDBYTES = 32;
+    const CRYPTO_SIGN_PUBLICKEYBYTES = 32;
+    const CRYPTO_SIGN_SECRETKEYBYTES = 64;
+    const CRYPTO_SIGN_KEYPAIRBYTES = 96;
+    const CRYPTO_STREAM_KEYBYTES = 32;
+    const CRYPTO_STREAM_NONCEBYTES = 24;
+
+    /**
+     * Cache-timing-safe implementation of bin2hex().
+     *
+     * @param string $string A string (probably raw binary)
+     * @return string        A hexadecimal-encoded string
+     * @throws TypeError
+     */
+    public static function bin2hex($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return bin2hex($string);
+        }
+        if (self::use_fallback('bin2hex')) {
+            return call_user_func('\\Sodium\\bin2hex', $string);
+        }
+        return ParagonIE_Sodium_Core_Util::bin2hex($string);
+    }
+
+    /**
+     * Compare two strings, in constant-time.
+     * Compared to memcmp(), compare() is more useful for sorting.
+     *
+     * @param string $left The left operand; must be a string
+     * @param string $right The right operand; must be a string
+     * @return int          < 0 if the left operand is less than the right
+     *                      0 if both strings are equal
+     *                      > 0 if the right operand is less than the left
+     * @throws TypeError
+     */
+    public static function compare($left, $right)
+    {
+        /* Type checks: */
+        if (!is_string($left)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
+        }
+        if (!is_string($right)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_compare($left, $right);
+        }
+        if (self::use_fallback('compare')) {
+            return call_user_func('\\Sodium\\compare', $left, $right);
+        }
+        return ParagonIE_Sodium_Core_Util::compare($left, $right);
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Decryption
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string            The original plaintext message
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_aead_chacha20poly1305_decrypt(
+        $ciphertext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        if (!is_string($ciphertext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ciphertext) . ' given.');
+        }
+        if (!is_string($assocData)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($assocData) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
+            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
+            throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_aead_chacha20poly1305_decrypt(
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_decrypt')) {
+            return call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_decrypt',
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_decrypt(
+            $ciphertext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $plaintext Message to be encrypted
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string           Ciphertext with a 16-byte Poly1305 message
+     *                          authentication code appended
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_aead_chacha20poly1305_encrypt(
+        $plaintext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        if (!is_string($plaintext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($plaintext) . ' given.');
+        }
+        if (!is_string($assocData)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($assocData) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
+            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_aead_chacha20poly1305_encrypt(
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_encrypt')) {
+            return call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_encrypt',
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_encrypt(
+            $plaintext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Decryption
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     * Regular mode uses a 64-bit random nonce with a 64-bit counter.
+     *
+     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 12 bytes
+     * @param string $key Encryption key
+     *
+     * @return string            The original plaintext message
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_aead_chacha20poly1305_ietf_decrypt(
+        $ciphertext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        if (!is_string($ciphertext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ciphertext) . ' given.');
+        }
+        if (!is_string($assocData)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($assocData) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
+            throw new Error('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_decrypt')) {
+            return call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt',
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_decrypt(
+            $ciphertext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     * Regular mode uses a 64-bit random nonce with a 64-bit counter.
+     *
+     * @param string $plaintext Message to be encrypted
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string           Ciphertext with a 16-byte Poly1305 message
+     *                          authentication code appended
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_aead_chacha20poly1305_ietf_encrypt(
+        $plaintext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        if (!is_string($plaintext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($plaintext) . ' given.');
+        }
+        if (!is_string($assocData)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($assocData) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new Error('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new Error('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_encrypt')) {
+            return call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt',
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_encrypt(
+            $plaintext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Decryption
+     *
+     * Algorithm:
+     *     XChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string            The original plaintext message
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_aead_xchacha20poly1305_ietf_decrypt(
+        $ciphertext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        if (!is_string($ciphertext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ciphertext) . ' given.');
+        }
+        if (!is_string($assocData)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($assocData) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
+            throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES) {
+            throw new Error('Message must be at least CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES long');
+        }
+
+        return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_decrypt(
+            $ciphertext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data
+     *
+     * Algorithm:
+     *     XChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $plaintext Message to be encrypted
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string           Ciphertext with a 16-byte Poly1305 message
+     *                          authentication code appended
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_aead_xchacha20poly1305_ietf_encrypt(
+        $plaintext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        if (!is_string($plaintext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($plaintext) . ' given.');
+        }
+        if (!is_string($assocData)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($assocData) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new Error('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
+            throw new Error('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_KEYBYTES long');
+        }
+
+        return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_encrypt(
+            $plaintext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticate a message. Uses symmetric-key cryptography.
+     *
+     * Algorithm:
+     *     HMAC-SHA512-256. Which is HMAC-SHA-512 truncated to 256 bits.
+     *     Not to be confused with HMAC-SHA-512/256 which would use the
+     *     SHA-512/256 hash function (uses different initial parameters
+     *     but still truncates to 256 bits to sidestep length-extension
+     *     attacks).
+     *
+     * @param string $message Message to be authenticated
+     * @param string $key Symmetric authentication key
+     * @return string         Message authentication code
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_auth($message, $key)
+    {
+        /* Type checks: */
+        if (!is_string($message)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_AUTH_KEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_auth($message, $key);
+        }
+        if (self::use_fallback('crypto_auth')) {
+            return call_user_func('\\Sodium\\crypto_auth', $message, $key);
+        }
+        return ParagonIE_Sodium_Crypto::auth($message, $key);
+    }
+
+    /**
+     * Verify the MAC of a message previously authenticated with crypto_auth.
+     *
+     * @param string $mac Message authentication code
+     * @param string $message Message whose authenticity you are attempting to
+     *                        verify (with a given MAC and key)
+     * @param string $key Symmetric authentication key
+     * @return bool           TRUE if authenticated, FALSE otherwise
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_auth_verify($mac, $message, $key)
+    {
+        /* Type checks: */
+        if (!is_string($mac)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($mac) . ' given.');
+        }
+        if (!is_string($message)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($mac) !== self::CRYPTO_AUTH_BYTES) {
+            throw new Error('Argument 1 must be CRYPTO_AUTH_BYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_AUTH_KEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_auth_verify($mac, $message, $key);
+        }
+        if (self::use_fallback('crypto_auth_verify')) {
+            return call_user_func('\\Sodium\\crypto_auth_verify', $mac, $message, $key);
+        }
+        return ParagonIE_Sodium_Crypto::auth_verify($mac, $message, $key);
+    }
+
+    /**
+     * Authenticated asymmetric-key encryption. Both the sender and recipient
+     * may decrypt messages.
+     *
+     * Algorithm: X25519-Xsalsa20-Poly1305.
+     *     X25519: Elliptic-Curve Diffie Hellman over Curve25519.
+     *     Xsalsa20: Extended-nonce variant of salsa20.
+     *     Poyl1305: Polynomial MAC for one-time message authentication.
+     *
+     * @param string $plaintext The message to be encrypted
+     * @param string $nonce A Number to only be used Once; must be 24 bytes
+     * @param string $keypair Your secret key and your recipient's public key
+     * @return string           Ciphertext with 16-byte Poly1305 MAC
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box($plaintext, $nonce, $keypair)
+    {
+        /* Type checks: */
+        if (!is_string($plaintext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($plaintext) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box($plaintext, $nonce, $keypair);
+        }
+        if (self::use_fallback('crypto_box')) {
+            return call_user_func('\\Sodium\\crypto_box', $plaintext, $nonce, $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box($plaintext, $nonce, $keypair);
+    }
+
+    /**
+     * Anonymous public-key encryption. Only the recipient may decrypt messages.
+     *
+     * Algorithm: X25519-Xsalsa20-Poly1305, as with crypto_box.
+     *     The sender's X25519 keypair is ephemeral.
+     *     Nonce is generated from the BLAKE2b hash of both public keys.
+     *
+     * This provides ciphertext integrity.
+     *
+     * @param string $plaintext Message to be sealed
+     * @param string $publicKey Your recipient's public key
+     * @return string           Sealed message that only your recipient can
+     *                          decrypt
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box_seal($plaintext, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($plaintext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($plaintext) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_seal($plaintext, $publicKey);
+        }
+        if (self::use_fallback('crypto_box_seal')) {
+            return call_user_func('\\Sodium\\crypto_box_seal', $plaintext, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::box_seal($plaintext, $publicKey);
+    }
+
+    /**
+     * Opens a message encrypted with crypto_box_seal(). Requires
+     * the recipient's keypair (sk || pk) to decrypt successfully.
+     *
+     * This validates ciphertext integrity.
+     *
+     * @param string $ciphertext Sealed message to be opened
+     * @param string $keypair Your crypto_box keypair
+     * @return string            The original plaintext message
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box_seal_open($ciphertext, $keypair)
+    {
+        /* Type checks: */
+        if (!is_string($ciphertext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ciphertext) . ' given.');
+        }
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_seal_open($ciphertext, $keypair);
+        }
+        if (self::use_fallback('crypto_box_seal_open')) {
+            return call_user_func('\\Sodium\\crypto_box_seal_open', $ciphertext, $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_seal_open($ciphertext, $keypair);
+    }
+
+    /**
+     * Generate a new random X25519 keypair.
+     *
+     * @return string A 64-byte string; the first 32 are your secret key, while
+     *                the last 32 are your public key. crypto_box_secretkey()
+     *                and crypto_box_publickey() exist to separate them so you
+     *                don't accidentally get them mixed up!
+     */
+    public static function crypto_box_keypair()
+    {
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_keypair();
+        }
+        if (self::use_fallback('crypto_sign_keypair')) {
+            return call_user_func('\\Sodium\\crypto_box_keypair');
+        }
+        return ParagonIE_Sodium_Crypto::box_keypair();
+    }
+
+    /**
+     * Combine two keys into a keypair for use in library methods that expect
+     * a keypair. This doesn't necessarily have to be the same person's keys.
+     *
+     * @param string $secretKey Secret key
+     * @param string $publicKey Public key
+     * @return string    Keypair
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+        }
+        if (self::use_fallback('box_keypair_from_secretkey_and_publickey')) {
+            return call_user_func('\\Sodium\\box_keypair_from_secretkey_and_publickey', $secretKey, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+    }
+
+    /**
+     * Decrypt a message previously encrypted with crypto_box().
+     *
+     * @param string $ciphertext Encrypted message
+     * @param string $nonce      Number to only be used Once; must be 24 bytes
+     * @param string $keypair    Your secret key and the sender's public key
+     * @return string            The original plaintext message
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box_open($ciphertext, $nonce, $keypair)
+    {
+        /* Type checks: */
+        if (!is_string($ciphertext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ciphertext) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_BOX_MACBYTES) {
+            throw new Error('Argument 1 must be at least CRYPTO_BOX_MACBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_open($ciphertext, $nonce, $keypair);
+        }
+        if (self::use_fallback('crypto_box_open')) {
+            return call_user_func('\\Sodium\\crypto_box_open', $ciphertext, $nonce, $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_open($ciphertext, $nonce, $keypair);
+    }
+
+    /**
+     * Extract the public key from a crypto_box keypair.
+     *
+     * @param string $keypair
+     * @return string         Your crypto_box public key
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box_publickey($keypair)
+    {
+        /* Type checks: */
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($keypair) . ' given.');
+        }
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_publickey($keypair);
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::use_fallback('crypto_box_publickey')) {
+            return call_user_func('\\Sodium\\crypto_box_publickey', $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_publickey($keypair);
+    }
+
+    /**
+     * Calculate the X25519 public key from a given X25519 secret key.
+     *
+     * @param string $secretKey Any X25519 secret key
+     * @return string      The corresponding X25519 public key
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box_publickey_from_secretkey($secretKey)
+    {
+        /* Type checks: */
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_publickey_from_secretkey($secretKey);
+        }
+        if (self::use_fallback('crypto_box_publickey_from_secretkey')) {
+            return call_user_func('\\Sodium\\crypto_box_publickey_from_secretkey', $secretKey);
+        }
+        return ParagonIE_Sodium_Crypto::box_publickey_from_secretkey($secretKey);
+    }
+
+    /**
+     * Extract the secret key from a crypto_box keypair.
+     *
+     * @param string $keypair
+     * @return string         Your crypto_box secret key
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_box_secretkey($keypair)
+    {
+        /* Type checks: */
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_box_secretkey($keypair);
+        }
+        if (self::use_fallback('crypto_box_secretkey')) {
+            return call_user_func('\\Sodium\\crypto_box_secretkey', $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_secretkey($keypair);
+    }
+
+    /**
+     * Calculates a BLAKE2b hash, with an optional key.
+     *
+     * @param string $message The message to be hashed
+     * @param string $key If specified, must be a string between 16 and 64
+     *                        bytes long
+     * @param int $length Output length in bytes; must be between 16 and 64
+     *                        (default = 32)
+     * @return string         Raw binary
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+    {
+        /* Type checks: */
+        if (!is_string($message)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($key)) {
+            if ($key === null) {
+                $key = '';
+            } else {
+                throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+            }
+        }
+        if (!is_int($length)) {
+            if (is_numeric($length)) {
+                $length = (int) $length;
+            } else {
+                throw new TypeError('Argument 3 must be an integer, ' . gettype($length) . ' given.');
+            }
+        }
+
+        /* Input validation: */
+        if (!empty($key)) {
+            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+                throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+            }
+            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+                throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+            }
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_generichash($message, $key, $length);
+        }
+        if (self::use_fallback('crypto_generichash')) {
+            return call_user_func('\\Sodium\\crypto_generichash', $message, $key, $length);
+        }
+        return ParagonIE_Sodium_Crypto::generichash($message, $key, $length);
+    }
+
+    /**
+     * Get the final BLAKE2b hash output for a given context.
+     *
+     * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
+     * @param int $length Hash output size.
+     * @return string      Final BLAKE2b hash.
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES)
+    {
+        /* Type checks: */
+        if (!is_string($ctx)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ctx) . ' given.');
+        }
+        if (!is_int($length)) {
+            if (is_numeric($length)) {
+                $length = (int) $length;
+            } else {
+                throw new TypeError('Argument 2 must be an integer, ' . gettype($length) . ' given.');
+            }
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_generichash_final($ctx, $length);
+        }
+        if (self::use_fallback('crypto_generichash_final')) {
+            $func = '\\Sodium\\crypto_generichash_final';
+            return $func($ctx, $length);
+        }
+        $result = ParagonIE_Sodium_Crypto::generichash_final($ctx, $length);
+        try {
+            self::memzero($ctx);
+        } catch (Error $ex) {
+            unset($ctx);
+        }
+        return $result;
+    }
+
+    /**
+     * Initialize a BLAKE2b hashing context, for use in a streaming interface.
+     *
+     * @param string $key If specified must be a string between 16 and 64 bytes
+     * @param int $length The size of the desired hash output
+     * @return string     A BLAKE2 hashing context, encoded as a string
+     *                    (To be 100% compatible with ext/libsodium)
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+    {
+        /* Type checks: */
+        if (!is_string($key)) {
+            if ($key === null) {
+                $key = '';
+            } else {
+                throw new TypeError('Argument 1 must be a string, ' . gettype($key) . ' given.');
+            }
+        }
+        if (!is_int($length)) {
+            if (is_numeric($length)) {
+                $length = (int) $length;
+            } else {
+                throw new TypeError('Argument 2 must be an integer, ' . gettype($length) . ' given.');
+            }
+        }
+
+        /* Input validation: */
+        if (!empty($key)) {
+            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+                throw new Error('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+            }
+            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+                throw new Error('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+            }
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_generichash_init($key, $length);
+        }
+        if (self::use_fallback('crypto_generichash_init')) {
+            return call_user_func('\\Sodium\\crypto_generichash_init', $key, $length);
+        }
+        return ParagonIE_Sodium_Crypto::generichash_init($key, $length);
+    }
+
+    /**
+     * Update a BLAKE2b hashing context with additional data.
+     *
+     * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
+     *                        $ctx is passed by reference and gets updated in-place.
+     * @param string $message The message to append to the existing hash state.
+     * @return void
+     * @throws TypeError
+     */
+    public static function crypto_generichash_update(&$ctx, $message)
+    {
+        /* Type checks: */
+        if (!is_string($ctx)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ctx) . ' given.');
+        }
+        if (!is_string($message)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($message) . ' given.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            sodium_crypto_generichash_update($ctx, $message);
+            return;
+        }
+        if (self::use_fallback('crypto_generichash_update')) {
+            $func = '\\Sodium\\crypto_generichash_update';
+            $func($ctx, $message);
+            return;
+        }
+        $ctx = ParagonIE_Sodium_Crypto::generichash_update($ctx, $message);
+    }
+
+    /**
+     * Perform a key exchange, between a designated client and a server.
+     *
+     * Typically, you would designate one machine to be the client and the
+     * other to be the server. The first two keys are what you'd expect for
+     * scalarmult() below, but the latter two public keys don't swap places.
+     *
+     * | ALICE                          | BOB                                 |
+     * | Client                         | Server                              |
+     * |--------------------------------|-------------------------------------|
+     * | shared = crypto_kx(            | shared = crypto_kx(                 |
+     * |     alice_sk,                  |     bob_sk,                         | <- contextual
+     * |     bob_pk,                    |     alice_pk,                       | <- contextual
+     * |     alice_pk,                  |     alice_pk,                       | <----- static
+     * |     bob_pk                     |     bob_pk                          | <----- static
+     * | )                              | )                                   |
+     *
+     * They are used along with the scalarmult product to generate a 256-bit
+     * BLAKE2b hash unique to the client and server keys.
+     *
+     * @param string $my_secret
+     * @param string $their_public
+     * @param string $client_public
+     * @param string $server_public
+     * @return string
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    {
+        /* Type checks: */
+        if (!is_string($my_secret)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($my_secret) . ' given.');
+        }
+        if (!is_string($their_public)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($their_public) . ' given.');
+        }
+        if (!is_string($client_public)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($client_public) . ' given.');
+        }
+        if (!is_string($server_public)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($server_public) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($my_secret) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($their_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($client_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($server_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new Error('Argument 4 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_kx(
+                $my_secret,
+                $their_public,
+                $client_public,
+                $server_public
+            );
+        }
+        if (self::use_fallback('crypto_kx')) {
+            return call_user_func(
+                '\\Sodium\\crypto_kx',
+                $my_secret,
+                $their_public,
+                $client_public,
+                $server_public
+            );
+        }
+        return ParagonIE_Sodium_Crypto::keyExchange(
+            $my_secret,
+            $their_public,
+            $client_public,
+            $server_public
+        );
+    }
+
+    /**
+     * Calculate the shared secret between your secret key and your
+     * recipient's public key.
+     *
+     * Algorithm: X25519 (ECDH over Curve25519)
+     *
+     * @param string $secretKey
+     * @param string $publicKey
+     * @return string
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_scalarmult($secretKey, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_scalarmult($secretKey, $publicKey);
+        }
+        if (self::use_fallback('crypto_scalarmult')) {
+            return call_user_func('\\Sodium\\crypto_scalarmult', $secretKey, $publicKey);
+        }
+
+        /* Output validation: Forbid all-zero keys */
+        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
+            throw new Error('Zero secret key is not allowed');
+        }
+        if (ParagonIE_Sodium_Core_Util::hashEquals($publicKey, str_repeat("\0", self::CRYPTO_BOX_PUBLICKEYBYTES))) {
+            throw new Error('Zero public key is not allowed');
+        }
+        return ParagonIE_Sodium_Crypto::scalarmult($secretKey, $publicKey);
+    }
+
+    /**
+     * Calculate an X25519 public key from an X25519 secret key.
+     *
+     * @param string $secretKey
+     * @return string
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_scalarmult_base($secretKey)
+    {
+        /* Type checks: */
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_scalarmult_base($secretKey);
+        }
+        if (self::use_fallback('crypto_scalarmult_base')) {
+            return call_user_func('\\Sodium\\crypto_scalarmult_base', $secretKey);
+        }
+        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
+            throw new Error('Zero secret key is not allowed');
+        }
+        return ParagonIE_Sodium_Crypto::scalarmult_base($secretKey);
+    }
+
+    /**
+     * Authenticated symmetric-key encryption.
+     *
+     * Algorithm: Xsalsa20-Poly1305
+     *
+     * @param string $plaintext The message you're encrypting
+     * @param string $nonce A Number to be used Once; must be 24 bytes
+     * @param string $key Symmetric encryption key
+     * @return string           Ciphertext with Poly1305 MAC
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_secretbox($plaintext, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($plaintext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($plaintext) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_secretbox($plaintext, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_secretbox')) {
+            return call_user_func('\\Sodium\\crypto_secretbox', $plaintext, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Crypto::secretbox($plaintext, $nonce, $key);
+    }
+
+    /**
+     * Decrypts a message previously encrypted with crypto_secretbox().
+     *
+     * @param string $ciphertext Ciphertext with Poly1305 MAC
+     * @param string $nonce      A Number to be used Once; must be 24 bytes
+     * @param string $key        Symmetric encryption key
+     * @return string            Original plaintext message
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_secretbox_open($ciphertext, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($ciphertext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ciphertext) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_secretbox_open')) {
+            return call_user_func('\\Sodium\\crypto_secretbox_open', $ciphertext, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Crypto::secretbox_open($ciphertext, $nonce, $key);
+    }
+
+    /**
+     * Authenticated symmetric-key encryption.
+     *
+     * Algorithm: XChaCha20-Poly1305
+     *
+     * @param string $plaintext The message you're encrypting
+     * @param string $nonce     A Number to be used Once; must be 24 bytes
+     * @param string $key       Symmetric encryption key
+     * @return string           Ciphertext with Poly1305 MAC
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($plaintext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($plaintext) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
+    }
+    /**
+     * Decrypts a message previously encrypted with crypto_secretbox_xchacha20poly1305().
+     *
+     * @param string $ciphertext Ciphertext with Poly1305 MAC
+     * @param string $nonce      A Number to be used Once; must be 24 bytes
+     * @param string $key        Symmetric encryption key
+     * @return string            Original plaintext message
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($ciphertext)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($ciphertext) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
+    }
+
+    /**
+     * Calculates a SipHash-2-4 hash of a message for a given key.
+     *
+     * @param string $message Input message
+     * @param string $key SipHash-2-4 key
+     * @return string         Hash
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_shorthash($message, $key)
+    {
+        /* Type checks: */
+        if (!is_string($message)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SHORTHASH_KEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SHORTHASH_KEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_shorthash($message, $key);
+        }
+        if (self::use_fallback('crypto_shorthash')) {
+            return call_user_func('\\Sodium\\crypto_shorthash', $message, $key);
+        }
+        return ParagonIE_Sodium_Core_SipHash::sipHash24($message, $key);
+    }
+
+    /**
+     * Expand a key and nonce into a keystream of pseudorandom bytes.
+     *
+     * @param int $len Number of bytes desired
+     * @param string $nonce Number to be used Once; must be 24 bytes
+     * @param string $key Xsalsa20 key
+     * @return string       Pseudorandom stream that can be XORed with messages
+     *                      to provide encryption (but not authentication; see
+     *                      Poly1305 or crypto_auth() for that, which is not
+     *                      optional for security)
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_stream($len, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_int($len)) {
+            if (is_numeric($len)) {
+                $len = (int) $len;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($len) . ' given.');
+            }
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_STREAM_KEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_stream($len, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_stream')) {
+            return call_user_func('\\Sodium\\crypto_stream', $len, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Core_Xsalsa20::xsalsa20($len, $nonce, $key);
+    }
+
+    /**
+     * DANGER! UNAUTHENTICATED ENCRYPTION!
+     *
+     * Unless you are following expert advice, do not used this feature.
+     *
+     * Algorithm: Xsalsa20
+     *
+     * This DOES NOT provide ciphertext integrity.
+     *
+     * @param string $message Plaintext message
+     * @param string $nonce Number to be used Once; must be 24 bytes
+     * @param string $key Encryption key
+     * @return string         Encrypted text which is vulnerable to chosen-
+     *                        ciphertext attacks unless you implement some
+     *                        other mitigation to the ciphertext (i.e.
+     *                        Encrypt then MAC)
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_stream_xor($message, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($message)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_stream_xor($message, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_stream_xor')) {
+            return call_user_func('\\Sodium\\crypto_stream_xor', $message, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Core_Xsalsa20::xsalsa20_xor($message, $nonce, $key);
+    }
+
+    /**
+     * Returns a signed message. You probably want crypto_sign_detached()
+     * instead, which only returns the signature.
+     *
+     * Algorithm: Ed25519 (EdDSA over Curve25519)
+     *
+     * @param string $message Message to be signed.
+     * @param string $secretKey Secret signing key.
+     * @return string           Signed message (signature is prefixed).
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_sign($message, $secretKey)
+    {
+        /* Type checks: */
+        if (!is_string($message)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign($message, $secretKey);
+        }
+        if (self::use_fallback('crypto_sign')) {
+            return call_user_func('\\Sodium\\crypto_sign', $message, $secretKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign($message, $secretKey);
+    }
+
+    /**
+     * Validates a signed message then returns the message.
+     *
+     * @param string $signedMessage A signed message
+     * @param string $publicKey A public key
+     * @return string               The original message (if the signature is
+     *                              valid for this public key)
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_sign_open($signedMessage, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($signedMessage)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($signedMessage) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($signedMessage) < self::CRYPTO_SIGN_BYTES) {
+            throw new Error('Argument 1 must be at least CRYPTO_SIGN_BYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_open($signedMessage, $publicKey);
+        }
+        if (self::use_fallback('crypto_sign_open')) {
+            return call_user_func('\\Sodium\\crypto_sign_open', $signedMessage, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign_open($signedMessage, $publicKey);
+    }
+
+    /**
+     * Generate a new random Ed25519 keypair.
+     *
+     * @return string
+     */
+    public static function crypto_sign_keypair()
+    {
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_keypair();
+        }
+        if (self::use_fallback('crypto_sign_keypair')) {
+            return call_user_func(
+                '\\Sodium\\crypto_sign_keypair'
+            );
+        }
+        return ParagonIE_Sodium_Core_Ed25519::keypair();
+    }
+
+    /**
+     * Generate an Ed25519 keypair from a seed.
+     *
+     * @param string $seed Input seed
+     * @return string      Keypair
+     */
+    public static function crypto_sign_seed_keypair($seed)
+    {
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_seed_keypair($seed);
+        }
+        if (self::use_fallback('crypto_sign_keypair')) {
+            return call_user_func('\\Sodium\\crypto_sign_seed_keypair', $seed);
+        }
+        $publicKey = '';
+        $secretKey = '';
+        ParagonIE_Sodium_Core_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
+        return $secretKey . $publicKey;
+    }
+
+    /**
+     * Extract an Ed25519 public key from an Ed25519 keypair.
+     *
+     * @param string $keypair Keypair
+     * @return string         Public key
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_sign_publickey($keypair)
+    {
+        /* Type checks: */
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_publickey($keypair);
+        }
+        if (self::use_fallback('crypto_sign_publickey')) {
+            return call_user_func('\\Sodium\\crypto_sign_publickey', $keypair);
+        }
+        return ParagonIE_Sodium_Core_Ed25519::publickey($keypair);
+    }
+
+    /**
+     * Calculate an Ed25519 public key from an Ed25519 secret key.
+     *
+     * @param string $secretKey Your Ed25519 secret key
+     * @return string           The corresponding Ed25519 public key
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_sign_publickey_from_secretkey($secretKey)
+    {
+        /* Type checks: */
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_publickey_from_secretkey($secretKey);
+        }
+        if (self::use_fallback('crypto_sign_publickey_from_publickey')) {
+            return call_user_func('\\Sodium\\crypto_sign_publickey_from_publickey', $secretKey);
+        }
+        return ParagonIE_Sodium_Core_Ed25519::publickey_from_secretkey($secretKey);
+    }
+
+    /**
+     * Extract an Ed25519 secret key from an Ed25519 keypair.
+     *
+     * @param string $keypair Keypair
+     * @return string         Secret key
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_sign_secretkey($keypair)
+    {
+        /* Type checks: */
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
+            throw new Error('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_secretkey($keypair);
+        }
+        if (self::use_fallback('crypto_sign_secretkey')) {
+            return call_user_func('\\Sodium\\crypto_sign_secretkey', $keypair);
+        }
+        return ParagonIE_Sodium_Core_Ed25519::secretkey($keypair);
+    }
+
+    /**
+     * Calculate the Ed25519 signature of a message and return ONLY the signature.
+     *
+     * Algorithm: Ed25519 (EdDSA over Curve25519)
+     *
+     * @param string $message Message to be signed
+     * @param string $secretKey Secret signing key
+     * @return string           Digital signature
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_sign_detached($message, $secretKey)
+    {
+        /* Type checks: */
+        if (!is_string($message)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new Error('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_detached($message, $secretKey);
+        }
+        if (self::use_fallback('crypto_sign_detached')) {
+            return call_user_func('\\Sodium\\crypto_sign_detached', $message, $secretKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign_detached($message, $secretKey);
+    }
+
+    /**
+     * Verify the Ed25519 signature of a message.
+     *
+     * @param string $signature Digital sginature
+     * @param string $message Message to be verified
+     * @param string $publicKey Public key
+     * @return bool             TRUE if this signature is good for this public key;
+     *                          FALSE otherwise
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function crypto_sign_verify_detached($signature, $message, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($signature)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($signature) . ' given.');
+        }
+        if (!is_string($message)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($message) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($signature) !== self::CRYPTO_SIGN_BYTES) {
+            throw new Error('Argument 1 must be CRYPTO_SIGN_BYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new Error('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return sodium_crypto_sign_verify_detached($signature, $message, $publicKey);
+        }
+        if (self::use_fallback('crypto_sign_verify_detached')) {
+            return call_user_func('\\Sodium\\crypto_sign_verify_detached', $signature, $message, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign_verify_detached($signature, $message, $publicKey);
+    }
+
+    /**
+     * Cache-timing-safe implementation of hex2bin().
+     *
+     * @param string $string Hexadecimal string
+     * @return string        Raw binary string
+     * @throws TypeError
+     */
+    public static function hex2bin($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            return self::hex2bin($string);
+        }
+        if (self::use_fallback('hex2bin')) {
+            return call_user_func('\\Sodium\\hex2bin', $string);
+        }
+        return ParagonIE_Sodium_Core_Util::hex2bin($string);
+    }
+
+    /**
+     * The equivalent to the libsodium minor version we aim to be compatible
+     * with (sans pwhash and memzero).
+     *
+     * @return int
+     */
+    public static function library_version_major()
+    {
+        if (self::use_fallback('library_version_major')) {
+            return (int)call_user_func('\\Sodium\\library_version_major');
+        }
+        return self::LIBRARY_VERSION_MAJOR;
+    }
+
+    /**
+     * The equivalent to the libsodium minor version we aim to be compatible
+     * with (sans pwhash and memzero).
+     *
+     * @return int
+     */
+    public static function library_version_minor()
+    {
+        if (self::use_fallback('library_version_minor')) {
+            return (int)call_user_func('\\Sodium\\library_version_minor');
+        }
+        return self::LIBRARY_VERSION_MINOR;
+    }
+
+    /**
+     * Compare two strings.
+     *
+     * @param string $left
+     * @param string $right
+     * @return int
+     * @throws TypeError
+     */
+    public static function memcmp($left, $right)
+    {
+        /* Type checks: */
+        if (!is_string($left)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
+        }
+        if (!is_string($right)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
+        }
+
+        if (self::use_fallback('memcmp')) {
+            return call_user_func('\\Sodium\\memcmp', $left, $right);
+        }
+        return ParagonIE_Sodium_Core_Util::memcmp($left, $right);
+    }
+
+    /**
+     * It's actually not possible to zero memory buffers in PHP. You need the
+     * native library for that.
+     *
+     * @param &string $var
+     *
+     * @return void
+     * @throws Error (Unless libsodium is installed)
+     */
+    public static function memzero(&$var)
+    {
+        /* Type checks: */
+        if (!is_string($var)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($var) . ' given.');
+        }
+
+        if (self::isPhp72OrGreater()) {
+            sodium_memzero($var);
+            return;
+        }
+        if (self::use_fallback('memzero')) {
+            @call_user_func('\\Sodium\\memzero', $var);
+            return;
+        }
+        // This is the best we can do.
+        throw new Error(
+            'This is not implemented, as it is not possible to securely wipe memory from PHP'
+        );
+    }
+
+    /**
+     * Generate a string of bytes from the kernel's CSPRNG.
+     * Proudly uses /dev/urandom (if getrandom(2) is not available).
+     *
+     * @param int $numBytes
+     * @return string
+     * @throws TypeError
+     */
+    public static function randombytes_buf($numBytes)
+    {
+        /* Type checks: */
+        if (!is_int($numBytes)) {
+            if (is_numeric($numBytes)) {
+                $numBytes = (int)$numBytes;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($numBytes) . ' given.');
+            }
+        }
+        if (self::use_fallback('randombytes_buf')) {
+            return call_user_func('\\Sodium\\randombytes_buf', $numBytes);
+        }
+        return random_bytes($numBytes);
+    }
+
+    /**
+     * Generate an integer between 0 and $range (non-inclusive).
+     *
+     * @param int $range
+     * @return int
+     * @throws TypeError
+     */
+    public static function randombytes_uniform($range)
+    {
+        /* Type checks: */
+        if (!is_int($range)) {
+            if (is_numeric($range)) {
+                $range = (int)$range;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($range) . ' given.');
+            }
+        }
+        if (self::use_fallback('randombytes_uniform')) {
+            return (int)call_user_func('\\Sodium\\randombytes_uniform', $range);
+        }
+        return random_int(0, $range - 1);
+    }
+
+    /**
+     * Generate a random 16-bit integer.
+     *
+     * @return int
+     */
+    public static function randombytes_random16()
+    {
+        if (self::use_fallback('randombytes_random16')) {
+            return (int) call_user_func('\\Sodium\\randombytes_random16');
+        }
+        return random_int(0, 65535);
+    }
+
+    /**
+     * This emulates libsodium's version_string() function, except ours is
+     * prefixed with 'polyfill-'.
+     *
+     * @return string
+     */
+    public static function version_string()
+    {
+        if (self::use_fallback('version_string')) {
+            return (string) call_user_func('\\Sodium\\version_string');
+        }
+        return self::VERSION_STRING;
+    }
+
+    /**
+     * Should we use the libsodium core function instead?
+     * This is always a good idea, if it's available. (Unless we're in the
+     * middle of running our unit test suite.)
+     *
+     * If ext/libsodium is available, use it. Return TRUE.
+     * Otherwise, we have to use the code provided herein. Return FALSE.
+     *
+     * @param string $sodium_func_name
+     *
+     * @return bool
+     */
+    protected static function use_fallback($sodium_func_name = '')
+    {
+        static $res = null;
+        if ($res === null) {
+            $res = extension_loaded('libsodium') && PHP_VERSION_ID >= 50300;
+        }
+        if ($res === false) {
+            // No libsodium installed
+            return false;
+        }
+        if (self::$disableFallbackForUnitTests) {
+            // Don't fallback. Use the PHP implementation.
+            return false;
+        }
+        if (!empty($sodium_func_name)) {
+            return is_callable('\\Sodium\\' . $sodium_func_name);
+        }
+        return true;
+    }
+
+    /**
+     * Libsodium as implemented in PHP 7.2
+     *
+     * @ref https://wiki.php.net/rfc/libsodium
+     * @return bool
+     */
+    protected static function isPhp72OrGreater()
+    {
+        static $res = null;
+        if ($res === null) {
+            $res = PHP_VERSION_ID >= 70200 && extension_loaded('libsodium');
+        }
+        if (self::$disableFallbackForUnitTests) {
+            // Don't fallback. Use the PHP implementation.
+            return false;
+        }
+        return $res;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php b/libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
new file mode 100644
index 0000000000000..4c3b58d3695f2
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
@@ -0,0 +1,657 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_BLAKE2b
+ *
+ * Based on the work of Devi Mandiri in devi/salt.
+ */
+abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @var SplFixedArray
+     */
+    protected static $iv;
+
+    /**
+     * @var int[][]
+     */
+    protected static $sigma = array(
+        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
+        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
+        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
+        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
+        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
+        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
+        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
+        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
+        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
+        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
+    );
+
+    const BLOCKBYTES = 128;
+    const OUTBYTES   = 64;
+    const KEYBYTES   = 64;
+
+    /**
+     * Turn two 32-bit integers into a fixed array representing a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $high
+     * @param int $low
+     * @return SplFixedArray
+     */
+    protected static function new64($high, $low)
+    {
+        $i64 = new SplFixedArray(2);
+        $i64[0] = $high & 0xffffffff;
+        $i64[1] = $low & 0xffffffff;
+        return $i64;
+    }
+
+    /**
+     * Convert an arbitrary number into an SplFixedArray of two 32-bit integers
+     * that represents a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $num
+     * @return SplFixedArray
+     */
+    protected static function to64($num)
+    {
+        list($hi, $lo) = self::numericTo64BitInteger($num);
+        return self::new64($hi, $lo);
+    }
+
+    /**
+     * Adds two 64-bit integers together, returning their sum as a SplFixedArray
+     * containing two 32-bit integers (representing a 64-bit integer).
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param SplFixedArray $y
+     * @return SplFixedArray
+     */
+    protected static function add64($x, $y)
+    {
+        $l = ($x[1] + $y[1]) & 0xffffffff;
+        return self::new64(
+            $x[0] + $y[0] + (
+                ($l < $x[1]) ? 1 : 0
+            ),
+            $l
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param SplFixedArray $y
+     * @param SplFixedArray $z
+     * @return SplFixedArray
+     */
+    protected static function add364($x, $y, $z)
+    {
+        return self::add64($x, self::add64($y, $z));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param SplFixedArray $y
+     * @return SplFixedArray
+     * @throws Exception
+     */
+    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
+    {
+        if (!is_numeric($x[0])) {
+            throw new Exception('x[0] is not an integer');
+        }
+        if (!is_numeric($x[1])) {
+            throw new Exception('x[1] is not an integer');
+        }
+        if (!is_numeric($y[0])) {
+            throw new Exception('y[0] is not an integer');
+        }
+        if (!is_numeric($y[1])) {
+            throw new Exception('y[1] is not an integer');
+        }
+        return self::new64($x[0] ^ $y[0], $x[1] ^ $y[1]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $c
+     * @return SplFixedArray
+     */
+    protected static function rotr64($x, $c)
+    {
+        $l0 = 0;
+        $c = 64 - $c;
+
+        if ($c < 32) {
+            $h0 = ($x[0] << $c) | (($x[1] & ((1 << $c) - 1) << (32 - $c)) >> (32 - $c));
+            $l0 = $x[1] << $c;
+        } else {
+            $h0 = $x[1] << ($c - 32);
+        }
+
+        $h1 = 0;
+        $c1 = 64 - $c;
+
+        if ($c1 < 32) {
+            $h1 = $x[0] >> $c1;
+            $l1 = ($x[1] >> $c1) | ($x[0] & ((1 << $c1) - 1)) << (32 - $c1);
+        } else {
+            $l1 = $x[0] >> ($c1 - 32);
+        }
+
+        return self::new64($h0 | $h1, $l0 | $l1);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @return int
+     */
+    protected static function flatten64($x)
+    {
+        return ($x[0] * 4294967296 + $x[1]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $i
+     * @return SplFixedArray
+     */
+    protected static function load64(SplFixedArray $x, $i)
+    {
+        $l = $x[$i]   | ($x[$i+1]<<8) | ($x[$i+2]<<16) | ($x[$i+3]<<24);
+        $h = $x[$i+4] | ($x[$i+5]<<8) | ($x[$i+6]<<16) | ($x[$i+7]<<24);
+        return self::new64($h, $l);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $i
+     * @param SplFixedArray $u
+     * @return void
+     */
+    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
+    {
+        $maxLength = $x->getSize() - 1;
+        for ($j = 0; $j < 8; ++$j) {
+            /*
+               [0, 1, 2, 3, 4, 5, 6, 7]
+                    ... becomes ...
+               [0, 0, 0, 0, 1, 1, 1, 1]
+            */
+            $uIdx = ((7 - $j) & 4) >> 2;
+            $x[$i]   = ($u[$uIdx] & 0xff);
+            if (++$i > $maxLength) {
+                return;
+            }
+            $u[$uIdx] >>= 8;
+        }
+    }
+
+    /**
+     * This just sets the $iv static variable.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return void
+     */
+    public static function pseudoConstructor()
+    {
+        static $called = false;
+        if ($called) {
+            return;
+        }
+        self::$iv = new SplFixedArray(8);
+        self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
+        self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
+        self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
+        self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
+        self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
+        self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
+        self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
+        self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
+
+        $called = true;
+    }
+
+    /**
+     * Returns a fresh BLAKE2 context.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return SplFixedArray
+     */
+    protected static function context()
+    {
+        $ctx    = new SplFixedArray(5);
+        $ctx[0] = new SplFixedArray(8);   // h
+        $ctx[1] = new SplFixedArray(2);   // t
+        $ctx[2] = new SplFixedArray(2);   // f
+        $ctx[3] = new SplFixedArray(256); // buf
+        $ctx[4] = 0;                      // buflen
+
+        for ($i = 8; $i--;) {
+            $ctx[0][$i] = self::$iv[$i];
+        }
+        for ($i = 256; $i--;) {
+            $ctx[3][$i] = 0;
+        }
+
+        $zero = self::new64(0, 0);
+        $ctx[1][0] = $zero;
+        $ctx[1][1] = $zero;
+        $ctx[2][0] = $zero;
+        $ctx[2][1] = $zero;
+
+        return $ctx;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $buf
+     * @return void
+     */
+    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
+    {
+        $m = new SplFixedArray(16);
+        $v = new SplFixedArray(16);
+
+        for ($i = 16; $i--;) {
+            $m[$i] = self::load64($buf, $i << 3);
+        }
+
+        for ($i = 8; $i--;) {
+            $v[$i] = $ctx[0][$i];
+        }
+
+        $v[ 8] = self::$iv[0];
+        $v[ 9] = self::$iv[1];
+        $v[10] = self::$iv[2];
+        $v[11] = self::$iv[3];
+
+        $v[12] = self::xor64($ctx[1][0], self::$iv[4]);
+        $v[13] = self::xor64($ctx[1][1], self::$iv[5]);
+        $v[14] = self::xor64($ctx[2][0], self::$iv[6]);
+        $v[15] = self::xor64($ctx[2][1], self::$iv[7]);
+
+        for ($r = 0; $r < 12; ++$r) {
+            $v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
+            $v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
+            $v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
+            $v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
+            $v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
+            $v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
+            $v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
+            $v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
+        }
+
+        for ($i = 8; $i--;) {
+            $ctx[0][$i] = self::xor64(
+                $ctx[0][$i], self::xor64($v[$i], $v[$i+8])
+            );
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $r
+     * @param int $i
+     * @param int $a
+     * @param int $b
+     * @param int $c
+     * @param int $d
+     * @param SplFixedArray $v
+     * @param SplFixedArray $m
+     * @return SplFixedArray
+     */
+    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
+    {
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
+        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
+        $v[$c] = self::add64($v[$c], $v[$d]);
+        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
+        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
+        $v[$c] = self::add64($v[$c], $v[$d]);
+        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
+        return $v;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param int $inc
+     * @return void
+     * @throws Error
+     */
+    public static function increment_counter($ctx, $inc)
+    {
+        if ($inc < 0) {
+            throw new Error('Increasing by a negative number makes no sense.');
+        }
+        $t = self::to64($inc);
+        # S->t is $ctx[1] in our implementation
+
+        # S->t[0] = ( uint64_t )( t >> 0 );
+        $ctx[1][0] = self::add64($ctx[1][0], $t);
+
+        # S->t[1] += ( S->t[0] < inc );
+        if (self::flatten64($ctx[1][0]) < $inc) {
+            $ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $p
+     * @param int $plen
+     * @return void
+     */
+    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
+    {
+        self::pseudoConstructor();
+
+        $offset = 0;
+        while ($plen > 0) {
+            $left = $ctx[4];
+            $fill = 256 - $left;
+
+            if ($plen > $fill) {
+                # memcpy( S->buf + left, in, fill ); /* Fill buffer */
+                for ($i = $fill; $i--;) {
+                    $ctx[3][$i + $left] = $p[$i + $offset];
+                }
+
+                # S->buflen += fill;
+                $ctx[4] += $fill;
+
+                # blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
+                self::increment_counter($ctx, 128);
+
+                # blake2b_compress( S, S->buf ); /* Compress */
+                self::compress($ctx, $ctx[3]);
+
+                # memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
+                for ($i = 128; $i--;) {
+                    $ctx[3][$i] = $ctx[3][$i + 128];
+                }
+
+                # S->buflen -= BLAKE2B_BLOCKBYTES;
+                $ctx[4] -= 128;
+
+                # in += fill;
+                $offset += $fill;
+
+                # inlen -= fill;
+                $plen -= $fill;
+            } else {
+                for ($i = $plen; $i--;) {
+                    $ctx[3][$i + $left] = $p[$i + $offset];
+                }
+                $ctx[4] += $plen;
+                $offset += $plen;
+                $plen -= $plen;
+            }
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $out
+     * @return SplFixedArray
+     * @throws Error
+     */
+    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
+    {
+        self::pseudoConstructor();
+        if ($ctx[4] > 128) {
+            self::increment_counter($ctx, 128);
+            self::compress($ctx, $ctx[3]);
+            $ctx[4] -= 128;
+            if ($ctx[4] > 128) {
+                throw new Error('Failed to assert that buflen <= 128 bytes');
+            }
+            for ($i = $ctx[4]; $i--;) {
+                $ctx[3][$i] = $ctx[3][$i + 128];
+            }
+        }
+
+        self::increment_counter($ctx, $ctx[4]);
+        $ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
+
+        for ($i = 256 - $ctx[4]; $i--;) {
+            $ctx[3][$i+$ctx[4]] = 0;
+        }
+
+        self::compress($ctx, $ctx[3]);
+
+        $i = (int) (($out->getSize() - 1) / 8);
+        for (; $i >= 0; --$i) {
+            self::store64($out, $i << 3, $ctx[0][$i]);
+        }
+        return $out;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray|null $key
+     * @param int $outlen
+     * @return SplFixedArray
+     * @throws Exception
+     */
+    public static function init($key = null, $outlen = 64)
+    {
+        self::pseudoConstructor();
+        $klen = 0;
+
+        if ($key !== null) {
+            if (count($key) > 64) {
+                throw new Exception('Invalid key size');
+            }
+            $klen = count($key);
+        }
+
+        if ($outlen > 64) {
+            throw new Exception('Invalid output size');
+        }
+
+        $ctx = self::context();
+
+        $p = new SplFixedArray(64);
+        for ($i = 64; --$i;) {
+            $p[$i] = 0;
+        }
+
+        $p[0] = $outlen; // digest_length
+        $p[1] = $klen;   // key_length
+        $p[2] = 1;       // fanout
+        $p[3] = 1;       // depth
+
+        $ctx[0][0] = self::xor64(
+            $ctx[0][0],
+            self::load64($p, 0)
+        );
+
+        if ($klen > 0 && $key instanceof SplFixedArray) {
+            $block = new SplFixedArray(128);
+            for ($i = 128; $i--;) {
+                $block[$i] = 0;
+            }
+            for ($i = $klen; $i--;) {
+                $block[$i] = $key[$i];
+            }
+            self::update($ctx, $block, 128);
+        }
+
+        return $ctx;
+    }
+
+    /**
+     * Convert a string into an SplFixedArray of integers
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $str
+     * @return SplFixedArray
+     */
+    public static function stringToSplFixedArray($str = '')
+    {
+        $values = unpack('C*', $str);
+        return SplFixedArray::fromArray(array_values($values));
+    }
+
+    /**
+     * Convert an SplFixedArray of integers into a string
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $a
+     * @return string
+     */
+    public static function SplFixedArrayToString(SplFixedArray $a)
+    {
+        /**
+         * @var array<mixed, int>
+         */
+        $arr = $a->toArray();
+        $c = $a->count();
+        array_unshift($arr, str_repeat('C', $c));
+        return call_user_func_array('pack', $arr);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray[SplFixedArray] $ctx
+     * @return string
+     */
+    public static function contextToString(SplFixedArray $ctx)
+    {
+        $str = '';
+        $ctxA = $ctx[0]->toArray();
+
+        # uint64_t h[8];
+        for ($i = 0; $i < 8; ++$i) {
+            $str .= self::store32_le($ctxA[$i][1]);
+            $str .= self::store32_le($ctxA[$i][0]);
+        }
+
+        # uint64_t t[2];
+        # uint64_t f[2];
+        for ($i = 1; $i < 3; ++$i) {
+            $ctxA = $ctx[$i]->toArray();
+            $str .= self::store32_le($ctxA[0][1]);
+            $str .= self::store32_le($ctxA[0][0]);
+            $str .= self::store32_le($ctxA[1][1]);
+            $str .= self::store32_le($ctxA[1][0]);
+        }
+
+        # uint8_t buf[2 * 128];
+        $str .= self::SplFixedArrayToString($ctx[3]);
+
+        # size_t buflen;
+        $str .= implode('', array(
+            self::intToChr($ctx[4] & 0xff),
+            self::intToChr(($ctx[4] >> 8) & 0xff),
+            self::intToChr(($ctx[4] >> 16) & 0xff),
+            self::intToChr(($ctx[4] >> 24) & 0xff),
+            self::intToChr(($ctx[4] >> 32) & 0xff),
+            self::intToChr(($ctx[4] >> 40) & 0xff),
+            self::intToChr(($ctx[4] >> 48) & 0xff),
+            self::intToChr(($ctx[4] >> 56) & 0xff)
+        ));
+        # uint8_t last_node;
+        return $str . "\x00";
+    }
+
+    /**
+     * Creates an SplFixedArray containing other SplFixedArray elements, from
+     * a string (compatible with \Sodium\crypto_generichash_{init, update, final})
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return SplFixedArray
+     */
+    public static function stringToContext($string)
+    {
+        $ctx = self::context();
+
+        # uint64_t h[8];
+        for ($i = 0; $i < 8; ++$i) {
+            $ctx[0][$i] = SplFixedArray::fromArray(
+                array(
+                    self::load_4(
+                        self::substr($string, (($i << 3) + 4), 4)
+                    ),
+                    self::load_4(
+                        self::substr($string, (($i << 3) + 0), 4)
+                    )
+                )
+            );
+        }
+
+        # uint64_t t[2];
+        # uint64_t f[2];
+        for ($i = 1; $i < 3; ++$i) {
+            $ctx[$i][1] = SplFixedArray::fromArray(
+                array(
+                    self::load_4(self::substr($string, 76 + (($i - 1) << 4), 4)),
+                    self::load_4(self::substr($string, 72 + (($i - 1) << 4), 4))
+                )
+            );
+            $ctx[$i][0] = SplFixedArray::fromArray(
+                array(
+                    self::load_4(self::substr($string, 68 + (($i - 1) << 4), 4)),
+                    self::load_4(self::substr($string, 64 + (($i - 1) << 4), 4))
+                )
+            );
+        }
+
+        # uint8_t buf[2 * 128];
+        $ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
+
+
+        # uint8_t buf[2 * 128];
+        $int = 0;
+        for ($i = 0; $i < 8; ++$i) {
+            $int |= self::chrToInt($string[352 + $i]) << ($i << 3);
+        }
+        $ctx[4] = $int;
+
+        return $ctx;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php b/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php
new file mode 100644
index 0000000000000..cb07e37b2775c
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php
@@ -0,0 +1,364 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_ChaCha20
+ */
+class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * Bitwise left rotation
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $v
+     * @param int $n
+     * @return int
+     */
+    public static function rotate($v, $n)
+    {
+        $v &= 0xffffffff;
+        $n &= 31;
+        return 0xffffffff & (
+            ($v << $n)
+                |
+            ($v >> (32 - $n))
+        );
+    }
+
+    /**
+     * The ChaCha20 quarter round function. Works on four 32-bit integers.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $a
+     * @param int $b
+     * @param int $c
+     * @param int $d
+     * @return array<int, int>
+     */
+    protected static function quarterRound($a, $b, $c, $d)
+    {
+        # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
+        $a = ($a + $b) & 0xffffffff;
+        $d = self::rotate($d ^ $a, 16);
+
+        # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
+        $c = ($c + $d) & 0xffffffff;
+        $b = self::rotate($b ^ $c, 12);
+
+        # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
+        $a = ($a + $b) & 0xffffffff;
+        $d = self::rotate($d ^ $a, 8);
+
+        # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+        $c = ($c + $d) & 0xffffffff;
+        $b = self::rotate($b ^ $c, 7);
+        return array((int) $a, (int) $b, (int) $c, (int) $d);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx
+     * @param string $message
+     *
+     * @return string
+     * @throws Exception
+     */
+    public static function encryptBytes(
+        ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
+        $message = ''
+    ) {
+        $bytes = self::strlen($message);
+
+        /*
+        j0 = ctx->input[0];
+        j1 = ctx->input[1];
+        j2 = ctx->input[2];
+        j3 = ctx->input[3];
+        j4 = ctx->input[4];
+        j5 = ctx->input[5];
+        j6 = ctx->input[6];
+        j7 = ctx->input[7];
+        j8 = ctx->input[8];
+        j9 = ctx->input[9];
+        j10 = ctx->input[10];
+        j11 = ctx->input[11];
+        j12 = ctx->input[12];
+        j13 = ctx->input[13];
+        j14 = ctx->input[14];
+        j15 = ctx->input[15];
+        */
+        $j0  = (int) $ctx[0];
+        $j1  = (int) $ctx[1];
+        $j2  = (int) $ctx[2];
+        $j3  = (int) $ctx[3];
+        $j4  = (int) $ctx[4];
+        $j5  = (int) $ctx[5];
+        $j6  = (int) $ctx[6];
+        $j7  = (int) $ctx[7];
+        $j8  = (int) $ctx[8];
+        $j9  = (int) $ctx[9];
+        $j10 = (int) $ctx[10];
+        $j11 = (int) $ctx[11];
+        $j12 = (int) $ctx[12];
+        $j13 = (int) $ctx[13];
+        $j14 = (int) $ctx[14];
+        $j15 = (int) $ctx[15];
+
+        $c = '';
+        for (;;) {
+            if ($bytes < 64) {
+                $message .= str_repeat("\x00", 64 - $bytes);
+            }
+
+            $x0 =  (int) $j0;
+            $x1 =  (int) $j1;
+            $x2 =  (int) $j2;
+            $x3 =  (int) $j3;
+            $x4 =  (int) $j4;
+            $x5 =  (int) $j5;
+            $x6 =  (int) $j6;
+            $x7 =  (int) $j7;
+            $x8 =  (int) $j8;
+            $x9 =  (int) $j9;
+            $x10 = (int) $j10;
+            $x11 = (int) $j11;
+            $x12 = (int) $j12;
+            $x13 = (int) $j13;
+            $x14 = (int) $j14;
+            $x15 = (int) $j15;
+
+            # for (i = 20; i > 0; i -= 2) {
+            for ($i = 20; $i > 0; $i -= 2) {
+                # QUARTERROUND( x0,  x4,  x8,  x12)
+                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+
+                # QUARTERROUND( x1,  x5,  x9,  x13)
+                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+
+                # QUARTERROUND( x2,  x6,  x10,  x14)
+                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+
+                # QUARTERROUND( x3,  x7,  x11,  x15)
+                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+
+                # QUARTERROUND( x0,  x5,  x10,  x15)
+                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+
+                # QUARTERROUND( x1,  x6,  x11,  x12)
+                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+
+                # QUARTERROUND( x2,  x7,  x8,  x13)
+                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+
+                # QUARTERROUND( x3,  x4,  x9,  x14)
+                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+            }
+            /*
+            x0 = PLUS(x0, j0);
+            x1 = PLUS(x1, j1);
+            x2 = PLUS(x2, j2);
+            x3 = PLUS(x3, j3);
+            x4 = PLUS(x4, j4);
+            x5 = PLUS(x5, j5);
+            x6 = PLUS(x6, j6);
+            x7 = PLUS(x7, j7);
+            x8 = PLUS(x8, j8);
+            x9 = PLUS(x9, j9);
+            x10 = PLUS(x10, j10);
+            x11 = PLUS(x11, j11);
+            x12 = PLUS(x12, j12);
+            x13 = PLUS(x13, j13);
+            x14 = PLUS(x14, j14);
+            x15 = PLUS(x15, j15);
+            */
+            $x0  = ($x0 & 0xffffffff) + $j0;
+            $x1  = ($x1 & 0xffffffff) + $j1;
+            $x2  = ($x2 & 0xffffffff) + $j2;
+            $x3  = ($x3 & 0xffffffff) + $j3;
+            $x4  = ($x4 & 0xffffffff) + $j4;
+            $x5  = ($x5 & 0xffffffff) + $j5;
+            $x6  = ($x6 & 0xffffffff) + $j6;
+            $x7  = ($x7 & 0xffffffff) + $j7;
+            $x8  = ($x8 & 0xffffffff) + $j8;
+            $x9  = ($x9 & 0xffffffff) + $j9;
+            $x10 = ($x10 & 0xffffffff) + $j10;
+            $x11 = ($x11 & 0xffffffff) + $j11;
+            $x12 = ($x12 & 0xffffffff) + $j12;
+            $x13 = ($x13 & 0xffffffff) + $j13;
+            $x14 = ($x14 & 0xffffffff) + $j14;
+            $x15 = ($x15 & 0xffffffff) + $j15;
+
+            /*
+            x0 = XOR(x0, LOAD32_LE(m + 0));
+            x1 = XOR(x1, LOAD32_LE(m + 4));
+            x2 = XOR(x2, LOAD32_LE(m + 8));
+            x3 = XOR(x3, LOAD32_LE(m + 12));
+            x4 = XOR(x4, LOAD32_LE(m + 16));
+            x5 = XOR(x5, LOAD32_LE(m + 20));
+            x6 = XOR(x6, LOAD32_LE(m + 24));
+            x7 = XOR(x7, LOAD32_LE(m + 28));
+            x8 = XOR(x8, LOAD32_LE(m + 32));
+            x9 = XOR(x9, LOAD32_LE(m + 36));
+            x10 = XOR(x10, LOAD32_LE(m + 40));
+            x11 = XOR(x11, LOAD32_LE(m + 44));
+            x12 = XOR(x12, LOAD32_LE(m + 48));
+            x13 = XOR(x13, LOAD32_LE(m + 52));
+            x14 = XOR(x14, LOAD32_LE(m + 56));
+            x15 = XOR(x15, LOAD32_LE(m + 60));
+            */
+            $x0  ^= self::load_4(self::substr($message, 0, 4));
+            $x1  ^= self::load_4(self::substr($message, 4, 4));
+            $x2  ^= self::load_4(self::substr($message, 8, 4));
+            $x3  ^= self::load_4(self::substr($message, 12, 4));
+            $x4  ^= self::load_4(self::substr($message, 16, 4));
+            $x5  ^= self::load_4(self::substr($message, 20, 4));
+            $x6  ^= self::load_4(self::substr($message, 24, 4));
+            $x7  ^= self::load_4(self::substr($message, 28, 4));
+            $x8  ^= self::load_4(self::substr($message, 32, 4));
+            $x9  ^= self::load_4(self::substr($message, 36, 4));
+            $x10 ^= self::load_4(self::substr($message, 40, 4));
+            $x11 ^= self::load_4(self::substr($message, 44, 4));
+            $x12 ^= self::load_4(self::substr($message, 48, 4));
+            $x13 ^= self::load_4(self::substr($message, 52, 4));
+            $x14 ^= self::load_4(self::substr($message, 56, 4));
+            $x15 ^= self::load_4(self::substr($message, 60, 4));
+
+            /*
+                j12 = PLUSONE(j12);
+                if (!j12) {
+                    j13 = PLUSONE(j13);
+                }
+             */
+            ++$j12;
+            if ($j12 & 0xf0000000) {
+                throw new Exception('Overflow');
+            }
+
+            /*
+            STORE32_LE(c + 0, x0);
+            STORE32_LE(c + 4, x1);
+            STORE32_LE(c + 8, x2);
+            STORE32_LE(c + 12, x3);
+            STORE32_LE(c + 16, x4);
+            STORE32_LE(c + 20, x5);
+            STORE32_LE(c + 24, x6);
+            STORE32_LE(c + 28, x7);
+            STORE32_LE(c + 32, x8);
+            STORE32_LE(c + 36, x9);
+            STORE32_LE(c + 40, x10);
+            STORE32_LE(c + 44, x11);
+            STORE32_LE(c + 48, x12);
+            STORE32_LE(c + 52, x13);
+            STORE32_LE(c + 56, x14);
+            STORE32_LE(c + 60, x15);
+            */
+            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
+                 self::store32_le((int) ($x1  & 0xffffffff)) .
+                 self::store32_le((int) ($x2  & 0xffffffff)) .
+                 self::store32_le((int) ($x3  & 0xffffffff)) .
+                 self::store32_le((int) ($x4  & 0xffffffff)) .
+                 self::store32_le((int) ($x5  & 0xffffffff)) .
+                 self::store32_le((int) ($x6  & 0xffffffff)) .
+                 self::store32_le((int) ($x7  & 0xffffffff)) .
+                 self::store32_le((int) ($x8  & 0xffffffff)) .
+                 self::store32_le((int) ($x9  & 0xffffffff)) .
+                 self::store32_le((int) ($x10 & 0xffffffff)) .
+                 self::store32_le((int) ($x11 & 0xffffffff)) .
+                 self::store32_le((int) ($x12 & 0xffffffff)) .
+                 self::store32_le((int) ($x13 & 0xffffffff)) .
+                 self::store32_le((int) ($x14 & 0xffffffff)) .
+                 self::store32_le((int) ($x15 & 0xffffffff));
+
+            /* Partial block */
+            if ($bytes < 64) {
+                $c .= self::substr($block, 0, $bytes);
+                break;
+            }
+
+            /* Full block */
+            $c .= $block;
+            $bytes -= 64;
+            if ($bytes <= 0) {
+                break;
+            }
+            $message = self::substr($message, 64);
+        }
+        /* end for(;;) loop */
+
+        $ctx[12] = $j12;
+        $ctx[13] = $j13;
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function stream($len = 64, $nonce = '', $key = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function ietfStream($len, $nonce = '', $key = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     */
+    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
+            $message
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     */
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce, $ic),
+            $message
+        );
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php b/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
new file mode 100644
index 0000000000000..bdbbb59998f40
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
@@ -0,0 +1,115 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_ChaCha20_Ctx
+ */
+class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util implements ArrayAccess
+{
+    /**
+     * @var SplFixedArray<int, int>
+     */
+    protected $container;
+
+    /**
+     * ParagonIE_Sodium_Core_ChaCha20_Ctx constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key     ChaCha20 key.
+     * @param string $iv      Initialization Vector (a.k.a. nonce).
+     * @param string $counter The initial counter value.
+     *                        Defaults to 8 0x00 bytes.
+     * @throws InvalidArgumentException
+     */
+    public function __construct($key = '', $iv = '', $counter = '')
+    {
+        if (self::strlen($key) !== 32) {
+            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
+        }
+        if (self::strlen($iv) !== 8) {
+            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
+        }
+        $this->container = new SplFixedArray(16);
+
+        /* "expand 32-byte k" as per ChaCha20 spec */
+        $this->container[0]  = 0x61707865;
+        $this->container[1]  = 0x3320646e;
+        $this->container[2]  = 0x79622d32;
+        $this->container[3]  = 0x6b206574;
+        $this->container[4]  = self::load_4(self::substr($key, 0, 4));
+        $this->container[5]  = self::load_4(self::substr($key, 4, 4));
+        $this->container[6]  = self::load_4(self::substr($key, 8, 4));
+        $this->container[7]  = self::load_4(self::substr($key, 12, 4));
+        $this->container[8]  = self::load_4(self::substr($key, 16, 4));
+        $this->container[9]  = self::load_4(self::substr($key, 20, 4));
+        $this->container[10] = self::load_4(self::substr($key, 24, 4));
+        $this->container[11] = self::load_4(self::substr($key, 28, 4));
+
+        if (empty($counter)) {
+            $this->container[12] = 0;
+            $this->container[13] = 0;
+        } else {
+            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
+            $this->container[13] = self::load_4(self::substr($counter, 4, 4));
+        }
+        $this->container[14] = self::load_4(self::substr($iv, 0, 4));
+        $this->container[15] = self::load_4(self::substr($iv, 4, 4));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $offset
+     * @param int $value
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (!is_int($offset)) {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        if (!is_int($value)) {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        $this->container[$offset] = $value;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return mixed|null
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset])
+            ? $this->container[$offset]
+            : null;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php b/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
new file mode 100644
index 0000000000000..72b7676061b1e
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
@@ -0,0 +1,37 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_ChaCha20_IetfCtx
+ */
+class ParagonIE_Sodium_Core_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core_ChaCha20_Ctx
+{
+    /**
+     * ParagonIE_Sodium_Core_ChaCha20_IetfCtx constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key     ChaCha20 key.
+     * @param string $iv      Initialization Vector (a.k.a. nonce).
+     * @param string $counter The initial counter value.
+     *                        Defaults to 4 0x00 bytes.
+     * @throws InvalidArgumentException
+     */
+    public function __construct($key = '', $iv = '', $counter = '')
+    {
+        if (self::strlen($iv) !== 12) {
+            throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
+        }
+        parent::__construct($key, self::substr($iv, 0, 8), $counter);
+
+        if (!empty($counter)) {
+            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
+        }
+        $this->container[13] = self::load_4(self::substr($iv, 0, 4));
+        $this->container[14] = self::load_4(self::substr($iv, 4, 4));
+        $this->container[15] = self::load_4(self::substr($iv, 8, 4));
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
new file mode 100644
index 0000000000000..ebea37acdeadc
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
@@ -0,0 +1,2567 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519
+ *
+ * Implements Curve25519 core functions
+ *
+ * Based on the ref10 curve25519 code provided by libsodium
+ *
+ * @ref https://github.com/jedisct1/libsodium/blob/master/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
+ */
+abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Curve25519_H
+{
+    /**
+     * Get a field element of size 10 with a value of 0
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_0()
+    {
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        );
+    }
+
+    /**
+     * Get a field element of size 10 with a value of 1
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_1()
+    {
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        );
+    }
+
+    /**
+     * Add two field elements.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_add(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g
+    ) {
+        $arr = array();
+        for ($i = 0; $i < 10; ++$i) {
+            $arr[$i] = (int) ($f[$i] + $g[$i]);
+        }
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($arr);
+    }
+
+    /**
+     * Constant-time conditional move.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @param int $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_cmov(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g,
+        $b = 0
+    ) {
+        $h = array();
+        $b *= -1;
+        for ($i = 0; $i < 10; ++$i) {
+            $x = (($f[$i] ^ $g[$i]) & $b);
+            $h[$i] = $f[$i] ^ $x;
+        }
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+    }
+
+    /**
+     * Create a copy of a field element.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $h = clone $f;
+        return $h;
+    }
+
+    /**
+     * Give: 32-byte string.
+     * Receive: A field element object to use for internal calculations.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     * @throws RangeException
+     */
+    public static function fe_frombytes($s)
+    {
+        if (self::strlen($s) !== 32) {
+            throw new RangeException('Expected a 32-byte string.');
+        }
+        $h0 = self::load_4($s);
+        $h1 = self::load_3(self::substr($s, 4, 3)) << 6;
+        $h2 = self::load_3(self::substr($s, 7, 3)) << 5;
+        $h3 = self::load_3(self::substr($s, 10, 3)) << 3;
+        $h4 = self::load_3(self::substr($s, 13, 3)) << 2;
+        $h5 = self::load_4(self::substr($s, 16, 4));
+        $h6 = self::load_3(self::substr($s, 20, 3)) << 7;
+        $h7 = self::load_3(self::substr($s, 23, 3)) << 5;
+        $h8 = self::load_3(self::substr($s, 26, 3)) << 4;
+        $h9 = (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2;
+
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19);
+        $h9 -= self::mul($carry9,  1 << 25);
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= self::mul($carry1,  1 << 25);
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= self::mul($carry3,  1 << 25);
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= self::mul($carry5,  1 << 25);
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= self::mul($carry7,  1 << 25);
+
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= self::mul($carry0,  1 << 26);
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= self::mul($carry2,  1 << 26);
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= self::mul($carry4,  1 << 26);
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= self::mul($carry6,  1 << 26);
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= self::mul($carry8,  1 << 26);
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+    /**
+     * Convert a field element to a byte string.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
+     * @return string
+     */
+    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
+    {
+        $h[0] = (int) $h[0];
+        $h[1] = (int) $h[1];
+        $h[2] = (int) $h[2];
+        $h[3] = (int) $h[3];
+        $h[4] = (int) $h[4];
+        $h[5] = (int) $h[5];
+        $h[6] = (int) $h[6];
+        $h[7] = (int) $h[7];
+        $h[8] = (int) $h[8];
+        $h[9] = (int) $h[9];
+
+        $q = (self::mul(19, $h[9]) + (1 << 24)) >> 25;
+        $q = ($h[0] + $q) >> 26;
+        $q = ($h[1] + $q) >> 25;
+        $q = ($h[2] + $q) >> 26;
+        $q = ($h[3] + $q) >> 25;
+        $q = ($h[4] + $q) >> 26;
+        $q = ($h[5] + $q) >> 25;
+        $q = ($h[6] + $q) >> 26;
+        $q = ($h[7] + $q) >> 25;
+        $q = ($h[8] + $q) >> 26;
+        $q = ($h[9] + $q) >> 25;
+
+        $h[0] += self::mul(19, $q);
+
+        $carry0 = $h[0] >> 26;
+        $h[1] += $carry0;
+        $h[0] -= self::mul($carry0,  1 << 26);
+        $carry1 = $h[1] >> 25;
+        $h[2] += $carry1;
+        $h[1] -= self::mul($carry1,  1 << 25);
+        $carry2 = $h[2] >> 26;
+        $h[3] += $carry2;
+        $h[2] -= self::mul($carry2,  1 << 26);
+        $carry3 = $h[3] >> 25;
+        $h[4] += $carry3;
+        $h[3] -= self::mul($carry3,  1 << 25);
+        $carry4 = $h[4] >> 26;
+        $h[5] += $carry4;
+        $h[4] -= self::mul($carry4,  1 << 26);
+        $carry5 = $h[5] >> 25;
+        $h[6] += $carry5;
+        $h[5] -= self::mul($carry5,  1 << 25);
+        $carry6 = $h[6] >> 26;
+        $h[7] += $carry6;
+        $h[6] -= self::mul($carry6,  1 << 26);
+        $carry7 = $h[7] >> 25;
+        $h[8] += $carry7;
+        $h[7] -= self::mul($carry7,  1 << 25);
+        $carry8 = $h[8] >> 26;
+        $h[9] += $carry8;
+        $h[8] -= self::mul($carry8,  1 << 26);
+        $carry9 = $h[9] >> 25;
+        $h[9] -= self::mul($carry9,  1 << 25);
+
+        /**
+         * @var array<int, int>
+         */
+        $s = array(
+            (int) (($h[0] >> 0) & 0xff),
+            (int) (($h[0] >> 8) & 0xff),
+            (int) (($h[0] >> 16) & 0xff),
+            (int) ((($h[0] >> 24) | ($h[1] << 2)) & 0xff),
+            (int) (($h[1] >> 6) & 0xff),
+            (int) (($h[1] >> 14) & 0xff),
+            (int) ((($h[1] >> 22) | ($h[2] << 3)) & 0xff),
+            (int) (($h[2] >> 5) & 0xff),
+            (int) (($h[2] >> 13) & 0xff),
+            (int) ((($h[2] >> 21) | ($h[3] << 5)) & 0xff),
+            (int) (($h[3] >> 3) & 0xff),
+            (int) (($h[3] >> 11) & 0xff),
+            (int) ((($h[3] >> 19) | ($h[4] << 6)) & 0xff),
+            (int) (($h[4] >> 2) & 0xff),
+            (int) (($h[4] >> 10) & 0xff),
+            (int) (($h[4] >> 18) & 0xff),
+            (int) (($h[5] >> 0) & 0xff),
+            (int) (($h[5] >> 8) & 0xff),
+            (int) (($h[5] >> 16) & 0xff),
+            (int) ((($h[5] >> 24) | ($h[6] << 1)) & 0xff),
+            (int) (($h[6] >> 7) & 0xff),
+            (int) (($h[6] >> 15) & 0xff),
+            (int) ((($h[6] >> 23) | ($h[7] << 3)) & 0xff),
+            (int) (($h[7] >> 5) & 0xff),
+            (int) (($h[7] >> 13) & 0xff),
+            (int) ((($h[7] >> 21) | ($h[8] << 4)) & 0xff),
+            (int) (($h[8] >> 4) & 0xff),
+            (int) (($h[8] >> 12) & 0xff),
+            (int) ((($h[8] >> 20) | ($h[9] << 6)) & 0xff),
+            (int) (($h[9] >> 2) & 0xff),
+            (int) (($h[9] >> 10) & 0xff),
+            (int) (($h[9] >> 18) & 0xff)
+        );
+        return self::intArrayToString($s);
+    }
+
+    /**
+     * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return int
+     */
+    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $str = self::fe_tobytes($f);
+        return self::chrToInt($str[0]) & 1;
+    }
+
+    /**
+     * Returns 0 if this field element results in all NUL bytes.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return bool
+     */
+    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        static $zero;
+        if ($zero === null) {
+            $zero = str_repeat("\x00", 32);
+        }
+        $str = self::fe_tobytes($f);
+        return !self::verify_32($str, $zero);
+    }
+
+    /**
+     * Multiply two field elements
+     *
+     * h = f * g
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @security Is multiplication a source of timing leaks? If so, can we do
+     *           anything to prevent that from happening?
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_mul(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g
+    ) {
+        $f0 = $f[0];
+        $f1 = $f[1];
+        $f2 = $f[2];
+        $f3 = $f[3];
+        $f4 = $f[4];
+        $f5 = $f[5];
+        $f6 = $f[6];
+        $f7 = $f[7];
+        $f8 = $f[8];
+        $f9 = $f[9];
+        $g0 = $g[0];
+        $g1 = $g[1];
+        $g2 = $g[2];
+        $g3 = $g[3];
+        $g4 = $g[4];
+        $g5 = $g[5];
+        $g6 = $g[6];
+        $g7 = $g[7];
+        $g8 = $g[8];
+        $g9 = $g[9];
+        $g1_19 = self::mul(19, $g1);
+        $g2_19 = self::mul(19, $g2);
+        $g3_19 = self::mul(19, $g3);
+        $g4_19 = self::mul(19, $g4);
+        $g5_19 = self::mul(19, $g5);
+        $g6_19 = self::mul(19, $g6);
+        $g7_19 = self::mul(19, $g7);
+        $g8_19 = self::mul(19, $g8);
+        $g9_19 = self::mul(19, $g9);
+        $f1_2 = $f1 << 1;
+        $f3_2 = $f3 << 1;
+        $f5_2 = $f5 << 1;
+        $f7_2 = $f7 << 1;
+        $f9_2 = $f9 << 1;
+        $f0g0    = self::mul($f0,    $g0);
+        $f0g1    = self::mul($f0,    $g1);
+        $f0g2    = self::mul($f0,    $g2);
+        $f0g3    = self::mul($f0,    $g3);
+        $f0g4    = self::mul($f0,    $g4);
+        $f0g5    = self::mul($f0,    $g5);
+        $f0g6    = self::mul($f0,    $g6);
+        $f0g7    = self::mul($f0,    $g7);
+        $f0g8    = self::mul($f0,    $g8);
+        $f0g9    = self::mul($f0,    $g9);
+        $f1g0    = self::mul($f1,    $g0);
+        $f1g1_2  = self::mul($f1_2,  $g1);
+        $f1g2    = self::mul($f1,    $g2);
+        $f1g3_2  = self::mul($f1_2,  $g3);
+        $f1g4    = self::mul($f1,    $g4);
+        $f1g5_2  = self::mul($f1_2,  $g5);
+        $f1g6    = self::mul($f1,    $g6);
+        $f1g7_2  = self::mul($f1_2,  $g7);
+        $f1g8    = self::mul($f1,    $g8);
+        $f1g9_38 = self::mul($f1_2,  $g9_19);
+        $f2g0    = self::mul($f2,    $g0);
+        $f2g1    = self::mul($f2,    $g1);
+        $f2g2    = self::mul($f2,    $g2);
+        $f2g3    = self::mul($f2,    $g3);
+        $f2g4    = self::mul($f2,    $g4);
+        $f2g5    = self::mul($f2,    $g5);
+        $f2g6    = self::mul($f2,    $g6);
+        $f2g7    = self::mul($f2,    $g7);
+        $f2g8_19 = self::mul($f2,    $g8_19);
+        $f2g9_19 = self::mul($f2,    $g9_19);
+        $f3g0    = self::mul($f3,    $g0);
+        $f3g1_2  = self::mul($f3_2,  $g1);
+        $f3g2    = self::mul($f3,    $g2);
+        $f3g3_2  = self::mul($f3_2,  $g3);
+        $f3g4    = self::mul($f3,    $g4);
+        $f3g5_2  = self::mul($f3_2,  $g5);
+        $f3g6    = self::mul($f3,    $g6);
+        $f3g7_38 = self::mul($f3_2,  $g7_19);
+        $f3g8_19 = self::mul($f3,    $g8_19);
+        $f3g9_38 = self::mul($f3_2,  $g9_19);
+        $f4g0    = self::mul($f4,    $g0);
+        $f4g1    = self::mul($f4,    $g1);
+        $f4g2    = self::mul($f4,    $g2);
+        $f4g3    = self::mul($f4,    $g3);
+        $f4g4    = self::mul($f4,    $g4);
+        $f4g5    = self::mul($f4,    $g5);
+        $f4g6_19 = self::mul($f4,    $g6_19);
+        $f4g7_19 = self::mul($f4,    $g7_19);
+        $f4g8_19 = self::mul($f4,    $g8_19);
+        $f4g9_19 = self::mul($f4,    $g9_19);
+        $f5g0    = self::mul($f5,    $g0);
+        $f5g1_2  = self::mul($f5_2,  $g1);
+        $f5g2    = self::mul($f5,    $g2);
+        $f5g3_2  = self::mul($f5_2,  $g3);
+        $f5g4    = self::mul($f5,    $g4);
+        $f5g5_38 = self::mul($f5_2,  $g5_19);
+        $f5g6_19 = self::mul($f5,    $g6_19);
+        $f5g7_38 = self::mul($f5_2,  $g7_19);
+        $f5g8_19 = self::mul($f5,    $g8_19);
+        $f5g9_38 = self::mul($f5_2,  $g9_19);
+        $f6g0    = self::mul($f6,    $g0);
+        $f6g1    = self::mul($f6,    $g1);
+        $f6g2    = self::mul($f6,    $g2);
+        $f6g3    = self::mul($f6,    $g3);
+        $f6g4_19 = self::mul($f6,    $g4_19);
+        $f6g5_19 = self::mul($f6,    $g5_19);
+        $f6g6_19 = self::mul($f6,    $g6_19);
+        $f6g7_19 = self::mul($f6,    $g7_19);
+        $f6g8_19 = self::mul($f6,    $g8_19);
+        $f6g9_19 = self::mul($f6,    $g9_19);
+        $f7g0    = self::mul($f7,    $g0);
+        $f7g1_2  = self::mul($f7_2,  $g1);
+        $f7g2    = self::mul($f7,    $g2);
+        $f7g3_38 = self::mul($f7_2,  $g3_19);
+        $f7g4_19 = self::mul($f7,    $g4_19);
+        $f7g5_38 = self::mul($f7_2,  $g5_19);
+        $f7g6_19 = self::mul($f7,    $g6_19);
+        $f7g7_38 = self::mul($f7_2,  $g7_19);
+        $f7g8_19 = self::mul($f7,    $g8_19);
+        $f7g9_38 = self::mul($f7_2,  $g9_19);
+        $f8g0    = self::mul($f8,    $g0);
+        $f8g1    = self::mul($f8,    $g1);
+        $f8g2_19 = self::mul($f8,    $g2_19);
+        $f8g3_19 = self::mul($f8,    $g3_19);
+        $f8g4_19 = self::mul($f8,    $g4_19);
+        $f8g5_19 = self::mul($f8,    $g5_19);
+        $f8g6_19 = self::mul($f8,    $g6_19);
+        $f8g7_19 = self::mul($f8,    $g7_19);
+        $f8g8_19 = self::mul($f8,    $g8_19);
+        $f8g9_19 = self::mul($f8,    $g9_19);
+        $f9g0    = self::mul($f9,    $g0);
+        $f9g1_38 = self::mul($f9_2,  $g1_19);
+        $f9g2_19 = self::mul($f9,    $g2_19);
+        $f9g3_38 = self::mul($f9_2,  $g3_19);
+        $f9g4_19 = self::mul($f9,    $g4_19);
+        $f9g5_38 = self::mul($f9_2,  $g5_19);
+        $f9g6_19 = self::mul($f9,    $g6_19);
+        $f9g7_38 = self::mul($f9_2,  $g7_19);
+        $f9g8_19 = self::mul($f9,    $g8_19);
+        $f9g9_38 = self::mul($f9_2,  $g9_19);
+        $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
+        $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
+        $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
+        $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
+        $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
+        $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
+        $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
+        $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
+        $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
+        $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
+
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19);
+        $h9 -= $carry9 << 25;
+
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+    /**
+     * Get the negative values for each piece of the field element.
+     *
+     * h = -f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $h = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        for ($i = 0; $i < 10; ++$i) {
+            $h[$i] = -$f[$i];
+        }
+        return $h;
+    }
+
+    /**
+     * Square a field element
+     *
+     * h = f * f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $f0 = (int) $f[0];
+        $f1 = (int) $f[1];
+        $f2 = (int) $f[2];
+        $f3 = (int) $f[3];
+        $f4 = (int) $f[4];
+        $f5 = (int) $f[5];
+        $f6 = (int) $f[6];
+        $f7 = (int) $f[7];
+        $f8 = (int) $f[8];
+        $f9 = (int) $f[9];
+
+        $f0_2 = $f0 << 1;
+        $f1_2 = $f1 << 1;
+        $f2_2 = $f2 << 1;
+        $f3_2 = $f3 << 1;
+        $f4_2 = $f4 << 1;
+        $f5_2 = $f5 << 1;
+        $f6_2 = $f6 << 1;
+        $f7_2 = $f7 << 1;
+        $f5_38 = self::mul(38, $f5);
+        $f6_19 = self::mul(19, $f6);
+        $f7_38 = self::mul(38, $f7);
+        $f8_19 = self::mul(19, $f8);
+        $f9_38 = self::mul(38, $f9);
+        $f0f0    = self::mul($f0,    $f0);
+        $f0f1_2  = self::mul($f0_2,  $f1);
+        $f0f2_2  = self::mul($f0_2,  $f2);
+        $f0f3_2  = self::mul($f0_2,  $f3);
+        $f0f4_2  = self::mul($f0_2,  $f4);
+        $f0f5_2  = self::mul($f0_2,  $f5);
+        $f0f6_2  = self::mul($f0_2,  $f6);
+        $f0f7_2  = self::mul($f0_2,  $f7);
+        $f0f8_2  = self::mul($f0_2,  $f8);
+        $f0f9_2  = self::mul($f0_2,  $f9);
+        $f1f1_2  = self::mul($f1_2,  $f1);
+        $f1f2_2  = self::mul($f1_2,  $f2);
+        $f1f3_4  = self::mul($f1_2,  $f3_2);
+        $f1f4_2  = self::mul($f1_2,  $f4);
+        $f1f5_4  = self::mul($f1_2,  $f5_2);
+        $f1f6_2  = self::mul($f1_2,  $f6);
+        $f1f7_4  = self::mul($f1_2,  $f7_2);
+        $f1f8_2  = self::mul($f1_2,  $f8);
+        $f1f9_76 = self::mul($f1_2,  $f9_38);
+        $f2f2    = self::mul($f2,    $f2);
+        $f2f3_2  = self::mul($f2_2,  $f3);
+        $f2f4_2  = self::mul($f2_2,  $f4);
+        $f2f5_2  = self::mul($f2_2,  $f5);
+        $f2f6_2  = self::mul($f2_2,  $f6);
+        $f2f7_2  = self::mul($f2_2,  $f7);
+        $f2f8_38 = self::mul($f2_2,  $f8_19);
+        $f2f9_38 = self::mul($f2,    $f9_38);
+        $f3f3_2  = self::mul($f3_2,  $f3);
+        $f3f4_2  = self::mul($f3_2,  $f4);
+        $f3f5_4  = self::mul($f3_2,  $f5_2);
+        $f3f6_2  = self::mul($f3_2,  $f6);
+        $f3f7_76 = self::mul($f3_2,  $f7_38);
+        $f3f8_38 = self::mul($f3_2,  $f8_19);
+        $f3f9_76 = self::mul($f3_2,  $f9_38);
+        $f4f4    = self::mul($f4,    $f4);
+        $f4f5_2  = self::mul($f4_2,  $f5);
+        $f4f6_38 = self::mul($f4_2,  $f6_19);
+        $f4f7_38 = self::mul($f4,    $f7_38);
+        $f4f8_38 = self::mul($f4_2,  $f8_19);
+        $f4f9_38 = self::mul($f4,    $f9_38);
+        $f5f5_38 = self::mul($f5,    $f5_38);
+        $f5f6_38 = self::mul($f5_2,  $f6_19);
+        $f5f7_76 = self::mul($f5_2,  $f7_38);
+        $f5f8_38 = self::mul($f5_2,  $f8_19);
+        $f5f9_76 = self::mul($f5_2,  $f9_38);
+        $f6f6_19 = self::mul($f6,    $f6_19);
+        $f6f7_38 = self::mul($f6,    $f7_38);
+        $f6f8_38 = self::mul($f6_2,  $f8_19);
+        $f6f9_38 = self::mul($f6,    $f9_38);
+        $f7f7_38 = self::mul($f7,    $f7_38);
+        $f7f8_38 = self::mul($f7_2,  $f8_19);
+        $f7f9_76 = self::mul($f7_2,  $f9_38);
+        $f8f8_19 = self::mul($f8,    $f8_19);
+        $f8f9_38 = self::mul($f8,    $f9_38);
+        $f9f9_38 = self::mul($f9,    $f9_38);
+        $h0 = $f0f0   + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
+        $h1 = $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38;
+        $h2 = $f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
+        $h3 = $f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38;
+        $h4 = $f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38;
+        $h5 = $f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38;
+        $h6 = $f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19;
+        $h7 = $f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38;
+        $h8 = $f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38;
+        $h9 = $f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2;
+
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19);
+        $h9 -= $carry9 << 25;
+
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+
+    /**
+     * Square and double a field element
+     *
+     * h = 2 * f * f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $f0 = (int) $f[0];
+        $f1 = (int) $f[1];
+        $f2 = (int) $f[2];
+        $f3 = (int) $f[3];
+        $f4 = (int) $f[4];
+        $f5 = (int) $f[5];
+        $f6 = (int) $f[6];
+        $f7 = (int) $f[7];
+        $f8 = (int) $f[8];
+        $f9 = (int) $f[9];
+
+        $f0_2 = $f0 << 1;
+        $f1_2 = $f1 << 1;
+        $f2_2 = $f2 << 1;
+        $f3_2 = $f3 << 1;
+        $f4_2 = $f4 << 1;
+        $f5_2 = $f5 << 1;
+        $f6_2 = $f6 << 1;
+        $f7_2 = $f7 << 1;
+        $f5_38 = self::mul(38, $f5); /* 1.959375*2^30 */
+        $f6_19 = self::mul(19, $f6); /* 1.959375*2^30 */
+        $f7_38 = self::mul(38, $f7); /* 1.959375*2^30 */
+        $f8_19 = self::mul(19, $f8); /* 1.959375*2^30 */
+        $f9_38 = self::mul(38, $f9); /* 1.959375*2^30 */
+        $f0f0 = self::mul($f0, (int) $f0);
+        $f0f1_2 = self::mul($f0_2, (int) $f1);
+        $f0f2_2 = self::mul($f0_2, (int) $f2);
+        $f0f3_2 = self::mul($f0_2, (int) $f3);
+        $f0f4_2 = self::mul($f0_2, (int) $f4);
+        $f0f5_2 = self::mul($f0_2, (int) $f5);
+        $f0f6_2 = self::mul($f0_2, (int) $f6);
+        $f0f7_2 = self::mul($f0_2, (int) $f7);
+        $f0f8_2 = self::mul($f0_2, (int) $f8);
+        $f0f9_2 = self::mul($f0_2, (int) $f9);
+        $f1f1_2 = self::mul($f1_2,  (int) $f1);
+        $f1f2_2 = self::mul($f1_2,  (int) $f2);
+        $f1f3_4 = self::mul($f1_2,  (int) $f3_2);
+        $f1f4_2 = self::mul($f1_2,  (int) $f4);
+        $f1f5_4 = self::mul($f1_2,  (int) $f5_2);
+        $f1f6_2 = self::mul($f1_2,  (int) $f6);
+        $f1f7_4 = self::mul($f1_2,  (int) $f7_2);
+        $f1f8_2 = self::mul($f1_2,  (int) $f8);
+        $f1f9_76 = self::mul($f1_2,  (int) $f9_38);
+        $f2f2 = self::mul($f2,  (int) $f2);
+        $f2f3_2 = self::mul($f2_2,  (int) $f3);
+        $f2f4_2 = self::mul($f2_2,  (int) $f4);
+        $f2f5_2 = self::mul($f2_2,  (int) $f5);
+        $f2f6_2 = self::mul($f2_2,  (int) $f6);
+        $f2f7_2 = self::mul($f2_2,  (int) $f7);
+        $f2f8_38 = self::mul($f2_2,  (int) $f8_19);
+        $f2f9_38 = self::mul($f2,  (int) $f9_38);
+        $f3f3_2 = self::mul($f3_2,  (int) $f3);
+        $f3f4_2 = self::mul($f3_2,  (int) $f4);
+        $f3f5_4 = self::mul($f3_2,  (int) $f5_2);
+        $f3f6_2 = self::mul($f3_2,  (int) $f6);
+        $f3f7_76 = self::mul($f3_2,  (int) $f7_38);
+        $f3f8_38 = self::mul($f3_2,  (int) $f8_19);
+        $f3f9_76 = self::mul($f3_2,  (int) $f9_38);
+        $f4f4 = self::mul($f4,  (int) $f4);
+        $f4f5_2 = self::mul($f4_2,  (int) $f5);
+        $f4f6_38 = self::mul($f4_2,  (int) $f6_19);
+        $f4f7_38 = self::mul($f4,  (int) $f7_38);
+        $f4f8_38 = self::mul($f4_2,  (int) $f8_19);
+        $f4f9_38 = self::mul($f4,  (int) $f9_38);
+        $f5f5_38 = self::mul($f5,  (int) $f5_38);
+        $f5f6_38 = self::mul($f5_2,  (int) $f6_19);
+        $f5f7_76 = self::mul($f5_2,  (int) $f7_38);
+        $f5f8_38 = self::mul($f5_2,  (int) $f8_19);
+        $f5f9_76 = self::mul($f5_2,  (int) $f9_38);
+        $f6f6_19 = self::mul($f6,  (int) $f6_19);
+        $f6f7_38 = self::mul($f6,  (int) $f7_38);
+        $f6f8_38 = self::mul($f6_2,  (int) $f8_19);
+        $f6f9_38 = self::mul($f6,  (int) $f9_38);
+        $f7f7_38 = self::mul($f7,  (int) $f7_38);
+        $f7f8_38 = self::mul($f7_2,  (int) $f8_19);
+        $f7f9_76 = self::mul($f7_2,  (int) $f9_38);
+        $f8f8_19 = self::mul($f8,  (int) $f8_19);
+        $f8f9_38 = self::mul($f8,  (int) $f9_38);
+        $f9f9_38 = self::mul($f9,  (int) $f9_38);
+
+        $h0 = (int) ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38);
+        $h1 = (int) ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38);
+        $h2 = (int) ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19);
+        $h3 = (int) ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38);
+        $h4 = (int) ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38);
+        $h5 = (int) ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38);
+        $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19);
+        $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38);
+        $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38);
+        $h9 = (int) ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2);
+
+        $h0 = (int) ($h0 + $h0);
+        $h1 = (int) ($h1 + $h1);
+        $h2 = (int) ($h2 + $h2);
+        $h3 = (int) ($h3 + $h3);
+        $h4 = (int) ($h4 + $h4);
+        $h5 = (int) ($h5 + $h5);
+        $h6 = (int) ($h6 + $h6);
+        $h7 = (int) ($h7 + $h7);
+        $h8 = (int) ($h8 + $h8);
+        $h9 = (int) ($h9 + $h9);
+
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19);
+        $h9 -= $carry9 << 25;
+
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
+    {
+        $z = clone $Z;
+        $t0 = self::fe_sq($z);
+        $t1 = self::fe_sq($t0);
+        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul($z, $t1);
+        $t0 = self::fe_mul($t0, $t1);
+        $t2 = self::fe_sq($t0);
+        $t1 = self::fe_mul($t1, $t2);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 5; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 10; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t2 = self::fe_mul($t2, $t1);
+        $t3 = self::fe_sq($t2);
+        for ($i = 1; $i < 20; ++$i) {
+            $t3 = self::fe_sq($t3);
+        }
+        $t2 = self::fe_mul($t3, $t2);
+        $t2 = self::fe_sq($t2);
+        for ($i = 1; $i < 10; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 50; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t2 = self::fe_mul($t2, $t1);
+        $t3 = self::fe_sq($t2);
+        for ($i = 1; $i < 100; ++$i) {
+            $t3 = self::fe_sq($t3);
+        }
+        $t2 = self::fe_mul($t3, $t2);
+        $t2 = self::fe_sq($t2);
+        for ($i = 1; $i < 50; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+        for ($i = 1; $i < 5; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+        return self::fe_mul($t1, $t0);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
+    {
+        # fe_sq(t0, z);
+        # fe_sq(t1, t0);
+        # fe_sq(t1, t1);
+        # fe_mul(t1, z, t1);
+        # fe_mul(t0, t0, t1);
+        # fe_sq(t0, t0);
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_sq($z);
+        $t1 = self::fe_sq($t0);
+        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul($z, $t1);
+        $t0 = self::fe_mul($t0, $t1);
+        $t0 = self::fe_sq($t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 5; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 5; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 10; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 10; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t1, t1, t0);
+        # fe_sq(t2, t1);
+        $t1 = self::fe_mul($t1, $t0);
+        $t2 = self::fe_sq($t1);
+
+        # for (i = 1; i < 20; ++i) {
+        #     fe_sq(t2, t2);
+        # }
+        for ($i = 1; $i < 20; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+
+        # fe_mul(t1, t2, t1);
+        # fe_sq(t1, t1);
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+
+        # for (i = 1; i < 10; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 10; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 50; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 50; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t1, t1, t0);
+        # fe_sq(t2, t1);
+        $t1 = self::fe_mul($t1, $t0);
+        $t2 = self::fe_sq($t1);
+
+        # for (i = 1; i < 100; ++i) {
+        #     fe_sq(t2, t2);
+        # }
+        for ($i = 1; $i < 100; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+
+        # fe_mul(t1, t2, t1);
+        # fe_sq(t1, t1);
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+
+        # for (i = 1; i < 50; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 50; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t0, t0);
+        # fe_sq(t0, t0);
+        # fe_mul(out, t0, z);
+        $t0 = self::fe_mul($t1, $t0);
+        $t0 = self::fe_sq($t0);
+        $t0 = self::fe_sq($t0);
+        return self::fe_mul($t0, $z);
+    }
+
+    /**
+     * Subtract two field elements.
+     *
+     * h = f - g
+     *
+     * Preconditions:
+     * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+     * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+     *
+     * Postconditions:
+     * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
+    {
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) ($f[0] - $g[0]),
+                (int) ($f[1] - $g[1]),
+                (int) ($f[2] - $g[2]),
+                (int) ($f[3] - $g[3]),
+                (int) ($f[4] - $g[4]),
+                (int) ($f[5] - $g[5]),
+                (int) ($f[6] - $g[6]),
+                (int) ($f[7] - $g[7]),
+                (int) ($f[8] - $g[8]),
+                (int) ($f[9] - $g[9])
+            )
+        );
+    }
+
+    /**
+     * Add two group elements.
+     *
+     * r = p + q
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_add(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+    ) {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->YplusX);
+        $r->Y = self::fe_mul($r->Y, $q->YminusX);
+        $r->T = self::fe_mul($q->T2d, $p->T);
+        $r->X = self::fe_mul($p->Z, $q->Z);
+        $t0   = self::fe_add($r->X, $r->X);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_add($t0, $r->T);
+        $r->T = self::fe_sub($t0, $r->T);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
+     * @param string $a
+     * @return array<int, mixed>
+     */
+    public static function slide($a)
+    {
+        if (self::strlen($a) < 256) {
+            if (self::strlen($a) < 16) {
+                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+            }
+        }
+        $r = array();
+        for ($i = 0; $i < 256; ++$i) {
+            $r[$i] = 1 & (
+                    self::chrToInt($a[$i >> 3])
+                        >>
+                    ($i & 7)
+                );
+        }
+
+        for ($i = 0;$i < 256;++$i) {
+            if ($r[$i]) {
+                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
+                    if ($r[$i + $b]) {
+                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
+                            $r[$i] += $r[$i + $b] << $b;
+                            $r[$i + $b] = 0;
+                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
+                            $r[$i] -= $r[$i + $b] << $b;
+                            for ($k = $i + $b; $k < 256; ++$k) {
+                                if (!$r[$k]) {
+                                    $r[$k] = 1;
+                                    break;
+                                }
+                                $r[$k] = 0;
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     */
+    public static function ge_frombytes_negate_vartime($s)
+    {
+        static $d = null;
+        if (!$d) {
+            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
+        }
+
+        # fe_frombytes(h->Y,s);
+        # fe_1(h->Z);
+        $h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
+            self::fe_0(),
+            self::fe_frombytes($s),
+            self::fe_1()
+        );
+
+        # fe_sq(u,h->Y);
+        # fe_mul(v,u,d);
+        # fe_sub(u,u,h->Z);       /* u = y^2-1 */
+        # fe_add(v,v,h->Z);       /* v = dy^2+1 */
+        $u = self::fe_sq($h->Y);
+        $v = self::fe_mul($u, $d);
+        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
+        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+
+        # fe_sq(v3,v);
+        # fe_mul(v3,v3,v);        /* v3 = v^3 */
+        # fe_sq(h->X,v3);
+        # fe_mul(h->X,h->X,v);
+        # fe_mul(h->X,h->X,u);    /* x = uv^7 */
+        $v3 = self::fe_sq($v);
+        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
+        $h->X = self::fe_sq($v3);
+        $h->X = self::fe_mul($h->X, $v);
+        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+
+        # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
+        # fe_mul(h->X,h->X,v3);
+        # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
+        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
+        $h->X = self::fe_mul($h->X, $v3);
+        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+
+        # fe_sq(vxx,h->X);
+        # fe_mul(vxx,vxx,v);
+        # fe_sub(check,vxx,u);    /* vx^2-u */
+        $vxx = self::fe_sq($h->X);
+        $vxx = self::fe_mul($vxx, $v);
+        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
+
+        # if (fe_isnonzero(check)) {
+        #     fe_add(check,vxx,u);  /* vx^2+u */
+        #     if (fe_isnonzero(check)) {
+        #         return -1;
+        #     }
+        #     fe_mul(h->X,h->X,sqrtm1);
+        # }
+        if (self::fe_isnonzero($check)) {
+            $check = self::fe_add($vxx, $u); /* vx^2 + u */
+            if (self::fe_isnonzero($check)) {
+                throw new RangeException('Internal check failed.');
+            }
+            $h->X = self::fe_mul(
+                $h->X,
+                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1)
+            );
+        }
+
+        # if (fe_isnegative(h->X) == (s[31] >> 7)) {
+        #     fe_neg(h->X,h->X);
+        # }
+        $i = self::chrToInt($s[31]);
+        if (self::fe_isnegative($h->X) === ($i >> 7)) {
+            $h->X = self::fe_neg($h->X);
+        }
+
+        # fe_mul(h->T,h->X,h->Y);
+        $h->T = self::fe_mul($h->X, $h->Y);
+        return $h;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_madd(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+    ) {
+        $r = clone $R;
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->yplusx);
+        $r->Y = self::fe_mul($r->Y, $q->yminusx);
+        $r->T = self::fe_mul($q->xy2d, $p->T);
+        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_add($t0, $r->T);
+        $r->T = self::fe_sub($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_msub(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+    ) {
+        $r = clone $R;
+
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->yminusx);
+        $r->Y = self::fe_mul($r->Y, $q->yplusx);
+        $r->T = self::fe_mul($q->xy2d, $p->T);
+        $t0 = self::fe_add($p->Z, $p->Z);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_sub($t0, $r->T);
+        $r->T = self::fe_add($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     */
+    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
+        $r->X = self::fe_mul($p->X, $p->T);
+        $r->Y = self::fe_mul($p->Y, $p->Z);
+        $r->Z = self::fe_mul($p->Z, $p->T);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     */
+    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
+        $r->X = self::fe_mul($p->X, $p->T);
+        $r->Y = self::fe_mul($p->Y, $p->Z);
+        $r->Z = self::fe_mul($p->Z, $p->T);
+        $r->T = self::fe_mul($p->X, $p->Y);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     */
+    public static function ge_p2_0()
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
+            self::fe_0(),
+            self::fe_1(),
+            self::fe_1()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
+    {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+        $r->X = self::fe_sq($p->X);
+        $r->Z = self::fe_sq($p->Y);
+        $r->T = self::fe_sq2($p->Z);
+        $r->Y = self::fe_add($p->X, $p->Y);
+        $t0   = self::fe_sq($r->Y);
+        $r->Y = self::fe_add($r->Z, $r->X);
+        $r->Z = self::fe_sub($r->Z, $r->X);
+        $r->X = self::fe_sub($t0, $r->Y);
+        $r->T = self::fe_sub($r->T, $r->Z);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     */
+    public static function ge_p3_0()
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
+            self::fe_0(),
+            self::fe_1(),
+            self::fe_1(),
+            self::fe_0()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+     */
+    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    {
+        static $d2 = null;
+        if ($d2 === null) {
+            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
+        }
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
+        $r->YplusX = self::fe_add($p->Y, $p->X);
+        $r->YminusX = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_copy($p->Z);
+        $r->T2d = self::fe_mul($p->T, $d2);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     */
+    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
+            $p->X,
+            $p->Y,
+            $p->Z
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
+     * @return string
+     */
+    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
+    {
+        $recip = self::fe_invert($h->Z);
+        $x = self::fe_mul($h->X, $recip);
+        $y = self::fe_mul($h->Y, $recip);
+        $s = self::fe_tobytes($y);
+        $s[31] = self::intToChr(
+            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        );
+        return $s;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    {
+        $q = self::ge_p3_to_p2($p);
+        return self::ge_p2_dbl($q);
+    }
+
+    /**
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+     */
+    public static function ge_precomp_0()
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+            self::fe_1(),
+            self::fe_1(),
+            self::fe_0()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $b
+     * @param int $c
+     * @return int
+     */
+    public static function equal($b, $c)
+    {
+        return (($b ^ $c) - 1 & 0xffffffff) >> 31;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $char
+     * @return int (1 = yes, 0 = no)
+     */
+    public static function negative($char)
+    {
+        if (is_int($char)) {
+            return $char < 0 ? 1 : 0;
+        }
+        $x = self::chrToInt(self::substr($char, 0, 1));
+        if (PHP_INT_SIZE === 8) {
+            return $x >> 63;
+        }
+        return $x >> 31;
+    }
+
+    /**
+     * Conditional move
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u
+     * @param int $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+     */
+    public static function cmov(
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u,
+        $b
+    ) {
+        if (!is_int($b)) {
+            throw new InvalidArgumentException('Expected an integer.');
+        }
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+            self::fe_cmov($t->yplusx, $u->yplusx, $b),
+            self::fe_cmov($t->yminusx, $u->yminusx, $b),
+            self::fe_cmov($t->xy2d, $u->xy2d, $b)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $pos
+     * @param int $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+     */
+    public static function ge_select($pos = 0, $b = 0)
+    {
+        static $base = null;
+        if ($base === null) {
+            $base = array();
+            foreach (self::$base as $i => $bas) {
+                for ($j = 0; $j < 8; ++$j) {
+                    $base[$i][$j] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][0]),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][1]),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][2])
+                    );
+                }
+            }
+        }
+        if (!is_int($pos)) {
+            throw new InvalidArgumentException('Position must be an integer');
+        }
+        if ($pos < 0 || $pos > 31) {
+            throw new RangeException('Position is out of range [0, 31]');
+        }
+
+        $bnegative = self::negative($b);
+        $babs = $b - (((-$bnegative) & $b) << 1);
+
+        $t = self::ge_precomp_0();
+        for ($i = 0; $i < 8; ++$i) {
+            $t = self::cmov(
+                $t,
+                $base[$pos][$i],
+                self::equal($babs, $i + 1)
+            );
+        }
+        $minusT = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+            self::fe_copy($t->yminusx),
+            self::fe_copy($t->yplusx),
+            self::fe_neg($t->xy2d)
+        );
+        return self::cmov($t, $minusT, $bnegative);
+    }
+
+    /**
+     * Subtract two group elements.
+     *
+     * r = p - q
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_sub(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+    ) {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->YminusX);
+        $r->Y = self::fe_mul($r->Y, $q->YplusX);
+        $r->T = self::fe_mul($q->T2d, $p->T);
+        $r->X = self::fe_mul($p->Z, $q->Z);
+        $t0 = self::fe_add($r->X, $r->X);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_sub($t0, $r->T);
+        $r->T = self::fe_add($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * Convert a group element to a byte string.
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h
+     * @return string
+     */
+    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
+    {
+        $recip = self::fe_invert($h->Z);
+        $x = self::fe_mul($h->X, $recip);
+        $y = self::fe_mul($h->Y, $recip);
+        $s = self::fe_tobytes($y);
+        $s[31] = self::intToChr(
+            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        );
+        return $s;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
+     * @param string $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     */
+    public static function ge_double_scalarmult_vartime(
+        $a,
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A,
+        $b
+    ) {
+        /**
+         * @var ParagonIE_Sodium_Core_Curve25519_Ge_Cached[]
+         */
+        $Ai = array();
+
+        /**
+         * @var ParagonIE_Sodium_Core_Curve25519_Ge_Precomp[]
+         */
+        static $Bi = array();
+        if (!$Bi) {
+            for ($i = 0; $i < 8; ++$i) {
+                $Bi[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][0]),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][1]),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][2])
+                );
+            }
+        }
+        for ($i = 0; $i < 8; ++$i) {
+            $Ai[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
+                self::fe_0(),
+                self::fe_0(),
+                self::fe_0(),
+                self::fe_0()
+            );
+        }
+
+        # slide(aslide,a);
+        # slide(bslide,b);
+        $aslide = self::slide($a);
+        $bslide = self::slide($b);
+
+        # ge_p3_to_cached(&Ai[0],A);
+        # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
+        $Ai[0] = self::ge_p3_to_cached($A);
+        $t = self::ge_p3_dbl($A);
+        $A2 = self::ge_p1p1_to_p3($t);
+
+        # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
+        # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
+        # ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
+        # ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
+        # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
+        # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
+        # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
+        for ($i = 0; $i < 7; ++$i) {
+            $t = self::ge_add($A2, $Ai[$i]);
+            $u = self::ge_p1p1_to_p3($t);
+            $Ai[$i + 1] = self::ge_p3_to_cached($u);
+        }
+
+        # ge_p2_0(r);
+        $r = self::ge_p2_0();
+
+        # for (i = 255;i >= 0;--i) {
+        #     if (aslide[i] || bslide[i]) break;
+        # }
+        $i = 255;
+        for (; $i >= 0; --$i) {
+            if ($aslide[$i] || $bslide[$i]) {
+                break;
+            }
+        }
+
+        # for (;i >= 0;--i) {
+        for (; $i >= 0; --$i) {
+            # ge_p2_dbl(&t,r);
+            $t = self::ge_p2_dbl($r);
+
+            # if (aslide[i] > 0) {
+            if ($aslide[$i] > 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_add(&t,&u,&Ai[aslide[i]/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_add(
+                    $u,
+                    $Ai[(int) floor($aslide[$i] / 2)]
+                );
+            # } else if (aslide[i] < 0) {
+            } elseif ($aslide[$i] < 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_sub(
+                    $u,
+                    $Ai[(int) floor(-$aslide[$i] / 2)]
+                );
+            }
+
+            # if (bslide[i] > 0) {
+            if ($bslide[$i] > 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_madd(&t,&u,&Bi[bslide[i]/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_madd(
+                    $t,
+                    $u,
+                    $Bi[(int) floor($bslide[$i] / 2)]
+                );
+            # } else if (bslide[i] < 0) {
+            } elseif ($bslide[$i] < 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_msub(
+                    $t,
+                    $u,
+                    $Bi[(int) floor(-$bslide[$i] / 2)]
+                );
+            }
+            # ge_p1p1_to_p2(r,&t);
+            $r = self::ge_p1p1_to_p2($t);
+        }
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     */
+    public static function ge_scalarmult_base($a)
+    {
+        $e = array();
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+        for ($i = 0; $i < 32; ++$i) {
+            $e[$i << 1] = self::chrToInt($a[$i]) & 15;
+            $e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
+        }
+
+        $carry = 0;
+        for ($i = 0; $i < 63; ++$i) {
+            $e[$i] += $carry;
+            $carry = $e[$i] + 8;
+            $carry >>= 4;
+            $e[$i] -= $carry << 4;
+        }
+        $e[63] += $carry;
+
+        $h = self::ge_p3_0();
+
+        for ($i = 1; $i < 64; $i += 2) {
+            $t = self::ge_select((int) floor($i / 2), $e[$i]);
+            $r = self::ge_madd($r, $h, $t);
+            $h = self::ge_p1p1_to_p3($r);
+        }
+
+        $r = self::ge_p3_dbl($h);
+
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+
+        $h = self::ge_p1p1_to_p3($r);
+
+        for ($i = 0; $i < 64; $i += 2) {
+            $t = self::ge_select($i >> 1, $e[$i]);
+            $r = self::ge_madd($r, $h, $t);
+            $h = self::ge_p1p1_to_p3($r);
+        }
+        return $h;
+    }
+
+    /**
+     * Calculates (ab + c) mod l
+     * where l = 2^252 + 27742317777372353535851937790883648493
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @param string $c
+     * @return string
+     */
+    public static function sc_muladd($a, $b, $c)
+    {
+        $a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
+        $a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
+        $a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
+        $a3 = 2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7);
+        $a4 = 2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4);
+        $a5 = 2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1);
+        $a6 = 2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6);
+        $a7 = 2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3);
+        $a8 = 2097151 & self::load_3(self::substr($a, 21, 3));
+        $a9 = 2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5);
+        $a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
+        $a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
+        $b0 = 2097151 & self::load_3(self::substr($b, 0, 3));
+        $b1 = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
+        $b2 = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
+        $b3 = 2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7);
+        $b4 = 2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4);
+        $b5 = 2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1);
+        $b6 = 2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6);
+        $b7 = 2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3);
+        $b8 = 2097151 & self::load_3(self::substr($b, 21, 3));
+        $b9 = 2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5);
+        $b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
+        $b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
+        $c0 = 2097151 & self::load_3(self::substr($c, 0, 3));
+        $c1 = 2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5);
+        $c2 = 2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2);
+        $c3 = 2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7);
+        $c4 = 2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4);
+        $c5 = 2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1);
+        $c6 = 2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6);
+        $c7 = 2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3);
+        $c8 = 2097151 & self::load_3(self::substr($c, 21, 3));
+        $c9 = 2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5);
+        $c10 = 2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2);
+        $c11 = (self::load_4(self::substr($c, 28, 4)) >> 7);
+
+        /* Can't really avoid the pyramid here: */
+        $s0 = $c0 + self::mul($a0, $b0);
+        $s1 = $c1 + self::mul($a0, $b1) + self::mul($a1, $b0);
+        $s2 = $c2 + self::mul($a0, $b2) + self::mul($a1, $b1) + self::mul($a2, $b0);
+        $s3 = $c3 + self::mul($a0, $b3) + self::mul($a1, $b2) + self::mul($a2, $b1) + self::mul($a3, $b0);
+        $s4 = $c4 + self::mul($a0, $b4) + self::mul($a1, $b3) + self::mul($a2, $b2) + self::mul($a3, $b1) + self::mul($a4, $b0);
+        $s5 = $c5 + self::mul($a0, $b5) + self::mul($a1, $b4) + self::mul($a2, $b3) + self::mul($a3, $b2) + self::mul($a4, $b1) + self::mul($a5, $b0);
+        $s6 = $c6 + self::mul($a0, $b6) + self::mul($a1, $b5) + self::mul($a2, $b4) + self::mul($a3, $b3) + self::mul($a4, $b2) + self::mul($a5, $b1) + self::mul($a6, $b0);
+        $s7 = $c7 + self::mul($a0, $b7) + self::mul($a1, $b6) + self::mul($a2, $b5) + self::mul($a3, $b4) + self::mul($a4, $b3) + self::mul($a5, $b2) + self::mul($a6, $b1) + self::mul($a7, $b0);
+        $s8 = $c8 + self::mul($a0, $b8) + self::mul($a1, $b7) + self::mul($a2, $b6) + self::mul($a3, $b5) + self::mul($a4, $b4) + self::mul($a5, $b3) + self::mul($a6, $b2) + self::mul($a7, $b1) + self::mul($a8, $b0);
+        $s9 = $c9 + self::mul($a0, $b9) + self::mul($a1, $b8) + self::mul($a2, $b7) + self::mul($a3, $b6) + self::mul($a4, $b5) + self::mul($a5, $b4) + self::mul($a6, $b3) + self::mul($a7, $b2) + self::mul($a8, $b1) + self::mul($a9, $b0);
+        $s10 = $c10 + self::mul($a0, $b10) + self::mul($a1, $b9) + self::mul($a2, $b8) + self::mul($a3, $b7) + self::mul($a4, $b6) + self::mul($a5, $b5) + self::mul($a6, $b4) + self::mul($a7, $b3) + self::mul($a8, $b2) + self::mul($a9, $b1) + self::mul($a10, $b0);
+        $s11 = $c11 + self::mul($a0, $b11) + self::mul($a1, $b10) + self::mul($a2, $b9) + self::mul($a3, $b8) + self::mul($a4, $b7) + self::mul($a5, $b6) + self::mul($a6, $b5) + self::mul($a7, $b4) + self::mul($a8, $b3) + self::mul($a9, $b2) + self::mul($a10, $b1) + self::mul($a11, $b0);
+        $s12 = self::mul($a1, $b11) + self::mul($a2, $b10) + self::mul($a3, $b9) + self::mul($a4, $b8) + self::mul($a5, $b7) + self::mul($a6, $b6) + self::mul($a7, $b5) + self::mul($a8, $b4) + self::mul($a9, $b3) + self::mul($a10, $b2) + self::mul($a11, $b1);
+        $s13 = self::mul($a2, $b11) + self::mul($a3, $b10) + self::mul($a4, $b9) + self::mul($a5, $b8) + self::mul($a6, $b7) + self::mul($a7, $b6) + self::mul($a8, $b5) + self::mul($a9, $b4) + self::mul($a10, $b3) + self::mul($a11, $b2);
+        $s14 = self::mul($a3, $b11) + self::mul($a4, $b10) + self::mul($a5, $b9) + self::mul($a6, $b8) + self::mul($a7, $b7) + self::mul($a8, $b6) + self::mul($a9, $b5) + self::mul($a10, $b4) + self::mul($a11, $b3);
+        $s15 = self::mul($a4, $b11) + self::mul($a5, $b10) + self::mul($a6, $b9) + self::mul($a7, $b8) + self::mul($a8, $b7) + self::mul($a9, $b6) + self::mul($a10, $b5) + self::mul($a11, $b4);
+        $s16 = self::mul($a5, $b11) + self::mul($a6, $b10) + self::mul($a7, $b9) + self::mul($a8, $b8) + self::mul($a9, $b7) + self::mul($a10, $b6) + self::mul($a11, $b5);
+        $s17 = self::mul($a6, $b11) + self::mul($a7, $b10) + self::mul($a8, $b9) + self::mul($a9, $b8) + self::mul($a10, $b7) + self::mul($a11, $b6);
+        $s18 = self::mul($a7, $b11) + self::mul($a8, $b10) + self::mul($a9, $b9) + self::mul($a10, $b8) + self::mul($a11, $b7);
+        $s19 = self::mul($a8, $b11) + self::mul($a9, $b10) + self::mul($a10, $b9) + self::mul($a11, $b8);
+        $s20 = self::mul($a9, $b11) + self::mul($a10, $b10) + self::mul($a11, $b9);
+        $s21 = self::mul($a10, $b11) + self::mul($a11, $b10);
+        $s22 = self::mul($a11, $b11);
+        $s23 = 0;
+
+
+        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $s1 += $carry0;
+        $s0 -= self::mul($carry0, 1 << 21);
+        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $s3 += $carry2;
+        $s2 -= self::mul($carry2, 1 << 21);
+        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $s5 += $carry4;
+        $s4 -= self::mul($carry4, 1 << 21);
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6, 1 << 21);
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8, 1 << 21);
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10, 1 << 21);
+        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $s13 += $carry12;
+        $s12 -= self::mul($carry12, 1 << 21);
+        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $s15 += $carry14;
+        $s14 -= self::mul($carry14, 1 << 21);
+        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $s17 += $carry16;
+        $s16 -= self::mul($carry16, 1 << 21);
+        $carry18 = ($s18 + (1 << 20)) >> 21;
+        $s19 += $carry18;
+        $s18 -= self::mul($carry18, 1 << 21);
+        $carry20 = ($s20 + (1 << 20)) >> 21;
+        $s21 += $carry20;
+        $s20 -= self::mul($carry20, 1 << 21);
+        $carry22 = ($s22 + (1 << 20)) >> 21;
+        $s23 += $carry22;
+        $s22 -= self::mul($carry22, 1 << 21);
+
+        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $s2 += $carry1;
+        $s1 -= self::mul($carry1, 1 << 21);
+        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $s4 += $carry3;
+        $s3 -= self::mul($carry3, 1 << 21);
+        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $s6 += $carry5;
+        $s5 -= self::mul($carry5, 1 << 21);
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7, 1 << 21);
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9, 1 << 21);
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= self::mul($carry11, 1 << 21);
+        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $s14 += $carry13;
+        $s13 -= self::mul($carry13, 1 << 21);
+        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $s16 += $carry15;
+        $s15 -= self::mul($carry15, 1 << 21);
+        $carry17 = ($s17 + (1 << 20)) >> 21;
+        $s18 += $carry17;
+        $s17 -= self::mul($carry17, 1 << 21);
+        $carry19 = ($s19 + (1 << 20)) >> 21;
+        $s20 += $carry19;
+        $s19 -= self::mul($carry19, 1 << 21);
+        $carry21 = ($s21 + (1 << 20)) >> 21;
+        $s22 += $carry21;
+        $s21 -= self::mul($carry21, 1 << 21);
+
+        $s11 += self::mul($s23, 666643);
+        $s12 += self::mul($s23, 470296);
+        $s13 += self::mul($s23, 654183);
+        $s14 -= self::mul($s23, 997805);
+        $s15 += self::mul($s23, 136657);
+        $s16 -= self::mul($s23, 683901);
+
+        $s10 += self::mul($s22, 666643);
+        $s11 += self::mul($s22, 470296);
+        $s12 += self::mul($s22, 654183);
+        $s13 -= self::mul($s22, 997805);
+        $s14 += self::mul($s22, 136657);
+        $s15 -= self::mul($s22, 683901);
+
+        $s9 += self::mul($s21,  666643);
+        $s10 += self::mul($s21,  470296);
+        $s11 += self::mul($s21,  654183);
+        $s12 -= self::mul($s21,  997805);
+        $s13 += self::mul($s21,  136657);
+        $s14 -= self::mul($s21,  683901);
+
+        $s8 += self::mul($s20,  666643);
+        $s9 += self::mul($s20,  470296);
+        $s10 += self::mul($s20,  654183);
+        $s11 -= self::mul($s20,  997805);
+        $s12 += self::mul($s20,  136657);
+        $s13 -= self::mul($s20,  683901);
+
+        $s7 += self::mul($s19,  666643);
+        $s8 += self::mul($s19,  470296);
+        $s9 += self::mul($s19,  654183);
+        $s10 -= self::mul($s19,  997805);
+        $s11 += self::mul($s19,  136657);
+        $s12 -= self::mul($s19,  683901);
+
+        $s6 += self::mul($s18,  666643);
+        $s7 += self::mul($s18,  470296);
+        $s8 += self::mul($s18,  654183);
+        $s9 -= self::mul($s18,  997805);
+        $s10 += self::mul($s18,  136657);
+        $s11 -= self::mul($s18,  683901);
+
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6, 1 << 21);
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8, 1 << 21);
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10, 1 << 21);
+        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $s13 += $carry12;
+        $s12 -= self::mul($carry12, 1 << 21);
+        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $s15 += $carry14;
+        $s14 -= self::mul($carry14, 1 << 21);
+        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $s17 += $carry16;
+        $s16 -= self::mul($carry16, 1 << 21);
+
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7, 1 << 21);
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9, 1 << 21);
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= self::mul($carry11, 1 << 21);
+        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $s14 += $carry13;
+        $s13 -= self::mul($carry13, 1 << 21);
+        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $s16 += $carry15;
+        $s15 -= self::mul($carry15, 1 << 21);
+
+        $s5 += self::mul($s17,  666643);
+        $s6 += self::mul($s17,  470296);
+        $s7 += self::mul($s17,  654183);
+        $s8 -= self::mul($s17,  997805);
+        $s9 += self::mul($s17,  136657);
+        $s10 -= self::mul($s17,  683901);
+
+        $s4 += self::mul($s16,  666643);
+        $s5 += self::mul($s16,  470296);
+        $s6 += self::mul($s16,  654183);
+        $s7 -= self::mul($s16,  997805);
+        $s8 += self::mul($s16,  136657);
+        $s9 -= self::mul($s16,  683901);
+
+        $s3 += self::mul($s15,  666643);
+        $s4 += self::mul($s15,  470296);
+        $s5 += self::mul($s15,  654183);
+        $s6 -= self::mul($s15,  997805);
+        $s7 += self::mul($s15,  136657);
+        $s8 -= self::mul($s15,  683901);
+
+        $s2 += self::mul($s14,  666643);
+        $s3 += self::mul($s14,  470296);
+        $s4 += self::mul($s14,  654183);
+        $s5 -= self::mul($s14,  997805);
+        $s6 += self::mul($s14,  136657);
+        $s7 -= self::mul($s14,  683901);
+
+        $s1 += self::mul($s13,  666643);
+        $s2 += self::mul($s13,  470296);
+        $s3 += self::mul($s13,  654183);
+        $s4 -= self::mul($s13,  997805);
+        $s5 += self::mul($s13,  136657);
+        $s6 -= self::mul($s13,  683901);
+
+        $s0 += self::mul($s12,  666643);
+        $s1 += self::mul($s12,  470296);
+        $s2 += self::mul($s12,  654183);
+        $s3 -= self::mul($s12,  997805);
+        $s4 += self::mul($s12,  136657);
+        $s5 -= self::mul($s12,  683901);
+        $s12 = 0;
+
+        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $s1 += $carry0;
+        $s0 -= self::mul($carry0,  1 << 21);
+        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $s3 += $carry2;
+        $s2 -= self::mul($carry2,  1 << 21);
+        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $s5 += $carry4;
+        $s4 -= self::mul($carry4,  1 << 21);
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6,  1 << 21);
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8,  1 << 21);
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10,  1 << 21);
+
+        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $s2 += $carry1;
+        $s1 -= self::mul($carry1,  1 << 21);
+        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $s4 += $carry3;
+        $s3 -= self::mul($carry3,  1 << 21);
+        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $s6 += $carry5;
+        $s5 -= self::mul($carry5,  1 << 21);
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7,  1 << 21);
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9,  1 << 21);
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= self::mul($carry11,  1 << 21);
+
+        $s0 += self::mul($s12,  666643);
+        $s1 += self::mul($s12,  470296);
+        $s2 += self::mul($s12,  654183);
+        $s3 -= self::mul($s12,  997805);
+        $s4 += self::mul($s12,  136657);
+        $s5 -= self::mul($s12,  683901);
+        $s12 = 0;
+
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= self::mul($carry0,  1 << 21);
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= self::mul($carry1,  1 << 21);
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= self::mul($carry2,  1 << 21);
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= self::mul($carry3,  1 << 21);
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= self::mul($carry4,  1 << 21);
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= self::mul($carry5,  1 << 21);
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6,  1 << 21);
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7,  1 << 21);
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8,  1 << 21);
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9,  1 << 21);
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10,  1 << 21);
+        $carry11 = $s11 >> 21;
+        $s12 += $carry11;
+        $s11 -= self::mul($carry11,  1 << 21);
+
+
+        $s0 += self::mul($s12,  666643);
+        $s1 += self::mul($s12,  470296);
+        $s2 += self::mul($s12,  654183);
+        $s3 -= self::mul($s12,  997805);
+        $s4 += self::mul($s12,  136657);
+        $s5 -= self::mul($s12,  683901);
+
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= self::mul($carry0,  1 << 21);
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= self::mul($carry1,  1 << 21);
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= self::mul($carry2,  1 << 21);
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= self::mul($carry3,  1 << 21);
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= self::mul($carry4,  1 << 21);
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= self::mul($carry5,  1 << 21);
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6,  1 << 21);
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7,  1 << 21);
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8,  1 << 21);
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9,  1 << 21);
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10,  1 << 21);
+
+
+        /**
+         * @var array<int, int>
+         */
+        $arr = array(
+            (int) (0xff & ($s0 >> 0)),
+            (int) (0xff & ($s0 >> 8)),
+            (int) (0xff & (($s0 >> 16) | self::mul($s1, 1 << 5))),
+            (int) (0xff & ($s1 >> 3)),
+            (int) (0xff & ($s1 >> 11)),
+            (int) (0xff & (($s1 >> 19) | self::mul($s2, 1 << 2))),
+            (int) (0xff & ($s2 >> 6)),
+            (int) (0xff & (($s2 >> 14) | self::mul($s3, 1 << 7))),
+            (int) (0xff & ($s3 >> 1)),
+            (int) (0xff & ($s3 >> 9)),
+            (int) (0xff & (($s3 >> 17) | self::mul($s4, 1 << 4))),
+            (int) (0xff & ($s4 >> 4)),
+            (int) (0xff & ($s4 >> 12)),
+            (int) (0xff & (($s4 >> 20) | self::mul($s5, 1 << 1))),
+            (int) (0xff & ($s5 >> 7)),
+            (int) (0xff & (($s5 >> 15) | self::mul($s6, 1 << 6))),
+            (int) (0xff & ($s6 >> 2)),
+            (int) (0xff & ($s6 >> 10)),
+            (int) (0xff & (($s6 >> 18) | self::mul($s7, 1 << 3))),
+            (int) (0xff & ($s7 >> 5)),
+            (int) (0xff & ($s7 >> 13)),
+            (int) (0xff & ($s8 >> 0)),
+            (int) (0xff & ($s8 >> 8)),
+            (int) (0xff & (($s8 >> 16) | self::mul($s9, 1 << 5))),
+            (int) (0xff & ($s9 >> 3)),
+            (int) (0xff & ($s9 >> 11)),
+            (int) (0xff & (($s9 >> 19) | self::mul($s10, 1 << 2))),
+            (int) (0xff & ($s10 >> 6)),
+            (int) (0xff & (($s10 >> 14) | self::mul($s11, 1 << 7))),
+            (int) (0xff & ($s11 >> 1)),
+            (int) (0xff & ($s11 >> 9)),
+            0xff & ($s11 >> 17)
+        );
+        return self::intArrayToString($arr);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return string
+     */
+    public static function sc_reduce($s)
+    {
+        $s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
+        $s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
+        $s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);
+        $s3 = 2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7);
+        $s4 = 2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4);
+        $s5 = 2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1);
+        $s6 = 2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6);
+        $s7 = 2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3);
+        $s8 = 2097151 & self::load_3(self::substr($s, 21, 3));
+        $s9 = 2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5);
+        $s10 = 2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2);
+        $s11 = 2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7);
+        $s12 = 2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4);
+        $s13 = 2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1);
+        $s14 = 2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6);
+        $s15 = 2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3);
+        $s16 = 2097151 & self::load_3(self::substr($s, 42, 3));
+        $s17 = 2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5);
+        $s18 = 2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2);
+        $s19 = 2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7);
+        $s20 = 2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4);
+        $s21 = 2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1);
+        $s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6);
+        $s23 = (self::load_4(self::substr($s, 60, 4)) >> 3);
+
+        $s11 += self::mul($s23,  666643);
+        $s12 += self::mul($s23,  470296);
+        $s13 += self::mul($s23,  654183);
+        $s14 -= self::mul($s23,  997805);
+        $s15 += self::mul($s23,  136657);
+        $s16 -= self::mul($s23,  683901);
+
+        $s10 += self::mul($s22,  666643);
+        $s11 += self::mul($s22,  470296);
+        $s12 += self::mul($s22,  654183);
+        $s13 -= self::mul($s22,  997805);
+        $s14 += self::mul($s22,  136657);
+        $s15 -= self::mul($s22,  683901);
+
+        $s9 += self::mul($s21,  666643);
+        $s10 += self::mul($s21,  470296);
+        $s11 += self::mul($s21,  654183);
+        $s12 -= self::mul($s21,  997805);
+        $s13 += self::mul($s21,  136657);
+        $s14 -= self::mul($s21,  683901);
+
+        $s8 += self::mul($s20,  666643);
+        $s9 += self::mul($s20,  470296);
+        $s10 += self::mul($s20,  654183);
+        $s11 -= self::mul($s20,  997805);
+        $s12 += self::mul($s20,  136657);
+        $s13 -= self::mul($s20,  683901);
+
+        $s7 += self::mul($s19,  666643);
+        $s8 += self::mul($s19,  470296);
+        $s9 += self::mul($s19,  654183);
+        $s10 -= self::mul($s19,  997805);
+        $s11 += self::mul($s19,  136657);
+        $s12 -= self::mul($s19,  683901);
+
+        $s6 += self::mul($s18,  666643);
+        $s7 += self::mul($s18,  470296);
+        $s8 += self::mul($s18,  654183);
+        $s9 -= self::mul($s18,  997805);
+        $s10 += self::mul($s18,  136657);
+        $s11 -= self::mul($s18,  683901);
+
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6,  1 << 21);
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8,  1 << 21);
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10,  1 << 21);
+        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $s13 += $carry12;
+        $s12 -= self::mul($carry12,  1 << 21);
+        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $s15 += $carry14;
+        $s14 -= self::mul($carry14,  1 << 21);
+        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $s17 += $carry16;
+        $s16 -= self::mul($carry16,  1 << 21);
+
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7,  1 << 21);
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9,  1 << 21);
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= self::mul($carry11,  1 << 21);
+        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $s14 += $carry13;
+        $s13 -= self::mul($carry13,  1 << 21);
+        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $s16 += $carry15;
+        $s15 -= self::mul($carry15,  1 << 21);
+
+        $s5 += self::mul($s17,  666643);
+        $s6 += self::mul($s17,  470296);
+        $s7 += self::mul($s17,  654183);
+        $s8 -= self::mul($s17,  997805);
+        $s9 += self::mul($s17,  136657);
+        $s10 -= self::mul($s17,  683901);
+
+        $s4 += self::mul($s16,  666643);
+        $s5 += self::mul($s16,  470296);
+        $s6 += self::mul($s16,  654183);
+        $s7 -= self::mul($s16,  997805);
+        $s8 += self::mul($s16,  136657);
+        $s9 -= self::mul($s16,  683901);
+
+        $s3 += self::mul($s15,  666643);
+        $s4 += self::mul($s15,  470296);
+        $s5 += self::mul($s15,  654183);
+        $s6 -= self::mul($s15,  997805);
+        $s7 += self::mul($s15,  136657);
+        $s8 -= self::mul($s15,  683901);
+
+        $s2 += self::mul($s14,  666643);
+        $s3 += self::mul($s14,  470296);
+        $s4 += self::mul($s14,  654183);
+        $s5 -= self::mul($s14,  997805);
+        $s6 += self::mul($s14,  136657);
+        $s7 -= self::mul($s14,  683901);
+
+        $s1 += self::mul($s13,  666643);
+        $s2 += self::mul($s13,  470296);
+        $s3 += self::mul($s13,  654183);
+        $s4 -= self::mul($s13,  997805);
+        $s5 += self::mul($s13,  136657);
+        $s6 -= self::mul($s13,  683901);
+
+        $s0 += self::mul($s12,  666643);
+        $s1 += self::mul($s12,  470296);
+        $s2 += self::mul($s12,  654183);
+        $s3 -= self::mul($s12,  997805);
+        $s4 += self::mul($s12,  136657);
+        $s5 -= self::mul($s12,  683901);
+        $s12 = 0;
+
+        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $s1 += $carry0;
+        $s0 -= self::mul($carry0,  1 << 21);
+        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $s3 += $carry2;
+        $s2 -= self::mul($carry2,  1 << 21);
+        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $s5 += $carry4;
+        $s4 -= self::mul($carry4,  1 << 21);
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6,  1 << 21);
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8,  1 << 21);
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10,  1 << 21);
+
+        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $s2 += $carry1;
+        $s1 -= self::mul($carry1,  1 << 21);
+        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $s4 += $carry3;
+        $s3 -= self::mul($carry3,  1 << 21);
+        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $s6 += $carry5;
+        $s5 -= self::mul($carry5,  1 << 21);
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7,  1 << 21);
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9,  1 << 21);
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= self::mul($carry11,  1 << 21);
+
+        $s0 += self::mul($s12,  666643);
+        $s1 += self::mul($s12,  470296);
+        $s2 += self::mul($s12,  654183);
+        $s3 -= self::mul($s12,  997805);
+        $s4 += self::mul($s12,  136657);
+        $s5 -= self::mul($s12,  683901);
+        $s12 = 0;
+
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= self::mul($carry0,  1 << 21);
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= self::mul($carry1,  1 << 21);
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= self::mul($carry2,  1 << 21);
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= self::mul($carry3,  1 << 21);
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= self::mul($carry4,  1 << 21);
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= self::mul($carry5,  1 << 21);
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6,  1 << 21);
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7,  1 << 21);
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8,  1 << 21);
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9,  1 << 21);
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10,  1 << 21);
+        $carry11 = $s11 >> 21;
+        $s12 += $carry11;
+        $s11 -= self::mul($carry11,  1 << 21);
+
+        $s0 += self::mul($s12,  666643);
+        $s1 += self::mul($s12,  470296);
+        $s2 += self::mul($s12,  654183);
+        $s3 -= self::mul($s12,  997805);
+        $s4 += self::mul($s12,  136657);
+        $s5 -= self::mul($s12,  683901);
+
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= self::mul($carry0,  1 << 21);
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= self::mul($carry1,  1 << 21);
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= self::mul($carry2,  1 << 21);
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= self::mul($carry3,  1 << 21);
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= self::mul($carry4,  1 << 21);
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= self::mul($carry5,  1 << 21);
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= self::mul($carry6,  1 << 21);
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= self::mul($carry7,  1 << 21);
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= self::mul($carry8,  1 << 21);
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= self::mul($carry9,  1 << 21);
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= self::mul($carry10,  1 << 21);
+
+        /**
+         * @var array<int, int>
+         */
+        $arr = array(
+            (int) ($s0 >> 0),
+            (int) ($s0 >> 8),
+            (int) (($s0 >> 16) | self::mul($s1, 1 << 5)),
+            (int) ($s1 >> 3),
+            (int) ($s1 >> 11),
+            (int) (($s1 >> 19) | self::mul($s2, 1 << 2)),
+            (int) ($s2 >> 6),
+            (int) (($s2 >> 14) | self::mul($s3, 1 << 7)),
+            (int) ($s3 >> 1),
+            (int) ($s3 >> 9),
+            (int) (($s3 >> 17) | self::mul($s4, 1 << 4)),
+            (int) ($s4 >> 4),
+            (int) ($s4 >> 12),
+            (int) (($s4 >> 20) | self::mul($s5, 1 << 1)),
+            (int) ($s5 >> 7),
+            (int) (($s5 >> 15) | self::mul($s6, 1 << 6)),
+            (int) ($s6 >> 2),
+            (int) ($s6 >> 10),
+            (int) (($s6 >> 18) | self::mul($s7, 1 << 3)),
+            (int) ($s7 >> 5),
+            (int) ($s7 >> 13),
+            (int) ($s8 >> 0),
+            (int) ($s8 >> 8),
+            (int) (($s8 >> 16) | self::mul($s9, 1 << 5)),
+            (int) ($s9 >> 3),
+            (int) ($s9 >> 11),
+            (int) (($s9 >> 19) | self::mul($s10, 1 << 2)),
+            (int) ($s10 >> 6),
+            (int) (($s10 >> 14) | self::mul($s11, 1 << 7)),
+            (int) ($s11 >> 1),
+            (int) ($s11 >> 9),
+            (int) $s11 >> 17
+        );
+        return self::intArrayToString($arr);
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
new file mode 100644
index 0000000000000..fb66315f00f77
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
@@ -0,0 +1,126 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Fe
+ *
+ * This represents a Field Element
+ */
+class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
+{
+    /**
+     * @var array
+     */
+    protected $container = array();
+
+    /**
+     * @var int
+     */
+    protected $size = 10;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Fe constructor.
+     * @param int $size
+     */
+    public function __construct($size = 10)
+    {
+        $this->size = 10;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param array $array
+     * @param bool $save_indexes
+     * @return self
+     */
+    public static function fromArray($array, $save_indexes = null)
+    {
+        $count = count($array);
+        if ($save_indexes) {
+            $keys = array_keys($array);
+        } else {
+            $keys = range(0, $count - 1);
+        }
+        $array = array_values($array);
+
+        $obj = new ParagonIE_Sodium_Core_Curve25519_Fe($count);
+        if ($save_indexes) {
+            for ($i = 0; $i < $count; ++$i) {
+                $obj->offsetSet($keys[$i], $array[$i]);
+            }
+        } else {
+            for ($i = 0; $i < $count; ++$i) {
+                $obj->offsetSet($i, $array[$i]);
+            }
+        }
+        return $obj;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (!is_int($value)) {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return mixed|null
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset])
+            ? $this->container[$offset]
+            : null;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return array
+     */
+    public function __debugInfo()
+    {
+        return array(implode(', ', $this->container));
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
new file mode 100644
index 0000000000000..39bf8977766c9
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
@@ -0,0 +1,65 @@
+<?php
+
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Cached', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $YplusX;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $YminusX;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $T2d;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_Cached constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $YplusX
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $YminusX
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $Z
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $T2d
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $YplusX = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $YminusX = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $Z = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $T2d = null
+    ) {
+        if ($YplusX === null) {
+            $YplusX = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->YplusX = $YplusX;
+        if ($YminusX === null) {
+            $YminusX = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->YminusX = $YminusX;
+        if ($Z === null) {
+            $Z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $Z;
+        if ($T2d === null) {
+            $T2d = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->T2d = $T2d;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
new file mode 100644
index 0000000000000..a63d6ab232e7c
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
@@ -0,0 +1,64 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P1p1', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $T;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $t
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $z = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $t = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $z;
+        if ($t === null) {
+            $t = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->T = $t;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
new file mode 100644
index 0000000000000..aee4000d14193
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
@@ -0,0 +1,54 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P2', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_P2
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_P2
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_P2 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $z = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $z;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
new file mode 100644
index 0000000000000..00f5b27a4b288
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
@@ -0,0 +1,65 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P3', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_P3
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_P3
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $T;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_P3 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $t
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $z = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $t = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $z;
+        if ($t === null) {
+            $t = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->T = $t;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
new file mode 100644
index 0000000000000..59611c103669e
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
@@ -0,0 +1,54 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Precomp', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $yplusx;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $yminusx;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $xy2d;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_Precomp constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $yplusx
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $yminusx
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $xy2d
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $yplusx = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $yminusx = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $xy2d = null
+    ) {
+        if ($yplusx === null) {
+            $yplusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->yplusx = $yplusx;
+        if ($yminusx === null) {
+            $yminusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->yminusx = $yminusx;
+        if ($xy2d === null) {
+            $xy2d = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->xy2d = $xy2d;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php
new file mode 100644
index 0000000000000..c371be50255d7
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php
@@ -0,0 +1,1467 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_H', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_H
+ *
+ * This just contains the constants in the ref10/base.h file
+ */
+class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * See: libsodium's crypto_core/curve25519/ref10/base.h
+     *
+     * @var array Basically, int[32][8][3][10]
+     */
+    protected static $base = array(
+        array(
+            array(
+                array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
+                array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
+                array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
+            ),
+            array(
+                array(-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303),
+                array(-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081),
+                array(26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697),
+            ),
+            array(
+                array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
+                array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
+                array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
+            ),
+            array(
+                array(-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540),
+                array(23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397),
+                array(7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325),
+            ),
+            array(
+                array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
+                array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
+                array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
+            ),
+            array(
+                array(-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777),
+                array(-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737),
+                array(-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652),
+            ),
+            array(
+                array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
+                array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
+                array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
+            ),
+            array(
+                array(14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726),
+                array(-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955),
+                array(27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425),
+            ),
+        ),
+        array(
+            array(
+                array(-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171),
+                array(27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510),
+                array(17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660),
+            ),
+            array(
+                array(-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639),
+                array(29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963),
+                array(5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950),
+            ),
+            array(
+                array(-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568),
+                array(12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335),
+                array(25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628),
+            ),
+            array(
+                array(-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007),
+                array(-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772),
+                array(-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653),
+            ),
+            array(
+                array(2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567),
+                array(13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686),
+                array(21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372),
+            ),
+            array(
+                array(-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887),
+                array(-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954),
+                array(-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953),
+            ),
+            array(
+                array(24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833),
+                array(-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532),
+                array(-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876),
+            ),
+            array(
+                array(2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268),
+                array(33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214),
+                array(1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038),
+            ),
+        ),
+        array(
+            array(
+                array(6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800),
+                array(4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645),
+                array(-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664),
+            ),
+            array(
+                array(1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933),
+                array(-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182),
+                array(-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222),
+            ),
+            array(
+                array(-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991),
+                array(20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880),
+                array(9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092),
+            ),
+            array(
+                array(-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295),
+                array(19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788),
+                array(8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553),
+            ),
+            array(
+                array(-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026),
+                array(11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347),
+                array(-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033),
+            ),
+            array(
+                array(-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395),
+                array(-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278),
+                array(1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890),
+            ),
+            array(
+                array(32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995),
+                array(-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596),
+                array(-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891),
+            ),
+            array(
+                array(31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060),
+                array(11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608),
+                array(-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606),
+            ),
+        ),
+        array(
+            array(
+                array(7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389),
+                array(-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016),
+                array(-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341),
+            ),
+            array(
+                array(-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505),
+                array(14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553),
+                array(-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655),
+            ),
+            array(
+                array(15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220),
+                array(12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631),
+                array(-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099),
+            ),
+            array(
+                array(26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556),
+                array(14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749),
+                array(236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930),
+            ),
+            array(
+                array(1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391),
+                array(5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253),
+                array(20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066),
+            ),
+            array(
+                array(24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958),
+                array(-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082),
+                array(-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383),
+            ),
+            array(
+                array(-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521),
+                array(-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807),
+                array(23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948),
+            ),
+            array(
+                array(9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134),
+                array(-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455),
+                array(27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629),
+            ),
+        ),
+        array(
+            array(
+                array(-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069),
+                array(-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746),
+                array(24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919),
+            ),
+            array(
+                array(11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837),
+                array(8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906),
+                array(-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771),
+            ),
+            array(
+                array(-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817),
+                array(10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098),
+                array(10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409),
+            ),
+            array(
+                array(-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504),
+                array(-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727),
+                array(28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420),
+            ),
+            array(
+                array(-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003),
+                array(-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605),
+                array(-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384),
+            ),
+            array(
+                array(-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701),
+                array(-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683),
+                array(29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708),
+            ),
+            array(
+                array(-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563),
+                array(-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260),
+                array(-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387),
+            ),
+            array(
+                array(-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672),
+                array(23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686),
+                array(-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665),
+            ),
+        ),
+        array(
+            array(
+                array(11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182),
+                array(-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277),
+                array(14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628),
+            ),
+            array(
+                array(-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474),
+                array(-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539),
+                array(-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822),
+            ),
+            array(
+                array(-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970),
+                array(19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756),
+                array(-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508),
+            ),
+            array(
+                array(-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683),
+                array(-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655),
+                array(-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158),
+            ),
+            array(
+                array(-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125),
+                array(-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839),
+                array(-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664),
+            ),
+            array(
+                array(27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294),
+                array(-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899),
+                array(-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070),
+            ),
+            array(
+                array(3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294),
+                array(-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949),
+                array(-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083),
+            ),
+            array(
+                array(31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420),
+                array(-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940),
+                array(29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396),
+            ),
+        ),
+        array(
+            array(
+                array(-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567),
+                array(20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127),
+                array(-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294),
+            ),
+            array(
+                array(-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887),
+                array(22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964),
+                array(16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195),
+            ),
+            array(
+                array(9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244),
+                array(24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999),
+                array(-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762),
+            ),
+            array(
+                array(-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274),
+                array(-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236),
+                array(-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605),
+            ),
+            array(
+                array(-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761),
+                array(-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884),
+                array(-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482),
+            ),
+            array(
+                array(-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638),
+                array(-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490),
+                array(-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170),
+            ),
+            array(
+                array(5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736),
+                array(10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124),
+                array(-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392),
+            ),
+            array(
+                array(8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029),
+                array(6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048),
+                array(28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958),
+            ),
+        ),
+        array(
+            array(
+                array(24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593),
+                array(26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071),
+                array(-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692),
+            ),
+            array(
+                array(11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687),
+                array(-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441),
+                array(-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001),
+            ),
+            array(
+                array(-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460),
+                array(-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007),
+                array(-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762),
+            ),
+            array(
+                array(15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005),
+                array(-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674),
+                array(4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035),
+            ),
+            array(
+                array(7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590),
+                array(-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957),
+                array(-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812),
+            ),
+            array(
+                array(33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740),
+                array(-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122),
+                array(-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158),
+            ),
+            array(
+                array(8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885),
+                array(26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140),
+                array(19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857),
+            ),
+            array(
+                array(801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155),
+                array(19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260),
+                array(19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483),
+            ),
+        ),
+        array(
+            array(
+                array(-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677),
+                array(32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815),
+                array(22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751),
+            ),
+            array(
+                array(-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203),
+                array(-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208),
+                array(1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230),
+            ),
+            array(
+                array(16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850),
+                array(-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389),
+                array(-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968),
+            ),
+            array(
+                array(-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689),
+                array(14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880),
+                array(5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304),
+            ),
+            array(
+                array(30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632),
+                array(-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412),
+                array(20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566),
+            ),
+            array(
+                array(-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038),
+                array(-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232),
+                array(-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943),
+            ),
+            array(
+                array(17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856),
+                array(23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738),
+                array(15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971),
+            ),
+            array(
+                array(-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718),
+                array(-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697),
+                array(-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883),
+            ),
+        ),
+        array(
+            array(
+                array(5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912),
+                array(-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358),
+                array(3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849),
+            ),
+            array(
+                array(29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307),
+                array(-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977),
+                array(-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335),
+            ),
+            array(
+                array(-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644),
+                array(-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616),
+                array(-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735),
+            ),
+            array(
+                array(-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099),
+                array(29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341),
+                array(-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336),
+            ),
+            array(
+                array(-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646),
+                array(31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425),
+                array(-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388),
+            ),
+            array(
+                array(-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743),
+                array(-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822),
+                array(-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462),
+            ),
+            array(
+                array(18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985),
+                array(9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702),
+                array(-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797),
+            ),
+            array(
+                array(21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293),
+                array(27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100),
+                array(19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688),
+            ),
+        ),
+        array(
+            array(
+                array(12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186),
+                array(2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610),
+                array(-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707),
+            ),
+            array(
+                array(7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220),
+                array(915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025),
+                array(32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044),
+            ),
+            array(
+                array(32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992),
+                array(-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027),
+                array(21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197),
+            ),
+            array(
+                array(8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901),
+                array(31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952),
+                array(19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878),
+            ),
+            array(
+                array(-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390),
+                array(32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730),
+                array(2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730),
+            ),
+            array(
+                array(-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180),
+                array(-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272),
+                array(-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715),
+            ),
+            array(
+                array(-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970),
+                array(-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772),
+                array(-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865),
+            ),
+            array(
+                array(15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750),
+                array(20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373),
+                array(32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348),
+            ),
+        ),
+        array(
+            array(
+                array(9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144),
+                array(-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195),
+                array(5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086),
+            ),
+            array(
+                array(-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684),
+                array(-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518),
+                array(-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233),
+            ),
+            array(
+                array(-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793),
+                array(-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794),
+                array(580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435),
+            ),
+            array(
+                array(23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921),
+                array(13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518),
+                array(2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563),
+            ),
+            array(
+                array(14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278),
+                array(-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024),
+                array(4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030),
+            ),
+            array(
+                array(10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783),
+                array(27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717),
+                array(6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844),
+            ),
+            array(
+                array(14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333),
+                array(16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048),
+                array(22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760),
+            ),
+            array(
+                array(-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760),
+                array(-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757),
+                array(-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112),
+            ),
+        ),
+        array(
+            array(
+                array(-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468),
+                array(3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184),
+                array(10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289),
+            ),
+            array(
+                array(15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066),
+                array(24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882),
+                array(13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226),
+            ),
+            array(
+                array(16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101),
+                array(29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279),
+                array(-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811),
+            ),
+            array(
+                array(27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709),
+                array(20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714),
+                array(-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121),
+            ),
+            array(
+                array(9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464),
+                array(12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847),
+                array(13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400),
+            ),
+            array(
+                array(4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414),
+                array(-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158),
+                array(17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045),
+            ),
+            array(
+                array(-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415),
+                array(-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459),
+                array(-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079),
+            ),
+            array(
+                array(21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412),
+                array(-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743),
+                array(-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836),
+            ),
+        ),
+        array(
+            array(
+                array(12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022),
+                array(18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429),
+                array(-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065),
+            ),
+            array(
+                array(30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861),
+                array(10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000),
+                array(-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101),
+            ),
+            array(
+                array(32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815),
+                array(29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642),
+                array(10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966),
+            ),
+            array(
+                array(25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574),
+                array(-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742),
+                array(-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689),
+            ),
+            array(
+                array(12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020),
+                array(-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772),
+                array(3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982),
+            ),
+            array(
+                array(-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953),
+                array(-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218),
+                array(-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265),
+            ),
+            array(
+                array(29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073),
+                array(-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325),
+                array(-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798),
+            ),
+            array(
+                array(-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870),
+                array(-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863),
+                array(-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927),
+            ),
+        ),
+        array(
+            array(
+                array(-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267),
+                array(-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663),
+                array(22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862),
+            ),
+            array(
+                array(-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673),
+                array(15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943),
+                array(15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020),
+            ),
+            array(
+                array(-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238),
+                array(11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064),
+                array(14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795),
+            ),
+            array(
+                array(15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052),
+                array(-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904),
+                array(29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531),
+            ),
+            array(
+                array(-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979),
+                array(-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841),
+                array(10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431),
+            ),
+            array(
+                array(10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324),
+                array(-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940),
+                array(10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320),
+            ),
+            array(
+                array(-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184),
+                array(14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114),
+                array(30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878),
+            ),
+            array(
+                array(12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784),
+                array(-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091),
+                array(-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585),
+            ),
+        ),
+        array(
+            array(
+                array(-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208),
+                array(10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864),
+                array(17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661),
+            ),
+            array(
+                array(7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233),
+                array(26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212),
+                array(-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525),
+            ),
+            array(
+                array(-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068),
+                array(9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397),
+                array(-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988),
+            ),
+            array(
+                array(5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889),
+                array(32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038),
+                array(14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697),
+            ),
+            array(
+                array(20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875),
+                array(-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905),
+                array(-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656),
+            ),
+            array(
+                array(11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818),
+                array(27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714),
+                array(10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203),
+            ),
+            array(
+                array(20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931),
+                array(-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024),
+                array(-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084),
+            ),
+            array(
+                array(-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204),
+                array(20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817),
+                array(27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667),
+            ),
+        ),
+        array(
+            array(
+                array(11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504),
+                array(-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768),
+                array(-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255),
+            ),
+            array(
+                array(6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790),
+                array(1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438),
+                array(-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333),
+            ),
+            array(
+                array(17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971),
+                array(31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905),
+                array(29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409),
+            ),
+            array(
+                array(12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409),
+                array(6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499),
+                array(-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363),
+            ),
+            array(
+                array(28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664),
+                array(-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324),
+                array(-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940),
+            ),
+            array(
+                array(13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990),
+                array(-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914),
+                array(-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290),
+            ),
+            array(
+                array(24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257),
+                array(-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433),
+                array(-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236),
+            ),
+            array(
+                array(-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045),
+                array(11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093),
+                array(-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347),
+            ),
+        ),
+        array(
+            array(
+                array(-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191),
+                array(-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507),
+                array(-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906),
+            ),
+            array(
+                array(3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018),
+                array(-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109),
+                array(-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926),
+            ),
+            array(
+                array(-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528),
+                array(8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625),
+                array(-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286),
+            ),
+            array(
+                array(2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033),
+                array(27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866),
+                array(21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896),
+            ),
+            array(
+                array(30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075),
+                array(26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347),
+                array(-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437),
+            ),
+            array(
+                array(-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165),
+                array(-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588),
+                array(-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193),
+            ),
+            array(
+                array(-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017),
+                array(-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883),
+                array(21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961),
+            ),
+            array(
+                array(8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043),
+                array(29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663),
+                array(-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362),
+            ),
+        ),
+        array(
+            array(
+                array(-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860),
+                array(2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466),
+                array(-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063),
+            ),
+            array(
+                array(-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997),
+                array(-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295),
+                array(-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369),
+            ),
+            array(
+                array(9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385),
+                array(18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109),
+                array(2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906),
+            ),
+            array(
+                array(4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424),
+                array(-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185),
+                array(7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962),
+            ),
+            array(
+                array(-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325),
+                array(10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593),
+                array(696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404),
+            ),
+            array(
+                array(-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644),
+                array(17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801),
+                array(26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804),
+            ),
+            array(
+                array(-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884),
+                array(-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577),
+                array(-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849),
+            ),
+            array(
+                array(32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473),
+                array(-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644),
+                array(-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319),
+            ),
+        ),
+        array(
+            array(
+                array(-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599),
+                array(-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768),
+                array(-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084),
+            ),
+            array(
+                array(-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328),
+                array(-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369),
+                array(20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920),
+            ),
+            array(
+                array(12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815),
+                array(-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025),
+                array(-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397),
+            ),
+            array(
+                array(-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448),
+                array(6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981),
+                array(30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165),
+            ),
+            array(
+                array(32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501),
+                array(17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073),
+                array(-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861),
+            ),
+            array(
+                array(14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845),
+                array(-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211),
+                array(18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870),
+            ),
+            array(
+                array(10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096),
+                array(33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803),
+                array(-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168),
+            ),
+            array(
+                array(30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965),
+                array(-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505),
+                array(18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598),
+            ),
+        ),
+        array(
+            array(
+                array(5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782),
+                array(5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900),
+                array(-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479),
+            ),
+            array(
+                array(-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208),
+                array(8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232),
+                array(17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719),
+            ),
+            array(
+                array(16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271),
+                array(-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326),
+                array(-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132),
+            ),
+            array(
+                array(14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300),
+                array(8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570),
+                array(15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670),
+            ),
+            array(
+                array(-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994),
+                array(-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913),
+                array(31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317),
+            ),
+            array(
+                array(-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730),
+                array(842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096),
+                array(-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078),
+            ),
+            array(
+                array(-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411),
+                array(-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905),
+                array(-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654),
+            ),
+            array(
+                array(-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870),
+                array(-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498),
+                array(12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579),
+            ),
+        ),
+        array(
+            array(
+                array(14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677),
+                array(10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647),
+                array(-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743),
+            ),
+            array(
+                array(-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468),
+                array(21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375),
+                array(-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155),
+            ),
+            array(
+                array(6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725),
+                array(-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612),
+                array(-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943),
+            ),
+            array(
+                array(-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944),
+                array(30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928),
+                array(9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406),
+            ),
+            array(
+                array(22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139),
+                array(-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963),
+                array(-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693),
+            ),
+            array(
+                array(1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734),
+                array(-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680),
+                array(-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410),
+            ),
+            array(
+                array(-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931),
+                array(-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654),
+                array(22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710),
+            ),
+            array(
+                array(29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180),
+                array(-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684),
+                array(-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895),
+            ),
+        ),
+        array(
+            array(
+                array(22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501),
+                array(-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413),
+                array(6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880),
+            ),
+            array(
+                array(-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874),
+                array(22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962),
+                array(-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899),
+            ),
+            array(
+                array(21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152),
+                array(9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063),
+                array(7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080),
+            ),
+            array(
+                array(-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146),
+                array(-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183),
+                array(-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133),
+            ),
+            array(
+                array(-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421),
+                array(-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622),
+                array(-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197),
+            ),
+            array(
+                array(2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663),
+                array(31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753),
+                array(4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755),
+            ),
+            array(
+                array(-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862),
+                array(-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118),
+                array(26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171),
+            ),
+            array(
+                array(15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380),
+                array(16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824),
+                array(28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270),
+            ),
+        ),
+        array(
+            array(
+                array(-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438),
+                array(-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584),
+                array(-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562),
+            ),
+            array(
+                array(30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471),
+                array(18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610),
+                array(19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269),
+            ),
+            array(
+                array(-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650),
+                array(14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369),
+                array(19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461),
+            ),
+            array(
+                array(30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462),
+                array(-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793),
+                array(-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218),
+            ),
+            array(
+                array(-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226),
+                array(18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019),
+                array(-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037),
+            ),
+            array(
+                array(31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171),
+                array(-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132),
+                array(-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841),
+            ),
+            array(
+                array(21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181),
+                array(-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210),
+                array(-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040),
+            ),
+            array(
+                array(3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935),
+                array(24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105),
+                array(-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814),
+            ),
+        ),
+        array(
+            array(
+                array(793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852),
+                array(5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581),
+                array(-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646),
+            ),
+            array(
+                array(10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844),
+                array(10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025),
+                array(27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453),
+            ),
+            array(
+                array(-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068),
+                array(4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192),
+                array(-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921),
+            ),
+            array(
+                array(-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259),
+                array(-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426),
+                array(-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072),
+            ),
+            array(
+                array(-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305),
+                array(13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832),
+                array(28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943),
+            ),
+            array(
+                array(-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011),
+                array(24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447),
+                array(17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494),
+            ),
+            array(
+                array(-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245),
+                array(-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859),
+                array(28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915),
+            ),
+            array(
+                array(16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707),
+                array(10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848),
+                array(-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224),
+            ),
+        ),
+        array(
+            array(
+                array(-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391),
+                array(15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215),
+                array(-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101),
+            ),
+            array(
+                array(23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713),
+                array(21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849),
+                array(-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930),
+            ),
+            array(
+                array(-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940),
+                array(-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031),
+                array(-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404),
+            ),
+            array(
+                array(-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243),
+                array(-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116),
+                array(-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525),
+            ),
+            array(
+                array(-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509),
+                array(-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883),
+                array(15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865),
+            ),
+            array(
+                array(-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660),
+                array(4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273),
+                array(-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138),
+            ),
+            array(
+                array(-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560),
+                array(-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135),
+                array(2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941),
+            ),
+            array(
+                array(-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739),
+                array(18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756),
+                array(-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819),
+            ),
+        ),
+        array(
+            array(
+                array(-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347),
+                array(-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028),
+                array(21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075),
+            ),
+            array(
+                array(16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799),
+                array(-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609),
+                array(-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817),
+            ),
+            array(
+                array(-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989),
+                array(-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523),
+                array(4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278),
+            ),
+            array(
+                array(31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045),
+                array(19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377),
+                array(24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480),
+            ),
+            array(
+                array(17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016),
+                array(510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426),
+                array(18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525),
+            ),
+            array(
+                array(13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396),
+                array(9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080),
+                array(12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892),
+            ),
+            array(
+                array(15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275),
+                array(11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074),
+                array(20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140),
+            ),
+            array(
+                array(-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717),
+                array(-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101),
+                array(24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127),
+            ),
+        ),
+        array(
+            array(
+                array(-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632),
+                array(-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415),
+                array(-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160),
+            ),
+            array(
+                array(31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876),
+                array(22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625),
+                array(-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478),
+            ),
+            array(
+                array(27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164),
+                array(26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595),
+                array(-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248),
+            ),
+            array(
+                array(-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858),
+                array(15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193),
+                array(8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184),
+            ),
+            array(
+                array(-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942),
+                array(-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635),
+                array(21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948),
+            ),
+            array(
+                array(11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935),
+                array(-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415),
+                array(-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416),
+            ),
+            array(
+                array(-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018),
+                array(4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778),
+                array(366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659),
+            ),
+            array(
+                array(-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385),
+                array(18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503),
+                array(476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329),
+            ),
+        ),
+        array(
+            array(
+                array(20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056),
+                array(-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838),
+                array(24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948),
+            ),
+            array(
+                array(-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691),
+                array(-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118),
+                array(-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517),
+            ),
+            array(
+                array(-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269),
+                array(-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904),
+                array(-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589),
+            ),
+            array(
+                array(-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193),
+                array(-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910),
+                array(-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930),
+            ),
+            array(
+                array(-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667),
+                array(25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481),
+                array(-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876),
+            ),
+            array(
+                array(22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640),
+                array(-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278),
+                array(-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112),
+            ),
+            array(
+                array(26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272),
+                array(17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012),
+                array(-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221),
+            ),
+            array(
+                array(30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046),
+                array(13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345),
+                array(-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310),
+            ),
+        ),
+        array(
+            array(
+                array(19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937),
+                array(31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636),
+                array(-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008),
+            ),
+            array(
+                array(-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429),
+                array(-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576),
+                array(31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066),
+            ),
+            array(
+                array(-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490),
+                array(-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104),
+                array(33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053),
+            ),
+            array(
+                array(31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275),
+                array(-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511),
+                array(22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095),
+            ),
+            array(
+                array(-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439),
+                array(23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939),
+                array(-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424),
+            ),
+            array(
+                array(2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310),
+                array(3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608),
+                array(-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079),
+            ),
+            array(
+                array(-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101),
+                array(21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418),
+                array(18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576),
+            ),
+            array(
+                array(30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356),
+                array(9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996),
+                array(-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099),
+            ),
+        ),
+        array(
+            array(
+                array(-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728),
+                array(-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658),
+                array(-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242),
+            ),
+            array(
+                array(-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001),
+                array(-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766),
+                array(18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373),
+            ),
+            array(
+                array(26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458),
+                array(-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628),
+                array(-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657),
+            ),
+            array(
+                array(-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062),
+                array(25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616),
+                array(31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014),
+            ),
+            array(
+                array(24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383),
+                array(-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814),
+                array(-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718),
+            ),
+            array(
+                array(30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417),
+                array(2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222),
+                array(33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444),
+            ),
+            array(
+                array(-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597),
+                array(23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970),
+                array(1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799),
+            ),
+            array(
+                array(-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647),
+                array(13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511),
+                array(-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032),
+            ),
+        ),
+        array(
+            array(
+                array(9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834),
+                array(-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461),
+                array(29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062),
+            ),
+            array(
+                array(-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516),
+                array(-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547),
+                array(-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240),
+            ),
+            array(
+                array(-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038),
+                array(-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741),
+                array(16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103),
+            ),
+            array(
+                array(-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747),
+                array(-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323),
+                array(31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016),
+            ),
+            array(
+                array(-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373),
+                array(15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228),
+                array(-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141),
+            ),
+            array(
+                array(16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399),
+                array(11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831),
+                array(-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376),
+            ),
+            array(
+                array(-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313),
+                array(-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958),
+                array(-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577),
+            ),
+            array(
+                array(-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743),
+                array(29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684),
+                array(-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476),
+            ),
+        )
+    );
+
+    /**
+     * See: libsodium's crypto_core/curve25519/ref10/base2.h
+     *
+     * @var array basically int[8][3]
+     */
+    protected static $base2 = array(
+        array(
+            array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
+            array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
+            array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
+        ),
+        array(
+            array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
+            array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
+            array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
+        ),
+        array(
+            array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
+            array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
+            array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
+        ),
+        array(
+            array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
+            array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
+            array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
+        ),
+        array(
+            array(-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877),
+            array(-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951),
+            array(4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784),
+        ),
+        array(
+            array(-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436),
+            array(25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918),
+            array(23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877),
+        ),
+        array(
+            array(-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800),
+            array(-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305),
+            array(-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300),
+        ),
+        array(
+            array(-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876),
+            array(-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619),
+            array(-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683),
+        )
+    );
+
+    /**
+     * 37095705934669439343138083508754565189542113879843219016388785533085940283555
+     *
+     * @var int[]
+     */
+    protected static $d = array(
+        -10913610,
+        13857413,
+        -15372611,
+        6949391,
+        114729,
+        -8787816,
+        -6275908,
+        -3247719,
+        -18696448,
+        -12055116
+    );
+
+    /**
+     * 2 * d = 16295367250680780974490674513165176452449235426866156013048779062215315747161
+     *
+     * @var int[]
+     */
+    protected static $d2 = array(
+        -21827239,
+        -5839606,
+        -30745221,
+        13898782,
+        229458,
+        15978800,
+        -12551817,
+        -6495438,
+        29715968,
+        9444199
+    );
+
+    /**
+     * sqrt(-1)
+     *
+     * @var int[]
+     */
+    protected static $sqrtm1 = array(
+        -32595792,
+        -7943725,
+        9377950,
+        3500415,
+        12389472,
+        -272473,
+        -25146209,
+        -2005654,
+        326686,
+        11406482
+    );
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php
new file mode 100644
index 0000000000000..64903dfe9930f
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php
@@ -0,0 +1,418 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Ed25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Ed25519
+ */
+abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve25519
+{
+    const KEYPAIR_BYTES = 96;
+    const SEED_BYTES = 32;
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return string (96 bytes)
+     */
+    public static function keypair()
+    {
+        $seed = random_bytes(self::SEED_BYTES);
+        $pk = '';
+        $sk = '';
+        self::seed_keypair($pk, $sk, $seed);
+        return $sk . $pk;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $pk
+     * @param string $sk
+     * @param string $seed
+     * @return string
+     */
+    public static function seed_keypair(&$pk, &$sk, $seed)
+    {
+        if (self::strlen($seed) !== self::SEED_BYTES) {
+            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
+        }
+
+        /** @var string $pk */
+        $pk = self::publickey_from_secretkey($seed);
+        $sk = self::substr($seed, 0, self::SEED_BYTES) . $pk;
+        return $sk;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $keypair
+     * @return string
+     */
+    public static function secretkey($keypair)
+    {
+        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
+        }
+        return self::substr($keypair, 0, 64);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $keypair
+     * @return string
+     */
+    public static function publickey($keypair)
+    {
+        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
+        }
+        return self::substr($keypair, 64, 32);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sk
+     * @return string
+     */
+    public static function publickey_from_secretkey($sk)
+    {
+        /** @var string $sk */
+        $sk = hash('sha512', self::substr($sk, 0, 32), true);
+        $sk[0] = self::intToChr(
+            self::chrToInt($sk[0]) & 248
+        );
+        $sk[31] = self::intToChr(
+            (self::chrToInt($sk[31]) & 63) | 64
+        );
+        return self::sk_to_pk($sk);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sk
+     * @return string
+     */
+    public static function sk_to_pk($sk)
+    {
+        return self::ge_p3_tobytes(
+            self::ge_scalarmult_base(
+                self::substr($sk, 0, 32)
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    public static function sign($message, $sk)
+    {
+        /** @var string $signature */
+        $signature = self::sign_detached($message, $sk);
+        return $signature . $message;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message A signed message
+     * @param string $pk      Public key
+     * @return string         Message (without signature)
+     * @throws Exception
+     */
+    public static function sign_open($message, $pk)
+    {
+        /** @var string $signature */
+        $signature = self::substr($message, 0, 64);
+
+        /** @var string $message */
+        $message = self::substr($message, 64);
+
+        if (self::verify_detached($signature, $message, $pk)) {
+            return $message;
+        }
+        throw new Exception('Invalid signature');
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    public static function sign_detached($message, $sk)
+    {
+        # crypto_hash_sha512(az, sk, 32);
+        $az =  hash('sha512', self::substr($sk, 0, 32), true);
+
+        # az[0] &= 248;
+        # az[31] &= 63;
+        # az[31] |= 64;
+        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+        # crypto_hash_sha512_init(&hs);
+        # crypto_hash_sha512_update(&hs, az + 32, 32);
+        # crypto_hash_sha512_update(&hs, m, mlen);
+        # crypto_hash_sha512_final(&hs, nonce);
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($az, 32, 32));
+        hash_update($hs, $message);
+        $nonceHash = hash_final($hs, true);
+
+        # memmove(sig + 32, sk + 32, 32);
+        $pk = self::substr($sk, 32, 32);
+
+        # sc_reduce(nonce);
+        # ge_scalarmult_base(&R, nonce);
+        # ge_p3_tobytes(sig, &R);
+        $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $sig = self::ge_p3_tobytes(
+            self::ge_scalarmult_base($nonce)
+        );
+
+        # crypto_hash_sha512_init(&hs);
+        # crypto_hash_sha512_update(&hs, sig, 64);
+        # crypto_hash_sha512_update(&hs, m, mlen);
+        # crypto_hash_sha512_final(&hs, hram);
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($pk, 0, 32));
+        hash_update($hs, $message);
+        $hramHash = hash_final($hs, true);
+
+        # sc_reduce(hram);
+        # sc_muladd(sig + 32, hram, az, nonce);
+        $hram = self::sc_reduce($hramHash);
+        $sigAfter = self::sc_muladd($hram, $az, $nonce);
+        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+        try {
+            ParagonIE_Sodium_Compat::memzero($az);
+        } catch (Error $ex) {
+            $az = null;
+        }
+        return $sig;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sig
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     * @throws Exception
+     */
+    public static function verify_detached($sig, $message, $pk)
+    {
+        if (self::strlen($sig) < 64) {
+            throw new Exception('Signature is too short');
+        }
+        if (self::check_S_lt_L(self::substr($sig, 32, 32))) {
+            throw new Exception('S < L - Invalid signature');
+        }
+        if (self::small_order($sig)) {
+            throw new Exception('Signature is on too small of an order');
+        }
+        if ((self::chrToInt($sig[63]) & 224) !== 0) {
+            throw new Exception('Invalid signature');
+        }
+        $d = 0;
+        for ($i = 0; $i < 32; ++$i) {
+            $d |= self::chrToInt($pk[$i]);
+        }
+        if ($d === 0) {
+            throw new Exception('All zero public key');
+        }
+
+        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        $orig = ParagonIE_Sodium_Compat::$fastMult;
+
+        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+        ParagonIE_Sodium_Compat::$fastMult = true;
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
+        $A = self::ge_frombytes_negate_vartime($pk);
+
+        /** @var string $hDigest */
+        $hDigest = hash(
+            'sha512',
+            self::substr($sig, 0, 32) .
+                self::substr($pk, 0, 32) .
+                $message,
+            true
+        );
+
+        /** @var string $h */
+        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
+        $R = self::ge_double_scalarmult_vartime(
+            $h,
+            $A,
+            self::substr($sig, 32)
+        );
+
+        /** @var string $rcheck */
+        $rcheck = self::ge_tobytes($R);
+
+        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+        ParagonIE_Sodium_Compat::$fastMult = $orig;
+
+        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $S
+     * @return bool
+     * @throws Exception
+     */
+    public static function check_S_lt_L($S)
+    {
+        if (self::strlen($S) < 32) {
+            throw new Exception('Signature must be 32 bytes');
+        }
+        static $L = array(
+            0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
+            0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
+        );
+        $c = 0;
+        $n = 1;
+        $i = 32;
+
+        do {
+            --$i;
+            $x = self::chrToInt($S[$i]);
+            $c |= (
+                (($x - $L[$i]) >> 8) & $n
+            );
+            $n &= (
+                (($x ^ $L[$i]) - 1) >> 8
+            );
+        } while ($i !== 0);
+
+        return $c === 0;
+    }
+
+    /**
+     * @param string $R
+     * @return bool
+     */
+    public static function small_order($R)
+    {
+        static $blacklist = array(
+            /* 0 (order 4) */
+            array(
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            ),
+            /* 1 (order 1) */
+            array(
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            ),
+            /* 2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+            array(
+                0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05
+            ),
+            /* 55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+            array(
+                0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a
+            ),
+            /* p-1 (order 2) */
+            array(
+                0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85
+            ),
+            /* p (order 4) */
+            array(
+                0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa
+            ),
+            /* p+1 (order 1) */
+            array(
+                0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* p+2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+            array(
+                0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* p+55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+            array(
+                0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* 2p-1 (order 2) */
+            array(
+                0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ),
+            /* 2p (order 4) */
+            array(
+                0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ),
+            /* 2p+1 (order 1) */
+            array(
+                0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            )
+        );
+        $countBlacklist = count($blacklist);
+
+        for ($i = 0; $i < $countBlacklist; ++$i) {
+            $c = 0;
+            for ($j = 0; $j < 32; ++$j) {
+                $c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
+            }
+            if ($c === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php b/libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php
new file mode 100644
index 0000000000000..b6cf92996e65c
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php
@@ -0,0 +1,106 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_HChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_HChaCha20
+ */
+class ParagonIE_Sodium_Core_HChaCha20 extends ParagonIE_Sodium_Core_ChaCha20
+{
+    /**
+     * @param string $in
+     * @param string $key
+     * @param string|null $c
+     * @return string
+     */
+    public static function hChaCha20($in = '', $key = '', $c = null)
+    {
+        $ctx = array();
+
+        if ($c === null) {
+            $ctx[0] = 0x61707865;
+            $ctx[1] = 0x3320646e;
+            $ctx[2] = 0x79622d32;
+            $ctx[3] = 0x6b206574;
+        } else {
+            $ctx[0] = self::load_4(self::substr($c,  0, 4));
+            $ctx[1] = self::load_4(self::substr($c,  4, 4));
+            $ctx[2] = self::load_4(self::substr($c,  8, 4));
+            $ctx[3] = self::load_4(self::substr($c, 12, 4));
+        }
+        $ctx[4]  = self::load_4(self::substr($key,  0, 4));
+        $ctx[5]  = self::load_4(self::substr($key,  4, 4));
+        $ctx[6]  = self::load_4(self::substr($key,  8, 4));
+        $ctx[7]  = self::load_4(self::substr($key, 12, 4));
+        $ctx[8]  = self::load_4(self::substr($key, 16, 4));
+        $ctx[9]  = self::load_4(self::substr($key, 20, 4));
+        $ctx[10] = self::load_4(self::substr($key, 24, 4));
+        $ctx[11] = self::load_4(self::substr($key, 28, 4));
+        $ctx[12] = self::load_4(self::substr($in,   0, 4));
+        $ctx[13] = self::load_4(self::substr($in,   4, 4));
+        $ctx[14] = self::load_4(self::substr($in,   8, 4));
+        $ctx[15] = self::load_4(self::substr($in,  12, 4));
+        return self::hChaCha20Bytes($ctx);
+    }
+
+    /**
+     * @param array $ctx
+     * @return string
+     */
+    protected static function hChaCha20Bytes(array $ctx)
+    {
+        $x0  = (int) $ctx[0];
+        $x1  = (int) $ctx[1];
+        $x2  = (int) $ctx[2];
+        $x3  = (int) $ctx[3];
+        $x4  = (int) $ctx[4];
+        $x5  = (int) $ctx[5];
+        $x6  = (int) $ctx[6];
+        $x7  = (int) $ctx[7];
+        $x8  = (int) $ctx[8];
+        $x9  = (int) $ctx[9];
+        $x10 = (int) $ctx[10];
+        $x11 = (int) $ctx[11];
+        $x12 = (int) $ctx[12];
+        $x13 = (int) $ctx[13];
+        $x14 = (int) $ctx[14];
+        $x15 = (int) $ctx[15];
+
+        for ($i = 0; $i < 10; ++$i) {
+            # QUARTERROUND( x0,  x4,  x8,  x12)
+            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+
+            # QUARTERROUND( x1,  x5,  x9,  x13)
+            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+
+            # QUARTERROUND( x2,  x6,  x10,  x14)
+            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+
+            # QUARTERROUND( x3,  x7,  x11,  x15)
+            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+
+            # QUARTERROUND( x0,  x5,  x10,  x15)
+            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+
+            # QUARTERROUND( x1,  x6,  x11,  x12)
+            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+
+            # QUARTERROUND( x2,  x7,  x8,  x13)
+            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+
+            # QUARTERROUND( x3,  x4,  x9,  x14)
+            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+        }
+
+        return self::store32_le((int) ($x0  & 0xffffffff)) .
+            self::store32_le((int) ($x1  & 0xffffffff)) .
+            self::store32_le((int) ($x2  & 0xffffffff)) .
+            self::store32_le((int) ($x3  & 0xffffffff)) .
+            self::store32_le((int) ($x12 & 0xffffffff)) .
+            self::store32_le((int) ($x13 & 0xffffffff)) .
+            self::store32_le((int) ($x14 & 0xffffffff)) .
+            self::store32_le((int) ($x15 & 0xffffffff));
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php b/libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php
new file mode 100644
index 0000000000000..039e057d0c604
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php
@@ -0,0 +1,95 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_HSalsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_HSalsa20
+ */
+abstract class ParagonIE_Sodium_Core_HSalsa20 extends ParagonIE_Sodium_Core_Salsa20
+{
+    /**
+     * Calculate an hsalsa20 hash of a single block
+     *
+     * Hsalsa20 doesn't have a counter and will never be used for more than
+     * one block (used to derive a subkey for xsalsa20).
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $k
+     * @param string|null $c
+     * @return string
+     */
+    public static function hsalsa20($in, $k, $c = null)
+    {
+        if ($c === null) {
+            $x0  = 0x61707865;
+            $x5  = 0x3320646e;
+            $x10 = 0x79622d32;
+            $x15 = 0x6b206574;
+        } else {
+            $x0  = self::load_4(self::substr($c, 0, 4));
+            $x5  = self::load_4(self::substr($c, 4, 4));
+            $x10 = self::load_4(self::substr($c, 8, 4));
+            $x15 = self::load_4(self::substr($c, 12, 4));
+        }
+        $x1  = self::load_4(self::substr($k, 0, 4));
+        $x2  = self::load_4(self::substr($k, 4, 4));
+        $x3  = self::load_4(self::substr($k, 8, 4));
+        $x4  = self::load_4(self::substr($k, 12, 4));
+        $x11 = self::load_4(self::substr($k, 16, 4));
+        $x12 = self::load_4(self::substr($k, 20, 4));
+        $x13 = self::load_4(self::substr($k, 24, 4));
+        $x14 = self::load_4(self::substr($k, 28, 4));
+        $x6  = self::load_4(self::substr($in, 0, 4));
+        $x7  = self::load_4(self::substr($in, 4, 4));
+        $x8  = self::load_4(self::substr($in, 8, 4));
+        $x9  = self::load_4(self::substr($in, 12, 4));
+
+        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+            $x4 ^= self::rotate($x0 + $x12, 7);
+            $x8 ^= self::rotate($x4 + $x0, 9);
+            $x12 ^= self::rotate($x8 + $x4, 13);
+            $x0 ^= self::rotate($x12 + $x8, 18);
+            $x9 ^= self::rotate($x5 + $x1, 7);
+            $x13 ^= self::rotate($x9 + $x5, 9);
+            $x1 ^= self::rotate($x13 + $x9, 13);
+            $x5 ^= self::rotate($x1 + $x13, 18);
+            $x14 ^= self::rotate($x10 + $x6, 7);
+            $x2 ^= self::rotate($x14 + $x10, 9);
+            $x6 ^= self::rotate($x2 + $x14, 13);
+            $x10 ^= self::rotate($x6 + $x2, 18);
+            $x3 ^= self::rotate($x15 + $x11, 7);
+            $x7 ^= self::rotate($x3 + $x15, 9);
+            $x11 ^= self::rotate($x7 + $x3, 13);
+            $x15 ^= self::rotate($x11 + $x7, 18);
+            $x1 ^= self::rotate($x0 + $x3, 7);
+            $x2 ^= self::rotate($x1 + $x0, 9);
+            $x3 ^= self::rotate($x2 + $x1, 13);
+            $x0 ^= self::rotate($x3 + $x2, 18);
+            $x6 ^= self::rotate($x5 + $x4, 7);
+            $x7 ^= self::rotate($x6 + $x5, 9);
+            $x4 ^= self::rotate($x7 + $x6, 13);
+            $x5 ^= self::rotate($x4 + $x7, 18);
+            $x11 ^= self::rotate($x10 + $x9, 7);
+            $x8 ^= self::rotate($x11 + $x10, 9);
+            $x9 ^= self::rotate($x8 + $x11, 13);
+            $x10 ^= self::rotate($x9 + $x8, 18);
+            $x12 ^= self::rotate($x15 + $x14, 7);
+            $x13 ^= self::rotate($x12 + $x15, 9);
+            $x14 ^= self::rotate($x13 + $x12, 13);
+            $x15 ^= self::rotate($x14 + $x13, 18);
+        }
+
+        return self::store32_le($x0) .
+            self::store32_le($x5) .
+            self::store32_le($x10) .
+            self::store32_le($x15) .
+            self::store32_le($x6) .
+            self::store32_le($x7) .
+            self::store32_le($x8) .
+            self::store32_le($x9);
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php
new file mode 100644
index 0000000000000..be3b83da7c7dc
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php
@@ -0,0 +1,59 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Poly1305', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Poly1305
+ */
+abstract class ParagonIE_Sodium_Core_Poly1305 extends ParagonIE_Sodium_Core_Util
+{
+    const BLOCK_SIZE = 16;
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $m
+     * @param string $key
+     * @return string
+     */
+    public static function onetimeauth($m, $key)
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Key must be 32 bytes long.'
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            self::substr($key, 0, 32)
+        );
+        return $state
+            ->update($m)
+            ->finish();
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $mac
+     * @param string $m
+     * @param string $key
+     * @return bool
+     */
+    public static function onetimeauth_verify($mac, $m, $key)
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Key must be 32 bytes long.'
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            self::substr($key, 0, 32)
+        );
+        $calc = $state
+            ->update($m)
+            ->finish();
+        return self::verify_16($calc, $mac);
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php
new file mode 100644
index 0000000000000..f03da72947bf0
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php
@@ -0,0 +1,356 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Poly1305_State
+ */
+class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @var array<int, int>
+     */
+    protected $buffer = array();
+
+    /**
+     * @var bool
+     */
+    protected $final = false;
+
+    /**
+     * @var array<int, int>
+     */
+    public $h;
+
+    /**
+     * @var int
+     */
+    protected $leftover = 0;
+
+    /**
+     * @var int[]
+     */
+    public $r;
+
+    /**
+     * @var int[]
+     */
+    public $pad;
+
+    /**
+     * ParagonIE_Sodium_Core_Poly1305_State constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key
+     * @throws InvalidArgumentException
+     */
+    public function __construct($key = '')
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Poly1305 requires a 32-byte key'
+            );
+        }
+        /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
+        $this->r = array(
+            (int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
+            (int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
+            (int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
+            (int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
+            (int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
+        );
+
+        /* h = 0 */
+        $this->h = array(0, 0, 0, 0, 0);
+
+        /* save pad for later */
+        $this->pad = array(
+            self::load_4(self::substr($key, 16, 4)),
+            self::load_4(self::substr($key, 20, 4)),
+            self::load_4(self::substr($key, 24, 4)),
+            self::load_4(self::substr($key, 28, 4)),
+        );
+
+        $this->leftover = 0;
+        $this->final = false;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @return self
+     */
+    public function update($message = '')
+    {
+        $bytes = self::strlen($message);
+
+        /* handle leftover */
+        if ($this->leftover) {
+            $want = ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - $this->leftover;
+            if ($want > $bytes) {
+                $want = $bytes;
+            }
+            for ($i = 0; $i < $want; ++$i) {
+                $mi = self::chrToInt($message[$i]);
+                $this->buffer[$this->leftover + $i] = $mi;
+            }
+            // We snip off the leftmost bytes.
+            $message = self::substr($message, $want);
+            $bytes = self::strlen($message);
+            $this->leftover += $want;
+            if ($this->leftover < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+                // We still don't have enough to run $this->blocks()
+                return $this;
+            }
+
+            $this->blocks(
+                static::intArrayToString($this->buffer),
+                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+            );
+            $this->leftover = 0;
+        }
+
+        /* process full blocks */
+        if ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+            $want = $bytes & ~(ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1);
+            if ($want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+                $block = self::substr($message, 0, $want);
+                if (self::strlen($block) >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+                    $this->blocks($block, $want);
+                    $message = self::substr($message, $want);
+                    $bytes = self::strlen($message);
+                }
+            }
+        }
+
+        /* store leftover */
+        if ($bytes) {
+            for ($i = 0; $i < $bytes; ++$i) {
+                $mi = self::chrToInt($message[$i]);
+                $this->buffer[$this->leftover + $i] = $mi;
+            }
+            $this->leftover = (int) $this->leftover + $bytes;
+        }
+        return $this;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param int $bytes
+     * @return self
+     */
+    public function blocks($message, $bytes)
+    {
+        if (self::strlen($message) < 16) {
+            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
+        }
+        $hibit = $this->final ? 0 : 1 << 24; /* 1 << 128 */
+        $r0 = (int) $this->r[0];
+        $r1 = (int) $this->r[1];
+        $r2 = (int) $this->r[2];
+        $r3 = (int) $this->r[3];
+        $r4 = (int) $this->r[4];
+
+        $s1 = self::mul($r1, 5);
+        $s2 = self::mul($r2, 5);
+        $s3 = self::mul($r3, 5);
+        $s4 = self::mul($r4, 5);
+
+        $h0 = $this->h[0];
+        $h1 = $this->h[1];
+        $h2 = $this->h[2];
+        $h3 = $this->h[3];
+        $h4 = $this->h[4];
+
+        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+            /* h += m[i] */
+            $h0 +=  self::load_4(self::substr($message, 0, 4))       & 0x3ffffff;
+            $h1 += (self::load_4(self::substr($message, 3, 4)) >> 2) & 0x3ffffff;
+            $h2 += (self::load_4(self::substr($message, 6, 4)) >> 4) & 0x3ffffff;
+            $h3 += (self::load_4(self::substr($message, 9, 4)) >> 6) & 0x3ffffff;
+            $h4 += (self::load_4(self::substr($message, 12, 4)) >> 8) | $hibit;
+
+            /* h *= r */
+            $d0 = (
+                self::mul($h0, $r0) +
+                self::mul($h1, $s4) +
+                self::mul($h2, $s3) +
+                self::mul($h3, $s2) +
+                self::mul($h4, $s1)
+            );
+            $d1 = (
+                self::mul($h0, $r1) +
+                self::mul($h1, $r0) +
+                self::mul($h2, $s4) +
+                self::mul($h3, $s3) +
+                self::mul($h4, $s2)
+            );
+
+            $d2 = (
+                self::mul($h0, $r2) +
+                self::mul($h1, $r1) +
+                self::mul($h2, $r0) +
+                self::mul($h3, $s4) +
+                self::mul($h4, $s3)
+            );
+
+            $d3 = (
+                self::mul($h0, $r3) +
+                self::mul($h1, $r2) +
+                self::mul($h2, $r1) +
+                self::mul($h3, $r0) +
+                self::mul($h4, $s4)
+            );
+
+            $d4 = (
+                self::mul($h0, $r4) +
+                self::mul($h1, $r3) +
+                self::mul($h2, $r2) +
+                self::mul($h3, $r1) +
+                self::mul($h4, $r0)
+            );
+
+            /* (partial) h %= p */
+                                 $c = $d0 >> 26;
+            $h0 = $d0 & 0x3ffffff;
+            $d1 += $c;
+            $c = $d1 >> 26;
+            $h1 = $d1 & 0x3ffffff;
+            $d2 += $c;
+            $c = $d2 >> 26;
+            $h2 = $d2 & 0x3ffffff;
+            $d3 += $c;
+            $c = $d3 >> 26;
+            $h3 = $d3 & 0x3ffffff;
+            $d4 += $c;
+            $c = $d4 >> 26;
+            $h4 = $d4 & 0x3ffffff;
+            $h0 += (int) self::mul($c, 5);
+            $c = $h0 >> 26;
+            $h0 &= 0x3ffffff;
+            $h1 += $c;
+
+            // Chop off the left 32 bytes.
+            $message = self::substr(
+                $message,
+                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+            );
+            $bytes -= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE;
+        }
+
+        $this->h = array(
+            (int) ($h0 & 0xffffffff),
+            (int) ($h1 & 0xffffffff),
+            (int) ($h2 & 0xffffffff),
+            (int) ($h3 & 0xffffffff),
+            (int) ($h4 & 0xffffffff)
+        );
+        return $this;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return string
+     */
+    public function finish()
+    {
+        /* process the remaining block */
+        if ($this->leftover) {
+            $i = $this->leftover;
+            $this->buffer[$i++] = 1;
+            for (; $i < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE; ++$i) {
+                $this->buffer[$i] = 0;
+            }
+            $this->final = true;
+            $this->blocks(
+                self::substr(
+                    static::intArrayToString($this->buffer),
+                    0,
+                    ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+                ),
+                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+            );
+        }
+
+        $h0 = (int) $this->h[0];
+        $h1 = (int) $this->h[1];
+        $h2 = (int) $this->h[2];
+        $h3 = (int) $this->h[3];
+        $h4 = (int) $this->h[4];
+
+        $c = $h1 >> 26;
+        $h1 &= 0x3ffffff;
+        $h2 += $c;
+        $c = $h2 >> 26;
+        $h2 &= 0x3ffffff;
+        $h3 += $c;
+        $c = $h3 >> 26;
+        $h3 &= 0x3ffffff;
+        $h4 += $c;
+        $c = $h4 >> 26;
+        $h4 &= 0x3ffffff;
+        $h0 += self::mul($c, 5);
+        $c = $h0 >> 26;
+        $h0 &= 0x3ffffff;
+        $h1 += $c;
+
+        /* compute h + -p */
+        $g0 = $h0 +  5;
+        $c = $g0 >> 26;
+        $g0 &= 0x3ffffff;
+        $g1 = $h1 + $c;
+        $c = $g1 >> 26;
+        $g1 &= 0x3ffffff;
+        $g2 = $h2 + $c;
+        $c = $g2 >> 26;
+        $g2 &= 0x3ffffff;
+        $g3 = $h3 + $c;
+        $c = $g3 >> 26;
+        $g3 &= 0x3ffffff;
+        $g4 = ($h4 + $c - (1 << 26)) & 0xffffffff;
+
+        /* select h if h < p, or h + -p if h >= p */
+        $mask = ($g4 >> 31) - 1;
+
+        $g0 &= $mask;
+        $g1 &= $mask;
+        $g2 &= $mask;
+        $g3 &= $mask;
+        $g4 &= $mask;
+
+        $mask = ~$mask & 0xffffffff;
+        $h0 = ($h0 & $mask) | $g0;
+        $h1 = ($h1 & $mask) | $g1;
+        $h2 = ($h2 & $mask) | $g2;
+        $h3 = ($h3 & $mask) | $g3;
+        $h4 = ($h4 & $mask) | $g4;
+
+        /* h = h % (2^128) */
+        $h0 = (($h0) | ($h1 << 26)) & 0xffffffff;
+        $h1 = (($h1 >>  6) | ($h2 << 20)) & 0xffffffff;
+        $h2 = (($h2 >> 12) | ($h3 << 14)) & 0xffffffff;
+        $h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
+
+        /* mac = (h + pad) % (2^128) */
+        $f = ($h0 + $this->pad[0]);
+        $h0 = (int) $f;
+        $f = ($h1 + $this->pad[1] + ($f >> 32));
+        $h1 = (int) $f;
+        $f = ($h2 + $this->pad[2] + ($f >> 32));
+        $h2 = (int) $f;
+        $f = ($h3 + $this->pad[3] + ($f >> 32));
+        $h3 = (int) $f;
+
+        return self::store32_le($h0 & 0xffffffff) .
+            self::store32_le($h1 & 0xffffffff) .
+            self::store32_le($h2 & 0xffffffff) .
+            self::store32_le($h3 & 0xffffffff);
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php
new file mode 100644
index 0000000000000..afb70cf0ddac5
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php
@@ -0,0 +1,265 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Salsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Salsa20
+ */
+abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
+{
+    const ROUNDS = 20;
+
+    /**
+     * Calculate an salsa20 hash of a single block
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $k
+     * @param string|null $c
+     * @return string
+     */
+    public static function core_salsa20($in, $k, $c = null)
+    {
+        if (self::strlen($k) < 32) {
+            throw new RangeException('Key must be 32 bytes long');
+        }
+        if ($c === null) {
+            $j0  = $x0  = 0x61707865;
+            $j5  = $x5  = 0x3320646e;
+            $j10 = $x10 = 0x79622d32;
+            $j15 = $x15 = 0x6b206574;
+        } else {
+            $j0  = $x0  = self::load_4(self::substr($c, 0, 4));
+            $j5  = $x5  = self::load_4(self::substr($c, 4, 4));
+            $j10 = $x10 = self::load_4(self::substr($c, 8, 4));
+            $j15 = $x15 = self::load_4(self::substr($c, 12, 4));
+        }
+        $j1  = $x1  = self::load_4(self::substr($k, 0, 4));
+        $j2  = $x2  = self::load_4(self::substr($k, 4, 4));
+        $j3  = $x3  = self::load_4(self::substr($k, 8, 4));
+        $j4  = $x4  = self::load_4(self::substr($k, 12, 4));
+        $j6  = $x6  = self::load_4(self::substr($in, 0, 4));
+        $j7  = $x7  = self::load_4(self::substr($in, 4, 4));
+        $j8  = $x8  = self::load_4(self::substr($in, 8, 4));
+        $j9  = $x9  = self::load_4(self::substr($in, 12, 4));
+        $j11 = $x11 = self::load_4(self::substr($k, 16, 4));
+        $j12 = $x12 = self::load_4(self::substr($k, 20, 4));
+        $j13 = $x13 = self::load_4(self::substr($k, 24, 4));
+        $j14 = $x14 = self::load_4(self::substr($k, 28, 4));
+
+        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+            $x4 ^= self::rotate($x0 + $x12, 7);
+            $x8 ^= self::rotate($x4 + $x0, 9);
+            $x12 ^= self::rotate($x8 + $x4, 13);
+            $x0 ^= self::rotate($x12 + $x8, 18);
+
+            $x9 ^= self::rotate($x5 + $x1, 7);
+            $x13 ^= self::rotate($x9 + $x5, 9);
+            $x1 ^= self::rotate($x13 + $x9, 13);
+            $x5 ^= self::rotate($x1 + $x13, 18);
+
+            $x14 ^= self::rotate($x10 + $x6, 7);
+            $x2 ^= self::rotate($x14 + $x10, 9);
+            $x6 ^= self::rotate($x2 + $x14, 13);
+            $x10 ^= self::rotate($x6 + $x2, 18);
+
+            $x3 ^= self::rotate($x15 + $x11, 7);
+            $x7 ^= self::rotate($x3 + $x15, 9);
+            $x11 ^= self::rotate($x7 + $x3, 13);
+            $x15 ^= self::rotate($x11 + $x7, 18);
+
+            $x1 ^= self::rotate($x0 + $x3, 7);
+            $x2 ^= self::rotate($x1 + $x0, 9);
+            $x3 ^= self::rotate($x2 + $x1, 13);
+            $x0 ^= self::rotate($x3 + $x2, 18);
+
+            $x6 ^= self::rotate($x5 + $x4, 7);
+            $x7 ^= self::rotate($x6 + $x5, 9);
+            $x4 ^= self::rotate($x7 + $x6, 13);
+            $x5 ^= self::rotate($x4 + $x7, 18);
+
+            $x11 ^= self::rotate($x10 + $x9, 7);
+            $x8 ^= self::rotate($x11 + $x10, 9);
+            $x9 ^= self::rotate($x8 + $x11, 13);
+            $x10 ^= self::rotate($x9 + $x8, 18);
+
+            $x12 ^= self::rotate($x15 + $x14, 7);
+            $x13 ^= self::rotate($x12 + $x15, 9);
+            $x14 ^= self::rotate($x13 + $x12, 13);
+            $x15 ^= self::rotate($x14 + $x13, 18);
+        }
+
+        $x0  += $j0;
+        $x1  += $j1;
+        $x2  += $j2;
+        $x3  += $j3;
+        $x4  += $j4;
+        $x5  += $j5;
+        $x6  += $j6;
+        $x7  += $j7;
+        $x8  += $j8;
+        $x9  += $j9;
+        $x10 += $j10;
+        $x11 += $j11;
+        $x12 += $j12;
+        $x13 += $j13;
+        $x14 += $j14;
+        $x15 += $j15;
+
+        return self::store32_le($x0) .
+            self::store32_le($x1) .
+            self::store32_le($x2) .
+            self::store32_le($x3) .
+            self::store32_le($x4) .
+            self::store32_le($x5) .
+            self::store32_le($x6) .
+            self::store32_le($x7) .
+            self::store32_le($x8) .
+            self::store32_le($x9) .
+            self::store32_le($x10) .
+            self::store32_le($x11) .
+            self::store32_le($x12) .
+            self::store32_le($x13) .
+            self::store32_le($x14) .
+            self::store32_le($x15);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function salsa20($len, $nonce, $key)
+    {
+        if (self::strlen($key) !== 32) {
+            throw new RangeException('Key must be 32 bytes long');
+        }
+        $kcopy = '' . $key;
+        $in = self::substr($nonce, 0, 8) . str_repeat("\0", 8);
+        $c = '';
+        while ($len >= 64) {
+            $c .= self::core_salsa20($in, $kcopy, null);
+            $u = 1;
+            // Internal counter.
+            for ($i = 8; $i < 16; ++$i) {
+                $u += self::chrToInt($in[$i]);
+                $in[$i] = self::intToChr($u & 0xff);
+                $u >>= 8;
+            }
+            $len -= 64;
+        }
+        if ($len > 0) {
+            $c .= self::substr(
+                self::core_salsa20($in, $kcopy, null),
+                0,
+                $len
+            );
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($kcopy);
+        } catch (Error $ex) {
+            $kcopy = null;
+        }
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $m
+     * @param string $n
+     * @param int $ic
+     * @param string $k
+     * @return string
+     */
+    public static function salsa20_xor_ic($m, $n, $ic, $k)
+    {
+        $mlen = self::strlen($m);
+        if ($mlen < 1) {
+            return '';
+        }
+        $kcopy = self::substr($k, 0, 32);
+        $in = self::substr($n, 0, 8);
+        // Initialize the counter
+        $in .= ParagonIE_Sodium_Core_Util::store64_le($ic);
+
+        $c = '';
+        while ($mlen >= 64) {
+            $block = self::core_salsa20($in, $kcopy, null);
+            $c .= self::xorStrings(
+                self::substr($m, 0, 64),
+                self::substr($block, 0, 64)
+            );
+            $u = 1;
+            for ($i = 8; $i < 16; ++$i) {
+                $u += self::chrToInt($in[$i]);
+                $in[$i] = self::intToChr($u & 0xff);
+                $u >>= 8;
+            }
+
+            $mlen -= 64;
+            $m = self::substr($m, 64);
+        }
+
+        if ($mlen) {
+            $block = self::core_salsa20($in, $kcopy, null);
+            $c .= self::xorStrings(
+                self::substr($m, 0, $mlen),
+                self::substr($block, 0, $mlen)
+            );
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($block);
+            ParagonIE_Sodium_Compat::memzero($kcopy);
+        } catch (Error $ex) {
+            $block = null;
+            $kcopy = null;
+        }
+
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function salsa20_xor($message, $nonce, $key)
+    {
+        return self::xorStrings(
+            $message,
+            self::salsa20(
+                self::strlen($message),
+                $nonce,
+                $key
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $u
+     * @param int $c
+     * @return int
+     */
+    public static function rotate($u, $c)
+    {
+        $u &= 0xffffffff;
+        $c %= 32;
+        return 0xffffffff & (
+            ($u << $c)
+                |
+            ($u >> (32 - $c))
+        );
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php b/libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php
new file mode 100644
index 0000000000000..592ad7a4d521a
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php
@@ -0,0 +1,300 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_SipHash', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_SodiumCompat_Core_SipHash
+ *
+ * Only uses 32-bit arithmetic, while the original SipHash used 64-bit integers
+ */
+class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int[] $v
+     * @return int[]
+     */
+    public static function sipRound(array $v)
+    {
+        # v0 += v1;
+        list($v[0], $v[1]) = self::add(
+            array($v[0], $v[1]),
+            array($v[2], $v[3])
+        );
+
+        #  v1=ROTL(v1,13);
+        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
+
+        #  v1 ^= v0;
+        $v[2] ^= $v[0];
+        $v[3] ^= $v[1];
+
+        #  v0=ROTL(v0,32);
+        list($v[0], $v[1]) = self::rotl_64($v[0], $v[1], 32);
+
+        # v2 += v3;
+        list($v[4], $v[5]) = self::add(
+            array($v[4], $v[5]),
+            array($v[6], $v[7])
+        );
+
+        # v3=ROTL(v3,16);
+        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
+
+        #  v3 ^= v2;
+        $v[6] ^= $v[4];
+        $v[7] ^= $v[5];
+
+        # v0 += v3;
+        list($v[0], $v[1]) = self::add(
+            array($v[0], $v[1]),
+            array($v[6], $v[7])
+        );
+
+        # v3=ROTL(v3,21);
+        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 21);
+
+        # v3 ^= v0;
+        $v[6] ^= $v[0];
+        $v[7] ^= $v[1];
+
+        # v2 += v1;
+        list($v[4], $v[5]) = self::add(
+            array($v[4], $v[5]),
+            array($v[2], $v[3])
+        );
+
+        # v1=ROTL(v1,17);
+        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 17);
+
+        #  v1 ^= v2;;
+        $v[2] ^= $v[4];
+        $v[3] ^= $v[5];
+
+        # v2=ROTL(v2,32)
+        list($v[4], $v[5]) = self::rotl_64($v[4], $v[5], 32);
+
+        return $v;
+    }
+
+    /**
+     * Add two 32 bit integers representing a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int[] $a
+     * @param int[] $b
+     * @return array<int, mixed>
+     */
+    public static function add(array $a, array $b)
+    {
+        $x1 = $a[1] + $b[1];
+        $c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
+        $x0 = $a[0] + $b[0] + $c;
+        return array(
+            $x0 & 0xffffffff,
+            $x1 & 0xffffffff
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int0
+     * @param int $int1
+     * @param int $c
+     * @return array<int, mixed>
+     */
+    public static function rotl_64($int0, $int1, $c)
+    {
+        $int0 &= 0xffffffff;
+        $int1 &= 0xffffffff;
+        $c &= 63;
+        if ($c === 32) {
+            return array($int1, $int0);
+        }
+        if ($c > 31) {
+            $tmp = $int1;
+            $int1 = $int0;
+            $int0 = $tmp;
+            $c &= 31;
+        }
+        if ($c === 0) {
+            return array($int0, $int1);
+        }
+        return array(
+            0xffffffff & (
+                ($int0 << $c)
+                    |
+                ($int1 >> (32 - $c))
+            ),
+            0xffffffff & (
+                ($int1 << $c)
+                    |
+                ($int0 >> (32 - $c))
+            ),
+        );
+    }
+
+    /**
+     * Implements Siphash-2-4 using only 32-bit numbers.
+     *
+     * When we split an int into two, the higher bits go to the lower index.
+     * e.g. 0xDEADBEEFAB10C92D becomes [
+     *     0 => 0xDEADBEEF,
+     *     1 => 0xAB10C92D
+     * ].
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $key
+     * @return string
+     */
+    public static function sipHash24($in, $key)
+    {
+        $inlen = self::strlen($in);
+
+        # /* "somepseudorandomlygeneratedbytes" */
+        # u64 v0 = 0x736f6d6570736575ULL;
+        # u64 v1 = 0x646f72616e646f6dULL;
+        # u64 v2 = 0x6c7967656e657261ULL;
+        # u64 v3 = 0x7465646279746573ULL;
+        $v = array(
+            0x736f6d65, // 0
+            0x70736575, // 1
+            0x646f7261, // 2
+            0x6e646f6d, // 3
+            0x6c796765, // 4
+            0x6e657261, // 5
+            0x74656462, // 6
+            0x79746573  // 7
+        );
+        // v0 => $v[0], $v[1]
+        // v1 => $v[2], $v[3]
+        // v2 => $v[4], $v[5]
+        // v3 => $v[6], $v[7]
+
+        # u64 k0 = LOAD64_LE( k );
+        # u64 k1 = LOAD64_LE( k + 8 );
+        $k = array(
+            self::load_4(self::substr($key, 4, 4)),
+            self::load_4(self::substr($key, 0, 4)),
+            self::load_4(self::substr($key, 12, 4)),
+            self::load_4(self::substr($key, 8, 4))
+        );
+        // k0 => $k[0], $k[1]
+        // k1 => $k[2], $k[3]
+
+        # b = ( ( u64 )inlen ) << 56;
+        $b = array(
+            $inlen << 24,
+            0
+        );
+        // See docblock for why the 0th index gets the higher bits.
+
+        # v3 ^= k1;
+        $v[6] ^= $k[2];
+        $v[7] ^= $k[3];
+        # v2 ^= k0;
+        $v[4] ^= $k[0];
+        $v[5] ^= $k[1];
+        # v1 ^= k1;
+        $v[2] ^= $k[2];
+        $v[3] ^= $k[3];
+        # v0 ^= k0;
+        $v[0] ^= $k[0];
+        $v[1] ^= $k[1];
+
+        $left = $inlen;
+        # for ( ; in != end; in += 8 )
+        while ($left >= 8) {
+            # m = LOAD64_LE( in );
+            $m = array(
+                self::load_4(self::substr($in, 4, 4)),
+                self::load_4(self::substr($in, 0, 4))
+            );
+
+            # v3 ^= m;
+            $v[6] ^= $m[0];
+            $v[7] ^= $m[1];
+
+            # SIPROUND;
+            # SIPROUND;
+            $v = self::sipRound($v);
+            $v = self::sipRound($v);
+
+            # v0 ^= m;
+            $v[0] ^= $m[0];
+            $v[1] ^= $m[1];
+
+            $in = self::substr($in, 8);
+            $left -= 8;
+        }
+
+        # switch( left )
+        #  {
+        #     case 7: b |= ( ( u64 )in[ 6] )  << 48;
+        #     case 6: b |= ( ( u64 )in[ 5] )  << 40;
+        #     case 5: b |= ( ( u64 )in[ 4] )  << 32;
+        #     case 4: b |= ( ( u64 )in[ 3] )  << 24;
+        #     case 3: b |= ( ( u64 )in[ 2] )  << 16;
+        #     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
+        #     case 1: b |= ( ( u64 )in[ 0] ); break;
+        #     case 0: break;
+        # }
+        switch ($left) {
+            case 7:
+                $b[0] |= self::chrToInt($in[6]) << 16;
+            case 6:
+                $b[0] |= self::chrToInt($in[5]) << 8;
+            case 5:
+                $b[0] |= self::chrToInt($in[4]);
+            case 4:
+                $b[1] |= self::chrToInt($in[3]) << 24;
+            case 3:
+                $b[1] |= self::chrToInt($in[2]) << 16;
+            case 2:
+                $b[1] |= self::chrToInt($in[1]) << 8;
+            case 1:
+                $b[1] |= self::chrToInt($in[0]);
+            case 0:
+                break;
+        }
+        // See docblock for why the 0th index gets the higher bits.
+
+        # v3 ^= b;
+        $v[6] ^= $b[0];
+        $v[7] ^= $b[1];
+
+        # SIPROUND;
+        # SIPROUND;
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+
+        # v0 ^= b;
+        $v[0] ^= $b[0];
+        $v[1] ^= $b[1];
+
+        // Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
+        # v2 ^= 0xff;
+        $v[5] ^= 0xff;
+
+        # SIPROUND;
+        # SIPROUND;
+        # SIPROUND;
+        # SIPROUND;
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+
+        # b = v0 ^ v1 ^ v2 ^ v3;
+        # STORE64_LE( out, b );
+        return  self::store32_le($v[1] ^ $v[3] ^ $v[5] ^ $v[7]) .
+            self::store32_le($v[0] ^ $v[2] ^ $v[4] ^ $v[6]);
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php
new file mode 100644
index 0000000000000..1cb5612579341
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php
@@ -0,0 +1,767 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Util', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Util
+ */
+abstract class ParagonIE_Sodium_Core_Util
+{
+    /**
+     * Convert a binary string into a hexadecimal string without cache-timing
+     * leaks
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $binaryString (raw binary)
+     * @return string
+     * @throws TypeError
+     */
+    public static function bin2hex($binaryString)
+    {
+        /* Type checks: */
+        if (!is_string($binaryString)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
+        }
+
+        $hex = '';
+        $len = self::strlen($binaryString);
+        for ($i = 0; $i < $len; ++$i) {
+            $chunk = unpack('C', self::substr($binaryString, $i, 2));
+            $c = $chunk[1] & 0xf;
+            $b = $chunk[1] >> 4;
+            $hex .= pack(
+                'CC',
+                (87 + $b + ((($b - 10) >> 8) & ~38)),
+                (87 + $c + ((($c - 10) >> 8) & ~38))
+            );
+        }
+        return $hex;
+    }
+
+    /**
+     * Convert a binary string into a hexadecimal string without cache-timing
+     * leaks, returning uppercase letters (as per RFC 4648)
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $bin_string (raw binary)
+     * @return string
+     */
+    public static function bin2hexUpper($bin_string)
+    {
+        $hex = '';
+        $len = self::strlen($bin_string);
+        for ($i = 0; $i < $len; ++$i) {
+            $chunk = unpack('C', self::substr($bin_string, $i, 2));
+            /**
+             * Lower 16 bits
+             *
+             * @var int
+             */
+            $c = $chunk[1] & 0xf;
+
+            /**
+             * Upper 16 bits
+             * @var int
+             */
+            $b = $chunk[1] >> 4;
+
+            /**
+             * Use pack() and binary operators to turn the two integers
+             * into hexadecimal characters. We don't use chr() here, because
+             * it uses a lookup table internally and we want to avoid
+             * cache-timing side-channels.
+             */
+            $hex .= pack(
+                'CC',
+                (55 + $b + ((($b - 10) >> 8) & ~6)),
+                (55 + $c + ((($c - 10) >> 8) & ~6))
+            );
+        }
+        return $hex;
+    }
+
+    /**
+     * Cache-timing-safe variant of ord()
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $chr
+     * @return int
+     * @throws Error
+     */
+    public static function chrToInt($chr)
+    {
+        /* Type checks: */
+        if (!is_string($chr)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
+        }
+        if (self::strlen($chr) !== 1) {
+            throw new Error('chrToInt() expects a string that is exactly 1 character long');
+        }
+        $chunk = unpack('C', $chr);
+        return $chunk[1];
+    }
+
+    /**
+     * Compares two strings.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $left
+     * @param string $right
+     * @param int $len
+     * @return int
+     */
+    public static function compare($left, $right, $len = null)
+    {
+        $leftLen = self::strlen($left);
+        $rightLen = self::strlen($right);
+        if ($len === null) {
+            $len = max($leftLen, $rightLen);
+            $left = str_pad($left, $len, "\x00", STR_PAD_RIGHT);
+            $right = str_pad($right, $len, "\x00", STR_PAD_RIGHT);
+        }
+
+        $gt = 0;
+        $eq = 1;
+        $i = $len;
+        while ($i !== 0) {
+            --$i;
+            $gt |= ((self::chrToInt($right[$i]) - self::chrToInt($left[$i])) >> 8) & $eq;
+            $eq &= ((self::chrToInt($right[$i]) ^ self::chrToInt($left[$i])) - 1) >> 8;
+        }
+        return ($gt + $gt + $eq) - 1;
+    }
+
+    /**
+     * Evaluate whether or not two strings are equal (in constant-time)
+     *
+     * @param string $left
+     * @param string $right
+     * @return bool
+     * @throws TypeError
+     */
+    public static function hashEquals($left, $right)
+    {
+        /* Type checks: */
+        if (!is_string($left)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
+        }
+        if (!is_string($right)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
+        }
+
+        if (is_callable('hash_equals')) {
+            return hash_equals($left, $right);
+        }
+        $d = 0;
+        $len = self::strlen($left);
+        if ($len !== self::strlen($right)) {
+            return false;
+        }
+        for ($i = 0; $i < $len; ++$i) {
+            $d |= self::chrToInt($left[$i]) ^ self::chrToInt($right[$i]);
+        }
+
+        if ($d !== 0) {
+            return false;
+        }
+        return $left === $right;
+    }
+
+    /**
+     * Convert a hexadecimal string into a binary string without cache-timing
+     * leaks
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $hexString
+     * @param bool $strictPadding
+     * @return string (raw binary)
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function hex2bin($hexString, $strictPadding = false)
+    {
+        /* Type checks: */
+        if (!is_string($hexString)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
+        }
+
+        $hex_pos = 0;
+        $bin = '';
+        $c_acc = 0;
+        $hex_len = self::strlen($hexString);
+        $state = 0;
+        if (($hex_len & 1) !== 0) {
+            if ($strictPadding) {
+                throw new RangeException(
+                    'Expected an even number of hexadecimal characters'
+                );
+            } else {
+                $hexString = '0' . $hexString;
+                ++$hex_len;
+            }
+        }
+
+        $chunk = unpack('C*', $hexString);
+        while ($hex_pos < $hex_len) {
+            ++$hex_pos;
+            $c = $chunk[$hex_pos];
+            $c_num = $c ^ 48;
+            $c_num0 = ($c_num - 10) >> 8;
+            $c_alpha = ($c & ~32) - 55;
+            $c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
+            if (($c_num0 | $c_alpha0) === 0) {
+                throw new RangeException(
+                    'hex2bin() only expects hexadecimal characters'
+                );
+            }
+            $c_val = ($c_num0 & $c_num) | ($c_alpha & $c_alpha0);
+            if ($state === 0) {
+                $c_acc = $c_val * 16;
+            } else {
+                $bin .= pack('C', $c_acc | $c_val);
+            }
+            $state ^= 1;
+        }
+        return $bin;
+    }
+
+    /**
+     * Turn an array of integers into a string
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param array<int, int> $ints
+     * @return string
+     */
+    public static function intArrayToString(array $ints)
+    {
+        $args = $ints;
+        foreach ($args as $i => $v) {
+            $args[$i] = $v & 0xff;
+        }
+        array_unshift($args, str_repeat('C', count($ints)));
+        return call_user_func_array('pack', $args);
+    }
+
+    /**
+     * Cache-timing-safe variant of ord()
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function intToChr($int)
+    {
+        return pack('C', $int);
+    }
+
+    /**
+     * Load a 3 character substring into an integer
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return int
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function load_3($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($string) < 3) {
+            throw new RangeException(
+                'String must be 3 bytes or more; ' . self::strlen($string) . ' given.'
+            );
+        }
+        $result = self::chrToInt($string[0]);
+        $result |= self::chrToInt($string[1]) << 8;
+        $result |= self::chrToInt($string[2]) << 16;
+        return $result & 0xffffff;
+    }
+
+    /**
+     * Load a 4 character substring into an integer
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return int
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function load_4($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($string) < 4) {
+            throw new RangeException(
+                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+            );
+        }
+        $result  = (self::chrToInt($string[0]) & 0xff);
+        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
+        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
+        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
+        return $result & 0xffffffff;
+    }
+
+    /**
+     * Load a 8 character substring into an integer
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return int
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function load64_le($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($string) < 4) {
+            throw new RangeException(
+                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+            );
+        }
+        $result  = (self::chrToInt($string[0]) & 0xff);
+        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
+        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
+        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
+        $result |= (self::chrToInt($string[4]) & 0xff) << 32;
+        $result |= (self::chrToInt($string[5]) & 0xff) << 40;
+        $result |= (self::chrToInt($string[6]) & 0xff) << 48;
+        $result |= (self::chrToInt($string[7]) & 0xff) << 56;
+        return (int) $result;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $left
+     * @param string $right
+     * @return int
+     */
+    public static function memcmp($left, $right)
+    {
+        if (self::hashEquals($left, $right)) {
+            return 0;
+        }
+        return -1;
+    }
+
+    /**
+     * Multiply two integers in constant-time
+     *
+     * Micro-architecture timing side-channels caused by how your CPU
+     * implements multiplication are best prevented by never using the
+     * multiplication operators and ensuring that our code always takes
+     * the same number of operations to complete, regardless of the values
+     * of $a and $b.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $a
+     * @param int $b
+     * @return int
+     */
+    public static function mul($a, $b)
+    {
+        if (ParagonIE_Sodium_Compat::$fastMult) {
+            return (int) ($a * $b);
+        }
+
+        static $size = null;
+        if (!$size) {
+            $size = (PHP_INT_SIZE << 3) - 1;
+        }
+
+        $c = 0;
+
+        /**
+         * Mask is either -1 or 0.
+         *
+         * -1 in binary looks like 0x1111 ... 1111
+         *  0 in binary looks like 0x0000 ... 0000
+         *
+         * @var int
+         */
+        $mask = -(($b >> $size) & 1);
+
+        /**
+         * Ensure $b is a positive integer, without creating
+         * a branching side-channel
+         */
+        $b = ($b & ~$mask) | ($mask & -$b);
+
+        /**
+         * This loop always runs 32 times when PHP_INT_SIZE is 4.
+         * This loop always runs 64 times when PHP_INT_SIZE is 8.
+         */
+        for ($i = $size; $i >= 0; --$i) {
+            $c += (int) ($a & -($b & 1));
+            $a <<= 1;
+            $b >>= 1;
+        }
+
+        /**
+         * If $b was negative, we then apply the same value to $c here.
+         * It doesn't matter much if $a was negative; the $c += above would
+         * have produced a negative integer to begin with. But a negative $b
+         * makes $b >>= 1 never return 0, so we would end up with incorrect
+         * results.
+         *
+         * The end result is what we'd expect from integer multiplication.
+         */
+        return (int) (($c & ~$mask) | ($mask & -$c));
+    }
+
+    /**
+     * Convert any arbitrary numbers into two 32-bit integers that represent
+     * a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int|float $num
+     * @return array<int, int>
+     */
+    public static function numericTo64BitInteger($num)
+    {
+        $high = 0;
+        $low = $num & 0xffffffff;
+
+        if ((+(abs($num))) >= 1) {
+            if ($num > 0) {
+                $high = min((+(floor($num/4294967296))), 4294967295);
+            } else {
+                $high = ~~((+(ceil(($num - (+((~~($num)))))/4294967296))));
+            }
+        }
+        return array((int) $high, (int) $low);
+    }
+
+    /**
+     * Store a 24-bit integer into a string, treating it as big-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store_3($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+
+        return self::intToChr(($int >> 16) & 0xff) .
+            self::intToChr(($int >> 8)     & 0xff) .
+            self::intToChr($int            & 0xff);
+    }
+
+    /**
+     * Store a 32-bit integer into a string, treating it as little-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store32_le($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+
+        return self::intToChr($int      & 0xff) .
+            self::intToChr(($int >> 8)  & 0xff) .
+            self::intToChr(($int >> 16) & 0xff) .
+            self::intToChr(($int >> 24) & 0xff);
+    }
+
+    /**
+     * Store a 32-bit integer into a string, treating it as big-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store_4($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+
+        return self::intToChr(($int >> 24) & 0xff) .
+            self::intToChr(($int >> 16)    & 0xff) .
+            self::intToChr(($int >> 8)     & 0xff) .
+            self::intToChr($int            & 0xff);
+    }
+
+    /**
+     * Stores a 64-bit integer as an string, treating it as little-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store64_le($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+
+        if (PHP_INT_SIZE === 8) {
+            return self::intToChr($int & 0xff) .
+                self::intToChr(($int >>  8) & 0xff) .
+                self::intToChr(($int >> 16) & 0xff) .
+                self::intToChr(($int >> 24) & 0xff) .
+                self::intToChr(($int >> 32) & 0xff) .
+                self::intToChr(($int >> 40) & 0xff) .
+                self::intToChr(($int >> 48) & 0xff) .
+                self::intToChr(($int >> 56) & 0xff);
+        }
+        if ($int > PHP_INT_MAX) {
+            list($hiB, $int) = self::numericTo64BitInteger($int);
+        } else {
+            $hiB = 0;
+        }
+        return self::intToChr($hiB & 0xff) .
+            self::intToChr(($hiB >>  8) & 0xff) .
+            self::intToChr(($hiB >> 16) & 0xff) .
+            self::intToChr(($hiB >> 24) & 0xff) .
+            self::intToChr(($int      ) & 0xff) .
+            self::intToChr(($int >>  8) & 0xff) .
+            self::intToChr(($int >> 16) & 0xff) .
+            self::intToChr(($int >> 24) & 0xff);
+    }
+
+    /**
+     * Safe string length
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @ref mbstring.func_overload
+     *
+     * @param string $str
+     * @return int
+     * @throws TypeError
+     */
+    public static function strlen($str)
+    {
+        /* Type checks: */
+        if (!is_string($str)) {
+            throw new TypeError('String expected');
+        }
+
+        return (int) (
+        self::isMbStringOverride()
+            ? mb_strlen($str, '8bit')
+            : strlen($str)
+        );
+    }
+
+    /**
+     * Turn a string into an array of integers
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return array<int, int>
+     * @throws TypeError
+     */
+    public static function stringToIntArray($string)
+    {
+        if (!is_string($string)) {
+            throw new TypeError('String expected');
+        }
+        /**
+         * @var array<int, int>
+         */
+        $values = array_values(
+            unpack('C*', $string)
+        );
+        return $values;
+    }
+
+    /**
+     * Safe substring
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @ref mbstring.func_overload
+     *
+     * @param string $str
+     * @param int $start
+     * @param int $length
+     * @return string
+     * @throws TypeError
+     */
+    public static function substr($str, $start = 0, $length = null)
+    {
+        /* Type checks: */
+        if (!is_string($str)) {
+            throw new TypeError('String expected');
+        }
+
+        if ($length === 0) {
+            return '';
+        }
+
+        if (self::isMbStringOverride()) {
+            if (PHP_VERSION_ID < 50400 && $length === null) {
+                $length = self::strlen($str);
+            }
+            $sub = (string) mb_substr($str, $start, $length, '8bit');
+        } elseif ($length === null) {
+            $sub = (string) substr($str, $start);
+        } else {
+            $sub = (string) substr($str, $start, $length);
+        }
+        if (isset($sub)) {
+            return $sub;
+        }
+        return '';
+    }
+
+    /**
+     * Compare a 16-character byte string in constant time.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @return bool
+     * @throws TypeError
+     */
+    public static function verify_16($a, $b)
+    {
+        /* Type checks: */
+        if (!is_string($a)) {
+            throw new TypeError('String expected');
+        }
+        if (!is_string($b)) {
+            throw new TypeError('String expected');
+        }
+        return self::hashEquals(
+            self::substr($a, 0, 16),
+            self::substr($b, 0, 16)
+        );
+    }
+
+    /**
+     * Compare a 32-character byte string in constant time.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @return bool
+     * @throws TypeError
+     */
+    public static function verify_32($a, $b)
+    {
+        /* Type checks: */
+        if (!is_string($a)) {
+            throw new TypeError('String expected');
+        }
+        if (!is_string($b)) {
+            throw new TypeError('String expected');
+        }
+        return self::hashEquals(
+            self::substr($a, 0, 32),
+            self::substr($b, 0, 32)
+        );
+    }
+
+    /**
+     * Calculate $a ^ $b for two strings.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @return string
+     * @throws TypeError
+     */
+    public static function xorStrings($a, $b)
+    {
+        /* Type checks: */
+        if (!is_string($a)) {
+            throw new TypeError('Argument 1 must be a string');
+        }
+        if (!is_string($b)) {
+            throw new TypeError('Argument 2 must be a string');
+        }
+
+        return $a ^ $b;
+    }
+
+    /**
+     * Returns whether or not mbstring.func_overload is in effect.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return bool
+     */
+    protected static function isMbStringOverride()
+    {
+        static $mbstring = null;
+
+        if ($mbstring === null) {
+            $mbstring = extension_loaded('mbstring')
+                &&
+            (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING);
+        }
+
+        return $mbstring;
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php b/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php
new file mode 100644
index 0000000000000..c33f15d4037fa
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php
@@ -0,0 +1,311 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_X25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_X25519
+ */
+abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve25519
+{
+    /**
+     * Alters the objects passed to this method in place.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @param int $b
+     * @return void
+     */
+    public static function fe_cswap(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g,
+        $b = 0
+    ) {
+        $f0 = (int) $f[0];
+        $f1 = (int) $f[1];
+        $f2 = (int) $f[2];
+        $f3 = (int) $f[3];
+        $f4 = (int) $f[4];
+        $f5 = (int) $f[5];
+        $f6 = (int) $f[6];
+        $f7 = (int) $f[7];
+        $f8 = (int) $f[8];
+        $f9 = (int) $f[9];
+        $g0 = (int) $g[0];
+        $g1 = (int) $g[1];
+        $g2 = (int) $g[2];
+        $g3 = (int) $g[3];
+        $g4 = (int) $g[4];
+        $g5 = (int) $g[5];
+        $g6 = (int) $g[6];
+        $g7 = (int) $g[7];
+        $g8 = (int) $g[8];
+        $g9 = (int) $g[9];
+        $b = -$b;
+        $x0 = ($f0 ^ $g0) & $b;
+        $x1 = ($f1 ^ $g1) & $b;
+        $x2 = ($f2 ^ $g2) & $b;
+        $x3 = ($f3 ^ $g3) & $b;
+        $x4 = ($f4 ^ $g4) & $b;
+        $x5 = ($f5 ^ $g5) & $b;
+        $x6 = ($f6 ^ $g6) & $b;
+        $x7 = ($f7 ^ $g7) & $b;
+        $x8 = ($f8 ^ $g8) & $b;
+        $x9 = ($f9 ^ $g9) & $b;
+        $f[0] = $f0 ^ $x0;
+        $f[1] = $f1 ^ $x1;
+        $f[2] = $f2 ^ $x2;
+        $f[3] = $f3 ^ $x3;
+        $f[4] = $f4 ^ $x4;
+        $f[5] = $f5 ^ $x5;
+        $f[6] = $f6 ^ $x6;
+        $f[7] = $f7 ^ $x7;
+        $f[8] = $f8 ^ $x8;
+        $f[9] = $f9 ^ $x9;
+        $g[0] = $g0 ^ $x0;
+        $g[1] = $g1 ^ $x1;
+        $g[2] = $g2 ^ $x2;
+        $g[3] = $g3 ^ $x3;
+        $g[4] = $g4 ^ $x4;
+        $g[5] = $g5 ^ $x5;
+        $g[6] = $g6 ^ $x6;
+        $g[7] = $g7 ^ $x7;
+        $g[8] = $g8 ^ $x8;
+        $g[9] = $g9 ^ $x9;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $h = array(
+            self::mul($f[0], 121666),
+            self::mul($f[1], 121666),
+            self::mul($f[2], 121666),
+            self::mul($f[3], 121666),
+            self::mul($f[4], 121666),
+            self::mul($f[5], 121666),
+            self::mul($f[6], 121666),
+            self::mul($f[7], 121666),
+            self::mul($f[8], 121666),
+            self::mul($f[9], 121666)
+        );
+
+        $carry9 = ($h[9] + (1 << 24)) >> 25;
+        $h[0] += self::mul($carry9, 19);
+        $h[9] -= $carry9 << 25;
+        $carry1 = ($h[1] + (1 << 24)) >> 25;
+        $h[2] += $carry1;
+        $h[1] -= $carry1 << 25;
+        $carry3 = ($h[3] + (1 << 24)) >> 25;
+        $h[4] += $carry3;
+        $h[3] -= $carry3 << 25;
+        $carry5 = ($h[5] + (1 << 24)) >> 25;
+        $h[6] += $carry5;
+        $h[5] -= $carry5 << 25;
+        $carry7 = ($h[7] + (1 << 24)) >> 25;
+        $h[8] += $carry7;
+        $h[7] -= $carry7 << 25;
+
+        $carry0 = ($h[0] + (1 << 25)) >> 26;
+        $h[1] += $carry0;
+        $h[0] -= $carry0 << 26;
+        $carry2 = ($h[2] + (1 << 25)) >> 26;
+        $h[3] += $carry2;
+        $h[2] -= $carry2 << 26;
+        $carry4 = ($h[4] + (1 << 25)) >> 26;
+        $h[5] += $carry4;
+        $h[4] -= $carry4 << 26;
+        $carry6 = ($h[6] + (1 << 25)) >> 26;
+        $h[7] += $carry6;
+        $h[6] -= $carry6 << 26;
+        $carry8 = ($h[8] + (1 << 25)) >> 26;
+        $h[9] += $carry8;
+        $h[8] -= $carry8 << 26;
+
+        foreach ($h as $i => $value) {
+            $h[$i] = (int) $value;
+        }
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * Inline comments preceded by # are from libsodium's ref10 code.
+     *
+     * @param string $n
+     * @param string $p
+     * @return string
+     */
+    public static function crypto_scalarmult_curve25519_ref10($n, $p)
+    {
+        # for (i = 0;i < 32;++i) e[i] = n[i];
+        $e = '' . $n;
+        # e[0] &= 248;
+        $e[0] = self::intToChr(
+            self::chrToInt($e[0]) & 248
+        );
+        # e[31] &= 127;
+        # e[31] |= 64;
+        $e[31] = self::intToChr(
+            (self::chrToInt($e[31]) & 127) | 64
+        );
+        # fe_frombytes(x1,p);
+        $x1 = self::fe_frombytes($p);
+        # fe_1(x2);
+        $x2 = self::fe_1();
+        # fe_0(z2);
+        $z2 = self::fe_0();
+        # fe_copy(x3,x1);
+        $x3 = self::fe_copy($x1);
+        # fe_1(z3);
+        $z3 = self::fe_1();
+
+        # swap = 0;
+        $swap = 0;
+
+        # for (pos = 254;pos >= 0;--pos) {
+        for ($pos = 254; $pos >= 0; --$pos) {
+            # b = e[pos / 8] >> (pos & 7);
+            $b = self::chrToInt(
+                    $e[(int) floor($pos / 8)]
+                ) >> ($pos & 7);
+            # b &= 1;
+            $b &= 1;
+            # swap ^= b;
+            $swap ^= $b;
+            # fe_cswap(x2,x3,swap);
+            self::fe_cswap($x2, $x3, $swap);
+            # fe_cswap(z2,z3,swap);
+            self::fe_cswap($z2, $z3, $swap);
+            # swap = b;
+            $swap = $b;
+            # fe_sub(tmp0,x3,z3);
+            $tmp0 = self::fe_sub($x3, $z3);
+            # fe_sub(tmp1,x2,z2);
+            $tmp1 = self::fe_sub($x2, $z2);
+
+            # fe_add(x2,x2,z2);
+            $x2 = self::fe_add($x2, $z2);
+
+            # fe_add(z2,x3,z3);
+            $z2 = self::fe_add($x3, $z3);
+
+            # fe_mul(z3,tmp0,x2);
+            $z3 = self::fe_mul($tmp0, $x2);
+
+            # fe_mul(z2,z2,tmp1);
+            $z2 = self::fe_mul($z2, $tmp1);
+
+            # fe_sq(tmp0,tmp1);
+            $tmp0 = self::fe_sq($tmp1);
+
+            # fe_sq(tmp1,x2);
+            $tmp1 = self::fe_sq($x2);
+
+            # fe_add(x3,z3,z2);
+            $x3 = self::fe_add($z3, $z2);
+
+            # fe_sub(z2,z3,z2);
+            $z2 = self::fe_sub($z3, $z2);
+
+            # fe_mul(x2,tmp1,tmp0);
+            $x2 = self::fe_mul($tmp1, $tmp0);
+
+            # fe_sub(tmp1,tmp1,tmp0);
+            $tmp1 = self::fe_sub($tmp1, $tmp0);
+
+            # fe_sq(z2,z2);
+            $z2 = self::fe_sq($z2);
+
+            # fe_mul121666(z3,tmp1);
+            $z3 = self::fe_mul121666($tmp1);
+
+            # fe_sq(x3,x3);
+            $x3 = self::fe_sq($x3);
+
+            # fe_add(tmp0,tmp0,z3);
+            $tmp0 = self::fe_add($tmp0, $z3);
+
+            # fe_mul(z3,x1,z2);
+            $z3 = self::fe_mul($x1, $z2);
+
+            # fe_mul(z2,tmp1,tmp0);
+            $z2 = self::fe_mul($tmp1, $tmp0);
+        }
+
+        # fe_cswap(x2,x3,swap);
+        self::fe_cswap($x2, $x3, $swap);
+
+        # fe_cswap(z2,z3,swap);
+        self::fe_cswap($z2, $z3, $swap);
+
+        # fe_invert(z2,z2);
+        $z2 = self::fe_invert($z2);
+
+        # fe_mul(x2,x2,z2);
+        $x2 = self::fe_mul($x2, $z2);
+        # fe_tobytes(q,x2);
+        return self::fe_tobytes($x2);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $edwardsZ
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function edwards_to_montgomery(
+        ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY,
+        ParagonIE_Sodium_Core_Curve25519_Fe $edwardsZ
+    ) {
+        $tempX = self::fe_add($edwardsZ, $edwardsY);
+        $tempZ = self::fe_sub($edwardsZ, $edwardsY);
+        $tempZ = self::fe_invert($tempZ);
+        return self::fe_mul($tempX, $tempZ);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $n
+     * @return string
+     * @throws TypeError
+     */
+    public static function crypto_scalarmult_curve25519_ref10_base($n)
+    {
+        # for (i = 0;i < 32;++i) e[i] = n[i];
+        $e = '' . $n;
+
+        # e[0] &= 248;
+        $e[0] = self::intToChr(
+            self::chrToInt($e[0]) & 248
+        );
+
+        # e[31] &= 127;
+        # e[31] |= 64;
+        $e[31] = self::intToChr(
+            (self::chrToInt($e[31]) & 127) | 64
+        );
+
+        $A = self::ge_scalarmult_base($e);
+        if (
+            !($A->Y instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
+                ||
+            !($A->Z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
+        ) {
+            throw new TypeError('Null points encountered');
+        }
+        $pk = self::edwards_to_montgomery($A->Y, $A->Z);
+        return self::fe_tobytes($pk);
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php b/libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php
new file mode 100644
index 0000000000000..e7a25337bcb15
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php
@@ -0,0 +1,62 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_XChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_XChaCha20
+ */
+class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
+{
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws Exception
+     */
+    public static function stream($len = 64, $nonce = '', $key = '')
+    {
+        if (self::strlen($nonce) !== 24) {
+            throw new Exception('Nonce must be 24 bytes long');
+        }
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx(
+                self::hChaCha20(
+                    self::substr($nonce, 0, 16),
+                    $key
+                ),
+                self::substr($nonce, 16, 8)
+            ),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws Exception
+     */
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        if (self::strlen($nonce) !== 24) {
+            throw new Exception('Nonce must be 24 bytes long');
+        }
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx(
+                self::hChaCha20(self::substr($nonce, 0, 16), $key),
+                self::substr($nonce, 16, 8),
+                $ic
+            ),
+            $message
+        );
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php b/libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php
new file mode 100644
index 0000000000000..dc391d132da6a
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php
@@ -0,0 +1,53 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Xsalsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Xsalsa20
+ */
+abstract class ParagonIE_Sodium_Core_Xsalsa20 extends ParagonIE_Sodium_Core_HSalsa20
+{
+    /**
+     * Expand a key and nonce into an xsalsa20 keystream.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function xsalsa20($len, $nonce, $key)
+    {
+        $ret = self::salsa20(
+            $len,
+            self::substr($nonce, 16, 8),
+            self::hsalsa20($nonce, $key)
+        );
+        return $ret;
+    }
+
+    /**
+     * Encrypt a string with Xsalsa20. Doesn't provide integrity.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function xsalsa20_xor($message, $nonce, $key)
+    {
+        return self::xorStrings(
+            $message,
+            self::xsalsa20(
+                self::strlen($message),
+                $nonce,
+                $key
+            )
+        );
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/Crypto.php b/libraries/vendor/paragonie/sodium_compat/src/Crypto.php
new file mode 100644
index 0000000000000..ea582abcd1143
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/Crypto.php
@@ -0,0 +1,1174 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Crypto', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Crypto
+ *
+ * ATTENTION!
+ *
+ * If you are using this library, you should be using
+ * ParagonIE_Sodium_Compat in your code, not this class.
+ */
+abstract class ParagonIE_Sodium_Crypto
+{
+    const aead_chacha20poly1305_KEYBYTES = 32;
+    const aead_chacha20poly1305_NSECBYTES = 0;
+    const aead_chacha20poly1305_NPUBBYTES = 8;
+    const aead_chacha20poly1305_ABYTES = 16;
+
+    const aead_chacha20poly1305_IETF_KEYBYTES = 32;
+    const aead_chacha20poly1305_IETF_NSECBYTES = 0;
+    const aead_chacha20poly1305_IETF_NPUBBYTES = 12;
+    const aead_chacha20poly1305_IETF_ABYTES = 16;
+
+    const aead_xchacha20poly1305_IETF_KEYBYTES = 32;
+    const aead_xchacha20poly1305_IETF_NSECBYTES = 0;
+    const aead_xchacha20poly1305_IETF_NPUBBYTES = 24;
+    const aead_xchacha20poly1305_IETF_ABYTES = 16;
+
+    const box_curve25519xsalsa20poly1305_SEEDBYTES = 32;
+    const box_curve25519xsalsa20poly1305_PUBLICKEYBYTES = 32;
+    const box_curve25519xsalsa20poly1305_SECRETKEYBYTES = 32;
+    const box_curve25519xsalsa20poly1305_BEFORENMBYTES = 32;
+    const box_curve25519xsalsa20poly1305_NONCEBYTES = 24;
+    const box_curve25519xsalsa20poly1305_MACBYTES = 16;
+    const box_curve25519xsalsa20poly1305_BOXZEROBYTES = 16;
+    const box_curve25519xsalsa20poly1305_ZEROBYTES = 32;
+
+    const onetimeauth_poly1305_BYTES = 16;
+    const onetimeauth_poly1305_KEYBYTES = 32;
+
+    const secretbox_xsalsa20poly1305_KEYBYTES = 32;
+    const secretbox_xsalsa20poly1305_NONCEBYTES = 24;
+    const secretbox_xsalsa20poly1305_MACBYTES = 16;
+    const secretbox_xsalsa20poly1305_BOXZEROBYTES = 16;
+    const secretbox_xsalsa20poly1305_ZEROBYTES = 32;
+
+    const secretbox_xchacha20poly1305_KEYBYTES = 32;
+    const secretbox_xchacha20poly1305_NONCEBYTES = 24;
+    const secretbox_xchacha20poly1305_MACBYTES = 16;
+    const secretbox_xchacha20poly1305_BOXZEROBYTES = 16;
+    const secretbox_xchacha20poly1305_ZEROBYTES = 32;
+
+    const stream_salsa20_KEYBYTES = 32;
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws Error
+     */
+    public static function aead_chacha20poly1305_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of message (ciphertext + MAC) */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int  $clen - Length of ciphertext */
+        $clen = $len - self::aead_chacha20poly1305_ABYTES;
+
+        /** @var int $adlen - Length of associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var string $mac - Message authentication code */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $message,
+            $clen,
+            self::aead_chacha20poly1305_ABYTES
+        );
+
+        /** @var string $ciphertext - The encrypted message (sans MAC) */
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 0, $clen);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+            32,
+            $nonce,
+            $key
+        );
+
+        /* Recalculate the Poly1305 authentication tag (MAC): */
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (Error $ex) {
+            $block0 = null;
+        }
+        $state->update($ad);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update($ciphertext);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $computed_mac = $state->finish();
+
+        /* Compare the given MAC with the recalculated MAC: */
+        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
+            throw new Error('Invalid MAC');
+        }
+
+        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
+        return ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+            $ciphertext,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function aead_chacha20poly1305_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of the plaintext message */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int $adlen - Length of the associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+            32,
+            $nonce,
+            $key
+        );
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (Error $ex) {
+            $block0 = null;
+        }
+
+        /** @var string $ciphertext - Raw encrypted data */
+        $ciphertext = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+            $message,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+
+        $state->update($ad);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update($ciphertext);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        return $ciphertext . $state->finish();
+    }
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws Error
+     */
+    public static function aead_chacha20poly1305_ietf_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $adlen - Length of associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var int $len - Length of message (ciphertext + MAC) */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int  $clen - Length of ciphertext */
+        $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
+            32,
+            $nonce,
+            $key
+        );
+
+        /** @var string $mac - Message authentication code */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $message,
+            $len - self::aead_chacha20poly1305_IETF_ABYTES,
+            self::aead_chacha20poly1305_IETF_ABYTES
+        );
+
+        /** @var string $ciphertext - The encrypted message (sans MAC) */
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr(
+            $message,
+            0,
+            $len - self::aead_chacha20poly1305_IETF_ABYTES
+        );
+
+        /* Recalculate the Poly1305 authentication tag (MAC): */
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (Error $ex) {
+            $block0 = null;
+        }
+        $state->update($ad);
+        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+        $state->update($ciphertext);
+        $state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $computed_mac = $state->finish();
+
+        /* Compare the given MAC with the recalculated MAC: */
+        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
+            throw new Error('Invalid MAC');
+        }
+
+        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
+        return ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
+            $ciphertext,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function aead_chacha20poly1305_ietf_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of the plaintext message */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int $adlen - Length of the associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
+            32,
+            $nonce,
+            $key
+        );
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (Error $ex) {
+            $block0 = null;
+        }
+
+        /** @var string $ciphertext - Raw encrypted data */
+        $ciphertext = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
+            $message,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+
+        $state->update($ad);
+        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+        $state->update($ciphertext);
+        $state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        return $ciphertext . $state->finish();
+    }
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws Error
+     */
+    public static function aead_xchacha20poly1305_ietf_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = "\x00\x00\x00\x00" .
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function aead_xchacha20poly1305_ietf_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = "\x00\x00\x00\x00" .
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
+    }
+
+    /**
+     * HMAC-SHA-512-256 (a.k.a. the leftmost 256 bits of HMAC-SHA-512)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $key
+     * @return string
+     */
+    public static function auth($message, $key)
+    {
+        return ParagonIE_Sodium_Core_Util::substr(
+            hash_hmac('sha512', $message, $key, true),
+            0,
+            32
+        );
+    }
+
+    /**
+     * HMAC-SHA-512-256 validation. Constant-time via hash_equals().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $mac
+     * @param string $message
+     * @param string $key
+     * @return bool
+     */
+    public static function auth_verify($mac, $message, $key)
+    {
+        return ParagonIE_Sodium_Core_Util::hashEquals(
+            $mac,
+            self::auth($message, $key)
+        );
+    }
+
+    /**
+     * X25519 key exchange followed by Xsalsa20Poly1305 symmetric encryption
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $keypair
+     * @return string
+     */
+    public static function box($plaintext, $nonce, $keypair)
+    {
+        $c = self::secretbox(
+            $plaintext,
+            $nonce,
+            self::box_beforenm(
+                self::box_secretkey($keypair),
+                self::box_publickey($keypair)
+            )
+        );
+        return $c;
+    }
+
+    /**
+     * X25519-Xsalsa20-Poly1305 with one ephemeral X25519 keypair.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $publicKey
+     * @return string
+     */
+    public static function box_seal($message, $publicKey)
+    {
+        /** @var string $ephemeralKeypair */
+        $ephemeralKeypair = self::box_keypair();
+
+        /** @var string $ephemeralSK */
+        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
+
+        /** @var string $ephemeralPK */
+        $ephemeralPK = self::box_publickey($ephemeralKeypair);
+
+        /** @var string $nonce */
+        $nonce = self::generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var string $keypair - The combined keypair used in crypto_box() */
+        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
+
+        /** @var string $ciphertext Ciphertext + MAC from crypto_box */
+        $ciphertext = self::box($message, $nonce, $keypair);
+        try {
+            ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
+            ParagonIE_Sodium_Compat::memzero($ephemeralSK);
+            ParagonIE_Sodium_Compat::memzero($nonce);
+        } catch (Error $ex) {
+            $ephemeralKeypair = null;
+            $ephemeralSK = null;
+            $nonce = null;
+        }
+        return $ephemeralPK . $ciphertext;
+    }
+
+    /**
+     * Opens a message encrypted via box_seal().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $keypair
+     * @return string
+     */
+    public static function box_seal_open($message, $keypair)
+    {
+        /** @var string $ephemeralPK */
+        $ephemeralPK = ParagonIE_Sodium_Core_Util::substr($message, 0, 32);
+
+        /** @var string $ciphertext (ciphertext + MAC) */
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 32);
+
+        /** @var string $secretKey */
+        $secretKey = self::box_secretkey($keypair);
+
+        /** @var string $publicKey */
+        $publicKey = self::box_publickey($keypair);
+
+        /** @var string $nonce */
+        $nonce = self::generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var string $keypair */
+        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
+
+        /** @var string $m */
+        $m = self::box_open($ciphertext, $nonce, $keypair);
+        try {
+            ParagonIE_Sodium_Compat::memzero($secretKey);
+            ParagonIE_Sodium_Compat::memzero($ephemeralPK);
+            ParagonIE_Sodium_Compat::memzero($nonce);
+        } catch (Error $ex) {
+            $secretKey = null;
+            $ephemeralPK = null;
+            $nonce = null;
+        }
+        return $m;
+    }
+
+    /**
+     * Used by crypto_box() to get the crypto_secretbox() key.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sk
+     * @param string $pk
+     * @return string
+     */
+    public static function box_beforenm($sk, $pk)
+    {
+        return ParagonIE_Sodium_Core_HSalsa20::hsalsa20(
+            str_repeat("\x00", 16),
+            self::scalarmult($sk, $pk)
+        );
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @return string
+     */
+    public static function box_keypair()
+    {
+        $sKey = random_bytes(32);
+        $pKey = self::scalarmult_base($sKey);
+        return $sKey . $pKey;
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @param string $pKey
+     * @return string
+     */
+    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
+    {
+        return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
+            ParagonIE_Sodium_Core_Util::substr($pKey, 0, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $keypair
+     * @return string
+     * @throws RangeException
+     */
+    public static function box_secretkey($keypair)
+    {
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== 64) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        }
+        return ParagonIE_Sodium_Core_Util::substr($keypair, 0, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $keypair
+     * @return string
+     * @throws RangeException
+     */
+    public static function box_publickey($keypair)
+    {
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        }
+        return ParagonIE_Sodium_Core_Util::substr($keypair, 32, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @return string
+     * @throws RangeException
+     */
+    public static function box_publickey_from_secretkey($sKey)
+    {
+        if (ParagonIE_Sodium_Core_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.');
+        }
+        return self::scalarmult_base($sKey);
+    }
+
+    /**
+     * Decrypt a message encrypted with box().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $nonce
+     * @param string $keypair
+     * @return string
+     */
+    public static function box_open($ciphertext, $nonce, $keypair)
+    {
+        return self::secretbox_open(
+            $ciphertext,
+            $nonce,
+            self::box_beforenm(
+                self::box_secretkey($keypair),
+                self::box_publickey($keypair)
+            )
+        );
+    }
+
+    /**
+     * Calculate a BLAKE2b hash.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string|null $key
+     * @param int $outlen
+     * @return string
+     * @throws RangeException
+     */
+    public static function generichash($message, $key = '', $outlen = 32)
+    {
+        // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+        $k = null;
+        if (!empty($key)) {
+            /** @var SplFixedArray $k */
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
+            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
+                throw new RangeException('Invalid key size');
+            }
+        }
+
+        /** @var SplFixedArray $in */
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+
+        /** @var SplFixedArray $ctx */
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outlen);
+        ParagonIE_Sodium_Core_BLAKE2b::update($ctx, $in, $in->count());
+
+        /** @var SplFixedArray $out */
+        $out = new SplFixedArray($outlen);
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($ctx, $out);
+
+        /** @var array<int, int> */
+        $outArray = $out->toArray();
+        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+    }
+
+    /**
+     * Finalize a BLAKE2b hashing context, returning the hash.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ctx
+     * @param int $outlen
+     * @return string
+     * @throws TypeError
+     */
+    public static function generichash_final($ctx, $outlen = 32)
+    {
+        if (!is_string($ctx)) {
+            throw new TypeError('Context must be a string');
+        }
+        $out = new SplFixedArray($outlen);
+
+        /** @var SplFixedArray $context */
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+
+        /** @var SplFixedArray $out */
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($context, $out);
+
+        /** @var array<int, int> */
+        $outArray = $out->toArray();
+        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+    }
+
+    /**
+     * Initialize a hashing context for BLAKE2b.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $key
+     * @param int $outputLength
+     * @return string
+     * @throws RangeException
+     */
+    public static function generichash_init($key = '', $outputLength = 32)
+    {
+        // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+        $k = null;
+        if (!empty($key)) {
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
+            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
+                throw new RangeException('Invalid key size');
+            }
+        }
+
+        /** @var SplFixedArray $ctx */
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength);
+
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($ctx);
+    }
+
+    /**
+     * Update a hashing context for BLAKE2b with $message
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ctx
+     * @param string $message
+     * @return string
+     */
+    public static function generichash_update($ctx, $message)
+    {
+        // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+        /** @var SplFixedArray $context */
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+
+        /** @var SplFixedArray $in */
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+
+        ParagonIE_Sodium_Core_BLAKE2b::update($context, $in, $in->count());
+
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($context);
+    }
+
+    /**
+     * Libsodium's crypto_kx().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $my_sk
+     * @param string $their_pk
+     * @param string $client_pk
+     * @param string $server_pk
+     * @return string
+     */
+    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
+    {
+        return self::generichash(
+            self::scalarmult($my_sk, $their_pk) .
+            $client_pk .
+            $server_pk
+        );
+    }
+
+    /**
+     * ECDH over Curve25519
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @param string $pKey
+     * @return string
+     *
+     * @throws Error
+     */
+    public static function scalarmult($sKey, $pKey)
+    {
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
+        self::scalarmult_throw_if_zero($q);
+        return $q;
+    }
+
+    /**
+     * ECDH over Curve25519, using the basepoint.
+     * Used to get a secret key from a public key.
+     *
+     * @param string $secret
+     * @return string
+     *
+     * @throws Error
+     */
+    public static function scalarmult_base($secret)
+    {
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
+        self::scalarmult_throw_if_zero($q);
+        return $q;
+    }
+
+    /**
+     * This throws an Error if a zero public key was passed to the function.
+     *
+     * @param string $q
+     * @return void
+     * @throws Error
+     */
+    protected static function scalarmult_throw_if_zero($q)
+    {
+        $d = 0;
+        for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
+            $d |= ParagonIE_Sodium_Core_Util::chrToInt($q[$i]);
+        }
+
+        /* branch-free variant of === 0 */
+        if (-(1 & (($d - 1) >> 8))) {
+            throw new Error('Zero public key is not allowed');
+        }
+    }
+
+    /**
+     * Xsalsa20-Poly1305 authenticated symmetric-key encryption.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function secretbox($plaintext, $nonce, $key)
+    {
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
+            $block0,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $block0,
+            self::secretbox_xsalsa20poly1305_ZEROBYTES
+        );
+        if ($mlen > $mlen0) {
+            $c .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $plaintext,
+                    self::secretbox_xsalsa20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                1,
+                $subkey
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            ParagonIE_Sodium_Core_Util::substr(
+                $block0,
+                0,
+                self::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (Error $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+
+        $state->update($c);
+
+        /** @var string $c - MAC || ciphertext */
+        $c = $state->finish() . $c;
+        unset($state);
+
+        return $c;
+    }
+
+    /**
+     * Decrypt a ciphertext generated via secretbox().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws Error
+     */
+    public static function secretbox_open($ciphertext, $nonce, $key)
+    {
+        /** @var string $mac */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            0,
+            self::secretbox_xsalsa20poly1305_MACBYTES
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            self::secretbox_xsalsa20poly1305_MACBYTES
+        );
+
+        /** @var int $clen */
+        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
+            64,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+        $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
+            $mac,
+            $c,
+            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+        );
+        if (!$verified) {
+            try {
+                ParagonIE_Sodium_Compat::memzero($subkey);
+            } catch (Error $ex) {
+                $subkey = null;
+            }
+            throw new Error('Invalid MAC');
+        }
+
+        /** @var string $m - Decrypted message */
+        $m = ParagonIE_Sodium_Core_Util::xorStrings(
+            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
+            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
+        );
+        if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            // We had more than 1 block, so let's continue to decrypt the rest.
+            $m .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $c,
+                    self::secretbox_xsalsa20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                1,
+                $subkey
+            );
+        }
+        return $m;
+    }
+
+    /**
+     * XChaCha20-Poly1305 authenticated symmetric-key encryption.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    {
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+            $block0,
+            $nonceLast,
+            $subkey
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $block0,
+            self::secretbox_xchacha20poly1305_ZEROBYTES
+        );
+        if ($mlen > $mlen0) {
+            $c .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $plaintext,
+                    self::secretbox_xchacha20poly1305_ZEROBYTES
+                ),
+                $nonceLast,
+                $subkey,
+                ParagonIE_Sodium_Core_Util::store64_le(1)
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            ParagonIE_Sodium_Core_Util::substr(
+                $block0,
+                0,
+                self::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (Error $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+
+        $state->update($c);
+
+        /** @var string $c - MAC || ciphertext */
+        $c = $state->finish() . $c;
+        unset($state);
+
+        return $c;
+    }
+
+    /**
+     * Decrypt a ciphertext generated via secretbox_xchacha20poly1305().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws Error
+     */
+    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    {
+        /** @var string $mac */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            0,
+            self::secretbox_xchacha20poly1305_MACBYTES
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            self::secretbox_xchacha20poly1305_MACBYTES
+        );
+
+        /** @var int $clen */
+        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+            64,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+        $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
+            $mac,
+            $c,
+            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+        );
+
+        if (!$verified) {
+            try {
+                ParagonIE_Sodium_Compat::memzero($subkey);
+            } catch (Error $ex) {
+                $subkey = null;
+            }
+            throw new Error('Invalid MAC');
+        }
+
+        /** @var string $m - Decrypted message */
+        $m = ParagonIE_Sodium_Core_Util::xorStrings(
+            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
+            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
+        );
+
+        if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
+            // We had more than 1 block, so let's continue to decrypt the rest.
+            $m .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $c,
+                    self::secretbox_xchacha20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                $subkey,
+                ParagonIE_Sodium_Core_Util::store64_le(1)
+            );
+        }
+        return $m;
+    }
+
+    /**
+     * Detached Ed25519 signature.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    public static function sign_detached($message, $sk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::sign_detached($message, $sk);
+    }
+
+    /**
+     * Attached Ed25519 signature. (Returns a signed message.)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     */
+    public static function sign($message, $sk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::sign($message, $sk);
+    }
+
+    /**
+     * Opens a signed message. If valid, returns the message.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $signedMessage
+     * @param string $pk
+     * @return string
+     */
+    public static function sign_open($signedMessage, $pk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::sign_open($signedMessage, $pk);
+    }
+
+    /**
+     * Verify a detached signature of a given message and public key.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $signature
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     */
+    public static function sign_verify_detached($signature, $message, $pk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::verify_detached($signature, $message, $pk);
+    }
+}
diff --git a/libraries/vendor/paragonie/sodium_compat/src/File.php b/libraries/vendor/paragonie/sodium_compat/src/File.php
new file mode 100644
index 0000000000000..f787662890091
--- /dev/null
+++ b/libraries/vendor/paragonie/sodium_compat/src/File.php
@@ -0,0 +1,1041 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_File', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_File
+ */
+class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
+{
+    /* PHP's default buffer size is 8192 for fread()/fwrite(). */
+    const BUFFER_SIZE = 8192;
+
+    /**
+     * Box a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box(), but produces
+     * the same result.
+     *
+     * @param string $inputFile  Absolute path to a file on the filesystem
+     * @param string $outputFile Absolute path to a file on the filesystem
+     * @param string $nonce      Number to be used only once
+     * @param string $keyPair    ECDH secret key and ECDH public key concatenated
+     *
+     * @return bool
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function box($inputFile, $outputFile, $nonce, $keyPair)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+
+        /* Input validation: */
+        if (!is_string($keyPair)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($keyPair) . ' given.');
+        }
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes');
+        }
+        if (self::strlen($keyPair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new Error('Could not open output file for writing');
+        }
+
+        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $keyPair);
+        fclose($ifp);
+        fclose($ofp);
+        return $res;
+    }
+
+    /**
+     * Open a boxed file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box_open(), but produces
+     * the same result.
+     *
+     * Warning: Does not protect against TOCTOU attacks. You should
+     * just load the file into memory and use crypto_box_open() if
+     * you are worried about those.
+     *
+     * @param string $inputFile
+     * @param string $outputFile
+     * @param string $nonce
+     * @param string $keypair
+     * @return bool
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function box_open($inputFile, $outputFile, $nonce, $keypair)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes');
+        }
+        if (self::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new Error('Could not open output file for writing');
+        }
+
+        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $keypair);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($nonce);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+        } catch (Error $ex) {
+            unset($ephKeypair);
+        }
+        return $res;
+    }
+
+    /**
+     * Seal a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box_seal(), but produces
+     * the same result.
+     *
+     * @param string $inputFile  Absolute path to a file on the filesystem
+     * @param string $outputFile Absolute path to a file on the filesystem
+     * @param string $publicKey  ECDH public key
+     *
+     * @return bool
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function box_seal($inputFile, $outputFile, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new Error('Could not open output file for writing');
+        }
+
+        /** @var string $ephKeypair */
+        $ephKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair();
+
+        /** @var string $msgKeypair */
+        $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
+            ParagonIE_Sodium_Compat::crypto_box_secretkey($ephKeypair),
+            $publicKey
+        );
+
+        /** @var string $ephemeralPK */
+        $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey($ephKeypair);
+
+        /** @var string $nonce */
+        $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var int $firstWrite */
+        $firstWrite = fwrite(
+            $ofp,
+            $ephemeralPK,
+            ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES
+        );
+        if (!is_int($firstWrite)) {
+            fclose($ifp);
+            fclose($ofp);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+            throw new Error('Could not write to output file');
+        }
+        if ($firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+            fclose($ifp);
+            fclose($ofp);
+            throw new Error('Error writing public key to output file');
+        }
+
+        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($nonce);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+        } catch (Error $ex) {
+            unset($ephKeypair);
+        }
+        return $res;
+    }
+
+    /**
+     * Open a sealed file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box_seal_open(), but produces
+     * the same result.
+     *
+     * Warning: Does not protect against TOCTOU attacks. You should
+     * just load the file into memory and use crypto_box_seal_open() if
+     * you are worried about those.
+     *
+     * @param string $inputFile
+     * @param string $outputFile
+     * @param string $ecdhKeypair
+     * @return bool
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($ecdhKeypair)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($ecdhKeypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($ecdhKeypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        }
+
+        $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey($ecdhKeypair);
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new Error('Could not open output file for writing');
+        }
+
+        $ephemeralPK = fread($ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES);
+        if (self::strlen($ephemeralPK) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+            fclose($ifp);
+            fclose($ofp);
+            throw new Error('Could not read public key from sealed file');
+        }
+
+        $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+        $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
+            ParagonIE_Sodium_Compat::crypto_box_secretkey($ecdhKeypair),
+            $ephemeralPK
+        );
+
+        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($nonce);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+        } catch (Error $ex) {
+            unset($ephKeypair);
+        }
+        return $res;
+    }
+
+    /**
+     * Calculate the BLAKE2b hash of a file.
+     *
+     * @param string      $filePath     Absolute path to a file on the filesystem
+     * @param string|null $key          BLAKE2b key
+     * @param int         $outputLength Length of hash output
+     *
+     * @return string                   BLAKE2b hash
+     * @throws Error
+     * @throws TypeError
+     * @psalm-suppress FailedTypeResolution
+     */
+    public static function generichash($filePath, $key = '', $outputLength = 32)
+    {
+        /* Type checks: */
+        if (!is_string($filePath)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        }
+        if (!is_string($key)) {
+            if (is_null($key)) {
+                $key = '';
+            } else {
+                throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+            }
+        }
+        if (!is_int($outputLength)) {
+            if (!is_numeric($outputLength)) {
+                throw new TypeError('Argument 3 must be an integer, ' . gettype($outputLength) . ' given.');
+            }
+            $outputLength = (int) $outputLength;
+        }
+
+        /* Input validation: */
+        if (!empty($key)) {
+            if (self::strlen($key) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+                throw new TypeError('Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes');
+            }
+            if (self::strlen($key) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+                throw new TypeError('Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes');
+            }
+        }
+        if ($outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN) {
+            throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN');
+        }
+        if ($outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX) {
+            throw new Error('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX');
+        }
+
+        /** @var int $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new Error('Could not open input file for reading');
+        }
+        $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outputLength);
+        while ($size > 0) {
+            $blockSize = $size > 64
+                ? 64
+                : $size;
+            ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, fread($fp, $blockSize));
+            $size -= $blockSize;
+        }
+
+        fclose($fp);
+        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+    }
+
+    /**
+     * Encrypt a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_secretbox(), but produces
+     * the same result.
+     *
+     * @param string $inputFile  Absolute path to a file on the filesystem
+     * @param string $outputFile Absolute path to a file on the filesystem
+     * @param string $nonce      Number to be used only once
+     * @param string $key        Encryption key
+     *
+     * @return bool
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function secretbox($inputFile, $outputFile, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new Error('Could not open output file for writing');
+        }
+
+        $res = self::secretbox_encrypt($ifp, $ofp, $size, $nonce, $key);
+        fclose($ifp);
+        fclose($ofp);
+        return $res;
+    }
+    /**
+     * Seal a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_secretbox_open(), but produces
+     * the same result.
+     *
+     * Warning: Does not protect against TOCTOU attacks. You should
+     * just load the file into memory and use crypto_secretbox_open() if
+     * you are worried about those.
+     *
+     * @param string $inputFile
+     * @param string $outputFile
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function secretbox_open($inputFile, $outputFile, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        }
+        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new Error('Could not open output file for writing');
+        }
+
+        $res = self::secretbox_decrypt($ifp, $ofp, $size, $nonce, $key);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($key);
+        } catch (Error $ex) {
+            unset($key);
+        }
+        return $res;
+    }
+
+    /**
+     * Sign a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_sign_detached(), but produces
+     * the same result.
+     *
+     * @param string $filePath  Absolute path to a file on the filesystem
+     * @param string $secretKey Secret signing key
+     *
+     * @return string           Ed25519 signature
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function sign($filePath, $secretKey)
+    {
+        /* Type checks: */
+        if (!is_string($filePath)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        }
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($secretKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new TypeError('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var string $az */
+        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
+
+        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($az, 32, 32));
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+
+        /** @var string $nonceHash */
+        $nonceHash = hash_final($hs, true);
+
+        /** @var string $pk */
+        $pk = self::substr($secretKey, 32, 32);
+
+        /** @var string $nonce */
+        $nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+
+        /** @var string $sig */
+        $sig = ParagonIE_Sodium_Core_Ed25519::ge_p3_tobytes(
+            ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base($nonce)
+        );
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($pk, 0, 32));
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+
+        /** @var string $hramHash */
+        $hramHash = hash_final($hs, true);
+
+        /** @var string $hram */
+        $hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hramHash);
+
+        /** @var string $sigAfter */
+        $sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd($hram, $az, $nonce);
+
+        /** @var string $sig */
+        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+        try {
+            ParagonIE_Sodium_Compat::memzero($az);
+        } catch (Error $ex) {
+            $az = null;
+        }
+        fclose($fp);
+        return $sig;
+    }
+
+    /**
+     * Verify a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_sign_verify_detached(), but
+     * produces the same result.
+     *
+     * @param string $sig       Ed25519 signature
+     * @param string $filePath  Absolute path to a file on the filesystem
+     * @param string $publicKey Signing public key
+     *
+     * @return bool
+     * @throws Error
+     * @throws Exception
+     */
+    public static function verify($sig, $filePath, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($sig)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
+        }
+        if (!is_string($filePath)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($filePath) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($sig) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES) {
+            throw new TypeError('Argument 1 must be CRYPTO_SIGN_BYTES bytes');
+        }
+        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes');
+        }
+        if (self::strlen($sig) < 64) {
+            throw new Exception('Signature is too short');
+        }
+
+        /* Security checks */
+        if (ParagonIE_Sodium_Core_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
+            throw new Exception('S < L - Invalid signature');
+        }
+        if (ParagonIE_Sodium_Core_Ed25519::small_order($sig)) {
+            throw new Exception('Signature is on too small of an order');
+        }
+        if ((self::chrToInt($sig[63]) & 224) !== 0) {
+            throw new Exception('Invalid signature');
+        }
+        $d = 0;
+        for ($i = 0; $i < 32; ++$i) {
+            $d |= self::chrToInt($publicKey[$i]);
+        }
+        if ($d === 0) {
+            throw new Exception('All zero public key');
+        }
+
+        /** @var int $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new Error('Could not obtain the file size');
+        }
+
+        /** @var resource $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new Error('Could not open input file for reading');
+        }
+
+        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        $orig = ParagonIE_Sodium_Compat::$fastMult;
+
+        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+        ParagonIE_Sodium_Compat::$fastMult = true;
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
+        $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime($publicKey);
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($publicKey, 0, 32));
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+        /** @var string $hDigest */
+        $hDigest = hash_final($hs, true);
+
+        /** @var string $h */
+        $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
+        $R = ParagonIE_Sodium_Core_Ed25519::ge_double_scalarmult_vartime(
+            $h,
+            $A,
+            self::substr($sig, 32)
+        );
+
+        /** @var string $rcheck */
+        $rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes($R);
+
+        // Close the file handle
+        fclose($fp);
+
+        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+        ParagonIE_Sodium_Compat::$fastMult = $orig;
+        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+    }
+
+    /**
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int      $mlen
+     * @param string   $nonce
+     * @param string   $boxKeypair
+     * @return bool
+     */
+    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    {
+        return self::secretbox_encrypt(
+            $ifp,
+            $ofp,
+            $mlen,
+            $nonce,
+            ParagonIE_Sodium_Crypto::box_beforenm(
+                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
+                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+            )
+        );
+    }
+
+
+    /**
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int      $mlen
+     * @param string   $nonce
+     * @param string   $boxKeypair
+     * @return bool
+     */
+    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    {
+        return self::secretbox_decrypt(
+            $ifp,
+            $ofp,
+            $mlen,
+            $nonce,
+            ParagonIE_Sodium_Crypto::box_beforenm(
+                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
+                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+            )
+        );
+    }
+
+    /**
+     * Encrypt a file
+     *
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int $mlen
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     */
+    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
+    {
+        $plaintext = fread($ifp, 32);
+        $first32 = ftell($ifp);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $realNonce */
+        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
+            $block0,
+            $realNonce,
+            $subkey
+        );
+
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            ParagonIE_Sodium_Core_Util::substr(
+                $block0,
+                0,
+                ParagonIE_Sodium_Crypto::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+
+        // Pre-write 16 blank bytes for the Poly1305 tag
+        $start = ftell($ofp);
+        fwrite($ofp, str_repeat("\x00", 16));
+
+        /** @var string $c */
+        $cBlock = ParagonIE_Sodium_Core_Util::substr(
+            $block0,
+            ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
+        );
+        $state->update($cBlock);
+        fwrite($ofp, $cBlock);
+        $mlen -= 32;
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        /*
+         * Set the cursor to the end of the first half-block. All future bytes will
+         * generated from salsa20_xor_ic, starting from 1 (second block).
+         */
+        fseek($ifp, $first32, SEEK_SET);
+
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $plaintext = fread($ifp, $blockSize);
+            $cBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                $plaintext,
+                $realNonce,
+                $iter,
+                $subkey
+            );
+            fwrite($ofp, $cBlock, $blockSize);
+            $state->update($cBlock);
+
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (Error $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+        $end = ftell($ofp);
+
+        /*
+         * Write the Poly1305 authentication tag that provides integrity
+         * over the ciphertext (encrypt-then-MAC)
+         */
+        fseek($ofp, $start, SEEK_SET);
+        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
+        fseek($ofp, $end, SEEK_SET);
+        unset($state);
+
+        return true;
+    }
+
+    /**
+     * Decrypt a file
+     *
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int $mlen
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     * @throws Exception
+     */
+    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
+    {
+        $tag = fread($ifp, 16);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $realNonce */
+        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
+            64,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+
+        /* Verify the Poly1305 MAC -before- attempting to decrypt! */
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(self::substr($block0, 0, 32));
+        if (!self::onetimeauth_verify($state, $ifp, $tag, $mlen)) {
+            throw new Exception('Invalid MAC');
+        }
+
+        /*
+         * Set the cursor to the end of the first half-block. All future bytes will
+         * generated from salsa20_xor_ic, starting from 1 (second block).
+         */
+        $first32 = fread($ifp, 32);
+        $first32len = self::strlen($first32);
+        fwrite(
+            $ofp,
+            self::xorStrings(
+                self::substr($block0, 32, $first32len),
+                self::substr($first32, 0, $first32len)
+            )
+        );
+        $mlen -= 32;
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        /* Decrypts ciphertext, writes to output file. */
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $ciphertext = fread($ifp, $blockSize);
+            $pBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                $ciphertext,
+                $realNonce,
+                $iter,
+                $subkey
+            );
+            fwrite($ofp, $pBlock, $blockSize);
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        return true;
+    }
+
+    /**
+     * @param ParagonIE_Sodium_Core_Poly1305_State $state
+     * @param resource $ifp
+     * @param string $tag
+     * @param int $mlen
+     * @return bool
+     */
+    protected static function onetimeauth_verify(ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0)
+    {
+        /** @var int $pos */
+        $pos = ftell($ifp);
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $ciphertext = fread($ifp, $blockSize);
+            $state->update($ciphertext);
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        $res = ParagonIE_Sodium_Core_Util::verify_16($tag, $state->finish());
+
+        fseek($ifp, $pos, SEEK_SET);
+        return $res;
+    }
+
+    /**
+     * Update a hash context with the contents of a file, without
+     * loading the entire file into memory.
+     *
+     * @param resource $hash
+     * @param resource $fp
+     * @param int $size
+     * @return resource
+     * @throws Error
+     * @throws TypeError
+     */
+    public static function updateHashWithFile($hash, $fp, $size = 0)
+    {
+        /* Type checks: */
+        if (!is_resource($hash)) {
+            throw new TypeError('Argument 1 must be a resource, ' . gettype($hash) . ' given.');
+        }
+        if (!is_resource($fp)) {
+            throw new TypeError('Argument 2 must be a resource, ' . gettype($fp) . ' given.');
+        }
+        if (!is_int($size)) {
+            throw new TypeError('Argument 3 must be an integer, ' . gettype($size) . ' given.');
+        }
+
+        /** @var int $originalPosition */
+        $originalPosition = ftell($fp);
+
+        // Move file pointer to beginning of file
+        fseek($fp, 0, SEEK_SET);
+        for ($i = 0; $i < $size; $i += self::BUFFER_SIZE) {
+            /** @var string $message */
+            $message = fread(
+                $fp,
+                ($size - $i) > self::BUFFER_SIZE
+                    ? $size - $i
+                    : self::BUFFER_SIZE
+            );
+            if (!is_string($message)) {
+                throw new Error('Unexpected error reading from file.');
+            }
+            hash_update($hash, $message);
+        }
+        // Reset file pointer's position
+        fseek($fp, $originalPosition, SEEK_SET);
+        return $hash;
+    }
+}
diff --git a/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
new file mode 100644
index 0000000000000..ebc0b7a4a85c0
--- /dev/null
+++ b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Crypt
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Test class for JCryptCipherSodium.
+ */
+class JCryptCipherSodiumTest extends TestCase
+{
+	/**
+	 * Test data for processing
+	 *
+	 * @return  array
+	 */
+	public function dataStrings()
+	{
+		return array(
+			array('c-;3-(Is>{DJzOHMCv_<#yKuN/G`/Us{GkgicWG$M|HW;kI0BVZ^|FY/"Obt53?PNaWwhmRtH;lWkWE4vlG5CIFA!abu&F=Xo#Qw}gAp3;GL\'k])%D}C+W&ne6_F$3P5'),
+			array('Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' .
+					'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor ' .
+					'in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt ' .
+					'in culpa qui officia deserunt mollit anim id est laborum.'),
+			array('لا أحد يحب الألم بذاته، يسعى ورائه أو يبتغيه، ببساطة لأنه الألم...'),
+			array('Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства'),
+			array('The quick brown fox jumps over the lazy dog.')
+		);
+	}
+
+	/**
+	 * @testdox  Validates data is encrypted and decrypted correctly
+	 *
+	 * @param   string  $data  The decrypted data to validate
+	 *
+	 * @covers        JCryptCipherSodium::decrypt
+	 * @covers        JCryptCipherSodium::encrypt
+	 * @dataProvider  dataStrings
+	 */
+	public function testDataEncryptionAndDecryption($data)
+	{
+		$cipher = new JCryptCipherSodium;
+		$key    = $cipher->generateKey();
+
+		$cipher->setNonce(\Sodium\randombytes_buf(\Sodium\CRYPTO_BOX_NONCEBYTES));
+
+		$encrypted = $cipher->encrypt($data, $key);
+
+		// Assert that the encrypted value is not the same as the clear text value.
+		$this->assertNotSame($data, $encrypted);
+
+		$decrypted = $cipher->decrypt($encrypted, $key);
+
+		// Assert the decrypted string is the same value we started with
+		$this->assertSame($data, $decrypted);
+	}
+
+	/**
+	 * @testdox  Validates keys are correctly generated
+	 *
+	 * @covers   JCryptCipherSodium::generateKey
+	 */
+	public function testGenerateKey()
+	{
+		$cipher = new JCryptCipherSodium;
+		$key    = $cipher->generateKey();
+
+		// Assert that the key is the correct type.
+		$this->assertInstanceOf('JCryptKey', $key);
+
+		// Assert the keys pass validation
+		$this->assertSame(JCrypt::safeStrlen($key->private), 32);
+		$this->assertSame(JCrypt::safeStrlen($key->public), 32);
+
+		// Assert the key is of the correct type.
+		$this->assertAttributeEquals('sodium', 'type', $key);
+	}
+}

From dd6dda4d861eefae39e6c5826988ab498ad603fa Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Wed, 26 Jul 2017 09:05:01 +0100
Subject: [PATCH 063/148] Fix fatal error in the Chrome Style Field

---
 .../src/Joomla/CMS/Form/Field/ChromeStyleField.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php b/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php
index 802455eb7afa3..c4deab4eb7af5 100644
--- a/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php
+++ b/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php
@@ -84,18 +84,18 @@ public function __set($name, $value)
 	/**
 	 * Method to attach a JForm object to the field.
 	 *
-	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
-	 * @param   mixed             $value    The form field value to validate.
-	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
-	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
-	 *                                      full field name would end up being "bar[foo]".
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
 	 *
 	 * @return  boolean  True on success.
 	 *
 	 * @see     JFormField::setup()
 	 * @since   3.2
 	 */
-	public function setup(SimpleXMLElement $element, $value, $group = null)
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
 	{
 		$result = parent::setup($element, $value, $group);
 

From a6e771ec6fabb306bc98e1fdf0527872be47d028 Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Wed, 26 Jul 2017 09:11:16 +0100
Subject: [PATCH 064/148] Fix classMap alias

---
 libraries/classmap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 3641ecb002281..384efc2eded51 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -327,7 +327,7 @@
 JLoader::registerAlias('JMailWrapperHelper',                '\\Joomla\\CMS\\Mail\\MailWrapper', '5.0');
 
 JLoader::registerAlias('JClientHelper',                     '\\Joomla\\CMS\\Client\\ClientHelper', '5.0');
-JLoader::registerAlias('JClientWrapperHelper',              '\\Joomla\\CMS\\Client\\ClienWrapper', '5.0');
+JLoader::registerAlias('JClientWrapperHelper',              '\\Joomla\\CMS\\Client\\ClientWrapper', '5.0');
 JLoader::registerAlias('JClientFtp',                        '\\Joomla\\CMS\\Client\\FtpClient', '5.0');
 JLoader::registerAlias('JFTP',                              '\\Joomla\\CMS\\Client\\FtpClient', '4.0');
 JLoader::registerAlias('JClientLdap',                       '\\Joomla\\Ldap\\LdapClient', '5.0');

From 3110af21642891a1b46e46a2e5065ff63c3fc58c Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Wed, 26 Jul 2017 09:15:49 +0100
Subject: [PATCH 065/148] Fix typehint

---
 libraries/src/Joomla/CMS/Application/BaseApplication.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Joomla/CMS/Application/BaseApplication.php b/libraries/src/Joomla/CMS/Application/BaseApplication.php
index 7044c74dd483e..709c212a8c016 100644
--- a/libraries/src/Joomla/CMS/Application/BaseApplication.php
+++ b/libraries/src/Joomla/CMS/Application/BaseApplication.php
@@ -17,7 +17,7 @@
 /**
  * Joomla Platform Base Application Class
  *
- * @property-read  JInput  $input  The application input object
+ * @property-read  \JInput  $input  The application input object
  *
  * @since  12.1
  */

From bc1e0a0637e6148216d7462774f8b1297f5ab562 Mon Sep 17 00:00:00 2001
From: RolandD <contact@rolandd.com>
Date: Wed, 26 Jul 2017 13:36:38 +0200
Subject: [PATCH 066/148] New Feature: Implements a modal to edit the Redirect
 plugin settings when needed (#16844)

* Redo of #7259 and implements a modal to edit the Redirect plugin settings when needed

* Fixed CSS class and copyright
Changed reload of parent page

* Removed label class

* Make location generic

* Changed amp usage

* Updated after feedback

* Updated the language constants and RTL issue

* Fixed invalid markup in Hathor

* Fixed the URLs for Hathor

* More Hathor massaging

* RTL support in Hathor #16844 Redo
---
 .../com_plugins/views/plugin/tmpl/edit.php    |  5 ++
 .../com_plugins/views/plugin/tmpl/modal.php   | 26 ++++++++++
 .../com_redirect/helpers/redirect.php         | 29 -----------
 .../com_redirect/views/links/tmpl/default.php | 18 +++++++
 .../com_redirect/views/links/view.html.php    | 51 +++++++++++++++----
 .../language/en-GB/en-GB.com_redirect.ini     |  8 ++-
 .../html/com_redirect/links/default.php       | 21 ++++----
 .../src/Joomla/CMS/Plugin/PluginHelper.php    | 17 ++++++-
 8 files changed, 124 insertions(+), 51 deletions(-)
 create mode 100644 administrator/components/com_plugins/views/plugin/tmpl/modal.php

diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
index bd1a040931a1e..9303541c98ae3 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -23,6 +23,11 @@
 		if (task == 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) {
 			Joomla.submitform(task, document.getElementById('style-form'));
 		}
+		
+		if (self !== top) {
+			window.top.setTimeout('window.parent.location = window.top.location.href', 1000);
+			window.parent.jQuery('#plugin" . $this->item->extension_id . "Modal').modal('hide');
+		}
 	};
 ");
 ?>
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/modal.php b/administrator/components/com_plugins/views/plugin/tmpl/modal.php
new file mode 100644
index 0000000000000..69d18a30cd77f
--- /dev/null
+++ b/administrator/components/com_plugins/views/plugin/tmpl/modal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// This code is needed for proper check out in case of modal close
+JFactory::getDocument()->addScriptDeclaration('
+	window.parent.jQuery(".modal").on("hidden", function () {
+	if (typeof window.parent.jQuery("#plugin' . $this->item->extension_id . 'Modal iframe").contents().find("#closeBtn") !== "undefined") {
+		window.parent.jQuery("#plugin' . $this->item->extension_id . 'Modal iframe").contents().find("#closeBtn").click();
+		}
+	});
+');
+?>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.save');"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.cancel');"></button>
+
+<?php
+$this->setLayout('edit');
+echo $this->loadTemplate();
diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php
index 93779082edeb6..9951d3300280c 100644
--- a/administrator/components/com_redirect/helpers/redirect.php
+++ b/administrator/components/com_redirect/helpers/redirect.php
@@ -81,35 +81,6 @@ public static function publishedOptions()
 		return $options;
 	}
 
-	/**
-	 * Determines if the plugin for Redirect to work is enabled.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	public static function isEnabled()
-	{
-		$db    = JFactory::getDbo();
-		$query = $db->getQuery(true)
-			->select($db->quoteName('enabled'))
-			->from($db->quoteName('#__extensions'))
-			->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-			->where($db->quoteName('element') . ' = ' . $db->quote('redirect'));
-		$db->setQuery($query);
-
-		try
-		{
-			$result = (boolean) $db->loadResult();
-		}
-		catch (RuntimeException $e)
-		{
-			JError::raiseWarning(500, $e->getMessage());
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Gets the redirect system plugin extension id.
 	 *
diff --git a/administrator/components/com_redirect/views/links/tmpl/default.php b/administrator/components/com_redirect/views/links/tmpl/default.php
index 9e05ec4a69c21..00d0cd09cc137 100644
--- a/administrator/components/com_redirect/views/links/tmpl/default.php
+++ b/administrator/components/com_redirect/views/links/tmpl/default.php
@@ -23,6 +23,24 @@
 <form action="<?php echo JRoute::_('index.php?option=com_redirect&view=links'); ?>" method="post" name="adminForm" id="adminForm">
 	<div id="j-main-container">
 		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if ($this->redirectPluginId) : ?>
+			<?php $link = JRoute::_('index.php?option=com_plugins&client_id=0&task=plugin.edit&extension_id=' . $this->redirectPluginId . '&tmpl=component&layout=modal'); ?>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'plugin' . $this->redirectPluginId . 'Modal',
+				array(
+					'url'        => $link,
+					'title'      => JText::_('COM_REDIRECT_EDIT_PLUGIN_SETTINGS'),
+					'height'     => '400px',
+					'modalWidth' => '60',
+					'footer'     => '<button class="btn" data-dismiss="modal" aria-hidden="true">'
+						. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+						. '<button class="btn btn-success" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
+						. JText::_("JSAVE") . '</button>'
+				)
+			); ?>
+		<?php endif; ?>
+
 		<?php if (empty($this->items)) : ?>
 		<div class="alert alert-no-items">
 			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php
index c2c7683f99e85..e0e224611b699 100644
--- a/administrator/components/com_redirect/views/links/view.html.php
+++ b/administrator/components/com_redirect/views/links/view.html.php
@@ -20,12 +20,18 @@ class RedirectViewLinks extends JViewLegacy
 
 	protected $collect_urls_enabled;
 
+	protected $redirectPluginId = 0;
+
 	protected $items;
 
 	protected $pagination;
 
 	protected $state;
 
+	public $filterForm;
+
+	public $activeFilters;
+
 	/**
 	 * Display the view.
 	 *
@@ -34,12 +40,14 @@ class RedirectViewLinks extends JViewLegacy
 	 * @return  mixed  False if unsuccessful, otherwise void.
 	 *
 	 * @since   1.6
+	 *
+	 * @throws  Exception
 	 */
 	public function display($tpl = null)
 	{
 		// Set variables
 		$app                        = JFactory::getApplication();
-		$this->enabled              = RedirectHelper::isEnabled();
+		$this->enabled              = JPluginHelper::isEnabled('system', 'redirect');
 		$this->collect_urls_enabled = RedirectHelper::collectUrlsEnabled();
 		$this->items                = $this->get('Items');
 		$this->pagination           = $this->get('Pagination');
@@ -56,22 +64,42 @@ public function display($tpl = null)
 		// Show messages about the enabled plugin and if the plugin should collect URLs
 		if ($this->enabled && $this->collect_urls_enabled)
 		{
-			$app->enqueueMessage(JText::_('COM_REDIRECT_PLUGIN_ENABLED') . ' ' . JText::_('COM_REDIRECT_COLLECT_URLS_ENABLED'), 'notice');
-		}
-		elseif ($this->enabled && !$this->collect_urls_enabled)
-		{
-			$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId());
-			$app->enqueueMessage(JText::_('COM_REDIRECT_PLUGIN_ENABLED') . JText::sprintf('COM_REDIRECT_COLLECT_URLS_DISABLED', $link), 'notice');
+			$app->enqueueMessage(JText::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED')), 'notice');
 		}
 		else
 		{
-			$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId());
-			$app->enqueueMessage(JText::sprintf('COM_REDIRECT_PLUGIN_DISABLED', $link), 'error');
+			$this->redirectPluginId = RedirectHelper::getRedirectPluginId();
+
+			$link = JHtml::_(
+				'link',
+				'#plugin' . $this->redirectPluginId . 'Modal',
+				JText::_('COM_REDIRECT_SYSTEM_PLUGIN'),
+				'class="alert-link" data-toggle="modal" id="title-' . $this->redirectPluginId . '"'
+			);
+
+			// To be removed in Joomla 4
+			if (JFactory::getApplication()->getTemplate() === 'hathor')
+			{
+				$link = JHtml::_(
+					'link',
+					JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId()),
+					JText::_('COM_REDIRECT_SYSTEM_PLUGIN')
+				);
+			}
+
+			if ($this->enabled && !$this->collect_urls_enabled)
+			{
+				$app->enqueueMessage(JText::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED'), $link), 'notice');
+			}
+			else
+			{
+				$app->enqueueMessage(JText::sprintf('COM_REDIRECT_PLUGIN_MODAL_DISABLED', $link), 'error');
+			}
 		}
 
 		$this->addToolbar();
 
-		parent::display($tpl);
+		return parent::display($tpl);
 	}
 
 	/**
@@ -129,6 +157,8 @@ protected function addToolbar()
 
 			$title = JText::_('JTOOLBAR_BULK_IMPORT');
 
+			JHtml::_('bootstrap.modal', 'collapseModal');
+
 			// Instantiate a new JLayoutFile instance and render the batch button
 			$layout = new JLayoutFile('toolbar.batch');
 
@@ -155,6 +185,5 @@ protected function addToolbar()
 		}
 
 		JToolbarHelper::help('JHELP_COMPONENTS_REDIRECT_MANAGER');
-
 	}
 }
diff --git a/administrator/language/en-GB/en-GB.com_redirect.ini b/administrator/language/en-GB/en-GB.com_redirect.ini
index 12c65d407132e..822ada2b49a83 100644
--- a/administrator/language/en-GB/en-GB.com_redirect.ini
+++ b/administrator/language/en-GB/en-GB.com_redirect.ini
@@ -10,11 +10,14 @@ COM_REDIRECT_BATCH_TIP="Enter expired URL (mandatory) with a new URL (optional)
 COM_REDIRECT_BUTTON_UPDATE_LINKS="Update Links"
 COM_REDIRECT_CLEAR_FAIL="Failed to delete unpublished links."
 COM_REDIRECT_CLEAR_SUCCESS="All unpublished links have been deleted."
-COM_REDIRECT_COLLECT_URLS_ENABLED="The option 'Collect URLs' is enabled."
+COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED="%1$s The 'Collect URLs' option in the %2$s is disabled. Error page URLs will not be collected by this component."
+COM_REDIRECT_COLLECT_URLS_ENABLED="%1$s The option 'Collect URLs' is enabled."
+; The following string is deprecated and will be removed with 4.0.
 COM_REDIRECT_COLLECT_URLS_DISABLED="The 'Collect URLs' option in the <a href="_QQ_"%s"_QQ_">Redirect System Plugin</a> is disabled. Error page URLs will not be collected by this component."
 COM_REDIRECT_CONFIGURATION="Redirect: Options"
 COM_REDIRECT_DISABLE_LINK="Disable Link"
 COM_REDIRECT_EDIT_LINK="Edit Link #%d"
+COM_REDIRECT_EDIT_PLUGIN_SETTINGS="Edit Plugin Settings"
 COM_REDIRECT_ENABLE_LINK="Enable Link"
 COM_REDIRECT_ERROR_DESTINATION_URL_REQUIRED="The redirect must have a destination URL"
 COM_REDIRECT_ERROR_DUPLICATE_OLD_URL="The source URL must be unique."
@@ -79,11 +82,14 @@ COM_REDIRECT_N_LINKS_UPDATED_1="1 link has been updated."
 COM_REDIRECT_NEW_LINK="New Link"
 COM_REDIRECT_NO_ITEM_ADDED="No links added."
 COM_REDIRECT_NO_ITEM_SELECTED="No links selected."
+; The following string is deprecated and will be removed with 4.0.
 COM_REDIRECT_PLUGIN_DISABLED="The <a href="_QQ_"%s"_QQ_">Redirect System Plugin</a> is disabled. It needs to be enabled for this component to work."
 COM_REDIRECT_PLUGIN_ENABLED="The Redirect Plugin is enabled."
+COM_REDIRECT_PLUGIN_MODAL_DISABLED="The %s is disabled. It needs to be enabled for this component to work."
 COM_REDIRECT_REDIRECTED_ON="Redirected on: %s."
 COM_REDIRECT_SAVE_SUCCESS="Link saved."
 COM_REDIRECT_SEARCH_LINKS="Search in link fields."
+COM_REDIRECT_SYSTEM_PLUGIN="Redirect System Plugin"
 COM_REDIRECT_TOOLBAR_PURGE="Purge Unpublished"
 COM_REDIRECT_XML_DESCRIPTION="This component implements link redirection."
 JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."
diff --git a/administrator/templates/hathor/html/com_redirect/links/default.php b/administrator/templates/hathor/html/com_redirect/links/default.php
index 2ed99612f07f3..adb9d82720a01 100644
--- a/administrator/templates/hathor/html/com_redirect/links/default.php
+++ b/administrator/templates/hathor/html/com_redirect/links/default.php
@@ -140,15 +140,18 @@
 
 	<?php echo $this->pagination->getListFooter(); ?>
 	<p class="footer-tip">
-		<?php if ($this->enabled) : ?>
-			<span class="enabled"><?php echo JText::_('COM_REDIRECT_PLUGIN_ENABLED'); ?></span>
-			<?php if ($this->collect_urls_enabled) : ?>
-				<span class="enabled"><?php echo JText::_('COM_REDIRECT_COLLECT_URLS_ENABLED'); ?></span>
-			<?php else : ?>
-				<span class="enabled"><?php echo JText::_('COM_REDIRECT_COLLECT_URLS_DISABLED'); ?></span>
-			<?php endif; ?>
-		<?php else : ?>
-			<span class="disabled"><?php echo JText::_('COM_REDIRECT_PLUGIN_DISABLED'); ?></span>
+		<?php if ($this->enabled && $this->collect_urls_enabled) : ?>
+			<span class="enabled"><?php echo JText::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED')); ?></span>
+		<?php elseif ($this->enabled && !$this->collect_urls_enabled) : ?>
+			<?php $link = JHtml::_(
+				'link',
+				JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId()),
+				JText::_('COM_REDIRECT_SYSTEM_PLUGIN')
+			);
+			?>
+			<span class="enabled"><?php echo JText::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED'), $link); ?></span>
+		<?php elseif (!$this->enabled) : ?>
+			<span class="disabled"><?php echo JText::sprintf('COM_REDIRECT_PLUGIN_DISABLED', 'index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId()); ?></span>
 		<?php endif; ?>
 	</p>
 	<div class="clr"></div>
diff --git a/libraries/src/Joomla/CMS/Plugin/PluginHelper.php b/libraries/src/Joomla/CMS/Plugin/PluginHelper.php
index 0f5227187e71b..10f348dc3b30c 100644
--- a/libraries/src/Joomla/CMS/Plugin/PluginHelper.php
+++ b/libraries/src/Joomla/CMS/Plugin/PluginHelper.php
@@ -316,7 +316,22 @@ protected static function load()
 		{
 			$db = \JFactory::getDbo();
 			$query = $db->getQuery(true)
-				->select(array($db->quoteName('folder', 'type'), $db->quoteName('element', 'name'), $db->quoteName('params')))
+				->select(
+					$db->quoteName(
+						array(
+							'folder',
+							'element',
+							'params',
+							'extension_id'
+						),
+						array(
+							'type',
+							'name',
+							'params',
+							'id'
+						)
+					)
+				)
 				->from('#__extensions')
 				->where('enabled = 1')
 				->where('type = ' . $db->quote('plugin'))

From f162bc7aa85da32ebb9ca47c30975522186fbf25 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Wed, 26 Jul 2017 07:11:06 -0500
Subject: [PATCH 067/148] Add J4 file to ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f448d6ba6997b..a7693669e9859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 /administrator/logs
 /cache
 /installation/cache
+/libraries/autoload_psr4.php
 /tmp
 /configuration.php
 /.htaccess

From 73577db36ad563df7780e6b2facb1fbf13dfccf5 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Wed, 26 Jul 2017 08:23:15 -0500
Subject: [PATCH 068/148] Add test for Firefox, add JBrowser tests (#17140)

---
 .../joomla/environment/JBrowserTest.php       | 159 ++++++++++++++++--
 1 file changed, 141 insertions(+), 18 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php b/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php
index 0a2ca6e2ec5f4..d559c3cb97b0d 100644
--- a/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php
+++ b/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php
@@ -9,15 +9,20 @@
 
 /**
  * Test class for JBrowser.
- *
- * @package     Joomla.UnitTest
- * @subpackage  Environment
- * @since       11.1
  */
 class JBrowserTest extends \PHPUnit\Framework\TestCase
 {
 	/**
-	 * @var JBrowser
+	 * Backup of the SERVER superglobal
+	 *
+	 * @var  array
+	 */
+	protected $backupServer;
+
+	/**
+	 * Object being tested
+	 *
+	 * @var  JBrowser
 	 */
 	protected $object;
 
@@ -25,12 +30,14 @@ class JBrowserTest extends \PHPUnit\Framework\TestCase
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.
 	 *
-	 * @return void
+	 * @return  void
 	 */
 	protected function setUp()
 	{
 		parent::setUp();
 
+		$this->backupServer = $_SERVER;
+
 		$this->object = new JBrowser;
 	}
 
@@ -40,35 +47,151 @@ protected function setUp()
 	 * @return  void
 	 *
 	 * @see     \PHPUnit\Framework\TestCase::tearDown()
-	 * @since   3.6
 	 */
 	protected function tearDown()
 	{
+		$_SERVER = $this->backupServer;
+
 		unset($this->object);
 		parent::tearDown();
 	}
 
 	/**
-	 * Test...
+	 * Data provider for the testBrowserMatching method
+	 *
+	 * @return  array
+	 */
+	public function dataMatch()
+	{
+		return array(
+			'Edge 14' => array(
+				'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393',
+				'edge',
+				'win',
+				'14',
+				false,
+			),
+			'Opera 9.80 Mobile Linux' => array(
+				'Opera/9.80 (Android 3.2.1; Linux; Opera Tablet/ADR-1111101157; U; en) Presto/2.9.201 Version/11.50',
+				'opera',
+				'unix',
+				'11',
+				true,
+			),
+			'Chrome 13 OS X' => array(
+				'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_3) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.32 Safari/535.1',
+				'chrome',
+				'mac',
+				'13',
+				false,
+			),
+			'Chrome 12 Windows' => array(
+				'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.113 Safari/534.30',
+				'chrome',
+				'win',
+				'12',
+				false,
+			),
+			'Chrome 54 Windows' => array(
+				'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36',
+				'chrome',
+				'win',
+				'54',
+				false,
+			),
+			'Chrome 12 Ubuntu' => array(
+				'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.30 (KHTML, like Gecko) Ubuntu/10.04 Chromium/12.0.742.112 Chrome/12.0.742.112 Safari/534.30',
+				'chrome',
+				'unix',
+				'12',
+				false,
+			),
+			'Internet Explorer 10' => array(
+				'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)',
+				'msie',
+				'win',
+				'10',
+				false,
+			),
+			'Internet Explorer 9' => array(
+				'Mozilla/5.0 (Windows; U; MSIE 9.0; WIndows NT 9.0; en-US))',
+				'msie',
+				'win',
+				'9',
+				false,
+			),
+			'Firefox 12 Android Tablet' => array(
+				'Mozilla/5.0 (Android; Tablet; rv:12.0) Gecko/12.0 Firefox/12.0',
+				'mozilla',
+				'unix',
+				'12',
+				true,
+			),
+			'Firefox 6 Windows' => array(
+				'Mozilla/5.0 (Windows NT 5.0; WOW64; rv:6.0) Gecko/20100101 Firefox/6.0',
+				'mozilla',
+				'win',
+				'6',
+				false,
+			),
+		);
+	}
+
+	/**
+	 * @testdox  A browser with a given user agent is correctly detected
 	 *
-	 * @covers JBrowser::isSSLConnection
+	 * @covers        JBrowser::match
+	 * @dataProvider  dataMatch
 	 *
-	 * @return void
+	 * @param   string   $userAgent             The user agent to test
+	 * @param   string   $expectedBrowser       The expected browser value
+	 * @param   string   $expectedPlatform      The expected platform value
+	 * @param   string   $expectedMajorVersion  The expected major version value
+	 * @param   boolean  $expectedMobile        The expected mobile state
+	 */
+	public function testBrowserMatching($userAgent, $expectedBrowser, $expectedPlatform, $expectedMajorVersion, $expectedMobile)
+	{
+		if ($expectedBrowser === 'mozilla')
+		{
+			$this->markTestSkipped('Requires PR #17051 to be tested correctly');
+		}
+
+		$this->object->match($userAgent);
+
+		$this->assertSame(
+			$expectedBrowser,
+			$this->object->getBrowser()
+		);
+
+		$this->assertSame(
+			$expectedPlatform,
+			$this->object->getPlatform()
+		);
+
+		$this->assertSame(
+			$expectedMajorVersion,
+			$this->object->getMajor()
+		);
+
+		$this->assertSame(
+			$expectedMobile,
+			$this->object->isMobile()
+		);
+	}
+
+	/**
+	 * @testdox  The isSSLConnection method correctly detects if a secure connection was made
+	 *
+	 * @covers   JBrowser::isSSLConnection
 	 */
 	public function testIsSSLConnection()
 	{
 		unset($_SERVER['HTTPS']);
 
-		$this->assertThat(
-			$this->object->isSSLConnection(),
-			$this->equalTo(false)
-		);
+		$this->assertFalse($this->object->isSSLConnection());
 
 		$_SERVER['HTTPS'] = 'on';
 
-		$this->assertThat(
-			$this->object->isSSLConnection(),
-			$this->equalTo(true)
-		);
+		$this->assertTrue($this->object->isSSLConnection());
 	}
 }

From ff11ae9198d12fda6a9209be386bf80c8ce6d60b Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Wed, 26 Jul 2017 14:35:09 +0100
Subject: [PATCH 069/148] Unit Test CS (#13433)

* Whats going on now

* Some exclusions

* Remove function comment

* Add some more excludes

* Remove for now

* Add another exception

* Lots of small tweaks to codestyle in tests

* Fix some the plugins CS

* More plugin cs fixing

* Uppercase

* Couple of extra fixes

* empty lines around control structure

* PHPCS autofixers

* Apply PHPCS2.x autofixers to JRouter tests

* Apply PHPCS2.x autofixers to JComponentRouter

* Fix null lowercase

* Code style in application tests

* Fix JApplicationWeb tests

* Remove non-PHP files from tests

* Clean up email cloak unit test

* Remove commented code

* Fix tests failing after merging in develop
---
 build/phpcs/Joomla/ruleset.xml                |  28 +++-
 tests/codeception/_bootstrap.php              |   1 +
 tests/codeception/functional/_bootstrap.php   |   1 +
 tests/unit/core/mock/dispatcher.php           |   1 +
 tests/unit/stubs/discover2/endeavour.php      |   2 +-
 .../includes/JAdministratorHelperTest.php     |   1 -
 .../JDatabaseIteratorPostgresqlTest.php       |   2 +-
 .../JDatabaseQueryPostgresqlTest.php          |   2 +-
 .../sqlite/JDatabaseQuerySqliteTest.php       |   2 +-
 .../sqlsrv/JDatabaseQuerySqlsrvTest.php       |   2 +-
 .../cms/application/JApplicationCmsTest.php   |  18 +--
 .../router/JComponentRouterBaseTest.php       |   7 +-
 .../router/JComponentRouterViewTest.php       |   5 +-
 .../JComponentRouterViewconfigurationTest.php |   3 +
 .../rules/JComponentRouterRulesMenuTest.php   |  19 +--
 .../rules/JComponentRouterRulesNomenuTest.php |   6 +-
 .../JComponentRouterRulesStandardTest.php     |   4 +-
 .../JComponentRouterRulesMenuInspector.php    |   8 +-
 .../JComponentRouterRulesNomenuInspector.php  |   6 +-
 ...ockJComponentRouterRulesMenuMenuObject.php | 128 +++++++++---------
 .../router/stubs/ComContentRouter.php         |   1 +
 .../stubs/JComponentRouterBaseInspector.php   |   8 +-
 .../stubs/JComponentRouterViewInspector.php   |  54 ++++----
 .../router/stubs/componentrouter.php          |   2 +
 .../router/stubs/componentrouterrule.php      |  74 +++++-----
 .../libraries/cms/html/JHtmlMenuTest.php      |   2 +-
 .../cms/installer/JInstallerAdapterTest.php   |   8 +-
 .../libraries/cms/router/JRouterSiteTest.php  |   1 +
 .../libraries/cms/router/JRouterTest.php      |  10 +-
 .../application/JApplicationBaseTest.php      |   2 +-
 .../application/JApplicationWebTest.php       |  16 +--
 .../libraries/joomla/archive/JArchiveTest.php |   5 +-
 .../joomla/archive/JArchiveTestCase.php       |   2 +-
 .../joomla/database/JDatabaseQueryTest.php    |   2 +-
 .../form/field/JFormFieldModuleLayoutTest.php |   2 +-
 .../form/fields/JFormFieldFileListTest.php    |   1 +
 .../joomla/github/JGithubPackageUsersTest.php |   2 +-
 ...GithubPackageRepositoriesDownloadsTest.php |   2 +-
 .../joomla/google/JGoogleAuthOauth2Test.php   |   1 -
 .../libraries/joomla/image/JImageTest.php     |   8 +-
 .../libraries/joomla/input/JInputCliTest.php  |  12 +-
 .../joomla/session/handler/array.php          |  17 ++-
 .../libraries/joomla/user/JUserHelperTest.php |   4 +-
 .../libraries/joomla/view/JViewHtmlTest.php   |   3 +-
 .../emailcloak/PlgContentEmailcloakTest.php   |  67 +++++----
 45 files changed, 299 insertions(+), 253 deletions(-)

diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml
index b644453af4001..0b2d1219aea8c 100644
--- a/build/phpcs/Joomla/ruleset.xml
+++ b/build/phpcs/Joomla/ruleset.xml
@@ -5,7 +5,6 @@
 	<!-- Exclude folders not containing production code -->
 	<exclude-pattern type="relative">build/*</exclude-pattern>
 	<exclude-pattern type="relative">docs/*</exclude-pattern>
-	<exclude-pattern type="relative">tests/*</exclude-pattern>
 	<exclude-pattern type="relative">cache/*</exclude-pattern>
 	<exclude-pattern type="relative">tmp/*</exclude-pattern>
 	<exclude-pattern type="relative">logs/*</exclude-pattern>
@@ -25,6 +24,15 @@
 	<exclude-pattern type="relative">configuration.php</exclude-pattern>
 	<exclude-pattern type="relative">installation/template/index.php</exclude-pattern>
 	<exclude-pattern type="relative">plugins/captcha/recaptcha/recaptchalib.php</exclude-pattern>
+	<!-- Exclude some test related files that don't actually include PHP code -->
+	<exclude-pattern type="relative">tests/unit/suites/libraries/joomla/model/stubs/barbaz.php</exclude-pattern>
+	<exclude-pattern type="relative">tests/unit/suites/libraries/joomla/view/layouts1/fringe/division.php</exclude-pattern>
+	<exclude-pattern type="relative">tests/unit/suites/libraries/joomla/view/layouts1/olivia.php</exclude-pattern>
+	<exclude-pattern type="relative">tests/unit/suites/libraries/joomla/view/layouts1/peter.php</exclude-pattern>
+	<exclude-pattern type="relative">tests/unit/suites/libraries/joomla/view/layouts2/fauxlivia.php</exclude-pattern>
+	<exclude-pattern type="relative">tests/unit/suites/libraries/joomla/view/layouts2/olivia.php</exclude-pattern>
+	<exclude-pattern type="relative">tests/unit/suites/libraries/legacy/controller/stubs/component1/controller.json.php</exclude-pattern>
+	<exclude-pattern type="relative">tests/unit/suites/libraries/legacy/controller/stubs/component2/controller.php</exclude-pattern>
 
 	<!-- Exclude the RoboFile.php -->
 	<exclude-pattern type="relative">RoboFile.php</exclude-pattern>
@@ -54,6 +62,7 @@
 		<exclude-pattern type="relative">*/tmpl/*</exclude-pattern>
 		<exclude-pattern type="relative">templates/*</exclude-pattern>
 		<exclude-pattern type="relative">layouts/*</exclude-pattern>
+		<exclude-pattern type="relative">tests/*</exclude-pattern>
 	</rule>
 
 	<rule ref="Generic.Formatting.DisallowMultipleStatements">
@@ -136,12 +145,23 @@
 
 	<!-- Remove the following when the folder limitations are dropped -->
 
-	<rule ref="Joomla.Classes.MethodScope"/>
+	<rule ref="Joomla.Classes.MethodScope">
+		<exclude-pattern type="relative">tests/*</exclude-pattern>
+	</rule>
+
+	<rule ref="Joomla.Commenting.FileComment">
+		<exclude-pattern type="relative">tests/*</exclude-pattern>
+	</rule>
+
+	<rule ref="Joomla.Functions.FunctionCallSignature">
+		<exclude-pattern type="relative">tests/*</exclude-pattern>
+	</rule>
 
 	<rule ref="Joomla.Commenting.FunctionComment">
 		<!-- We only want this for libraries, language and cli for now -->
 		<exclude-pattern type="relative">templates/*</exclude-pattern>
 		<exclude-pattern type="relative">layouts/*</exclude-pattern>
+		<exclude-pattern type="relative">tests/*</exclude-pattern>
 	</rule>
 
 	<rule ref="Joomla.Commenting.SingleComment">
@@ -151,7 +171,9 @@
 		<exclude-pattern type="relative">layouts/*</exclude-pattern>
 	</rule>
 
-	<rule ref="Joomla.Commenting.ClassComment"/>
+	<rule ref="Joomla.Commenting.ClassComment">
+		<exclude-pattern type="relative">tests/*</exclude-pattern>
+	</rule>
 
 	<rule ref="Joomla.ControlStructures.ControlSignature">
 		<!-- These exceptions are permanent -->
diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
index 243f9c85bc6da..074505f2795c7 100644
--- a/tests/codeception/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -1,2 +1,3 @@
 <?php
+
 // This is global bootstrap for autoloading
diff --git a/tests/codeception/functional/_bootstrap.php b/tests/codeception/functional/_bootstrap.php
index 8a885558065a1..62817a53c4efa 100644
--- a/tests/codeception/functional/_bootstrap.php
+++ b/tests/codeception/functional/_bootstrap.php
@@ -1,2 +1,3 @@
 <?php
+
 // Here you can initialize variables that will be available to your tests
diff --git a/tests/unit/core/mock/dispatcher.php b/tests/unit/core/mock/dispatcher.php
index f558cba19e083..993469b6ca745 100644
--- a/tests/unit/core/mock/dispatcher.php
+++ b/tests/unit/core/mock/dispatcher.php
@@ -60,6 +60,7 @@ public static function create($test, $defaults = true)
 					->setMockClassName('')
 					->disableOriginalConstructor()
 					->getMock();
+
 		// Mock selected methods.
 		$test->assignMockReturns(
 			$mockObject, array(
diff --git a/tests/unit/stubs/discover2/endeavour.php b/tests/unit/stubs/discover2/endeavour.php
index a0bf71975ec4c..cbdb45e524674 100644
--- a/tests/unit/stubs/discover2/endeavour.php
+++ b/tests/unit/stubs/discover2/endeavour.php
@@ -8,4 +8,4 @@
 
 class ShuttleEndeavour
 {
-}
\ No newline at end of file
+}
diff --git a/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php b/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php
index 939ba1b650e84..070908b074cee 100644
--- a/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php
+++ b/tests/unit/suites/administrator/includes/JAdministratorHelperTest.php
@@ -29,7 +29,6 @@ class JAdministratorHelperTest extends TestCase
 	 */
 	protected function setUp()
 	{
-		//$this->object = new JErrorPage;
 		$this->saveFactoryState();
 
 		JFactory::$application = $this->getMockCmsApp();
diff --git a/tests/unit/suites/database/driver/postgresql/JDatabaseIteratorPostgresqlTest.php b/tests/unit/suites/database/driver/postgresql/JDatabaseIteratorPostgresqlTest.php
index 4ad7107b61ef8..ea51fe71f9a50 100644
--- a/tests/unit/suites/database/driver/postgresql/JDatabaseIteratorPostgresqlTest.php
+++ b/tests/unit/suites/database/driver/postgresql/JDatabaseIteratorPostgresqlTest.php
@@ -133,7 +133,7 @@ public function testForEach($select, $from, $column, $class, $limit, $offset, $e
 		$iterator = self::$driver->getIterator($column, $class);
 
 		// Run the Iterator pattern
-		$this->assertEquals($expected,iterator_to_array($iterator));
+		$this->assertEquals($expected, iterator_to_array($iterator));
 	}
 
 	/**
diff --git a/tests/unit/suites/database/driver/postgresql/JDatabaseQueryPostgresqlTest.php b/tests/unit/suites/database/driver/postgresql/JDatabaseQueryPostgresqlTest.php
index aeef9eaccf4c1..00f80bc5e9675 100644
--- a/tests/unit/suites/database/driver/postgresql/JDatabaseQueryPostgresqlTest.php
+++ b/tests/unit/suites/database/driver/postgresql/JDatabaseQueryPostgresqlTest.php
@@ -1180,7 +1180,7 @@ public function testReturning()
 	public function seedDateAdd()
 	{
 		return array(
-			// date, interval, datepart, expected
+			// Elements: date, interval, datepart, expected
 			'Add date'		=> array('2008-12-31', '1', 'day', "timestamp '2008-12-31' + interval '1 day'"),
 			'Subtract date'	=> array('2008-12-31', '-1', 'day', "timestamp '2008-12-31' - interval '1 day'"),
 			'Add datetime'	=> array('2008-12-31 23:59:59', '1', 'day', "timestamp '2008-12-31 23:59:59' + interval '1 day'"),
diff --git a/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php b/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php
index 2308d9f877083..3624743ebd9be 100644
--- a/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php
+++ b/tests/unit/suites/database/driver/sqlite/JDatabaseQuerySqliteTest.php
@@ -73,7 +73,7 @@ protected function tearDown()
 	public function seedDateAdd()
 	{
 		return array(
-			// date, interval, datepart, expected
+			// Elements: date, interval, datepart, expected
 			'Add date'			=> array('2008-12-31', '1', 'DAY', "datetime('2008-12-31', '+1 DAY')"),
 			'Subtract date'		=> array('2008-12-31', '-1', 'DAY', "datetime('2008-12-31', '-1 DAY')"),
 			'Add datetime'		=> array('2008-12-31 23:59:59', '1', 'DAY', "datetime('2008-12-31 23:59:59', '+1 DAY')"),
diff --git a/tests/unit/suites/database/driver/sqlsrv/JDatabaseQuerySqlsrvTest.php b/tests/unit/suites/database/driver/sqlsrv/JDatabaseQuerySqlsrvTest.php
index 272727e47a745..73df67da7a7f6 100644
--- a/tests/unit/suites/database/driver/sqlsrv/JDatabaseQuerySqlsrvTest.php
+++ b/tests/unit/suites/database/driver/sqlsrv/JDatabaseQuerySqlsrvTest.php
@@ -73,7 +73,7 @@ protected function tearDown()
 	public function seedDateAdd()
 	{
 		return array(
-			// date, interval, datepart, expected
+			// Elements: date, interval, datepart, expected
 			'Add date'			=> array('2008-12-31', '1', 'day', "DATEADD('day', '1', '2008-12-31')"),
 			'Subtract date'		=> array('2008-12-31', '-1', 'day', "DATEADD('day', '-1', '2008-12-31')"),
 			'Add datetime'		=> array('2008-12-31 23:59:59', '1', 'day', "DATEADD('day', '1', '2008-12-31 23:59:59')"),
diff --git a/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php b/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
index bf8047c45988d..58cc151aa79eb 100644
--- a/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
+++ b/tests/unit/suites/libraries/cms/application/JApplicationCmsTest.php
@@ -459,9 +459,9 @@ public function testRedirect()
 			$this->class->headers[2]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[3][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[3][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[4][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
@@ -529,9 +529,9 @@ public function testRedirectLegacy()
 			$this->class->headers[2]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[3][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[3][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[4][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
@@ -595,9 +595,9 @@ public function testRedirectLegacyWithEmptyMessageAndEmptyStatus()
 			$this->class->headers[2]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[3][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[3][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[4][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
@@ -704,7 +704,7 @@ public function testRedirectWithMoved()
 		);
 
 		$this->assertEquals(
-			array('Location: '  . $url, true, null),
+			array('Location: ' . $url, true, null),
 			$this->class->headers[1]
 		);
 
@@ -713,9 +713,9 @@ public function testRedirectWithMoved()
 			$this->class->headers[2]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[3][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[3][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[4][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
diff --git a/tests/unit/suites/libraries/cms/component/router/JComponentRouterBaseTest.php b/tests/unit/suites/libraries/cms/component/router/JComponentRouterBaseTest.php
index 14a1d88108a4d..13f74656503a5 100644
--- a/tests/unit/suites/libraries/cms/component/router/JComponentRouterBaseTest.php
+++ b/tests/unit/suites/libraries/cms/component/router/JComponentRouterBaseTest.php
@@ -37,7 +37,7 @@ public function testConstruct()
 		 * Test if standard setup of JComponentRouterBase works and $app and
 		 * $menu are properly populated
 		 */
-		$object = new JComponentRouterBaseInspector();
+		$object = new JComponentRouterBaseInspector;
 		$this->assertInstanceOf('JComponentRouterInterface', $object);
 		$this->assertInstanceOf('JComponentRouterBase', $object);
 		$this->assertEquals($app, $object->app);
@@ -51,13 +51,14 @@ public function testConstruct()
 		$app2 = TestMockApplication::create($this);
 		$object = new JComponentRouterBaseInspector($app2);
 		$this->assertEquals($app2, $object->app);
-		//The original $app is not the same object as $app2, thus we did not use JFactory
+
+		// The original $app is not the same object as $app2, thus we did not use JFactory
 		$this->assertNotSame($app, $object->app);
 
 		/**
 		 * Test if the setup works when both an app and menu object is handed over
 		 */
-		$menu2 = new stdClass();
+		$menu2 = new stdClass;
 		$object = new JComponentRouterBaseInspector($app, $menu2);
 		$this->assertEquals($app, $object->app);
 		$this->assertEquals($menu2, $object->menu);
diff --git a/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewTest.php b/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewTest.php
index 755579034bfd7..2c0c2f21dac2b 100644
--- a/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewTest.php
+++ b/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewTest.php
@@ -128,6 +128,7 @@ public function testGetViews()
 	public function casesGetPath()
 	{
 		$cases   = array();
+
 		// No view, so we don't have a path to return.
 		$cases[] = array(array('task' => 'edit'), array());
 
@@ -140,7 +141,7 @@ public function casesGetPath()
 		// View with parent and children
 		$cases[] = array(array('view' => 'category', 'id' => '9'), array('category' => array(9 => '9:uncategorised'), 'categories' => array(9 => '9:uncategorised')));
 
-		//View with parent, no children
+		// View with parent, no children
 		$cases[] = array(array('view' => 'article', 'id' => '42:question-for-everything', 'catid' => '9'),
 			array(
 				'article' => array(42 => '42:question-for-everything'),
@@ -149,7 +150,7 @@ public function casesGetPath()
 			)
 		);
 
-		//View with parent, no children and nested view
+		// View with parent, no children and nested view
 		$cases[] = array(array('view' => 'article', 'id' => '42:question-for-everything', 'catid' => '20'),
 			array(
 				'article' => array(42 => '42:question-for-everything'),
diff --git a/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewconfigurationTest.php b/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewconfigurationTest.php
index b769a5d2c1e34..7479b989aea7d 100644
--- a/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewconfigurationTest.php
+++ b/tests/unit/suites/libraries/cms/component/router/JComponentRouterViewconfigurationTest.php
@@ -144,6 +144,7 @@ public function testSetParent()
 		$this->assertEquals(array($this->object), $parent2->children);
 		$this->assertEquals(array('category', 'test'), $this->object->path);
 		$this->assertEquals(array('catid'), $parent2->child_keys);
+
 		// Make sure that the original parent is cleaned up
 		$this->assertEquals(array(), $parent->children);
 		$this->assertEquals(array(), $parent->child_keys);
@@ -154,6 +155,7 @@ public function testSetParent()
 		$this->assertEquals($parent3, $this->object->parent);
 		$this->assertEquals('formid', $this->object->parent_key);
 		$this->assertEquals(array('formid'), $parent3->child_keys);
+
 		// Make sure that the original parent is cleaned up
 		$this->assertEquals(array(), $parent2->children);
 		$this->assertEquals(array(), $parent2->child_keys);
@@ -191,6 +193,7 @@ public function testAddLayout()
 		$this->assertEquals(array('default'), $this->object->layouts);
 		$this->assertEquals($this->object, $this->object->addLayout('form'));
 		$this->assertEquals(array('default', 'form'), $this->object->layouts);
+
 		// Make sure that a layout can only be added once
 		$this->object->addLayout('form');
 		$this->assertEquals(array('default', 'form'), $this->object->layouts);
diff --git a/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesMenuTest.php b/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesMenuTest.php
index ce03db8a20b0a..ceeaf7a67701a 100644
--- a/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesMenuTest.php
+++ b/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesMenuTest.php
@@ -18,8 +18,8 @@
  * @subpackage  Component
  * @since       3.5
  */
-class JComponentRouterRulesMenuTest extends TestCaseDatabase {
-
+class JComponentRouterRulesMenuTest extends TestCaseDatabase
+{
 	/**
 	 * Object under test
 	 *
@@ -63,7 +63,7 @@ protected function setUp()
 		$router->registerView($featured);
 		$form = new JComponentRouterViewconfiguration('form');
 		$router->registerView($form);
-		$router->menu = new MockJComponentRouterRulesMenuMenuObject();
+		$router->menu = new MockJComponentRouterRulesMenuMenuObject;
 
 		$this->object = new JComponentRouterRulesMenuInspector($router);
 	}
@@ -116,7 +116,8 @@ public function testConstruct()
 				'featured' => '47',
 				'categories' => array(14 => '48'),
 				'category' => array (20 => '49'))
-			), $this->object->get('lookup'));
+			), $this->object->get('lookup')
+		);
 	}
 
 	/**
@@ -129,7 +130,7 @@ public function testConstruct()
 	public function casesPreprocess()
 	{
 		$cases   = array();
-		
+
 		// Check direct link to a simple view
 		$cases[] = array(array('option' => 'com_content', 'view' => 'featured'),
 			array('option' => 'com_content', 'view' => 'featured', 'Itemid' => '47'));
@@ -244,8 +245,9 @@ public function testBuildLookup()
 				'featured' => '47',
 				'categories' => array(14 => '48'),
 				'category' => array (20 => '49'))
-			), $this->object->get('lookup'));
-		
+			), $this->object->get('lookup')
+		);
+
 		$this->object->runBuildLookUp('en-GB');
 		$this->assertEquals(array(
 			'*' => array(
@@ -256,6 +258,7 @@ public function testBuildLookup()
 				'featured' => '51',
 				'categories' => array(14 => '50'),
 				'category' => array (20 => '49'))
-			), $this->object->get('lookup'));
+			), $this->object->get('lookup')
+		);
 	}
 }
diff --git a/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesNomenuTest.php b/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesNomenuTest.php
index 8460fdd9d4299..2cd4c4873293f 100644
--- a/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesNomenuTest.php
+++ b/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesNomenuTest.php
@@ -17,8 +17,8 @@
  * @subpackage  Component
  * @since       3.4
  */
-class JComponentRouterRulesNomenuTest extends TestCase {
-
+class JComponentRouterRulesNomenuTest extends TestCase
+{
 	/**
 	 * Object under test
 	 *
@@ -115,7 +115,7 @@ public function testParse()
 		$router = $this->object->get('router');
 		$router->menu->expects($this->any())
 			->method('getActive')
-			->will($this->returnValue(new stdClass()));
+			->will($this->returnValue(new stdClass));
 		$segments = array('article', '42:the-answer');
 		$vars = array('option' => 'com_content');
 		$this->object->parse($segments, $vars);
diff --git a/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesStandardTest.php b/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesStandardTest.php
index d6e57717acf16..11a2c6541a1b0 100644
--- a/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesStandardTest.php
+++ b/tests/unit/suites/libraries/cms/component/router/rules/JComponentRouterRulesStandardTest.php
@@ -17,8 +17,8 @@
  * @subpackage  Component
  * @since       3.7.0
  */
-class JComponentRouterRulesStandardTest extends TestCaseDatabase {
-
+class JComponentRouterRulesStandardTest extends TestCaseDatabase
+{
 	/**
 	 * Object under test
 	 *
diff --git a/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesMenuInspector.php b/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesMenuInspector.php
index 2bb2fa339c857..43207aebbce75 100644
--- a/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesMenuInspector.php
+++ b/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesMenuInspector.php
@@ -18,7 +18,7 @@ class JComponentRouterRulesMenuInspector extends JComponentRouterRulesMenu
 {
 	/**
 	 * Gets an attribute of the object
-	 * 
+	 *
 	 * @param   string   $key  Attributename to return
 	 *
 	 * @return  mixed  Attributes of the object
@@ -32,7 +32,7 @@ public function get($key)
 
 	/**
 	 * Sets an attribute of the object
-	 * 
+	 *
 	 * @param   string   $key    Attributename to return
 	 * @param   mixed    $value  Value to be set
 	 *
@@ -44,9 +44,9 @@ public function set($key, $value)
 	{
 		$this->$key = $value;
 	}
-	
+
 	public function runBuildLookup($language = '*')
 	{
 		return $this->buildLookup($language);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesNomenuInspector.php b/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesNomenuInspector.php
index 626050d9b1fc3..7e9208a6f34c2 100644
--- a/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesNomenuInspector.php
+++ b/tests/unit/suites/libraries/cms/component/router/rules/stubs/JComponentRouterRulesNomenuInspector.php
@@ -18,7 +18,7 @@ class JComponentRouterRulesNomenuInspector extends JComponentRouterRulesNomenu
 {
 	/**
 	 * Gets an attribute of the object
-	 * 
+	 *
 	 * @param   string   $key  Attributename to return
 	 *
 	 * @return  mixed  Attributes of the object
@@ -32,7 +32,7 @@ public function get($key)
 
 	/**
 	 * Sets an attribute of the object
-	 * 
+	 *
 	 * @param   string   $key    Attributename to return
 	 * @param   mixed    $value  Value to be set
 	 *
@@ -44,4 +44,4 @@ public function set($key, $value)
 	{
 		$this->$key = $value;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/suites/libraries/cms/component/router/rules/stubs/MockJComponentRouterRulesMenuMenuObject.php b/tests/unit/suites/libraries/cms/component/router/rules/stubs/MockJComponentRouterRulesMenuMenuObject.php
index 238f2a872ceaf..617cd42c9ff92 100644
--- a/tests/unit/suites/libraries/cms/component/router/rules/stubs/MockJComponentRouterRulesMenuMenuObject.php
+++ b/tests/unit/suites/libraries/cms/component/router/rules/stubs/MockJComponentRouterRulesMenuMenuObject.php
@@ -18,104 +18,104 @@ class MockJComponentRouterRulesMenuMenuObject
 {
 	/**
 	 * Menuitems
-	 * 
+	 *
 	 * @var array
 	 */
 	protected $items = array();
 
 	/**
 	 * Active menuitem
-	 * 
+	 *
 	 * @var integer
 	 */
 	public $active = 49;
 
 	/**
 	 * Constructor for this object
-	 * 
+	 *
 	 * @since 3.4
 	 */
 	public function __construct()
 	{
 		$this->items[47] = (object) array(
-			'id'           => '47', 
-			'menutype'     => 'testmenu', 
-			'title'        => 'Content Home', 
-			'alias'        => 'content-home', 
-			'route'        => 'content-home', 
-			'link'         => 'index.php?option=com_content&view=featured', 
-			'type'         => 'component', 
-			'level'        => '1', 
-			'language'     => '*', 
+			'id'           => '47',
+			'menutype'     => 'testmenu',
+			'title'        => 'Content Home',
+			'alias'        => 'content-home',
+			'route'        => 'content-home',
+			'link'         => 'index.php?option=com_content&view=featured',
+			'type'         => 'component',
+			'level'        => '1',
+			'language'     => '*',
 			'component_id' => '22',
 			'component'    => 'com_content',
-			'parent_id'    => '0', 
+			'parent_id'    => '0',
 			'query'        => array('option' => 'com_content', 'view' => 'featured'));
 
 		$this->items[48] = (object) array(
-			'id'           => '48', 
-			'menutype'     => 'testmenu', 
-			'title'        => 'Categories View', 
-			'alias'        => 'categories', 
-			'route'        => 'content-home/categories', 
-			'link'         => 'index.php?option=com_content&view=categories&id=14', 
-			'type'         => 'component', 
-			'level'        => '2', 
-			'language'     => '*', 
-			'component_id' => '22', 
+			'id'           => '48',
+			'menutype'     => 'testmenu',
+			'title'        => 'Categories View',
+			'alias'        => 'categories',
+			'route'        => 'content-home/categories',
+			'link'         => 'index.php?option=com_content&view=categories&id=14',
+			'type'         => 'component',
+			'level'        => '2',
+			'language'     => '*',
+			'component_id' => '22',
 			'component'    => 'com_content',
-			'parent_id'    => '47', 
+			'parent_id'    => '47',
 			'query'        => array('option' => 'com_content', 'view' => 'categories', 'id' => '14'));
 
 		$this->items[49] = (object) array(
-			'id'           => '49', 
-			'menutype'     => 'testmenu', 
-			'title'        => 'Category View', 
-			'alias'        => 'category-view', 
-			'route'        => 'category-view', 
-			'link'         => 'index.php?option=com_content&view=category&id=20', 
-			'type'         => 'component', 
-			'level'        => '1', 
-			'language'     => '*', 
-			'component_id' => '22', 
+			'id'           => '49',
+			'menutype'     => 'testmenu',
+			'title'        => 'Category View',
+			'alias'        => 'category-view',
+			'route'        => 'category-view',
+			'link'         => 'index.php?option=com_content&view=category&id=20',
+			'type'         => 'component',
+			'level'        => '1',
+			'language'     => '*',
+			'component_id' => '22',
 			'component'    => 'com_content',
-			'parent_id'    => '47', 
+			'parent_id'    => '47',
 			'query'        => array('option' => 'com_content', 'view' => 'category', 'id' => '20'));
 
 		$this->items[50] = (object) array(
-			'id'           => '50', 
-			'menutype'     => 'testmenu', 
-			'title'        => 'Categories View', 
-			'alias'        => 'categories', 
-			'route'        => 'content-home/categories', 
-			'link'         => 'index.php?option=com_content&view=categories&id=14', 
-			'type'         => 'component', 
-			'level'        => '2', 
-			'language'     => 'en-GB', 
-			'component_id' => '22', 
+			'id'           => '50',
+			'menutype'     => 'testmenu',
+			'title'        => 'Categories View',
+			'alias'        => 'categories',
+			'route'        => 'content-home/categories',
+			'link'         => 'index.php?option=com_content&view=categories&id=14',
+			'type'         => 'component',
+			'level'        => '2',
+			'language'     => 'en-GB',
+			'component_id' => '22',
 			'component'    => 'com_content',
-			'parent_id'    => '47', 
+			'parent_id'    => '47',
 			'query'        => array('option' => 'com_content', 'view' => 'categories', 'id' => '14'));
-		
+
 		$this->items[51] = (object) array(
-			'id'           => '51', 
-			'menutype'     => 'testmenu', 
-			'title'        => 'Content Home', 
-			'alias'        => 'content-home', 
-			'route'        => 'content-home', 
-			'link'         => 'index.php?option=com_content&view=featured', 
-			'type'         => 'component', 
-			'level'        => '1', 
-			'language'     => 'en-GB', 
-			'component_id' => '22', 
+			'id'           => '51',
+			'menutype'     => 'testmenu',
+			'title'        => 'Content Home',
+			'alias'        => 'content-home',
+			'route'        => 'content-home',
+			'link'         => 'index.php?option=com_content&view=featured',
+			'type'         => 'component',
+			'level'        => '1',
+			'language'     => 'en-GB',
+			'component_id' => '22',
 			'component'    => 'com_content',
-			'parent_id'    => '0', 
+			'parent_id'    => '0',
 			'query'        => array('option' => 'com_content', 'view' => 'featured'));
 	}
 
 	/**
 	 * Gets the menu item set that fits the search array
-	 * 
+	 *
 	 * @param   array   $attributes  Search criteria
 	 * @param   array   $values      Search criteria
 	 *
@@ -164,7 +164,7 @@ public function getItems($attributes, $values)
 
 	/**
 	 * Return the currently active menuitem
-	 * 
+	 *
 	 * @return  object  Menuitem
 	 * @since 3.4
 	 */
@@ -175,9 +175,9 @@ public function getActive()
 
 	/**
 	 * Return the default menuitem for the language
-	 * 
+	 *
 	 * @param   string  $language  Language for the default
-	 * 
+	 *
 	 * @return  object  Menuitem
 	 * @since 3.4
 	 */
@@ -187,10 +187,10 @@ public function getDefault($language = '*')
 		{
 			return $this->items[47];
 		}
-		
+
 		if ($language == 'en-GB')
 		{
 			return $this->items[51];
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/suites/libraries/cms/component/router/stubs/ComContentRouter.php b/tests/unit/suites/libraries/cms/component/router/stubs/ComContentRouter.php
index e69593cace7eb..d0d61e799ddc6 100644
--- a/tests/unit/suites/libraries/cms/component/router/stubs/ComContentRouter.php
+++ b/tests/unit/suites/libraries/cms/component/router/stubs/ComContentRouter.php
@@ -19,6 +19,7 @@
 class ContentRouterStandardRuleOnly extends JComponentRouterView
 {
 	protected $noIDs = false;
+
 	protected $name = 'content';
 
 	/**
diff --git a/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterBaseInspector.php b/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterBaseInspector.php
index 41466d39282ee..f512e8c5e0cc7 100644
--- a/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterBaseInspector.php
+++ b/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterBaseInspector.php
@@ -18,7 +18,7 @@ class JComponentRouterBaseInspector extends JComponentRouterBase
 {
 	/**
 	 * Runs the protected createURI() method
-	 * 
+	 *
 	 * @param   array   $url  valid inputs to the createURI() method
 	 *
 	 * @return  object  JUri object from the given parameters
@@ -29,13 +29,13 @@ public function get($key)
 	{
 		return $this->$key;
 	}
-	
+
 	public function build(&$query)
 	{
 	}
-	
+
 	public function parse(&$segments)
 	{
-		
+
 	}
 }
diff --git a/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterViewInspector.php b/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterViewInspector.php
index 2533761e20166..cb42e87c288e9 100644
--- a/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterViewInspector.php
+++ b/tests/unit/suites/libraries/cms/component/router/stubs/JComponentRouterViewInspector.php
@@ -18,7 +18,7 @@ class JComponentRouterViewInspector extends JComponentRouterView
 {
 	/**
 	 * Gets an attribute of the object
-	 * 
+	 *
 	 * @param   string   $key  Attributename to return
 	 *
 	 * @return  mixed  Attributes of the object
@@ -32,7 +32,7 @@ public function get($key)
 
 	/**
 	 * Sets an attribute of the object
-	 * 
+	 *
 	 * @param   string   $key    Attributename to return
 	 * @param   mixed    $value  Value to be set
 	 *
@@ -46,14 +46,14 @@ public function set($key, $value)
 	}
 
 	/**
-	* Get content items of the type category
-	*
-	* @param int $id ID of the category to load
-	*
-	* @return array  Categories path identified by $id
-	*
-	* @since 3.4
-	*/
+	 * Get content items of the type category
+	 *
+	 * @param   int $id ID of the category to load
+	 *
+	 * @return array  Categories path identified by $id
+	 *
+	 * @since 3.4
+	 */
 	public function getCategorySegment($id, $query)
 	{
 		$category = JCategories::getInstance($this->getName())->get($id);
@@ -67,28 +67,28 @@ public function getCategorySegment($id, $query)
 	}
 
 	/**
-	* Get content items of the type categories
-	*
-	* @param int $id ID of the category to load
-	*
-	* @return array  Categories path identified by $id
-	*
-	* @since 3.4
-	*/
+	 * Get content items of the type categories
+	 *
+	 * @param   int $id ID of the category to load
+	 *
+	 * @return array  Categories path identified by $id
+	 *
+	 * @since 3.4
+	 */
 	public function getCategoriesSegment($id, $query)
 	{
 		return $this->getCategorySegment($id, $query);
 	}
 
 	/**
-	* Get content items of the type article
-	*
-	* @param int $id ID of the article to load
-	*
-	* @return array article identified by $id
-	*
-	* @since 3.4
-	*/
+	 * Get content items of the type article
+	 *
+	 * @param   int $id ID of the article to load
+	 *
+	 * @return array article identified by $id
+	 *
+	 * @since 3.4
+	 */
 	public function getArticleSegment($id, $query)
 	{
 		return array((int) $id => $id);
@@ -100,4 +100,4 @@ public function getArticleSegment($id, $query)
  */
 class FakeComponentURLCreator extends JComponentRouterViewInspector
 {
-}
\ No newline at end of file
+}
diff --git a/tests/unit/suites/libraries/cms/component/router/stubs/componentrouter.php b/tests/unit/suites/libraries/cms/component/router/stubs/componentrouter.php
index 32d96a7173e28..9cba097de8aff 100644
--- a/tests/unit/suites/libraries/cms/component/router/stubs/componentrouter.php
+++ b/tests/unit/suites/libraries/cms/component/router/stubs/componentrouter.php
@@ -17,6 +17,7 @@
 function ComtestBuildRoute(&$query)
 {
 	$return = array();
+
 	foreach ($query as $key => $var)
 	{
 		$return[] = $key . '-' . $var;
@@ -35,6 +36,7 @@ function ComtestBuildRoute(&$query)
 function ComtestParseRoute(&$segments)
 {
 	$return = array();
+
 	foreach ($segments as $segment)
 	{
 		list($key, $var) = explode(':', $segment, 2);
diff --git a/tests/unit/suites/libraries/cms/component/router/stubs/componentrouterrule.php b/tests/unit/suites/libraries/cms/component/router/stubs/componentrouterrule.php
index 0fffe21f94f46..d9b92a2b72227 100644
--- a/tests/unit/suites/libraries/cms/component/router/stubs/componentrouterrule.php
+++ b/tests/unit/suites/libraries/cms/component/router/stubs/componentrouterrule.php
@@ -17,49 +17,49 @@
 class TestComponentRouterRule implements JComponentRouterRulesInterface
 {
 	/**
-	* Router this rule belongs to
-	*
-	* @var JComponentRouterView
-	* @since 3.4
-	*/
+	 * Router this rule belongs to
+	 *
+	 * @var JComponentRouterView
+	 * @since 3.4
+	 */
 	protected $router;
 
 	/**
-	* Class constructor.
-	*
-	* @param JComponentRouterView $router Router this rule belongs to
-	*
-	* @since 3.4
-	*/
+	 * Class constructor.
+	 *
+	 * @param   JComponentRouterView $router Router this rule belongs to
+	 *
+	 * @since 3.4
+	 */
 	public function __construct(JComponentRouterView $router)
 	{
 		$this->router = $router;
 	}
 
 	/**
-	* Finds the right Itemid for this query
-	*
-	* @param array &$query The query array to process
-	*
-	* @return void
-	*
-	* @since 3.4
-	*/
+	 * Finds the right Itemid for this query
+	 *
+	 * @param   array &$query The query array to process
+	 *
+	 * @return void
+	 *
+	 * @since 3.4
+	 */
 	public function preprocess(&$query)
 	{
 		$query['testrule'] = 'yes';
 	}
 
 	/**
-	* Parse method
-	*
-	* @param   array  &$segments  The URL segments to parse
-	* @param   array  &$vars      The vars that result from the segments
-	*
-	* @return void
-	*
-	* @since 3.4
-	*/
+	 * Parse method
+	 *
+	 * @param   array  &$segments  The URL segments to parse
+	 * @param   array  &$vars      The vars that result from the segments
+	 *
+	 * @return void
+	 *
+	 * @since 3.4
+	 */
 	public function parse(&$segments, &$vars)
 	{
 		array_pop($segments);
@@ -67,15 +67,15 @@ public function parse(&$segments, &$vars)
 	}
 
 	/**
-	* Build method
-	*
-	* @param   array  &$query     The vars that should be converted
-	* @param   array  &$segments  The URL segments to create
-	*
-	* @return void
-	*
-	* @since 3.4
-	*/
+	 * Build method
+	 *
+	 * @param   array  &$query     The vars that should be converted
+	 * @param   array  &$segments  The URL segments to create
+	 *
+	 * @return void
+	 *
+	 * @since 3.4
+	 */
 	public function build(&$query, &$segments)
 	{
 		array_pop($query);
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlMenuTest.php b/tests/unit/suites/libraries/cms/html/JHtmlMenuTest.php
index a2de73522258d..fdd632789db46 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlMenuTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlMenuTest.php
@@ -26,7 +26,7 @@ class JHtmlMenuTest extends TestCaseDatabase
 	 */
 	protected function setUp()
 	{
-        // skipped because dateset that allows these test not to fail let other tests fail.
+        // Skipped because dataset that allows these test not to fail let other tests fail.
 	    $this->markTestSkipped('skipped RD 3.Feb 2017');
 
 	    parent::setUp();
diff --git a/tests/unit/suites/libraries/cms/installer/JInstallerAdapterTest.php b/tests/unit/suites/libraries/cms/installer/JInstallerAdapterTest.php
index 8374f02f8e4e4..a0f5a8a0354cd 100644
--- a/tests/unit/suites/libraries/cms/installer/JInstallerAdapterTest.php
+++ b/tests/unit/suites/libraries/cms/installer/JInstallerAdapterTest.php
@@ -556,7 +556,7 @@ public function testDiscoverInstallWithExceptionThrownInAdapterMethods($method)
 		// Mock setupInstallPaths throwing an exception
 		$object->expects($this->once())
 			->method($method)
-			->willThrowException(new RuntimeException());
+			->willThrowException(new RuntimeException);
 
 		$manifestObject = simplexml_load_string($this->sampleManifest);
 		unset($manifestObject->description);
@@ -1036,7 +1036,7 @@ public function testInstallAbortsWhenSetupUpdatesThrowsException()
 		// Check that setupUpdates has been called
 		$object->expects($this->once())
 			->method('setupUpdates')
-			->willThrowException(new RuntimeException());
+			->willThrowException(new RuntimeException);
 
 		$manifestObject = simplexml_load_string($this->sampleManifest);
 		TestReflection::setValue($object, 'manifest', $manifestObject);
@@ -1200,7 +1200,7 @@ public function testInstallWithExceptionThrownInAdapterMethods($method)
 		// Mock setupInstallPaths throwing an exception
 		$object->expects($this->once())
 			->method($method)
-			->willThrowException(new RuntimeException());
+			->willThrowException(new RuntimeException);
 
 		$manifestObject = simplexml_load_string($this->sampleManifest);
 		unset($manifestObject->description);
@@ -1263,7 +1263,7 @@ public function testInstallWithExceptionThrownInFinaliseInstall()
 		// Mock setupInstallPaths throwing an exception
 		$object->expects($this->once())
 			->method('finaliseInstall')
-			->willThrowException(new RuntimeException());
+			->willThrowException(new RuntimeException);
 
 		$manifestObject = simplexml_load_string($this->sampleManifest);
 		unset($manifestObject->description);
diff --git a/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php b/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
index d18f8d5f2deed..3128233d2b795 100644
--- a/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
+++ b/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
@@ -896,6 +896,7 @@ public function testParseSefRoute($url, $mode, $appConfig, $expectedParseVars, $
 				->will($this->returnValue(true));
 			unset($appConfig['languagefilter']);
 		}
+
 		$app->expects($this->any())
 			->method('get')
 			->will($this->returnValueMap($appConfig));
diff --git a/tests/unit/suites/libraries/cms/router/JRouterTest.php b/tests/unit/suites/libraries/cms/router/JRouterTest.php
index 91995eabc8de6..c212553b8fadf 100644
--- a/tests/unit/suites/libraries/cms/router/JRouterTest.php
+++ b/tests/unit/suites/libraries/cms/router/JRouterTest.php
@@ -98,7 +98,7 @@ public function testProperTypeAndMode($client)
 		$cache->setAccessible(true);
 		$cache->setValue(array());
 
-		#$this->markTestSkipped('Untestable due to global instance cache not clearable.');
+		// $this->markTestSkipped('Untestable due to global instance cache not clearable.');
 
 		$object = JRouter::getInstance($client, array('mode' => 'test'));
 
@@ -131,7 +131,8 @@ public function testLegacyApplicationRouterIsStillLoaded()
 			'id'   => 3,
 			'name' => 'tester',
 			'path' => __DIR__ . '/data'
-		));
+			)
+		);
 
 		$this->assertInstanceOf('JRouter', JRouter::getInstance('tester'));
 	}
@@ -215,10 +216,12 @@ public function testBuildGivesTheSameResultAsTheJuriConstructor($mode)
 	{
 		$uri    = new JUri('index.php?var1=value1');
 		$object = new JRouter;
+
 		if (!empty($mode))
 		{
 			$object->setMode($mode);
 		}
+
 		$result = $this->object->build('index.php?var1=value1');
 		$this->assertEquals($uri, $result);
 	}
@@ -390,6 +393,7 @@ function (JRouter $router, JUri $uri)
 	public function testParseRulesCanReplacePresetVariables($preset, $rules, $stage, $expected)
 	{
 		$this->object->setVars($preset, false);
+
 		foreach ($rules as $rule)
 		{
 			$this->object->attachParseRule($rule, $stage);
@@ -453,6 +457,7 @@ function (JRouter $router, JUri $uri)
 	public function testParseRulesCanAddVariables($preset, $rules, $stage, $expected)
 	{
 		$this->object->setVars($preset, false);
+
 		foreach ($rules as $rule)
 		{
 			$this->object->attachParseRule($rule, $stage);
@@ -528,6 +533,7 @@ function (JRouter $router, JUri $uri)
 	public function testFirstParseRuleTakesPrecedence($preset, $rules, $stage, $expected)
 	{
 		$this->object->setVars($preset, false);
+
 		foreach ($rules as $rule)
 		{
 			$this->object->attachParseRule($rule, $stage);
diff --git a/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php b/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php
index 9151b75bcb628..ac8c9b64dcec6 100644
--- a/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php
+++ b/tests/unit/suites/libraries/joomla/application/JApplicationBaseTest.php
@@ -70,7 +70,7 @@ public function testClose()
 	 */
 	public function testExecute()
 	{
-		// execute() has no return, just make sure the method runs
+		// As execute() has no return, just make sure the method runs
 		$this->assertNull($this->class->execute());
 	}
 
diff --git a/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php b/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
index aa79497da5be2..d8b1e10b7de2d 100644
--- a/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
+++ b/tests/unit/suites/libraries/joomla/application/JApplicationWebTest.php
@@ -1099,9 +1099,9 @@ public function testRedirect()
 			$this->class->headers[2]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[3][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[3][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[4][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
@@ -1167,9 +1167,9 @@ public function testRedirectWithExistingStatusCode1()
 			$this->class->headers[3]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[4][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[5][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[5][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
@@ -1229,9 +1229,9 @@ public function testRedirectWithExistingStatusCode2()
 			$this->class->headers[2]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[3][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[3][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[4][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
@@ -1341,9 +1341,9 @@ public function testRedirectWithMoved()
 			$this->class->headers[2]
 		);
 
-		$this->assertRegexp('/Expires/',$this->class->headers[3][0]);
+		$this->assertRegexp('/Expires/', $this->class->headers[3][0]);
 
-		$this->assertRegexp('/Last-Modified/',$this->class->headers[4][0]);
+		$this->assertRegexp('/Last-Modified/', $this->class->headers[4][0]);
 
 		$this->assertEquals(
 			array('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null),
diff --git a/tests/unit/suites/libraries/joomla/archive/JArchiveTest.php b/tests/unit/suites/libraries/joomla/archive/JArchiveTest.php
index 2a6d0e5c8dd48..4cfdcc61dce72 100644
--- a/tests/unit/suites/libraries/joomla/archive/JArchiveTest.php
+++ b/tests/unit/suites/libraries/joomla/archive/JArchiveTest.php
@@ -63,7 +63,7 @@ public function testExtractGzip()
 			$this->markTestSkipped('Gzip files can not be extracted.');
 		}
 
-		// we need a configuration with a tmp_path set
+		// We need a configuration with a tmp_path set
 		$config = JFactory::$config;
 		$config->set('tmp_path', __DIR__ . '/output');
 
@@ -83,7 +83,7 @@ public function testExtractBzip2()
 			$this->markTestSkipped('Bzip2 files can not be extracted.');
 		}
 
-		// we need a configuration with a tmp_path set
+		// We need a configuration with a tmp_path set
 		$config = JFactory::$config;
 		$config->set('tmp_path', __DIR__ . '/output');
 
@@ -100,7 +100,6 @@ public function testExtractBzip2()
 	 */
 	public function testExtractUnknownType()
 	{
-
 		JArchive::extract(__DIR__ . '/unknown.type', $this->outputPath);
 	}
 
diff --git a/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php b/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
index 3021783c5f5a7..08f9bedc18946 100644
--- a/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
+++ b/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
@@ -61,7 +61,7 @@ protected function tearDown()
 	{
 		if (is_dir($this->outputPath))
 		{
-			// delete files in output directory
+			// Delete files in output directory
 			foreach (glob("{$this->outputPath}/*") as $file)
 			{
 				unlink($file);
diff --git a/tests/unit/suites/libraries/joomla/database/JDatabaseQueryTest.php b/tests/unit/suites/libraries/joomla/database/JDatabaseQueryTest.php
index 2882b54087030..4a7d86e203693 100644
--- a/tests/unit/suites/libraries/joomla/database/JDatabaseQueryTest.php
+++ b/tests/unit/suites/libraries/joomla/database/JDatabaseQueryTest.php
@@ -2014,7 +2014,7 @@ protected function tearDown()
 	public function seedDateAdd()
 	{
 		return array(
-			// date, interval, datepart, expected
+			// Elements: date, interval, datepart, expected
 			'Add date'		=> array('2008-12-31', '1', 'DAY', "DATE_ADD('2008-12-31', INTERVAL 1 DAY)"),
 			'Subtract date'	=> array('2008-12-31', '-1', 'DAY', "DATE_ADD('2008-12-31', INTERVAL -1 DAY)"),
 			'Add datetime'	=> array('2008-12-31 23:59:59', '1', 'DAY', "DATE_ADD('2008-12-31 23:59:59', INTERVAL 1 DAY)"),
diff --git a/tests/unit/suites/libraries/joomla/form/field/JFormFieldModuleLayoutTest.php b/tests/unit/suites/libraries/joomla/form/field/JFormFieldModuleLayoutTest.php
index b02983f516cc2..541c879ba7853 100644
--- a/tests/unit/suites/libraries/joomla/form/field/JFormFieldModuleLayoutTest.php
+++ b/tests/unit/suites/libraries/joomla/form/field/JFormFieldModuleLayoutTest.php
@@ -35,7 +35,7 @@ protected function getDataSet()
 	 */
 	public function testGetInput()
 	{
-		$field = new JFormFieldModulelayout();
+		$field = new JFormFieldModulelayout;
 		$field->setup(
 			new SimpleXmlElement('<field name="modulelayout" type="modulelayout" module="mod_finder" client_id="0" />'),
 			'value'
diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldFileListTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldFileListTest.php
index 153d23c75c1e4..8a4d9e2658428 100644
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldFileListTest.php
+++ b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldFileListTest.php
@@ -48,6 +48,7 @@ public function testGetInput()
 			$this->greaterThan(0),
 			'Line:' . __LINE__ . ' The getInput method should return something without error.'
 		);
+
 		// TODO: Should check all the attributes have come in properly.
 	}
 }
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubPackageUsersTest.php b/tests/unit/suites/libraries/joomla/github/JGithubPackageUsersTest.php
index 0bf60c091a499..454b90e056bdc 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubPackageUsersTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubPackageUsersTest.php
@@ -364,7 +364,7 @@ public function testEditFailure()
 			->with('/user', $input, 0, 0)
 			->will($this->returnValue($this->response));
 
-		//$this->object->edit($name, $email, $blog, $company, $location, $hireable, $bio);
+		// $this->object->edit($name, $email, $blog, $company, $location, $hireable, $bio);
 
 
 		$this->assertThat(
diff --git a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php
index 03f2696fbca66..7e033180a7605 100644
--- a/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/repositories/JGithubPackageRepositoriesDownloadsTest.php
@@ -129,7 +129,7 @@ public function testUpload()
 			->will($this->returnValue($this->response));
 
 		$this->assertThat(
-			$this->object->upload('joomla', 'joomla-platform', 123, 'a/b/aaa.zip', 'acl', 201, 'aaa.zip', '123abc', '123abc', '123abc','content_type', '@aaa.zip'),
+			$this->object->upload('joomla', 'joomla-platform', 123, 'a/b/aaa.zip', 'acl', 201, 'aaa.zip', '123abc', '123abc', '123abc', 'content_type', '@aaa.zip'),
 			$this->equalTo($this->response->body)
 		);
 	}
diff --git a/tests/unit/suites/libraries/joomla/google/JGoogleAuthOauth2Test.php b/tests/unit/suites/libraries/joomla/google/JGoogleAuthOauth2Test.php
index 7df2eab521dc5..61d5763624861 100644
--- a/tests/unit/suites/libraries/joomla/google/JGoogleAuthOauth2Test.php
+++ b/tests/unit/suites/libraries/joomla/google/JGoogleAuthOauth2Test.php
@@ -45,7 +45,6 @@ class JGoogleAuthOauth2Test extends TestCase
 	 */
 	protected $object;
 
-
 	/**
 	 * Code that the app closes with.
 	 *
diff --git a/tests/unit/suites/libraries/joomla/image/JImageTest.php b/tests/unit/suites/libraries/joomla/image/JImageTest.php
index 32d066f9314e7..8d85ee4aad814 100644
--- a/tests/unit/suites/libraries/joomla/image/JImageTest.php
+++ b/tests/unit/suites/libraries/joomla/image/JImageTest.php
@@ -384,7 +384,7 @@ public function testToFileInvalid()
 	 */
 	public function testToFileGif()
 	{
-		$outFileGif = JPATH_TESTS . '/tmp/' . uniqid() .'.gif';
+		$outFileGif = JPATH_TESTS . '/tmp/' . uniqid() . '.gif';
 
 		$image = new JImageInspector($this->testFile);
 		$image->toFile($outFileGif, IMAGETYPE_GIF);
@@ -419,7 +419,7 @@ public function testToFileGif()
 	 */
 	public function testToFilePng()
 	{
-		$outFilePng = JPATH_TESTS . '/tmp/' . uniqid() .'.png';
+		$outFilePng = JPATH_TESTS . '/tmp/' . uniqid() . '.png';
 
 		$image = new JImageInspector($this->testFile);
 		$image->toFile($outFilePng, IMAGETYPE_PNG);
@@ -455,7 +455,7 @@ public function testToFilePng()
 	public function testToFileJpg()
 	{
 		// Write the file out to a JPG.
-		$outFileJpg = JPATH_TESTS . '/tmp/' . uniqid() .'.jpg';
+		$outFileJpg = JPATH_TESTS . '/tmp/' . uniqid() . '.jpg';
 
 		$image = new JImageInspector($this->testFile);
 		$image->toFile($outFileJpg, IMAGETYPE_JPEG);
@@ -490,7 +490,7 @@ public function testToFileJpg()
 	public function testToFileDefault()
 	{
 		// Write the file out to a JPG.
-		$outFileDefault = JPATH_TESTS . '/tmp/' . uniqid() .'.default';
+		$outFileDefault = JPATH_TESTS . '/tmp/' . uniqid() . '.default';
 
 		$image = new JImageInspector($this->testFile);
 		$image->toFile($outFileDefault);
diff --git a/tests/unit/suites/libraries/joomla/input/JInputCliTest.php b/tests/unit/suites/libraries/joomla/input/JInputCliTest.php
index e78f85faa61c6..bfba9751a083f 100644
--- a/tests/unit/suites/libraries/joomla/input/JInputCliTest.php
+++ b/tests/unit/suites/libraries/joomla/input/JInputCliTest.php
@@ -73,7 +73,7 @@ public function provider_parseArguments()
 	{
 		return array(
 
-			// php test.php --foo --bar=baz
+			// Represents: php test.php --foo --bar=baz
 			array(
 				array('test.php', '--foo', '--bar=baz'),
 				array(
@@ -83,7 +83,7 @@ public function provider_parseArguments()
 				array()
 			),
 
-			// php test.php -abc
+			// Represents: php test.php -abc
 			array(
 				array('test.php', '-abc'),
 				array(
@@ -94,7 +94,7 @@ public function provider_parseArguments()
 				array()
 			),
 
-			// php test.php arg1 arg2 arg3
+			// Represents: php test.php arg1 arg2 arg3
 			array(
 				array('test.php', 'arg1', 'arg2', 'arg3'),
 				array(),
@@ -105,7 +105,7 @@ public function provider_parseArguments()
 				)
 			),
 
-			// php test.php plain-arg --foo --bar=baz --funny="spam=eggs" --also-funny=spam=eggs \
+			// Represents: php test.php plain-arg --foo --bar=baz --funny="spam=eggs" --also-funny=spam=eggs \
 			//      'plain arg 2' -abc -k=value "plain arg 3" --s="original" --s='overwrite' --s
 			array(
 				array('test.php', 'plain-arg', '--foo', '--bar=baz', '--funny=spam=eggs', '--also-funny=spam=eggs',
@@ -128,7 +128,7 @@ public function provider_parseArguments()
 				)
 			),
 
-			// php test.php --key value -abc not-c-value
+			// Represents: php test.php --key value -abc not-c-value
 			array(
 				array('test.php', '--key', 'value', '-abc', 'not-c-value'),
 				array(
@@ -142,7 +142,7 @@ public function provider_parseArguments()
 				)
 			),
 
-			// php test.php --key1 value1 -a --key2 -b b-value --c
+			// Represents: php test.php --key1 value1 -a --key2 -b b-value --c
 			array(
 				array('test.php', '--key1', 'value1', '-a', '--key2', '-b', 'b-value', '--c'),
 				array(
diff --git a/tests/unit/suites/libraries/joomla/session/handler/array.php b/tests/unit/suites/libraries/joomla/session/handler/array.php
index efab71fd9bdc9..a71d793b16e0a 100644
--- a/tests/unit/suites/libraries/joomla/session/handler/array.php
+++ b/tests/unit/suites/libraries/joomla/session/handler/array.php
@@ -80,11 +80,13 @@ public function setSessionData(array $array)
 	 */
 	public function start()
 	{
-		if ($this->started && !$this->closed) {
+		if ($this->started && !$this->closed)
+		{
 			return true;
 		}
 
-		if (empty($this->id)) {
+		if (empty($this->id))
+		{
 			$this->setId($this->generateId());
 		}
 
@@ -149,7 +151,8 @@ public function getId()
 	 */
 	public function setId($id)
 	{
-		if ($this->started) {
+		if ($this->started)
+		{
 			throw new LogicException('Cannot set session ID after the session has started.');
 		}
 
@@ -202,10 +205,12 @@ public function setName($name)
 	 */
 	public function save()
 	{
-		if (!$this->started || $this->closed) {
+		if (!$this->started || $this->closed)
+		{
 			throw new \RuntimeException("Trying to save a session that was not started yet or was already closed");
 		}
-		// nothing to do since we don't persist the session data
+
+		// Nothing to do since we don't persist the session data
 		$this->closed = false;
 		$this->started = false;
 	}
@@ -219,7 +224,7 @@ public function save()
 	 */
 	public function clear()
 	{
-		// clear out the session
+		// Clear out the session
 		$this->data = array();
 	}
 
diff --git a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
index ab5a354f4adbd..ae44fed4df8be 100644
--- a/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
+++ b/tests/unit/suites/libraries/joomla/user/JUserHelperTest.php
@@ -357,6 +357,7 @@ public function testVerifyPassword()
 		);
 
 		$password = 'mySuperSecretPassword';
+
 		// Generate the old style password hash used before phpass was implemented.
 		$salt		= JUserHelper::genRandomPassword(32);
 		$crypted	= JUserHelper::getCryptedPassword($password, $salt);
@@ -520,7 +521,8 @@ public function testGetCryptedPassword()
 	 */
 	public function testGetCryptedPasswordWithMhash()
 	{
-		if (!function_exists('mhash')) {
+		if (!function_exists('mhash'))
+		{
 			$this->markTestSkipped('The mhash function is not available');
 		}
 
diff --git a/tests/unit/suites/libraries/joomla/view/JViewHtmlTest.php b/tests/unit/suites/libraries/joomla/view/JViewHtmlTest.php
index 3354787e155b7..7c50de3cf06e8 100644
--- a/tests/unit/suites/libraries/joomla/view/JViewHtmlTest.php
+++ b/tests/unit/suites/libraries/joomla/view/JViewHtmlTest.php
@@ -111,7 +111,8 @@ public function testGetPath()
 		$this->assertEquals(realpath(__DIR__ . '/layouts1/peter.php'), $this->_instance->getPath('peter'));
 		$this->assertEquals(realpath(__DIR__ . '/layouts2/fauxlivia.php'), $this->_instance->getPath('fauxlivia'));
 		$this->assertEquals(realpath(__DIR__ . '/layouts1/fringe/division.php'), $this->_instance->getPath('fringe/division'));
-		//$this->assertEquals(realpath(__DIR__ . '/layouts1/astrid.phtml'), $this->_instance->getPath('astrid', 'phtml'));
+
+		// $this->assertEquals(realpath(__DIR__ . '/layouts1/astrid.phtml'), $this->_instance->getPath('astrid', 'phtml'));
 		$this->assertFalse($this->_instance->getPath('walter'));
 
 		// Check dirty path.
diff --git a/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php b/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
index 12f29b441a7bf..7ce4c4b31af8a 100644
--- a/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
+++ b/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
@@ -38,7 +38,7 @@ public function setup()
 		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$session = $this->getMockSession();
 
-		// force the cloak JS inline so that we can unit test it easier than messing with script head in document
+		// Force the cloak JS inline so that we can unit test it easier than messing with script head in document
 		JFactory::getApplication()->input->server->set('HTTP_X_REQUESTED_WITH', 'xmlhttprequest');
 
 		/**
@@ -84,7 +84,7 @@ public function dataTestOnContentPrepare()
 				 */
 				'this should not be parsed as it has no (at) sign in it - see what I did there? ;)',
 
-				// this third row is the full output of the cloak with inline javascript mode enabled
+				// This third row is the full output of the cloak with inline javascript mode enabled
 				''
 
 			),
@@ -356,64 +356,58 @@ public function dataTestOnContentPrepare()
 	/**
 	 * Tests PlgContentEmailcloakTest::_cloak()
 	 *
-	 * @param   string $input The text to test.
-	 * @param   string $expected The expectation of the filtering.
+	 * @param   string  $input         The text to test.
+	 * @param   string  $expectedHTML  The expectation of the filtering.
+	 * @param   string  $expectedJs    The expected javascript
 	 *
 	 * @return  void
 	 *
 	 * @dataProvider  dataTestOnContentPrepare
 	 * @since         3.6.2
 	 */
-	public function testOnContentPrepareWithRowNoFinder($input, $expectedHTML = NULL, $expectedJs)
+	public function testOnContentPrepareWithRowNoFinder($input, $expectedHTML, $expectedJs)
 	{
 		$row = new \stdClass;
 		$row->text = $input;
 		$params = new JRegistry;
 
-		// assert we have the correct event
+		// Assert we have the correct event
 		$this->assertInstanceOf('PlgContentEmailcloak', $this->class);
 
-		// assert that we are getting a clean process
+		// Assert that we are getting a clean process
 		$res = $this->class->onContentPrepare('com_content.article', $row, $params);
 		$this->assertEquals(1, $res);
 
-
 		// Get the md5 hash
 		preg_match("/addy_text([0-9a-z]{32})/", $row->text, $output_array);
 
 		// If we did some cloaking then test the JS
-		if (count($output_array)) {
+		if (count($output_array))
+		{
 			$hash = $output_array[1];
 
-			// assert the JLIB_HTML_CLOAKING span is intact
+			// Assert the JLIB_HTML_CLOAKING span is intact
 			$this->assertRegExp('/\<span\sid\=\"cloak[0-9a-z]{32}\"\>JLIB_HTML_CLOAKING\<\/span\>/', $row->text);
 			$cloakHTML = '<span id="cloak' . $hash . '">JLIB_HTML_CLOAKING</span>';
 			$this->assertContains($cloakHTML, $row->text);
 
+			// Need to do this to overcome whitespace comparison issue in phpunit for some reason...
+			preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $row->text, $innerJS);
+			$result = trim($innerJS[1][0]);
 
-			if ($expectedJs) {
-				// need to do this to overcome whitespace comparison issue in phpunit for some reason...
-				preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $row->text, $innerJS);
-				$result = trim($innerJS[1][0]);
-
-				preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $expectedJs, $innerJS);
-				$expected = trim($innerJS[1][0]);
-
-				// assert the render is as the expected render with injected hash
-				$this->assertEquals(trim(str_replace('__HASH__', $hash, $expected)), $result);
-
-				if (null !== $expectedHTML) {
-					$html = $this->convertJStoHTML($result, $hash);
-					$this->assertEquals($html, $expectedHTML);
-				}
-			}
+			preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $expectedJs, $innerJS);
+			$expected = trim($innerJS[1][0]);
 
+			// Assert the render is as the expected render with injected hash
+			$this->assertEquals(trim(str_replace('__HASH__', $hash, $expected)), $result);
 
-		} else {
-
-			// ok we never cloaked an email but lets ensure we did not screw up the article text anyway!
+			$html = $this->convertJStoHTML($result, $hash);
+			$this->assertEquals($html, $expectedHTML);
+		}
+		else
+		{
+			// We never cloaked an email but lets ensure we did not screw up the article text anyway!
 			$this->assertEquals($expectedHTML, $row->text);
-
 		}
 	}
 
@@ -448,14 +442,17 @@ private function convertJStoHTML($js, $hash)
 			sprintf('$addy%s .', $hash),
 			$js);
 
-		// because with all those replaces, you and I will need this a lot :)
-		if (true === $debug) {
+		// Because with all those replaces, you and I will need this a lot :)
+		if (true === $debug)
+		{
 			echo "\n\n" . trim($js) . "\n\n";
 			eval($js);
 			echo "\n\n";
 			var_dump(trim($resultantHTML));
 			die;
-		} else {
+		}
+		else
+		{
 			// EVAL IS EVIL - I know - but here its not a security risk, and is 'ok'-ish.
 			eval($js);
 		}
@@ -472,10 +469,10 @@ public function testIndexer()
 		$row = 'test string';
 		$params = new JRegistry;
 
-		// assert we have the correct event
+		// Assert we have the correct event
 		$this->assertInstanceOf('PlgContentEmailcloak', $this->class);
 
-		// assert that we are getting a clean process
+		// Assert that we are getting a clean process
 		$res = $this->class->onContentPrepare('com_finder.indexer', $row, $params);
 		$this->assertEquals(1, $res);
 		$this->assertEquals('test string', $row);

From 51c2bbc60cbbf0dd06c77cf6c2f4c5f8769c53e7 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Wed, 26 Jul 2017 14:43:44 +0100
Subject: [PATCH 070/148] Fix code style issues

---
 tests/unit/suites/libraries/joomla/JLoaderTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/JLoaderTest.php b/tests/unit/suites/libraries/joomla/JLoaderTest.php
index da2e6289e174c..eca44fe2a2cbb 100644
--- a/tests/unit/suites/libraries/joomla/JLoaderTest.php
+++ b/tests/unit/suites/libraries/joomla/JLoaderTest.php
@@ -241,8 +241,8 @@ public function testLoadOverrideAliasClass()
 		$this->assertTrue(class_exists('AliasNewClass'));
 		$this->assertTrue(class_exists('AliasOldClass'));
 
-		$newClass = new AliasNewClass();
-		$oldClass = new AliasOldClass();
+		$newClass = new AliasNewClass;
+		$oldClass = new AliasOldClass;
 
 		// Check if really the override is used
 		$this->assertEquals('Alias Override Class', $newClass->getName());
@@ -271,8 +271,8 @@ public function testLoadOverrideOriginalClass()
 		$this->assertTrue(class_exists('OriginalNewClass'));
 		$this->assertTrue(class_exists('OriginalOldClass'));
 
-		$newClass = new OriginalNewClass();
-		$oldClass = new OriginalOldClass();
+		$newClass = new OriginalNewClass;
+		$oldClass = new OriginalOldClass;
 
 		// Check if really the override is used
 		$this->assertEquals('Original Override Class', $newClass->getName());

From 817a29bb3f65bb41aeb6dadc8671453904b85a3d Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Wed, 26 Jul 2017 19:33:30 +0530
Subject: [PATCH 071/148] Namespace mismatch fix (#17273)

Please make this quick. We need to fix these all over the CMS, 3.8 branch has lot of similar conflicts and not they are all in staging.
---
 libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php b/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php
index c4deab4eb7af5..2f7db0c4fe6e5 100644
--- a/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php
+++ b/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php
@@ -110,12 +110,12 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 
 				if (isset($clientName))
 				{
-					$client = JApplicationHelper::getClientInfo($clientName, true);
+					$client = \JApplicationHelper::getClientInfo($clientName, true);
 					$clientId = $client->id;
 				}
 			}
 
-			if (!isset($clientId) && $this->form instanceof JForm)
+			if (!isset($clientId) && $this->form instanceof \JForm)
 			{
 				$clientId = $this->form->getValue('client_id');
 			}
@@ -209,7 +209,7 @@ protected function getTemplateModuleStyles()
 	/**
 	 * Method to get the system template as an object.
 	 *
-	 * @return  array  The object of system template.
+	 * @return  \stdClass  The object of system template.
 	 *
 	 * @since   3.0
 	 */

From b0f5e1b845d32f29f32d00ac9ada15ea833a4a2e Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Wed, 26 Jul 2017 20:56:35 +0530
Subject: [PATCH 072/148] Namespace and datatype mismatch in namespace joomla
 library (#17280)

---
 libraries/src/Joomla/CMS/Access/Wrapper/Access.php   |  5 +++--
 .../src/Joomla/CMS/Cache/Storage/RedisStorage.php    |  2 +-
 libraries/src/Joomla/CMS/Controller/Controller.php   |  6 +++---
 libraries/src/Joomla/CMS/Controller/Form.php         |  8 ++++----
 .../CMS/Form/Field/LastvisitDateRangeField.php       |  1 +
 .../CMS/Form/Field/RegistrationDateRangeField.php    |  1 +
 .../src/Joomla/CMS/Form/Field/UserActiveField.php    |  1 +
 libraries/src/Joomla/CMS/Form/Form.php               |  4 ++--
 libraries/src/Joomla/CMS/Form/Rule/EqualsRule.php    |  4 ++--
 libraries/src/Joomla/CMS/Helper/ContentHelper.php    |  2 +-
 libraries/src/Joomla/CMS/Helper/TagsHelper.php       |  4 ++--
 libraries/src/Joomla/CMS/Http/HttpFactory.php        |  4 ++--
 .../src/Joomla/CMS/Http/Transport/CurlTransport.php  |  6 +++---
 .../Joomla/CMS/Http/Transport/SocketTransport.php    |  8 ++++----
 .../Joomla/CMS/Http/Transport/StreamTransport.php    |  6 +++---
 .../src/Joomla/CMS/Http/Wrapper/FactoryWrapper.php   |  8 +++++---
 libraries/src/Joomla/CMS/Input/Input.php             | 12 ++++++------
 .../CMS/Installer/Adapter/ComponentAdapter.php       | 12 ++++++------
 .../Joomla/CMS/Installer/Adapter/ModuleAdapter.php   |  2 +-
 .../src/Joomla/CMS/Language/Wrapper/JTextWrapper.php |  2 +-
 libraries/src/Joomla/CMS/Menu/MenuItem.php           |  2 +-
 libraries/src/Joomla/CMS/Table/Nested.php            |  2 +-
 .../Joomla/CMS/Table/Observer/AbstractObserver.php   |  1 +
 .../src/Joomla/CMS/Table/Observer/ContentHistory.php |  2 +-
 libraries/src/Joomla/CMS/Table/Observer/Tags.php     |  2 +-
 libraries/src/Joomla/CMS/Table/Table.php             |  8 ++++----
 libraries/src/Joomla/CMS/Table/Usergroup.php         |  4 ++--
 libraries/src/Joomla/CMS/Toolbar/Toolbar.php         |  2 +-
 libraries/src/Joomla/CMS/Toolbar/ToolbarButton.php   |  2 +-
 libraries/src/Joomla/CMS/UCM/UCMBase.php             |  2 +-
 libraries/src/Joomla/CMS/Updater/Update.php          |  2 +-
 libraries/src/Joomla/CMS/View/CategoryFeed.php       |  2 +-
 libraries/src/Joomla/CMS/View/HtmlView.php           |  4 ++--
 33 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Access/Wrapper/Access.php b/libraries/src/Joomla/CMS/Access/Wrapper/Access.php
index 72e404fa359d3..d68374f7431f8 100644
--- a/libraries/src/Joomla/CMS/Access/Wrapper/Access.php
+++ b/libraries/src/Joomla/CMS/Access/Wrapper/Access.php
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Access\Access as StaticAccess;
+use Joomla\CMS\Access\Rules as AccessRules;
 
 /**
  * Wrapper class for Access
@@ -174,8 +175,8 @@ public function getActionsFromFile($file, $xpath = '/access/section[@name=\'comp
 	/**
 	 * Helper wrapper method for getActionsFromData
 	 *
-	 * @param   string|SimpleXMLElement  $data   The XML string or an XML element.
-	 * @param   string                   $xpath  An optional xpath to search for the fields.
+	 * @param   string|\SimpleXMLElement  $data   The XML string or an XML element.
+	 * @param   string                    $xpath  An optional xpath to search for the fields.
 	 *
 	 * @return  boolean|array   False if case of error or the list of actions available.
 	 *
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/RedisStorage.php b/libraries/src/Joomla/CMS/Cache/Storage/RedisStorage.php
index 3879531a97a1b..febed02ab33f9 100644
--- a/libraries/src/Joomla/CMS/Cache/Storage/RedisStorage.php
+++ b/libraries/src/Joomla/CMS/Cache/Storage/RedisStorage.php
@@ -136,7 +136,7 @@ protected function getConnection()
 
 			if ($app->isClient('administrator'))
 			{
-				JError::raiseWarning(500, 'Redis failed to select database');
+				\JError::raiseWarning(500, 'Redis failed to select database');
 			}
 
 			return false;
diff --git a/libraries/src/Joomla/CMS/Controller/Controller.php b/libraries/src/Joomla/CMS/Controller/Controller.php
index f0a2c105114e1..fc7fedb687366 100644
--- a/libraries/src/Joomla/CMS/Controller/Controller.php
+++ b/libraries/src/Joomla/CMS/Controller/Controller.php
@@ -119,7 +119,7 @@ class Controller extends \JObject
 	/**
 	 * Hold a JInput object for easier access to the input variables.
 	 *
-	 * @var    JInput
+	 * @var    \JInput
 	 * @since  3.0
 	 */
 	protected $input;
@@ -127,7 +127,7 @@ class Controller extends \JObject
 	/**
 	 * Instance container.
 	 *
-	 * @var    JControllerLegacy
+	 * @var    \JControllerLegacy
 	 * @since  3.0
 	 */
 	protected static $instance;
@@ -135,7 +135,7 @@ class Controller extends \JObject
 	/**
 	 * Instance container containing the views.
 	 *
-	 * @var    JViewLegacy[]
+	 * @var    \JViewLegacy[]
 	 * @since  3.4
 	 */
 	protected static $views;
diff --git a/libraries/src/Joomla/CMS/Controller/Form.php b/libraries/src/Joomla/CMS/Controller/Form.php
index 333abaf3771a8..53486ec73a707 100644
--- a/libraries/src/Joomla/CMS/Controller/Form.php
+++ b/libraries/src/Joomla/CMS/Controller/Form.php
@@ -853,9 +853,9 @@ public function save($key = null, $urlVar = null)
 	public function reload($key = null, $urlVar = null)
 	{
 		// Check for request forgeries.
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
 
-		$app     = JFactory::getApplication();
+		$app     = \JFactory::getApplication();
 		$model   = $this->getModel();
 		$data    = $this->input->post->get('jform', array(), 'array');
 
@@ -876,7 +876,7 @@ public function reload($key = null, $urlVar = null)
 		if (!$this->allowEdit($data, $key))
 		{
 			$this->setRedirect(
-				JRoute::_(
+				\JRoute::_(
 					'index.php?option=' . $this->option . '&view=' . $this->view_list
 					. $this->getRedirectToListAppend(), false
 				)
@@ -888,7 +888,7 @@ public function reload($key = null, $urlVar = null)
 		$data[$key] = $recordId;
 
 		// The redirect url
-		$redirectUrl = JRoute::_(
+		$redirectUrl = \JRoute::_(
 			'index.php?option=' . $this->option . '&view=' . $this->view_item .
 			$this->getRedirectToItemAppend($recordId, $urlVar),
 			false
diff --git a/libraries/src/Joomla/CMS/Form/Field/LastvisitDateRangeField.php b/libraries/src/Joomla/CMS/Form/Field/LastvisitDateRangeField.php
index 6832174a05310..f3c79b81110f9 100644
--- a/libraries/src/Joomla/CMS/Form/Field/LastvisitDateRangeField.php
+++ b/libraries/src/Joomla/CMS/Form/Field/LastvisitDateRangeField.php
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 
 FormHelper::loadFieldClass('predefinedlist');
diff --git a/libraries/src/Joomla/CMS/Form/Field/RegistrationDateRangeField.php b/libraries/src/Joomla/CMS/Form/Field/RegistrationDateRangeField.php
index 8a904d10ec046..eeb70ab9031f4 100644
--- a/libraries/src/Joomla/CMS/Form/Field/RegistrationDateRangeField.php
+++ b/libraries/src/Joomla/CMS/Form/Field/RegistrationDateRangeField.php
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 
 FormHelper::loadFieldClass('predefinedlist');
diff --git a/libraries/src/Joomla/CMS/Form/Field/UserActiveField.php b/libraries/src/Joomla/CMS/Form/Field/UserActiveField.php
index d048baef6f1b5..706d066a98aef 100644
--- a/libraries/src/Joomla/CMS/Form/Field/UserActiveField.php
+++ b/libraries/src/Joomla/CMS/Form/Field/UserActiveField.php
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 
 FormHelper::loadFieldClass('predefinedlist');
diff --git a/libraries/src/Joomla/CMS/Form/Form.php b/libraries/src/Joomla/CMS/Form/Form.php
index b535ef71a513c..6faa1c10817e4 100644
--- a/libraries/src/Joomla/CMS/Form/Form.php
+++ b/libraries/src/Joomla/CMS/Form/Form.php
@@ -254,7 +254,7 @@ public function getErrors()
 	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
 	 * @param   mixed   $value  The optional value to use as the default for the field.
 	 *
-	 * @return  JFormField|boolean  The JFormField object for the field or boolean false on error.
+	 * @return  \JFormField|boolean  The JFormField object for the field or boolean false on error.
 	 *
 	 * @since   11.1
 	 */
@@ -1019,7 +1019,7 @@ public function setField(\SimpleXMLElement $element, $group = null, $replace = t
 			$fields = &$this->findGroup($group);
 
 			// If an appropriate fields element was found for the group, add the element.
-			if (isset($fields[0]) && ($fields[0] instanceof SimpleXMLElement))
+			if (isset($fields[0]) && ($fields[0] instanceof \SimpleXMLElement))
 			{
 				self::addNode($fields[0], $element);
 			}
diff --git a/libraries/src/Joomla/CMS/Form/Rule/EqualsRule.php b/libraries/src/Joomla/CMS/Form/Rule/EqualsRule.php
index 68ac9226f8099..463ab4133a2af 100644
--- a/libraries/src/Joomla/CMS/Form/Rule/EqualsRule.php
+++ b/libraries/src/Joomla/CMS/Form/Rule/EqualsRule.php
@@ -37,8 +37,8 @@ class EqualsRule extends FormRule
 	 * @return  boolean  True if the value is valid, false otherwise.
 	 *
 	 * @since   11.1
-	 * @throws  InvalidArgumentException
-	 * @throws  UnexpectedValueException
+	 * @throws  \InvalidArgumentException
+	 * @throws  \UnexpectedValueException
 	 */
 	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
diff --git a/libraries/src/Joomla/CMS/Helper/ContentHelper.php b/libraries/src/Joomla/CMS/Helper/ContentHelper.php
index d718d87b4acdb..1e88357c1e7f0 100644
--- a/libraries/src/Joomla/CMS/Helper/ContentHelper.php
+++ b/libraries/src/Joomla/CMS/Helper/ContentHelper.php
@@ -49,7 +49,7 @@ public static function addSubmenu($vName)
 	 * @param   integer  $id          The item ID.
 	 * @param   string   $assetName   The asset name
 	 *
-	 * @return  JObject
+	 * @return  \JObject
 	 *
 	 * @since   3.1
 	 * @deprecated  3.2  Use ContentHelper::getActions() instead
diff --git a/libraries/src/Joomla/CMS/Helper/TagsHelper.php b/libraries/src/Joomla/CMS/Helper/TagsHelper.php
index 61fca33053fea..2ecbe41e2b1f0 100644
--- a/libraries/src/Joomla/CMS/Helper/TagsHelper.php
+++ b/libraries/src/Joomla/CMS/Helper/TagsHelper.php
@@ -150,7 +150,7 @@ public static function convertPathsToNames($tags)
 				{
 					$aliasesMapper = $db->loadAssocList('alias');
 				}
-				catch (RuntimeException $e)
+				catch (\RuntimeException $e)
 				{
 					return false;
 				}
@@ -393,7 +393,7 @@ public function deleteTagData(TableInterface $table, $contentItemId)
 
 		$result = $this->unTagItem($contentItemId[$key], $table);
 
-		/** @var JTableCorecontent $ucmContentTable */
+		/** @var  \JTableCorecontent $ucmContentTable */
 		$ucmContentTable = Table::getInstance('Corecontent');
 
 		return $result && $ucmContentTable->deleteByContentId($contentItemId[$key], $this->typeAlias);
diff --git a/libraries/src/Joomla/CMS/Http/HttpFactory.php b/libraries/src/Joomla/CMS/Http/HttpFactory.php
index 1ec04ed12472d..7e2bd8ec58c0c 100644
--- a/libraries/src/Joomla/CMS/Http/HttpFactory.php
+++ b/libraries/src/Joomla/CMS/Http/HttpFactory.php
@@ -30,7 +30,7 @@ class HttpFactory
 	 *
 	 * @return  Http      Joomla Http class
 	 *
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 *
 	 * @since   12.1
 	 */
@@ -107,7 +107,7 @@ public static function getHttpTransports()
 		$names = array();
 		$iterator = new \DirectoryIterator(__DIR__ . '/Transport');
 
-		/* @type  $file  DirectoryIterator */
+		/* @type  $file  \DirectoryIterator */
 		foreach ($iterator as $file)
 		{
 			$fileName = $file->getFilename();
diff --git a/libraries/src/Joomla/CMS/Http/Transport/CurlTransport.php b/libraries/src/Joomla/CMS/Http/Transport/CurlTransport.php
index 45fabd738f774..e4aac318e6ac5 100644
--- a/libraries/src/Joomla/CMS/Http/Transport/CurlTransport.php
+++ b/libraries/src/Joomla/CMS/Http/Transport/CurlTransport.php
@@ -35,7 +35,7 @@ class CurlTransport implements TransportInterface
 	 *
 	 * @link    https://secure.php.net/manual/en/function.curl-setopt.php
 	 * @since   11.3
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	public function __construct(Registry $options)
 	{
@@ -60,7 +60,7 @@ public function __construct(Registry $options)
 	 * @return  Response
 	 *
 	 * @since   11.3
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	public function request($method, Uri $uri, $data = null, array $headers = null, $timeout = null, $userAgent = null)
 	{
@@ -249,7 +249,7 @@ public function request($method, Uri $uri, $data = null, array $headers = null,
 	 * @return  Response
 	 *
 	 * @since   11.3
-	 * @throws  UnexpectedValueException
+	 * @throws  \UnexpectedValueException
 	 */
 	protected function getResponse($content, $info)
 	{
diff --git a/libraries/src/Joomla/CMS/Http/Transport/SocketTransport.php b/libraries/src/Joomla/CMS/Http/Transport/SocketTransport.php
index fe92755e4333f..a1c448856272a 100644
--- a/libraries/src/Joomla/CMS/Http/Transport/SocketTransport.php
+++ b/libraries/src/Joomla/CMS/Http/Transport/SocketTransport.php
@@ -40,7 +40,7 @@ class SocketTransport implements TransportInterface
 	 * @param   Registry  $options  Client options object.
 	 *
 	 * @since   11.3
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	public function __construct(Registry $options)
 	{
@@ -65,7 +65,7 @@ public function __construct(Registry $options)
 	 * @return  Response
 	 *
 	 * @since   11.3
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	public function request($method, Uri $uri, $data = null, array $headers = null, $timeout = null, $userAgent = null)
 	{
@@ -177,7 +177,7 @@ public function request($method, Uri $uri, $data = null, array $headers = null,
 	 * @return  Response
 	 *
 	 * @since   11.3
-	 * @throws  UnexpectedValueException
+	 * @throws  \UnexpectedValueException
 	 */
 	protected function getResponse($content)
 	{
@@ -232,7 +232,7 @@ protected function getResponse($content)
 	 * @return  resource  Socket connection resource.
 	 *
 	 * @since   11.3
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	protected function connect(Uri $uri, $timeout = null)
 	{
diff --git a/libraries/src/Joomla/CMS/Http/Transport/StreamTransport.php b/libraries/src/Joomla/CMS/Http/Transport/StreamTransport.php
index 6e5f30d5ba324..675f400ee3791 100644
--- a/libraries/src/Joomla/CMS/Http/Transport/StreamTransport.php
+++ b/libraries/src/Joomla/CMS/Http/Transport/StreamTransport.php
@@ -34,7 +34,7 @@ class StreamTransport implements TransportInterface
 	 * @param   Registry  $options  Client options object.
 	 *
 	 * @since   11.3
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	public function __construct(Registry $options)
 	{
@@ -66,7 +66,7 @@ public function __construct(Registry $options)
 	 * @return  Response
 	 *
 	 * @since   11.3
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	public function request($method, Uri $uri, $data = null, array $headers = null, $timeout = null, $userAgent = null)
 	{
@@ -236,7 +236,7 @@ public function request($method, Uri $uri, $data = null, array $headers = null,
 	 * @return  Response
 	 *
 	 * @since   11.3
-	 * @throws  UnexpectedValueException
+	 * @throws  \UnexpectedValueException
 	 */
 	protected function getResponse(array $headers, $body)
 	{
diff --git a/libraries/src/Joomla/CMS/Http/Wrapper/FactoryWrapper.php b/libraries/src/Joomla/CMS/Http/Wrapper/FactoryWrapper.php
index 06d65c805d51d..ae8906cced08f 100644
--- a/libraries/src/Joomla/CMS/Http/Wrapper/FactoryWrapper.php
+++ b/libraries/src/Joomla/CMS/Http/Wrapper/FactoryWrapper.php
@@ -11,7 +11,9 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\Registry\Registry;
+use Joomla\CMS\Http\Http;
 use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Http\TransportInterface;
 
 /**
  * Wrapper class for HttpFactory
@@ -28,11 +30,11 @@ class FactoryWrapper
 	 * @param   Registry  $options   Client options object.
 	 * @param   mixed     $adapters  Adapter (string) or queue of adapters (array) to use for communication.
 	 *
-	 * @return Http      Joomla Http class
+	 * @return  Http      Joomla Http class
 	 *
 	 * @see     HttpFactory::getHttp()
 	 * @since   3.4
-	 * @throws  RuntimeException
+	 * @throws  \RuntimeException
 	 */
 	public function getHttp(Registry $options = null, $adapters = null)
 	{
@@ -45,7 +47,7 @@ public function getHttp(Registry $options = null, $adapters = null)
 	 * @param   Registry  $options  Option for creating http transport object.
 	 * @param   mixed     $default  Adapter (string) or queue of adapters (array) to use.
 	 *
-	 * @return HttpTransport Interface sub-class
+	 * @return  TransportInterface  Interface sub-class
 	 *
 	 * @see     HttpFactory::getAvailableDriver()
 	 * @since   3.4
diff --git a/libraries/src/Joomla/CMS/Input/Input.php b/libraries/src/Joomla/CMS/Input/Input.php
index b88e2ce9bc116..55c8e45b1ff4d 100644
--- a/libraries/src/Joomla/CMS/Input/Input.php
+++ b/libraries/src/Joomla/CMS/Input/Input.php
@@ -20,12 +20,12 @@
  * @since       11.1
  * @deprecated  5.0  Use Joomla\Input\Input instead
  *
- * @property-read    Input        $get
- * @property-read    Input        $post
- * @property-read    Input        $request
- * @property-read    Input        $server
- * @property-read    InputFiles   $files
- * @property-read    InputCookie  $cookie
+ * @property-read   Input   $get
+ * @property-read   Input   $post
+ * @property-read   Input   $request
+ * @property-read   Input   $server
+ * @property-read   Files   $files
+ * @property-read   Cookie  $cookie
  */
 class Input extends \Joomla\Input\Input
 {
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/ComponentAdapter.php b/libraries/src/Joomla/CMS/Installer/Adapter/ComponentAdapter.php
index 0f14e6356e017..aebee1379230f 100644
--- a/libraries/src/Joomla/CMS/Installer/Adapter/ComponentAdapter.php
+++ b/libraries/src/Joomla/CMS/Installer/Adapter/ComponentAdapter.php
@@ -703,7 +703,7 @@ public function uninstall($id)
 		 */
 		if ($this->extension->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($this->extension->package_id))
 		{
-			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $this->extension->name), JLog::WARNING, 'jerror');
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $this->extension->name), \JLog::WARNING, 'jerror');
 
 			return false;
 		}
@@ -1105,7 +1105,7 @@ protected function _removeAdminMenus($id)
 	{
 		$db = $this->parent->getDbo();
 
-		/** @var  JTableMenu  $table */
+		/** @var  \JTableMenu  $table */
 		$table = Table::getInstance('menu');
 
 		// Get the ids of the menu items
@@ -1318,7 +1318,7 @@ protected function _createAdminMenuItem(array &$data, $parentId)
 	{
 		$db = $this->parent->getDbo();
 
-		/** @var  JTableMenu  $table */
+		/** @var  \JTableMenu  $table */
 		$table  = Table::getInstance('menu');
 
 		try
@@ -1327,7 +1327,7 @@ protected function _createAdminMenuItem(array &$data, $parentId)
 		}
 		catch (\InvalidArgumentException $e)
 		{
-			JLog::add($e->getMessage(), JLog::WARNING, 'jerror');
+			\JLog::add($e->getMessage(), \JLog::WARNING, 'jerror');
 
 			return false;
 		}
@@ -1351,13 +1351,13 @@ protected function _createAdminMenuItem(array &$data, $parentId)
 			if (!$menu_id)
 			{
 				// Oops! Could not get the menu ID. Go back and rollback changes.
-				JError::raiseWarning(1, $table->getError());
+				\JError::raiseWarning(1, $table->getError());
 
 				return false;
 			}
 			else
 			{
-				/** @var  JTableMenu $temporaryTable */
+				/** @var  \JTableMenu $temporaryTable */
 				$temporaryTable = Table::getInstance('menu');
 				$temporaryTable->delete($menu_id, true);
 				$temporaryTable->rebuild($data['parent_id']);
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/ModuleAdapter.php b/libraries/src/Joomla/CMS/Installer/Adapter/ModuleAdapter.php
index 1dea56f6af1bc..a4ac9bb8a2754 100644
--- a/libraries/src/Joomla/CMS/Installer/Adapter/ModuleAdapter.php
+++ b/libraries/src/Joomla/CMS/Installer/Adapter/ModuleAdapter.php
@@ -408,7 +408,7 @@ protected function storeExtension()
 			// Create unpublished module
 			$name = preg_replace('#[\*?]#', '', \JText::_($this->name));
 
-			/** @var JTableModule $module */
+			/** @var \JTableModule $module */
 			$module            = Table::getInstance('module');
 			$module->title     = $name;
 			$module->content   = '';
diff --git a/libraries/src/Joomla/CMS/Language/Wrapper/JTextWrapper.php b/libraries/src/Joomla/CMS/Language/Wrapper/JTextWrapper.php
index ce096f449bbb9..9a1e02fb47389 100644
--- a/libraries/src/Joomla/CMS/Language/Wrapper/JTextWrapper.php
+++ b/libraries/src/Joomla/CMS/Language/Wrapper/JTextWrapper.php
@@ -93,7 +93,7 @@ public function sprintf($string)
 	/**
 	 * Helper wrapper method for printf
 	 *
-	 * @param   format  $string  The format string.
+	 * @param   string  $string  The format string.
 	 *
 	 * @return  mixed
 	 *
diff --git a/libraries/src/Joomla/CMS/Menu/MenuItem.php b/libraries/src/Joomla/CMS/Menu/MenuItem.php
index 8f0381a58c98a..e463c13715685 100644
--- a/libraries/src/Joomla/CMS/Menu/MenuItem.php
+++ b/libraries/src/Joomla/CMS/Menu/MenuItem.php
@@ -282,7 +282,7 @@ public function getParams()
 			{
 				$this->params = new Registry($this->params);
 			}
-			catch (RuntimeException $e)
+			catch (\RuntimeException $e)
 			{
 				/*
 				 * Joomla shipped with a broken sample json string for 4 years which caused fatals with new
diff --git a/libraries/src/Joomla/CMS/Table/Nested.php b/libraries/src/Joomla/CMS/Table/Nested.php
index 7a255b8d335e2..48f29a10c7995 100644
--- a/libraries/src/Joomla/CMS/Table/Nested.php
+++ b/libraries/src/Joomla/CMS/Table/Nested.php
@@ -1507,7 +1507,7 @@ public function saveorder($idArray = null, $lft_array = null)
 	 * @return  boolean  True on success.
 	 *
 	 * @since   3.7.0
-	 * @throws  RuntimeException on database error.
+	 * @throws  \RuntimeException on database error.
 	 */
 	protected function recursiveUpdatePublishedColumn($pk, $newState = null)
 	{
diff --git a/libraries/src/Joomla/CMS/Table/Observer/AbstractObserver.php b/libraries/src/Joomla/CMS/Table/Observer/AbstractObserver.php
index 4ecab25aac0c7..60e62455987de 100644
--- a/libraries/src/Joomla/CMS/Table/Observer/AbstractObserver.php
+++ b/libraries/src/Joomla/CMS/Table/Observer/AbstractObserver.php
@@ -9,6 +9,7 @@
 namespace Joomla\CMS\Table\Observer;
 
 use Joomla\CMS\Table\TableInterface;
+use Joomla\CMS\Table\Table;
 
 defined('JPATH_PLATFORM') or die;
 
diff --git a/libraries/src/Joomla/CMS/Table/Observer/ContentHistory.php b/libraries/src/Joomla/CMS/Table/Observer/ContentHistory.php
index c652bfe54d999..140fc1aaa2d32 100644
--- a/libraries/src/Joomla/CMS/Table/Observer/ContentHistory.php
+++ b/libraries/src/Joomla/CMS/Table/Observer/ContentHistory.php
@@ -99,7 +99,7 @@ public function onAfterStore(&$result)
 	 * @return  void
 	 *
 	 * @since   3.2
-	 * @throws  UnexpectedValueException
+	 * @throws  \UnexpectedValueException
 	 */
 	public function onBeforeDelete($pk)
 	{
diff --git a/libraries/src/Joomla/CMS/Table/Observer/Tags.php b/libraries/src/Joomla/CMS/Table/Observer/Tags.php
index 42dffd106fda5..c32114914a43a 100644
--- a/libraries/src/Joomla/CMS/Table/Observer/Tags.php
+++ b/libraries/src/Joomla/CMS/Table/Observer/Tags.php
@@ -148,7 +148,7 @@ public function onAfterStore(&$result)
 	 * @return  void
 	 *
 	 * @since   3.1.2
-	 * @throws  UnexpectedValueException
+	 * @throws  \UnexpectedValueException
 	 */
 	public function onBeforeDelete($pk)
 	{
diff --git a/libraries/src/Joomla/CMS/Table/Table.php b/libraries/src/Joomla/CMS/Table/Table.php
index fa8c947611089..845be14e53a22 100644
--- a/libraries/src/Joomla/CMS/Table/Table.php
+++ b/libraries/src/Joomla/CMS/Table/Table.php
@@ -405,7 +405,7 @@ protected function _getAssetTitle()
 	protected function _getAssetParentId(Table $table = null, $id = null)
 	{
 		// For simple cases, parent to the asset root.
-		/** @var JTableAsset $assets */
+		/** @var  \JTableAsset  $assets */
 		$assets = self::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
 		$rootId = $assets->getRootId();
 
@@ -819,7 +819,7 @@ public function store($updateNulls = false)
 			$name     = $this->_getAssetName();
 			$title    = $this->_getAssetTitle();
 
-			/** @var JTableAsset $asset */
+			/** @var  \JTableAsset  $asset */
 			$asset = self::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
 			$asset->loadByName($name);
 
@@ -983,7 +983,7 @@ public function delete($pk = null)
 		{
 			// Get the asset name
 			$name  = $this->_getAssetName();
-			/** @var JTableAsset $asset */
+			/** @var  \JTableAsset  $asset */
 			$asset = self::getInstance('Asset');
 
 			if ($asset->loadByName($name))
@@ -1598,7 +1598,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			{
 				$this->_db->execute();
 			}
-			catch (RuntimeException $e)
+			catch (\RuntimeException $e)
 			{
 				$this->setError($e->getMessage());
 
diff --git a/libraries/src/Joomla/CMS/Table/Usergroup.php b/libraries/src/Joomla/CMS/Table/Usergroup.php
index 7cd7172ea21b6..aea94c530fdc5 100644
--- a/libraries/src/Joomla/CMS/Table/Usergroup.php
+++ b/libraries/src/Joomla/CMS/Table/Usergroup.php
@@ -148,8 +148,8 @@ public function store($updateNulls = false)
 	 * @return  mixed  Boolean or Exception.
 	 *
 	 * @since   11.1
-	 * @throws  RuntimeException on database error.
-	 * @throws  UnexpectedValueException on data error.
+	 * @throws  \RuntimeException on database error.
+	 * @throws  \UnexpectedValueException on data error.
 	 */
 	public function delete($oid = null)
 	{
diff --git a/libraries/src/Joomla/CMS/Toolbar/Toolbar.php b/libraries/src/Joomla/CMS/Toolbar/Toolbar.php
index 70113c0fe82bc..a7a98069019d4 100644
--- a/libraries/src/Joomla/CMS/Toolbar/Toolbar.php
+++ b/libraries/src/Joomla/CMS/Toolbar/Toolbar.php
@@ -76,7 +76,7 @@ public function __construct($name = 'toolbar')
 	 *
 	 * @param   string  $name  The name of the toolbar.
 	 *
-	 * @return  JToolbar  The JToolbar object.
+	 * @return  \JToolbar  The JToolbar object.
 	 *
 	 * @since   1.5
 	 */
diff --git a/libraries/src/Joomla/CMS/Toolbar/ToolbarButton.php b/libraries/src/Joomla/CMS/Toolbar/ToolbarButton.php
index 26339c512b9cf..10f8360f7123c 100644
--- a/libraries/src/Joomla/CMS/Toolbar/ToolbarButton.php
+++ b/libraries/src/Joomla/CMS/Toolbar/ToolbarButton.php
@@ -33,7 +33,7 @@ abstract class ToolbarButton
 	/**
 	 * reference to the object that instantiated the element
 	 *
-	 * @var    JButton
+	 * @var    \JButton
 	 */
 	protected $_parent = null;
 
diff --git a/libraries/src/Joomla/CMS/UCM/UCMBase.php b/libraries/src/Joomla/CMS/UCM/UCMBase.php
index 9a94de0cfcd4d..7ced1ea05afe0 100644
--- a/libraries/src/Joomla/CMS/UCM/UCMBase.php
+++ b/libraries/src/Joomla/CMS/UCM/UCMBase.php
@@ -64,7 +64,7 @@ public function __construct($alias = null, UCMType $type = null)
 	 * @return  boolean  True on success
 	 *
 	 * @since   3.1
-	 * @throws  Exception
+	 * @throws  \Exception
 	 */
 	protected function store($data, TableInterface $table = null, $primaryKey = null)
 	{
diff --git a/libraries/src/Joomla/CMS/Updater/Update.php b/libraries/src/Joomla/CMS/Updater/Update.php
index c58509aa8380c..5fe7d2c105f40 100644
--- a/libraries/src/Joomla/CMS/Updater/Update.php
+++ b/libraries/src/Joomla/CMS/Updater/Update.php
@@ -180,7 +180,7 @@ class Update extends \JObject
 	/**
 	 * Object containing the current update data
 	 *
-	 * @var    stdClass
+	 * @var    \stdClass
 	 * @since  12.1
 	 */
 	protected $currentUpdate;
diff --git a/libraries/src/Joomla/CMS/View/CategoryFeed.php b/libraries/src/Joomla/CMS/View/CategoryFeed.php
index 672a64b5082bc..2ab1e071f3758 100644
--- a/libraries/src/Joomla/CMS/View/CategoryFeed.php
+++ b/libraries/src/Joomla/CMS/View/CategoryFeed.php
@@ -71,7 +71,7 @@ public function display($tpl = null)
 		// Don't display feed if category id missing or non existent
 		if ($category == false || $category->alias === 'root')
 		{
-			return JError::raiseError(404, JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
+			return \JError::raiseError(404, \JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
 		}
 
 		foreach ($items as $item)
diff --git a/libraries/src/Joomla/CMS/View/HtmlView.php b/libraries/src/Joomla/CMS/View/HtmlView.php
index 7a511ed0ca4d9..075ff4245ef35 100644
--- a/libraries/src/Joomla/CMS/View/HtmlView.php
+++ b/libraries/src/Joomla/CMS/View/HtmlView.php
@@ -484,7 +484,7 @@ public function getLayoutTemplate()
 	 * @return  string  The name of the model
 	 *
 	 * @since   3.0
-	 * @throws  Exception
+	 * @throws  \Exception
 	 */
 	public function getName()
 	{
@@ -635,7 +635,7 @@ public function addHelperPath($path)
 	 * @return  string  The output of the the template script.
 	 *
 	 * @since   3.0
-	 * @throws  Exception
+	 * @throws  \Exception
 	 */
 	public function loadTemplate($tpl = null)
 	{

From d26e6005d687689973cf45a6e255de53e777a1f4 Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Wed, 26 Jul 2017 21:02:25 +0530
Subject: [PATCH 073/148] Namespace and datatype mismatch part 2 (#17279)

* Namespace and datatype mismatch part 2

* Revert changes to 3rd party library idea-convert
---
 libraries/cms/less/less.php                     |  4 ++--
 libraries/idna_convert/idna_convert.class.php   |  4 ++--
 libraries/joomla/controller/controller.php      |  2 ++
 libraries/joomla/database/driver/postgresql.php |  2 +-
 libraries/joomla/database/exporter.php          |  4 ++--
 libraries/joomla/database/iterator.php          |  4 ++--
 libraries/joomla/document/document.php          |  2 +-
 libraries/joomla/document/feed.php              |  2 +-
 libraries/joomla/document/image.php             |  2 +-
 libraries/joomla/document/json.php              |  2 +-
 libraries/joomla/document/opensearch.php        |  2 +-
 libraries/joomla/document/raw.php               |  2 +-
 libraries/joomla/document/xml.php               |  2 +-
 libraries/joomla/facebook/group.php             |  2 +-
 libraries/joomla/facebook/object.php            | 10 +++++-----
 libraries/joomla/facebook/user.php              |  4 ++--
 libraries/joomla/filesystem/patcher.php         |  4 ++--
 libraries/joomla/filesystem/stream.php          |  4 ++--
 libraries/joomla/language/text.php              |  2 +-
 libraries/joomla/openstreetmap/elements.php     |  2 +-
 libraries/legacy/application/application.php    |  2 +-
 21 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/libraries/cms/less/less.php b/libraries/cms/less/less.php
index 53a7d7e08d8fe..1c8a5864a3b03 100644
--- a/libraries/cms/less/less.php
+++ b/libraries/cms/less/less.php
@@ -22,8 +22,8 @@ class JLess extends lessc
 	/**
 	 * Constructor
 	 *
-	 * @param   string  $fname      Filename to process
-	 * @param   mided   $formatter  Formatter object
+	 * @param   string                 $fname      Filename to process
+	 * @param   \JLessFormatterJoomla  $formatter  Formatter object
 	 *
 	 * @since   3.4
 	 */
diff --git a/libraries/idna_convert/idna_convert.class.php b/libraries/idna_convert/idna_convert.class.php
index 23f4405538e34..949bd4a6a1472 100644
--- a/libraries/idna_convert/idna_convert.class.php
+++ b/libraries/idna_convert/idna_convert.class.php
@@ -120,7 +120,7 @@ public function __construct($options = false)
      *
      * @param    mixed     Parameter to set (string: single parameter; array of Parameter => Value pairs)
      * @param    string    Value to use (if parameter 1 is a string)
-     * @return   boolean   true on success, false otherwise
+     * @return   boolean  true on success, false otherwise
      */
     public function set_parameter($option, $value = false)
     {
@@ -1602,4 +1602,4 @@ public function singleton($params = array())
                     )
             );
 }
-?>
\ No newline at end of file
+?>
diff --git a/libraries/joomla/controller/controller.php b/libraries/joomla/controller/controller.php
index eaa3ac4ac0121..d73871f03f725 100644
--- a/libraries/joomla/controller/controller.php
+++ b/libraries/joomla/controller/controller.php
@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
+use Joomla\Application\AbstractApplication;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
diff --git a/libraries/joomla/database/driver/postgresql.php b/libraries/joomla/database/driver/postgresql.php
index 9d30a950a605b..63f1136755f1c 100644
--- a/libraries/joomla/database/driver/postgresql.php
+++ b/libraries/joomla/database/driver/postgresql.php
@@ -67,7 +67,7 @@ class JDatabaseDriverPostgresql extends JDatabaseDriver
 	/**
 	 * JDatabaseDriverPostgresqlQuery object returned by getQuery
 	 *
-	 * @var    JDatabaseDriverPostgresqlQuery
+	 * @var    JDatabaseQueryPostgresql
 	 * @since  12.1
 	 */
 	protected $queryObject = null;
diff --git a/libraries/joomla/database/exporter.php b/libraries/joomla/database/exporter.php
index 8b91d31d6b53a..957afe05950a6 100644
--- a/libraries/joomla/database/exporter.php
+++ b/libraries/joomla/database/exporter.php
@@ -108,7 +108,7 @@ public function __toString()
 	/**
 	 * Set the output option for the exporter to XML format.
 	 *
-	 * @return  DatabaseExporter  Method supports chaining.
+	 * @return  JDatabaseExporter  Method supports chaining.
 	 *
 	 * @since   13.1
 	 */
@@ -142,7 +142,7 @@ abstract protected function buildXmlStructure();
 	/**
 	 * Checks if all data and options are in order prior to exporting.
 	 *
-	 * @return  DatabaseDriver  Method supports chaining.
+	 * @return  JDatabaseDriver  Method supports chaining.
 	 *
 	 * @since   13.1
 	 * @throws  Exception if an error is encountered.
diff --git a/libraries/joomla/database/iterator.php b/libraries/joomla/database/iterator.php
index 7c74b4d515e7e..a10716ad02099 100644
--- a/libraries/joomla/database/iterator.php
+++ b/libraries/joomla/database/iterator.php
@@ -51,7 +51,7 @@ abstract class JDatabaseIterator implements Countable, Iterator
 	/**
 	 * A numeric or string key for the current database record.
 	 *
-	 * @var    scalar
+	 * @var    int|string
 	 * @since  12.1
 	 */
 	private $_key;
@@ -116,7 +116,7 @@ public function current()
 	/**
 	 * The key of the current element in the iterator.
 	 *
-	 * @return  scalar
+	 * @return  int|string
 	 *
 	 * @see     Iterator::key()
 	 * @since   12.1
diff --git a/libraries/joomla/document/document.php b/libraries/joomla/document/document.php
index 10e45ca2a16a2..df77d103b2a44 100644
--- a/libraries/joomla/document/document.php
+++ b/libraries/joomla/document/document.php
@@ -1231,7 +1231,7 @@ public function parse($params = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  void  The rendered data
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/document/feed.php b/libraries/joomla/document/feed.php
index 514250d15c439..593ea62e0c9c3 100644
--- a/libraries/joomla/document/feed.php
+++ b/libraries/joomla/document/feed.php
@@ -183,7 +183,7 @@ public function __construct($options = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  string  The rendered data
 	 *
 	 * @since   11.1
 	 * @throws  Exception
diff --git a/libraries/joomla/document/image.php b/libraries/joomla/document/image.php
index e861fb32c4064..2d0b5d88f74f4 100644
--- a/libraries/joomla/document/image.php
+++ b/libraries/joomla/document/image.php
@@ -40,7 +40,7 @@ public function __construct($options = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  string  The rendered data
 	 *
 	 * @since   12.1
 	 */
diff --git a/libraries/joomla/document/json.php b/libraries/joomla/document/json.php
index 7fb5107931b3b..61762c27c8cfc 100644
--- a/libraries/joomla/document/json.php
+++ b/libraries/joomla/document/json.php
@@ -59,7 +59,7 @@ public function __construct($options = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  string  The rendered data
 	 *
 	 * @since  11.1
 	 */
diff --git a/libraries/joomla/document/opensearch.php b/libraries/joomla/document/opensearch.php
index cfd04c8252606..81074eb3f9b3a 100644
--- a/libraries/joomla/document/opensearch.php
+++ b/libraries/joomla/document/opensearch.php
@@ -113,7 +113,7 @@ public function __construct($options = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  string  The rendered data
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/document/raw.php b/libraries/joomla/document/raw.php
index eb781dc6d7b15..7bc3c518ef824 100644
--- a/libraries/joomla/document/raw.php
+++ b/libraries/joomla/document/raw.php
@@ -40,7 +40,7 @@ public function __construct($options = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  string  The rendered data
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/document/xml.php b/libraries/joomla/document/xml.php
index 6a63fbf7b1bcf..0e480f9d2e852 100644
--- a/libraries/joomla/document/xml.php
+++ b/libraries/joomla/document/xml.php
@@ -48,7 +48,7 @@ public function __construct($options = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  string  The rendered data
 	 *
 	 * @since  11.1
 	 */
diff --git a/libraries/joomla/facebook/group.php b/libraries/joomla/facebook/group.php
index 49e2149dac402..99dc4e871b0dc 100644
--- a/libraries/joomla/facebook/group.php
+++ b/libraries/joomla/facebook/group.php
@@ -109,7 +109,7 @@ public function getPicture($group, $type = null)
 	 *
 	 * @param   string  $group    The group id.
 	 * @param   string  $link     Link URL.
-	 * @param   strin   $message  Link message.
+	 * @param   string  $message  Link message.
 	 *
 	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
 	 *
diff --git a/libraries/joomla/facebook/object.php b/libraries/joomla/facebook/object.php
index 54bce3395ca62..f5a95cbc503f4 100644
--- a/libraries/joomla/facebook/object.php
+++ b/libraries/joomla/facebook/object.php
@@ -58,11 +58,11 @@ public function __construct(Registry $options = null, JHttp $client = null, JFac
 	 * add appropriate pagination details if necessary and also prepend the API url
 	 * to have a complete URL for the request.
 	 *
-	 * @param   string     $path    URL to inflect.
-	 * @param   integer    $limit   The number of objects per page.
-	 * @param   integer    $offset  The object's number on the page.
-	 * @param   timestamp  $until   A unix timestamp or any date accepted by strtotime.
-	 * @param   timestamp  $since   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $path    URL to inflect.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   integer  $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   integer  $since   A unix timestamp or any date accepted by strtotime.
 	 *
 	 * @return  string  The request URL.
 	 *
diff --git a/libraries/joomla/facebook/user.php b/libraries/joomla/facebook/user.php
index 6cb66a2767696..c4e78a7f96f01 100644
--- a/libraries/joomla/facebook/user.php
+++ b/libraries/joomla/facebook/user.php
@@ -306,7 +306,7 @@ public function getAlbums($user, $limit = 0, $offset = 0, $until = null, $since
 	 * @param   mixed   $user         Either an integer containing the user ID or a string containing the username.
 	 * @param   string  $name         Album name.
 	 * @param   string  $description  Album description.
-	 * @param   json    $privacy      A JSON-encoded object that defines the privacy setting for the album.
+	 * @param   string  $privacy      A JSON-encoded object that defines the privacy setting for the album.
 	 *
 	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
 	 *
@@ -538,7 +538,7 @@ public function getLinks($user, $limit = 0, $offset = 0, $until = null, $since =
 	 *
 	 * @param   mixed   $user     Either an integer containing the user ID or a string containing the username.
 	 * @param   string  $link     Link URL.
-	 * @param   strin   $message  Link message.
+	 * @param   string  $message  Link message.
 	 *
 	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
 	 *
diff --git a/libraries/joomla/filesystem/patcher.php b/libraries/joomla/filesystem/patcher.php
index 8bb5ba1c5258a..4ef55638f3692 100644
--- a/libraries/joomla/filesystem/patcher.php
+++ b/libraries/joomla/filesystem/patcher.php
@@ -213,7 +213,7 @@ public function apply()
 	 * @param   string  $root      The files root path
 	 * @param   string  $strip     The number of '/' to strip
 	 *
-	 * @return	JFilesystemPatch $this for chaining
+	 * @return	JFilesystemPatcher  $this for chaining
 	 *
 	 * @since   12.1
 	 */
@@ -229,7 +229,7 @@ public function addFile($filename, $root = JPATH_BASE, $strip = 0)
 	 * @param   string  $root   The files root path
 	 * @param   string  $strip  The number of '/' to strip
 	 *
-	 * @return	JFilesystemPatch $this for chaining
+	 * @return	JFilesystemPatcher  $this for chaining
 	 *
 	 * @since   12.1
 	 */
diff --git a/libraries/joomla/filesystem/stream.php b/libraries/joomla/filesystem/stream.php
index dc38554a205eb..8a5dd48f36a08 100644
--- a/libraries/joomla/filesystem/stream.php
+++ b/libraries/joomla/filesystem/stream.php
@@ -94,7 +94,7 @@ class JStream extends JObject
 	/**
 	 * File Handle
 	 *
-	 * @var    array
+	 * @var    resource
 	 * @since  12.1
 	 */
 	protected $fh;
@@ -1411,7 +1411,7 @@ public function _getFilename($filename, $mode, $use_prefix, $relative)
 	/**
 	 * Return the internal file handle
 	 *
-	 * @return  File handler
+	 * @return  resource  File handler
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/joomla/language/text.php b/libraries/joomla/language/text.php
index 74f4fbf02edea..708c40c20e7a5 100644
--- a/libraries/joomla/language/text.php
+++ b/libraries/joomla/language/text.php
@@ -315,7 +315,7 @@ public static function sprintf($string)
 	 *
 	 * Note that this method can take a mixed number of arguments as for the sprintf function.
 	 *
-	 * @param   format  $string  The format string.
+	 * @param   string  $string  The format string.
 	 *
 	 * @return  mixed
 	 *
diff --git a/libraries/joomla/openstreetmap/elements.php b/libraries/joomla/openstreetmap/elements.php
index e5463be8ce4f0..5955c898802d9 100644
--- a/libraries/joomla/openstreetmap/elements.php
+++ b/libraries/joomla/openstreetmap/elements.php
@@ -23,7 +23,7 @@ class JOpenstreetmapElements extends JOpenstreetmapObject
 	 * @param   integer  $changeset  Changeset id
 	 * @param   float    $latitude   Latitude of the node
 	 * @param   float    $longitude  Longitude of the node
-	 * @param   arary    $tags       Array of tags for a node
+	 * @param   array    $tags       Array of tags for a node
 	 *
 	 * @return  array  The XML response
 	 *
diff --git a/libraries/legacy/application/application.php b/libraries/legacy/application/application.php
index 660e4c5dce085..a212f05a1672d 100644
--- a/libraries/legacy/application/application.php
+++ b/libraries/legacy/application/application.php
@@ -574,7 +574,7 @@ public function setUserState($key, $value)
 	 * @param   string  $default  The default value for the variable if not found. Optional.
 	 * @param   string  $type     Filter for the variable, for valid values see {@link JFilterInput::clean()}. Optional.
 	 *
-	 * @return  The request user state.
+	 * @return  mixed  The request user state.
 	 *
 	 * @since   1.5
 	 * @deprecated  3.2

From 50a8b3224184ad3d7bbc0f256be63a63adc77eb6 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 27 Jul 2017 12:44:40 +0100
Subject: [PATCH 074/148] Capitalise headings (#17296)

All headings in Joomla are capitalised but these three were not. This simple PR for consistency corrects that
---
 administrator/language/en-GB/en-GB.com_menus.ini | 2 +-
 administrator/language/en-GB/en-GB.com_users.ini | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index cdb8bc2f93140..46bd9604113c4 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -47,7 +47,7 @@ COM_MENUS_HEADING_DISPLAY="Display"
 COM_MENUS_HEADING_HOME="Home"
 COM_MENUS_HEADING_HOME_ASC="Home ascending"
 COM_MENUS_HEADING_HOME_DESC="Home descending"
-COM_MENUS_HEADING_LEVELS="View level"
+COM_MENUS_HEADING_LEVELS="View Level"
 COM_MENUS_HEADING_LINKED_MODULES="Linked Modules"
 COM_MENUS_HEADING_MENU="Menu"
 COM_MENUS_HEADING_MENU_ASC="Menu ascending"
diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 8b34dc17e11a4..892e5d615f4ed 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -60,8 +60,8 @@ COM_USERS_CONFIG_PASSWORD_OPTIONS="Password Options"
 COM_USERS_CONFIG_SAVE_FAILED="An error was encountered while saving the configuration: %s."
 COM_USERS_CONFIG_USER_OPTIONS="User Options"
 COM_USERS_CONFIGURATION="Users: Options"
-COM_USERS_COUNT_ENABLED_USERS="Enabled users"
-COM_USERS_COUNT_DISABLED_USERS="Disabled users"
+COM_USERS_COUNT_ENABLED_USERS="Enabled Users"
+COM_USERS_COUNT_DISABLED_USERS="Disabled Users"
 COM_USERS_DEBUG_DESC="Display the Advanced Permission Reports."
 COM_USERS_DEBUG_EXPLICIT_ALLOW="Allowed"
 COM_USERS_DEBUG_EXPLICIT_DENY="Forbidden"

From eac89ded0253a6a2c917a459d512812a0de4bbae Mon Sep 17 00:00:00 2001
From: Bradley Weston <bradwestonwigston@gmail.com>
Date: Thu, 27 Jul 2017 20:54:32 +0100
Subject: [PATCH 075/148] Allow disabling the Joomla! localhost database
 security check. (#17298)

As Joomla! provides a Docker image, the chance of using "localhost" is never. Therefore if the container is scheduled in an environment where you cannot access the container (not that you should ever need to) then you need to be able to bypass this check. This environment variable can be placed in the containers build file and will disable checks meaning you can install hassle free.

This check still keeps the installation secure as you'd need the same access to the server to delete the file.
---
 installation/model/database.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/installation/model/database.php b/installation/model/database.php
index 158231eeef13f..b0c5dfcc3cc0f 100644
--- a/installation/model/database.php
+++ b/installation/model/database.php
@@ -164,6 +164,8 @@ public function initialise($options)
 			return false;
 		}
 
+		$shouldCheckLocalhost = getenv('JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK') !== '1';
+		
 		// Per Default allowed DB Hosts
 		$localhost = array(
 			'localhost',
@@ -172,7 +174,7 @@ public function initialise($options)
 		);
 
 		// Check the security file if the db_host is not localhost / 127.0.0.1 / ::1
-		if (!in_array($options->db_host, $localhost))
+		if ($shouldCheckLocalhost && !in_array($options->db_host, $localhost))
 		{
 			// Add the general message
 			JFactory::getApplication()->enqueueMessage(

From 38390312e00a00596b2cced25c2fb93107c5432d Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Thu, 27 Jul 2017 17:23:55 -0500
Subject: [PATCH 076/148] Update code coverage filter

---
 phpunit.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bc647942b028e..b05b6307863a3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -50,11 +50,11 @@
 			<directory suffix=".php">libraries/cms</directory>
 			<directory suffix=".php">libraries/joomla</directory>
 			<directory suffix=".php">libraries/legacy</directory>
+			<directory suffix=".php">libraries/src</directory>
 			<directory suffix=".php">administrator/components/com_finder/helpers/indexer</directory>
 			<directory suffix=".php">plugins</directory>
 			<file>administrator/includes/helper.php</file>
 			<file>libraries/loader.php</file>
-			<file>libraries/platform.php</file>
 		</whitelist>
 	</filter>
 </phpunit>

From fffdce955b9607ea8e2a85455e9cb677840bc0d6 Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Thu, 27 Jul 2017 23:37:24 +0100
Subject: [PATCH 077/148] =?UTF-8?q?Simple=20change=20from=20str=5Fireplace?=
 =?UTF-8?q?=20to=20pref=5Freplace=20for=20matching=20case=20sen=E2=80=A6?=
 =?UTF-8?q?=20(#17303)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Simple change from str_ireplace to pref_replace for matching case sensitive and insensitive word replacements within the results.

* Added unicode support i.e. المستقبل is now highlightable.
---
 components/com_search/views/search/view.html.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/com_search/views/search/view.html.php b/components/com_search/views/search/view.html.php
index d92179441b234..b39d574b31d1a 100644
--- a/components/com_search/views/search/view.html.php
+++ b/components/com_search/views/search/view.html.php
@@ -226,10 +226,12 @@ public function display($tpl = null)
 					{
 						$pos += $cnt * $highlighterLen;
 
-						/* Avoid overlapping/corrupted highlighter-spans
+						/*
+						 * Avoid overlapping/corrupted highlighter-spans
 						 * TODO $chkOverlap could be used to highlight remaining part
 						 * of search-word outside last highlighter-span.
-						 * At the moment no additional highlighter is set.*/
+						 * At the moment no additional highlighter is set.
+						 */
 						$chkOverlap = $pos - $lastHighlighterEnd;
 
 						if ($chkOverlap >= 0)
@@ -256,17 +258,14 @@ public function display($tpl = null)
 				}
 
 				$result = &$results[$i];
+				$created = '';
 
 				if ($result->created)
 				{
 					$created = JHtml::_('date', $result->created, JText::_('DATE_FORMAT_LC3'));
 				}
-				else
-				{
-					$created = '';
-				}
 
-				$result->title   = StringHelper::str_ireplace($needle, $hl1 . $needle . $hl2, htmlspecialchars($result->title, ENT_COMPAT, 'UTF-8'));
+				$result->title   = preg_replace("/\b($needle)\b/ui", $hl1 . "$1" . $hl2, htmlspecialchars($result->title, ENT_COMPAT, 'UTF-8'));
 				$result->text    = JHtml::_('content.prepare', $result->text, '', 'com_search.search');
 				$result->created = $created;
 				$result->count   = $i + 1;

From 1bcfb4a58a5546a1278a00012d41cc9aef9dafc0 Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Fri, 28 Jul 2017 00:52:31 +0200
Subject: [PATCH 078/148] [New Feature] Implementing filtering admin modules
 per admin languages (including custom menu modules) (#17215)

* Implementing multilingual custom backend menus

* Implementing multilingual custom backend menus

* Alignment

* Correcting grammar and alpha order

* Improving Warning. Thanks @izharaazmi

* Modifyimg patch to allow language filtering per module when modules
Option is set such.

* uppercase

* module lang field exchange

* fix xml cs ;)

* Update adminlanguage.php

since version

* Update adminlanguage.php
---
 .../components/com_menus/controller.php       |  33 ++++++
 .../components/com_modules/config.xml         |  19 +++
 .../components/com_modules/controller.php     |  33 ++++++
 .../models/forms/filter_modulesadmin.xml      | 109 ++++++++++++++++++
 .../com_modules/models/forms/moduleadmin.xml  |  11 ++
 .../components/com_modules/models/module.php  |   6 +
 .../components/com_modules/models/modules.php |   6 +
 .../views/modules/tmpl/default.php            |  14 +++
 .../views/modules/tmpl/default_batch_body.php |  16 ++-
 .../com_modules/views/modules/view.html.php   |  62 +++++++---
 .../language/en-GB/en-GB.com_modules.ini      |   3 +
 administrator/language/en-GB/en-GB.ini        |   1 +
 layouts/joomla/html/batch/adminlanguage.php   |  44 +++++++
 libraries/cms/html/adminlanguage.php          |  65 +++++++++++
 .../src/Joomla/CMS/Helper/ModuleHelper.php    |   6 +
 .../src/Joomla/CMS/Language/Multilanguage.php |  19 +++
 16 files changed, 426 insertions(+), 21 deletions(-)
 create mode 100644 administrator/components/com_modules/models/forms/filter_modulesadmin.xml
 create mode 100644 layouts/joomla/html/batch/adminlanguage.php
 create mode 100644 libraries/cms/html/adminlanguage.php

diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php
index 21823c69557a0..eed32b70bdb53 100644
--- a/administrator/components/com_menus/controller.php
+++ b/administrator/components/com_menus/controller.php
@@ -30,6 +30,39 @@ public function display($cachable = false, $urlparams = false)
 	{
 		JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
 
+		// Check custom administrator menu modules
+		if (JLanguageMultilang::isAdminEnabled())
+		{
+			$languages = JLanguageHelper::getInstalledLanguages(1, true);
+			$langCodes = array();
+
+			foreach ($languages as $language)
+			{
+				$langCodes[$language->metadata['tag']] = $language->metadata['nativeName'];
+			}
+
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			$query->select($db->qn('m.language'))
+				->from($db->qn('#__modules', 'm'))
+				->where($db->qn('m.module') . ' = ' . $db->quote('mod_menu'))
+				->where($db->qn('m.published') . ' = 1')
+				->where($db->qn('m.client_id') . ' = 1')
+				->group($db->qn('m.language'));
+
+			$mLanguages = $db->setQuery($query)->loadColumn();
+
+			// Check if we have a mod_menu module set to All languages or a mod_menu module for each admin language.
+			if (!in_array('*', $mLanguages) && count($langMissing = array_diff(array_keys($langCodes), $mLanguages)))
+			{
+				$app         = JFactory::getApplication();
+				$langMissing = array_intersect_key($langCodes, array_flip($langMissing));
+
+				$app->enqueueMessage(JText::sprintf('JMENU_MULTILANG_WARNING_MISSING_MODULES', implode(', ', $langMissing)), 'warning');
+			}
+		}
+
 		return parent::display();
 	}
 }
diff --git a/administrator/components/com_modules/config.xml b/administrator/components/com_modules/config.xml
index 4f7f55b2ea54f..3eb9b198ebcf4 100644
--- a/administrator/components/com_modules/config.xml
+++ b/administrator/components/com_modules/config.xml
@@ -17,6 +17,25 @@
 			<option value="site">JSITE</option>
 		</field>
 	</fieldset>
+
+	<fieldset
+		name="admin_modules"
+		label="COM_MODULES_ADMIN_LANG_FILTER_FIELDSET_LABEL"
+		>
+		<field
+			name="adminlangfilter"
+			type="radio"
+			label="COM_MODULES_ADMIN_LANG_FILTER_LABEL"
+			description="COM_MODULES_ADMIN_LANG_FILTER_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+	</fieldset>
+
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php
index 5e7d5c6b381fe..1850272286f61 100644
--- a/administrator/components/com_modules/controller.php
+++ b/administrator/components/com_modules/controller.php
@@ -76,6 +76,39 @@ public function display($cachable = false, $urlparams = false)
 		// Load the submenu.
 		ModulesHelper::addSubmenu($this->input->get('view', 'modules'));
 
+		// Check custom administrator menu modules
+		if (JLanguageMultilang::isAdminEnabled())
+		{
+			$languages = JLanguageHelper::getInstalledLanguages(1, true);
+			$langCodes = array();
+
+			foreach ($languages as $language)
+			{
+				$langCodes[$language->metadata['tag']] = $language->metadata['nativeName'];
+			}
+
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			$query->select($db->qn('m.language'))
+				->from($db->qn('#__modules', 'm'))
+				->where($db->qn('m.module') . ' = ' . $db->quote('mod_menu'))
+				->where($db->qn('m.published') . ' = 1')
+				->where($db->qn('m.client_id') . ' = 1')
+				->group($db->qn('m.language'));
+
+			$mLanguages = $db->setQuery($query)->loadColumn();
+
+			// Check if we have a mod_menu module set to All languages or a mod_menu module for each admin language.
+			if (!in_array('*', $mLanguages) && count($langMissing = array_diff(array_keys($langCodes), $mLanguages)))
+			{
+				$app         = JFactory::getApplication();
+				$langMissing = array_intersect_key($langCodes, array_flip($langMissing));
+
+				$app->enqueueMessage(JText::sprintf('JMENU_MULTILANG_WARNING_MISSING_MODULES', implode(', ', $langMissing)), 'warning');
+			}
+		}
+
 		return parent::display();
 	}
 }
diff --git a/administrator/components/com_modules/models/forms/filter_modulesadmin.xml b/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
new file mode 100644
index 0000000000000..0166cb5e53652
--- /dev/null
+++ b/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_modules/models/fields" />
+
+	<field
+		name="client_id"
+		type="list"
+		label=""
+		filtermode="selector"
+		layout="default"
+		onchange="jQuery('#filter_position, #filter_module, #filter_language').val('');this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MODULES_MODULES_FILTER_SEARCH_LABEL"
+			description="COM_MODULES_MODULES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="COM_MODULES_MSG_MANAGE_NO_MODULES"
+		/>
+		<field
+			name="state"
+			type="status"
+			label="JSTATUS"
+			filter="*,-2,0,1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="position"
+			type="modulesposition"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_POSITION</option>
+		</field>
+		<field
+			name="module"
+			type="ModulesModule"
+			label="COM_MODULES_OPTION_SELECT_MODULE"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_MODULE</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+		<field
+			name="language"
+			type="language"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			client="administrator"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,-2"
+			onchange="this.form.submit();"
+			default="a.position ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.position ASC">COM_MODULES_HEADING_POSITION_ASC</option>
+			<option value="a.position DESC">COM_MODULES_HEADING_POSITION_DESC</option>
+			<option value="name ASC">COM_MODULES_HEADING_MODULE_ASC</option>
+			<option value="name DESC">COM_MODULES_HEADING_MODULE_DESC</option>
+			<option value="ag.title ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="ag.title DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_MODULES_LIST_LIMIT"
+			description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/administrator/components/com_modules/models/forms/moduleadmin.xml b/administrator/components/com_modules/models/forms/moduleadmin.xml
index 06d1ad3bd7be5..5857a1723c9de 100644
--- a/administrator/components/com_modules/models/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/models/forms/moduleadmin.xml
@@ -103,6 +103,17 @@
 			label="JFIELD_ORDERING_LABEL"
 		/>
 
+		<field
+			name="language"
+			type="language"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="JFIELD_MODULE_LANGUAGE_DESC"
+			default="*"
+			client="administrator"
+			>
+			<option value="*">JALL</option>
+		</field>
+
 		<field name="content" type="editor"
 			buttons="true"
 			description="COM_MODULES_FIELD_CONTENT_DESC"
diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php
index 0ad00711d202a..0ce754313ad1b 100644
--- a/administrator/components/com_modules/models/module.php
+++ b/administrator/components/com_modules/models/module.php
@@ -541,6 +541,12 @@ public function getForm($data = array(), $loadData = true)
 		if ($clientId == 1)
 		{
 			$form = $this->loadForm('com_modules.module.admin', 'moduleadmin', array('control' => 'jform', 'load_data' => $loadData), true);
+
+			// Display language field to filter admin custom menus per language
+			if (!JLanguageMultilang::isAdminEnabled())
+			{
+				$form->setFieldAttribute('language', 'type', 'hidden');
+			}
 		}
 		else
 		{
diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php
index 942fcdab6383b..5eec9a16f248d 100644
--- a/administrator/components/com_modules/models/modules.php
+++ b/administrator/components/com_modules/models/modules.php
@@ -111,6 +111,12 @@ protected function populateState($ordering = 'a.position', $direction = 'asc')
 			$this->setState('client_id', $clientId);
 		}
 
+		// Use a different filter file when client is administrator
+		if ($clientId == 1)
+		{
+			$this->filterFormName = 'filter_modulesadmin';
+		}
+
 		// Load the parameters.
 		$params = JComponentHelper::getParams('com_modules');
 		$this->setState('params', $params);
diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php
index a7bdfbafd6526..d6b30171378b3 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default.php
@@ -69,6 +69,10 @@
 						<th width="10%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'l.title', $listDirn, $listOrder); ?>
 						</th>
+						<?php elseif ($clientId === 1 && JLanguageMultilang::isAdminEnabled()) : ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+						</th>
 						<?php endif; ?>
 						<th width="1%" class="nowrap center hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
@@ -187,6 +191,16 @@
 						<td class="small hidden-phone">
 							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 						</td>
+						<?php elseif ($clientId === 1 && JLanguageMultilang::isAdminEnabled()) : ?>
+							<td class="small hidden-phone">
+								<?php if ($item->language == ''):?>
+									<?php echo JText::_('JUNDEFINED'); ?>
+								<?php elseif ($item->language == '*'):?>
+									<?php echo JText::alt('JALL', 'language'); ?>
+								<?php else:?>
+									<?php echo $this->escape($item->language); ?>
+								<?php endif; ?>
+							</td>
 						<?php endif; ?>
 						<td class="hidden-phone">
 							<?php echo (int) $item->id; ?>
diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
index 93e72eafd1e2f..fdc24284b67f2 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
@@ -33,11 +33,19 @@
 <div class="container-fluid">
 	<p><?php echo JText::_('COM_MODULES_BATCH_TIP'); ?></p>
 	<div class="row-fluid">
-		<div class="control-group span6">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
+		<?php if ($clientId != 1) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JLayoutHelper::render('joomla.html.batch.language', array()); ?>
+				</div>
 			</div>
-		</div>
+		<?php elseif ($clientId == 1 && JLanguageMultilang::isAdminEnabled()) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JLayoutHelper::render('joomla.html.batch.adminlanguage', array()); ?>
+				</div>
+			</div>
+		<?php endif; ?>
 		<div class="control-group span6">
 			<div class="controls">
 				<?php echo JHtml::_('batch.access'); ?>
diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php
index 974e320131428..f3502b5437cb9 100644
--- a/administrator/components/com_modules/views/modules/view.html.php
+++ b/administrator/components/com_modules/views/modules/view.html.php
@@ -39,6 +39,7 @@ public function display($tpl = null)
 		$this->total         = $this->get('Total');
 		$this->filterForm    = $this->get('FilterForm');
 		$this->activeFilters = $this->get('ActiveFilters');
+		$this->clientId      = $this->state->get('client_id');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -46,12 +47,9 @@ public function display($tpl = null)
 			throw new Exception(implode("\n", $errors), 500);
 		}
 
-		// We do not need the Page and the Language filters when filtering by administrator
-		if ($this->state->get('client_id') == 1)
+		// We do not need the Language filter when modules are not filtered
+		if ($this->clientId == 1 && !JLanguageMultilang::isAdminEnabled())
 		{
-			unset($this->activeFilters['menuitem']);
-			$this->filterForm->removeField('menuitem', 'filter');
-
 			unset($this->activeFilters['language']);
 			$this->filterForm->removeField('language', 'filter');
 		}
@@ -176,11 +174,26 @@ protected function addToolbar()
 	 */
 	protected function getSortFields()
 	{
-		if ($this->getLayout() == 'default')
+		$this->state = $this->get('State');
+
+		if ($this->state->get('client_id') == 0)
 		{
+			if ($this->getLayout() == 'default')
+			{
+				return array(
+					'ordering'       => JText::_('JGRID_HEADING_ORDERING'),
+					'a.published'    => JText::_('JSTATUS'),
+					'a.title'        => JText::_('JGLOBAL_TITLE'),
+					'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
+					'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
+					'pages'          => JText::_('COM_MODULES_HEADING_PAGES'),
+					'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+					'language_title' => JText::_('JGRID_HEADING_LANGUAGE'),
+					'a.id'           => JText::_('JGRID_HEADING_ID')
+				);
+			}
+
 			return array(
-				'ordering'       => JText::_('JGRID_HEADING_ORDERING'),
-				'a.published'    => JText::_('JSTATUS'),
 				'a.title'        => JText::_('JGLOBAL_TITLE'),
 				'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
 				'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
@@ -190,15 +203,30 @@ protected function getSortFields()
 				'a.id'           => JText::_('JGRID_HEADING_ID')
 			);
 		}
+		else
+		{
+			if ($this->getLayout() == 'default')
+			{
+				return array(
+					'ordering'       => JText::_('JGRID_HEADING_ORDERING'),
+					'a.published'    => JText::_('JSTATUS'),
+					'a.title'        => JText::_('JGLOBAL_TITLE'),
+					'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
+					'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
+					'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+					'a.language'     => JText::_('JGRID_HEADING_LANGUAGE'),
+					'a.id'           => JText::_('JGRID_HEADING_ID')
+				);
+			}
 
-		return array(
-			'a.title'        => JText::_('JGLOBAL_TITLE'),
-			'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
-			'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
-			'pages'          => JText::_('COM_MODULES_HEADING_PAGES'),
-			'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
-			'language_title' => JText::_('JGRID_HEADING_LANGUAGE'),
-			'a.id'           => JText::_('JGRID_HEADING_ID')
-		);
+			return array(
+					'a.title'        => JText::_('JGLOBAL_TITLE'),
+					'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
+					'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
+					'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+					'a.language'     => JText::_('JGRID_HEADING_LANGUAGE'),
+					'a.id'           => JText::_('JGRID_HEADING_ID')
+			);
+		}
 	}
 }
diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
index a1463cd8b9540..e0d430dfe5fec 100644
--- a/administrator/language/en-GB/en-GB.com_modules.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -6,6 +6,9 @@
 COM_MODULES="Modules Manager"
 COM_MODULES_ACTION_EDITFRONTEND="Frontend Editing"
 COM_MODULES_ACTION_EDITFRONTEND_COMPONENT_DESC="Allows users in the group to edit in Frontend."
+COM_MODULES_ADMIN_LANG_FILTER_FIELDSET_LABEL="Administrator Modules"
+COM_MODULES_ADMIN_LANG_FILTER_DESC="Allows filtering administrator modules per administrator language."
+COM_MODULES_ADMIN_LANG_FILTER_LABEL="Language Filtering"
 COM_MODULES_ADVANCED_FIELDSET_LABEL="Advanced"
 COM_MODULES_ASSIGNED_VARIES_EXCEPT="All except selected"
 COM_MODULES_ASSIGNED_VARIES_ONLY="Selected"
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 1afc2be0b04cb..af3322b33369b 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -87,6 +87,7 @@ JINVALID_TOKEN="The most recent request was denied because it contained an inval
 JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
+JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
 JMODIFY="Modify"
 JNEVER="Never"
 JNEXT="Next"
diff --git a/layouts/joomla/html/batch/adminlanguage.php b/layouts/joomla/html/batch/adminlanguage.php
new file mode 100644
index 0000000000000..ebb1221fe084c
--- /dev/null
+++ b/layouts/joomla/html/batch/adminlanguage.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ * None
+ */
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+		jQuery(document).ready(function($){
+			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
+			if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");}
+			if ($("#batch-position-id").length){var batchSelector = $("#batch-position-id");}
+			if ($("#batch-copy-move").length && batchSelector) {
+				$("#batch-copy-move").hide();
+				batchSelector.on("change", function(){
+					if (batchSelector.val() != 0 || batchSelector.val() != "") {
+						$("#batch-copy-move").show();
+					} else {
+						$("#batch-copy-move").hide();
+					}
+				});
+			}
+		});
+			'
+);
+?>
+<label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
+	<?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
+</label>
+<select name="batch[language_id]" class="inputbox" id="batch-language-id">
+	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
+	<?php echo JHtml::_('select.options', JHtml::_('adminlanguage.existing', true, true), 'value', 'text'); ?>
+</select>
diff --git a/libraries/cms/html/adminlanguage.php b/libraries/cms/html/adminlanguage.php
new file mode 100644
index 0000000000000..a9230ecd28eda
--- /dev/null
+++ b/libraries/cms/html/adminlanguage.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class working with administrator language select lists
+ *
+ * @since  3.8.0
+ */
+abstract class JHtmlAdminLanguage
+{
+	/**
+	 * Cached array of the administrator language items.
+	 *
+	 * @var    array
+	 * @since  3.8.0
+	 */
+	protected static $items = null;
+
+	/**
+	 * Get a list of the available administrator language items.
+	 *
+	 * @param   boolean  $all        True to include All (*)
+	 * @param   boolean  $translate  True to translate All
+	 *
+	 * @return  string
+	 *
+	 * @since   3.8.0
+	 */
+	public static function existing($all = false, $translate = false)
+	{
+		if (empty(static::$items))
+		{
+			$languages       = array();
+			$admin_languages = JLanguageHelper::getKnownLanguages(JPATH_ADMINISTRATOR);
+
+			foreach ($admin_languages as $tag => $language)
+			{
+				$languages[$tag] = $language['nativeName'];
+			}
+			
+			ksort($languages);
+			
+			static::$items = $languages;
+		}
+
+		if ($all)
+		{
+			$all_option = array(new JObject(array('value' => '*', 'text' => $translate ? JText::alt('JALL', 'language') : 'JALL_LANGUAGE')));
+
+			return array_merge($all_option, static::$items);
+		}
+		else
+		{
+			return static::$items;
+		}
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Helper/ModuleHelper.php b/libraries/src/Joomla/CMS/Helper/ModuleHelper.php
index 6cdfd998b79ac..10605a9dd8179 100644
--- a/libraries/src/Joomla/CMS/Helper/ModuleHelper.php
+++ b/libraries/src/Joomla/CMS/Helper/ModuleHelper.php
@@ -413,6 +413,12 @@ public static function getModuleList()
 			$cacheId .= $lang . '*';
 		}
 
+		if ($app->isClient('administrator') && \JLanguageMultilang::isAdminEnabled())
+		{
+			$query->where('m.language IN (' . $db->quote($lang) . ',' . $db->quote('*') . ')');
+			$cacheId .= $lang . '*';
+		}
+
 		$query->order('m.position, m.ordering');
 
 		// Set the query
diff --git a/libraries/src/Joomla/CMS/Language/Multilanguage.php b/libraries/src/Joomla/CMS/Language/Multilanguage.php
index d6d92b79d32e6..cff02e8b39e0b 100644
--- a/libraries/src/Joomla/CMS/Language/Multilanguage.php
+++ b/libraries/src/Joomla/CMS/Language/Multilanguage.php
@@ -109,4 +109,23 @@ public static function getSiteHomePages()
 
 		return $multilangSiteHomePages;
 	}
+
+	/**
+	 * Method to determine if filtering by language is enabled in back-end for custom menus.
+	 *
+	 * @return  boolean  True if admin is supporting multiple languages; false otherwise.
+	 *
+	 * @since   3.8.0
+	 */
+	public static function isAdminEnabled()
+	{
+		static $enabled = false;
+
+		if (count(\JLanguageHelper::getInstalledLanguages(1)) > 1)
+		{
+			$enabled = \JComponentHelper::getParams('com_modules')->get('adminlangfilter', 0);
+		}
+
+		return (bool) $enabled;
+	}
 }

From 321591e1c00d277799e780dc3f5c1714d0f60365 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Fri, 28 Jul 2017 13:07:19 +0100
Subject: [PATCH 079/148] required = false is nnot required (#17309)

Looks like some commits included this in the xml definition fr a field when it is not needed (and doesnt do anything).

You can confirm this by checking the markup of the content rights field in the article edit form before and after the PR - there will be no change
---
 administrator/components/com_content/models/forms/article.xml  | 1 -
 .../components/com_languages/models/forms/language.xml         | 1 -
 .../components/com_newsfeeds/models/forms/newsfeed.xml         | 1 -
 components/com_content/models/forms/article.xml                | 1 -
 components/com_users/models/forms/login.xml                    | 1 -
 plugins/captcha/recaptcha/recaptcha.xml                        | 3 ---
 6 files changed, 8 deletions(-)

diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml
index c41a0dad11589..b15e97f1dbafe 100644
--- a/administrator/components/com_content/models/forms/article.xml
+++ b/administrator/components/com_content/models/forms/article.xml
@@ -1029,7 +1029,6 @@
 				type="textarea" 
 				label="JFIELD_META_RIGHTS_LABEL"
 				description="JFIELD_META_RIGHTS_DESC" 
-				required="false" 
 				filter="string"
 				cols="30" 
 				rows="2" 
diff --git a/administrator/components/com_languages/models/forms/language.xml b/administrator/components/com_languages/models/forms/language.xml
index afe244ed84ab7..61e900bc6844e 100644
--- a/administrator/components/com_languages/models/forms/language.xml
+++ b/administrator/components/com_languages/models/forms/language.xml
@@ -60,7 +60,6 @@
 			directory="media/mod_languages/images/"
 			hide_none="1"
 			hide_default="1"
-			required="false"
 			filter="\.gif$"
 			size="10"
 			>
diff --git a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
index 93655cd20c9c0..a0e2f1b9392fc 100644
--- a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
+++ b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
@@ -477,7 +477,6 @@
 				type="text"
 				label="JFIELD_META_RIGHTS_LABEL"
 				description="JFIELD_META_RIGHTS_DESC"
-				required="false"
 				rows="2"
 				cols="30"
 				filter="string"
diff --git a/components/com_content/models/forms/article.xml b/components/com_content/models/forms/article.xml
index 5213c80cc3ea0..cd35169cd4e0a 100644
--- a/components/com_content/models/forms/article.xml
+++ b/components/com_content/models/forms/article.xml
@@ -409,7 +409,6 @@
 					label="JFIELD_META_RIGHTS_LABEL"
 					description="JFIELD_META_RIGHTS_DESC"
 					filter="unset"
-					required="false"
 					labelclass="control-label"
 				/>
 
diff --git a/components/com_users/models/forms/login.xml b/components/com_users/models/forms/login.xml
index 0aaa7b4427d8d..376e76b5e37ab 100644
--- a/components/com_users/models/forms/login.xml
+++ b/components/com_users/models/forms/login.xml
@@ -29,7 +29,6 @@
 			type="text"
 			label="JGLOBAL_SECRETKEY"
 			class=""
-			required="false"
 			filter="int"
 			size="25"
 		/>
diff --git a/plugins/captcha/recaptcha/recaptcha.xml b/plugins/captcha/recaptcha/recaptcha.xml
index 745b9d396b763..26a85f49a6707 100644
--- a/plugins/captcha/recaptcha/recaptcha.xml
+++ b/plugins/captcha/recaptcha/recaptcha.xml
@@ -63,7 +63,6 @@
 					label="PLG_RECAPTCHA_THEME_LABEL"
 					description="PLG_RECAPTCHA_THEME_DESC"
 					default="clean"
-					required="false"
 					showon="version:1.0"
 					filter=""
 					>
@@ -79,7 +78,6 @@
 					label="PLG_RECAPTCHA_THEME_LABEL"
 					description="PLG_RECAPTCHA_THEME_DESC"
 					default="light"
-					required="false"
 					showon="version:2.0"
 					filter=""
 					>
@@ -93,7 +91,6 @@
 					label="PLG_RECAPTCHA_SIZE_LABEL"
 					description="PLG_RECAPTCHA_SIZE_DESC"
 					default="normal"
-					required="false"
 					showon="version:2.0"
 					filter=""
 					>

From a46a1f7b0e3457ee1f3d3bb6d940223213de32bf Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Fri, 28 Jul 2017 13:09:44 +0100
Subject: [PATCH 080/148] [CS] Required=true (#17313)

Reviewing the cookie plugin I see that it has required=required - for consistency and code style it should be required=true
---
 plugins/authentication/cookie/cookie.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/authentication/cookie/cookie.xml b/plugins/authentication/cookie/cookie.xml
index c6466d32e90cb..a77bbd0deb588 100644
--- a/plugins/authentication/cookie/cookie.xml
+++ b/plugins/authentication/cookie/cookie.xml
@@ -26,7 +26,7 @@
 					description="PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_DESC"
 					default="60"
 					filter="integer"
-					required="required"
+					required="true"
 				/>
 
 				<field
@@ -36,7 +36,7 @@
 					description="PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_DESC"
 					default="16"
 					filter="integer"
-					required="required"
+					required="true"
 					>
 					<option value="8">8</option>
 					<option value="16">16</option>

From ffcacef738e8b5e8efeac7587f5deaafc20a896c Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Fri, 28 Jul 2017 14:13:10 +0200
Subject: [PATCH 081/148] Namespace feed (#17278)

* Namespace feed

* CS

* Restore old function name with _
---
 libraries/classmap.php                        |  12 ++
 libraries/joomla/feed/parser/namespace.php    |  42 ------
 libraries/joomla/feed/parser/rss/itunes.php   |  49 -------
 libraries/joomla/feed/parser/rss/media.php    |  49 -------
 .../feed.php => src/Joomla/CMS/Feed/Feed.php} |  91 ++++++------
 .../Joomla/CMS/Feed/FeedEntry.php}            |  79 ++++++-----
 .../Joomla/CMS/Feed/FeedFactory.php}          |  65 +++++----
 .../Joomla/CMS/Feed/FeedLink.php}             |  15 +-
 .../Joomla/CMS/Feed/FeedParser.php}           |  57 ++++----
 .../Joomla/CMS/Feed/FeedPerson.php}           |  11 +-
 .../Joomla/CMS/Feed/Parser/AtomParser.php}    |  80 ++++++-----
 .../Feed/Parser/NamespaceParserInterface.php  |  46 ++++++
 .../CMS/Feed/Parser/Rss/ItunesRssParser.php   |  54 +++++++
 .../CMS/Feed/Parser/Rss/MediaRssParser.php    |  54 +++++++
 .../Joomla/CMS/Feed/Parser/RssParser.php}     | 133 +++++++++---------
 15 files changed, 445 insertions(+), 392 deletions(-)
 delete mode 100644 libraries/joomla/feed/parser/namespace.php
 delete mode 100644 libraries/joomla/feed/parser/rss/itunes.php
 delete mode 100644 libraries/joomla/feed/parser/rss/media.php
 rename libraries/{joomla/feed/feed.php => src/Joomla/CMS/Feed/Feed.php} (70%)
 rename libraries/{joomla/feed/entry.php => src/Joomla/CMS/Feed/FeedEntry.php} (65%)
 rename libraries/{joomla/feed/factory.php => src/Joomla/CMS/Feed/FeedFactory.php} (58%)
 rename libraries/{joomla/feed/link.php => src/Joomla/CMS/Feed/FeedLink.php} (82%)
 rename libraries/{joomla/feed/parser.php => src/Joomla/CMS/Feed/FeedParser.php} (74%)
 rename libraries/{joomla/feed/person.php => src/Joomla/CMS/Feed/FeedPerson.php} (79%)
 rename libraries/{joomla/feed/parser/atom.php => src/Joomla/CMS/Feed/Parser/AtomParser.php} (61%)
 create mode 100644 libraries/src/Joomla/CMS/Feed/Parser/NamespaceParserInterface.php
 create mode 100644 libraries/src/Joomla/CMS/Feed/Parser/Rss/ItunesRssParser.php
 create mode 100644 libraries/src/Joomla/CMS/Feed/Parser/Rss/MediaRssParser.php
 rename libraries/{joomla/feed/parser/rss.php => src/Joomla/CMS/Feed/Parser/RssParser.php} (62%)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 384efc2eded51..c4db775347bce 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -361,3 +361,15 @@
 JLoader::registerAlias('JInputFiles',                       '\\Joomla\\CMS\\Input\\Files', '5.0');
 JLoader::registerAlias('JInput',                            '\\Joomla\\CMS\\Input\\Input', '5.0');
 JLoader::registerAlias('JInputJSON',                        '\\Joomla\\CMS\\Input\\Json', '5.0');
+
+JLoader::registerAlias('JFeed',                             '\\Joomla\\CMS\\Feed\\Feed', '5.0');
+JLoader::registerAlias('JFeedEntry',                        '\\Joomla\\CMS\\Feed\\FeedEntry', '5.0');
+JLoader::registerAlias('JFeedFactory',                      '\\Joomla\\CMS\\Feed\\FeedFactory', '5.0');
+JLoader::registerAlias('JFeedLink',                         '\\Joomla\\CMS\\Feed\\FeedLink', '5.0');
+JLoader::registerAlias('JFeedParser',                       '\\Joomla\\CMS\\Feed\\FeedParser', '5.0');
+JLoader::registerAlias('JFeedPerson',                       '\\Joomla\\CMS\\Feed\\FeedPerson', '5.0');
+JLoader::registerAlias('JFeedParserAtom',                   '\\Joomla\\CMS\\Feed\\Parser\\AtomParser', '5.0');
+JLoader::registerAlias('JFeedParserNamespace',              '\\Joomla\\CMS\\Feed\\Parser\\NamespaceParserInterface', '5.0');
+JLoader::registerAlias('JFeedParserRss',                    '\\Joomla\\CMS\\Feed\\Parser\\RssParser', '5.0');
+JLoader::registerAlias('JFeedParserRssItunes',              '\\Joomla\\CMS\\Feed\\Parser\\Rss\\ItunesRssParser', '5.0');
+JLoader::registerAlias('JFeedParserRssMedia',               '\\Joomla\\CMS\\Feed\\Parser\\Rss\\MediaRssParser', '5.0');
diff --git a/libraries/joomla/feed/parser/namespace.php b/libraries/joomla/feed/parser/namespace.php
deleted file mode 100644
index f9fff7b582ea2..0000000000000
--- a/libraries/joomla/feed/parser/namespace.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Feed
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Feed Namespace interface.
- *
- * @since  12.3
- */
-interface JFeedParserNamespace
-{
-	/**
-	 * Method to handle an element for the feed given that a certain namespace is present.
-	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
-	 *
-	 * @return  void
-	 *
-	 * @since   12.3
-	 */
-	public function processElementForFeed(JFeed $feed, SimpleXMLElement $el);
-
-	/**
-	 * Method to handle the feed entry element for the feed given that a certain namespace is present.
-	 *
-	 * @param   JFeedEntry        $entry  The JFeedEntry object being built from the parsed feed entry.
-	 * @param   SimpleXMLElement  $el     The current XML element object to handle.
-	 *
-	 * @return  void
-	 *
-	 * @since   12.3
-	 */
-	public function processElementForFeedEntry(JFeedEntry $entry, SimpleXMLElement $el);
-}
diff --git a/libraries/joomla/feed/parser/rss/itunes.php b/libraries/joomla/feed/parser/rss/itunes.php
deleted file mode 100644
index 7e93cee617e3e..0000000000000
--- a/libraries/joomla/feed/parser/rss/itunes.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Feed
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * RSS Feed Parser Namespace handler for iTunes.
- *
- * @link   https://itunespartner.apple.com/en/podcasts/overview
- * @since  12.3
- */
-class JFeedParserRssItunes implements JFeedParserNamespace
-{
-	/**
-	 * Method to handle an element for the feed given that the itunes namespace is present.
-	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
-	 *
-	 * @return  void
-	 *
-	 * @since   12.3
-	 */
-	public function processElementForFeed(JFeed $feed, SimpleXMLElement $el)
-	{
-		return;
-	}
-
-	/**
-	 * Method to handle the feed entry element for the feed given that the itunes namespace is present.
-	 *
-	 * @param   JFeedEntry        $entry  The JFeedEntry object being built from the parsed feed entry.
-	 * @param   SimpleXMLElement  $el     The current XML element object to handle.
-	 *
-	 * @return  void
-	 *
-	 * @since   12.3
-	 */
-	public function processElementForFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
-	{
-		return;
-	}
-}
diff --git a/libraries/joomla/feed/parser/rss/media.php b/libraries/joomla/feed/parser/rss/media.php
deleted file mode 100644
index 6615425dc51a8..0000000000000
--- a/libraries/joomla/feed/parser/rss/media.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @package     Joomla.Platform
- * @subpackage  Feed
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * RSS Feed Parser Namespace handler for MediaRSS.
- *
- * @link   http://video.search.yahoo.com/mrss
- * @since  12.3
- */
-class JFeedParserRssMedia implements JFeedParserNamespace
-{
-	/**
-	 * Method to handle an element for the feed given that the media namespace is present.
-	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
-	 *
-	 * @return  void
-	 *
-	 * @since   12.3
-	 */
-	public function processElementForFeed(JFeed $feed, SimpleXMLElement $el)
-	{
-		return;
-	}
-
-	/**
-	 * Method to handle the feed entry element for the feed given that the media namespace is present.
-	 *
-	 * @param   JFeedEntry        $entry  The JFeedEntry object being built from the parsed feed entry.
-	 * @param   SimpleXMLElement  $el     The current XML element object to handle.
-	 *
-	 * @return  void
-	 *
-	 * @since   12.3
-	 */
-	public function processElementForFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
-	{
-		return;
-	}
-}
diff --git a/libraries/joomla/feed/feed.php b/libraries/src/Joomla/CMS/Feed/Feed.php
similarity index 70%
rename from libraries/joomla/feed/feed.php
rename to libraries/src/Joomla/CMS/Feed/Feed.php
index dd026d46757b2..21147b693fcba 100644
--- a/libraries/joomla/feed/feed.php
+++ b/libraries/src/Joomla/CMS/Feed/Feed.php
@@ -1,32 +1,35 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed;
+
+use Joomla\CMS\Date\Date;
+
 defined('JPATH_PLATFORM') or die();
 
 /**
  * Class to encapsulate a feed for the Joomla Platform.
  *
- * @property  JFeedPerson  $author         Person responsible for feed content.
- * @property  array        $categories     Categories to which the feed belongs.
- * @property  array        $contributors   People who contributed to the feed content.
- * @property  string       $copyright      Information about rights, e.g. copyrights, held in and over the feed.
- * @property  string       $description    A phrase or sentence describing the feed.
- * @property  string       $generator      A string indicating the program used to generate the feed.
- * @property  string       $image          Specifies a GIF, JPEG or PNG image that should be displayed with the feed.
- * @property  JDate        $publishedDate  The publication date for the feed content.
- * @property  string       $title          A human readable title for the feed.
- * @property  JDate        $updatedDate    The last time the content of the feed changed.
- * @property  string       $uri            Universal, permanent identifier for the feed.
+ * @property  FeedPerson  $author         Person responsible for feed content.
+ * @property  array       $categories     Categories to which the feed belongs.
+ * @property  array       $contributors   People who contributed to the feed content.
+ * @property  string      $copyright      Information about rights, e.g. copyrights, held in and over the feed.
+ * @property  string      $description    A phrase or sentence describing the feed.
+ * @property  string      $generator      A string indicating the program used to generate the feed.
+ * @property  string      $image          Specifies a GIF, JPEG or PNG image that should be displayed with the feed.
+ * @property  Date        $publishedDate  The publication date for the feed content.
+ * @property  string      $title          A human readable title for the feed.
+ * @property  Date        $updatedDate    The last time the content of the feed changed.
+ * @property  string      $uri            Universal, permanent identifier for the feed.
  *
  * @since  12.3
  */
-class JFeed implements ArrayAccess, Countable
+class Feed implements \ArrayAccess, \Countable
 {
 	/**
 	 * @var    array  The entry properties.
@@ -74,21 +77,21 @@ public function __get($name)
 	public function __set($name, $value)
 	{
 		// Ensure that setting a date always sets a JDate instance.
-		if ((($name == 'updatedDate') || ($name == 'publishedDate')) && !($value instanceof JDate))
+		if ((($name == 'updatedDate') || ($name == 'publishedDate')) && !($value instanceof Date))
 		{
-			$value = new JDate($value);
+			$value = new Date($value);
 		}
 
 		// Validate that any authors that are set are instances of JFeedPerson or null.
-		if (($name == 'author') && (!($value instanceof JFeedPerson) || ($value === null)))
+		if (($name == 'author') && (!($value instanceof FeedPerson) || ($value === null)))
 		{
-			throw new InvalidArgumentException('JFeed "author" must be of type JFeedPerson. ' . gettype($value) . 'given.');
+			throw new \InvalidArgumentException('Feed "author" must be of type FeedPerson. ' . gettype($value) . 'given.');
 		}
 
 		// Disallow setting categories or contributors directly.
 		if (($name == 'categories') || ($name == 'contributors'))
 		{
-			throw new InvalidArgumentException('Cannot directly set JFeed property "' . $name . '".');
+			throw new \InvalidArgumentException('Cannot directly set Feed property "' . $name . '".');
 		}
 
 		$this->properties[$name] = $value;
@@ -100,7 +103,7 @@ public function __set($name, $value)
 	 * @param   string  $name  The name of the category to add.
 	 * @param   string  $uri   The optional URI for the category to add.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
@@ -119,13 +122,13 @@ public function addCategory($name, $uri = '')
 	 * @param   string  $uri    The optional URI for the person to add.
 	 * @param   string  $type   The optional type of person to add.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
 	public function addContributor($name, $email, $uri = null, $type = null)
 	{
-		$contributor = new JFeedPerson($name, $email, $uri, $type);
+		$contributor = new FeedPerson($name, $email, $uri, $type);
 
 		// If the new contributor already exists then there is nothing to do, so just return.
 		foreach ($this->properties['contributors'] as $c)
@@ -145,13 +148,13 @@ public function addContributor($name, $email, $uri = null, $type = null)
 	/**
 	 * Method to add an entry to the feed object.
 	 *
-	 * @param   JFeedEntry  $entry  The entry object to add.
+	 * @param   FeedEntry  $entry  The entry object to add.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
-	public function addEntry(JFeedEntry $entry)
+	public function addEntry(FeedEntry $entry)
 	{
 		// If the new entry already exists then there is nothing to do, so just return.
 		foreach ($this->entries as $e)
@@ -170,10 +173,10 @@ public function addEntry(JFeedEntry $entry)
 
 	/**
 	 * Returns a count of the number of entries in the feed.
-	 * 
+	 *
 	 * This method is here to implement the Countable interface.
 	 * You can call it by doing count($feed) rather than $feed->count();
-	 * 
+	 *
 	 * @return  integer number of entries in the feed.
 	 */
 	public function count()
@@ -215,20 +218,20 @@ public function offsetGet($offset)
 	/**
 	 * Assigns a value to the specified offset.
 	 *
-	 * @param   mixed       $offset  The offset to assign the value to.
-	 * @param   JFeedEntry  $value   The JFeedEntry to set.
+	 * @param   mixed      $offset  The offset to assign the value to.
+	 * @param   FeedEntry  $value   The JFeedEntry to set.
 	 *
 	 * @return  boolean
 	 *
 	 * @see     ArrayAccess::offsetSet()
 	 * @since   12.3
-	 * @throws  InvalidArgumentException
+	 * @throws  \InvalidArgumentException
 	 */
 	public function offsetSet($offset, $value)
 	{
-		if (!($value instanceof JFeedEntry))
+		if (!($value instanceof FeedEntry))
 		{
-			throw new InvalidArgumentException('Cannot set value of type "' . gettype($value) . '".');
+			throw new \InvalidArgumentException('Cannot set value of type "' . gettype($value) . '".');
 		}
 
 		$this->entries[$offset] = $value;
@@ -256,7 +259,7 @@ public function offsetUnset($offset)
 	 *
 	 * @param   string  $name  The name of the category to remove.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
@@ -270,13 +273,13 @@ public function removeCategory($name)
 	/**
 	 * Method to remove a contributor from the feed object.
 	 *
-	 * @param   JFeedPerson  $contributor  The person object to remove.
+	 * @param   FeedPerson  $contributor  The person object to remove.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
-	public function removeContributor(JFeedPerson $contributor)
+	public function removeContributor(FeedPerson $contributor)
 	{
 		// If the contributor exists remove it.
 		foreach ($this->properties['contributors'] as $k => $c)
@@ -296,13 +299,13 @@ public function removeContributor(JFeedPerson $contributor)
 	/**
 	 * Method to remove an entry from the feed object.
 	 *
-	 * @param   JFeedEntry  $entry  The entry object to remove.
+	 * @param   FeedEntry  $entry  The entry object to remove.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
-	public function removeEntry(JFeedEntry $entry)
+	public function removeEntry(FeedEntry $entry)
 	{
 		// If the entry exists remove it.
 		foreach ($this->entries as $k => $e)
@@ -327,13 +330,13 @@ public function removeEntry(JFeedEntry $entry)
 	 * @param   string  $uri    The optional URI for the person to set.
 	 * @param   string  $type   The optional type of person to set.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
 	public function setAuthor($name, $email, $uri = null, $type = null)
 	{
-		$author = new JFeedPerson($name, $email, $uri, $type);
+		$author = new FeedPerson($name, $email, $uri, $type);
 
 		$this->properties['author'] = $author;
 
@@ -343,7 +346,7 @@ public function setAuthor($name, $email, $uri = null, $type = null)
 	/**
 	 * Method to reverse the items if display is set to 'oldest first'
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
diff --git a/libraries/joomla/feed/entry.php b/libraries/src/Joomla/CMS/Feed/FeedEntry.php
similarity index 65%
rename from libraries/joomla/feed/entry.php
rename to libraries/src/Joomla/CMS/Feed/FeedEntry.php
index c3c3b62f36d16..66867df79d144 100644
--- a/libraries/joomla/feed/entry.php
+++ b/libraries/src/Joomla/CMS/Feed/FeedEntry.php
@@ -1,32 +1,35 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed;
+
+use Joomla\CMS\Date\Date;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
  * Class to encapsulate a feed entry for the Joomla Platform.
  *
- * @property  JFeedPerson  $author         Person responsible for feed entry content.
- * @property  array        $categories     Categories to which the feed entry belongs.
- * @property  string       $content        The content of the feed entry.
- * @property  array        $contributors   People who contributed to the feed entry content.
- * @property  string       $copyright      Information about rights, e.g. copyrights, held in and over the feed entry.
- * @property  array        $links          Links associated with the feed entry.
- * @property  JDate        $publishedDate  The publication date for the feed entry.
- * @property  JFeed        $source         The feed from which the entry is sourced.
- * @property  string       $title          A human readable title for the feed entry.
- * @property  JDate        $updatedDate    The last time the content of the feed entry changed.
- * @property  string       $uri            Universal, permanent identifier for the feed entry.
+ * @property  FeedPerson  $author         Person responsible for feed entry content.
+ * @property  array       $categories     Categories to which the feed entry belongs.
+ * @property  string      $content        The content of the feed entry.
+ * @property  array       $contributors   People who contributed to the feed entry content.
+ * @property  string      $copyright      Information about rights, e.g. copyrights, held in and over the feed entry.
+ * @property  array       $links          Links associated with the feed entry.
+ * @property  Date        $publishedDate  The publication date for the feed entry.
+ * @property  Feed        $source         The feed from which the entry is sourced.
+ * @property  string      $title          A human readable title for the feed entry.
+ * @property  Date        $updatedDate    The last time the content of the feed entry changed.
+ * @property  string      $uri            Universal, permanent identifier for the feed entry.
  *
  * @since  12.3
  */
-class JFeedEntry
+class FeedEntry
 {
 	/**
 	 * @var    array  The entry properties.
@@ -69,27 +72,27 @@ public function __get($name)
 	public function __set($name, $value)
 	{
 		// Ensure that setting a date always sets a JDate instance.
-		if ((($name == 'updatedDate') || ($name == 'publishedDate')) && !($value instanceof JDate))
+		if ((($name == 'updatedDate') || ($name == 'publishedDate')) && !($value instanceof Date))
 		{
-			$value = new JDate($value);
+			$value = new Date($value);
 		}
 
 		// Validate that any authors that are set are instances of JFeedPerson or null.
-		if (($name == 'author') && (!($value instanceof JFeedPerson) || ($value === null)))
+		if (($name == 'author') && (!($value instanceof FeedPerson) || ($value === null)))
 		{
-			throw new InvalidArgumentException('JFeedEntry "author" must be of type JFeedPerson. ' . gettype($value) . 'given.');
+			throw new \InvalidArgumentException('FeedEntry "author" must be of type FeedPerson. ' . gettype($value) . 'given.');
 		}
 
 		// Validate that any sources that are set are instances of JFeed or null.
-		if (($name == 'source') && (!($value instanceof JFeed) || ($value === null)))
+		if (($name == 'source') && (!($value instanceof Feed) || ($value === null)))
 		{
-			throw new InvalidArgumentException('JFeedEntry "source" must be of type JFeed. ' . gettype($value) . 'given.');
+			throw new \InvalidArgumentException('FeedEntry "source" must be of type Feed. ' . gettype($value) . 'given.');
 		}
 
 		// Disallow setting categories, contributors, or links directly.
 		if (($name == 'categories') || ($name == 'contributors') || ($name == 'links'))
 		{
-			throw new InvalidArgumentException('Cannot directly set JFeedEntry property "' . $name . '".');
+			throw new \InvalidArgumentException('Cannot directly set FeedEntry property "' . $name . '".');
 		}
 
 		$this->properties[$name] = $value;
@@ -101,7 +104,7 @@ public function __set($name, $value)
 	 * @param   string  $name  The name of the category to add.
 	 * @param   string  $uri   The optional URI for the category to add.
 	 *
-	 * @return  JFeedEntry
+	 * @return  FeedEntry
 	 *
 	 * @since   12.3
 	 */
@@ -120,13 +123,13 @@ public function addCategory($name, $uri = '')
 	 * @param   string  $uri    The optional URI for the person to add.
 	 * @param   string  $type   The optional type of person to add.
 	 *
-	 * @return  JFeedEntry
+	 * @return  FeedEntry
 	 *
 	 * @since   12.3
 	 */
 	public function addContributor($name, $email, $uri = null, $type = null)
 	{
-		$contributor = new JFeedPerson($name, $email, $uri, $type);
+		$contributor = new FeedPerson($name, $email, $uri, $type);
 
 		// If the new contributor already exists then there is nothing to do, so just return.
 		foreach ($this->properties['contributors'] as $c)
@@ -146,13 +149,13 @@ public function addContributor($name, $email, $uri = null, $type = null)
 	/**
 	 * Method to add a link to the feed entry object.
 	 *
-	 * @param   JFeedLink  $link  The link object to add.
+	 * @param   FeedLink  $link  The link object to add.
 	 *
-	 * @return  JFeedEntry
+	 * @return  FeedEntry
 	 *
 	 * @since   12.3
 	 */
-	public function addLink(JFeedLink $link)
+	public function addLink(FeedLink $link)
 	{
 		// If the new link already exists then there is nothing to do, so just return.
 		foreach ($this->properties['links'] as $l)
@@ -174,7 +177,7 @@ public function addLink(JFeedLink $link)
 	 *
 	 * @param   string  $name  The name of the category to remove.
 	 *
-	 * @return  JFeedEntry
+	 * @return  FeedEntry
 	 *
 	 * @since   12.3
 	 */
@@ -188,13 +191,13 @@ public function removeCategory($name)
 	/**
 	 * Method to remove a contributor from the feed entry object.
 	 *
-	 * @param   JFeedPerson  $contributor  The person object to remove.
+	 * @param   FeedPerson  $contributor  The person object to remove.
 	 *
-	 * @return  JFeedEntry
+	 * @return  FeedEntry
 	 *
 	 * @since   12.3
 	 */
-	public function removeContributor(JFeedPerson $contributor)
+	public function removeContributor(FeedPerson $contributor)
 	{
 		// If the contributor exists remove it.
 		foreach ($this->properties['contributors'] as $k => $c)
@@ -214,13 +217,13 @@ public function removeContributor(JFeedPerson $contributor)
 	/**
 	 * Method to remove a link from the feed entry object.
 	 *
-	 * @param   JFeedLink  $link  The link object to remove.
+	 * @param   FeedLink  $link  The link object to remove.
 	 *
-	 * @return  JFeedEntry
+	 * @return  FeedEntry
 	 *
 	 * @since   12.3
 	 */
-	public function removeLink(JFeedLink $link)
+	public function removeLink(FeedLink $link)
 	{
 		// If the link exists remove it.
 		foreach ($this->properties['links'] as $k => $l)
@@ -245,13 +248,13 @@ public function removeLink(JFeedLink $link)
 	 * @param   string  $uri    The optional URI for the person to set.
 	 * @param   string  $type   The optional type of person to set.
 	 *
-	 * @return  JFeedEntry
+	 * @return  FeedEntry
 	 *
 	 * @since   12.3
 	 */
 	public function setAuthor($name, $email, $uri = null, $type = null)
 	{
-		$author = new JFeedPerson($name, $email, $uri, $type);
+		$author = new FeedPerson($name, $email, $uri, $type);
 
 		$this->properties['author'] = $author;
 
diff --git a/libraries/joomla/feed/factory.php b/libraries/src/Joomla/CMS/Feed/FeedFactory.php
similarity index 58%
rename from libraries/joomla/feed/factory.php
rename to libraries/src/Joomla/CMS/Feed/FeedFactory.php
index b7ed75e1a4524..6271c125c29d6 100644
--- a/libraries/joomla/feed/factory.php
+++ b/libraries/src/Joomla/CMS/Feed/FeedFactory.php
@@ -1,42 +1,46 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Http\HttpFactory;
+use Joomla\Registry\Registry;
+
 /**
  * Feed factory class.
  *
  * @since  12.3
  */
-class JFeedFactory
+class FeedFactory
 {
 	/**
 	 * @var    array  The list of registered parser classes for feeds.
 	 * @since  12.3
 	 */
-	protected $parsers = array('rss' => 'JFeedParserRss', 'feed' => 'JFeedParserAtom');
+	protected $parsers = array('rss' => 'Joomla\\CMS\\Feed\\Parser\\RssParser', 'feed' => 'Joomla\\CMS\\Feed\\Parser\\AtomParser');
 
 	/**
 	 * Method to load a URI into the feed reader for parsing.
 	 *
 	 * @param   string  $uri  The URI of the feed to load. Idn uris must be passed already converted to punycode.
 	 *
-	 * @return  JFeedReader
+	 * @return  Feed
 	 *
 	 * @since   12.3
-	 * @throws  InvalidArgumentException
-	 * @throws  RuntimeException
+	 * @throws  \InvalidArgumentException
+	 * @throws  \RuntimeException
 	 */
 	public function getFeed($uri)
 	{
 		// Create the XMLReader object.
-		$reader = new XMLReader;
+		$reader = new \XMLReader;
 
 		// Open the URI within the stream reader.
 		if (!@$reader->open($uri, null, LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_NOWARNING))
@@ -44,23 +48,22 @@ public function getFeed($uri)
 			// Retry with JHttpFactory that allow using CURL and Sockets as alternative method when available
 
 			// Adding a valid user agent string, otherwise some feed-servers returning an error
-			$options 	= new \joomla\Registry\Registry;
+			$options 	= new Registry;
 			$options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0');
 
-			$connector 	= JHttpFactory::getHttp($options);
+			$connector 	= HttpFactory::getHttp($options);
 			$feed 		= $connector->get($uri);
 
 			if ($feed->code != 200)
 			{
-				throw new RuntimeException('Unable to open the feed.');
+				throw new \RuntimeException('Unable to open the feed.');
 			}
 
 			// Set the value to the XMLReader parser
 			if (!$reader->xml($feed->body, null, LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_NOWARNING))
 			{
-				throw new RuntimeException('Unable to parse the feed.');
+				throw new \RuntimeException('Unable to parse the feed.');
 			}
-
 		}
 
 		try
@@ -68,47 +71,47 @@ public function getFeed($uri)
 			// Skip ahead to the root node.
 			while ($reader->read())
 			{
-				if ($reader->nodeType == XMLReader::ELEMENT)
+				if ($reader->nodeType == \XMLReader::ELEMENT)
 				{
 					break;
 				}
 			}
 		}
-		catch (Exception $e)
+		catch (\Exception $e)
 		{
-			throw new RuntimeException('Error reading feed.', $e->getCode(), $e);
+			throw new \RuntimeException('Error reading feed.', $e->getCode(), $e);
 		}
 
-		// Setup the appopriate feed parser for the feed.
+		// Setup the appropriate feed parser for the feed.
 		$parser = $this->_fetchFeedParser($reader->name, $reader);
 
 		return $parser->parse();
 	}
 
 	/**
-	 * Method to register a JFeedParser class for a given root tag name.
+	 * Method to register a FeedParser class for a given root tag name.
 	 *
 	 * @param   string   $tagName    The root tag name for which to register the parser class.
-	 * @param   string   $className  The JFeedParser class name to register for a root tag name.
+	 * @param   string   $className  The FeedParser class name to register for a root tag name.
 	 * @param   boolean  $overwrite  True to overwrite the parser class if one is already registered.
 	 *
-	 * @return  JFeedFactory
+	 * @return  FeedFactory
 	 *
 	 * @since   12.3
-	 * @throws  InvalidArgumentException
+	 * @throws  \InvalidArgumentException
 	 */
 	public function registerParser($tagName, $className, $overwrite = false)
 	{
 		// Verify that the class exists.
 		if (!class_exists($className))
 		{
-			throw new InvalidArgumentException('The feed parser class ' . $className . ' does not exist.');
+			throw new \InvalidArgumentException('The feed parser class ' . $className . ' does not exist.');
 		}
 
 		// Validate that the tag name is valid.
 		if (!preg_match('/\A(?!XML)[a-z][\w0-9-]*/i', $tagName))
 		{
-			throw new InvalidArgumentException('The tag name ' . $tagName . ' is not valid.');
+			throw new \InvalidArgumentException('The tag name ' . $tagName . ' is not valid.');
 		}
 
 		// Register the given parser class for the tag name if nothing registered or the overwrite flag set.
@@ -123,20 +126,20 @@ public function registerParser($tagName, $className, $overwrite = false)
 	/**
 	 * Method to return a new JFeedParser object based on the registered parsers and a given type.
 	 *
-	 * @param   string     $type    The name of parser to return.
-	 * @param   XMLReader  $reader  The XMLReader instance for the feed.
+	 * @param   string      $type    The name of parser to return.
+	 * @param   \XMLReader  $reader  The XMLReader instance for the feed.
 	 *
-	 * @return  JFeedParser
+	 * @return  FeedParser
 	 *
 	 * @since   12.3
-	 * @throws  LogicException
+	 * @throws  \LogicException
 	 */
-	private function _fetchFeedParser($type, XMLReader $reader)
+	private function _fetchFeedParser($type, \XMLReader $reader)
 	{
 		// Look for a registered parser for the feed type.
 		if (empty($this->parsers[$type]))
 		{
-			throw new LogicException('No registered feed parser for type ' . $type . '.');
+			throw new \LogicException('No registered feed parser for type ' . $type . '.');
 		}
 
 		return new $this->parsers[$type]($reader);
diff --git a/libraries/joomla/feed/link.php b/libraries/src/Joomla/CMS/Feed/FeedLink.php
similarity index 82%
rename from libraries/joomla/feed/link.php
rename to libraries/src/Joomla/CMS/Feed/FeedLink.php
index 733045b63bcd7..92b2e20361b84 100644
--- a/libraries/joomla/feed/link.php
+++ b/libraries/src/Joomla/CMS/Feed/FeedLink.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -14,7 +15,7 @@
  *
  * @since  12.3
  */
-class JFeedLink
+class FeedLink
 {
 	/**
 	 * The URI to the linked resource.
@@ -75,7 +76,7 @@ class JFeedLink
 	 * @param   integer  $length    The length of the resource in bytes.
 	 *
 	 * @since   12.3
-	 * @throws  InvalidArgumentException
+	 * @throws  \InvalidArgumentException
 	 */
 	public function __construct($uri = null, $relation = null, $type = null, $language = null, $title = null, $length = null)
 	{
@@ -88,7 +89,7 @@ public function __construct($uri = null, $relation = null, $type = null, $langua
 		// Validate the length input.
 		if (isset($length) && !is_numeric($length))
 		{
-			throw new InvalidArgumentException('Length must be numeric.');
+			throw new \InvalidArgumentException('Length must be numeric.');
 		}
 
 		$this->length = (int) $length;
diff --git a/libraries/joomla/feed/parser.php b/libraries/src/Joomla/CMS/Feed/FeedParser.php
similarity index 74%
rename from libraries/joomla/feed/parser.php
rename to libraries/src/Joomla/CMS/Feed/FeedParser.php
index a70acf68151e0..20d70dcb807bd 100644
--- a/libraries/joomla/feed/parser.php
+++ b/libraries/src/Joomla/CMS/Feed/FeedParser.php
@@ -1,12 +1,15 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed;
+
+use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -14,7 +17,7 @@
  *
  * @since  12.3
  */
-abstract class JFeedParser
+abstract class FeedParser
 {
 	/**
 	 * The feed element name for the entry elements.
@@ -25,7 +28,7 @@ abstract class JFeedParser
 	protected $entryElementName = 'entry';
 
 	/**
-	 * Array of JFeedParserNamespace objects
+	 * Array of NamespaceParserInterface objects
 	 *
 	 * @var    array
 	 * @since  12.3
@@ -35,7 +38,7 @@ abstract class JFeedParser
 	/**
 	 * The XMLReader stream object for the feed.
 	 *
-	 * @var    XMLReader
+	 * @var    \XMLReader
 	 * @since  12.3
 	 */
 	protected $stream;
@@ -43,11 +46,11 @@ abstract class JFeedParser
 	/**
 	 * Constructor.
 	 *
-	 * @param   XMLReader  $stream  The XMLReader stream object for the feed.
+	 * @param   \XMLReader  $stream  The XMLReader stream object for the feed.
 	 *
 	 * @since   12.3
 	 */
-	public function __construct(XMLReader $stream)
+	public function __construct(\XMLReader $stream)
 	{
 		$this->stream  = $stream;
 	}
@@ -55,13 +58,13 @@ public function __construct(XMLReader $stream)
 	/**
 	 * Method to parse the feed into a JFeed object.
 	 *
-	 * @return  JFeed
+	 * @return  Feed
 	 *
 	 * @since   12.3
 	 */
 	public function parse()
 	{
-		$feed = new JFeed;
+		$feed = new Feed;
 
 		// Detect the feed version.
 		$this->initialise();
@@ -70,7 +73,7 @@ public function parse()
 		do
 		{
 			// Expand the element for processing.
-			$el = new SimpleXMLElement($this->stream->readOuterXml());
+			$el = new \SimpleXMLElement($this->stream->readOuterXml());
 
 			// Get the list of namespaces used within this element.
 			$ns = $el->getNamespaces(true);
@@ -110,14 +113,14 @@ public function parse()
 	/**
 	 * Method to register a namespace handler object.
 	 *
-	 * @param   string                $prefix     The XML namespace prefix for which to register the namespace object.
-	 * @param   JFeedParserNamespace  $namespace  The namespace object to register.
+	 * @param   string                    $prefix     The XML namespace prefix for which to register the namespace object.
+	 * @param   NamespaceParserInterface  $namespace  The namespace object to register.
 	 *
 	 * @return  JFeed
 	 *
 	 * @since   12.3
 	 */
-	public function registerNamespace($prefix, JFeedParserNamespace $namespace)
+	public function registerNamespace($prefix, NamespaceParserInterface $namespace)
 	{
 		$this->namespaces[$prefix] = $namespace;
 
@@ -137,15 +140,15 @@ abstract protected function initialise();
 	/**
 	 * Method to parse a specific feed element.
 	 *
-	 * @param   JFeed             $feed        The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el          The current XML element object to handle.
-	 * @param   array             $namespaces  The array of relevant namespace objects to process for the element.
+	 * @param   Feed               $feed        The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el          The current XML element object to handle.
+	 * @param   array              $namespaces  The array of relevant namespace objects to process for the element.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function processElement(JFeed $feed, SimpleXMLElement $el, array $namespaces)
+	protected function processElement(Feed $feed, \SimpleXMLElement $el, array $namespaces)
 	{
 		// Build the internal method name.
 		$method = 'handle' . ucfirst($el->getName());
@@ -154,14 +157,14 @@ protected function processElement(JFeed $feed, SimpleXMLElement $el, array $name
 		if ($el->getName() == $this->entryElementName)
 		{
 			// Create a new feed entry for the item.
-			$entry = new JFeedEntry;
+			$entry = new FeedEntry;
 
 			// First call the internal method.
 			$this->processFeedEntry($entry, $el);
 
 			foreach ($namespaces as $namespace)
 			{
-				if ($namespace instanceof JFeedParserNamespace)
+				if ($namespace instanceof NamespaceParserInterface)
 				{
 					$namespace->processElementForFeedEntry($entry, $el);
 				}
@@ -182,7 +185,7 @@ protected function processElement(JFeed $feed, SimpleXMLElement $el, array $name
 
 		foreach ($namespaces as $namespace)
 		{
-			if ($namespace instanceof JFeedParserNamespace)
+			if ($namespace instanceof NamespaceParserInterface)
 			{
 				$namespace->processElementForFeed($feed, $el);
 			}
@@ -194,7 +197,7 @@ protected function processElement(JFeed $feed, SimpleXMLElement $el, array $name
 	 *
 	 * @param   string  $prefix  The XML prefix for which to fetch the namespace object.
 	 *
-	 * @return  mixed  JFeedParserNamespace or false if none exists.
+	 * @return  mixed  NamespaceParserInterface or false if none exists.
 	 *
 	 * @since   12.3
 	 */
@@ -232,7 +235,7 @@ protected function moveToNextElement($name = null)
 		while ($this->stream->read())
 		{
 			// As soon as we get to the next ELEMENT node we are done.
-			if ($this->stream->nodeType == XMLReader::ELEMENT)
+			if ($this->stream->nodeType == \XMLReader::ELEMENT)
 			{
 				// If we are looking for a specific name make sure we have it.
 				if (isset($name) && ($this->stream->name != $name))
@@ -253,7 +256,7 @@ protected function moveToNextElement($name = null)
 	 * @return  void
 	 *
 	 * @since   12.3
-	 * @throws  RuntimeException  If the closing tag cannot be found.
+	 * @throws  \RuntimeException  If the closing tag cannot be found.
 	 */
 	protected function moveToClosingElement()
 	{
@@ -271,12 +274,12 @@ protected function moveToClosingElement()
 		while ($this->stream->read())
 		{
 			// If we have an END_ELEMENT node with the same name and depth as the node we started with we have a bingo. :-)
-			if (($this->stream->name == $name) && ($this->stream->depth == $depth) && ($this->stream->nodeType == XMLReader::END_ELEMENT))
+			if (($this->stream->name == $name) && ($this->stream->depth == $depth) && ($this->stream->nodeType == \XMLReader::END_ELEMENT))
 			{
 				return;
 			}
 		}
 
-		throw new RuntimeException('Unable to find the closing XML node.');
+		throw new \RuntimeException('Unable to find the closing XML node.');
 	}
 }
diff --git a/libraries/joomla/feed/person.php b/libraries/src/Joomla/CMS/Feed/FeedPerson.php
similarity index 79%
rename from libraries/joomla/feed/person.php
rename to libraries/src/Joomla/CMS/Feed/FeedPerson.php
index ab4b23f1f3ea1..ac6034578a6f8 100644
--- a/libraries/joomla/feed/person.php
+++ b/libraries/src/Joomla/CMS/Feed/FeedPerson.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -14,7 +15,7 @@
  *
  * @since  12.3
  */
-class JFeedPerson
+class FeedPerson
 {
 	/**
 	 * The email address of the person.
diff --git a/libraries/joomla/feed/parser/atom.php b/libraries/src/Joomla/CMS/Feed/Parser/AtomParser.php
similarity index 61%
rename from libraries/joomla/feed/parser/atom.php
rename to libraries/src/Joomla/CMS/Feed/Parser/AtomParser.php
index 95ddc281e21a7..f1f948523e200 100644
--- a/libraries/joomla/feed/parser/atom.php
+++ b/libraries/src/Joomla/CMS/Feed/Parser/AtomParser.php
@@ -1,21 +1,27 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed\Parser;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\CMS\Feed\FeedParser;
+
 /**
  * ATOM Feed Parser class.
  *
  * @link   http://www.atomenabled.org/developers/syndication/
  * @since  12.3
  */
-class JFeedParserAtom extends JFeedParser
+class AtomParser extends FeedParser
 {
 	/**
 	 * @var    string  The feed format version.
@@ -26,14 +32,14 @@ class JFeedParserAtom extends JFeedParser
 	/**
 	 * Method to handle the `<author>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleAuthor(JFeed $feed, SimpleXMLElement $el)
+	protected function handleAuthor(Feed $feed, \SimpleXMLElement $el)
 	{
 		// Set the author information from the XML element.
 		$feed->setAuthor((string) $el->name, (string) $el->email, (string) $el->uri);
@@ -42,14 +48,14 @@ protected function handleAuthor(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<contributor>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleContributor(JFeed $feed, SimpleXMLElement $el)
+	protected function handleContributor(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->addContributor((string) $el->name, (string) $el->email, (string) $el->uri);
 	}
@@ -57,14 +63,14 @@ protected function handleContributor(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<generator>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleGenerator(JFeed $feed, SimpleXMLElement $el)
+	protected function handleGenerator(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->generator = (string) $el;
 	}
@@ -72,14 +78,14 @@ protected function handleGenerator(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<id>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleId(JFeed $feed, SimpleXMLElement $el)
+	protected function handleId(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->uri = (string) $el;
 	}
@@ -87,16 +93,16 @@ protected function handleId(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<link>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleLink(JFeed $feed, SimpleXMLElement $el)
+	protected function handleLink(Feed $feed, \SimpleXMLElement $el)
 	{
-		$link = new JFeedLink;
+		$link = new FeedLink;
 		$link->uri      = (string) $el['href'];
 		$link->language = (string) $el['hreflang'];
 		$link->length   = (int) $el['length'];
@@ -110,14 +116,14 @@ protected function handleLink(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<rights>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleRights(JFeed $feed, SimpleXMLElement $el)
+	protected function handleRights(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->copyright = (string) $el;
 	}
@@ -125,14 +131,14 @@ protected function handleRights(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<subtitle>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleSubtitle(JFeed $feed, SimpleXMLElement $el)
+	protected function handleSubtitle(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->description = (string) $el;
 	}
@@ -140,14 +146,14 @@ protected function handleSubtitle(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<title>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleTitle(JFeed $feed, SimpleXMLElement $el)
+	protected function handleTitle(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->title = (string) $el;
 	}
@@ -155,14 +161,14 @@ protected function handleTitle(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<updated>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleUpdated(JFeed $feed, SimpleXMLElement $el)
+	protected function handleUpdated(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->updatedDate = (string) $el;
 	}
@@ -187,14 +193,14 @@ protected function initialise()
 	/**
 	 * Method to handle a `<entry>` element for the feed.
 	 *
-	 * @param   JFeedEntry        $entry  The JFeedEntry object being built from the parsed feed entry.
-	 * @param   SimpleXMLElement  $el     The current XML element object to handle.
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function processFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
+	protected function processFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
 	{
 		$entry->uri         = (string) $el->id;
 		$entry->title       = (string) $el->title;
@@ -226,7 +232,7 @@ protected function processFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
 	 *
 	 * @param   array  $links  Array of <link> elements from the feed entry.
 	 *
-	 * @return  SimpleXMLElement
+	 * @return  \SimpleXMLElement
 	 */
 	private function bestLinkForUri(array $links)
 	{
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/NamespaceParserInterface.php b/libraries/src/Joomla/CMS/Feed/Parser/NamespaceParserInterface.php
new file mode 100644
index 0000000000000..21223dba1680f
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Feed/Parser/NamespaceParserInterface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+
+/**
+ * Feed Namespace interface.
+ *
+ * @since  12.3
+ */
+interface NamespaceParserInterface
+{
+	/**
+	 * Method to handle an element for the feed given that a certain namespace is present.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeed(Feed $feed, \SimpleXMLElement $el);
+
+	/**
+	 * Method to handle the feed entry element for the feed given that a certain namespace is present.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeedEntry(FeedEntry $entry, \SimpleXMLElement $el);
+}
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/Rss/ItunesRssParser.php b/libraries/src/Joomla/CMS/Feed/Parser/Rss/ItunesRssParser.php
new file mode 100644
index 0000000000000..38f827643cc38
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Feed/Parser/Rss/ItunesRssParser.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser\Rss;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
+
+/**
+ * RSS Feed Parser Namespace handler for iTunes.
+ *
+ * @link   https://itunespartner.apple.com/en/podcasts/overview
+ * @since  12.3
+ */
+class ItunesRssParser implements NamespaceParserInterface
+{
+	/**
+	 * Method to handle an element for the feed given that the itunes namespace is present.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeed(Feed $feed, \SimpleXMLElement $el)
+	{
+		return;
+	}
+
+	/**
+	 * Method to handle the feed entry element for the feed given that the itunes namespace is present.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
+	{
+		return;
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/Rss/MediaRssParser.php b/libraries/src/Joomla/CMS/Feed/Parser/Rss/MediaRssParser.php
new file mode 100644
index 0000000000000..d91626de9f12f
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Feed/Parser/Rss/MediaRssParser.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser\Rss;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
+
+/**
+ * RSS Feed Parser Namespace handler for MediaRSS.
+ *
+ * @link   http://video.search.yahoo.com/mrss
+ * @since  12.3
+ */
+class MediaRssParser implements NamespaceParserInterface
+{
+	/**
+	 * Method to handle an element for the feed given that the media namespace is present.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeed(Feed $feed, \SimpleXMLElement $el)
+	{
+		return;
+	}
+
+	/**
+	 * Method to handle the feed entry element for the feed given that the media namespace is present.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
+	{
+		return;
+	}
+}
diff --git a/libraries/joomla/feed/parser/rss.php b/libraries/src/Joomla/CMS/Feed/Parser/RssParser.php
similarity index 62%
rename from libraries/joomla/feed/parser/rss.php
rename to libraries/src/Joomla/CMS/Feed/Parser/RssParser.php
index 8a99d3a3d3032..e7df3a74254d2 100644
--- a/libraries/joomla/feed/parser/rss.php
+++ b/libraries/src/Joomla/CMS/Feed/Parser/RssParser.php
@@ -1,21 +1,28 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Feed
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Feed\Parser;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\CMS\Feed\FeedParser;
+use Joomla\CMS\Feed\FeedPerson;
+
 /**
  * RSS Feed Parser class.
  *
  * @link   http://cyber.law.harvard.edu/rss/rss.html
  * @since  12.3
  */
-class JFeedParserRss extends JFeedParser
+class RssParser extends FeedParser
 {
 	/**
 	 * @var    string  The feed element name for the entry elements.
@@ -32,14 +39,14 @@ class JFeedParserRss extends JFeedParser
 	/**
 	 * Method to handle the `<category>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleCategory(JFeed $feed, SimpleXMLElement $el)
+	protected function handleCategory(Feed $feed, \SimpleXMLElement $el)
 	{
 		// Get the data from the element.
 		$domain    = (string) $el['domain'];
@@ -51,16 +58,16 @@ protected function handleCategory(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<cloud>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleCloud(JFeed $feed, SimpleXMLElement $el)
+	protected function handleCloud(Feed $feed, \SimpleXMLElement $el)
 	{
-		$cloud = new stdClass;
+		$cloud = new \stdClass;
 		$cloud->domain            = (string) $el['domain'];
 		$cloud->port              = (string) $el['port'];
 		$cloud->path              = (string) $el['path'];
@@ -73,14 +80,14 @@ protected function handleCloud(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<copyright>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleCopyright(JFeed $feed, SimpleXMLElement $el)
+	protected function handleCopyright(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->copyright = (string) $el;
 	}
@@ -88,14 +95,14 @@ protected function handleCopyright(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<description>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleDescription(JFeed $feed, SimpleXMLElement $el)
+	protected function handleDescription(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->description = (string) $el;
 	}
@@ -103,14 +110,14 @@ protected function handleDescription(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<generator>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleGenerator(JFeed $feed, SimpleXMLElement $el)
+	protected function handleGenerator(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->generator = (string) $el;
 	}
@@ -118,17 +125,17 @@ protected function handleGenerator(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<image>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleImage(JFeed $feed, SimpleXMLElement $el)
+	protected function handleImage(Feed $feed, \SimpleXMLElement $el)
 	{
 		// Create a feed link object for the image.
-		$image = new JFeedLink(
+		$image = new FeedLink(
 			(string) $el->url,
 			null,
 			'logo',
@@ -148,14 +155,14 @@ protected function handleImage(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<language>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleLanguage(JFeed $feed, SimpleXMLElement $el)
+	protected function handleLanguage(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->language = (string) $el;
 	}
@@ -163,14 +170,14 @@ protected function handleLanguage(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<lastBuildDate>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleLastBuildDate(JFeed $feed, SimpleXMLElement $el)
+	protected function handleLastBuildDate(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->updatedDate = (string) $el;
 	}
@@ -178,16 +185,16 @@ protected function handleLastBuildDate(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<link>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleLink(JFeed $feed, SimpleXMLElement $el)
+	protected function handleLink(Feed $feed, \SimpleXMLElement $el)
 	{
-		$link = new JFeedLink;
+		$link = new FeedLink;
 		$link->uri = (string) $el['href'];
 		$feed->link = $link;
 	}
@@ -195,14 +202,14 @@ protected function handleLink(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<managingEditor>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleManagingEditor(JFeed $feed, SimpleXMLElement $el)
+	protected function handleManagingEditor(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->author = $this->processPerson((string) $el);
 	}
@@ -210,14 +217,14 @@ protected function handleManagingEditor(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<skipDays>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleSkipDays(JFeed $feed, SimpleXMLElement $el)
+	protected function handleSkipDays(Feed $feed, \SimpleXMLElement $el)
 	{
 		// Initialise the array.
 		$days = array();
@@ -234,14 +241,14 @@ protected function handleSkipDays(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<skipHours>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleSkipHours(JFeed $feed, SimpleXMLElement $el)
+	protected function handleSkipHours(Feed $feed, \SimpleXMLElement $el)
 	{
 		// Initialise the array.
 		$hours = array();
@@ -258,14 +265,14 @@ protected function handleSkipHours(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<pubDate>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handlePubDate(JFeed $feed, SimpleXMLElement $el)
+	protected function handlePubDate(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->publishedDate = (string) $el;
 	}
@@ -273,14 +280,14 @@ protected function handlePubDate(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<title>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleTitle(JFeed $feed, SimpleXMLElement $el)
+	protected function handleTitle(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->title = (string) $el;
 	}
@@ -288,14 +295,14 @@ protected function handleTitle(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<ttl>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleTtl(JFeed $feed, SimpleXMLElement $el)
+	protected function handleTtl(Feed $feed, \SimpleXMLElement $el)
 	{
 		$feed->ttl = (integer) $el;
 	}
@@ -303,14 +310,14 @@ protected function handleTtl(JFeed $feed, SimpleXMLElement $el)
 	/**
 	 * Method to handle the `<webmaster>` element for the feed.
 	 *
-	 * @param   JFeed             $feed  The JFeed object being built from the parsed feed.
-	 * @param   SimpleXMLElement  $el    The current XML element object to handle.
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function handleWebmaster(JFeed $feed, SimpleXMLElement $el)
+	protected function handleWebmaster(Feed $feed, \SimpleXMLElement $el)
 	{
 		// Get the tag contents and split it over the first space.
 		$tmp = (string) $el;
@@ -350,14 +357,14 @@ protected function initialise()
 	/**
 	 * Method to handle a `<item>` element for the feed.
 	 *
-	 * @param   JFeedEntry        $entry  The JFeedEntry object being built from the parsed feed entry.
-	 * @param   SimpleXMLElement  $el     The current XML element object to handle.
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
 	 *
 	 * @return  void
 	 *
 	 * @since   12.3
 	 */
-	protected function processFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
+	protected function processFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
 	{
 		$entry->uri           = (string) $el->link;
 		$entry->title         = (string) $el->title;
@@ -384,7 +391,7 @@ protected function processFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
 		// Add any enclosures to the entry.
 		foreach ($el->enclosure as $enclosure)
 		{
-			$link = new JFeedLink(
+			$link = new FeedLink(
 				(string) $enclosure['url'],
 				null,
 				(string) $enclosure['type'],
@@ -398,18 +405,18 @@ protected function processFeedEntry(JFeedEntry $entry, SimpleXMLElement $el)
 	}
 
 	/**
-	 * Method to parse a string with person data and return a JFeedPerson object.
+	 * Method to parse a string with person data and return a FeedPerson object.
 	 *
 	 * @param   string  $data  The string to parse for a person.
 	 *
-	 * @return  JFeedPerson
+	 * @return  FeedPerson
 	 *
 	 * @since   12.3
 	 */
 	protected function processPerson($data)
 	{
 		// Create a new person object.
-		$person = new JFeedPerson;
+		$person = new FeedPerson;
 
 		// This is really cheap parsing, but so far good enough. :)
 		$data = explode(' ', $data, 2);

From 88c296fd7ab0bd2612c4afb2d74f6906583dde6d Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 07:15:45 -0500
Subject: [PATCH 082/148] Deleted files for #17278

---
 administrator/components/com_admin/script.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 5a4e97b7a9cb9..173abdde2d37a 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -1771,6 +1771,17 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/date/date.php',
 			'/libraries/joomla/environment/browser.php',
 			'/libraries/joomla/factory.php',
+			'/libraries/joomla/feed/entry.php',
+			'/libraries/joomla/feed/factory.php',
+			'/libraries/joomla/feed/feed.php',
+			'/libraries/joomla/feed/link.php',
+			'/libraries/joomla/feed/parser.php',
+			'/libraries/joomla/feed/parser/atom.php',
+			'/libraries/joomla/feed/parser/namespace.php',
+			'/libraries/joomla/feed/parser/rss.php',
+			'/libraries/joomla/feed/parser/rss/itunes.php',
+			'/libraries/joomla/feed/parser/rss/media.php',
+			'/libraries/joomla/feed/person.php',
 			'/libraries/joomla/filter/input.php',
 			'/libraries/joomla/filter/output.php',
 			'/libraries/joomla/filter/wrapper/output.php',

From 12067339ebd33dafee0d98ac99a371e5c138e095 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 07:19:05 -0500
Subject: [PATCH 083/148] Correct class name logic

---
 libraries/src/Joomla/CMS/Document/Document.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Joomla/CMS/Document/Document.php b/libraries/src/Joomla/CMS/Document/Document.php
index 1ee2b66101a8b..c0fe9577c7e5c 100644
--- a/libraries/src/Joomla/CMS/Document/Document.php
+++ b/libraries/src/Joomla/CMS/Document/Document.php
@@ -1179,7 +1179,7 @@ public function _getTab()
 	public function loadRenderer($type)
 	{
 		// Determine the path and class
-		$class = __NAMESPACE__ . '\\Renderer\\' . ucfirst($this->getType()) . '\\Renderer' . ucfirst($this->getType()) . ucfirst($type);
+		$class = __NAMESPACE__ . '\\Renderer\\' . ucfirst($this->getType()) . '\\' . ucfirst($type) . 'Renderer';
 
 		if (!class_exists($class))
 		{

From af138992278f9ee7ee571b6047ec7e9bd620beb3 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 07:24:27 -0500
Subject: [PATCH 084/148] Split feed data object classes to separate files

---
 .../CMS/Document/Feed/FeedEnclosure.php       |  49 ++++
 .../Joomla/CMS/Document/Feed/FeedImage.php    |  79 ++++++
 .../src/Joomla/CMS/Document/Feed/FeedItem.php | 155 +++++++++++
 .../src/Joomla/CMS/Document/FeedDocument.php  | 258 +-----------------
 4 files changed, 287 insertions(+), 254 deletions(-)
 create mode 100644 libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php
 create mode 100644 libraries/src/Joomla/CMS/Document/Feed/FeedImage.php
 create mode 100644 libraries/src/Joomla/CMS/Document/Feed/FeedItem.php

diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php b/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php
new file mode 100644
index 0000000000000..d34bd7c539891
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * FeedEnclosure is an internal class that stores feed enclosure information
+ *
+ * @since  11.1
+ */
+class FeedEnclosure
+{
+	/**
+	 * URL enclosure element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $url = '';
+
+	/**
+	 * Length enclosure element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $length = '';
+
+	/**
+	 * Type enclosure element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = '';
+}
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php b/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php
new file mode 100644
index 0000000000000..1d70cead5b385
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * FeedImage is an internal class that stores feed image information
+ *
+ * @since  11.1
+ */
+class FeedImage
+{
+	/**
+	 * Title image attribute
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $title = '';
+
+	/**
+	 * URL image attribute
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $url = '';
+
+	/**
+	 * Link image attribute
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $link = '';
+
+	/**
+	 * Width image attribute
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $width;
+
+	/**
+	 * Title feed attribute
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $height;
+
+	/**
+	 * Title feed attribute
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $description;
+}
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php b/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php
new file mode 100644
index 0000000000000..b8ad184535a56
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * FeedItem is an internal class that stores feed item information
+ *
+ * @since  11.1
+ */
+class FeedItem
+{
+	/**
+	 * Title item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $title;
+
+	/**
+	 * Link item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $link;
+
+	/**
+	 * Description item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $description;
+
+	/**
+	 * Author item element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $author;
+
+	/**
+	 * Author email element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $authorEmail;
+
+	/**
+	 * Category element
+	 *
+	 * optional
+	 *
+	 * @var    array or string
+	 * @since  11.1
+	 */
+	public $category;
+
+	/**
+	 * Comments element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $comments;
+
+	/**
+	 * Enclosure element
+	 *
+	 * @var    FeedEnclosure
+	 * @since  11.1
+	 */
+	public $enclosure = null;
+
+	/**
+	 * Guid element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $guid;
+
+	/**
+	 * Published date
+	 *
+	 * optional
+	 *
+	 * May be in one of the following formats:
+	 *
+	 * RFC 822:
+	 * "Mon, 20 Jan 03 18:05:41 +0400"
+	 * "20 Jan 03 18:05:41 +0000"
+	 *
+	 * ISO 8601:
+	 * "2003-01-20T18:05:41+04:00"
+	 *
+	 * Unix:
+	 * 1043082341
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $date;
+
+	/**
+	 * Source element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $source;
+
+	/**
+	 * Set the FeedEnclosure for this item
+	 *
+	 * @param   FeedEnclosure  $enclosure  The FeedEnclosure to add to the feed.
+	 *
+	 * @return  FeedItem instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setEnclosure(FeedEnclosure $enclosure)
+	{
+		$this->enclosure = $enclosure;
+
+		return $this;
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Document/FeedDocument.php b/libraries/src/Joomla/CMS/Document/FeedDocument.php
index c62029c37d201..091142a2fdcc4 100644
--- a/libraries/src/Joomla/CMS/Document/FeedDocument.php
+++ b/libraries/src/Joomla/CMS/Document/FeedDocument.php
@@ -10,8 +10,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
-use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Document\Feed\FeedImage;
+use Joomla\CMS\Document\Feed\FeedItem;
 
 /**
  * FeedDocument class, provides an easy interface to parse and display any feed document
@@ -187,10 +187,10 @@ public function __construct($options = array())
 	 * @param   boolean  $cache   If true, cache the output
 	 * @param   array    $params  Associative array of attributes
 	 *
-	 * @return  The rendered data
+	 * @return  string The rendered data
 	 *
 	 * @since   11.1
-	 * @throws  Exception
+	 * @throws  \Exception
 	 * @todo    Make this cacheable
 	 */
 	public function render($cache = false, $params = array())
@@ -244,253 +244,3 @@ public function addItem(FeedItem $item)
 		return $this;
 	}
 }
-
-/**
- * FeedItem is an internal class that stores feed item information
- *
- * @since  11.1
- */
-class FeedItem
-{
-	/**
-	 * Title item element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $title;
-
-	/**
-	 * Link item element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $link;
-
-	/**
-	 * Description item element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $description;
-
-	/**
-	 * Author item element
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $author;
-
-	/**
-	 * Author email element
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $authorEmail;
-
-	/**
-	 * Category element
-	 *
-	 * optional
-	 *
-	 * @var    array or string
-	 * @since  11.1
-	 */
-	public $category;
-
-	/**
-	 * Comments element
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $comments;
-
-	/**
-	 * Enclosure element
-	 *
-	 * @var    FeedEnclosure
-	 * @since  11.1
-	 */
-	public $enclosure = null;
-
-	/**
-	 * Guid element
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $guid;
-
-	/**
-	 * Published date
-	 *
-	 * optional
-	 *
-	 * May be in one of the following formats:
-	 *
-	 * RFC 822:
-	 * "Mon, 20 Jan 03 18:05:41 +0400"
-	 * "20 Jan 03 18:05:41 +0000"
-	 *
-	 * ISO 8601:
-	 * "2003-01-20T18:05:41+04:00"
-	 *
-	 * Unix:
-	 * 1043082341
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $date;
-
-	/**
-	 * Source element
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $source;
-
-	/**
-	 * Set the FeedEnclosure for this item
-	 *
-	 * @param   FeedEnclosure  $enclosure  The FeedEnclosure to add to the feed.
-	 *
-	 * @return  FeedItem instance of $this to allow chaining
-	 *
-	 * @since   11.1
-	 */
-	public function setEnclosure(FeedEnclosure $enclosure)
-	{
-		$this->enclosure = $enclosure;
-
-		return $this;
-	}
-}
-
-/**
- * FeedEnclosure is an internal class that stores feed enclosure information
- *
- * @since  11.1
- */
-class FeedEnclosure
-{
-	/**
-	 * URL enclosure element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $url = '';
-
-	/**
-	 * Length enclosure element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $length = '';
-
-	/**
-	 * Type enclosure element
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $type = '';
-}
-
-/**
- * FeedImage is an internal class that stores feed image information
- *
- * @since  11.1
- */
-class FeedImage
-{
-	/**
-	 * Title image attribute
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $title = '';
-
-	/**
-	 * URL image attribute
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $url = '';
-
-	/**
-	 * Link image attribute
-	 *
-	 * required
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $link = '';
-
-	/**
-	 * Width image attribute
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $width;
-
-	/**
-	 * Title feed attribute
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $height;
-
-	/**
-	 * Title feed attribute
-	 *
-	 * optional
-	 *
-	 * @var    string
-	 * @since  11.1
-	 */
-	public $description;
-}

From 98175d884b2df28c7769a83db432d6fd131dcf96 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 07:26:13 -0500
Subject: [PATCH 085/148] Rename the document renderer base class

---
 libraries/classmap.php                                   | 2 +-
 .../{RendererDocument.php => DocumentRenderer.php}       | 9 ++++-----
 .../Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php   | 6 +++---
 .../Joomla/CMS/Document/Renderer/Feed/RssRenderer.php    | 6 +++---
 .../CMS/Document/Renderer/Html/ComponentRenderer.php     | 4 ++--
 .../Joomla/CMS/Document/Renderer/Html/HeadRenderer.php   | 4 ++--
 .../CMS/Document/Renderer/Html/MessageRenderer.php       | 4 ++--
 .../Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php | 4 ++--
 .../CMS/Document/Renderer/Html/ModulesRenderer.php       | 4 ++--
 9 files changed, 21 insertions(+), 22 deletions(-)
 rename libraries/src/Joomla/CMS/Document/{RendererDocument.php => DocumentRenderer.php} (86%)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index fd7e3dafa97e8..ebcfd4ee90fdb 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -186,7 +186,7 @@
 JLoader::registerAlias('JDocumentJson',                     '\\Joomla\\CMS\\Document\\JsonDocument', '5.0');
 JLoader::registerAlias('JDocumentOpensearch',               '\\Joomla\\CMS\\Document\\OpensearchDocument', '5.0');
 JLoader::registerAlias('JDocumentRaw',                      '\\Joomla\\CMS\\Document\\RawDocument', '5.0');
-JLoader::registerAlias('JDocumentRenderer',                 '\\Joomla\\CMS\\Document\\RendererDocument', '5.0');
+JLoader::registerAlias('JDocumentRenderer',                 '\\Joomla\\CMS\\Document\\DocumentRenderer', '5.0');
 JLoader::registerAlias('JDocumentXml',                      '\\Joomla\\CMS\\Document\\XmlDocument', '5.0');
 JLoader::registerAlias('JDocumentRendererFeedAtom',         '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '5.0');
 JLoader::registerAlias('JDocumentRendererFeedRss',          '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '5.0');
diff --git a/libraries/src/Joomla/CMS/Document/RendererDocument.php b/libraries/src/Joomla/CMS/Document/DocumentRenderer.php
similarity index 86%
rename from libraries/src/Joomla/CMS/Document/RendererDocument.php
rename to libraries/src/Joomla/CMS/Document/DocumentRenderer.php
index 40fd8b74a59f6..43fbe6d7aa4c3 100644
--- a/libraries/src/Joomla/CMS/Document/RendererDocument.php
+++ b/libraries/src/Joomla/CMS/Document/DocumentRenderer.php
@@ -10,7 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -18,12 +17,12 @@
  *
  * @since  11.1
  */
-class RendererDocument
+class DocumentRenderer
 {
 	/**
-	 * Reference to the JDocument object that instantiated the renderer
+	 * Reference to the Document object that instantiated the renderer
 	 *
-	 * @var    JDocument
+	 * @var    Document
 	 * @since  11.1
 	 */
 	protected $_doc = null;
@@ -39,7 +38,7 @@ class RendererDocument
 	/**
 	 * Class constructor
 	 *
-	 * @param   JDocument  $doc  A reference to the JDocument object that instantiated the renderer
+	 * @param   Document  $doc  A reference to the Document object that instantiated the renderer
 	 *
 	 * @since   11.1
 	 */
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
index 5af21b2ba7e4a..d94eb401c8caf 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\RendererDocument;
+use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -25,7 +25,7 @@
  *
  * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class AtomRenderer extends RendererDocument
+class AtomRenderer extends DocumentRenderer
 {
 	/**
 	 * Document mime type
@@ -44,7 +44,7 @@ class AtomRenderer extends RendererDocument
 	 *
 	 * @return  string  The output of the script
 	 *
-	 * @see     RendererDocument::render()
+	 * @see     DocumentRenderer::render()
 	 * @since   3.5
 	 */
 	public function render($name = '', $params = null, $content = null)
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
index e2d31d6a581ec..513af91778799 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\RendererDocument;
+use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -21,7 +21,7 @@
  *
  * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
  */
-class RssRenderer extends RendererDocument
+class RssRenderer extends DocumentRenderer
 {
 	/**
 	 * Renderer mime type
@@ -40,7 +40,7 @@ class RssRenderer extends RendererDocument
 	 *
 	 * @return  string  The output of the script
 	 *
-	 * @see     RendererDocument::render()
+	 * @see     DocumentRenderer::render()
 	 * @since   3.5
 	 */
 	public function render($name = '', $params = null, $content = null)
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
index 41ce0acaaefe5..7a32914b268a3 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
@@ -10,14 +10,14 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\RendererDocument;
+use Joomla\CMS\Document\DocumentRenderer;
 
 /**
  * Document Html Component Renderer
  *
  * @since  3.5
  */
-class ComponentRenderer extends RendererDocument
+class ComponentRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders a component script and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
index 5fd7a01c0fb61..d91ed5dfc5979 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\RendererDocument;
+use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Utilities\ArrayHelper;
@@ -20,7 +20,7 @@
  *
  * @since  3.5
  */
-class HeadRenderer extends RendererDocument
+class HeadRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders the document head and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
index 3c93ec57b07e9..1a6ee5dc61c3d 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\RendererDocument;
+use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -19,7 +19,7 @@
  *
  * @since  3.5
  */
-class MessageRenderer extends RendererDocument
+class MessageRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders the error stack and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
index b1a398d52b8b6..153a541632913 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\RendererDocument;
+use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -21,7 +21,7 @@
  *
  * @since  3.5
  */
-class ModuleRenderer extends RendererDocument
+class ModuleRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders a module script and returns the results as a string
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
index a91682cea3111..7356e9ce4ff24 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
@@ -10,7 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\RendererDocument;
+use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Layout\LayoutHelper;
 
@@ -19,7 +19,7 @@
  *
  * @since  3.5
  */
-class ModulesRenderer extends RendererDocument
+class ModulesRenderer extends DocumentRenderer
 {
 	/**
 	 * Renders multiple modules script and returns the results as a string

From 3c05b8fd31d92b9f972707e427c67ff6bff34f20 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 07:29:38 -0500
Subject: [PATCH 086/148] Deleted files updated

---
 administrator/components/com_admin/script.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 4aaf50bf574a0..833a8e42e2f6b 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -1768,6 +1768,25 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/crypt/password.php',
 			'/libraries/joomla/crypt/password/simple.php',
 			'/libraries/joomla/date/date.php',
+			'/libraries/joomla/document/document.php',
+			'/libraries/joomla/document/error.php',
+			'/libraries/joomla/document/feed.php',
+			'/libraries/joomla/document/feed/renderer/atom.php',
+			'/libraries/joomla/document/feed/renderer/rss.php',
+			'/libraries/joomla/document/html.php',
+			'/libraries/joomla/document/image.php',
+			'/libraries/joomla/document/json.php',
+			'/libraries/joomla/document/opensearch.php',
+			'/libraries/joomla/document/raw.php',
+			'/libraries/joomla/document/renderer.php',
+			'/libraries/joomla/document/renderer/feed/atom.php',
+			'/libraries/joomla/document/renderer/feed/rss.php',
+			'/libraries/joomla/document/renderer/html/component.php',
+			'/libraries/joomla/document/renderer/html/head.php',
+			'/libraries/joomla/document/renderer/html/message.php',
+			'/libraries/joomla/document/renderer/html/module.php',
+			'/libraries/joomla/document/renderer/html/modules.php',
+			'/libraries/joomla/document/xml.php',
 			'/libraries/joomla/environment/browser.php',
 			'/libraries/joomla/factory.php',
 			'/libraries/joomla/filter/input.php',

From 65140eb093435f2acf3da3eb94c5958213dd01d5 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 07:32:55 -0500
Subject: [PATCH 087/148] Fix deleted files listing

---
 administrator/components/com_admin/script.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 7eb455b1a0355..2a686396116a0 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -1775,6 +1775,11 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/document/feed/renderer/atom.php',
 			'/libraries/joomla/document/feed/renderer/rss.php',
 			'/libraries/joomla/document/html.php',
+			'/libraries/joomla/document/html/renderer/component.php',
+			'/libraries/joomla/document/html/renderer/head.php',
+			'/libraries/joomla/document/html/renderer/message.php',
+			'/libraries/joomla/document/html/renderer/module.php',
+			'/libraries/joomla/document/html/renderer/modules.php',
 			'/libraries/joomla/document/image.php',
 			'/libraries/joomla/document/json.php',
 			'/libraries/joomla/document/opensearch.php',
@@ -2085,7 +2090,18 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/crypt/password',
 			'/libraries/joomla/crypt',
 			'/libraries/joomla/date',
+			'/libraries/joomla/document/feed/renderer',
+			'/libraries/joomla/document/feed',
+			'/libraries/joomla/document/html/renderer',
+			'/libraries/joomla/document/html',
+			'/libraries/joomla/document/renderer/feed',
+			'/libraries/joomla/document/renderer/html',
+			'/libraries/joomla/document/renderer',
+			'/libraries/joomla/document',
 			'/libraries/joomla/environment',
+			'/libraries/joomla/feed/parser/rss',
+			'/libraries/joomla/feed/parser',
+			'/libraries/joomla/feed',
 			'/libraries/joomla/filter/wrapper',
 			'/libraries/joomla/filter',
 			'/libraries/joomla/form/rule',

From eb53a06581b5b825375507cc24f940fefdc7d690 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Fri, 28 Jul 2017 16:18:52 +0300
Subject: [PATCH 088/148] Cleanup and optimization in FinderIndexerDrivers
 (#13511)

* Cleanup and optimization in FinderIndexerDrivers
- Pulled up same methods to abstract class. These can still be overridden in inheriting drivers to provide a different functionality.
- Save a few cycles by introducing a query template to clone
- Save a few cycles by introducing by instantiating and using a dbCache property

* Forgot PHPDoc for constructor

* Renamed dbCache property to db.

* Comment fix

* Changes, according to @andrepereiradasilva's suggestions

* cs

* - Revert quoteName(array) as it seems it cannot be used with columns
- changes, according to @Quy's suggestions

* cs

* remove duplicate

* CS - Fixes
---
 .../helpers/indexer/driver/mysql.php          | 201 ++++--------------
 .../helpers/indexer/driver/postgresql.php     | 135 +-----------
 .../helpers/indexer/driver/sqlsrv.php         |  54 ++---
 .../com_finder/helpers/indexer/indexer.php    | 127 ++++++++++-
 4 files changed, 182 insertions(+), 335 deletions(-)

diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
index ac62b74527233..a5eeb53db9e1c 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/mysql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
@@ -41,7 +41,7 @@ public function index($item, $format = 'html')
 	{
 		// Mark beforeIndexing in the profiler.
 		static::$profiler ? static::$profiler->mark('beforeIndexing') : null;
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$nd = $db->getNullDate();
 
 		// Check if the item is in the database.
@@ -125,24 +125,24 @@ public function index($item, $format = 'html')
 				->insert($db->quoteName('#__finder_links'))
 				->columns($columnsArray)
 				->values(
-				$db->quote($item->url) . ', '
-				. $db->quote($item->route) . ', '
-				. $db->quote($item->title) . ', '
-				. $db->quote($item->description) . ', '
-				. $query->currentTimestamp() . ', '
-				. '1, '
-				. (int) $item->state . ', '
-				. (int) $item->access . ', '
-				. $db->quote($item->language) . ', '
-				. (int) $item->type_id . ', '
-				. $db->quote(serialize($item)) . ', '
-				. $db->quote($item->publish_start_date) . ', '
-				. $db->quote($item->publish_end_date) . ', '
-				. $db->quote($item->start_date) . ', '
-				. $db->quote($item->end_date) . ', '
-				. (double) ($item->list_price ?: 0) . ', '
-				. (double) ($item->sale_price ?: 0)
-			);
+					$db->quote($item->url) . ', '
+					. $db->quote($item->route) . ', '
+					. $db->quote($item->title) . ', '
+					. $db->quote($item->description) . ', '
+					. $query->currentTimestamp() . ', '
+					. '1, '
+					. (int) $item->state . ', '
+					. (int) $item->access . ', '
+					. $db->quote($item->language) . ', '
+					. (int) $item->type_id . ', '
+					. $db->quote(serialize($item)) . ', '
+					. $db->quote($item->publish_start_date) . ', '
+					. $db->quote($item->publish_end_date) . ', '
+					. $db->quote($item->start_date) . ', '
+					. $db->quote($item->end_date) . ', '
+					. (double) ($item->list_price ?: 0) . ', '
+					. (double) ($item->sale_price ?: 0)
+				);
 			$db->setQuery($query);
 			$db->execute();
 
@@ -287,30 +287,30 @@ public function index($item, $format = 'html')
 		 * table.
 		 */
 		$query = 'INSERT INTO ' . $db->quoteName('#__finder_tokens_aggregate') .
-				' (' . $db->quoteName('term_id') .
-				', ' . $db->quoteName('map_suffix') .
+			' (' . $db->quoteName('term_id') .
+			', ' . $db->quoteName('map_suffix') .
 				', ' . $db->quoteName('term') .
-				', ' . $db->quoteName('stem') .
-				', ' . $db->quoteName('common') .
-				', ' . $db->quoteName('phrase') .
-				', ' . $db->quoteName('term_weight') .
-				', ' . $db->quoteName('context') .
-				', ' . $db->quoteName('context_weight') .
-				', ' . $db->quoteName('total_weight') .
+			', ' . $db->quoteName('stem') .
+			', ' . $db->quoteName('common') .
+			', ' . $db->quoteName('phrase') .
+			', ' . $db->quoteName('term_weight') .
+			', ' . $db->quoteName('context') .
+			', ' . $db->quoteName('context_weight') .
+			', ' . $db->quoteName('total_weight') .
 				', ' . $db->quoteName('language') . ')' .
-				' SELECT' .
-				' COALESCE(t.term_id, 0), \'\', t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context,' .
-				' ROUND( t1.weight * COUNT( t2.term ) * %F, 8 ) AS context_weight, 0, t1.language' .
-				' FROM (' .
-				'   SELECT DISTINCT t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
-				'   FROM ' . $db->quoteName('#__finder_tokens') . ' AS t1' .
-				'   WHERE t1.context = %d' .
-				' ) AS t1' .
-				' JOIN ' . $db->quoteName('#__finder_tokens') . ' AS t2 ON t2.term = t1.term' .
-				' LEFT JOIN ' . $db->quoteName('#__finder_terms') . ' AS t ON t.term = t1.term' .
-				' WHERE t2.context = %d' .
-				' GROUP BY t1.term, t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
-				' ORDER BY t1.term DESC';
+			' SELECT' .
+			' COALESCE(t.term_id, 0), \'\', t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context,' .
+			' ROUND( t1.weight * COUNT( t2.term ) * %F, 8 ) AS context_weight, 0, t1.language' .
+			' FROM (' .
+			'   SELECT DISTINCT t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+			'   FROM ' . $db->quoteName('#__finder_tokens') . ' AS t1' .
+			'   WHERE t1.context = %d' .
+			' ) AS t1' .
+			' JOIN ' . $db->quoteName('#__finder_tokens') . ' AS t2 ON t2.term = t1.term' .
+			' LEFT JOIN ' . $db->quoteName('#__finder_terms') . ' AS t ON t.term = t1.term' .
+			' WHERE t2.context = %d' .
+			' GROUP BY t1.term, t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+			' ORDER BY t1.term DESC';
 
 		// Iterate through the contexts and aggregate the tokens per context.
 		foreach ($state->weights as $context => $multiplier)
@@ -451,64 +451,6 @@ public function index($item, $format = 'html')
 		return $linkId;
 	}
 
-	/**
-	 * Method to remove a link from the index.
-	 *
-	 * @param   integer  $linkId  The id of the link.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   2.5
-	 * @throws  Exception on database error.
-	 */
-	public function remove($linkId)
-	{
-		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-
-		// Update the link counts and remove the mapping records.
-		for ($i = 0; $i <= 15; $i++)
-		{
-			// Update the link counts for the terms.
-			$query->clear()
-				->update($db->quoteName('#__finder_terms') . ' AS t')
-				->join('INNER', $db->quoteName('#__finder_links_terms' . dechex($i)) . ' AS m ON m.term_id = t.term_id')
-				->set('t.links = t.links - 1')
-				->where('m.link_id = ' . $db->quote((int) $linkId));
-			$db->setQuery($query);
-			$db->execute();
-
-			// Remove all records from the mapping tables.
-			$query->clear()
-				->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
-				->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
-			$db->setQuery($query);
-			$db->execute();
-		}
-
-		// Delete all orphaned terms.
-		$query->clear()
-			->delete($db->quoteName('#__finder_terms'))
-			->where($db->quoteName('links') . ' <= 0');
-		$db->setQuery($query);
-		$db->execute();
-
-		// Delete the link from the index.
-		$query->clear()
-			->delete($db->quoteName('#__finder_links'))
-			->where($db->quoteName('link_id') . ' = ' . $db->quote((int) $linkId));
-		$db->setQuery($query);
-		$db->execute();
-
-		// Remove the taxonomy maps.
-		FinderIndexerTaxonomy::removeMaps($linkId);
-
-		// Remove the orphaned taxonomy nodes.
-		FinderIndexerTaxonomy::removeOrphanNodes();
-
-		return true;
-	}
-
 	/**
 	 * Method to optimize the index. We use this method to remove unused terms
 	 * and any other optimizations that might be necessary.
@@ -521,7 +463,7 @@ public function remove($linkId)
 	public function optimize()
 	{
 		// Get the database object.
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$query = $db->getQuery(true);
 
 		// Delete all orphaned terms.
@@ -567,63 +509,6 @@ public function optimize()
 		return true;
 	}
 
-	/**
-	 * Method to add a set of tokens to the database.
-	 *
-	 * @param   mixed  $tokens   An array or single FinderIndexerToken object.
-	 * @param   mixed  $context  The context of the tokens. See context constants. [optional]
-	 *
-	 * @return  integer  The number of tokens inserted into the database.
-	 *
-	 * @since   3.0
-	 * @throws  Exception on database error.
-	 */
-	protected function addTokensToDb($tokens, $context = '')
-	{
-		// Get the database object.
-		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-
-		// Force tokens to an array.
-		$tokens = is_array($tokens) ? $tokens : array($tokens);
-
-		// Count the number of token values.
-		$values = 0;
-
-		// Insert the tokens into the database.
-		$query->insert($db->quoteName('#__finder_tokens'))
-			->columns(
-				array(
-					$db->quoteName('term'),
-					$db->quoteName('stem'),
-					$db->quoteName('common'),
-					$db->quoteName('phrase'),
-					$db->quoteName('weight'),
-					$db->quoteName('context'),
-					$db->quoteName('language')
-				)
-			);
-
-		// Iterate through the tokens to create SQL value sets.
-		foreach ($tokens as $token)
-		{
-			$query->values(
-				$db->quote($token->term) . ', '
-					. $db->quote($token->stem) . ', '
-					. (int) $token->common . ', '
-					. (int) $token->phrase . ', '
-					. (float) $token->weight . ', '
-					. (int) $context . ', '
-					. $db->quote($token->language)
-			);
-			$values++;
-		}
-
-		$db->setQuery($query);
-		$db->execute();
-
-		return $values;
-	}
 
 	/**
 	 * Method to switch the token tables from Memory tables to MyISAM tables
@@ -641,7 +526,7 @@ protected function toggleTables($memory)
 		static $state;
 
 		// Get the database adapter.
-		$db = JFactory::getDbo();
+		$db = $this->db;
 
 		// Check if we are setting the tables to the Memory engine.
 		if ($memory === true && $state !== true)
diff --git a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
index dfe26f28403f7..080627d072d66 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
@@ -33,7 +33,7 @@ public function index($item, $format = 'html')
 	{
 		// Mark beforeIndexing in the profiler.
 		static::$profiler ? static::$profiler->mark('beforeIndexing') : null;
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$nd = $db->getNullDate();
 
 		// Check if the item is in the database.
@@ -451,63 +451,6 @@ public function index($item, $format = 'html')
 		return $linkId;
 	}
 
-	/**
-	 * Method to remove a link from the index.
-	 *
-	 * @param   integer  $linkId  The id of the link.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   2.5
-	 * @throws  Exception on database error.
-	 */
-	public function remove($linkId)
-	{
-		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-
-		// Update the link counts and remove the mapping records.
-		for ($i = 0; $i <= 15; $i++)
-		{
-			// Update the link counts for the terms.
-			$query->clear()
-				->update($db->quoteName('#__finder_terms') . ' AS t')
-				->join('INNER', $db->quoteName('#__finder_links_terms' . dechex($i)) . ' AS m ON m.term_id = t.term_id')
-				->set('links = t.links - 1')
-				->where('m.link_id = ' . $db->quote((int) $linkId));
-			$db->setQuery($query);
-			$db->execute();
-
-			// Remove all records from the mapping tables.
-			$query->clear()
-				->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
-				->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
-			$db->setQuery($query);
-			$db->execute();
-		}
-
-		// Delete all orphaned terms.
-		$query->clear()
-			->delete($db->quoteName('#__finder_terms'))
-			->where($db->quoteName('links') . ' <= 0');
-		$db->setQuery($query);
-		$db->execute();
-
-		// Delete the link from the index.
-		$query->clear()
-			->delete($db->quoteName('#__finder_links'))
-			->where($db->quoteName('link_id') . ' = ' . $db->quote((int) $linkId));
-		$db->setQuery($query);
-		$db->execute();
-
-		// Remove the taxonomy maps.
-		FinderIndexerTaxonomy::removeMaps($linkId);
-
-		// Remove the orphaned taxonomy nodes.
-		FinderIndexerTaxonomy::removeOrphanNodes();
-
-		return true;
-	}
 
 	/**
 	 * Method to optimize the index. We use this method to remove unused terms
@@ -521,7 +464,7 @@ public function remove($linkId)
 	public function optimize()
 	{
 		// Get the database object.
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$query = $db->getQuery(true);
 
 		// Delete all orphaned terms.
@@ -552,7 +495,7 @@ public function optimize()
 		// Optimize the terms common table.
 		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_terms_common'));
 		$db->execute();
-		
+
 		// Optimize the types table.
 		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_types'));
 		$db->execute();
@@ -571,77 +514,5 @@ public function optimize()
 		return true;
 	}
 
-	/**
-	 * Method to add a set of tokens to the database.
-	 *
-	 * @param   mixed  $tokens   An array or single FinderIndexerToken object.
-	 * @param   mixed  $context  The context of the tokens. See context constants. [optional]
-	 *
-	 * @return  integer  The number of tokens inserted into the database.
-	 *
-	 * @since   2.5
-	 * @throws  Exception on database error.
-	 */
-	protected function addTokensToDb($tokens, $context = '')
-	{
-		// Get the database object.
-		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-
-		// Force tokens to an array.
-		$tokens = is_array($tokens) ? $tokens : array($tokens);
-
-		// Count the number of token values.
-		$values = 0;
-
-		// Insert the tokens into the database.
-		$query->insert($db->quoteName('#__finder_tokens'))
-			->columns(
-				array(
-					$db->quoteName('term'),
-					$db->quoteName('stem'),
-					$db->quoteName('common'),
-					$db->quoteName('phrase'),
-					$db->quoteName('weight'),
-					$db->quoteName('context'),
-					$db->quoteName('language')
-				)
-			);
 
-		// Iterate through the tokens to create SQL value sets.
-		foreach ($tokens as $token)
-		{
-			$query->values(
-				$db->quote($token->term) . ', '
-					. $db->quote($token->stem) . ', '
-					. (int) $token->common . ', '
-					. (int) $token->phrase . ', '
-					. (float) $token->weight . ', '
-					. (int) $context . ', '
-					. $db->quote($token->language)
-			);
-			$values++;
-		}
-
-		$db->setQuery($query);
-		$db->execute();
-
-		return $values;
-	}
-
-	/**
-	 * Method to switch the token tables from Memory tables to MyISAM tables
-	 * when they are close to running out of memory.
-	 *
-	 * @param   boolean  $memory  Flag to control how they should be toggled.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   2.5
-	 * @throws  Exception on database error.
-	 */
-	protected function toggleTables($memory)
-	{
-		return true;
-	}
 }
diff --git a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
index e89e19bad1d52..2b1e07a54ffb2 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
@@ -41,7 +41,7 @@ public function index($item, $format = 'html')
 	{
 		// Mark beforeIndexing in the profiler.
 		static::$profiler ? static::$profiler->mark('beforeIndexing') : null;
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$nd = $db->getNullDate();
 
 		// Check if the item is in the database.
@@ -458,7 +458,7 @@ public function index($item, $format = 'html')
 	 */
 	public function remove($linkId)
 	{
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$query = $db->getQuery(true);
 
 		// Update the link counts and remove the mapping records.
@@ -514,7 +514,7 @@ public function remove($linkId)
 	public function optimize()
 	{
 		// Get the database object.
-		$db = JFactory::getDbo();
+		$db = $this->db;
 		$query = $db->getQuery(true);
 
 		// Delete all orphaned terms.
@@ -543,8 +543,9 @@ public function optimize()
 	protected function addTokensToDb($tokens, $context = '')
 	{
 		// Get the database object.
-		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
+		$db = $this->db;
+
+		$query = clone $this->addTokensToDbQueryTemplate;
 
 		// Force tokens to an array.
 		$tokens = is_array($tokens) ? $tokens : array($tokens);
@@ -572,57 +573,28 @@ protected function addTokensToDb($tokens, $context = '')
 				. (int) $context . ', '
 				. $db->quote($token->language)
 			);
-			$values++;
-			$iterations++;
-			$remaining--;
+			++$values;
+			++$iterations;
+			--$remaining;
 
 			// Run the query if we've reached 1000 iterations or there are no tokens remaining
-			if ($iterations == 1000 || $remaining == 0)
+			if ($iterations === 1000 || $remaining === 0)
 			{
-				// Insert the tokens into the database.
-				$query->insert($db->quoteName('#__finder_tokens'))
-					->columns(
-					array(
-						$db->quoteName('term'),
-						$db->quoteName('stem'),
-						$db->quoteName('common'),
-						$db->quoteName('phrase'),
-						$db->quoteName('weight'),
-						$db->quoteName('context'),
-						$db->quoteName('language')
-					)
-				);
 				$db->setQuery($query);
 				$db->execute();
 
 				// Reset the query
-				$query->clear();
+				$query = clone $this->addTokensToDbQueryTemplate;
 			}
 
 			// If there's nothing remaining, we're done looping
-			if ($remaining == 0)
+			if ($remaining === 0)
 			{
 				$loop = false;
 			}
 		}
-		while ($loop == true);
+		while ($loop === true);
 
 		return $values;
 	}
-
-	/**
-	 * Method to switch the token tables from Memory tables to MyISAM tables
-	 * when they are close to running out of memory.
-	 *
-	 * @param   boolean  $memory  Flag to control how they should be toggled.
-	 *
-	 * @return  boolean  True on success.
-	 *
-	 * @since   3.1
-	 * @throws  Exception on database error.
-	 */
-	protected function toggleTables($memory)
-	{
-		return true;
-	}
 }
diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php
index e62907ec87767..bef3a51ac7835 100644
--- a/administrator/components/com_finder/helpers/indexer/indexer.php
+++ b/administrator/components/com_finder/helpers/indexer/indexer.php
@@ -90,6 +90,48 @@ abstract class FinderIndexer
 	 */
 	public static $profiler;
 
+	/**
+	 * Database driver cache.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
+	/**
+	 * Reusable Query Template. To be used with clone.
+	 *
+	 * @var    JDatabaseQuery
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $addTokensToDbQueryTemplate;
+
+	/**
+	 * FinderIndexer constructor.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function __construct()
+	{
+		$this->db = JFactory::getDbo();
+
+		$db = $this->db;
+
+		// Set up query template for addTokensToDb
+		$this->addTokensToDbQueryTemplate = $db->getQuery(true)->insert($db->quoteName('#__finder_tokens'))
+			->columns(
+				array(
+					$db->quoteName('term'),
+					$db->quoteName('stem'),
+					$db->quoteName('common'),
+					$db->quoteName('phrase'),
+					$db->quoteName('weight'),
+					$db->quoteName('context'),
+					$db->quoteName('language')
+				)
+			);
+	}
+
 	/**
 	 * Returns a reference to the FinderIndexer object.
 	 *
@@ -254,7 +296,49 @@ abstract public function index($item, $format = 'html');
 	 * @since   2.5
 	 * @throws  Exception on database error.
 	 */
-	abstract public function remove($linkId);
+	public function remove($linkId)
+	{
+		$db    = $this->db;
+		$query = $db->getQuery(true);
+
+		// Update the link counts and remove the mapping records.
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Update the link counts for the terms.
+			$query->clear()
+				->update($db->quoteName('#__finder_terms', 't'))
+				->join('INNER', $db->quoteName('#__finder_links_terms' . dechex($i), 'm') . ' ON m.term_id = t.term_id')
+				->set('t.links = t.links - 1')
+				->where($db->quoteName('m.link_id') . ' = ' . (int) $linkId);
+			$db->setQuery($query)->execute();
+
+			// Remove all records from the mapping tables.
+			$query->clear()
+				->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
+				->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+			$db->setQuery($query)->execute();
+		}
+
+		// Delete all orphaned terms.
+		$query->clear()
+			->delete($db->quoteName('#__finder_terms'))
+			->where($db->quoteName('links') . ' <= 0');
+		$db->setQuery($query)->execute();
+
+		// Delete the link from the index.
+		$query->clear()
+			->delete($db->quoteName('#__finder_links'))
+			->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+		$db->setQuery($query)->execute();
+
+		// Remove the taxonomy maps.
+		FinderIndexerTaxonomy::removeMaps($linkId);
+
+		// Remove the orphaned taxonomy nodes.
+		FinderIndexerTaxonomy::removeOrphanNodes();
+
+		return true;
+	}
 
 	/**
 	 * Method to optimize the index. We use this method to remove unused terms
@@ -420,11 +504,43 @@ private function tokenizeToDbShort($input, $context, $lang, $format, $count)
 	 * @since   2.5
 	 * @throws  Exception on database error.
 	 */
-	abstract protected function addTokensToDb($tokens, $context = '');
+	protected function addTokensToDb($tokens, $context = '')
+	{
+		// Get the database object.
+		$db = $this->db;
+
+		$query = clone $this->addTokensToDbQueryTemplate;
+
+		// Force tokens to an array.
+		$tokens = (array) $tokens;
+
+		// Count the number of token values.
+		$values = 0;
+
+		// Iterate through the tokens to create SQL value sets.
+		foreach ($tokens as $token)
+		{
+			$query->values(
+				$db->quote($token->term) . ', '
+				. $db->quote($token->stem) . ', '
+				. (int) $token->common . ', '
+				. (int) $token->phrase . ', '
+				. (float) $token->weight . ', '
+				. (int) $context . ', '
+				. $db->quote($token->language)
+			);
+			++$values;
+		}
+
+		$db->setQuery($query)->execute();
+
+		return $values;
+	}
 
 	/**
-	 * Method to switch the token tables from Memory tables to MyISAM tables
+	 * Method to switch the token tables from Memory tables to Disk tables
 	 * when they are close to running out of memory.
+	 * Since this is not supported/implemented in all DB-drivers, the default is a stub method, which simply returns true.
 	 *
 	 * @param   boolean  $memory  Flag to control how they should be toggled.
 	 *
@@ -433,5 +549,8 @@ abstract protected function addTokensToDb($tokens, $context = '');
 	 * @since   2.5
 	 * @throws  Exception on database error.
 	 */
-	abstract protected function toggleTables($memory);
+	protected function toggleTables($memory)
+	{
+		return true;
+	}
 }

From 8a6e5dab2f103a1285cdbc5740908d373598933d Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 09:41:32 -0500
Subject: [PATCH 089/148] Don't load unexisting paths

---
 .../document/html/renderer/JDocumentRendererComponentTest.php   | 2 --
 .../document/html/renderer/JDocumentRendererMessageTest.php     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererComponentTest.php b/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererComponentTest.php
index eab3394a71e68..e2e1736f6691e 100644
--- a/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererComponentTest.php
+++ b/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererComponentTest.php
@@ -6,8 +6,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-include_once JPATH_PLATFORM . '/joomla/document/html/renderer/component.php';
-
 /**
  * Test class for JDocumentRendererComponent
  */
diff --git a/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php b/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php
index bfdd8508ad3bd..e0e762c957fe6 100644
--- a/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php
+++ b/tests/unit/suites/libraries/joomla/document/html/renderer/JDocumentRendererMessageTest.php
@@ -6,8 +6,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-include_once JPATH_PLATFORM . '/joomla/document/html/renderer/message.php';
-
 /**
  * Test class for JDocumentRendererMessage
  */

From 66910c39e77c9a5c8414ac8aa856ed02f9a2a5e5 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 09:53:52 -0500
Subject: [PATCH 090/148] Class mappings for internal classes that apparently
 aren't internal

---
 libraries/classmap.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index 9dd78478c520f..e55ef1ca3a52e 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -202,6 +202,11 @@
 JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '4.0');
 JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '4.0');
 JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '4.0');
+JLoader::registerAlias('JFeedEnclosure',                    '\\Joomla\\CMS\\Document\\Feed\\FeedEnclosure', '5.0');
+JLoader::registerAlias('JFeedImage',                        '\\Joomla\\CMS\\Document\\Feed\\FeedImage', '5.0');
+JLoader::registerAlias('JFeedItem',                         '\\Joomla\\CMS\\Document\\Feed\\FeedItem', '5.0');
+JLoader::registerAlias('JOpensearchImage',                  '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchImage', '5.0');
+JLoader::registerAlias('JOpensearchUrl',                    '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchUrl', '5.0');
 
 JLoader::registerAlias('JFilterInput',                      '\\Joomla\\CMS\\Filter\\InputFilter', '5.0');
 JLoader::registerAlias('JFilterOutput',                     '\\Joomla\\CMS\\Filter\\OutputFilter', '5.0');

From c6ea8aa03029eff7421466789643ccc39097201c Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 09:59:17 -0500
Subject: [PATCH 091/148] Various doc block fixes and removing unneeded imports

---
 libraries/src/Joomla/CMS/Document/ErrorDocument.php   | 11 +++++------
 .../src/Joomla/CMS/Document/Feed/FeedEnclosure.php    |  2 +-
 libraries/src/Joomla/CMS/Document/Feed/FeedImage.php  |  2 +-
 libraries/src/Joomla/CMS/Document/Feed/FeedItem.php   |  2 +-
 libraries/src/Joomla/CMS/Document/HtmlDocument.php    |  1 -
 libraries/src/Joomla/CMS/Document/ImageDocument.php   |  2 --
 libraries/src/Joomla/CMS/Document/JsonDocument.php    |  2 --
 .../CMS/Document/Opensearch/OpensearchImage.php       |  2 +-
 .../Joomla/CMS/Document/Opensearch/OpensearchUrl.php  |  2 +-
 .../src/Joomla/CMS/Document/OpensearchDocument.php    |  5 ++---
 libraries/src/Joomla/CMS/Document/RawDocument.php     |  2 --
 .../CMS/Document/Renderer/Feed/AtomRenderer.php       |  2 +-
 .../Joomla/CMS/Document/Renderer/Feed/RssRenderer.php |  2 +-
 .../CMS/Document/Renderer/Html/ComponentRenderer.php  |  2 +-
 .../CMS/Document/Renderer/Html/HeadRenderer.php       |  2 +-
 .../CMS/Document/Renderer/Html/MessageRenderer.php    |  2 +-
 .../CMS/Document/Renderer/Html/ModuleRenderer.php     |  2 +-
 .../CMS/Document/Renderer/Html/ModulesRenderer.php    |  2 +-
 libraries/src/Joomla/CMS/Document/XmlDocument.php     |  2 --
 19 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Document/ErrorDocument.php b/libraries/src/Joomla/CMS/Document/ErrorDocument.php
index 081b332f54663..9d4ea8f4f20f3 100644
--- a/libraries/src/Joomla/CMS/Document/ErrorDocument.php
+++ b/libraries/src/Joomla/CMS/Document/ErrorDocument.php
@@ -10,9 +10,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
-use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * ErrorDocument class, provides an easy interface to parse and display an error page
@@ -40,7 +39,7 @@ class ErrorDocument extends Document
 	/**
 	 * Error Object
 	 *
-	 * @var    Exception|Throwable
+	 * @var    \Exception|\Throwable
 	 * @since  11.1
 	 */
 	public $error;
@@ -64,7 +63,7 @@ class ErrorDocument extends Document
 	/**
 	 * Error Object
 	 *
-	 * @var    Exception|Throwable
+	 * @var    \Exception|\Throwable
 	 * @since  11.1
 	 */
 	protected $_error;
@@ -90,7 +89,7 @@ public function __construct($options = array())
 	/**
 	 * Set error object
 	 *
-	 * @param   Exception|Throwable  $error  Error object to set
+	 * @param   \Exception|\Throwable  $error  Error object to set
 	 *
 	 * @return  boolean  True on success
 	 *
@@ -98,7 +97,7 @@ public function __construct($options = array())
 	 */
 	public function setError($error)
 	{
-		$expectedClass = PHP_MAJOR_VERSION >= 7 ? 'Throwable' : 'Exception';
+		$expectedClass = PHP_MAJOR_VERSION >= 7 ? '\\Throwable' : '\\Exception';
 
 		if ($error instanceof $expectedClass)
 		{
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php b/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php
index d34bd7c539891..189cf74b332c7 100644
--- a/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php
+++ b/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php
@@ -11,7 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * FeedEnclosure is an internal class that stores feed enclosure information
+ * Data object representing a feed enclosure
  *
  * @since  11.1
  */
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php b/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php
index 1d70cead5b385..badb11218c3cd 100644
--- a/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php
+++ b/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php
@@ -11,7 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * FeedImage is an internal class that stores feed image information
+ * Data object representing a feed image
  *
  * @since  11.1
  */
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php b/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php
index b8ad184535a56..e057d05f4d148 100644
--- a/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php
+++ b/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php
@@ -11,7 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * FeedItem is an internal class that stores feed item information
+ * Data object representing a feed item
  *
  * @since  11.1
  */
diff --git a/libraries/src/Joomla/CMS/Document/HtmlDocument.php b/libraries/src/Joomla/CMS/Document/HtmlDocument.php
index 6657a13aa7343..83191c4f72747 100644
--- a/libraries/src/Joomla/CMS/Document/HtmlDocument.php
+++ b/libraries/src/Joomla/CMS/Document/HtmlDocument.php
@@ -11,7 +11,6 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Cache\Cache;
-use Joomla\CMS\Document\Document;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Uri\Uri;
diff --git a/libraries/src/Joomla/CMS/Document/ImageDocument.php b/libraries/src/Joomla/CMS/Document/ImageDocument.php
index 52396d8997280..0acb8f629ea54 100644
--- a/libraries/src/Joomla/CMS/Document/ImageDocument.php
+++ b/libraries/src/Joomla/CMS/Document/ImageDocument.php
@@ -10,8 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
-
 /**
  * ImageDocument class, provides an easy interface to output image data
  *
diff --git a/libraries/src/Joomla/CMS/Document/JsonDocument.php b/libraries/src/Joomla/CMS/Document/JsonDocument.php
index ecff4a1fbf9db..c68a5a35703bc 100644
--- a/libraries/src/Joomla/CMS/Document/JsonDocument.php
+++ b/libraries/src/Joomla/CMS/Document/JsonDocument.php
@@ -10,8 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
-
 /**
  * JsonDocument class, provides an easy interface to parse and display JSON output
  *
diff --git a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php
index f7af437cdba47..053dc421017b8 100644
--- a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php
+++ b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php
@@ -11,7 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * OpensearchImage is an internal class that stores Images for the Opensearch Description
+ * Data object representing an OpenSearch image
  *
  * @since  11.1
  */
diff --git a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php
index 4d470b65d196b..c41caf1be9002 100644
--- a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php
+++ b/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php
@@ -11,7 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * OpensearchUrl is an internal class that stores the search URLs for the OpenSearch description
+ * Data object representing an OpenSearch URL
  *
  * @since  11.1
  */
diff --git a/libraries/src/Joomla/CMS/Document/OpensearchDocument.php b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
index 8d3ddbb38581e..affcb97626fa5 100644
--- a/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
+++ b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
@@ -10,10 +10,9 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
-use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\Document\Opensearch\OpensearchUrl;
 use Joomla\CMS\Document\Opensearch\OpensearchImage;
+use Joomla\CMS\Document\Opensearch\OpensearchUrl;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Opensearch class, provides an easy interface to display an Opensearch document
diff --git a/libraries/src/Joomla/CMS/Document/RawDocument.php b/libraries/src/Joomla/CMS/Document/RawDocument.php
index f831ccf4fb9a5..e42e1caf5cb03 100644
--- a/libraries/src/Joomla/CMS/Document/RawDocument.php
+++ b/libraries/src/Joomla/CMS/Document/RawDocument.php
@@ -10,8 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
-
 /**
  * RawDocument class, provides an easy interface to parse and display raw output
  *
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
index d94eb401c8caf..72a7312666c23 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
@@ -23,7 +23,7 @@
  * @link   http://www.atomenabled.org/developers/syndication/atom-format-spec.php
  * @since  3.5
  *
- * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
+ * @property-read  \Joomla\CMS\Document\FeedDocument  $_doc  Reference to the Document object that instantiated the renderer
  */
 class AtomRenderer extends DocumentRenderer
 {
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
index 513af91778799..49538b3a3fb14 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
@@ -19,7 +19,7 @@
  * @link   http://www.rssboard.org/rss-specification
  * @since  3.5
  *
- * @property-read  DocumentFeed  $_doc  Reference to the Document object that instantiated the renderer
+ * @property-read  \Joomla\CMS\Document\FeedDocument  $_doc  Reference to the Document object that instantiated the renderer
  */
 class RssRenderer extends DocumentRenderer
 {
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
index 7a32914b268a3..e52996939b8f4 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Document\DocumentRenderer;
 
 /**
- * Document Html Component Renderer
+ * HTML document renderer for the component output
  *
  * @since  3.5
  */
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
index dfc309ca8ce9a..ff39530328d86 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
@@ -16,7 +16,7 @@
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * Document Html Head Renderer
+ * HTML document renderer for the document `<head>` element
  *
  * @since  3.5
  */
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
index 1a6ee5dc61c3d..ce169d301e7a5 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 /**
- * Document Html Message Renderer
+ * HTML document renderer for the system message queue
  *
  * @since  3.5
  */
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
index 153a541632913..596c511d2944f 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
@@ -17,7 +17,7 @@
 use Joomla\Registry\Registry;
 
 /**
- * Document Html Module Renderer
+ * HTML document renderer for a single module
  *
  * @since  3.5
  */
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
index 7356e9ce4ff24..995a997c12833 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 /**
- * Document Html Modules Renderer
+ * HTML document renderer for a module position
  *
  * @since  3.5
  */
diff --git a/libraries/src/Joomla/CMS/Document/XmlDocument.php b/libraries/src/Joomla/CMS/Document/XmlDocument.php
index b0623efef746c..fa1cae49ae2e6 100644
--- a/libraries/src/Joomla/CMS/Document/XmlDocument.php
+++ b/libraries/src/Joomla/CMS/Document/XmlDocument.php
@@ -10,8 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Document\Document;
-
 /**
  * XmlDocument class, provides an easy interface to parse and display XML output
  *

From 665bfec7d5a7551c02a46484498b4ee2cc0d4eb0 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 10:04:28 -0500
Subject: [PATCH 092/148] Fix namespace use and class casing

---
 libraries/classmap.php                                   | 4 ++--
 libraries/src/Joomla/CMS/Document/OpensearchDocument.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/classmap.php b/libraries/classmap.php
index e55ef1ca3a52e..b605e8cc48b01 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -205,8 +205,8 @@
 JLoader::registerAlias('JFeedEnclosure',                    '\\Joomla\\CMS\\Document\\Feed\\FeedEnclosure', '5.0');
 JLoader::registerAlias('JFeedImage',                        '\\Joomla\\CMS\\Document\\Feed\\FeedImage', '5.0');
 JLoader::registerAlias('JFeedItem',                         '\\Joomla\\CMS\\Document\\Feed\\FeedItem', '5.0');
-JLoader::registerAlias('JOpensearchImage',                  '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchImage', '5.0');
-JLoader::registerAlias('JOpensearchUrl',                    '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchUrl', '5.0');
+JLoader::registerAlias('JOpenSearchImage',                  '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchImage', '5.0');
+JLoader::registerAlias('JOpenSearchUrl',                    '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchUrl', '5.0');
 
 JLoader::registerAlias('JFilterInput',                      '\\Joomla\\CMS\\Filter\\InputFilter', '5.0');
 JLoader::registerAlias('JFilterOutput',                     '\\Joomla\\CMS\\Filter\\OutputFilter', '5.0');
diff --git a/libraries/src/Joomla/CMS/Document/OpensearchDocument.php b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
index affcb97626fa5..a44585ac1f39a 100644
--- a/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
+++ b/libraries/src/Joomla/CMS/Document/OpensearchDocument.php
@@ -124,7 +124,7 @@ public function __construct($options = array())
 	 */
 	public function render($cache = false, $params = array())
 	{
-		$xml = new DOMDocument('1.0', 'utf-8');
+		$xml = new \DOMDocument('1.0', 'utf-8');
 
 		if (defined('JDEBUG') && JDEBUG)
 		{

From 0f71c42abda50271d40025b98705aa560f518faa Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 20:59:39 -0500
Subject: [PATCH 093/148] Namespace sodium cipher, use compat API

---
 .../Joomla/CMS/Crypt/Cipher/SodiumCipher.php} | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)
 rename libraries/{joomla/crypt/cipher/sodium.php => src/Joomla/CMS/Crypt/Cipher/SodiumCipher.php} (53%)

diff --git a/libraries/joomla/crypt/cipher/sodium.php b/libraries/src/Joomla/CMS/Crypt/Cipher/SodiumCipher.php
similarity index 53%
rename from libraries/joomla/crypt/cipher/sodium.php
rename to libraries/src/Joomla/CMS/Crypt/Cipher/SodiumCipher.php
index 671ceb2b6564d..993d1a4e65578 100644
--- a/libraries/joomla/crypt/cipher/sodium.php
+++ b/libraries/src/Joomla/CMS/Crypt/Cipher/SodiumCipher.php
@@ -1,20 +1,25 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Crypt
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Crypt\Cipher;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Crypt\CipherInterface;
+use Joomla\CMS\Crypt\Key;
+use ParagonIE\Sodium\Compat;
+
 /**
  * JCrypt cipher for sodium algorithm encryption, decryption and key generation.
  *
  * @since  __DEPLOY_VERSION__
  */
-class JCryptCipherSodium implements JCryptCipher
+class SodiumCipher implements CipherInterface
 {
 	/**
 	 * The message nonce to be used with encryption/decryption
@@ -27,31 +32,31 @@ class JCryptCipherSodium implements JCryptCipher
 	/**
 	 * Method to decrypt a data string.
 	 *
-	 * @param   string     $data  The encrypted string to decrypt.
-	 * @param   JCryptKey  $key   The key object to use for decryption.
+	 * @param   string  $data  The encrypted string to decrypt.
+	 * @param   Key     $key   The key object to use for decryption.
 	 *
 	 * @return  string  The decrypted data string.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 * @throws  RuntimeException
 	 */
-	public function decrypt($data, JCryptKey $key)
+	public function decrypt($data, Key $key)
 	{
 		// Validate key.
 		if ($key->type !== 'sodium')
 		{
-			throw new InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
 		}
 
 		if (!$this->nonce)
 		{
-			throw new RuntimeException('Missing nonce to decrypt data');
+			throw new \RuntimeException('Missing nonce to decrypt data');
 		}
 
-		$decrypted = \Sodium\crypto_box_open(
+		$decrypted = Compat::crypto_box_open(
 			$data,
 			$this->nonce,
-			\Sodium\crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
+			Compat::crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
 		);
 
 		if ($decrypted === false)
@@ -65,31 +70,31 @@ public function decrypt($data, JCryptKey $key)
 	/**
 	 * Method to encrypt a data string.
 	 *
-	 * @param   string     $data  The data string to encrypt.
-	 * @param   JCryptKey  $key   The key object to use for encryption.
+	 * @param   string  $data  The data string to encrypt.
+	 * @param   Key     $key   The key object to use for encryption.
 	 *
 	 * @return  string  The encrypted data string.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 * @throws  RuntimeException
 	 */
-	public function encrypt($data, JCryptKey $key)
+	public function encrypt($data, Key $key)
 	{
 		// Validate key.
 		if ($key->type !== 'sodium')
 		{
-			throw new InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
 		}
 
 		if (!$this->nonce)
 		{
-			throw new RuntimeException('Missing nonce to decrypt data');
+			throw new \RuntimeException('Missing nonce to decrypt data');
 		}
 
-		return \Sodium\crypto_box(
+		return Compat::crypto_box(
 			$data,
 			$this->nonce,
-			\Sodium\crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
+			Compat::crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
 		);
 	}
 
@@ -98,7 +103,7 @@ public function encrypt($data, JCryptKey $key)
 	 *
 	 * @param   array  $options  Key generation options.
 	 *
-	 * @return  JCryptKey
+	 * @return  Key
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 * @throws  RuntimeException
@@ -106,13 +111,13 @@ public function encrypt($data, JCryptKey $key)
 	public function generateKey(array $options = array())
 	{
 		// Create the new encryption key object.
-		$key = new JCryptKey('sodium');
+		$key = new Key('sodium');
 
 		// Generate the encryption key.
-		$pair = \Sodium\crypto_box_keypair();
+		$pair = Compat::crypto_box_keypair();
 
-		$key->public  = \Sodium\crypto_box_publickey($pair);
-		$key->private = \Sodium\crypto_box_secretkey($pair);
+		$key->public  = Compat::crypto_box_publickey($pair);
+		$key->private = Compat::crypto_box_secretkey($pair);
 
 		return $key;
 	}

From 447f82aea17bf00be2d1f01a7380b968c92f02b0 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 28 Jul 2017 21:01:37 -0500
Subject: [PATCH 094/148] Fix tests

---
 .../crypt/cipher/JCryptCipherSodiumTest.php   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
index ebc0b7a4a85c0..1fb9f00a4b683 100644
--- a/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
+++ b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
@@ -7,8 +7,12 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+use Joomla\CMS\Crypt\Cipher\SodiumCipher;
+use Joomla\CMS\Crypt\Crypt;
+use ParagonIE\Sodium\Compat;
+
 /**
- * Test class for JCryptCipherSodium.
+ * Test class for \Joomla\CMS\Crypt\Cipher\SodiumCipher.
  */
 class JCryptCipherSodiumTest extends TestCase
 {
@@ -36,16 +40,16 @@ public function dataStrings()
 	 *
 	 * @param   string  $data  The decrypted data to validate
 	 *
-	 * @covers        JCryptCipherSodium::decrypt
-	 * @covers        JCryptCipherSodium::encrypt
+	 * @covers        SodiumCipher::decrypt
+	 * @covers        SodiumCipher::encrypt
 	 * @dataProvider  dataStrings
 	 */
 	public function testDataEncryptionAndDecryption($data)
 	{
-		$cipher = new JCryptCipherSodium;
+		$cipher = new SodiumCipher;
 		$key    = $cipher->generateKey();
 
-		$cipher->setNonce(\Sodium\randombytes_buf(\Sodium\CRYPTO_BOX_NONCEBYTES));
+		$cipher->setNonce(Compat::randombytes_buf(Compat::CRYPTO_BOX_NONCEBYTES));
 
 		$encrypted = $cipher->encrypt($data, $key);
 
@@ -61,19 +65,19 @@ public function testDataEncryptionAndDecryption($data)
 	/**
 	 * @testdox  Validates keys are correctly generated
 	 *
-	 * @covers   JCryptCipherSodium::generateKey
+	 * @covers   SodiumCipher::generateKey
 	 */
 	public function testGenerateKey()
 	{
-		$cipher = new JCryptCipherSodium;
+		$cipher = new SodiumCipher;
 		$key    = $cipher->generateKey();
 
 		// Assert that the key is the correct type.
-		$this->assertInstanceOf('JCryptKey', $key);
+		$this->assertInstanceOf('Joomla\\CMS\\Crypt\\Key', $key);
 
 		// Assert the keys pass validation
-		$this->assertSame(JCrypt::safeStrlen($key->private), 32);
-		$this->assertSame(JCrypt::safeStrlen($key->public), 32);
+		$this->assertSame(Crypt::safeStrlen($key->private), 32);
+		$this->assertSame(Crypt::safeStrlen($key->public), 32);
 
 		// Assert the key is of the correct type.
 		$this->assertAttributeEquals('sodium', 'type', $key);

From d13bf9c454f940db10d9a6f5cb256ec0f7df33c8 Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Sat, 29 Jul 2017 20:14:33 +0530
Subject: [PATCH 095/148] Moved JLanguageMultilang::isAdminEnabled() to
 JModuleHelper::isAdminMultilang() (#17314)

* Moved JLanguageMultilang::isAdminEnabled() to JModuleHelper::isAdminMultilang()

* Use namespace version of the classes
---
 .../components/com_menus/controller.php       |  2 +-
 .../components/com_modules/controller.php     |  2 +-
 .../components/com_modules/models/module.php  |  2 +-
 .../views/modules/tmpl/default.php            |  4 ++--
 .../views/modules/tmpl/default_batch_body.php |  2 +-
 .../com_modules/views/modules/view.html.php   |  2 +-
 .../src/Joomla/CMS/Helper/ModuleHelper.php    | 22 ++++++++++++++++++-
 .../src/Joomla/CMS/Language/Multilanguage.php | 19 ----------------
 8 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php
index eed32b70bdb53..7ef5645a6143a 100644
--- a/administrator/components/com_menus/controller.php
+++ b/administrator/components/com_menus/controller.php
@@ -31,7 +31,7 @@ public function display($cachable = false, $urlparams = false)
 		JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
 
 		// Check custom administrator menu modules
-		if (JLanguageMultilang::isAdminEnabled())
+		if (JModuleHelper::isAdminMultilang())
 		{
 			$languages = JLanguageHelper::getInstalledLanguages(1, true);
 			$langCodes = array();
diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php
index 1850272286f61..38e86bbf5e151 100644
--- a/administrator/components/com_modules/controller.php
+++ b/administrator/components/com_modules/controller.php
@@ -77,7 +77,7 @@ public function display($cachable = false, $urlparams = false)
 		ModulesHelper::addSubmenu($this->input->get('view', 'modules'));
 
 		// Check custom administrator menu modules
-		if (JLanguageMultilang::isAdminEnabled())
+		if (JModuleHelper::isAdminMultilang())
 		{
 			$languages = JLanguageHelper::getInstalledLanguages(1, true);
 			$langCodes = array();
diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php
index 0ce754313ad1b..206cac8d3c1f9 100644
--- a/administrator/components/com_modules/models/module.php
+++ b/administrator/components/com_modules/models/module.php
@@ -543,7 +543,7 @@ public function getForm($data = array(), $loadData = true)
 			$form = $this->loadForm('com_modules.module.admin', 'moduleadmin', array('control' => 'jform', 'load_data' => $loadData), true);
 
 			// Display language field to filter admin custom menus per language
-			if (!JLanguageMultilang::isAdminEnabled())
+			if (!JModuleHelper::isAdminMultilang())
 			{
 				$form->setFieldAttribute('language', 'type', 'hidden');
 			}
diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php
index d6b30171378b3..8f6e5e127f1d9 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default.php
@@ -69,7 +69,7 @@
 						<th width="10%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'l.title', $listDirn, $listOrder); ?>
 						</th>
-						<?php elseif ($clientId === 1 && JLanguageMultilang::isAdminEnabled()) : ?>
+						<?php elseif ($clientId === 1 && JModuleHelper::isAdminMultilang()) : ?>
 						<th width="10%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 						</th>
@@ -191,7 +191,7 @@
 						<td class="small hidden-phone">
 							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 						</td>
-						<?php elseif ($clientId === 1 && JLanguageMultilang::isAdminEnabled()) : ?>
+						<?php elseif ($clientId === 1 && JModuleHelper::isAdminMultilang()) : ?>
 							<td class="small hidden-phone">
 								<?php if ($item->language == ''):?>
 									<?php echo JText::_('JUNDEFINED'); ?>
diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
index fdc24284b67f2..1a3f178dd099d 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
@@ -39,7 +39,7 @@
 					<?php echo JLayoutHelper::render('joomla.html.batch.language', array()); ?>
 				</div>
 			</div>
-		<?php elseif ($clientId == 1 && JLanguageMultilang::isAdminEnabled()) : ?>
+		<?php elseif ($clientId == 1 && JModuleHelper::isAdminMultilang()) : ?>
 			<div class="control-group span6">
 				<div class="controls">
 					<?php echo JLayoutHelper::render('joomla.html.batch.adminlanguage', array()); ?>
diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php
index f3502b5437cb9..2f4433a17aff9 100644
--- a/administrator/components/com_modules/views/modules/view.html.php
+++ b/administrator/components/com_modules/views/modules/view.html.php
@@ -48,7 +48,7 @@ public function display($tpl = null)
 		}
 
 		// We do not need the Language filter when modules are not filtered
-		if ($this->clientId == 1 && !JLanguageMultilang::isAdminEnabled())
+		if ($this->clientId == 1 && !JModuleHelper::isAdminMultilang())
 		{
 			unset($this->activeFilters['language']);
 			$this->filterForm->removeField('language', 'filter');
diff --git a/libraries/src/Joomla/CMS/Helper/ModuleHelper.php b/libraries/src/Joomla/CMS/Helper/ModuleHelper.php
index 10605a9dd8179..ca4df19812908 100644
--- a/libraries/src/Joomla/CMS/Helper/ModuleHelper.php
+++ b/libraries/src/Joomla/CMS/Helper/ModuleHelper.php
@@ -11,6 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\Registry\Registry;
 
 /**
@@ -413,7 +414,7 @@ public static function getModuleList()
 			$cacheId .= $lang . '*';
 		}
 
-		if ($app->isClient('administrator') && \JLanguageMultilang::isAdminEnabled())
+		if ($app->isClient('administrator') && static::isAdminMultilang())
 		{
 			$query->where('m.language IN (' . $db->quote($lang) . ',' . $db->quote('*') . ')');
 			$cacheId .= $lang . '*';
@@ -624,4 +625,23 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
 
 		return $ret;
 	}
+
+	/**
+	 * Method to determine if filtering by language is enabled in back-end for modules.
+	 *
+	 * @return  boolean  True if enabled; false otherwise.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function isAdminMultilang()
+	{
+		static $enabled = false;
+
+		if (count(LanguageHelper::getInstalledLanguages(1)) > 1)
+		{
+			$enabled = (bool) ComponentHelper::getParams('com_modules')->get('adminlangfilter', 0);
+		}
+
+		return $enabled;
+	}
 }
diff --git a/libraries/src/Joomla/CMS/Language/Multilanguage.php b/libraries/src/Joomla/CMS/Language/Multilanguage.php
index cff02e8b39e0b..d6d92b79d32e6 100644
--- a/libraries/src/Joomla/CMS/Language/Multilanguage.php
+++ b/libraries/src/Joomla/CMS/Language/Multilanguage.php
@@ -109,23 +109,4 @@ public static function getSiteHomePages()
 
 		return $multilangSiteHomePages;
 	}
-
-	/**
-	 * Method to determine if filtering by language is enabled in back-end for custom menus.
-	 *
-	 * @return  boolean  True if admin is supporting multiple languages; false otherwise.
-	 *
-	 * @since   3.8.0
-	 */
-	public static function isAdminEnabled()
-	{
-		static $enabled = false;
-
-		if (count(\JLanguageHelper::getInstalledLanguages(1)) > 1)
-		{
-			$enabled = \JComponentHelper::getParams('com_modules')->get('adminlangfilter', 0);
-		}
-
-		return (bool) $enabled;
-	}
 }

From 6ec1e439b551a811f18c170faa6e3e9bb7bd8a0c Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sat, 29 Jul 2017 16:46:35 +0200
Subject: [PATCH 096/148] Implement component params for fieldgroups (#17317)

* implement component params for fieldgroup

* changing the installation sql to add the params field

* rename files and add a newline at the end of the file
---
 .../sql/updates/mysql/3.8.0-2017-07-28.sql    |  1 +
 .../updates/postgresql/3.8.0-2017-07-28.sql   |  1 +
 .../sql/updates/sqlazure/3.8.0-2017-07-28.sql |  1 +
 .../components/com_fields/models/group.php    | 26 ++++++++++++++++++-
 installation/sql/mysql/joomla.sql             |  1 +
 installation/sql/postgresql/joomla.sql        |  1 +
 installation/sql/sqlazure/joomla.sql          |  1 +
 7 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql
 create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql
 create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql b/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql
new file mode 100644
index 0000000000000..634c8bbb6f3e3
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__fields_groups` ADD `params` TEXT  NOT NULL  AFTER `ordering`;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql b/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql
new file mode 100644
index 0000000000000..2c8c751dc9144
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__fields_groups" ADD "params" TEXT NOT NULL ;
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql
new file mode 100644
index 0000000000000..b25399e2478ec
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql
@@ -0,0 +1 @@
+ALTER TABLE [#__fields_groups] ADD [params] [text] NOT NULL DEFAULT '';
diff --git a/administrator/components/com_fields/models/group.php b/administrator/components/com_fields/models/group.php
index 70d890db89acd..bb3e35a176098 100644
--- a/administrator/components/com_fields/models/group.php
+++ b/administrator/components/com_fields/models/group.php
@@ -220,10 +220,34 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 
 		$parts = FieldsHelper::extract($this->state->get('filter.context'));
 
+		// Extract the component name
+		$component = $parts[0];
+
+		// Extract the optional section name
+		$section = (count($parts) > 1) ? $parts[1] : null;
+
 		if ($parts)
 		{
 			// Set the access control rules field component value.
-			$form->setFieldAttribute('rules', 'component', $parts[0]);
+			$form->setFieldAttribute('rules', 'component', $component);
+		}
+
+		if ($section !== null)
+		{
+			// Looking first in the component models/forms folder
+			$path = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
+
+			if (file_exists($path))
+			{
+				$lang = JFactory::getLanguage();
+				$lang->load($component, JPATH_BASE, null, false, true);
+				$lang->load($component, JPATH_BASE . '/components/' . $component, null, false, true);
+
+				if (!$form->loadFile($path, false))
+				{
+					throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+				}
+			}
 		}
 	}
 
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index d402e930e97ff..5019aadbaa152 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -716,6 +716,7 @@ CREATE TABLE IF NOT EXISTS `#__fields_groups` (
   `checked_out` int(11) NOT NULL DEFAULT '0',
   `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `ordering` int(11) NOT NULL DEFAULT '0',
+  `params` text NOT NULL,
   `language` char(7) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `created_by` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 857308069a918..5fec91f57e9c9 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -725,6 +725,7 @@ CREATE TABLE "#__fields_groups" (
   "checked_out" integer DEFAULT '0' NOT NULL,
   "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "ordering" integer DEFAULT '0' NOT NULL,
+  "params" text DEFAULT '' NOT NULL,
   "language" varchar(7) DEFAULT '' NOT NULL,
   "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "created_by" bigint DEFAULT '0' NOT NULL,
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index ccfaf92d8b919..ed7304f4ba4ab 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -958,6 +958,7 @@ CREATE TABLE "#__fields_groups" (
   "checked_out" bigint NOT NULL DEFAULT 0,
   "checked_out_time" datetime2(0) NOT NULL DEFAULT '1900-01-01 00:00:00',
   "ordering" int NOT NULL DEFAULT 0,
+  "params" nvarchar(max) NOT NULL DEFAULT '',
   "language" nvarchar(7) NOT NULL DEFAULT '',
   "created" datetime2(0) NOT NULL DEFAULT '1900-01-01 00:00:00',
   "created_by" bigint NOT NULL DEFAULT 0,

From 0d322d9a0bc9dfe88374a49f17acfa94548e9d3c Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Sat, 29 Jul 2017 09:54:52 -0500
Subject: [PATCH 097/148] Change links

---
 README.md  | 2 +-
 README.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0ec4f92782430..ea27ca244eb2c 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ What is this?
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
 * Joomla! 3.8 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/staging).
 
 What is Joomla?
 ---------------------
diff --git a/README.txt b/README.txt
index 31bc4fa9a35c9..7d42cf220869c 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
 	* Joomla! 3.8 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/staging
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.

From 5abadbbc379cd1a0f9cc81c2a5a4e950ebf8ee92 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <info@hkweb.nl>
Date: Sat, 29 Jul 2017 16:59:37 +0200
Subject: [PATCH 098/148] Add filter by Tag to mod_article_category (#16945)

* add filteroption to select tag to filter

* all php logic to get selected filter option

* add nice lines to separate fitler by tag from the rest.

* fix code style

* conditional load tags. Only load when filter is used
---
 modules/mod_articles_category/helper.php        |  6 +++++-
 .../mod_articles_category.xml                   | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/mod_articles_category/helper.php b/modules/mod_articles_category/helper.php
index dbae6b2ec2fee..0033c725bc874 100644
--- a/modules/mod_articles_category/helper.php
+++ b/modules/mod_articles_category/helper.php
@@ -51,7 +51,7 @@ public static function getList(&$params)
 		$articles->setState('filter.published', 1);
 
 		// This module does not use tags data
-		$articles->setState('load_tags', false);
+		$articles->setState('load_tags', $params->get('filter_tag', '') !== '' ? true : false);
 
 		// Access filter
 		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
@@ -195,6 +195,10 @@ public static function getList(&$params)
 		}
 
 		// New Parameters
+		if ($params->get('filter_tag', ''))
+		{
+			$articles->setState('filter.tag', $params->get('filter_tag', ''));
+		}
 		$articles->setState('filter.featured', $params->get('show_front', 'show'));
 		$articles->setState('filter.author_id', $params->get('created_by', ''));
 		$articles->setState('filter.author_id.include', $params->get('author_filtering_type', 1));
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index e00420f2024af..ef955d661f03e 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -78,7 +78,7 @@
 				</field>
 
 				<field
-					name="filteringspacer1"
+					name="filteringspacer0"
 					type="spacer"
 					hr="true"
 				/>
@@ -127,6 +127,21 @@
 					default="1"
 				/>
 
+				<field
+					name="filteringspacer1"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="filter_tag"
+					type="tag"
+					label="JTAG"
+				       	description="JTAG_FIELD_SELECT_DESC"
+					>
+					<option value="">JNONE</option>
+				</field>
+
 				<field
 					name="filteringspacer2"
 					type="spacer"

From aaed81f6eda2b686b9bc0ce726de42db54e1390b Mon Sep 17 00:00:00 2001
From: Vio Cassel <viocassel@users.noreply.github.com>
Date: Sat, 29 Jul 2017 18:02:34 +0300
Subject: [PATCH 099/148] Update jQuery Autocomplete to 1.4.1 (#15078)

* Update jQuery Autocomplete to 1.4.0

* Update jQuery Autocomplete to 1.4.1
---
 media/jui/js/jquery.autocomplete.js     | 199 +++++++++++-------------
 media/jui/js/jquery.autocomplete.min.js |   4 +-
 2 files changed, 94 insertions(+), 109 deletions(-)

diff --git a/media/jui/js/jquery.autocomplete.js b/media/jui/js/jquery.autocomplete.js
index 74121fae8c84b..991c97b155a72 100644
--- a/media/jui/js/jquery.autocomplete.js
+++ b/media/jui/js/jquery.autocomplete.js
@@ -1,5 +1,5 @@
 /**
-*  Ajax Autocomplete for jQuery, version 1.3.0
+*  Ajax Autocomplete for jQuery, version 1.4.1
 *  (c) 2017 Tomas Kirda
 *
 *  Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
@@ -49,51 +49,12 @@
             UP: 38,
             RIGHT: 39,
             DOWN: 40
-        };
+        },
+
+        noop = $.noop;
 
     function Autocomplete(el, options) {
-        var noop = $.noop,
-            that = this,
-            defaults = {
-                ajaxSettings: {},
-                autoSelectFirst: false,
-                appendTo: document.body,
-                serviceUrl: null,
-                lookup: null,
-                onSelect: null,
-                width: 'auto',
-                minChars: 1,
-                maxHeight: 300,
-                deferRequestBy: 0,
-                params: {},
-                formatResult: Autocomplete.formatResult,
-                formatGroup: Autocomplete.formatGroup,
-                delimiter: null,
-                zIndex: 9999,
-                type: 'GET',
-                noCache: false,
-                onSearchStart: noop,
-                onSearchComplete: noop,
-                onSearchError: noop,
-                preserveInput: false,
-                containerClass: 'autocomplete-suggestions',
-                tabDisabled: false,
-                dataType: 'text',
-                currentRequest: null,
-                triggerSelectOnValidInput: true,
-                preventBadQueries: true,
-                lookupFilter: function (suggestion, originalQuery, queryLowerCase) {
-                    return suggestion.value.toLowerCase().indexOf(queryLowerCase) !== -1;
-                },
-                paramName: 'query',
-                transformResult: function (response) {
-                    return typeof response === 'string' ? $.parseJSON(response) : response;
-                },
-                showNoSuggestionNotice: false,
-                noSuggestionNotice: 'No results',
-                orientation: 'bottom',
-                forceFixPosition: false
-            };
+        var that = this;
 
         // Shared variables:
         that.element = el;
@@ -102,14 +63,14 @@
         that.badQueries = [];
         that.selectedIndex = -1;
         that.currentValue = that.element.value;
-        that.intervalId = 0;
+        that.timeoutId = null;
         that.cachedResponse = {};
-        that.onChangeInterval = null;
+        that.onChangeTimeout = null;
         that.onChange = null;
         that.isLocal = false;
         that.suggestionsContainer = null;
         that.noSuggestionsContainer = null;
-        that.options = $.extend({}, defaults, options);
+        that.options = $.extend({}, Autocomplete.defaults, options);
         that.classes = {
             selected: 'autocomplete-selected',
             suggestion: 'autocomplete-suggestion'
@@ -127,8 +88,53 @@
 
     $.Autocomplete = Autocomplete;
 
-    Autocomplete.formatResult = function (suggestion, currentValue) {
-        // Do not replace anything if there current value is empty
+    Autocomplete.defaults = {
+            ajaxSettings: {},
+            autoSelectFirst: false,
+            appendTo: 'body',
+            serviceUrl: null,
+            lookup: null,
+            onSelect: null,
+            width: 'auto',
+            minChars: 1,
+            maxHeight: 300,
+            deferRequestBy: 0,
+            params: {},
+            formatResult: _formatResult,
+            formatGroup: _formatGroup,
+            delimiter: null,
+            zIndex: 9999,
+            type: 'GET',
+            noCache: false,
+            onSearchStart: noop,
+            onSearchComplete: noop,
+            onSearchError: noop,
+            preserveInput: false,
+            containerClass: 'autocomplete-suggestions',
+            tabDisabled: false,
+            dataType: 'text',
+            currentRequest: null,
+            triggerSelectOnValidInput: true,
+            preventBadQueries: true,
+            lookupFilter: _lookupFilter,
+            paramName: 'query',
+            transformResult: _transformResult,
+            showNoSuggestionNotice: false,
+            noSuggestionNotice: 'No results',
+            orientation: 'bottom',
+            forceFixPosition: false
+    };
+
+    function _lookupFilter(suggestion, originalQuery, queryLowerCase) {
+        return suggestion.value.toLowerCase().indexOf(queryLowerCase) !== -1;
+    };
+
+    function _transformResult(response) {
+        return typeof response === 'string' ? $.parseJSON(response) : response;
+    };
+
+    function _formatResult(suggestion, currentValue) {
+        // Do not replace anything if the current value is empty
         if (!currentValue) {
             return suggestion.value;
         }
@@ -144,14 +150,12 @@
             .replace(/&lt;(\/?strong)&gt;/g, '<$1>');
     };
 
-    Autocomplete.formatGroup = function (suggestion, category) {
-        return '<div class="autocomplete-group"><strong>' + category + '</strong></div>';
+    function _formatGroup(suggestion, category) {
+        return '<div class="autocomplete-group">' + category + '</div>';
     };
 
     Autocomplete.prototype = {
 
-        killerFn: null,
-
         initialize: function () {
             var that = this,
                 suggestionSelector = '.' + that.classes.suggestion,
@@ -162,13 +166,6 @@
             // Remove autocomplete attribute to prevent native suggestions:
             that.element.setAttribute('autocomplete', 'off');
 
-            that.killerFn = function (e) {
-                if (!$(e.target).closest('.' + that.options.containerClass).length) {
-                    that.killSuggestions();
-                    that.disableKillerFn();
-                }
-            };
-
             // html() deals with many types: htmlString or Element or Array or jQuery
             that.noSuggestionsContainer = $('<div class="autocomplete-no-suggestion"></div>')
                                           .html(this.options.noSuggestionNotice).get(0);
@@ -177,7 +174,7 @@
 
             container = $(that.suggestionsContainer);
 
-            container.appendTo(options.appendTo);
+            container.appendTo(options.appendTo || 'body');
 
             // Only set width if it was provided:
             if (options.width !== 'auto') {
@@ -195,12 +192,16 @@
                 container.children('.' + selected).removeClass(selected);
             });
 
+
             // Listen for click event on suggestions list:
             container.on('click.autocomplete', suggestionSelector, function () {
                 that.select($(this).data('index'));
-                return false;
             });
 
+            container.on('click.autocomplete', function () {
+                clearTimeout(that.blurTimeoutId);
+            })
+
             that.fixPositionCapture = function () {
                 if (that.visible) {
                     that.fixPosition();
@@ -228,7 +229,13 @@
         },
 
         onBlur: function () {
-            this.enableKillerFn();
+            var that = this;
+
+            // If user clicked on a suggestion, hide() will
+            // be canceled, otherwise close suggestions
+            that.blurTimeoutId = setTimeout(function () {
+                that.hide();
+            }, 200);
         },
         
         abortAjax: function () {
@@ -243,7 +250,7 @@
             var that = this,
                 options = that.options;
 
-            $.extend(options, suppliedOptions);
+            this.options = $.extend({}, options, suppliedOptions);
 
             that.isLocal = $.isArray(options.lookup);
 
@@ -276,7 +283,7 @@
         disable: function () {
             var that = this;
             that.disabled = true;
-            clearInterval(that.onChangeInterval);
+            clearTimeout(that.onChangeTimeout);
             that.abortAjax();
         },
 
@@ -344,39 +351,6 @@
             $container.css(styles);
         },
 
-        enableKillerFn: function () {
-            var that = this;
-            $(document).on('click.autocomplete', that.killerFn);
-        },
-
-        disableKillerFn: function () {
-            var that = this;
-            $(document).off('click.autocomplete', that.killerFn);
-        },
-
-        killSuggestions: function () {
-            var that = this;
-            that.stopKillSuggestions();
-            that.intervalId = window.setInterval(function () {
-                if (that.visible) {
-                    // No need to restore value when 
-                    // preserveInput === true, 
-                    // because we did not change it
-                    if (!that.options.preserveInput) {
-                        that.el.val(that.currentValue);
-                    }
-
-                    that.hide();
-                }
-                
-                that.stopKillSuggestions();
-            }, 50);
-        },
-
-        stopKillSuggestions: function () {
-            window.clearInterval(this.intervalId);
-        },
-
         isCursorAtEnd: function () {
             var that = this,
                 valLength = that.el.val().length,
@@ -467,13 +441,13 @@
                     return;
             }
 
-            clearInterval(that.onChangeInterval);
+            clearTimeout(that.onChangeTimeout);
 
             if (that.currentValue !== that.el.val()) {
                 that.findBestHint();
                 if (that.options.deferRequestBy > 0) {
                     // Defer lookup in case when value changes very quickly:
-                    that.onChangeInterval = setInterval(function () {
+                    that.onChangeTimeout = setTimeout(function () {
                         that.onValueChange();
                     }, that.options.deferRequestBy);
                 } else {
@@ -493,7 +467,7 @@
                 (options.onInvalidateSelection || $.noop).call(that.element);
             }
 
-            clearInterval(that.onChangeInterval);
+            clearTimeout(that.onChangeTimeout);
             that.currentValue = value;
             that.selectedIndex = -1;
 
@@ -558,12 +532,13 @@
                 ajaxSettings;
 
             options.params[options.paramName] = q;
-            params = options.ignoreParams ? null : options.params;
 
             if (options.onSearchStart.call(that.element, options.params) === false) {
                 return;
             }
 
+            params = options.ignoreParams ? null : options.params;
+
             if ($.isFunction(options.lookup)){
                 options.lookup(q, function (data) {
                     that.suggestions = data.suggestions;
@@ -640,7 +615,7 @@
 
             that.visible = false;
             that.selectedIndex = -1;
-            clearInterval(that.onChangeInterval);
+            clearTimeout(that.onChangeTimeout);
             $(that.suggestionsContainer).hide();
             that.signalHint(null);
         },
@@ -718,6 +693,7 @@
 
         noSuggestions: function() {
              var that = this,
+                 beforeRender = that.options.beforeRender,
                  container = $(that.suggestionsContainer),
                  noSuggestionsContainer = $(that.noSuggestionsContainer);
 
@@ -726,9 +702,15 @@
             // Some explicit steps. Be careful here as it easy to get
             // noSuggestionsContainer removed from DOM if not detached properly.
             noSuggestionsContainer.detach();
-            container.empty(); // clean suggestions if any
+
+            // clean suggestions if any
+            container.empty(); 
             container.append(noSuggestionsContainer);
 
+            if ($.isFunction(beforeRender)) {
+                beforeRender.call(that.element, container, that.suggestions);
+            }
+
             that.fixPosition();
 
             container.show();
@@ -862,7 +844,6 @@
             var that = this;
             that.hide();
             that.onSelect(i);
-            that.disableKillerFn();
         },
 
         moveUp: function () {
@@ -965,14 +946,13 @@
         dispose: function () {
             var that = this;
             that.el.off('.autocomplete').removeData('autocomplete');
-            that.disableKillerFn();
             $(window).off('resize.autocomplete', that.fixPositionCapture);
             $(that.suggestionsContainer).remove();
         }
     };
 
     // Create chainable jQuery plugin:
-    $.fn.autocomplete = $.fn.devbridgeAutocomplete = function (options, args) {
+    $.fn.devbridgeAutocomplete = function (options, args) {
         var dataKey = 'autocomplete';
         // If function invoked without argument return
         // instance of the first matched element:
@@ -998,4 +978,9 @@
             }
         });
     };
+
+    // Don't overwrite if it already exists
+    if (!$.fn.autocomplete) {
+        $.fn.autocomplete = $.fn.devbridgeAutocomplete;
+    }
 }));
diff --git a/media/jui/js/jquery.autocomplete.min.js b/media/jui/js/jquery.autocomplete.min.js
index 7a355f2ed65d9..3d00147eaa04e 100644
--- a/media/jui/js/jquery.autocomplete.min.js
+++ b/media/jui/js/jquery.autocomplete.min.js
@@ -1,8 +1,8 @@
 /**
-*  Ajax Autocomplete for jQuery, version 1.3.0
+*  Ajax Autocomplete for jQuery, version 1.4.1
 *  (c) 2017 Tomas Kirda
 *
 *  Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
 *  For details, see the web site: https://github.com/devbridge/jQuery-Autocomplete
 */
-!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports&&"function"==typeof require?require("jquery"):jQuery)}(function(a){"use strict";function b(c,d){var e=a.noop,f=this,g={ajaxSettings:{},autoSelectFirst:!1,appendTo:document.body,serviceUrl:null,lookup:null,onSelect:null,width:"auto",minChars:1,maxHeight:300,deferRequestBy:0,params:{},formatResult:b.formatResult,formatGroup:b.formatGroup,delimiter:null,zIndex:9999,type:"GET",noCache:!1,onSearchStart:e,onSearchComplete:e,onSearchError:e,preserveInput:!1,containerClass:"autocomplete-suggestions",tabDisabled:!1,dataType:"text",currentRequest:null,triggerSelectOnValidInput:!0,preventBadQueries:!0,lookupFilter:function(a,b,c){return-1!==a.value.toLowerCase().indexOf(c)},paramName:"query",transformResult:function(b){return"string"==typeof b?a.parseJSON(b):b},showNoSuggestionNotice:!1,noSuggestionNotice:"No results",orientation:"bottom",forceFixPosition:!1};f.element=c,f.el=a(c),f.suggestions=[],f.badQueries=[],f.selectedIndex=-1,f.currentValue=f.element.value,f.intervalId=0,f.cachedResponse={},f.onChangeInterval=null,f.onChange=null,f.isLocal=!1,f.suggestionsContainer=null,f.noSuggestionsContainer=null,f.options=a.extend({},g,d),f.classes={selected:"autocomplete-selected",suggestion:"autocomplete-suggestion"},f.hint=null,f.hintValue="",f.selection=null,f.initialize(),f.setOptions(d)}var c=function(){return{escapeRegExChars:function(a){return a.replace(/[|\\{}()[\]^$+*?.]/g,"\\$&")},createNode:function(a){var b=document.createElement("div");return b.className=a,b.style.position="absolute",b.style.display="none",b}}}(),d={ESC:27,TAB:9,RETURN:13,LEFT:37,UP:38,RIGHT:39,DOWN:40};b.utils=c,a.Autocomplete=b,b.formatResult=function(a,b){if(!b)return a.value;var d="("+c.escapeRegExChars(b)+")";return a.value.replace(new RegExp(d,"gi"),"<strong>$1</strong>").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/&lt;(\/?strong)&gt;/g,"<$1>")},b.formatGroup=function(a,b){return'<div class="autocomplete-group"><strong>'+b+"</strong></div>"},b.prototype={killerFn:null,initialize:function(){var c,d=this,e="."+d.classes.suggestion,f=d.classes.selected,g=d.options;d.element.setAttribute("autocomplete","off"),d.killerFn=function(b){a(b.target).closest("."+d.options.containerClass).length||(d.killSuggestions(),d.disableKillerFn())},d.noSuggestionsContainer=a('<div class="autocomplete-no-suggestion"></div>').html(this.options.noSuggestionNotice).get(0),d.suggestionsContainer=b.utils.createNode(g.containerClass),c=a(d.suggestionsContainer),c.appendTo(g.appendTo),"auto"!==g.width&&c.css("width",g.width),c.on("mouseover.autocomplete",e,function(){d.activate(a(this).data("index"))}),c.on("mouseout.autocomplete",function(){d.selectedIndex=-1,c.children("."+f).removeClass(f)}),c.on("click.autocomplete",e,function(){return d.select(a(this).data("index")),!1}),d.fixPositionCapture=function(){d.visible&&d.fixPosition()},a(window).on("resize.autocomplete",d.fixPositionCapture),d.el.on("keydown.autocomplete",function(a){d.onKeyPress(a)}),d.el.on("keyup.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("blur.autocomplete",function(){d.onBlur()}),d.el.on("focus.autocomplete",function(){d.onFocus()}),d.el.on("change.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("input.autocomplete",function(a){d.onKeyUp(a)})},onFocus:function(){var a=this;a.fixPosition(),a.el.val().length>=a.options.minChars&&a.onValueChange()},onBlur:function(){this.enableKillerFn()},abortAjax:function(){var a=this;a.currentRequest&&(a.currentRequest.abort(),a.currentRequest=null)},setOptions:function(b){var c=this,d=c.options;a.extend(d,b),c.isLocal=a.isArray(d.lookup),c.isLocal&&(d.lookup=c.verifySuggestionsFormat(d.lookup)),d.orientation=c.validateOrientation(d.orientation,"bottom"),a(c.suggestionsContainer).css({"max-height":d.maxHeight+"px",width:d.width+"px","z-index":d.zIndex})},clearCache:function(){this.cachedResponse={},this.badQueries=[]},clear:function(){this.clearCache(),this.currentValue="",this.suggestions=[]},disable:function(){var a=this;a.disabled=!0,clearInterval(a.onChangeInterval),a.abortAjax()},enable:function(){this.disabled=!1},fixPosition:function(){var b=this,c=a(b.suggestionsContainer),d=c.parent().get(0);if(d===document.body||b.options.forceFixPosition){var e=b.options.orientation,f=c.outerHeight(),g=b.el.outerHeight(),h=b.el.offset(),i={top:h.top,left:h.left};if("auto"===e){var j=a(window).height(),k=a(window).scrollTop(),l=-k+h.top-f,m=k+j-(h.top+g+f);e=Math.max(l,m)===l?"top":"bottom"}if("top"===e?i.top+=-f:i.top+=g,d!==document.body){var n,o=c.css("opacity");b.visible||c.css("opacity",0).show(),n=c.offsetParent().offset(),i.top-=n.top,i.left-=n.left,b.visible||c.css("opacity",o).hide()}"auto"===b.options.width&&(i.width=b.el.outerWidth()+"px"),c.css(i)}},enableKillerFn:function(){var b=this;a(document).on("click.autocomplete",b.killerFn)},disableKillerFn:function(){var b=this;a(document).off("click.autocomplete",b.killerFn)},killSuggestions:function(){var a=this;a.stopKillSuggestions(),a.intervalId=window.setInterval(function(){a.visible&&(a.options.preserveInput||a.el.val(a.currentValue),a.hide()),a.stopKillSuggestions()},50)},stopKillSuggestions:function(){window.clearInterval(this.intervalId)},isCursorAtEnd:function(){var a,b=this,c=b.el.val().length,d=b.element.selectionStart;return"number"==typeof d?d===c:document.selection?(a=document.selection.createRange(),a.moveStart("character",-c),c===a.text.length):!0},onKeyPress:function(a){var b=this;if(!b.disabled&&!b.visible&&a.which===d.DOWN&&b.currentValue)return void b.suggest();if(!b.disabled&&b.visible){switch(a.which){case d.ESC:b.el.val(b.currentValue),b.hide();break;case d.RIGHT:if(b.hint&&b.options.onHint&&b.isCursorAtEnd()){b.selectHint();break}return;case d.TAB:if(b.hint&&b.options.onHint)return void b.selectHint();if(-1===b.selectedIndex)return void b.hide();if(b.select(b.selectedIndex),b.options.tabDisabled===!1)return;break;case d.RETURN:if(-1===b.selectedIndex)return void b.hide();b.select(b.selectedIndex);break;case d.UP:b.moveUp();break;case d.DOWN:b.moveDown();break;default:return}a.stopImmediatePropagation(),a.preventDefault()}},onKeyUp:function(a){var b=this;if(!b.disabled){switch(a.which){case d.UP:case d.DOWN:return}clearInterval(b.onChangeInterval),b.currentValue!==b.el.val()&&(b.findBestHint(),b.options.deferRequestBy>0?b.onChangeInterval=setInterval(function(){b.onValueChange()},b.options.deferRequestBy):b.onValueChange())}},onValueChange:function(){var b=this,c=b.options,d=b.el.val(),e=b.getQuery(d);return b.selection&&b.currentValue!==e&&(b.selection=null,(c.onInvalidateSelection||a.noop).call(b.element)),clearInterval(b.onChangeInterval),b.currentValue=d,b.selectedIndex=-1,c.triggerSelectOnValidInput&&b.isExactMatch(e)?void b.select(0):void(e.length<c.minChars?b.hide():b.getSuggestions(e))},isExactMatch:function(a){var b=this.suggestions;return 1===b.length&&b[0].value.toLowerCase()===a.toLowerCase()},getQuery:function(b){var c,d=this.options.delimiter;return d?(c=b.split(d),a.trim(c[c.length-1])):b},getSuggestionsLocal:function(b){var c,d=this,e=d.options,f=b.toLowerCase(),g=e.lookupFilter,h=parseInt(e.lookupLimit,10);return c={suggestions:a.grep(e.lookup,function(a){return g(a,b,f)})},h&&c.suggestions.length>h&&(c.suggestions=c.suggestions.slice(0,h)),c},getSuggestions:function(b){var c,d,e,f,g=this,h=g.options,i=h.serviceUrl;if(h.params[h.paramName]=b,d=h.ignoreParams?null:h.params,h.onSearchStart.call(g.element,h.params)!==!1){if(a.isFunction(h.lookup))return void h.lookup(b,function(a){g.suggestions=a.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,a.suggestions)});g.isLocal?c=g.getSuggestionsLocal(b):(a.isFunction(i)&&(i=i.call(g.element,b)),e=i+"?"+a.param(d||{}),c=g.cachedResponse[e]),c&&a.isArray(c.suggestions)?(g.suggestions=c.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,c.suggestions)):g.isBadQuery(b)?h.onSearchComplete.call(g.element,b,[]):(g.abortAjax(),f={url:i,data:d,type:h.type,dataType:h.dataType},a.extend(f,h.ajaxSettings),g.currentRequest=a.ajax(f).done(function(a){var c;g.currentRequest=null,c=h.transformResult(a,b),g.processResponse(c,b,e),h.onSearchComplete.call(g.element,b,c.suggestions)}).fail(function(a,c,d){h.onSearchError.call(g.element,b,a,c,d)}))}},isBadQuery:function(a){if(!this.options.preventBadQueries)return!1;for(var b=this.badQueries,c=b.length;c--;)if(0===a.indexOf(b[c]))return!0;return!1},hide:function(){var b=this,c=a(b.suggestionsContainer);a.isFunction(b.options.onHide)&&b.visible&&b.options.onHide.call(b.element,c),b.visible=!1,b.selectedIndex=-1,clearInterval(b.onChangeInterval),a(b.suggestionsContainer).hide(),b.signalHint(null)},suggest:function(){if(!this.suggestions.length)return void(this.options.showNoSuggestionNotice?this.noSuggestions():this.hide());var b,c=this,d=c.options,e=d.groupBy,f=d.formatResult,g=c.getQuery(c.currentValue),h=c.classes.suggestion,i=c.classes.selected,j=a(c.suggestionsContainer),k=a(c.noSuggestionsContainer),l=d.beforeRender,m="",n=function(a,c){var f=a.data[e];return b===f?"":(b=f,d.formatGroup(a,b))};return d.triggerSelectOnValidInput&&c.isExactMatch(g)?void c.select(0):(a.each(c.suggestions,function(a,b){e&&(m+=n(b,g,a)),m+='<div class="'+h+'" data-index="'+a+'">'+f(b,g,a)+"</div>"}),this.adjustContainerWidth(),k.detach(),j.html(m),a.isFunction(l)&&l.call(c.element,j,c.suggestions),c.fixPosition(),j.show(),d.autoSelectFirst&&(c.selectedIndex=0,j.scrollTop(0),j.children("."+h).first().addClass(i)),c.visible=!0,void c.findBestHint())},noSuggestions:function(){var b=this,c=a(b.suggestionsContainer),d=a(b.noSuggestionsContainer);this.adjustContainerWidth(),d.detach(),c.empty(),c.append(d),b.fixPosition(),c.show(),b.visible=!0},adjustContainerWidth:function(){var b,c=this,d=c.options,e=a(c.suggestionsContainer);"auto"===d.width?(b=c.el.outerWidth(),e.css("width",b>0?b:300)):"flex"===d.width&&e.css("width","")},findBestHint:function(){var b=this,c=b.el.val().toLowerCase(),d=null;c&&(a.each(b.suggestions,function(a,b){var e=0===b.value.toLowerCase().indexOf(c);return e&&(d=b),!e}),b.signalHint(d))},signalHint:function(b){var c="",d=this;b&&(c=d.currentValue+b.value.substr(d.currentValue.length)),d.hintValue!==c&&(d.hintValue=c,d.hint=b,(this.options.onHint||a.noop)(c))},verifySuggestionsFormat:function(b){return b.length&&"string"==typeof b[0]?a.map(b,function(a){return{value:a,data:null}}):b},validateOrientation:function(b,c){return b=a.trim(b||"").toLowerCase(),-1===a.inArray(b,["auto","bottom","top"])&&(b=c),b},processResponse:function(a,b,c){var d=this,e=d.options;a.suggestions=d.verifySuggestionsFormat(a.suggestions),e.noCache||(d.cachedResponse[c]=a,e.preventBadQueries&&!a.suggestions.length&&d.badQueries.push(b)),b===d.getQuery(d.currentValue)&&(d.suggestions=a.suggestions,d.suggest())},activate:function(b){var c,d=this,e=d.classes.selected,f=a(d.suggestionsContainer),g=f.find("."+d.classes.suggestion);return f.find("."+e).removeClass(e),d.selectedIndex=b,-1!==d.selectedIndex&&g.length>d.selectedIndex?(c=g.get(d.selectedIndex),a(c).addClass(e),c):null},selectHint:function(){var b=this,c=a.inArray(b.hint,b.suggestions);b.select(c)},select:function(a){var b=this;b.hide(),b.onSelect(a),b.disableKillerFn()},moveUp:function(){var b=this;if(-1!==b.selectedIndex)return 0===b.selectedIndex?(a(b.suggestionsContainer).children().first().removeClass(b.classes.selected),b.selectedIndex=-1,b.el.val(b.currentValue),void b.findBestHint()):void b.adjustScroll(b.selectedIndex-1)},moveDown:function(){var a=this;a.selectedIndex!==a.suggestions.length-1&&a.adjustScroll(a.selectedIndex+1)},adjustScroll:function(b){var c=this,d=c.activate(b);if(d){var e,f,g,h=a(d).outerHeight();e=d.offsetTop,f=a(c.suggestionsContainer).scrollTop(),g=f+c.options.maxHeight-h,f>e?a(c.suggestionsContainer).scrollTop(e):e>g&&a(c.suggestionsContainer).scrollTop(e-c.options.maxHeight+h),c.options.preserveInput||c.el.val(c.getValue(c.suggestions[b].value)),c.signalHint(null)}},onSelect:function(b){var c=this,d=c.options.onSelect,e=c.suggestions[b];c.currentValue=c.getValue(e.value),c.currentValue===c.el.val()||c.options.preserveInput||c.el.val(c.currentValue),c.signalHint(null),c.suggestions=[],c.selection=e,a.isFunction(d)&&d.call(c.element,e)},getValue:function(a){var b,c,d=this,e=d.options.delimiter;return e?(b=d.currentValue,c=b.split(e),1===c.length?a:b.substr(0,b.length-c[c.length-1].length)+a):a},dispose:function(){var b=this;b.el.off(".autocomplete").removeData("autocomplete"),b.disableKillerFn(),a(window).off("resize.autocomplete",b.fixPositionCapture),a(b.suggestionsContainer).remove()}},a.fn.autocomplete=a.fn.devbridgeAutocomplete=function(c,d){var e="autocomplete";return arguments.length?this.each(function(){var f=a(this),g=f.data(e);"string"==typeof c?g&&"function"==typeof g[c]&&g[c](d):(g&&g.dispose&&g.dispose(),g=new b(this,c),f.data(e,g))}):this.first().data(e)}});
\ No newline at end of file
+!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports&&"function"==typeof require?require("jquery"):jQuery)}(function(a){"use strict";function b(c,d){var e=this;e.element=c,e.el=a(c),e.suggestions=[],e.badQueries=[],e.selectedIndex=-1,e.currentValue=e.element.value,e.timeoutId=null,e.cachedResponse={},e.onChangeTimeout=null,e.onChange=null,e.isLocal=!1,e.suggestionsContainer=null,e.noSuggestionsContainer=null,e.options=a.extend({},b.defaults,d),e.classes={selected:"autocomplete-selected",suggestion:"autocomplete-suggestion"},e.hint=null,e.hintValue="",e.selection=null,e.initialize(),e.setOptions(d)}function c(a,b,c){return-1!==a.value.toLowerCase().indexOf(c)}function d(b){return"string"==typeof b?a.parseJSON(b):b}function e(a,b){if(!b)return a.value;var c="("+g.escapeRegExChars(b)+")";return a.value.replace(new RegExp(c,"gi"),"<strong>$1</strong>").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/&lt;(\/?strong)&gt;/g,"<$1>")}function f(a,b){return'<div class="autocomplete-group">'+b+"</div>"}var g=function(){return{escapeRegExChars:function(a){return a.replace(/[|\\{}()[\]^$+*?.]/g,"\\$&")},createNode:function(a){var b=document.createElement("div");return b.className=a,b.style.position="absolute",b.style.display="none",b}}}(),h={ESC:27,TAB:9,RETURN:13,LEFT:37,UP:38,RIGHT:39,DOWN:40},i=a.noop;b.utils=g,a.Autocomplete=b,b.defaults={ajaxSettings:{},autoSelectFirst:!1,appendTo:"body",serviceUrl:null,lookup:null,onSelect:null,width:"auto",minChars:1,maxHeight:300,deferRequestBy:0,params:{},formatResult:e,formatGroup:f,delimiter:null,zIndex:9999,type:"GET",noCache:!1,onSearchStart:i,onSearchComplete:i,onSearchError:i,preserveInput:!1,containerClass:"autocomplete-suggestions",tabDisabled:!1,dataType:"text",currentRequest:null,triggerSelectOnValidInput:!0,preventBadQueries:!0,lookupFilter:c,paramName:"query",transformResult:d,showNoSuggestionNotice:!1,noSuggestionNotice:"No results",orientation:"bottom",forceFixPosition:!1},b.prototype={initialize:function(){var c,d=this,e="."+d.classes.suggestion,f=d.classes.selected,g=d.options;d.element.setAttribute("autocomplete","off"),d.noSuggestionsContainer=a('<div class="autocomplete-no-suggestion"></div>').html(this.options.noSuggestionNotice).get(0),d.suggestionsContainer=b.utils.createNode(g.containerClass),c=a(d.suggestionsContainer),c.appendTo(g.appendTo||"body"),"auto"!==g.width&&c.css("width",g.width),c.on("mouseover.autocomplete",e,function(){d.activate(a(this).data("index"))}),c.on("mouseout.autocomplete",function(){d.selectedIndex=-1,c.children("."+f).removeClass(f)}),c.on("click.autocomplete",e,function(){d.select(a(this).data("index"))}),c.on("click.autocomplete",function(){clearTimeout(d.blurTimeoutId)}),d.fixPositionCapture=function(){d.visible&&d.fixPosition()},a(window).on("resize.autocomplete",d.fixPositionCapture),d.el.on("keydown.autocomplete",function(a){d.onKeyPress(a)}),d.el.on("keyup.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("blur.autocomplete",function(){d.onBlur()}),d.el.on("focus.autocomplete",function(){d.onFocus()}),d.el.on("change.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("input.autocomplete",function(a){d.onKeyUp(a)})},onFocus:function(){var a=this;a.fixPosition(),a.el.val().length>=a.options.minChars&&a.onValueChange()},onBlur:function(){var a=this;a.blurTimeoutId=setTimeout(function(){a.hide()},200)},abortAjax:function(){var a=this;a.currentRequest&&(a.currentRequest.abort(),a.currentRequest=null)},setOptions:function(b){var c=this,d=c.options;this.options=a.extend({},d,b),c.isLocal=a.isArray(d.lookup),c.isLocal&&(d.lookup=c.verifySuggestionsFormat(d.lookup)),d.orientation=c.validateOrientation(d.orientation,"bottom"),a(c.suggestionsContainer).css({"max-height":d.maxHeight+"px",width:d.width+"px","z-index":d.zIndex})},clearCache:function(){this.cachedResponse={},this.badQueries=[]},clear:function(){this.clearCache(),this.currentValue="",this.suggestions=[]},disable:function(){var a=this;a.disabled=!0,clearTimeout(a.onChangeTimeout),a.abortAjax()},enable:function(){this.disabled=!1},fixPosition:function(){var b=this,c=a(b.suggestionsContainer),d=c.parent().get(0);if(d===document.body||b.options.forceFixPosition){var e=b.options.orientation,f=c.outerHeight(),g=b.el.outerHeight(),h=b.el.offset(),i={top:h.top,left:h.left};if("auto"===e){var j=a(window).height(),k=a(window).scrollTop(),l=-k+h.top-f,m=k+j-(h.top+g+f);e=Math.max(l,m)===l?"top":"bottom"}if("top"===e?i.top+=-f:i.top+=g,d!==document.body){var n,o=c.css("opacity");b.visible||c.css("opacity",0).show(),n=c.offsetParent().offset(),i.top-=n.top,i.left-=n.left,b.visible||c.css("opacity",o).hide()}"auto"===b.options.width&&(i.width=b.el.outerWidth()+"px"),c.css(i)}},isCursorAtEnd:function(){var a,b=this,c=b.el.val().length,d=b.element.selectionStart;return"number"==typeof d?d===c:document.selection?(a=document.selection.createRange(),a.moveStart("character",-c),c===a.text.length):!0},onKeyPress:function(a){var b=this;if(!b.disabled&&!b.visible&&a.which===h.DOWN&&b.currentValue)return void b.suggest();if(!b.disabled&&b.visible){switch(a.which){case h.ESC:b.el.val(b.currentValue),b.hide();break;case h.RIGHT:if(b.hint&&b.options.onHint&&b.isCursorAtEnd()){b.selectHint();break}return;case h.TAB:if(b.hint&&b.options.onHint)return void b.selectHint();if(-1===b.selectedIndex)return void b.hide();if(b.select(b.selectedIndex),b.options.tabDisabled===!1)return;break;case h.RETURN:if(-1===b.selectedIndex)return void b.hide();b.select(b.selectedIndex);break;case h.UP:b.moveUp();break;case h.DOWN:b.moveDown();break;default:return}a.stopImmediatePropagation(),a.preventDefault()}},onKeyUp:function(a){var b=this;if(!b.disabled){switch(a.which){case h.UP:case h.DOWN:return}clearTimeout(b.onChangeTimeout),b.currentValue!==b.el.val()&&(b.findBestHint(),b.options.deferRequestBy>0?b.onChangeTimeout=setTimeout(function(){b.onValueChange()},b.options.deferRequestBy):b.onValueChange())}},onValueChange:function(){var b=this,c=b.options,d=b.el.val(),e=b.getQuery(d);return b.selection&&b.currentValue!==e&&(b.selection=null,(c.onInvalidateSelection||a.noop).call(b.element)),clearTimeout(b.onChangeTimeout),b.currentValue=d,b.selectedIndex=-1,c.triggerSelectOnValidInput&&b.isExactMatch(e)?void b.select(0):void(e.length<c.minChars?b.hide():b.getSuggestions(e))},isExactMatch:function(a){var b=this.suggestions;return 1===b.length&&b[0].value.toLowerCase()===a.toLowerCase()},getQuery:function(b){var c,d=this.options.delimiter;return d?(c=b.split(d),a.trim(c[c.length-1])):b},getSuggestionsLocal:function(b){var c,d=this,e=d.options,f=b.toLowerCase(),g=e.lookupFilter,h=parseInt(e.lookupLimit,10);return c={suggestions:a.grep(e.lookup,function(a){return g(a,b,f)})},h&&c.suggestions.length>h&&(c.suggestions=c.suggestions.slice(0,h)),c},getSuggestions:function(b){var c,d,e,f,g=this,h=g.options,i=h.serviceUrl;if(h.params[h.paramName]=b,h.onSearchStart.call(g.element,h.params)!==!1){if(d=h.ignoreParams?null:h.params,a.isFunction(h.lookup))return void h.lookup(b,function(a){g.suggestions=a.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,a.suggestions)});g.isLocal?c=g.getSuggestionsLocal(b):(a.isFunction(i)&&(i=i.call(g.element,b)),e=i+"?"+a.param(d||{}),c=g.cachedResponse[e]),c&&a.isArray(c.suggestions)?(g.suggestions=c.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,c.suggestions)):g.isBadQuery(b)?h.onSearchComplete.call(g.element,b,[]):(g.abortAjax(),f={url:i,data:d,type:h.type,dataType:h.dataType},a.extend(f,h.ajaxSettings),g.currentRequest=a.ajax(f).done(function(a){var c;g.currentRequest=null,c=h.transformResult(a,b),g.processResponse(c,b,e),h.onSearchComplete.call(g.element,b,c.suggestions)}).fail(function(a,c,d){h.onSearchError.call(g.element,b,a,c,d)}))}},isBadQuery:function(a){if(!this.options.preventBadQueries)return!1;for(var b=this.badQueries,c=b.length;c--;)if(0===a.indexOf(b[c]))return!0;return!1},hide:function(){var b=this,c=a(b.suggestionsContainer);a.isFunction(b.options.onHide)&&b.visible&&b.options.onHide.call(b.element,c),b.visible=!1,b.selectedIndex=-1,clearTimeout(b.onChangeTimeout),a(b.suggestionsContainer).hide(),b.signalHint(null)},suggest:function(){if(!this.suggestions.length)return void(this.options.showNoSuggestionNotice?this.noSuggestions():this.hide());var b,c=this,d=c.options,e=d.groupBy,f=d.formatResult,g=c.getQuery(c.currentValue),h=c.classes.suggestion,i=c.classes.selected,j=a(c.suggestionsContainer),k=a(c.noSuggestionsContainer),l=d.beforeRender,m="",n=function(a,c){var f=a.data[e];return b===f?"":(b=f,d.formatGroup(a,b))};return d.triggerSelectOnValidInput&&c.isExactMatch(g)?void c.select(0):(a.each(c.suggestions,function(a,b){e&&(m+=n(b,g,a)),m+='<div class="'+h+'" data-index="'+a+'">'+f(b,g,a)+"</div>"}),this.adjustContainerWidth(),k.detach(),j.html(m),a.isFunction(l)&&l.call(c.element,j,c.suggestions),c.fixPosition(),j.show(),d.autoSelectFirst&&(c.selectedIndex=0,j.scrollTop(0),j.children("."+h).first().addClass(i)),c.visible=!0,void c.findBestHint())},noSuggestions:function(){var b=this,c=b.options.beforeRender,d=a(b.suggestionsContainer),e=a(b.noSuggestionsContainer);this.adjustContainerWidth(),e.detach(),d.empty(),d.append(e),a.isFunction(c)&&c.call(b.element,d,b.suggestions),b.fixPosition(),d.show(),b.visible=!0},adjustContainerWidth:function(){var b,c=this,d=c.options,e=a(c.suggestionsContainer);"auto"===d.width?(b=c.el.outerWidth(),e.css("width",b>0?b:300)):"flex"===d.width&&e.css("width","")},findBestHint:function(){var b=this,c=b.el.val().toLowerCase(),d=null;c&&(a.each(b.suggestions,function(a,b){var e=0===b.value.toLowerCase().indexOf(c);return e&&(d=b),!e}),b.signalHint(d))},signalHint:function(b){var c="",d=this;b&&(c=d.currentValue+b.value.substr(d.currentValue.length)),d.hintValue!==c&&(d.hintValue=c,d.hint=b,(this.options.onHint||a.noop)(c))},verifySuggestionsFormat:function(b){return b.length&&"string"==typeof b[0]?a.map(b,function(a){return{value:a,data:null}}):b},validateOrientation:function(b,c){return b=a.trim(b||"").toLowerCase(),-1===a.inArray(b,["auto","bottom","top"])&&(b=c),b},processResponse:function(a,b,c){var d=this,e=d.options;a.suggestions=d.verifySuggestionsFormat(a.suggestions),e.noCache||(d.cachedResponse[c]=a,e.preventBadQueries&&!a.suggestions.length&&d.badQueries.push(b)),b===d.getQuery(d.currentValue)&&(d.suggestions=a.suggestions,d.suggest())},activate:function(b){var c,d=this,e=d.classes.selected,f=a(d.suggestionsContainer),g=f.find("."+d.classes.suggestion);return f.find("."+e).removeClass(e),d.selectedIndex=b,-1!==d.selectedIndex&&g.length>d.selectedIndex?(c=g.get(d.selectedIndex),a(c).addClass(e),c):null},selectHint:function(){var b=this,c=a.inArray(b.hint,b.suggestions);b.select(c)},select:function(a){var b=this;b.hide(),b.onSelect(a)},moveUp:function(){var b=this;if(-1!==b.selectedIndex)return 0===b.selectedIndex?(a(b.suggestionsContainer).children().first().removeClass(b.classes.selected),b.selectedIndex=-1,b.el.val(b.currentValue),void b.findBestHint()):void b.adjustScroll(b.selectedIndex-1)},moveDown:function(){var a=this;a.selectedIndex!==a.suggestions.length-1&&a.adjustScroll(a.selectedIndex+1)},adjustScroll:function(b){var c=this,d=c.activate(b);if(d){var e,f,g,h=a(d).outerHeight();e=d.offsetTop,f=a(c.suggestionsContainer).scrollTop(),g=f+c.options.maxHeight-h,f>e?a(c.suggestionsContainer).scrollTop(e):e>g&&a(c.suggestionsContainer).scrollTop(e-c.options.maxHeight+h),c.options.preserveInput||c.el.val(c.getValue(c.suggestions[b].value)),c.signalHint(null)}},onSelect:function(b){var c=this,d=c.options.onSelect,e=c.suggestions[b];c.currentValue=c.getValue(e.value),c.currentValue===c.el.val()||c.options.preserveInput||c.el.val(c.currentValue),c.signalHint(null),c.suggestions=[],c.selection=e,a.isFunction(d)&&d.call(c.element,e)},getValue:function(a){var b,c,d=this,e=d.options.delimiter;return e?(b=d.currentValue,c=b.split(e),1===c.length?a:b.substr(0,b.length-c[c.length-1].length)+a):a},dispose:function(){var b=this;b.el.off(".autocomplete").removeData("autocomplete"),a(window).off("resize.autocomplete",b.fixPositionCapture),a(b.suggestionsContainer).remove()}},a.fn.devbridgeAutocomplete=function(c,d){var e="autocomplete";return arguments.length?this.each(function(){var f=a(this),g=f.data(e);"string"==typeof c?g&&"function"==typeof g[c]&&g[c](d):(g&&g.dispose&&g.dispose(),g=new b(this,c),f.data(e,g))}):this.first().data(e)},a.fn.autocomplete||(a.fn.autocomplete=a.fn.devbridgeAutocomplete)});
\ No newline at end of file

From e789975639a1faa2f0895e2fdf6dd82c1e2184a4 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Sat, 29 Jul 2017 10:29:56 -0500
Subject: [PATCH 100/148] Use namespaced classes in build scripts

---
 build/generatecss.php   |  7 +++++--
 build/helpTOC.php       | 21 +++++++++++++--------
 build/stubGenerator.php |  7 +++++--
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/build/generatecss.php b/build/generatecss.php
index 518771a65dd36..893dd39a627d3 100644
--- a/build/generatecss.php
+++ b/build/generatecss.php
@@ -9,6 +9,9 @@
 // Set flag that this is a parent file.
 const _JEXEC = 1;
 
+// Import namespaced classes
+use Joomla\CMS\Application\CliApplication;
+
 // Set fixed precision value to avoid round related issues
 ini_set('precision', 14);
 
@@ -33,7 +36,7 @@
  *
  * @since  3.0
  */
-class GenerateCss extends JApplicationCli
+class GenerateCss extends CliApplication
 {
 	/**
 	 * Entry point for the script
@@ -75,4 +78,4 @@ public function doExecute()
 	}
 }
 
-JApplicationCli::getInstance('GenerateCss')->execute();
+CliApplication::getInstance('GenerateCss')->execute();
diff --git a/build/helpTOC.php b/build/helpTOC.php
index baf64ba0b9ff1..49fd404b71e11 100644
--- a/build/helpTOC.php
+++ b/build/helpTOC.php
@@ -9,6 +9,12 @@
 // Set flag that this is a parent file.
 const _JEXEC = 1;
 
+// Import namespaced classes
+use Joomla\CMS\Application\CliApplication;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Version;
+use Joomla\Registry\Registry;
+
 // Load system defines
 if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
@@ -32,14 +38,14 @@
 ini_set('display_errors', 1);
 
 // Load the admin en-GB.ini language file to get the JHELP language keys
-JFactory::getLanguage()->load('joomla', JPATH_ADMINISTRATOR, null, false, false);
+Factory::getLanguage()->load('joomla', JPATH_ADMINISTRATOR, null, false, false);
 
 /**
  * Utility CLI to retrieve the list of help screens from the docs wiki and create an index for the admin help view.
  *
  * @since  3.0
  */
-class MediawikiCli extends JApplicationCli
+class MediawikiCli extends CliApplication
 {
 	/**
 	 * Entry point for CLI script
@@ -51,19 +57,18 @@ class MediawikiCli extends JApplicationCli
 	public function doExecute()
 	{
 		// Get the version data for the script
-		$version     = new JVersion;
-		$helpVersion = str_replace('.', '', $version::RELEASE);
+		$helpVersion = str_replace('.', '', Version::RELEASE);
 		$namespace   = 'Help' . $helpVersion . ':';
 
 		// Set up options for JMediawiki
-		$options = new Joomla\Registry\Registry;
+		$options = new Registry;
 		$options->set('api.url', 'https://docs.joomla.org');
 
 		$mediawiki = new JMediawiki($options);
 
 		// Get the category members (local hack)
 		$this->out('Fetching data from docs wiki', true);
-		$categoryMembers = $mediawiki->categories->getCategoryMembers('Category:Help_screen_' . $version::RELEASE, null, 'max');
+		$categoryMembers = $mediawiki->categories->getCategoryMembers('Category:Help_screen_' . Version::RELEASE, null, 'max');
 
 		$members = array();
 
@@ -77,7 +82,7 @@ public function doExecute()
 		}
 
 		// Get the language object
-		$language = JFactory::getLanguage();
+		$language = Factory::getLanguage();
 
 		// Get the language strings via Reflection as the property is protected
 		$refl = new ReflectionClass($language);
@@ -201,4 +206,4 @@ public function doExecute()
 }
 
 // Instantiate the application and execute it
-JApplicationCli::getInstance('MediawikiCli')->execute();
+CliApplication::getInstance('MediawikiCli')->execute();
diff --git a/build/stubGenerator.php b/build/stubGenerator.php
index f5b0dbdc0a446..09f3dfecc4e96 100644
--- a/build/stubGenerator.php
+++ b/build/stubGenerator.php
@@ -9,6 +9,9 @@
 // Set flag that this is a parent file.
 const _JEXEC = 1;
 
+// Import namespaced classes
+use Joomla\CMS\Application\CliApplication;
+
 // Load system defines
 if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
@@ -46,7 +49,7 @@
  *
  * @since  3.0
  */
-class StubGenerator extends JApplicationCli
+class StubGenerator extends CliApplication
 {
 	/**
 	 * Entry point for CLI script
@@ -84,4 +87,4 @@ public function doExecute()
 }
 
 // Instantiate the application and execute it
-JApplicationCli::getInstance('StubGenerator')->execute();
+CliApplication::getInstance('StubGenerator')->execute();

From 9320a94da956333f1661b083a91d7ae9f9a08252 Mon Sep 17 00:00:00 2001
From: Simon Asika <asika32764@gmail.com>
Date: Sun, 30 Jul 2017 00:12:12 +0800
Subject: [PATCH 101/148] isset query[id] (#16889)

---
 .../src/Joomla/CMS/Component/Router/Rules/StandardRules.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Joomla/CMS/Component/Router/Rules/StandardRules.php b/libraries/src/Joomla/CMS/Component/Router/Rules/StandardRules.php
index 6d519f1e89a60..f8b2c2544e2cd 100644
--- a/libraries/src/Joomla/CMS/Component/Router/Rules/StandardRules.php
+++ b/libraries/src/Joomla/CMS/Component/Router/Rules/StandardRules.php
@@ -198,7 +198,7 @@ public function build(&$query, &$segments)
 		{
 			$view = $views[$query['view']];
 
-			if (isset($item->query[$view->key]) && $item->query[$view->key] == (int) $query[$view->key])
+			if (isset($item->query[$view->key], $query[$view->key]) && $item->query[$view->key] == (int) $query[$view->key])
 			{
 				unset($query[$view->key]);
 

From 9efd8c01f14c34960dd9fb6a34387c53de5195e6 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 29 Jul 2017 18:57:33 +0200
Subject: [PATCH 102/148] fix whitespace error from the last commit.

---
 installation/model/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installation/model/database.php b/installation/model/database.php
index b0c5dfcc3cc0f..80c91b35a47db 100644
--- a/installation/model/database.php
+++ b/installation/model/database.php
@@ -165,7 +165,7 @@ public function initialise($options)
 		}
 
 		$shouldCheckLocalhost = getenv('JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK') !== '1';
-		
+
 		// Per Default allowed DB Hosts
 		$localhost = array(
 			'localhost',

From 09f5cd5dd1e199cb8a4df4dcda2d66c3e4502f6e Mon Sep 17 00:00:00 2001
From: Simon Asika <asika32764@gmail.com>
Date: Sun, 30 Jul 2017 00:57:55 +0800
Subject: [PATCH 103/148] Add CSRF token for Ajax (#14952)

* Add CSRF token for Ajax

* Add CSRF token to hathor

* CS

* call jquery first

* Use server->get()

* Loaded once

* Add CSRF to core.js request method

* Use CSRF instead Csrf

* Use scriptOption

* Fix test

* MISC update

* Use $name variable in JS

* Use string as script option directly and fix tests
---
 .../view/application/tmpl/default_mail.php    |  3 +-
 .../com_config/application/default_mail.php   |  3 +-
 libraries/cms/html/behavior.php               |  1 +
 libraries/cms/html/form.php                   | 53 ++++++++++++++++++-
 libraries/cms/html/jquery.php                 | 39 ++++++++++++++
 libraries/src/Joomla/CMS/Session/Session.php  |  7 +++
 media/system/js/core-uncompressed.js          | 17 ++++--
 .../libraries/cms/html/JHtmlFormTest.php      | 20 +++++++
 .../libraries/cms/html/JHtmlJqueryTest.php    | 19 +++++++
 9 files changed, 154 insertions(+), 8 deletions(-)

diff --git a/administrator/components/com_config/view/application/tmpl/default_mail.php b/administrator/components/com_config/view/application/tmpl/default_mail.php
index 8b7342ebebb68..795808c3bf100 100644
--- a/administrator/components/com_config/view/application/tmpl/default_mail.php
+++ b/administrator/components/com_config/view/application/tmpl/default_mail.php
@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('jquery.token');
 JHtml::_('script', 'system/sendtestmail.js', array('version' => 'auto', 'relative' => true));
 
 // Load JavaScript message titles
@@ -25,7 +26,7 @@
 JText::script('JLIB_JS_AJAX_ERROR_TIMEOUT');
 
 // Ajax request data.
-$ajaxUri = JRoute::_('index.php?option=com_config&task=config.sendtestmail.application&format=json&' . JSession::getFormToken() . '=1');
+$ajaxUri = JRoute::_('index.php?option=com_config&task=config.sendtestmail.application&format=json');
 
 $this->name = JText::_('COM_CONFIG_MAIL_SETTINGS');
 $this->fieldsname = 'mail';
diff --git a/administrator/templates/hathor/html/com_config/application/default_mail.php b/administrator/templates/hathor/html/com_config/application/default_mail.php
index 4e1395a2c3298..89888029c08a1 100644
--- a/administrator/templates/hathor/html/com_config/application/default_mail.php
+++ b/administrator/templates/hathor/html/com_config/application/default_mail.php
@@ -9,10 +9,11 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('jquery.token');
 JHtml::_('script', 'system/sendtestmail.js', array('version' => 'auto', 'relative' => true));
 
 JFactory::getDocument()->addScriptDeclaration('
-	var sendtestmail_url = "' . addslashes(JUri::base()) . 'index.php?option=com_config&task=config.sendtestmail.application&format=json&' . JSession::getFormToken() . '=1";
+	var sendtestmail_url = "' . addslashes(JUri::base()) . 'index.php?option=com_config&task=config.sendtestmail.application&format=json";
  ');
 ?>
 <div class="width-100">
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 53cb2b0dec35c..b783b3209022c 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -87,6 +87,7 @@ public static function core()
 			return;
 		}
 
+		JHtml::_('form.csrf');
 		JHtml::_('script', 'system/core.js', array('version' => 'auto', 'relative' => true));
 
 		// Add core and base uri paths so javascript scripts can use them.
diff --git a/libraries/cms/html/form.php b/libraries/cms/html/form.php
index 1c1af66a2f375..e5c15980c7181 100644
--- a/libraries/cms/html/form.php
+++ b/libraries/cms/html/form.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Utility class for form elements
  *
@@ -16,18 +18,65 @@
  */
 abstract class JHtmlForm
 {
+	/**
+	 * Array containing information for loaded files.
+	 *
+	 * @var    array
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected static $loaded = array();
+
 	/**
 	 * Displays a hidden token field to reduce the risk of CSRF exploits
 	 *
 	 * Use in conjunction with JSession::checkToken()
 	 *
+	 * @param   array  $attribs  Input element attributes.
+	 *
 	 * @return  string  A hidden input field with a token
 	 *
 	 * @see     JSession::checkToken()
 	 * @since   1.5
 	 */
-	public static function token()
+	public static function token(array $attribs = array())
 	{
-		return '<input type="hidden" name="' . JSession::getFormToken() . '" value="1" />';
+		$attributes = '';
+
+		if ($attribs !== array())
+		{
+			$attributes .= ' ' . ArrayHelper::toString($attribs);
+		}
+
+		return '<input type="hidden" name="' . JSession::getFormToken() . '" value="1"' . $attributes . ' />';
+	}
+
+	/**
+	 * Add CSRF form token to Joomla script options that developers can get it by Javascript.
+	 *
+	 * @param   string  $name  The script option key name.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function csrf($name = 'csrf.token')
+	{
+		if (isset(static::$loaded[__METHOD__][$name]))
+		{
+			return;
+		}
+
+		/** @var JDocumentHtml $doc */
+		$doc = JFactory::getDocument();
+
+		if (!$doc instanceof JDocumentHtml || $doc->getType() !== 'html')
+		{
+			return;
+		}
+
+		$doc->addScriptOptions($name, JSession::getFormToken());
+
+		static::$loaded[__METHOD__][$name] = true;
 	}
 }
diff --git a/libraries/cms/html/jquery.php b/libraries/cms/html/jquery.php
index d9d4b30078aee..f2555e6c05155 100644
--- a/libraries/cms/html/jquery.php
+++ b/libraries/cms/html/jquery.php
@@ -107,4 +107,43 @@ public static function ui(array $components = array('core'), $debug = null)
 
 		return;
 	}
+
+	/**
+	 * Auto set CSRF token to ajaxSetup so all jQuery ajax call will contains CSRF token.
+	 *
+	 * @param   string  $name  The CSRF meta tag name.
+	 *
+	 * @return  void
+	 *
+	 * @throws  \InvalidArgumentException
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function token($name = 'csrf.token')
+	{
+		// Only load once
+		if (!empty(static::$loaded[__METHOD__][$name]))
+		{
+			return;
+		}
+
+		static::framework();
+		JHtml::_('form.csrf', $name);
+
+		$doc = JFactory::getDocument();
+
+		$doc->addScriptDeclaration(
+<<<JS
+;(function ($) {
+	$.ajaxSetup({
+		headers: {
+			'X-CSRF-Token': Joomla.getOptions('$name')
+		}
+	});
+})(jQuery);
+JS
+		);
+
+		static::$loaded[__METHOD__][$name] = true;
+	}
 }
diff --git a/libraries/src/Joomla/CMS/Session/Session.php b/libraries/src/Joomla/CMS/Session/Session.php
index ed91a34897eb5..01c55db103a69 100644
--- a/libraries/src/Joomla/CMS/Session/Session.php
+++ b/libraries/src/Joomla/CMS/Session/Session.php
@@ -316,6 +316,13 @@ public static function checkToken($method = 'post')
 		$token = self::getFormToken();
 		$app = \JFactory::getApplication();
 
+		// Check from header first
+		if ($token === $app->input->server->get('HTTP_X_CSRF_TOKEN', '', 'alnum'))
+		{
+			return true;
+		}
+
+		// Then fallback to HTTP query
 		if (!$app->input->$method->get($token, '', 'alnum'))
 		{
 			if (\JFactory::getSession()->isNew())
diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
index 82636b3bfacbf..497c643135cd1 100644
--- a/media/system/js/core-uncompressed.js
+++ b/media/system/js/core-uncompressed.js
@@ -839,24 +839,33 @@ Joomla.editors.instances = Joomla.editors.instances || {
 		}, options);
 
 		// Use POST for send the data
-		options.method = options.data ? 'POST' : options.method;
+		options.method = options.data ? 'POST' : options.method.toUpperCase();
 
 		// Set up XMLHttpRequest instance
 		try{
 			var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('MSXML2.XMLHTTP.3.0');
+
 			xhr.open(options.method, options.url, true);
 
 			// Set the headers
 			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 			xhr.setRequestHeader('X-Ajax-Engine', 'Joomla!');
 
-			if (options.method === 'POST' && (!options.headers || !options.headers['Content-Type'])) {
-				xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+			if (options.method === 'POST') {
+				var token = Joomla.getOptions('csrf.token', '');
+
+				if (token) {
+					xhr.setRequestHeader('X-CSRF-Token', token);
+				}
+
+				if (!options.headers || !options.headers['Content-Type']) {
+					xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+				}
 			}
 
 			// Custom headers
 			if (options.headers){
-				for (var p in options.headers){
+				for (var p in options.headers) {
 					if (options.headers.hasOwnProperty(p)) {
 						xhr.setRequestHeader(p, options.headers[p]);
 					}
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php b/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php
index 6a5e9631062b6..3e21fc9fbcf1a 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php
@@ -82,4 +82,24 @@ public function testToken()
 			$this->equalTo('<input type="hidden" name="' . $token . '" value="1" />')
 		);
 	}
+
+	/**
+	 * Tests the JHtmlForm::csrf method.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function testCsrf()
+	{
+		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$document = new JDocumentHtml;
+
+		JHtmlForm::csrf();
+
+		$doc = JFactory::getDocument();
+		$options = $this->getObjectAttribute($doc, 'scriptOptions');
+
+		$this->assertEquals(JSession::getFormToken(), $options['csrf.token']);
+	}
 }
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php b/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
index 287fe5a5cfb70..77e5b755769a1 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
@@ -125,4 +125,23 @@ public function testUi()
 			'Verify that the jQueryUI sortable script is loaded'
 		);
 	}
+
+	/**
+	 * Tests the token() method.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function testToken()
+	{
+		JHtmlJquery::token();
+		
+		$doc = JFactory::getDocument();
+		
+		$script = $doc->_script['text/javascript'];
+		$expected = ";(function ($) { $.ajaxSetup({ headers: { 'X-CSRF-Token': Joomla.getOptions('csrf.token') } }); })(jQuery);";
+
+		self::assertEquals($expected, preg_replace('/\s+/', ' ', $script));
+	}
 }

From 3eda58daab0cbc9b8eb6d337df3927b7dbd4d379 Mon Sep 17 00:00:00 2001
From: "Nicholas K. Dionysopoulos" <nicholas@akeebabackup.com>
Date: Sun, 30 Jul 2017 09:48:56 +0300
Subject: [PATCH 104/148] Pull Request for Issue #15542. Replaces PR #15576

---
 .../com_joomlaupdate/models/default.php       |   4 +-
 .../components/com_joomlaupdate/restore.php   | 627 ++++++++++++++----
 2 files changed, 518 insertions(+), 113 deletions(-)

diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
index 9cb780a2b85c2..c9b5fed5a7258 100644
--- a/administrator/components/com_joomlaupdate/models/default.php
+++ b/administrator/components/com_joomlaupdate/models/default.php
@@ -399,7 +399,9 @@ public function createRestorationFile($basename = null)
 	'kickstart.setup.destdir' => '$siteroot',
 	'kickstart.setup.restoreperms' => '0',
 	'kickstart.setup.filetype' => 'zip',
-	'kickstart.setup.dryrun' => '0'
+	'kickstart.setup.dryrun' => '0',
+	'kickstart.setup.renamefiles' => array(),
+	'kickstart.setup.renamefiles' => false
 ENDDATA;
 
 		if ($method != 'direct')
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
index 093e9d815d7b8..a2413995a0a39 100644
--- a/administrator/components/com_joomlaupdate/restore.php
+++ b/administrator/components/com_joomlaupdate/restore.php
@@ -1,10 +1,18 @@
 <?php
+/**
+ * Akeeba Restore
+ *
+ * An archive extraction engine for ZIP, JPA and JPS archives.
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ */
 
 /**
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -82,6 +90,24 @@ function akstringlen($string)
 	}
 }
 
+if (!function_exists('aksubstr'))
+{
+	if (function_exists('mb_strlen'))
+	{
+		function aksubstr($string, $start, $length = null)
+		{
+			return mb_substr($string, $start, $length, '8bit');
+		}
+	}
+	else
+	{
+		function aksubstr($string, $start, $length = null)
+		{
+			return substr($string, $start, $length);
+		}
+	}
+}
+
 /**
  * Gets a query parameter from GET or POST data
  *
@@ -129,7 +155,7 @@ function debugMsg($msg)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -151,7 +177,7 @@ abstract class AKAbstractObject
 	private $_warnings = array();
 
 	/**
-	 * Public constructor, makes sure we are instanciated only by the factory class
+	 * Public constructor, makes sure we are instantiated only by the factory class
 	 */
 	public function __construct()
 	{
@@ -267,7 +293,7 @@ public function resetWarnings()
 	 * Propagates errors and warnings to a foreign object. The foreign object SHOULD
 	 * implement the setError() and/or setWarning() methods but DOESN'T HAVE TO be of
 	 * AKAbstractObject type. For example, this can even be used to propagate to a
-	 * JObject instance in Joomla!. Propagated items will be removed from ourself.
+	 * JObject instance in Joomla!. Propagated items will be removed from ourselves.
 	 *
 	 * @param object $object The object to propagate errors and warnings to.
 	 */
@@ -360,6 +386,7 @@ public function setError($error)
 				array_shift($this->_errors);
 			}
 		}
+
 		$this->_errors[] = $error;
 	}
 
@@ -407,7 +434,7 @@ protected function setWarningsQueueSize($newSize = 0)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -492,9 +519,9 @@ abstract class AKAbstractPart extends AKAbstractObject
 	/**
 	 * The public interface to an engine part. This method takes care for
 	 * calling the correct method in order to perform the initialisation -
-	 * run - finalisation cycle of operation and return a proper reponse array.
+	 * run - finalisation cycle of operation and return a proper response array.
 	 *
-	 * @return    array    A Reponse Array
+	 * @return    array    A Response Array
 	 */
 	final public function tick()
 	{
@@ -729,7 +756,7 @@ function attach(AKAbstractPartObserver $obs)
 	}
 
 	/**
-	 * Dettaches an observer object
+	 * Detaches an observer object
 	 *
 	 * @param AKAbstractPartObserver $obs
 	 */
@@ -780,7 +807,7 @@ protected function notify($message)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -1119,18 +1146,18 @@ protected function _run()
 					if ($status)
 					{
 						// Send start of file notification
-						$message          = new stdClass;
-						$message->type    = 'startfile';
-						$message->content = new stdClass;
+						$message                        = new stdClass;
+						$message->type                  = 'startfile';
+						$message->content               = new stdClass;
+						$message->content->realfile     = $this->fileHeader->file;
+						$message->content->file         = $this->fileHeader->file;
+						$message->content->uncompressed = $this->fileHeader->uncompressed;
+
 						if (array_key_exists('realfile', get_object_vars($this->fileHeader)))
 						{
 							$message->content->realfile = $this->fileHeader->realFile;
 						}
-						else
-						{
-							$message->content->realfile = $this->fileHeader->file;
-						}
-						$message->content->file = $this->fileHeader->file;
+
 						if (array_key_exists('compressed', get_object_vars($this->fileHeader)))
 						{
 							$message->content->compressed = $this->fileHeader->compressed;
@@ -1139,7 +1166,6 @@ protected function _run()
 						{
 							$message->content->compressed = 0;
 						}
-						$message->content->uncompressed = $this->fileHeader->uncompressed;
 
 						debugMsg(__CLASS__ . '::_run() - Preparing to extract ' . $message->content->realfile);
 
@@ -1218,7 +1244,7 @@ protected function _run()
 	/**
 	 * Concrete classes must use this method to read the file header
 	 *
-	 * @return bool True if reading the file was successful, false if an error occured or we reached end of archive
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
 	 */
 	protected abstract function readFileHeader();
 
@@ -1226,7 +1252,7 @@ protected abstract function readFileHeader();
 	 * Concrete classes must use this method to process file data. It must set $runState to AK_STATE_DATAREAD when
 	 * it's finished processing the file data.
 	 *
-	 * @return bool True if processing the file data was successful, false if an error occured
+	 * @return bool True if processing the file data was successful, false if an error occurred
 	 */
 	protected abstract function processFileData();
 
@@ -1402,7 +1428,7 @@ protected function removePath($path)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -1460,7 +1486,7 @@ abstract public function rename($from, $to);
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -1482,7 +1508,7 @@ abstract public function update($object, $message);
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -1617,7 +1643,7 @@ public function rename($from, $to)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -2194,7 +2220,7 @@ public function rename($from, $to)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -2842,7 +2868,7 @@ public function rename($from, $to)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -3230,7 +3256,7 @@ private function fixPermissions($path)
 		// Turn off error reporting
 		if (!defined('KSDEBUG'))
 		{
-			$oldErrorReporting = @error_reporting(E_NONE);
+			$oldErrorReporting = error_reporting(0);
 		}
 
 		// Get UNIX style paths
@@ -3607,7 +3633,7 @@ public function rename($from, $to)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -3706,7 +3732,7 @@ protected function readArchiveHeader()
 	/**
 	 * Concrete classes must use this method to read the file header
 	 *
-	 * @return bool True if reading the file was successful, false if an error occured or we reached end of archive
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
 	 */
 	protected function readFileHeader()
 	{
@@ -4077,7 +4103,7 @@ protected function createDirectory()
 	 * Concrete classes must use this method to process file data. It must set $runState to AK_STATE_DATAREAD when
 	 * it's finished processing the file data.
 	 *
-	 * @return bool True if processing the file data was successful, false if an error occured
+	 * @return bool True if processing the file data was successful, false if an error occurred
 	 */
 	protected function processFileData()
 	{
@@ -4216,7 +4242,7 @@ private function processTypeFileUncompressed()
 			// Can we write to the file?
 			if (($outfp === false) && (!$ignore))
 			{
-				// An error occured
+				// An error occurred
 				debugMsg('Could not write to output file');
 				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
 
@@ -4320,7 +4346,7 @@ private function processTypeFileCompressedSimple()
 
 			if (($outfp === false) && (!$ignore))
 			{
-				// An error occured
+				// An error occurred
 				debugMsg('Could not write to output file');
 				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
 
@@ -4393,7 +4419,7 @@ private function processTypeFileCompressedSimple()
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -4468,7 +4494,7 @@ protected function readArchiveHeader()
 	/**
 	 * Concrete classes must use this method to read the file header
 	 *
-	 * @return bool True if reading the file was successful, false if an error occured or we reached end of archive
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
 	 */
 	protected function readFileHeader()
 	{
@@ -4719,7 +4745,7 @@ protected function readFileHeader()
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -4730,10 +4756,55 @@ protected function readFileHeader()
  */
 class AKUnarchiverJPS extends AKUnarchiverJPA
 {
+	/**
+	 * Header data for the archive
+	 *
+	 * @var   array
+	 */
 	protected $archiveHeaderData = array();
 
+	/**
+	 * Plaintext password from which the encryption key will be derived with PBKDF2
+	 *
+	 * @var   string
+	 */
 	protected $password = '';
 
+	/**
+	 * Which hash algorithm should I use for key derivation with PBKDF2.
+	 *
+	 * @var   string
+	 */
+	private $pbkdf2Algorithm = 'sha1';
+
+	/**
+	 * How many iterations should I use for key derivation with PBKDF2
+	 *
+	 * @var   int
+	 */
+	private $pbkdf2Iterations = 1000;
+
+	/**
+	 * Should I use a static salt for key derivation with PBKDF2?
+	 *
+	 * @var   bool
+	 */
+	private $pbkdf2UseStaticSalt = 0;
+
+	/**
+	 * Static salt for key derivation with PBKDF2
+	 *
+	 * @var   string
+	 */
+	private $pbkdf2StaticSalt = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+	/**
+	 * How much compressed data I have read since the last file header read
+	 *
+	 * @var   int
+	 */
+	private $compressedSizeReadSinceLastFileHeader = 0;
+
 	public function __construct()
 	{
 		parent::__construct();
@@ -4741,6 +4812,18 @@ public function __construct()
 		$this->password = AKFactory::get('kickstart.jps.password', '');
 	}
 
+	public function __wakeup()
+	{
+		parent::__wakeup();
+
+		// Make sure the decryption is all set up (required!)
+		AKEncryptionAES::setPbkdf2Algorithm($this->pbkdf2Algorithm);
+		AKEncryptionAES::setPbkdf2Iterations($this->pbkdf2Iterations);
+		AKEncryptionAES::setPbkdf2UseStaticSalt($this->pbkdf2UseStaticSalt);
+		AKEncryptionAES::setPbkdf2StaticSalt($this->pbkdf2StaticSalt);
+	}
+
+
 	protected function readArchiveHeader()
 	{
 		// Initialize header data array
@@ -4770,15 +4853,24 @@ protected function readArchiveHeader()
 		$bin_data    = fread($this->fp, 5);
 		$header_data = unpack('Cmajor/Cminor/cspanned/vextra', $bin_data);
 
-		// Load any remaining header data (forward compatibility)
+		// Is this a v2 archive?
+		$versionHumanReadable = $header_data['major'] . '.' . $header_data['minor'];
+		$isV2Archive = version_compare($versionHumanReadable, '2.0', 'ge');
+
+		// Load any remaining header data
 		$rest_length = $header_data['extra'];
-		if ($rest_length > 0)
+
+		if ($isV2Archive && $rest_length)
 		{
-			$junk = fread($this->fp, $rest_length);
+			// V2 archives only have one kind of extra header
+			if (!$this->readKeyExpansionExtraHeader())
+			{
+				return false;
+			}
 		}
-		else
+		elseif ($rest_length > 0)
 		{
-			$junk = '';
+			$junk = fread($this->fp, $rest_length);
 		}
 
 		// Temporary array with all the data we read
@@ -4804,7 +4896,7 @@ protected function readArchiveHeader()
 	/**
 	 * Concrete classes must use this method to read the file header
 	 *
-	 * @return bool True if reading the file was successful, false if an error occured or we reached end of archive
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
 	 */
 	protected function readFileHeader()
 	{
@@ -4861,17 +4953,27 @@ protected function readFileHeader()
 				return false;
 			}
 		}
-		// This a JPA Entity Block. Process the header.
+
+		// This a JPS Entity Block. Process the header.
 
 		$isBannedFile = false;
 
+		// Make sure the decryption is all set up
+		AKEncryptionAES::setPbkdf2Algorithm($this->pbkdf2Algorithm);
+		AKEncryptionAES::setPbkdf2Iterations($this->pbkdf2Iterations);
+		AKEncryptionAES::setPbkdf2UseStaticSalt($this->pbkdf2UseStaticSalt);
+		AKEncryptionAES::setPbkdf2StaticSalt($this->pbkdf2StaticSalt);
+
 		// Read and decrypt the header
 		$edbhData = fread($this->fp, 4);
 		$edbh     = unpack('vencsize/vdecsize', $edbhData);
 		$bin_data = fread($this->fp, $edbh['encsize']);
 
+		// Add the header length to the data read
+		$this->compressedSizeReadSinceLastFileHeader += $edbh['encsize'] + 4;
+
 		// Decrypt and truncate
-		$bin_data = AKEncryptionAES::AESDecryptCBC($bin_data, $this->password, 128);
+		$bin_data = AKEncryptionAES::AESDecryptCBC($bin_data, $this->password);
 		$bin_data = substr($bin_data, 0, $edbh['decsize']);
 
 		// Read length of EDB and of the Entity Path Data
@@ -4975,11 +5077,14 @@ protected function readFileHeader()
 					// Skip forward by the amount of compressed data
 					$miniHead = unpack('Vencsize/Vdecsize', $binMiniHead);
 					@fseek($this->fp, $miniHead['encsize'], SEEK_CUR);
+					$this->compressedSizeReadSinceLastFileHeader += 8 + $miniHead['encsize'];
 				}
 			}
 
-			$this->currentPartOffset = @ftell($this->fp);
-			$this->runState          = AK_STATE_DONE;
+			$this->currentPartOffset                     = @ftell($this->fp);
+			$this->runState                              = AK_STATE_DONE;
+			$this->fileHeader->compressed                = $this->compressedSizeReadSinceLastFileHeader;
+			$this->compressedSizeReadSinceLastFileHeader = 0;
 
 			return true;
 		}
@@ -5030,6 +5135,9 @@ protected function readFileHeader()
 			$this->postProcEngine->processFilename(null);
 		}
 
+		$this->fileHeader->compressed                = $this->compressedSizeReadSinceLastFileHeader;
+		$this->compressedSizeReadSinceLastFileHeader = 0;
+
 		$this->createDirectory();
 
 		// Header is read
@@ -5053,25 +5161,24 @@ protected function createDirectory()
 		// Do we need to create a directory?
 		$lastSlash = strrpos($this->fileHeader->realFile, '/');
 		$dirName   = substr($this->fileHeader->realFile, 0, $lastSlash);
-		$perms     = $this->flagRestorePermissions ? $retArray['permissions'] : 0755;
+		$perms     = 0755;
 		$ignore    = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($dirName);
+
 		if (($this->postProcEngine->createDirRecursive($dirName, $perms) == false) && (!$ignore))
 		{
 			$this->setError(AKText::sprintf('COULDNT_CREATE_DIR', $dirName));
 
 			return false;
 		}
-		else
-		{
-			return true;
-		}
+
+		return true;
 	}
 
 	/**
 	 * Concrete classes must use this method to process file data. It must set $runState to AK_STATE_DATAREAD when
 	 * it's finished processing the file data.
 	 *
-	 * @return bool True if processing the file data was successful, false if an error occured
+	 * @return bool True if processing the file data was successful, false if an error occurred
 	 */
 	protected function processFileData()
 	{
@@ -5135,6 +5242,7 @@ private function processTypeLink()
 		// Read the mini header
 		$binMiniHeader   = fread($this->fp, 8);
 		$reallyReadBytes = akstringlen($binMiniHeader);
+
 		if ($reallyReadBytes < 8)
 		{
 			// We read less than requested! Why? Did we hit local EOF?
@@ -5167,6 +5275,8 @@ private function processTypeLink()
 		$toReadBytes     = $miniHeader['encsize'];
 		$data            = $this->fread($this->fp, $toReadBytes);
 		$reallyReadBytes = akstringlen($data);
+		$this->compressedSizeReadSinceLastFileHeader += 8 + $miniHeader['encsize'];
+
 		if ($reallyReadBytes < $toReadBytes)
 		{
 			// We read less than requested! Why? Did we hit local EOF?
@@ -5196,7 +5306,7 @@ private function processTypeLink()
 		}
 
 		// Decrypt the data
-		$data = AKEncryptionAES::AESDecryptCBC($data, $this->password, 128);
+		$data = AKEncryptionAES::AESDecryptCBC($data, $this->password);
 
 		// Is the length of the decrypted data less than expected?
 		$data_length = akstringlen($data);
@@ -5258,7 +5368,7 @@ private function processTypeFileUncompressed()
 			// Can we write to the file?
 			if (($outfp === false) && (!$ignore))
 			{
-				// An error occured
+				// An error occurred
 				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
 
 				return false;
@@ -5277,14 +5387,10 @@ private function processTypeFileUncompressed()
 
 			return true;
 		}
-		else
-		{
-			$this->setError('An uncompressed file was detected; this is not supported by this archive extraction utility');
 
-			return false;
-		}
+		$this->setError('An uncompressed file was detected; this is not supported by this archive extraction utility');
 
-		return true;
+		return false;
 	}
 
 	private function processTypeFileCompressedSimple()
@@ -5309,7 +5415,7 @@ private function processTypeFileCompressedSimple()
 				AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
 			if (($outfp === false) && (!$ignore))
 			{
-				// An error occured
+				// An error occurred
 				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
 
 				return false;
@@ -5372,6 +5478,9 @@ private function processTypeFileCompressedSimple()
 			$toReadBytes     = $miniHeader['encsize'];
 			$data            = $this->fread($this->fp, $toReadBytes);
 			$reallyReadBytes = akstringlen($data);
+
+			$this->compressedSizeReadSinceLastFileHeader += $miniHeader['encsize'] + 8;
+
 			if ($reallyReadBytes < $toReadBytes)
 			{
 				// We read less than requested! Why? Did we hit local EOF?
@@ -5408,7 +5517,7 @@ private function processTypeFileCompressedSimple()
 			}
 
 			// Decrypt the data
-			$data = AKEncryptionAES::AESDecryptCBC($data, $this->password, 128);
+			$data = AKEncryptionAES::AESDecryptCBC($data, $this->password);
 
 			// Is the length of the decrypted data less than expected?
 			$data_length = akstringlen($data);
@@ -5463,13 +5572,66 @@ private function processTypeFileCompressedSimple()
 
 		return true;
 	}
+
+	private function readKeyExpansionExtraHeader()
+	{
+		$signature = fread($this->fp, 4);
+
+		if ($signature != "JH\x00\x01")
+		{
+			// Not a valid JPS file
+			$this->setError(AKText::_('ERR_NOT_A_JPS_FILE'));
+
+			return false;
+		}
+
+		$bin_data    = fread($this->fp, 8);
+		$header_data = unpack('vlength/Calgo/Viterations/CuseStaticSalt', $bin_data);
+
+		if ($header_data['length'] != 76)
+		{
+			// Not a valid JPS file
+			$this->setError(AKText::_('ERR_NOT_A_JPS_FILE'));
+
+			return false;
+		}
+
+		switch ($header_data['algo'])
+		{
+			case 0:
+				$algorithm = 'sha1';
+				break;
+
+			case 1:
+				$algorithm = 'sha256';
+				break;
+
+			case 2:
+				$algorithm = 'sha512';
+				break;
+
+			default:
+				// Not a valid JPS file
+				$this->setError(AKText::_('ERR_NOT_A_JPS_FILE'));
+
+				return false;
+				break;
+		}
+
+		$this->pbkdf2Algorithm     = $algorithm;
+		$this->pbkdf2Iterations    = $header_data['iterations'];
+		$this->pbkdf2UseStaticSalt = $header_data['useStaticSalt'];
+		$this->pbkdf2StaticSalt    = fread($this->fp, 64);
+
+		return true;
+	}
 }
 
 /**
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -5654,13 +5816,21 @@ public function resetTime()
 	{
 		$this->start_time = $this->microtime_float();
 	}
+
+	/**
+	 * @param int $max_exec_time
+	 */
+	public function setMaxExecTime($max_exec_time)
+	{
+		$this->max_exec_time = $max_exec_time;
+	}
 }
 
 /**
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -5766,7 +5936,7 @@ public function &getFolders($folder, $pattern = '*')
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -5863,10 +6033,10 @@ class AKText extends AKAbstractObject
 		'RESTACLEANUP'                    => 'Restoration and Clean Up',
 		'BTN_RUNINSTALLER'                => 'Run the Installer',
 		'BTN_CLEANUP'                     => 'Clean Up',
-		'BTN_SITEFE'                      => 'Visit your site\'s front-end',
-		'BTN_SITEBE'                      => 'Visit your site\'s back-end',
+		'BTN_SITEFE'                      => 'Visit your site\'s frontend',
+		'BTN_SITEBE'                      => 'Visit your site\'s backend',
 		'WARNINGS'                        => 'Extraction Warnings',
-		'ERROR_OCCURED'                   => 'An error occured',
+		'ERROR_OCCURED'                   => 'An error occurred',
 		'STEALTH_MODE'                    => 'Stealth mode',
 		'STEALTH_URL'                     => 'HTML file to show to web visitors',
 		'ERR_NOT_A_JPS_FILE'              => 'The file is not a JPA archive',
@@ -5888,7 +6058,8 @@ class AKText extends AKAbstractObject
 		'RELOAD_ARCHIVES'                 => 'Reload',
 		'CONFIG_UI_SFTPBROWSER_TITLE'     => 'SFTP Directory Browser',
 		'ERR_COULD_NOT_OPEN_ARCHIVE_PART' => 'Could not open archive part file %s for reading. Check that the file exists, is readable by the web server and is not in a directory made out of reach by chroot, open_basedir restrictions or any other restriction put in place by your host.',
-		'RENAME_FILES'                    => 'Rename server configuration files'
+		'RENAME_FILES'                    => 'Rename server configuration files',
+		'RESTORE_PERMISSIONS'             => 'Restore file permissions',
 	);
 
 	/**
@@ -6313,7 +6484,7 @@ public function addDefaultLanguageStrings($stringList = array())
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -6325,13 +6496,16 @@ public function addDefaultLanguageStrings($stringList = array())
  */
 class AKFactory
 {
-	/** @var array A list of instanciated objects */
+	/** @var   array  A list of instantiated objects */
 	private $objectlist = array();
 
-	/** @var array Simple hash data storage */
+	/** @var   array  Simple hash data storage */
 	private $varlist = array();
 
-	/** Private constructor makes sure we can't directly instanciate the class */
+	/** @var   self   Static instance */
+	private static $instance = null;
+
+	/** Private constructor makes sure we can't directly instantiate the class */
 	private function __construct()
 	{
 	}
@@ -6476,6 +6650,7 @@ public static function &getUnarchiver($configOverride = null)
 	public static function get($key, $default = null)
 	{
 		$self = self::getInstance();
+
 		if (array_key_exists($key, $self->varlist))
 		{
 			return $self->varlist[$key];
@@ -6495,20 +6670,19 @@ public static function get($key, $default = null)
 	 */
 	protected static function &getInstance($serialized_data = null)
 	{
-		static $myInstance;
-		if (!is_object($myInstance) || !is_null($serialized_data))
+		if (!is_object(self::$instance) || !is_null($serialized_data))
 		{
 			if (!is_null($serialized_data))
 			{
-				$myInstance = unserialize($serialized_data);
+				self::$instance = unserialize($serialized_data);
 			}
 			else
 			{
-				$myInstance = new self();
+				self::$instance = new self();
 			}
 		}
 
-		return $myInstance;
+		return self::$instance;
 	}
 
 	/**
@@ -6522,6 +6696,7 @@ protected static function &getInstance($serialized_data = null)
 	protected static function &getClassInstance($class_name)
 	{
 		$self = self::getInstance();
+
 		if (!isset($self->objectlist[$class_name]))
 		{
 			$self->objectlist[$class_name] = new $class_name;
@@ -6553,12 +6728,7 @@ public static function unserialize($serialized_data)
 	 */
 	public static function nuke()
 	{
-		$self = self::getInstance();
-		foreach ($self->objectlist as $key => $object)
-		{
-			$self->objectlist[$key] = null;
-		}
-		$self->objectlist = array();
+		self::$instance = null;
 	}
 
 	// ========================================================================
@@ -6607,7 +6777,7 @@ public static function &getTimer()
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -6647,7 +6817,7 @@ public function isSupported();
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -6735,7 +6905,7 @@ protected function getZeroPadding($string, $blockSize)
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -6837,7 +7007,7 @@ public function getBlockSize()
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -6942,7 +7112,7 @@ public function getBlockSize()
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -6993,6 +7163,34 @@ class AKEncryptionAES
 
 	protected static $passwords = array();
 
+	/**
+	 * The algorithm to use for PBKDF2. Must be a supported hash_hmac algorithm. Default: sha1
+	 *
+	 * @var  string
+	 */
+	private static $pbkdf2Algorithm = 'sha1';
+
+	/**
+	 * Number of iterations to use for PBKDF2
+	 *
+	 * @var  int
+	 */
+	private static $pbkdf2Iterations = 1000;
+
+	/**
+	 * Should we use a static salt for PBKDF2?
+	 *
+	 * @var  int
+	 */
+	private static $pbkdf2UseStaticSalt = 0;
+
+	/**
+	 * The static salt to use for PBKDF2
+	 *
+	 * @var  string
+	 */
+	private static $pbkdf2StaticSalt = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
 	/**
 	 * Encrypt a text using AES encryption in Counter mode of operation
 	 *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
@@ -7419,22 +7617,50 @@ public static function AESDecryptCBC($ciphertext, $password)
 			return false;
 		}
 
-		// Get the expanded key from the password
-		$key = self::expandKey($password);
-
 		// Read the data size
 		$data_size = unpack('V', substr($ciphertext, -4));
 
+		// Do I have a PBKDF2 salt?
+		$salt             = substr($ciphertext, -92, 68);
+		$rightStringLimit = -4;
+
+		$params        = self::getKeyDerivationParameters();
+		$keySizeBytes  = $params['keySize'];
+		$algorithm     = $params['algorithm'];
+		$iterations    = $params['iterations'];
+		$useStaticSalt = $params['useStaticSalt'];
+
+		if (substr($salt, 0, 4) == 'JPST')
+		{
+			// We have a stored salt. Retrieve it and tell decrypt to process the string minus the last 44 bytes
+			// (4 bytes for JPST, 16 bytes for the salt, 4 bytes for JPIV, 16 bytes for the IV, 4 bytes for the
+			// uncompressed string length - note that using PBKDF2 means we're also using a randomized IV per the
+			// format specification).
+			$salt             = substr($salt, 4);
+			$rightStringLimit -= 68;
+
+			$key          = self::pbkdf2($password, $salt, $algorithm, $iterations, $keySizeBytes);
+		}
+		elseif ($useStaticSalt)
+		{
+			// We have a static salt. Use it for PBKDF2.
+			$key = self::getStaticSaltExpandedKey($password);
+		}
+		else
+		{
+			// Get the expanded key from the password. THIS USES THE OLD, INSECURE METHOD.
+			$key = self::expandKey($password);
+		}
+
 		// Try to get the IV from the data
 		$iv               = substr($ciphertext, -24, 20);
-		$rightStringLimit = -4;
 
 		if (substr($iv, 0, 4) == 'JPIV')
 		{
 			// We have a stored IV. Retrieve it and tell mdecrypt to process the string minus the last 24 bytes
 			// (4 bytes for JPIV, 16 bytes for the IV, 4 bytes for the uncompressed string length)
 			$iv               = substr($iv, 4);
-			$rightStringLimit = -24;
+			$rightStringLimit -= 20;
 		}
 		else
 		{
@@ -7455,7 +7681,7 @@ public static function AESDecryptCBC($ciphertext, $password)
 	}
 
 	/**
-	 * That's the old way of craeting an IV that's definitely not cryptographically sound.
+	 * That's the old way of creating an IV that's definitely not cryptographically sound.
 	 *
 	 * DO NOT USE, EVER, UNLESS YOU WANT TO DECRYPT LEGACY DATA
 	 *
@@ -7565,13 +7791,177 @@ public static function getAdapter()
 
 		return $adapter;
 	}
+
+	/**
+	 * @return string
+	 */
+	public static function getPbkdf2Algorithm()
+	{
+		return self::$pbkdf2Algorithm;
+	}
+
+	/**
+	 * @param string $pbkdf2Algorithm
+	 * @return void
+	 */
+	public static function setPbkdf2Algorithm($pbkdf2Algorithm)
+	{
+		self::$pbkdf2Algorithm = $pbkdf2Algorithm;
+	}
+
+	/**
+	 * @return int
+	 */
+	public static function getPbkdf2Iterations()
+	{
+		return self::$pbkdf2Iterations;
+	}
+
+	/**
+	 * @param int $pbkdf2Iterations
+	 * @return void
+	 */
+	public static function setPbkdf2Iterations($pbkdf2Iterations)
+	{
+		self::$pbkdf2Iterations = $pbkdf2Iterations;
+	}
+
+	/**
+	 * @return int
+	 */
+	public static function getPbkdf2UseStaticSalt()
+	{
+		return self::$pbkdf2UseStaticSalt;
+	}
+
+	/**
+	 * @param int $pbkdf2UseStaticSalt
+	 * @return void
+	 */
+	public static function setPbkdf2UseStaticSalt($pbkdf2UseStaticSalt)
+	{
+		self::$pbkdf2UseStaticSalt = $pbkdf2UseStaticSalt;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getPbkdf2StaticSalt()
+	{
+		return self::$pbkdf2StaticSalt;
+	}
+
+	/**
+	 * @param string $pbkdf2StaticSalt
+	 * @return void
+	 */
+	public static function setPbkdf2StaticSalt($pbkdf2StaticSalt)
+	{
+		self::$pbkdf2StaticSalt = $pbkdf2StaticSalt;
+	}
+
+	/**
+	 * Get the parameters fed into PBKDF2 to expand the user password into an encryption key. These are the static
+	 * parameters (key size, hashing algorithm and number of iterations). A new salt is used for each encryption block
+	 * to minimize the risk of attacks against the password.
+	 *
+	 * @return  array
+	 */
+	public static function getKeyDerivationParameters()
+	{
+		return array(
+			'keySize'       => 16,
+			'algorithm'     => self::$pbkdf2Algorithm,
+			'iterations'    => self::$pbkdf2Iterations,
+			'useStaticSalt' => self::$pbkdf2UseStaticSalt,
+			'staticSalt'    => self::$pbkdf2StaticSalt,
+		);
+	}
+
+	/**
+	 * PBKDF2 key derivation function as defined by RSA's PKCS #5: https://www.ietf.org/rfc/rfc2898.txt
+	 *
+	 * Test vectors can be found here: https://www.ietf.org/rfc/rfc6070.txt
+	 *
+	 * This implementation of PBKDF2 was originally created by https://defuse.ca
+	 * With improvements by http://www.variations-of-shadow.com
+	 * Modified for Akeeba Engine by Akeeba Ltd (removed unnecessary checks to make it faster)
+	 *
+	 * @param   string  $password    The password.
+	 * @param   string  $salt        A salt that is unique to the password.
+	 * @param   string  $algorithm   The hash algorithm to use. Default is sha1.
+	 * @param   int     $count       Iteration count. Higher is better, but slower. Default: 1000.
+	 * @param   int     $key_length  The length of the derived key in bytes.
+	 *
+	 * @return  string  A string of $key_length bytes
+	 */
+	public static function pbkdf2($password, $salt, $algorithm = 'sha1', $count = 1000, $key_length = 16)
+	{
+		if (function_exists("hash_pbkdf2"))
+		{
+			return hash_pbkdf2($algorithm, $password, $salt, $count, $key_length, true);
+		}
+
+		$hash_length = akstringlen(hash($algorithm, "", true));
+		$block_count = ceil($key_length / $hash_length);
+
+		$output = "";
+
+		for ($i = 1; $i <= $block_count; $i++)
+		{
+			// $i encoded as 4 bytes, big endian.
+			$last = $salt . pack("N", $i);
+
+			// First iteration
+			$xorResult = hash_hmac($algorithm, $last, $password, true);
+			$last      = $xorResult;
+
+			// Perform the other $count - 1 iterations
+			for ($j = 1; $j < $count; $j++)
+			{
+				$last = hash_hmac($algorithm, $last, $password, true);
+				$xorResult ^= $last;
+			}
+
+			$output .= $xorResult;
+		}
+
+		return aksubstr($output, 0, $key_length);
+	}
+
+	/**
+	 * Get the expanded key from the user supplied password using a static salt. The results are cached for performance
+	 * reasons.
+	 *
+	 * @param   string  $password  The user-supplied password, UTF-8 encoded.
+	 *
+	 * @return  string  The expanded key
+	 */
+	private static function getStaticSaltExpandedKey($password)
+	{
+		$params        = self::getKeyDerivationParameters();
+		$keySizeBytes  = $params['keySize'];
+		$algorithm     = $params['algorithm'];
+		$iterations    = $params['iterations'];
+		$staticSalt    = $params['staticSalt'];
+
+		$lookupKey = "PBKDF2-$algorithm-$iterations-" . md5($password . $staticSalt);
+
+		if (!array_key_exists($lookupKey, self::$passwords))
+		{
+			self::$passwords[$lookupKey] = self::pbkdf2($password, $staticSalt, $algorithm, $iterations, $keySizeBytes);
+		}
+
+		return self::$passwords[$lookupKey];
+	}
+
 }
 
 /**
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -7769,7 +8159,7 @@ function masterSetup()
  * Akeeba Restore
  * A JSON-powered JPA, JPS and ZIP archive extraction library
  *
- * @copyright   2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
  * @license     GNU GPL v2 or - at your option - any later version
  * @package     akeebabackup
  * @subpackage  kickstart
@@ -7834,11 +8224,16 @@ public function __toString()
 				$timer->enforce_min_exec_time();
 				break;
 
+			/**
+			 * There are two separate steps here since we were using an inefficient restoration intialization method in
+			 * the past. Now both startRestore and stepRestore are identical. The difference in behavior depends
+			 * exclusively on the calling Javascript. If no serialized factory was passed in the request then we start a
+			 * new restoration. If a serialized factory was passed in the request then the restoration is resumed. For
+			 * this reason we should NEVER call AKFactory::nuke() in startRestore anymore: that would simply reset the
+			 * extraction engine configuration which was done in masterSetup() leading to an error about the file being
+			 * invalid (since no file is found).
+			 */
 			case 'startRestore':
-				AKFactory::nuke(); // Reset the factory
-
-			// Let the control flow to the next step (the rest of the code is common!!)
-
 			case 'stepRestore':
 				$engine   = AKFactory::getUnarchiver(); // Get the engine
 				$observer = new RestorationObserver(); // Create a new observer
@@ -7878,24 +8273,32 @@ public function __toString()
 
 				$postproc = AKFactory::getPostProc();
 
-				// Rename htaccess.bak to .htaccess
-				if (file_exists($root . '/htaccess.bak'))
+				/**
+				 * Should I rename the htaccess.bak and web.config.bak files back to their live filenames...?
+				 */
+				$renameFiles = AKFactory::get('kickstart.setup.renamefiles', true);
+
+				if ($renameFiles)
 				{
-					if (file_exists($root . '/.htaccess'))
+					// Rename htaccess.bak to .htaccess
+					if (file_exists($root . '/htaccess.bak'))
 					{
-						$postproc->unlink($root . '/.htaccess');
+						if (file_exists($root . '/.htaccess'))
+						{
+							$postproc->unlink($root . '/.htaccess');
+						}
+						$postproc->rename($root . '/htaccess.bak', $root . '/.htaccess');
 					}
-					$postproc->rename($root . '/htaccess.bak', $root . '/.htaccess');
-				}
 
-				// Rename htaccess.bak to .htaccess
-				if (file_exists($root . '/web.config.bak'))
-				{
-					if (file_exists($root . '/web.config'))
+					// Rename htaccess.bak to .htaccess
+					if (file_exists($root . '/web.config.bak'))
 					{
-						$postproc->unlink($root . '/web.config');
+						if (file_exists($root . '/web.config'))
+						{
+							$postproc->unlink($root . '/web.config');
+						}
+						$postproc->rename($root . '/web.config.bak', $root . '/web.config');
 					}
-					$postproc->rename($root . '/web.config.bak', $root . '/web.config');
 				}
 
 				// Remove restoration.php

From d6938e1579f3db495c0e0eefd6fa8b49b2942efc Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 30 Jul 2017 10:45:28 +0100
Subject: [PATCH 105/148] Remote file check comments (#17347)

Just a small tidy up of the comments for clarity and to avoid any confusion
---
 installation/model/database.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installation/model/database.php b/installation/model/database.php
index 80c91b35a47db..bd9875b6098bd 100644
--- a/installation/model/database.php
+++ b/installation/model/database.php
@@ -189,14 +189,14 @@ public function initialise($options)
 
 			if ($remoteDbFile === false)
 			{
-				// This is the remote database file you need to remove if you want to use a remote database
+				// This is the file you need to remove if you want to use a remote database
 				$remoteDbFile = '_Joomla' . JUserHelper::genRandomPassword(21) . '.txt';
 				JFactory::getSession()->set('remoteDbFile', $remoteDbFile);
 
 				// Get the path
 				$remoteDbPath = JPATH_INSTALLATION . '/' . $remoteDbFile;
 
-				// When the path is not writable the user need to create the file itself
+				// When the path is not writable the user needs to create the file manually
 				if (!JFile::write($remoteDbPath, ''))
 				{
 					// Request to create the file manually

From ae6800a38280bc9ffbd775265d429ca0b676cfb3 Mon Sep 17 00:00:00 2001
From: "Nicholas K. Dionysopoulos" <nicholas@akeebabackup.com>
Date: Sun, 30 Jul 2017 19:30:37 +0300
Subject: [PATCH 106/148] Correct the parameter name

---
 administrator/components/com_joomlaupdate/models/default.php | 2 +-
 administrator/components/com_joomlaupdate/restore.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
index c9b5fed5a7258..106c9804e7aed 100644
--- a/administrator/components/com_joomlaupdate/models/default.php
+++ b/administrator/components/com_joomlaupdate/models/default.php
@@ -401,7 +401,7 @@ public function createRestorationFile($basename = null)
 	'kickstart.setup.filetype' => 'zip',
 	'kickstart.setup.dryrun' => '0',
 	'kickstart.setup.renamefiles' => array(),
-	'kickstart.setup.renamefiles' => false
+	'kickstart.setup.postrenamefiles' => false
 ENDDATA;
 
 		if ($method != 'direct')
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
index a2413995a0a39..4c16959c42f82 100644
--- a/administrator/components/com_joomlaupdate/restore.php
+++ b/administrator/components/com_joomlaupdate/restore.php
@@ -8276,7 +8276,7 @@ public function __toString()
 				/**
 				 * Should I rename the htaccess.bak and web.config.bak files back to their live filenames...?
 				 */
-				$renameFiles = AKFactory::get('kickstart.setup.renamefiles', true);
+				$renameFiles = AKFactory::get('kickstart.setup.postrenamefiles', true);
 
 				if ($renameFiles)
 				{

From f9e8dd7ce865f2bd93ba15affbfc0a24df449aea Mon Sep 17 00:00:00 2001
From: Jim Dolinski <jimdolinski@gmail.com>
Date: Sun, 30 Jul 2017 15:46:00 -0500
Subject: [PATCH 107/148] Add Redis Session Support (#15390)

* Added Redis session handler support

* fix doc blocks and basic cs

* drone

* Removing dead code and renaming variable

* Fix default value
---
 .../com_config/model/form/application.xml     | 25 +++++++
 .../language/en-GB/en-GB.lib_joomla.ini       |  1 +
 language/en-GB/en-GB.lib_joomla.ini           |  1 +
 libraries/joomla/session/storage/redis.php    | 74 +++++++++++++++++++
 4 files changed, 101 insertions(+)
 create mode 100644 libraries/joomla/session/storage/redis.php

diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index 8fda9c7e445fa..48c9cd682be07 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -922,6 +922,31 @@
 			size="5"
 		/>
 
+		<field
+			name="session_redis_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_REDIS_HOST_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_HOST_DESC"
+			default="localhost"
+			filter="string"
+			showon="session_handler:redis"
+			size="25"
+		/>
+
+		<field
+			name="session_redis_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_REDIS_PORT_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_PORT_DESC"
+			showon="session_handler:redis"
+			min="1"
+			max="65535"
+			default="6379"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
 		<field
 			name="lifetime"
 			type="number"
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 5aa2d69e3ff5c..908f3539ac147 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -342,6 +342,7 @@ JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator"
 JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache"
 JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)"
 JLIB_FORM_VALUE_SESSION_NONE="PHP"
+JLIB_FORM_VALUE_SESSION_REDIS="Redis"
 JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache"
 JLIB_FORM_VALUE_SESSION_XCACHE="XCache"
 JLIB_FORM_VALUE_TIMEZONE_UTC="Universal Time, Coordinated (UTC)"
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index 5aa2d69e3ff5c..908f3539ac147 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -342,6 +342,7 @@ JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator"
 JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache"
 JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)"
 JLIB_FORM_VALUE_SESSION_NONE="PHP"
+JLIB_FORM_VALUE_SESSION_REDIS="Redis"
 JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache"
 JLIB_FORM_VALUE_SESSION_XCACHE="XCache"
 JLIB_FORM_VALUE_TIMEZONE_UTC="Universal Time, Coordinated (UTC)"
diff --git a/libraries/joomla/session/storage/redis.php b/libraries/joomla/session/storage/redis.php
new file mode 100644
index 0000000000000..8a5e6b84c601b
--- /dev/null
+++ b/libraries/joomla/session/storage/redis.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Redis session storage handler for PHP
+ *
+ * @link   https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @since  __DEPLOY_VERSION__
+ */
+class JSessionStorageRedis extends JSessionStorage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('Redis Extension is not available', 404);
+		}
+
+		$config = JFactory::getConfig();
+
+		$this->_server = array(
+			'host' => $config->get('session_redis_server_host', 'localhost'),
+			'port' => $config->get('session_redis_server_port', 6379),
+		);
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function register()
+	{
+		if (!empty($this->_server) && isset($this->_server['host']) && isset($this->_server['port']))
+		{
+			ini_set('session.save_path', "{$this->_server['host']}:{$this->_server['port']}");
+			ini_set('session.save_handler', 'redis');
+
+			// This is required if the configuration.php gzip is turned on
+			ini_set('zlib.output_compression', 'Off');
+		}
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('redis') && class_exists('Redis');
+	}
+}

From bd4dbc8f9b0e8229c04201aad186deddfe777ab7 Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Mon, 31 Jul 2017 13:43:01 +0200
Subject: [PATCH 108/148] Admin modules: no need to sort by language when
 filtering is enabled (#17355)

---
 .../com_modules/models/forms/filter_modulesadmin.xml        | 4 ++--
 libraries/joomla/form/fields/list.php                       | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_modules/models/forms/filter_modulesadmin.xml b/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
index 0166cb5e53652..3f1eb3771d177 100644
--- a/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
+++ b/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
@@ -91,8 +91,8 @@
 			<option value="name DESC">COM_MODULES_HEADING_MODULE_DESC</option>
 			<option value="ag.title ASC">JGRID_HEADING_ACCESS_ASC</option>
 			<option value="ag.title DESC">JGRID_HEADING_ACCESS_DESC</option>
-			<option value="a.language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
-			<option value="a.language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.language ASC" requires="adminlanguage">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC" requires="adminlanguage">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
diff --git a/libraries/joomla/form/fields/list.php b/libraries/joomla/form/fields/list.php
index d28832dacffa9..203930079cb29 100644
--- a/libraries/joomla/form/fields/list.php
+++ b/libraries/joomla/form/fields/list.php
@@ -117,6 +117,12 @@ protected function getOptions()
 				{
 					continue;
 				}
+
+				// Requires adminlanguage
+				if (in_array('adminlanguage', $requires) && !JModuleHelper::isAdminMultilang())
+				{
+					continue;
+				}
 			}
 
 			$value = (string) $option['value'];

From e0219775d813a1bf138c7aa9fd95e6c03b3c1baf Mon Sep 17 00:00:00 2001
From: Drew Glaser <drewgglaser@yahoo.com>
Date: Mon, 31 Jul 2017 07:44:17 -0400
Subject: [PATCH 109/148] Update calendar.js (#17183)

* Update calendar.js

Proposed fix for issue #17171.

* Update calendar.js

Implementing @dgt41's solution.

* Update calendar.min.js

Minified changes for https://github.com/joomla/joomla-cms/pull/17183
---
 media/system/js/fields/calendar.js     | 2 +-
 media/system/js/fields/calendar.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/system/js/fields/calendar.js b/media/system/js/fields/calendar.js
index 8350e94eae2a2..1864462b436de 100644
--- a/media/system/js/fields/calendar.js
+++ b/media/system/js/fields/calendar.js
@@ -1007,7 +1007,7 @@
 
 			if (calObj) {
 				if (calObj.inputField.value) {
-					if (typeof calObj.dateClicked === 'undefined') {
+					if (typeof calObj.params.dateClicked === 'undefined') {
 						calObj.inputField.setAttribute('data-local-value', calObj.inputField.value);
 
 						if (calObj.params.dateType !== 'gregorian') {
diff --git a/media/system/js/fields/calendar.min.js b/media/system/js/fields/calendar.min.js
index 75c6e6ba3a142..f4cfaff279ffe 100644
--- a/media/system/js/fields/calendar.min.js
+++ b/media/system/js/fields/calendar.min.js
@@ -1 +1 @@
-!function(e,a){"use strict";Date.convertNumbers=function(e){var e=e.toString();if("[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers))for(var a=0;a<JoomlaCalLocale.localLangNumbers.length;a++)e=e.replace(new RegExp(a,"g"),JoomlaCalLocale.localLangNumbers[a]);return e},Date.toEnglish=function(e){e=this.toString();for(var a=[0,1,2,3,4,5,6,7,8,9],t=0;t<10;t++)e=e.replace(new RegExp(a[t],"g"),t);return e};var t=function(e){if(!e)throw new Error("Calendar setup failed:\n  No valid element found, Please check your code");if("function"!=typeof Date.parseFieldDate)throw new Error("Calendar setup failed:\n  No valid date helper, Please check your code");if(e._joomlaCalendar)throw new Error("JoomlaCalendar instance already exists for the element");if(e._joomlaCalendar=this,this.writable=!0,this.hidden=!0,this.params={},this.element=e,this.inputField=e.getElementsByTagName("input")[0],this.button=e.getElementsByTagName("button")[0],!this.inputField)throw new Error("Calendar setup failed:\n  No valid input found, Please check your code");this.params={debug:!1,clicked:!1,element:{style:{display:"none"}},writable:!0};var t=this,r=this.button,s={inputField:this.inputField,dateType:JoomlaCalLocale.dateType?JoomlaCalLocale.dateType:"gregorian",direction:void 0!==a.dir?a.dir:a.getElementsByTagName("html")[0].getAttribute("dir"),firstDayOfWeek:r.getAttribute("data-firstday")?parseInt(r.getAttribute("data-firstday")):0,dateFormat:"%Y-%m-%d %H:%M:%S",weekend:JoomlaCalLocale.weekend?JoomlaCalLocale.weekend:[0,6],minYear:JoomlaCalLocale.minYear?JoomlaCalLocale.minYear:1900,maxYear:JoomlaCalLocale.maxYear?JoomlaCalLocale.maxYear:2100,minYearTmp:r.getAttribute("data-min-year"),maxYearTmp:r.getAttribute("data-max-year"),weekendTmp:r.getAttribute("data-weekend"),time24:!0,showsOthers:1===parseInt(r.getAttribute("data-show-others")),showsTime:!0,weekNumbers:1===parseInt(r.getAttribute("data-week-numbers")),showsTodayBtn:!0,compressedHeader:1===parseInt(r.getAttribute("data-only-months-nav"))};r.getAttribute("data-dayformat")&&(s.dateFormat=r.getAttribute("data-dayformat")?r.getAttribute("data-dayformat"):"%Y-%m-%d %H:%M:%S"),r.getAttribute("data-time-24")&&(s.time24=24===parseInt(r.getAttribute("data-time-24"))),r.getAttribute("data-show-time")&&(s.showsTime=1===parseInt(r.getAttribute("data-show-time"))),r.getAttribute("data-today-btn")&&(s.showsTodayBtn=1===parseInt(r.getAttribute("data-today-btn")));for(var i in s)this.params[i]=s[i];l(t.params.minYearTmp)&&(t.params.minYear=o(parseInt(t.params.minYearTmp),t.params.dateType)),l(t.params.maxYearTmp)&&(t.params.maxYear=o(parseInt(t.params.maxYearTmp),t.params.dateType)),"undefined"!==t.params.weekendTmp&&(t.params.weekend=t.params.weekendTmp.split(",").map(function(e){return parseInt(e,10)})),this._dayMouseDown=function(e){return t._handleDayMouseDown(e)},this._calKeyEvent=function(e){return t._handleCalKeyEvent(e)},this._documentClick=function(e){return t._handleDocumentClick(e)},this.checkInputs(),this.inputField.getAttribute("readonly")||(this._create(),this._bindEvents())};t.prototype.checkInputs=function(){var e=Date.parseFieldDate(this.inputField.getAttribute("data-alt-value"),this.params.dateFormat,"gregorian");""!==this.inputField.value?(this.date=e,this.inputField.value=e.print(this.params.dateFormat,this.params.dateType,!0)):this.date=new Date},t.prototype.recreate=function(){var e=this.element,a=e.querySelector(".js-calendar");a&&(e._joomlaCalendar=null,a.parentNode.removeChild(a),new t(e))},t.prototype.updateTime=function(e,a,t){var r=this,s=r.date,l=r.date.getLocalDate(r.params.dateType),o=r.date.getLocalMonth(r.params.dateType),i=r.date.getLocalFullYear(r.params.dateType),n=this.inputField.parentNode.parentNode.querySelectorAll(".time-ampm")[0];r.params.time24||(/pm/i.test(n.value)&&e<12?e=parseInt(e)+12:/am/i.test(n.value)&&12===e&&(e=0)),s.setHours(e),s.setMinutes(parseInt(a,10)),s.setSeconds(s.getSeconds()),s.setLocalFullYear(r.params.dateType,i),s.setLocalMonth(r.params.dateType,o),s.setLocalDate(r.params.dateType,l),r.dateClicked=!1,this.callHandler()},t.prototype.setDate=function(e){e.equalsTo(this.date)||(this.date=e,this.processCalendar(this.params.firstDayOfWeek,e))},t.prototype.moveCursorBy=function(e){var a=new Date(this.date);a.setDate(a.getDate()-e),this.setDate(a)},t.prototype.resetSelected=function(e){for(var a=e.options,t=a.length;t--;){var r=a[t];r.selected&&(r.selected=!1)}},t.prototype.callHandler=function(){this.inputField.setAttribute("data-alt-value",this.date.print(this.params.dateFormat,"gregorian",!1)),this.inputField.getAttribute("data-alt-value")&&"0000-00-00 00:00:00"!==this.inputField.getAttribute("data-alt-value")&&(this.inputField.value=this.date.print(this.params.dateFormat,this.params.dateType,!0),"gregorian"!==this.params.dateType&&this.inputField.setAttribute("data-local-value",this.date.print(this.params.dateFormat,this.params.dateType,!0))),this.inputField.value=this.date.print(this.params.dateFormat,this.params.dateType,!0),"function"==typeof this.inputField.onchange&&this.inputField.onchange(),this.dateClicked&&"function"==typeof this.params.onUpdate&&this.params.onUpdate(this),this.dateClicked?this.close():this.processCalendar()},t.prototype.close=function(){a.activeElement.blur(),this.hide()},t.prototype.show=function(){if(-1!==navigator.appName.indexOf("Internet Explorer")&&-1===navigator.appVersion.indexOf("MSIE 9")&&-1===navigator.appVersion.indexOf("MSIE 1")&&e.jQuery&&jQuery().chosen)for(var t=this.element.getElementsByTagName("select"),r=0;r<t.length;r++)jQuery(t[r]).chosen("destroy");this.checkInputs(),this.inputField.focus(),this.dropdownElement.style.display="block",this.hidden=!1,a.addEventListener("keydown",this._calKeyEvent,!0),a.addEventListener("keypress",this._calKeyEvent,!0),a.addEventListener("mousedown",this._documentClick,!0);var s=this.element.querySelector(".js-calendar");e.innerHeight+e.scrollY<s.getBoundingClientRect().bottom+20&&(s.style.marginTop=-(s.getBoundingClientRect().height+this.inputField.getBoundingClientRect().height)+"px"),this.processCalendar()},t.prototype.hide=function(){a.removeEventListener("keydown",this._calKeyEvent,!0),a.removeEventListener("keypress",this._calKeyEvent,!0),a.removeEventListener("mousedown",this._documentClick,!0),this.dropdownElement.style.display="none",this.hidden=!0},t.prototype._handleDocumentClick=function(e){var t=e.target;if(null!==t&&!t.classList.contains("time"))for(;null!==t&&t!==this.element;t=t.parentNode);if(null===t)return a.activeElement.blur(),this.hide(),r(e)},t.prototype._handleDayMouseDown=function(e){var a=this,t=e.currentTarget,s=e.target||e.srcElement;if(!s||!s.hasAttribute("data-action")){if("TD"!==t.nodeName){var l=t.getParent("TD");"TD"===l.nodeName?t=l:(t=t.getParent("TD")).classList.contains("js-calendar")&&(t=t.getElementsByTagName("table")[0])}else if(!s.classList.contains("js-btn")&&!t.classList.contains("day")&&!t.classList.contains("title"))return;if(!t||t.disabled)return!1;if(void 0===t.navtype||300!==t.navtype){50===t.navtype&&(t._current=t.innerHTML),s!==t&&s.parentNode!==t||a.cellClick(t,e);var o=null;void 0!==t.month&&(o=t),void 0!==t.parentNode.month&&(o=t.parentNode);var i=null;if(o)i=new Date(a.date),o.month!==i.getLocalMonth(a.params.dateType)&&(i.setLocalMonth(a.params.dateType,o.month),a.setDate(i),a.dateClicked=!1,this.callHandler());else{var n=null;void 0!==t.year&&(n=s),void 0!==t.parentNode.year&&(n=s.parentNode),n&&(i=new Date(a.date),n.year!==i.getLocalFullYear(a.params.dateType)&&(i.setFullYear(a.params.dateType,n.year),a.setDate(i),a.dateClicked=!1,this.callHandler()))}}return r(e)}},t.prototype.cellClick=function(e,a){var t=this,r=!1,s=!1,l=null;if(void 0===e.navtype){t.currentDateEl&&(e.classList.add("selected"),t.currentDateEl=e.caldate,(r=t.currentDateEl===e.caldate)||(t.currentDateEl=e.caldate)),t.date.setLocalDateOnly("gregorian",e.caldate);var o=!(t.dateClicked=!e.otherMonth);t.currentDateEl&&(s=!e.disabled),o&&this.processCalendar()}else{l=new Date(t.date),t.dateClicked=!1;var i=l.getOtherFullYear(t.params.dateType),n=l.getLocalMonth(t.params.dateType);switch(e.navtype){case 400:break;case-2:t.params.compressedHeader||i>t.params.minYear&&l.setOtherFullYear(t.params.dateType,i-1);break;case-1:d=l.getLocalDate(t.params.dateType);n>0?(d>(m=l.getLocalMonthDays(t.params.dateType,n-1))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,n-1)):i-- >t.params.minYear&&(l.setOtherFullYear(t.params.dateType,i),d>(m=l.getLocalMonthDays(t.params.dateType,11))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,11));break;case 1:var d=l.getLocalDate(t.params.dateType);if(n<11)d>(m=l.getLocalMonthDays(t.params.dateType,n+1))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,n+1);else if(i<t.params.maxYear){l.setOtherFullYear(t.params.dateType,i+1);var m=l.getLocalMonthDays(t.params.dateType,0);d>m&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,0)}break;case 2:t.params.compressedHeader||i<t.params.maxYear&&l.setOtherFullYear(t.params.dateType,i+1)}l.equalsTo(t.date)?0===e.navtype&&(s=r=!0):(this.setDate(l),s=!0)}s&&(t.params.showsTime&&(this.dateClicked=!1),a&&this.callHandler()),e.classList.remove("hilite"),r&&!t.params.showsTime&&(t.dateClicked=!1,a&&this.close())},t.prototype._handleCalKeyEvent=function(e){var a=this,t=e.keyCode;if(e.target!==this.inputField||13!==t&&9!==t||this.close(),"rtl"===a.params.direction&&(37===t?t=39:39===t&&(t=37)),32===t&&e.shiftKey&&(e.preventDefault(),this.cellClick(a._nav_now,e),a.close()),27===t&&this.close(),38===t&&this.moveCursorBy(7),40===t&&this.moveCursorBy(-7),37===t&&this.moveCursorBy(1),39===t&&this.moveCursorBy(-1),e.target===this.inputField&&!(t>48||t<57||186===t||189===t||190===t||32===t))return r(e)},t.prototype._create=function(){var e=this,a=this.element,t=s("table"),r=s("div");this.table=t,t.className="table",t.cellSpacing=0,t.cellPadding=0,t.style.marginBottom=0,this.dropdownElement=r,a.appendChild(r),this.params.direction&&(r.style.direction=this.params.direction),r.className="js-calendar",r.style.position="absolute",r.style.boxShadow="0px 0px 70px 0px rgba(0,0,0,0.67)",r.style.minWidth=this.inputField.width,r.style.padding="0",r.style.display="none",r.style.left="auto",r.style.top="auto",r.style.zIndex=1060,r.style.borderRadius="20px",this.wrapper=s("div"),this.wrapper.className="calendar-container",r.appendChild(this.wrapper),this.wrapper.appendChild(t);var l=s("thead",t);l.className="calendar-header";var o=null,i=null,n=this,d=function(a,t,r,l,d,m,p){l=l||"td",d=d||{},o=s(l,i),t&&(m=m?'class="'+m+'"':"",o.colSpan=t);for(var c in d)o.style[c]=d[c];for(var c in p)o.setAttribute(c,p[c]);return 0!==r&&Math.abs(r)<=2&&(o.className+=" nav"),t&&o.addEventListener("mousedown",e._dayMouseDown,!0),o.calendar=n,o.navtype=r,0!==r&&Math.abs(r)<=2?o.innerHTML="<a "+m+" style='display:inline;padding:2px 6px;cursor:pointer;text-decoration:none;' unselectable='on'>"+a+"</a>":(o.innerHTML=t?"<div unselectable='on'"+m+">"+a+"</div>":a,!t&&m&&(o.className=m)),o};!1===this.params.compressedHeader&&((i=s("tr",l)).className="calendar-head-row",this._nav_py=d("&lsaquo;",1,-2,"",{"text-align":"center","font-size":"18px","line-height":"18px"},"js-btn btn-prev-year"),this.title=d('<div style="text-align:center;font-size:18px"><span></span></div>',this.params.weekNumbers?6:5,300),this.title.className="title",this._nav_ny=d(" &rsaquo;",1,2,"",{"text-align":"center","font-size":"18px","line-height":"18px"},"js-btn btn-next-year")),(i=s("tr",l)).className="calendar-head-row",this._nav_pm=d("&lsaquo;",1,-1,"",{"text-align":"center","font-size":"2em","line-height":"1em"},"js-btn btn-prev-month"),this._nav_month=d('<div style="text-align:center;font-size:1.2em"><span></span></div>',this.params.weekNumbers?6:5,888,"td",{textAlign:"center"}),this._nav_month.className="title",this._nav_nm=d(" &rsaquo;",1,1,"",{"text-align":"center","font-size":"2em","line-height":"1em"},"js-btn btn-next-month"),(i=s("tr",l)).className=e.params.weekNumbers?"daynames wk":"daynames",this.params.weekNumbers&&((o=s("td",i)).className="day-name wn",o.innerHTML=JoomlaCalLocale.wk);for(c=7;c>0;--c)o=s("td",i),c||(o.calendar=e);this.firstdayname=this.params.weekNumbers?i.firstChild.nextSibling:i.firstChild;for(var m=this.params.firstDayOfWeek,o=this.firstdayname,p=JoomlaCalLocale.weekend,c=0;c<7;++c){var u=(c+m)%7;o.classList.add("day-name"),this.params.weekNumbers&&o.classList.add("day-name-week"),c&&(o.calendar=e,o.fdow=u),-1!==p.indexOf(p)&&o.classList.add("weekend"),o.innerHTML=JoomlaCalLocale.shortDays[(c+m)%7],o=o.nextSibling}var h=s("tbody",t);for(this.tbody=h,c=6;c>0;--c){i=s("tr",h),this.params.weekNumbers&&(o=s("td",i));for(var y=7;y>0;--y)(o=s("td",i)).calendar=this,o.addEventListener("mousedown",this._dayMouseDown,!0)}if(this.params.showsTime){(i=s("tr",h)).className="time",(o=s("td",i)).className="time time-title",o.colSpan=1,o.style.verticalAlign="middle",o.innerHTML=" ";var v=s("td",i);v.className="time hours-select",v.colSpan=2;var g=s("td",i);g.className="time minutes-select",g.colSpan=2,function(){function a(a,t,r,l,o){var i,n=s("select",o);n.calendar=e,n.className=a,n.setAttribute("data-chosen",!0),n.style.width="100%",n.navtype=50,n._range=[];for(var d=r;d<=l;++d){var m,p="";d===t&&(p=!0),d<10&&l>=10?(i="0"+d,m=Date.convertNumbers("0")+Date.convertNumbers(d)):(i=""+d,m=""+Date.convertNumbers(d)),n.options.add(new Option(m,i,p,p))}return n}var t=e.date.getHours(),r=e.date.getMinutes(),l=!e.params.time24,n=e.date.getHours()>12;l&&n&&(t-=12);var d=a("time time-hours",t,l?1:0,l?12:23,v),m=a("time time-minutes",r,0,59,g);if(o=s("td",i),o.className="time ampm-select",o.colSpan=e.params.weekNumbers?1:2,l){n=Date.parseFieldDate(e.inputField.getAttribute("data-alt-value"),e.params.dateFormat,"gregorian").getHours()>12;var p=s("select",o);p.className="time-ampm",p.style.width="100%",p.options.add(new Option(JoomlaCalLocale.PM,"pm",!!n||"",!!n||"")),p.options.add(new Option(JoomlaCalLocale.AM,"am",!n||"",!n||"")),p.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1)}else o.innerHTML="&#160;",o.colSpan=e.params.weekNumbers?3:2;d.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1),m.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1)}()}(i=s("div",this.wrapper)).className="buttons-wrapper btn-group",this._nav_save=d(JoomlaCalLocale.save,"",100,"button","","js-btn btn btn-clear",{"data-action":"clear"}),this.inputField.hasAttribute("required")||i.querySelector('[data-action="clear"]').addEventListener("click",function(a){a.preventDefault();for(var t=e.table.querySelectorAll("td"),r=0;r<t.length;r++)if(t[r].classList.contains("selected")){t[r].classList.remove("selected");break}e.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00"),e.inputField.setAttribute("value",""),e.inputField.value=""}),this.params.showsTodayBtn&&(this._nav_now=d(JoomlaCalLocale.today,"",0,"button","","js-btn btn btn-today",{"data-action":"today"}),this.wrapper.querySelector('[data-action="today"]').addEventListener("click",function(a){a.preventDefault(),e.date.setLocalDateOnly("gregorian",new Date),e.dateClicked=!0,e.callHandler(),e.close()})),this._nav_exit=d(JoomlaCalLocale.exit,"",999,"button","","js-btn btn btn-exit",{"data-action":"exit"}),this.wrapper.querySelector('[data-action="exit"]').addEventListener("click",function(a){a.preventDefault(),e.dateClicked||(e.inputField.value?("gregorian"!==e.params.dateType&&e.inputField.setAttribute("data-local-value",e.inputField.value),void 0===e.dateClicked?e.inputField.setAttribute("data-alt-value",Date.parseFieldDate(e.inputField.value,e.params.dateFormat,e.params.dateType).print(e.params.dateFormat,"gregorian",!1)):e.inputField.setAttribute("data-alt-value",e.date.print(e.params.dateFormat,"gregorian",!1))):e.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00"),e.date=Date.parseFieldDate(e.inputField.getAttribute("data-alt-value"),e.params.dateFormat,e.params.dateType)),e.close()}),this.processCalendar()},t.prototype.processCalendar=function(){this.table.style.visibility="hidden";var e=this.params.firstDayOfWeek,a=this.date,t=new Date,r=t.getLocalFullYear(this.params.dateType),s=t.getLocalMonth(this.params.dateType),l=t.getLocalDate(this.params.dateType),o=a.getOtherFullYear(this.params.dateType),i=a.getHours(),n=a.getMinutes(),d=(a.getSeconds(),!this.params.time24);o<this.params.minYear?(o=this.params.minYear,a.getOtherFullYear(this.params.dateType,o)):o>this.params.maxYear&&(o=this.params.maxYear,a.getOtherFullYear(this.params.dateType,o)),this.params.firstDayOfWeek=e,this.date=new Date(a);var m=a.getLocalMonth(this.params.dateType),p=a.getLocalDate(this.params.dateType);a.setLocalDate(this.params.dateType,1);var c=(a.getLocalDay(this.params.dateType)-this.params.firstDayOfWeek)%7;c<0&&(c+=7),a.setLocalDate(this.params.dateType,-c),a.setLocalDate(this.params.dateType,a.getLocalDate(this.params.dateType)+1);for(var u=this.tbody.firstChild,h=this.ar_days=new Array,y=JoomlaCalLocale.weekend,v=parseInt(a.getLocalWeekDays(this.params.dateType)),g=0;g<v;++g,u=u.nextSibling){var b=u.firstChild;this.params.weekNumbers&&(b.className="day wn",b.innerHTML=a.getLocalWeekNumber(this.params.dateType),b=b.nextSibling),u.className=this.params.weekNumbers?"daysrow wk":"daysrow";for(var f,L=!1,C=h[g]=[],w=v+1,T=0;T<w;++T,b=b.nextSibling,a.setLocalDate(this.params.dateType,f+1)){b.className="day",b.style.textAlign="center",f=a.getLocalDate(this.params.dateType);var N=a.getLocalDay(this.params.dateType);b.pos=g<<4|T,C[T]=b;var D=a.getLocalMonth(this.params.dateType)===m;if(D)b.otherMonth=!1,L=!0,b.style.cursor="pointer";else{if(!this.params.showsOthers){b.className+=" emptycell",b.innerHTML="&#160;",b.disabled=!0;continue}b.className+=" disabled othermonth ",b.otherMonth=!0}b.disabled=!1,b.innerHTML=this.params.debug?f:Date.convertNumbers(f),b.disabled||(b.caldate=new Date(a),D&&f===p&&(b.className+=" selected",this.currentDateEl=b),a.getLocalFullYear(this.params.dateType)===r&&a.getLocalMonth(this.params.dateType)===s&&f===l&&(b.className+=" today"),-1!==y.indexOf(N)&&(b.className+=" weekend"))}L||this.params.showsOthers?u.style.display="":(u.style.display="none",u.className="emptyrow")}if(this.params.showsTime){i>12&&d&&(i-=12),i=i<10?"0"+i:i,n=n<10?"0"+n:n;var F=this.table.querySelector(".time-hours"),k=this.table.querySelector(".time-minutes");if(this.resetSelected(F),F.value=i,this.resetSelected(k),k.value=n,!this.params.time24){var J=new Date(this.inputField.getAttribute("data-alt-value")),A=this.table.querySelector(".time-ampm");J.getHours()>12&&(this.resetSelected(A),A.value="pm")}}if(this.params.compressedHeader){var M=Date.convertNumbers(o.toString());this._nav_month.getElementsByTagName("span")[0].innerHTML=this.params.monthBefore?M+" - "+JoomlaCalLocale.months[m]:JoomlaCalLocale.months[m]+" - "+M}else this._nav_month.getElementsByTagName("span")[0].innerHTML=this.params.debug?m+" "+JoomlaCalLocale.months[m]:JoomlaCalLocale.months[m],this.title.getElementsByTagName("span")[0].innerHTML=this.params.debug?o+" "+Date.convertNumbers(o.toString()):Date.convertNumbers(o.toString());this.table.style.visibility="visible"},t.prototype._bindEvents=function(){var e=this;this.inputField.addEventListener("blur",function(a){var r=t.getCalObject(this)._joomlaCalendar;if("block"!==r.dropdownElement.style.display){if(r){if(r.inputField.value)if(void 0===r.dateClicked)if(r.inputField.setAttribute("data-local-value",r.inputField.value),"gregorian"!==r.params.dateType){var s,l=Date.parseFieldDate(r.inputField.value,r.params.dateFormat,r.params.dateType);s=Date.localCalToGregorian(l.getFullYear(),l.getMonth(),l.getDate()),l.setFullYear(s[0]),l.setMonth(s[1]),l.setDate(s[2]),r.inputField.setAttribute("data-alt-value",l.print(r.params.dateFormat,"gregorian",!1))}else r.inputField.setAttribute("data-alt-value",Date.parseFieldDate(r.inputField.value,r.params.dateFormat,r.params.dateType).print(r.params.dateFormat,"gregorian",!1));else r.inputField.setAttribute("data-alt-value",r.date.print(r.params.dateFormat,"gregorian",!1));else r.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00");r.date=Date.parseFieldDate(r.inputField.getAttribute("data-alt-value"),r.params.dateFormat,r.params.dateType)}e.close()}else a.preventDefault()},!0),this.button.addEventListener("click",function(){e.show()},!1)};var r=function(a){return a||(a=e.event),a.preventDefault(),a.stopPropagation(),!1},s=function(e,t){var r=null;return r=a.createElement(e),void 0!==t&&t.appendChild(r),r},l=function(e){return!isNaN(e)&&function(e){return(0|e)===e}(parseFloat(e))},o=function(e,a){return(new Date).getLocalFullYear(a)+e};Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var a=this.length>>>0,t=Number(arguments[1])||0;for((t=t<0?Math.ceil(t):Math.floor(t))<0&&(t+=a);t<a;t++)if(t in this&&this[t]===e)return t;return-1}),t.getCalObject=function(e){if(!e)return!1;for(;e.parentNode;)if((e=e.parentNode).classList.contains("field-calendar"))return e;return!1},t.prototype.setAltValue=function(){var e=this.inputField;e.getAttribute("disabled")||(e.value=e.getAttribute("data-alt-value")?e.getAttribute("data-alt-value"):"")},t.onSubmit=function(){if(Joomla=e.Joomla||{},!Joomla.calendarProcessed){Joomla.calendarProcessed=!0;for(var t=a.querySelectorAll(".field-calendar"),r=0;r<t.length;r++){var s=t[r]._joomlaCalendar;s&&s.setAltValue()}}},t.init=function(a,r){e.JoomlaCalLocale=e.JoomlaCalLocale?JoomlaCalLocale:{},JoomlaCalLocale.today=JoomlaCalLocale.today?JoomlaCalLocale.today:"today",JoomlaCalLocale.weekend=JoomlaCalLocale.weekend?JoomlaCalLocale.weekend:[0,6],JoomlaCalLocale.localLangNumbers=JoomlaCalLocale.localLangNumbers?JoomlaCalLocale.localLangNumbers:[0,1,2,3,4,5,6,7,8,9],JoomlaCalLocale.wk=JoomlaCalLocale.wk?JoomlaCalLocale.wk:"wk",JoomlaCalLocale.AM=JoomlaCalLocale.AM?JoomlaCalLocale.AM:"AM",JoomlaCalLocale.PM=JoomlaCalLocale.PM?JoomlaCalLocale.PM:"PM",JoomlaCalLocale.am=JoomlaCalLocale.am?JoomlaCalLocale.am:"am",JoomlaCalLocale.pm=JoomlaCalLocale.pm?JoomlaCalLocale.pm:"pm",JoomlaCalLocale.dateType=JoomlaCalLocale.dateType?JoomlaCalLocale.dateType:"gregorian",JoomlaCalLocale.time=JoomlaCalLocale.time?JoomlaCalLocale.time:"time",JoomlaCalLocale.days=JoomlaCalLocale.days?JoomlaCalLocale.days:'["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]',JoomlaCalLocale.shortDays=JoomlaCalLocale.shortDays?JoomlaCalLocale.shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],JoomlaCalLocale.months=JoomlaCalLocale.months?JoomlaCalLocale.months:["January","February","March","April","May","June","July","August","September","October","November","December"],JoomlaCalLocale.shortMonths=JoomlaCalLocale.shortMonths?JoomlaCalLocale.shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],JoomlaCalLocale.minYear=JoomlaCalLocale.minYear?JoomlaCalLocale.minYear:1900,JoomlaCalLocale.maxYear=JoomlaCalLocale.maxYear?JoomlaCalLocale.maxYear:2100,JoomlaCalLocale.exit=JoomlaCalLocale.exit?JoomlaCalLocale.exit:"Cancel",JoomlaCalLocale.clear=JoomlaCalLocale.clear?JoomlaCalLocale.clear:"Clear";var s=a._joomlaCalendar;s?s.recreate():new t(a),a&&a.getElementsByTagName("input")[0]&&a.getElementsByTagName("input")[0].form&&!a.getElementsByTagName("input")[0].disabled&&a.getElementsByTagName("input")[0].form.addEventListener("submit",t.onSubmit)},e.JoomlaCalendar=t,a.addEventListener("DOMContentLoaded",function(){var r,s;for(r=a.querySelectorAll(".field-calendar"),s=0;s<r.length;s++)t.init(r[s]);e.jQuery&&jQuery(a).on("subform-row-add",function(e,a){for(r=a.querySelectorAll(".field-calendar"),s=0;s<r.length;s++)t.init(r[s])}),e.Calendar={},Calendar.setup=function(e){if(e.inputField&&a.getElementById(e.inputField)){var r=a.getElementById(e.inputField),s=r.parentNode.querySelectorAll("button")[0];for(var l in e)if(e.hasOwnProperty(l))switch(l){case"ifFormat":s&&s.setAttribute("data-dayformat",e.ifFormat);break;case"firstDay":s&&s.setAttribute("data-firstday",parseInt(e.firstDay));break;case"weekNumbers":s&&s.setAttribute("data-week-numbers","true"===e.weekNumbers||!0===e.weekNumbers?"1":"0");break;case"showOthers":s&&s.setAttribute("data-show-others","true"===e.showOthers||!0===e.showOthers?"1":"0");break;case"showsTime":s&&s.setAttribute("data-show-time","true"===e.showsTime||!0===e.showsTime?"1":"0");break;case"timeFormat":s&&s.setAttribute("data-time-24",parseInt(e.timeFormat))}t.init(r.parentNode.parentNode)}return null}})}(window,document);
\ No newline at end of file
+!function(e,a){"use strict";Date.convertNumbers=function(e){var e=e.toString();if("[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers))for(var a=0;a<JoomlaCalLocale.localLangNumbers.length;a++)e=e.replace(new RegExp(a,"g"),JoomlaCalLocale.localLangNumbers[a]);return e},Date.toEnglish=function(e){e=this.toString();for(var a=[0,1,2,3,4,5,6,7,8,9],t=0;t<10;t++)e=e.replace(new RegExp(a[t],"g"),t);return e};var t=function(e){if(!e)throw new Error("Calendar setup failed:\n  No valid element found, Please check your code");if("function"!=typeof Date.parseFieldDate)throw new Error("Calendar setup failed:\n  No valid date helper, Please check your code");if(e._joomlaCalendar)throw new Error("JoomlaCalendar instance already exists for the element");if(e._joomlaCalendar=this,this.writable=!0,this.hidden=!0,this.params={},this.element=e,this.inputField=e.getElementsByTagName("input")[0],this.button=e.getElementsByTagName("button")[0],!this.inputField)throw new Error("Calendar setup failed:\n  No valid input found, Please check your code");this.params={debug:!1,clicked:!1,element:{style:{display:"none"}},writable:!0};var t=this,r=this.button,s={inputField:this.inputField,dateType:JoomlaCalLocale.dateType?JoomlaCalLocale.dateType:"gregorian",direction:void 0!==a.dir?a.dir:a.getElementsByTagName("html")[0].getAttribute("dir"),firstDayOfWeek:r.getAttribute("data-firstday")?parseInt(r.getAttribute("data-firstday")):0,dateFormat:"%Y-%m-%d %H:%M:%S",weekend:JoomlaCalLocale.weekend?JoomlaCalLocale.weekend:[0,6],minYear:JoomlaCalLocale.minYear?JoomlaCalLocale.minYear:1900,maxYear:JoomlaCalLocale.maxYear?JoomlaCalLocale.maxYear:2100,minYearTmp:r.getAttribute("data-min-year"),maxYearTmp:r.getAttribute("data-max-year"),weekendTmp:r.getAttribute("data-weekend"),time24:!0,showsOthers:1===parseInt(r.getAttribute("data-show-others")),showsTime:!0,weekNumbers:1===parseInt(r.getAttribute("data-week-numbers")),showsTodayBtn:!0,compressedHeader:1===parseInt(r.getAttribute("data-only-months-nav"))};r.getAttribute("data-dayformat")&&(s.dateFormat=r.getAttribute("data-dayformat")?r.getAttribute("data-dayformat"):"%Y-%m-%d %H:%M:%S"),r.getAttribute("data-time-24")&&(s.time24=24===parseInt(r.getAttribute("data-time-24"))),r.getAttribute("data-show-time")&&(s.showsTime=1===parseInt(r.getAttribute("data-show-time"))),r.getAttribute("data-today-btn")&&(s.showsTodayBtn=1===parseInt(r.getAttribute("data-today-btn")));for(var i in s)this.params[i]=s[i];l(t.params.minYearTmp)&&(t.params.minYear=o(parseInt(t.params.minYearTmp),t.params.dateType)),l(t.params.maxYearTmp)&&(t.params.maxYear=o(parseInt(t.params.maxYearTmp),t.params.dateType)),"undefined"!==t.params.weekendTmp&&(t.params.weekend=t.params.weekendTmp.split(",").map(function(e){return parseInt(e,10)})),this._dayMouseDown=function(e){return t._handleDayMouseDown(e)},this._calKeyEvent=function(e){return t._handleCalKeyEvent(e)},this._documentClick=function(e){return t._handleDocumentClick(e)},this.checkInputs(),this.inputField.getAttribute("readonly")||(this._create(),this._bindEvents())};t.prototype.checkInputs=function(){var e=Date.parseFieldDate(this.inputField.getAttribute("data-alt-value"),this.params.dateFormat,"gregorian");""!==this.inputField.value?(this.date=e,this.inputField.value=e.print(this.params.dateFormat,this.params.dateType,!0)):this.date=new Date},t.prototype.recreate=function(){var e=this.element,a=e.querySelector(".js-calendar");a&&(e._joomlaCalendar=null,a.parentNode.removeChild(a),new t(e))},t.prototype.updateTime=function(e,a,t){var r=this,s=r.date,l=r.date.getLocalDate(r.params.dateType),o=r.date.getLocalMonth(r.params.dateType),i=r.date.getLocalFullYear(r.params.dateType),n=this.inputField.parentNode.parentNode.querySelectorAll(".time-ampm")[0];r.params.time24||(/pm/i.test(n.value)&&e<12?e=parseInt(e)+12:/am/i.test(n.value)&&12===e&&(e=0)),s.setHours(e),s.setMinutes(parseInt(a,10)),s.setSeconds(s.getSeconds()),s.setLocalFullYear(r.params.dateType,i),s.setLocalMonth(r.params.dateType,o),s.setLocalDate(r.params.dateType,l),r.dateClicked=!1,this.callHandler()},t.prototype.setDate=function(e){e.equalsTo(this.date)||(this.date=e,this.processCalendar(this.params.firstDayOfWeek,e))},t.prototype.moveCursorBy=function(e){var a=new Date(this.date);a.setDate(a.getDate()-e),this.setDate(a)},t.prototype.resetSelected=function(e){for(var a=e.options,t=a.length;t--;){var r=a[t];r.selected&&(r.selected=!1)}},t.prototype.callHandler=function(){this.inputField.setAttribute("data-alt-value",this.date.print(this.params.dateFormat,"gregorian",!1)),this.inputField.getAttribute("data-alt-value")&&"0000-00-00 00:00:00"!==this.inputField.getAttribute("data-alt-value")&&(this.inputField.value=this.date.print(this.params.dateFormat,this.params.dateType,!0),"gregorian"!==this.params.dateType&&this.inputField.setAttribute("data-local-value",this.date.print(this.params.dateFormat,this.params.dateType,!0))),this.inputField.value=this.date.print(this.params.dateFormat,this.params.dateType,!0),"function"==typeof this.inputField.onchange&&this.inputField.onchange(),this.dateClicked&&"function"==typeof this.params.onUpdate&&this.params.onUpdate(this),this.dateClicked?this.close():this.processCalendar()},t.prototype.close=function(){a.activeElement.blur(),this.hide()},t.prototype.show=function(){if(-1!==navigator.appName.indexOf("Internet Explorer")&&-1===navigator.appVersion.indexOf("MSIE 9")&&-1===navigator.appVersion.indexOf("MSIE 1")&&e.jQuery&&jQuery().chosen)for(var t=this.element.getElementsByTagName("select"),r=0;r<t.length;r++)jQuery(t[r]).chosen("destroy");this.checkInputs(),this.inputField.focus(),this.dropdownElement.style.display="block",this.hidden=!1,a.addEventListener("keydown",this._calKeyEvent,!0),a.addEventListener("keypress",this._calKeyEvent,!0),a.addEventListener("mousedown",this._documentClick,!0);var s=this.element.querySelector(".js-calendar");e.innerHeight+e.scrollY<s.getBoundingClientRect().bottom+20&&(s.style.marginTop=-(s.getBoundingClientRect().height+this.inputField.getBoundingClientRect().height)+"px"),this.processCalendar()},t.prototype.hide=function(){a.removeEventListener("keydown",this._calKeyEvent,!0),a.removeEventListener("keypress",this._calKeyEvent,!0),a.removeEventListener("mousedown",this._documentClick,!0),this.dropdownElement.style.display="none",this.hidden=!0},t.prototype._handleDocumentClick=function(e){var t=e.target;if(null!==t&&!t.classList.contains("time"))for(;null!==t&&t!==this.element;t=t.parentNode);if(null===t)return a.activeElement.blur(),this.hide(),r(e)},t.prototype._handleDayMouseDown=function(e){var a=this,t=e.currentTarget,s=e.target||e.srcElement;if(!s||!s.hasAttribute("data-action")){if("TD"!==t.nodeName){var l=t.getParent("TD");"TD"===l.nodeName?t=l:(t=t.getParent("TD")).classList.contains("js-calendar")&&(t=t.getElementsByTagName("table")[0])}else if(!s.classList.contains("js-btn")&&!t.classList.contains("day")&&!t.classList.contains("title"))return;if(!t||t.disabled)return!1;if(void 0===t.navtype||300!==t.navtype){50===t.navtype&&(t._current=t.innerHTML),s!==t&&s.parentNode!==t||a.cellClick(t,e);var o=null;void 0!==t.month&&(o=t),void 0!==t.parentNode.month&&(o=t.parentNode);var i=null;if(o)i=new Date(a.date),o.month!==i.getLocalMonth(a.params.dateType)&&(i.setLocalMonth(a.params.dateType,o.month),a.setDate(i),a.dateClicked=!1,this.callHandler());else{var n=null;void 0!==t.year&&(n=s),void 0!==t.parentNode.year&&(n=s.parentNode),n&&(i=new Date(a.date),n.year!==i.getLocalFullYear(a.params.dateType)&&(i.setFullYear(a.params.dateType,n.year),a.setDate(i),a.dateClicked=!1,this.callHandler()))}}return r(e)}},t.prototype.cellClick=function(e,a){var t=this,r=!1,s=!1,l=null;if(void 0===e.navtype){t.currentDateEl&&(e.classList.add("selected"),t.currentDateEl=e.caldate,(r=t.currentDateEl===e.caldate)||(t.currentDateEl=e.caldate)),t.date.setLocalDateOnly("gregorian",e.caldate);var o=!(t.dateClicked=!e.otherMonth);t.currentDateEl&&(s=!e.disabled),o&&this.processCalendar()}else{l=new Date(t.date),t.dateClicked=!1;var i=l.getOtherFullYear(t.params.dateType),n=l.getLocalMonth(t.params.dateType);switch(e.navtype){case 400:break;case-2:t.params.compressedHeader||i>t.params.minYear&&l.setOtherFullYear(t.params.dateType,i-1);break;case-1:d=l.getLocalDate(t.params.dateType);n>0?(d>(m=l.getLocalMonthDays(t.params.dateType,n-1))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,n-1)):i-- >t.params.minYear&&(l.setOtherFullYear(t.params.dateType,i),d>(m=l.getLocalMonthDays(t.params.dateType,11))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,11));break;case 1:var d=l.getLocalDate(t.params.dateType);if(n<11)d>(m=l.getLocalMonthDays(t.params.dateType,n+1))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,n+1);else if(i<t.params.maxYear){l.setOtherFullYear(t.params.dateType,i+1);var m=l.getLocalMonthDays(t.params.dateType,0);d>m&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,0)}break;case 2:t.params.compressedHeader||i<t.params.maxYear&&l.setOtherFullYear(t.params.dateType,i+1)}l.equalsTo(t.date)?0===e.navtype&&(s=r=!0):(this.setDate(l),s=!0)}s&&(t.params.showsTime&&(this.dateClicked=!1),a&&this.callHandler()),e.classList.remove("hilite"),r&&!t.params.showsTime&&(t.dateClicked=!1,a&&this.close())},t.prototype._handleCalKeyEvent=function(e){var a=this,t=e.keyCode;if(e.target!==this.inputField||13!==t&&9!==t||this.close(),"rtl"===a.params.direction&&(37===t?t=39:39===t&&(t=37)),32===t&&e.shiftKey&&(e.preventDefault(),this.cellClick(a._nav_now,e),a.close()),27===t&&this.close(),38===t&&this.moveCursorBy(7),40===t&&this.moveCursorBy(-7),37===t&&this.moveCursorBy(1),39===t&&this.moveCursorBy(-1),e.target===this.inputField&&!(t>48||t<57||186===t||189===t||190===t||32===t))return r(e)},t.prototype._create=function(){var e=this,a=this.element,t=s("table"),r=s("div");this.table=t,t.className="table",t.cellSpacing=0,t.cellPadding=0,t.style.marginBottom=0,this.dropdownElement=r,a.appendChild(r),this.params.direction&&(r.style.direction=this.params.direction),r.className="js-calendar",r.style.position="absolute",r.style.boxShadow="0px 0px 70px 0px rgba(0,0,0,0.67)",r.style.minWidth=this.inputField.width,r.style.padding="0",r.style.display="none",r.style.left="auto",r.style.top="auto",r.style.zIndex=1060,r.style.borderRadius="20px",this.wrapper=s("div"),this.wrapper.className="calendar-container",r.appendChild(this.wrapper),this.wrapper.appendChild(t);var l=s("thead",t);l.className="calendar-header";var o=null,i=null,n=this,d=function(a,t,r,l,d,m,p){l=l||"td",d=d||{},o=s(l,i),t&&(m=m?'class="'+m+'"':"",o.colSpan=t);for(var c in d)o.style[c]=d[c];for(var c in p)o.setAttribute(c,p[c]);return 0!==r&&Math.abs(r)<=2&&(o.className+=" nav"),t&&o.addEventListener("mousedown",e._dayMouseDown,!0),o.calendar=n,o.navtype=r,0!==r&&Math.abs(r)<=2?o.innerHTML="<a "+m+" style='display:inline;padding:2px 6px;cursor:pointer;text-decoration:none;' unselectable='on'>"+a+"</a>":(o.innerHTML=t?"<div unselectable='on'"+m+">"+a+"</div>":a,!t&&m&&(o.className=m)),o};!1===this.params.compressedHeader&&((i=s("tr",l)).className="calendar-head-row",this._nav_py=d("&lsaquo;",1,-2,"",{"text-align":"center","font-size":"18px","line-height":"18px"},"js-btn btn-prev-year"),this.title=d('<div style="text-align:center;font-size:18px"><span></span></div>',this.params.weekNumbers?6:5,300),this.title.className="title",this._nav_ny=d(" &rsaquo;",1,2,"",{"text-align":"center","font-size":"18px","line-height":"18px"},"js-btn btn-next-year")),(i=s("tr",l)).className="calendar-head-row",this._nav_pm=d("&lsaquo;",1,-1,"",{"text-align":"center","font-size":"2em","line-height":"1em"},"js-btn btn-prev-month"),this._nav_month=d('<div style="text-align:center;font-size:1.2em"><span></span></div>',this.params.weekNumbers?6:5,888,"td",{textAlign:"center"}),this._nav_month.className="title",this._nav_nm=d(" &rsaquo;",1,1,"",{"text-align":"center","font-size":"2em","line-height":"1em"},"js-btn btn-next-month"),(i=s("tr",l)).className=e.params.weekNumbers?"daynames wk":"daynames",this.params.weekNumbers&&((o=s("td",i)).className="day-name wn",o.innerHTML=JoomlaCalLocale.wk);for(c=7;c>0;--c)o=s("td",i),c||(o.calendar=e);this.firstdayname=this.params.weekNumbers?i.firstChild.nextSibling:i.firstChild;for(var m=this.params.firstDayOfWeek,o=this.firstdayname,p=JoomlaCalLocale.weekend,c=0;c<7;++c){var u=(c+m)%7;o.classList.add("day-name"),this.params.weekNumbers&&o.classList.add("day-name-week"),c&&(o.calendar=e,o.fdow=u),-1!==p.indexOf(p)&&o.classList.add("weekend"),o.innerHTML=JoomlaCalLocale.shortDays[(c+m)%7],o=o.nextSibling}var h=s("tbody",t);for(this.tbody=h,c=6;c>0;--c){i=s("tr",h),this.params.weekNumbers&&(o=s("td",i));for(var y=7;y>0;--y)(o=s("td",i)).calendar=this,o.addEventListener("mousedown",this._dayMouseDown,!0)}if(this.params.showsTime){(i=s("tr",h)).className="time",(o=s("td",i)).className="time time-title",o.colSpan=1,o.style.verticalAlign="middle",o.innerHTML=" ";var v=s("td",i);v.className="time hours-select",v.colSpan=2;var g=s("td",i);g.className="time minutes-select",g.colSpan=2,function(){function a(a,t,r,l,o){var i,n=s("select",o);n.calendar=e,n.className=a,n.setAttribute("data-chosen",!0),n.style.width="100%",n.navtype=50,n._range=[];for(var d=r;d<=l;++d){var m,p="";d===t&&(p=!0),d<10&&l>=10?(i="0"+d,m=Date.convertNumbers("0")+Date.convertNumbers(d)):(i=""+d,m=""+Date.convertNumbers(d)),n.options.add(new Option(m,i,p,p))}return n}var t=e.date.getHours(),r=e.date.getMinutes(),l=!e.params.time24,n=e.date.getHours()>12;l&&n&&(t-=12);var d=a("time time-hours",t,l?1:0,l?12:23,v),m=a("time time-minutes",r,0,59,g);if(o=s("td",i),o.className="time ampm-select",o.colSpan=e.params.weekNumbers?1:2,l){n=Date.parseFieldDate(e.inputField.getAttribute("data-alt-value"),e.params.dateFormat,"gregorian").getHours()>12;var p=s("select",o);p.className="time-ampm",p.style.width="100%",p.options.add(new Option(JoomlaCalLocale.PM,"pm",!!n||"",!!n||"")),p.options.add(new Option(JoomlaCalLocale.AM,"am",!n||"",!n||"")),p.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1)}else o.innerHTML="&#160;",o.colSpan=e.params.weekNumbers?3:2;d.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1),m.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1)}()}(i=s("div",this.wrapper)).className="buttons-wrapper btn-group",this._nav_save=d(JoomlaCalLocale.save,"",100,"button","","js-btn btn btn-clear",{"data-action":"clear"}),this.inputField.hasAttribute("required")||i.querySelector('[data-action="clear"]').addEventListener("click",function(a){a.preventDefault();for(var t=e.table.querySelectorAll("td"),r=0;r<t.length;r++)if(t[r].classList.contains("selected")){t[r].classList.remove("selected");break}e.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00"),e.inputField.setAttribute("value",""),e.inputField.value=""}),this.params.showsTodayBtn&&(this._nav_now=d(JoomlaCalLocale.today,"",0,"button","","js-btn btn btn-today",{"data-action":"today"}),this.wrapper.querySelector('[data-action="today"]').addEventListener("click",function(a){a.preventDefault(),e.date.setLocalDateOnly("gregorian",new Date),e.dateClicked=!0,e.callHandler(),e.close()})),this._nav_exit=d(JoomlaCalLocale.exit,"",999,"button","","js-btn btn btn-exit",{"data-action":"exit"}),this.wrapper.querySelector('[data-action="exit"]').addEventListener("click",function(a){a.preventDefault(),e.dateClicked||(e.inputField.value?("gregorian"!==e.params.dateType&&e.inputField.setAttribute("data-local-value",e.inputField.value),void 0===e.dateClicked?e.inputField.setAttribute("data-alt-value",Date.parseFieldDate(e.inputField.value,e.params.dateFormat,e.params.dateType).print(e.params.dateFormat,"gregorian",!1)):e.inputField.setAttribute("data-alt-value",e.date.print(e.params.dateFormat,"gregorian",!1))):e.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00"),e.date=Date.parseFieldDate(e.inputField.getAttribute("data-alt-value"),e.params.dateFormat,e.params.dateType)),e.close()}),this.processCalendar()},t.prototype.processCalendar=function(){this.table.style.visibility="hidden";var e=this.params.firstDayOfWeek,a=this.date,t=new Date,r=t.getLocalFullYear(this.params.dateType),s=t.getLocalMonth(this.params.dateType),l=t.getLocalDate(this.params.dateType),o=a.getOtherFullYear(this.params.dateType),i=a.getHours(),n=a.getMinutes(),d=(a.getSeconds(),!this.params.time24);o<this.params.minYear?(o=this.params.minYear,a.getOtherFullYear(this.params.dateType,o)):o>this.params.maxYear&&(o=this.params.maxYear,a.getOtherFullYear(this.params.dateType,o)),this.params.firstDayOfWeek=e,this.date=new Date(a);var m=a.getLocalMonth(this.params.dateType),p=a.getLocalDate(this.params.dateType);a.setLocalDate(this.params.dateType,1);var c=(a.getLocalDay(this.params.dateType)-this.params.firstDayOfWeek)%7;c<0&&(c+=7),a.setLocalDate(this.params.dateType,-c),a.setLocalDate(this.params.dateType,a.getLocalDate(this.params.dateType)+1);for(var u=this.tbody.firstChild,h=this.ar_days=new Array,y=JoomlaCalLocale.weekend,v=parseInt(a.getLocalWeekDays(this.params.dateType)),g=0;g<v;++g,u=u.nextSibling){var b=u.firstChild;this.params.weekNumbers&&(b.className="day wn",b.innerHTML=a.getLocalWeekNumber(this.params.dateType),b=b.nextSibling),u.className=this.params.weekNumbers?"daysrow wk":"daysrow";for(var f,L=!1,C=h[g]=[],w=v+1,T=0;T<w;++T,b=b.nextSibling,a.setLocalDate(this.params.dateType,f+1)){b.className="day",b.style.textAlign="center",f=a.getLocalDate(this.params.dateType);var N=a.getLocalDay(this.params.dateType);b.pos=g<<4|T,C[T]=b;var D=a.getLocalMonth(this.params.dateType)===m;if(D)b.otherMonth=!1,L=!0,b.style.cursor="pointer";else{if(!this.params.showsOthers){b.className+=" emptycell",b.innerHTML="&#160;",b.disabled=!0;continue}b.className+=" disabled othermonth ",b.otherMonth=!0}b.disabled=!1,b.innerHTML=this.params.debug?f:Date.convertNumbers(f),b.disabled||(b.caldate=new Date(a),D&&f===p&&(b.className+=" selected",this.currentDateEl=b),a.getLocalFullYear(this.params.dateType)===r&&a.getLocalMonth(this.params.dateType)===s&&f===l&&(b.className+=" today"),-1!==y.indexOf(N)&&(b.className+=" weekend"))}L||this.params.showsOthers?u.style.display="":(u.style.display="none",u.className="emptyrow")}if(this.params.showsTime){i>12&&d&&(i-=12),i=i<10?"0"+i:i,n=n<10?"0"+n:n;var F=this.table.querySelector(".time-hours"),k=this.table.querySelector(".time-minutes");if(this.resetSelected(F),F.value=i,this.resetSelected(k),k.value=n,!this.params.time24){var J=new Date(this.inputField.getAttribute("data-alt-value")),A=this.table.querySelector(".time-ampm");J.getHours()>12&&(this.resetSelected(A),A.value="pm")}}if(this.params.compressedHeader){var M=Date.convertNumbers(o.toString());this._nav_month.getElementsByTagName("span")[0].innerHTML=this.params.monthBefore?M+" - "+JoomlaCalLocale.months[m]:JoomlaCalLocale.months[m]+" - "+M}else this._nav_month.getElementsByTagName("span")[0].innerHTML=this.params.debug?m+" "+JoomlaCalLocale.months[m]:JoomlaCalLocale.months[m],this.title.getElementsByTagName("span")[0].innerHTML=this.params.debug?o+" "+Date.convertNumbers(o.toString()):Date.convertNumbers(o.toString());this.table.style.visibility="visible"},t.prototype._bindEvents=function(){var e=this;this.inputField.addEventListener("blur",function(a){var r=t.getCalObject(this)._joomlaCalendar;if("block"!==r.dropdownElement.style.display){if(r){if(r.inputField.value)if(void 0===r.params.dateClicked)if(r.inputField.setAttribute("data-local-value",r.inputField.value),"gregorian"!==r.params.dateType){var s,l=Date.parseFieldDate(r.inputField.value,r.params.dateFormat,r.params.dateType);s=Date.localCalToGregorian(l.getFullYear(),l.getMonth(),l.getDate()),l.setFullYear(s[0]),l.setMonth(s[1]),l.setDate(s[2]),r.inputField.setAttribute("data-alt-value",l.print(r.params.dateFormat,"gregorian",!1))}else r.inputField.setAttribute("data-alt-value",Date.parseFieldDate(r.inputField.value,r.params.dateFormat,r.params.dateType).print(r.params.dateFormat,"gregorian",!1));else r.inputField.setAttribute("data-alt-value",r.date.print(r.params.dateFormat,"gregorian",!1));else r.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00");r.date=Date.parseFieldDate(r.inputField.getAttribute("data-alt-value"),r.params.dateFormat,r.params.dateType)}e.close()}else a.preventDefault()},!0),this.button.addEventListener("click",function(){e.show()},!1)};var r=function(a){return a||(a=e.event),a.preventDefault(),a.stopPropagation(),!1},s=function(e,t){var r=null;return r=a.createElement(e),void 0!==t&&t.appendChild(r),r},l=function(e){return!isNaN(e)&&function(e){return(0|e)===e}(parseFloat(e))},o=function(e,a){return(new Date).getLocalFullYear(a)+e};Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var a=this.length>>>0,t=Number(arguments[1])||0;for((t=t<0?Math.ceil(t):Math.floor(t))<0&&(t+=a);t<a;t++)if(t in this&&this[t]===e)return t;return-1}),t.getCalObject=function(e){if(!e)return!1;for(;e.parentNode;)if((e=e.parentNode).classList.contains("field-calendar"))return e;return!1},t.prototype.setAltValue=function(){var e=this.inputField;e.getAttribute("disabled")||(e.value=e.getAttribute("data-alt-value")?e.getAttribute("data-alt-value"):"")},t.onSubmit=function(){if(Joomla=e.Joomla||{},!Joomla.calendarProcessed){Joomla.calendarProcessed=!0;for(var t=a.querySelectorAll(".field-calendar"),r=0;r<t.length;r++){var s=t[r]._joomlaCalendar;s&&s.setAltValue()}}},t.init=function(a,r){e.JoomlaCalLocale=e.JoomlaCalLocale?JoomlaCalLocale:{},JoomlaCalLocale.today=JoomlaCalLocale.today?JoomlaCalLocale.today:"today",JoomlaCalLocale.weekend=JoomlaCalLocale.weekend?JoomlaCalLocale.weekend:[0,6],JoomlaCalLocale.localLangNumbers=JoomlaCalLocale.localLangNumbers?JoomlaCalLocale.localLangNumbers:[0,1,2,3,4,5,6,7,8,9],JoomlaCalLocale.wk=JoomlaCalLocale.wk?JoomlaCalLocale.wk:"wk",JoomlaCalLocale.AM=JoomlaCalLocale.AM?JoomlaCalLocale.AM:"AM",JoomlaCalLocale.PM=JoomlaCalLocale.PM?JoomlaCalLocale.PM:"PM",JoomlaCalLocale.am=JoomlaCalLocale.am?JoomlaCalLocale.am:"am",JoomlaCalLocale.pm=JoomlaCalLocale.pm?JoomlaCalLocale.pm:"pm",JoomlaCalLocale.dateType=JoomlaCalLocale.dateType?JoomlaCalLocale.dateType:"gregorian",JoomlaCalLocale.time=JoomlaCalLocale.time?JoomlaCalLocale.time:"time",JoomlaCalLocale.days=JoomlaCalLocale.days?JoomlaCalLocale.days:'["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]',JoomlaCalLocale.shortDays=JoomlaCalLocale.shortDays?JoomlaCalLocale.shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],JoomlaCalLocale.months=JoomlaCalLocale.months?JoomlaCalLocale.months:["January","February","March","April","May","June","July","August","September","October","November","December"],JoomlaCalLocale.shortMonths=JoomlaCalLocale.shortMonths?JoomlaCalLocale.shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],JoomlaCalLocale.minYear=JoomlaCalLocale.minYear?JoomlaCalLocale.minYear:1900,JoomlaCalLocale.maxYear=JoomlaCalLocale.maxYear?JoomlaCalLocale.maxYear:2100,JoomlaCalLocale.exit=JoomlaCalLocale.exit?JoomlaCalLocale.exit:"Cancel",JoomlaCalLocale.clear=JoomlaCalLocale.clear?JoomlaCalLocale.clear:"Clear";var s=a._joomlaCalendar;s?s.recreate():new t(a),a&&a.getElementsByTagName("input")[0]&&a.getElementsByTagName("input")[0].form&&!a.getElementsByTagName("input")[0].disabled&&a.getElementsByTagName("input")[0].form.addEventListener("submit",t.onSubmit)},e.JoomlaCalendar=t,a.addEventListener("DOMContentLoaded",function(){var r,s;for(r=a.querySelectorAll(".field-calendar"),s=0;s<r.length;s++)t.init(r[s]);e.jQuery&&jQuery(a).on("subform-row-add",function(e,a){for(r=a.querySelectorAll(".field-calendar"),s=0;s<r.length;s++)t.init(r[s])}),e.Calendar={},Calendar.setup=function(e){if(e.inputField&&a.getElementById(e.inputField)){var r=a.getElementById(e.inputField),s=r.parentNode.querySelectorAll("button")[0];for(var l in e)if(e.hasOwnProperty(l))switch(l){case"ifFormat":s&&s.setAttribute("data-dayformat",e.ifFormat);break;case"firstDay":s&&s.setAttribute("data-firstday",parseInt(e.firstDay));break;case"weekNumbers":s&&s.setAttribute("data-week-numbers","true"===e.weekNumbers||!0===e.weekNumbers?"1":"0");break;case"showOthers":s&&s.setAttribute("data-show-others","true"===e.showOthers||!0===e.showOthers?"1":"0");break;case"showsTime":s&&s.setAttribute("data-show-time","true"===e.showsTime||!0===e.showsTime?"1":"0");break;case"timeFormat":s&&s.setAttribute("data-time-24",parseInt(e.timeFormat))}t.init(r.parentNode.parentNode)}return null}})}(window,document);

From 2da39148b21673d488ab4759966b64c0a9d3f919 Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Mon, 31 Jul 2017 17:16:21 +0530
Subject: [PATCH 110/148] Admin Menu custom presets, import/export a preset
 into/from database driven menu (#16451)

* Implement preset xml and the menuHelper class to load them.

* Export a menu (menutype) as a preset xml

* Import/load a preset xml into a database driven menu (menutype)

* Menu Tree and Node classes implemented for menu module menu item hierarchy.

* Update menu module to use new Menu Tree and Node class. Move the HTML rendering to layout files to facilitate template overrides.

* Remove unused files.

* CodeStyle fixes

* Include exception message string in error message.

* Add filter by Tag to mod_article_category (#16945)

* add filteroption to select tag to filter

* all php logic to get selected filter option

* add nice lines to separate fitler by tag from the rest.

* fix code style

* conditional load tags. Only load when filter is used

* File mode fixed
---
 administrator/components/com_admin/script.php |   3 +
 .../com_admin/views/help/tmpl/langforum.php   |  15 +
 .../components/com_menus/controllers/menu.php |  68 +-
 .../components/com_menus/helpers/menus.php    | 230 ++++++
 administrator/components/com_menus/menus.xml  |   1 +
 .../com_menus/models/fields/menupreset.php    |  51 ++
 .../com_menus/models/forms/menu.xml           |   9 +
 .../components/com_menus/models/menu.php      |   8 +-
 .../components/com_menus/presets/joomla.xml   | 558 +++++++++++++
 .../components/com_menus/presets/menu.xsd     |  64 ++
 .../components/com_menus/presets/modern.xml   | 585 +++++++++++++
 .../com_menus/views/menu/tmpl/edit.php        |  36 +-
 .../com_menus/views/menu/view.xml.php         | 170 ++++
 .../com_menus/views/menus/tmpl/default.php    |  10 +
 .../com_menus/views/menus/view.html.php       |   5 +
 .../language/en-GB/en-GB.com_admin.ini        |   1 +
 .../language/en-GB/en-GB.com_menus.ini        |   7 +
 .../language/en-GB/en-GB.lib_joomla.ini       |   3 +
 .../language/en-GB/en-GB.mod_menu.ini         |   5 +-
 administrator/modules/mod_menu/helper.php     | 321 +------
 administrator/modules/mod_menu/menu.php       | 781 ++++++------------
 administrator/modules/mod_menu/mod_menu.php   |   1 +
 administrator/modules/mod_menu/mod_menu.xml   |  48 +-
 .../modules/mod_menu/preset/disabled.php      |  78 --
 .../modules/mod_menu/preset/enabled.php       | 450 ----------
 .../modules/mod_menu/tmpl/default.php         |  25 +-
 .../modules/mod_menu/tmpl/default_submenu.php | 120 +++
 libraries/src/Joomla/CMS/Menu/MenuHelper.php  | 368 +++++++++
 libraries/src/Joomla/CMS/Menu/Node.php        | 272 ++++++
 .../src/Joomla/CMS/Menu/Node/Component.php    | 117 +++
 .../src/Joomla/CMS/Menu/Node/Container.php    |  21 +
 .../src/Joomla/CMS/Menu/Node/Heading.php      |  91 ++
 .../src/Joomla/CMS/Menu/Node/Separator.php    |  65 ++
 libraries/src/Joomla/CMS/Menu/Node/Url.php    | 105 +++
 libraries/src/Joomla/CMS/Menu/Tree.php        | 219 +++++
 35 files changed, 3474 insertions(+), 1437 deletions(-)
 create mode 100644 administrator/components/com_admin/views/help/tmpl/langforum.php
 create mode 100644 administrator/components/com_menus/models/fields/menupreset.php
 create mode 100644 administrator/components/com_menus/presets/joomla.xml
 create mode 100644 administrator/components/com_menus/presets/menu.xsd
 create mode 100644 administrator/components/com_menus/presets/modern.xml
 create mode 100644 administrator/components/com_menus/views/menu/view.xml.php
 delete mode 100644 administrator/modules/mod_menu/preset/disabled.php
 delete mode 100644 administrator/modules/mod_menu/preset/enabled.php
 create mode 100644 administrator/modules/mod_menu/tmpl/default_submenu.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/MenuHelper.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/Node.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/Node/Component.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/Node/Container.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/Node/Heading.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/Node/Separator.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/Node/Url.php
 create mode 100644 libraries/src/Joomla/CMS/Menu/Tree.php

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 2a686396116a0..b1bb47099692f 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -1907,6 +1907,8 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/view/legacy.php',
 			'/libraries/legacy/web/client.php',
 			'/libraries/legacy/web/web.php',
+			'/administrator/modules/mod_menu/preset/enabled.php',
+			'/administrator/modules/mod_menu/preset/disabled.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -2129,6 +2131,7 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/model',
 			'/libraries/legacy/view',
 			'/libraries/legacy/web',
+			'/administrator/modules/mod_menu/preset',
 		);
 
 		jimport('joomla.filesystem.file');
diff --git a/administrator/components/com_admin/views/help/tmpl/langforum.php b/administrator/components/com_admin/views/help/tmpl/langforum.php
new file mode 100644
index 0000000000000..f657d816df8be
--- /dev/null
+++ b/administrator/components/com_admin/views/help/tmpl/langforum.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$forumId   = (int) JText::_('COM_ADMIN_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
+$forum_url = 'https://forum.joomla.org/viewforum.php?f=' . $forumId;
+
+JFactory::getApplication()->redirect($forum_url);
diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php
index 3f4ccf1b20a1b..9115aae674324 100644
--- a/administrator/components/com_menus/controllers/menu.php
+++ b/administrator/components/com_menus/controllers/menu.php
@@ -78,10 +78,10 @@ public function save($key = null, $urlVar = null)
 			return false;
 		}
 
-		$data = $model->validate($form, $data);
+		$validData = $model->validate($form, $data);
 
 		// Check for validation errors.
-		if ($data === false)
+		if ($validData === false)
 		{
 			// Get the validation messages.
 			$errors = $model->getErrors();
@@ -98,8 +98,9 @@ public function save($key = null, $urlVar = null)
 					$app->enqueueMessage($errors[$i], 'warning');
 				}
 			}
+
 			// Save the data in the session.
-			$app->setUserState('com_menus.edit.menu.data', $data);
+			$app->setUserState($context . '.data', $data);
 
 			// Redirect back to the edit screen.
 			$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit', false));
@@ -107,11 +108,18 @@ public function save($key = null, $urlVar = null)
 			return false;
 		}
 
+		if (isset($validData['preset']))
+		{
+			$preset = trim($validData['preset']) ?: null;
+
+			unset($validData['preset']);
+		}
+
 		// Attempt to save the data.
-		if (!$model->save($data))
+		if (!$model->save($validData))
 		{
 			// Save the data in the session.
-			$app->setUserState('com_menus.edit.menu.data', $data);
+			$app->setUserState($context . '.data', $validData);
 
 			// Redirect back to the edit screen.
 			$this->setMessage(JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error');
@@ -120,7 +128,25 @@ public function save($key = null, $urlVar = null)
 			return false;
 		}
 
-		$this->setMessage(JText::_('COM_MENUS_MENU_SAVE_SUCCESS'));
+		// Import the preset selected
+		if (isset($preset) && $data['client_id'] == 1)
+		{
+			try
+			{
+				MenusHelper::installPreset($preset, $data['menutype']);
+
+				$this->setMessage(JText::_('COM_MENUS_PRESET_IMPORT_SUCCESS'));
+			}
+			catch (Exception $e)
+			{
+				// Save was successful but the preset could not be loaded. Let it through with just a warning
+				$this->setMessage(JText::sprintf('COM_MENUS_PRESET_IMPORT_FAILED', $e->getMessage()));
+			}
+		}
+		else
+		{
+			$this->setMessage(JText::_('COM_MENUS_MENU_SAVE_SUCCESS'));
+		}
 
 		// Redirect the user and adjust session state based on the chosen task.
 		switch ($task)
@@ -153,4 +179,34 @@ public function save($key = null, $urlVar = null)
 				break;
 		}
 	}
+
+	/**
+	 * Method to display a menu as preset xml.
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function exportXml()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		$cid   = $this->input->get('cid', array(), 'array');
+		$model = $this->getModel('Menu');
+		$item  = $model->getItem(reset($cid));
+
+		if (!$item->menutype)
+		{
+			$this->setMessage(JText::_('COM_MENUS_SELECT_MENU_FIRST_EXPORT'), 'warning');
+
+			$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menus', false));
+
+			return false;
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&menutype=' . $item->menutype . '&format=xml', false));
+
+		return true;
+	}
 }
diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
index c255900616ddb..f2be9931171af 100644
--- a/administrator/components/com_menus/helpers/menus.php
+++ b/administrator/components/com_menus/helpers/menus.php
@@ -7,6 +7,10 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+use Joomla\CMS\Menu\MenuHelper;
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
 defined('_JEXEC') or die;
 
 /**
@@ -18,6 +22,8 @@ class MenusHelper
 {
 	/**
 	 * Defines the valid request variables for the reverse lookup.
+	 *
+	 * @since   1.6
 	 */
 	protected static $_filter = array('option', 'view', 'layout');
 
@@ -321,4 +327,228 @@ public static function getAssociations($pk)
 
 		return $associations;
 	}
+
+	/**
+	 * Load the menu items from database for the given menutype
+	 *
+	 * @param   string   $menutype     The selected menu type
+	 * @param   boolean  $enabledOnly  Whether to load only enabled/published menu items.
+	 * @param   int[]    $exclude      The menu items to exclude from the list
+	 *
+	 * @return  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function getMenuItems($menutype, $enabledOnly = false, $exclude = array())
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Prepare the query.
+		$query->select('m.*')
+			->from('#__menu AS m')
+			->where('m.menutype = ' . $db->q($menutype))
+			->where('m.client_id = 1')
+			->where('m.id > 1');
+
+		if ($enabledOnly)
+		{
+			$query->where('m.published = 1');
+		}
+
+		// Filter on the enabled states.
+		$query->select('e.element')
+			->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
+			->where('(e.enabled = 1 OR e.enabled IS NULL)');
+
+		if (count($exclude))
+		{
+			$exId = array_filter($exclude, 'is_numeric');
+			$exEl = array_filter($exclude, 'is_string');
+
+			if ($exId)
+			{
+				$query->where('m.id NOT IN (' . implode(', ', array_map('intval', $exId)) . ')');
+				$query->where('m.parent_id NOT IN (' . implode(', ', array_map('intval', $exId)) . ')');
+			}
+
+			if ($exEl)
+			{
+				$query->where('e.element NOT IN (' . implode(', ', $db->quote($exEl)) . ')');
+			}
+		}
+
+		// Order by lft.
+		$query->order('m.lft');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$menuItems = $db->loadObjectList();
+
+			foreach ($menuItems as &$menuitem)
+			{
+				$menuitem->params = new Registry($menuitem->params);
+			}
+		}
+		catch (RuntimeException $e)
+		{
+			$menuItems = array();
+
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+		}
+
+		return $menuItems;
+	}
+
+	/**
+	 * Method to install a preset menu into database and link them to the given menutype
+	 *
+	 * @param   string  $preset    The preset name
+	 * @param   string  $menutype  The target menutype
+	 *
+	 * @return  void
+	 *
+	 * @throws  Exception
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function installPreset($preset, $menutype)
+	{
+		$items = MenuHelper::loadPreset($preset, false);
+
+		if (count($items) == 0)
+		{
+			throw new Exception(JText::_('COM_MENUS_PRESET_LOAD_FAILED'));
+		}
+
+		static::installPresetItems($items, $menutype, 1);
+	}
+
+	/**
+	 * Method to install a preset menu item into database and link it to the given menutype
+	 *
+	 * @param   stdClass[]  &$items    The single menuitem instance with a list of its descendants
+	 * @param   string      $menutype  The target menutype
+	 * @param   int         $parent    The parent id or object
+	 *
+	 * @return  void
+	 *
+	 * @throws  Exception
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected static function installPresetItems(&$items, $menutype, $parent = 1)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		static $components = array();
+
+		if (!$components)
+		{
+			$query->select('extension_id, element')->from('#__extensions')->where('type = ' . $db->q('component'));
+			$components = $db->setQuery($query)->loadObjectList();
+			$components = ArrayHelper::getColumn((array) $components, 'element', 'extension_id');
+		}
+
+		foreach ($items as &$item)
+		{
+			/** @var  JTableMenu  $table */
+			$table = JTable::getInstance('Menu');
+
+			$item->alias = $menutype . '-' . $item->title;
+
+			if ($item->type == 'separator')
+			{
+				// Do not reuse a separator
+				$item->title = $item->title ?: '-';
+				$item->alias = microtime(true);
+			}
+			elseif ($item->type == 'heading' || $item->type == 'container')
+			{
+				// Try to match an existing record to have minimum collision for a heading
+				$keys  = array(
+					'menutype'  => $menutype,
+					'type'      => $item->type,
+					'title'     => $item->title,
+					'parent_id' => $parent,
+					'client_id' => 1,
+				);
+				$table->load($keys);
+			}
+			elseif ($item->type == 'url' || $item->type == 'component')
+			{
+				// Try to match an existing record to have minimum collision for a link
+				$keys  = array(
+					'menutype'  => $menutype,
+					'type'      => $item->type,
+					'link'      => $item->link,
+					'parent_id' => $parent,
+					'client_id' => 1,
+				);
+				$table->load($keys);
+			}
+
+			// Translate "hideitems" param value from "element" into "menu-item-id"
+			if ($item->type == 'container' && count($hideitems = (array) $item->params->get('hideitems')))
+			{
+				foreach ($hideitems as &$hel)
+				{
+					if (!is_numeric($hel))
+					{
+						$hel = array_search($hel, $components);
+					}
+				}
+
+				$query->clear()->select('id')->from('#__menu')->where('component_id IN (' . implode(', ', $hideitems) . ')');
+				$hideitems = $db->setQuery($query)->loadColumn();
+
+				$item->params->set('hideitems', $hideitems);
+			}
+
+			$record = array(
+				'menutype'     => $menutype,
+				'title'        => $item->title,
+				'alias'        => $item->alias,
+				'type'         => $item->type,
+				'link'         => $item->link,
+				'browserNav'   => $item->browserNav ? 1 : 0,
+				'img'          => $item->class,
+				'access'       => $item->access,
+				'component_id' => array_search($item->element, $components),
+				'parent_id'    => $parent,
+				'client_id'    => 1,
+				'published'    => 1,
+				'language'     => '*',
+				'home'         => 0,
+				'params'       => (string) $item->params,
+			);
+
+			if (!$table->bind($record))
+			{
+				throw new Exception('Bind failed: ' . $table->getError());
+			}
+
+			$table->setLocation($parent, 'last-child');
+
+			if (!$table->check())
+			{
+				throw new Exception('Check failed: ' . $table->getError());
+			}
+
+			if (!$table->store())
+			{
+				throw new Exception('Saved failed: ' . $table->getError());
+			}
+
+			$item->id = $table->get('id');
+
+			if (!empty($item->submenu))
+			{
+				static::installPresetItems($item->submenu, $menutype, $item->id);
+			}
+		}
+	}
 }
diff --git a/administrator/components/com_menus/menus.xml b/administrator/components/com_menus/menus.xml
index 285432982d620..ed40066654c09 100644
--- a/administrator/components/com_menus/menus.xml
+++ b/administrator/components/com_menus/menus.xml
@@ -18,6 +18,7 @@
 			<folder>helpers</folder>
 			<folder>models</folder>
 			<folder>views</folder>
+			<folder>presets</folder>
 		</files>
 		<languages folder="admin">
 			<language tag="en-GB">language/en-GB.com_menus.ini</language>
diff --git a/administrator/components/com_menus/models/fields/menupreset.php b/administrator/components/com_menus/models/fields/menupreset.php
new file mode 100644
index 0000000000000..9992bf001f6b0
--- /dev/null
+++ b/administrator/components/com_menus/models/fields/menupreset.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Menu\MenuHelper;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Administrator Menu Presets list field.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JFormFieldMenuPreset extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $type = 'MenuPreset';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+		$presets = MenuHelper::getPresets();
+
+		foreach ($presets as $preset)
+		{
+			$options[] = JHtml::_('select.option', $preset->name, JText::_($preset->title));
+		}
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/administrator/components/com_menus/models/forms/menu.xml b/administrator/components/com_menus/models/forms/menu.xml
index 7db713f400f60..683e79fa6dc69 100644
--- a/administrator/components/com_menus/models/forms/menu.xml
+++ b/administrator/components/com_menus/models/forms/menu.xml
@@ -56,6 +56,15 @@
 			<option value="0">JSITE</option>
 			<option value="1">JADMINISTRATOR</option>
 		</field>
+		<field
+			name="preset"
+			type="menuPreset"
+			label="COM_MENUS_FIELD_PRESET_LABEL"
+			description="COM_MENUS_FIELD_PRESET_DESC"
+			showon="client_id:1"
+		>
+			<option value="">JNONE</option>
+		</field>
 		<field
 			name="rules"
 			type="rules"
diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php
index 4e40104c64b19..0bd39163722bc 100644
--- a/administrator/components/com_menus/models/menu.php
+++ b/administrator/components/com_menus/models/menu.php
@@ -69,11 +69,11 @@ protected function canEditState($record)
 	/**
 	 * Returns a Table object, always creating it
 	 *
-	 * @param   type    $type    The table type to instantiate
+	 * @param   string  $type    The table type to instantiate
 	 * @param   string  $prefix  A prefix for the table class name. Optional.
 	 * @param   array   $config  Configuration array for model. Optional.
 	 *
-	 * @return  JTable    A database object
+	 * @return  JTable  A database object
 	 *
 	 * @since   1.6
 	 */
@@ -176,6 +176,10 @@ protected function loadFormData()
 		{
 			$data = $this->getItem();
 		}
+		else
+		{
+			unset($data['preset']);
+		}
 
 		$this->preprocessData('com_menus.menu', $data);
 
diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml
new file mode 100644
index 0000000000000..10b93ad3a3a49
--- /dev/null
+++ b/administrator/components/com_menus/presets/joomla.xml
@@ -0,0 +1,558 @@
+<?xml version="1.0"?>
+<menu
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="urn:joomla.org"
+	xsi:schemaLocation="urn:joomla.org menu.xsd">
+	<menuitem
+		title="MOD_MENU_SYSTEM"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_CONTROL_PANEL"
+			link="index.php"
+			element="com_cpanel"
+			class="class:cpanel"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_CONFIGURATION"
+			type="component"
+			element="com_config"
+			link="index.php?option=com_config"
+			class="class:config"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_GLOBAL_CHECKIN"
+			type="component"
+			element="com_checkin"
+			link="index.php?option=com_checkin"
+			class="class:checkin"
+		/>
+		<menuitem
+			title="MOD_MENU_CLEAR_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache"
+			class="class:clear"
+		/>
+		<menuitem
+			title="MOD_MENU_PURGE_EXPIRED_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache&amp;view=purge"
+			class="class:purge"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_SYSTEM_INFORMATION"
+			type="component"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=sysinfo"
+			class="class:info"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_USERS_USERS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_USERS_USER_MANAGER"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=users"
+			class="class:user">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_USER"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=user.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_GROUPS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=groups"
+			class="class:groups">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_GROUP"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=group.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_LEVELS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=levels"
+			class="class:levels">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_LEVEL"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=level.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTES"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=notes"
+			class="class:user-note">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_NOTE"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=note.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTE_CATEGORIES"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_users"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_users"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_users.user"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_users.user"
+			class="class:category"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MASS_MAIL_USERS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=mail"
+			class="class:massmail"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_MENUS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_MENU_MANAGER"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=menus"
+			class="class:menumgr">
+			<menuitem
+				title="MOD_MENU_MENU_MANAGER_NEW_MENU"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=menu&amp;layout=edit"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MENUS_ALL_ITEMS"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=items&amp;menutype="
+			class="class:allmenu"
+		/>
+		<!--
+		Following is an example of repeatable group based on simple database query.
+		This requires sql_* attributes (sql_select and sql_from are required)
+		The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
+		The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
+		-->
+		<menuitem
+			type="separator"
+			title="JSITE"
+			hidden="false"
+			sql_select="title, menutype"
+			sql_from="#__menu_types"
+			sql_where="client_id = 0"
+			sql_order="title ASC">
+			<menuitem
+				title="{sql:title}"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+		<menuitem
+			type="separator"
+			title="JADMINISTRATOR"
+			hidden="false"
+			sql_select="title, menutype"
+			sql_from="#__menu_types"
+			sql_where="client_id = 1"
+			sql_order="title ASC">
+			<menuitem
+				title="{sql:title}"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_CONTENT"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content"
+			class="class:article">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+				type="component"
+				element="com_content"
+				link="index.php?option=com_content&amp;task=article.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;extension=com_content"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_content"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_content.article"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_content.article"
+			class="class:category"
+		/>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_FEATURED"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content&amp;view=featured"
+			class="class:featured"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MEDIA_MANAGER"
+			type="component"
+			element="com_media"
+			link="index.php?option=com_media"
+			class="class:media"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COMPONENTS"
+		type="container"
+	/>
+	<menuitem
+		title="MOD_MENU_EXTENSIONS_EXTENSIONS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_EXTENSION_MANAGER"
+			type="component"
+			element="com_installer"
+			link="index.php?option=com_installer"
+			class="class:install">
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_INSTALL"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=update"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_MANAGE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=manage"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DISCOVER"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=discover"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DATABASE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=database"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_WARNINGS"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=warnings"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_LANGUAGES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=languages"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATESITES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=updatesites"
+				class="class:install"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER"
+			type="component"
+			element="com_modules"
+			link="index.php?option=com_modules"
+			class="class:module"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_PLUGIN_MANAGER"
+			type="component"
+			element="com_plugins"
+			link="index.php?option=com_plugins"
+			class="class:plugin"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER"
+			type="component"
+			element="com_templates"
+			link="index.php?option=com_templates"
+			class="class:themes">
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=styles"
+				class="class:themes"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=templates"
+				class="class:themes"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER"
+			type="component"
+			element="com_languages"
+			link="index.php?option=com_languages"
+			class="class:language">
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=installed"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=languages"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=overrides"
+				class="class:language"
+			/>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_HELP"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_HELP_JOOMLA"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=help"
+			class="class:help"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM"
+			link="https://forum.joomla.org"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM"
+			link="index.php?option=com_admin&amp;view=help&amp;layout=langforum"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DOCUMENTATION"
+			link="https://docs.joomla.org"
+			class="class:help-docs"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_EXTENSIONS"
+			link="https://extensions.joomla.org"
+			class="class:help-jed"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_TRANSLATIONS"
+			link="https://community.joomla.org/translations.html"
+			class="class:help-trans"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_RESOURCES"
+			link="https://resources.joomla.org"
+			class="class:help-jrd"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_COMMUNITY"
+			link="https://community.joomla.org"
+			class="class:help-community"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SECURITY"
+			link="https://developer.joomla.org/security-centre.html"
+			class="class:help-security"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DEVELOPER"
+			link="https://developer.joomla.org"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_XCHANGE"
+			link="https://joomla.stackexchange.com"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SHOP"
+			link="https://community.joomla.org/the-joomla-shop.html"
+			class="class:help-shop"
+			scope="help"
+		/>
+	</menuitem>
+</menu>
diff --git a/administrator/components/com_menus/presets/menu.xsd b/administrator/components/com_menus/presets/menu.xsd
new file mode 100644
index 0000000000000..6338b8db992c8
--- /dev/null
+++ b/administrator/components/com_menus/presets/menu.xsd
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+	attributeFormDefault="unqualified" elementFormDefault="qualified"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="urn:joomla.org"
+	xmlns="urn:joomla.org">
+	<xs:element name="menu" type="menuType"/>
+	<xs:simpleType name="typeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="component" />
+			<xs:enumeration value="container" />
+			<xs:enumeration value="heading" />
+			<xs:enumeration value="separator" />
+			<xs:enumeration value="url" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="elementType">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="com_(.+)" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="scopeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="default" />
+			<xs:enumeration value="edit" />
+			<xs:enumeration value="help" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="trueFalse">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="true" />
+			<xs:enumeration value="false"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="browserNavType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="_blank" />
+			<xs:enumeration value=""/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="menuType">
+		<xs:sequence>
+			<xs:element type="menuitemType" name="menuitem" maxOccurs="unbounded" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="menuitemType" mixed="true">
+		<xs:sequence>
+			<xs:element type="xs:string" name="params" minOccurs="0" maxOccurs="1"/>
+			<xs:element type="menuitemType" name="menuitem" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute type="typeType" name="type" use="required"/>
+		<xs:attribute type="xs:string" name="title" use="optional"/>
+		<xs:attribute type="xs:string" name="link" use="optional"/>
+		<xs:attribute type="xs:string" name="class" use="optional"/>
+		<xs:attribute type="elementType" name="element" use="optional"/>
+		<xs:attribute type="trueFalse" name="hidden" use="optional" default="false"/>
+		<xs:attribute type="xs:string" name="sql_select" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_from" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_where" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_order" use="optional"/>
+		<xs:attribute type="browserNavType" name="target" use="optional" default=""/>
+		<xs:attribute type="scopeType" name="scope" use="optional" default="default"/>
+	</xs:complexType>
+</xs:schema>
diff --git a/administrator/components/com_menus/presets/modern.xml b/administrator/components/com_menus/presets/modern.xml
new file mode 100644
index 0000000000000..3c56af59b54af
--- /dev/null
+++ b/administrator/components/com_menus/presets/modern.xml
@@ -0,0 +1,585 @@
+<?xml version="1.0"?>
+<menu
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="urn:joomla.org"
+	xsi:schemaLocation="urn:joomla.org menu.xsd">
+	<menuitem
+		title="MOD_MENU_SYSTEM"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_CONTROL_PANEL"
+			link="index.php"
+			element="com_cpanel"
+			class="class:cpanel"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_CONFIGURATION"
+			type="component"
+			element="com_config"
+			link="index.php?option=com_config"
+			class="class:config"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_GLOBAL_CHECKIN"
+			type="component"
+			element="com_checkin"
+			link="index.php?option=com_checkin"
+			class="class:checkin"
+		/>
+		<menuitem
+			title="MOD_MENU_CLEAR_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache"
+			class="class:clear"
+		/>
+		<menuitem
+			title="MOD_MENU_PURGE_EXPIRED_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache&amp;view=purge"
+			class="class:purge"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_SYSTEM_INFORMATION"
+			type="component"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=sysinfo"
+			class="class:info"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_USERS_USERS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_USERS_USER_MANAGER"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=users"
+			class="class:user">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_USER"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=user.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_GROUPS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=groups"
+			class="class:groups">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_GROUP"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=group.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_LEVELS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=levels"
+			class="class:levels">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_LEVEL"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=level.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTES"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=notes"
+			class="class:user-note">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_NOTE"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=note.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTE_CATEGORIES"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_users"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_users"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_users.user"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_users.user"
+			class="class:category"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MASS_MAIL_USERS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=mail"
+			class="class:massmail"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_MENUS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_MENU_MANAGER"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=menus"
+			class="class:menumgr">
+			<menuitem
+				title="MOD_MENU_MENU_MANAGER_NEW_MENU"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=menu&amp;layout=edit"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MENUS_ALL_ITEMS"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=items&amp;menutype="
+			class="class:allmenu"
+		/>
+		<!--
+		Following is an example of repeatable group based on simple database query.
+		This requires sql_* attributes (sql_select and sql_from are required)
+		The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
+		The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
+		-->
+		<menuitem
+			type="separator"
+			title="JSITE"
+			hidden="false"
+			sql_select="title, menutype"
+			sql_from="#__menu_types"
+			sql_where="client_id = 0"
+			sql_order="title ASC">
+			<menuitem
+				title="{sql:title}"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+		<menuitem
+			type="separator"
+			title="JADMINISTRATOR"
+			hidden="false"
+			sql_select="title, menutype"
+			sql_from="#__menu_types"
+			sql_where="client_id = 1"
+			sql_order="title ASC">
+			<menuitem
+				title="{sql:title}"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_CONTENT"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content"
+			class="class:article">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+				type="component"
+				element="com_content"
+				link="index.php?option=com_content&amp;task=article.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;extension=com_content"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_content"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_content.article"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_content.article"
+			class="class:category"
+		/>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_FEATURED"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content&amp;view=featured"
+			class="class:featured"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MEDIA_MANAGER"
+			type="component"
+			element="com_media"
+			link="index.php?option=com_media"
+			class="class:media"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COMPONENTS"
+		type="container"
+	>
+		<params><![CDATA[{"hideitems":["com_joomlaupdate","com_postinstall"]}]]></params>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_EXTENSIONS_EXTENSION_MANAGER"
+		type="heading"
+	>
+		<menuitem
+			title="COM_JOOMLAUPDATE"
+			type="component"
+			element="com_joomlaupdate"
+			link="index.php?option=com_joomlaupdate"
+			class="class:component"
+		/>
+		<menuitem
+			title="COM_POSTINSTALL"
+			type="component"
+			element="com_postinstall"
+			link="index.php?option=com_postinstall"
+			class="class:component"
+		/>
+		<menuitem
+			title="MOD_MENU_SYSTEM"
+			type="component"
+			element="com_installer"
+			link="index.php?option=com_installer&amp;view=database"
+			class="class:install">
+
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DATABASE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=database"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_WARNINGS"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=warnings"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATESITES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=updatesites"
+				class="class:install"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_EXTENSIONS"
+			type="component"
+			element="com_installer"
+			link="index.php?option=com_installer"
+			class="class:install">
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_INSTALL"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=update"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_MANAGE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=manage"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DISCOVER"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=discover"
+				class="class:install"
+			/>
+			<menuitem
+				type="separator"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_LANGUAGES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=languages"
+				class="class:install"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER"
+			type="component"
+			element="com_modules"
+			link="index.php?option=com_modules"
+			class="class:module"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_PLUGIN_MANAGER"
+			type="component"
+			element="com_plugins"
+			link="index.php?option=com_plugins"
+			class="class:plugin"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER"
+			type="component"
+			element="com_templates"
+			link="index.php?option=com_templates"
+			class="class:themes">
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=styles"
+				class="class:themes"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=templates"
+				class="class:themes"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER"
+			type="component"
+			element="com_languages"
+			link="index.php?option=com_languages"
+			class="class:language">
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=installed"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=languages"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=overrides"
+				class="class:language"
+			/>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_HELP"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_HELP_JOOMLA"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=help"
+			class="class:help"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM"
+			link="https://forum.joomla.org"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM"
+			link="index.php?option=com_admin&amp;view=help&amp;layout=langforum"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DOCUMENTATION"
+			link="https://docs.joomla.org"
+			class="class:help-docs"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_EXTENSIONS"
+			link="https://extensions.joomla.org"
+			class="class:help-jed"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_TRANSLATIONS"
+			link="https://community.joomla.org/translations.html"
+			class="class:help-trans"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_RESOURCES"
+			link="https://resources.joomla.org"
+			class="class:help-jrd"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_COMMUNITY"
+			link="https://community.joomla.org"
+			class="class:help-community"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SECURITY"
+			link="https://developer.joomla.org/security-centre.html"
+			class="class:help-security"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DEVELOPER"
+			link="https://developer.joomla.org"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_XCHANGE"
+			link="https://joomla.stackexchange.com"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SHOP"
+			link="https://community.joomla.org/the-joomla-shop.html"
+			class="class:help-shop"
+			scope="help"
+		/>
+	</menuitem>
+</menu>
diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.php b/administrator/components/com_menus/views/menu/tmpl/edit.php
index 80d88e941df71..fee122017ff74 100644
--- a/administrator/components/com_menus/views/menu/tmpl/edit.php
+++ b/administrator/components/com_menus/views/menu/tmpl/edit.php
@@ -37,30 +37,17 @@
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
 
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_MENUS_MENU_DETAILS')); ?>
-			<div class="control-group">
-				<div class="control-label">
-					<?php echo $this->form->getLabel('menutype'); ?>
-				</div>
-				<div class="controls">
-					<?php echo $this->form->getInput('menutype'); ?>
-				</div>
-			</div>
-			<div class="control-group">
-				<div class="control-label">
-					<?php echo $this->form->getLabel('description'); ?>
-				</div>
-				<div class="controls">
-					<?php echo $this->form->getInput('description'); ?>
-				</div>
-			</div>
-			<div class="control-group">
-				<div class="control-label">
-					<?php echo $this->form->getLabel('client_id'); ?>
-				</div>
-				<div class="controls">
-					<?php echo $this->form->getInput('client_id'); ?>
-				</div>
-			</div>
+
+			<?php
+			echo $this->form->renderField('menutype');
+
+			echo $this->form->renderField('description');
+
+			echo $this->form->renderField('client_id');
+
+			echo $this->form->renderField('preset');
+			?>
+
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 			<?php if ($this->canDo->get('core.admin')) : ?>
@@ -73,6 +60,5 @@
 		<input type="hidden" name="task" value="" />
 		<?php echo JHtml::_('form.token'); ?>
 
-
 	</div>
 </form>
diff --git a/administrator/components/com_menus/views/menu/view.xml.php b/administrator/components/com_menus/views/menu/view.xml.php
new file mode 100644
index 0000000000000..6701d75af38a1
--- /dev/null
+++ b/administrator/components/com_menus/views/menu/view.xml.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Menu\MenuHelper;
+
+/**
+ * The HTML Menus Menu Item View.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class MenusViewMenu extends JViewLegacy
+{
+	/**
+	 * @var  stdClass[]
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $items;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function display($tpl = null)
+	{
+		$app      = JFactory::getApplication();
+		$menutype = $app->input->getCmd('menutype');
+
+		if ($menutype)
+		{
+			$items = MenusHelper::getMenuItems($menutype, true);
+		}
+
+		if (empty($items))
+		{
+			JLog::add(JText::_('COM_MENUS_SELECT_MENU_FIRST_EXPORT'), JLog::WARNING, 'jerror');
+
+			$app->redirect(JRoute::_('index.php?option=com_menus&view=menus', false));
+
+			return;
+		}
+
+		$this->items = MenuHelper::createLevels($items);
+
+		$xml = new SimpleXMLElement('<menu ' .
+			'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
+			'xmlns="urn:joomla.org"	xsi:schemaLocation="urn:joomla.org menu.xsd"' .
+			'></menu>'
+		);
+
+		foreach ($this->items as $item)
+		{
+			$this->addXmlChild($xml, $item);
+		}
+
+		if (headers_sent($file, $line))
+		{
+			JLog::add("Headers already sent at $file:$line.", JLog::ERROR, 'jerror');
+
+			return;
+		}
+
+		header('content-type: application/xml');
+		header('content-disposition: attachment; filename="' . $menutype . '.xml"');
+		header("Cache-Control: no-cache, must-revalidate");
+		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+		header('Pragma: private');
+
+		$dom = new DOMDocument;
+		$dom->preserveWhiteSpace = true;
+		$dom->formatOutput = true;
+		$dom->loadXML($xml->asXML());
+
+		echo $dom->saveXML();
+
+		$app->close();
+	}
+
+	/**
+	 * Add a child node to the xml
+	 *
+	 * @param   SimpleXMLElement  $xml   The current XML node which would become the parent to the new node
+	 * @param   stdClass          $item  The menuitem object to create the child XML node from
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function addXmlChild($xml, $item)
+	{
+		$node = $xml->addChild('menuitem');
+
+		$node['type'] = $item->type;
+
+		if ($item->title)
+		{
+			$node['title'] = $item->title;
+		}
+
+		if ($item->link)
+		{
+			$node['link'] = $item->link;
+		}
+
+		if ($item->element)
+		{
+			$node['element'] = $item->element;
+		}
+
+		if ($item->class)
+		{
+			$node['class'] = $item->class;
+		}
+
+		if ($item->access)
+		{
+			$node['access'] = $item->access;
+		}
+
+		if ($item->browserNav)
+		{
+			$node['target'] = '_blank';
+		}
+
+		if (count($item->params))
+		{
+			$hideitems = $item->params->get('hideitems');
+
+			if (count($hideitems))
+			{
+				$db    = JFactory::getDbo();
+				$query = $db->getQuery(true);
+
+				$query->select('e.element')->from('#__extensions e')
+					->join('inner', '#__menu m ON m.component_id = e.extension_id')
+					->where('m.id IN (' . implode(', ', $db->quote($hideitems)) . ')');
+
+				$hideitems = $db->setQuery($query)->loadColumn();
+
+				$item->params->set('hideitems', $hideitems);
+			}
+
+			$node->addChild('params', (string) $item->params);
+		}
+
+		foreach ($item->submenu as $sub)
+		{
+			$this->addXmlChild($node, $sub);
+		}
+	}
+}
diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php
index 49b8e661ba9ca..3fcd852f176ee 100644
--- a/administrator/components/com_menus/views/menus/tmpl/default.php
+++ b/administrator/components/com_menus/views/menus/tmpl/default.php
@@ -41,6 +41,16 @@
 $script[] = '		},1000);';
 $script[] = '	});';
 $script[] = '});';
+$script[] = '
+	(function (originalFn) {
+		Joomla.submitform = function(task, form) {
+		 	originalFn(task, form);
+		 	if (task == "menu.exportXml") {
+		 		document.adminForm.task.value = "";
+		 	}
+		};
+	})(Joomla.submitform);
+';
 
 JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
 ?>
diff --git a/administrator/components/com_menus/views/menus/view.html.php b/administrator/components/com_menus/views/menus/view.html.php
index 39b74c1ab86a1..4bc2505c440ac 100644
--- a/administrator/components/com_menus/views/menus/view.html.php
+++ b/administrator/components/com_menus/views/menus/view.html.php
@@ -102,6 +102,11 @@ protected function addToolbar()
 
 		JToolbarHelper::custom('menus.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
 
+		if ($canDo->get('core.admin') && $this->state->get('client_id') == 1)
+		{
+			JToolbarHelper::custom('menu.exportXml', 'download', 'download', 'COM_MENUS_MENU_EXPORT_BUTTON', true);
+		}
+
 		if ($canDo->get('core.admin') || $canDo->get('core.options'))
 		{
 			JToolbarHelper::divider();
diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini
index 09c48dddd04ea..cf893d048b7a8 100644
--- a/administrator/language/en-GB/en-GB.com_admin.ini
+++ b/administrator/language/en-GB/en-GB.com_admin.ini
@@ -99,6 +99,7 @@ COM_ADMIN_HELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Global Check-in"
 COM_ADMIN_HELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE="Cache: Clear Expired Cache"
 COM_ADMIN_HELP_SITE_SYSTEM_INFORMATION="System Information"
 COM_ADMIN_HELP_START_HERE="Start Here"
+COM_ADMIN_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511"
 COM_ADMIN_HELP_USERS_ACCESS_LEVELS="Users: Access Levels"
 COM_ADMIN_HELP_USERS_ACCESS_LEVELS_EDIT="Users: Access Levels - New/Edit"
 COM_ADMIN_HELP_USERS_DEBUG_USER="Users: Debug Users Permissions"
diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index 46bd9604113c4..1e3fb8220043f 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -32,6 +32,8 @@ COM_MENUS_EXTENSION_UNPUBLISHED_DISABLED="Component disabled and menu item unpub
 COM_MENUS_EXTENSION_UNPUBLISHED_ENABLED="Component enabled and menu item unpublished."
 COM_MENUS_FIELD_FEEDLINK_DESC="Display a feed link for this menu item."
 COM_MENUS_FIELD_FEEDLINK_LABEL="Feed link"
+COM_MENUS_FIELD_PRESET_LABEL="Import a preset"
+COM_MENUS_FIELD_PRESET_DESC="Select a preset if you want to populate this menu with the menu items in that preset. Otherwise leave this empty."
 COM_MENUS_FIELD_VALUE_IGNORE="Ignore"
 COM_MENUS_FIELD_VALUE_NEW_WITH_NAV="New Window With Navigation"
 COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV="New Without Navigation"
@@ -155,6 +157,7 @@ COM_MENUS_MENU_CLIENT_ID_DESC="Select if this Menu is to be used in the Site or
 COM_MENUS_MENU_CONFIRM_DELETE="Are you sure you want to delete these menus? Confirming will delete the selected menu types, all their menu items and the associated menu modules."
 COM_MENUS_MENU_DESCRIPTION_DESC="A description about the purpose of the menu."
 COM_MENUS_MENU_DETAILS="Menu Details"
+COM_MENUS_MENU_EXPORT_BUTTON="Download as Preset"
 COM_MENUS_MENU_ITEM_SAVE_SUCCESS="Menu item saved."
 COM_MENUS_MENU_MENUTYPE_DESC="The system name of the menu."
 COM_MENUS_MENU_MENUTYPE_LABEL="Menu Type"
@@ -192,12 +195,16 @@ COM_MENUS_NO_MENUS_SELECTED="No menu selected."
 COM_MENUS_OPTION_SELECT_COMPONENT="- Select Component -"
 COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -"
 COM_MENUS_PAGE_OPTIONS_LABEL="Page Display"
+COM_MENUS_PRESET_IMPORT_SUCCESS="Menu was saved and the menu items was imported from the selected preset."
+COM_MENUS_PRESET_IMPORT_FAILED="Menu was saved but failed to import the preset: %s"
+COM_MENUS_PRESET_LOAD_FAILED="Failed to load the specified preset."
 COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings"
 COM_MENUS_SAVE_SUCCESS="Menu item saved."
 COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item"
 COM_MENUS_SELECT_MENU="- Select Menu -"
 COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED="Filter the list by a state other than trashed or clear the filter."
 COM_MENUS_SELECT_MENU_FIRST="To use batch processing, please first select a Menu in the manager."
+COM_MENUS_SELECT_MENU_FIRST_EXPORT="To use export, please first select a valid Menu in the manager."
 COM_MENUS_SUBMENU_ITEMS="Menu Items"
 COM_MENUS_SUBMENU_MENUS="Menus"
 COM_MENUS_SUCCESS_REORDERED="Menu item reordered."
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 908f3539ac147..7ed279b570715 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -675,6 +675,9 @@ JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
 JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
 JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."
 
+JLIB_MENUS_PRESET_JOOMLA="Preset - Joomla"
+JLIB_MENUS_PRESET_MODERN="Preset - Modern"
+
 JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published."
 
 JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini
index 90675c99d1264..e16ddf74f3595 100644
--- a/administrator/language/en-GB/en-GB.mod_menu.ini
+++ b/administrator/language/en-GB/en-GB.mod_menu.ini
@@ -42,7 +42,9 @@ MOD_MENU_FIELD_FORUMURL_DESC="Enter the URL to a forum other than the default."
 MOD_MENU_FIELD_FORUMURL_LABEL="Custom Support Forum"
 MOD_MENU_FIELD_MENUTYPE_LABEL="Menu to Show"
 MOD_MENU_FIELD_MENUTYPE_DESC="Choose which menu should be rendered with this instance of module."
-MOD_MENU_FIELD_MENUTYPE_OPTION_PREDEFINED="Use System Preset"
+MOD_MENU_FIELD_MENUTYPE_OPTION_PREDEFINED="Use a Preset"
+MOD_MENU_FIELD_PRESET_LABEL="Choose Preset"
+MOD_MENU_FIELD_PRESET_DESC="Choose a preset to use as the backend menu"
 MOD_MENU_FIELD_SHOWHELP="Help Menu"
 MOD_MENU_FIELD_SHOWHELP_DESC="Show or hide the Help menu which includes links to various joomla.org sites useful to users."
 MOD_MENU_FIELD_SHOWNEW="Add New Shortcuts"
@@ -66,7 +68,6 @@ MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum"
 MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum"
 ; The string below will be used if MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE has a value, i.e the # of the specific language forum in https://forum.joomla.org/. Use something like 'Official english forum'.
 MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums"
-MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511"
 MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations"
 MOD_MENU_HELP_XCHANGE="Stack Exchange"
 MOD_MENU_HOME_DEFAULT="Home"
diff --git a/administrator/modules/mod_menu/helper.php b/administrator/modules/mod_menu/helper.php
index 4f62809cc6a00..28d6d527d0df2 100644
--- a/administrator/modules/mod_menu/helper.php
+++ b/administrator/modules/mod_menu/helper.php
@@ -9,9 +9,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\Registry\Registry;
-use Joomla\Utilities\ArrayHelper;
-
 /**
  * Helper for mod_menu
  *
@@ -28,7 +25,7 @@ abstract class ModMenuHelper
 	 */
 	public static function getMenus()
 	{
-		$db = JFactory::getDbo();
+		$db     = JFactory::getDbo();
 
 		// Search for home menu and language if exists
 		$subQuery = $db->getQuery(true)
@@ -55,323 +52,9 @@ public static function getMenus()
 		catch (RuntimeException $e)
 		{
 			$result = array();
-			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('JERROR_LOADING_MENUS', $e->getMessage()), 'error');
 		}
 
 		return $result;
 	}
-
-	/**
-	 * Get a list of the authorised, non-special components to display in the components menu.
-	 *
-	 * @param   boolean  $authCheck    An optional switch to turn off the auth check (to support custom layouts 'grey out' behaviour).
-	 * @param   boolean  $enabledOnly  Whether to load only enabled/published menu items.
-	 * @param   int[]    $exclude      The menu items to exclude from the list
-	 *
-	 * @return  array  A nest array of component objects and submenus
-	 *
-	 * @since   1.6
-	 */
-	public static function getComponents($authCheck = true, $enabledOnly = false, $exclude = array())
-	{
-		$lang   = JFactory::getLanguage();
-		$user   = JFactory::getUser();
-		$db     = JFactory::getDbo();
-		$query  = $db->getQuery(true);
-		$result = array();
-
-		// Prepare the query.
-		$query->select('m.id, m.title, m.alias, m.link, m.parent_id, m.img, e.element, m.menutype')
-			->from('#__menu AS m')
-			->where('m.menutype = ' . $db->q('main'))
-			->where('m.client_id = 1')
-			->where('m.id > 1');
-
-		if ($enabledOnly)
-		{
-			$query->where('m.published = 1');
-		}
-
-		if (count($exclude))
-		{
-			$query->where('m.id NOT IN (' . implode(', ', array_map('intval', $exclude)) . ')');
-			$query->where('m.parent_id NOT IN (' . implode(', ', array_map('intval', $exclude)) . ')');
-		}
-
-		// Filter on the enabled states.
-		$query->join('INNER', '#__extensions AS e ON m.component_id = e.extension_id')
-			->where('e.enabled = 1');
-
-		// Order by lft.
-		$query->order('m.lft');
-
-		$db->setQuery($query);
-
-		// Component list
-		try
-		{
-			$components = $db->loadObjectList();
-		}
-		catch (RuntimeException $e)
-		{
-			$components = array();
-			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
-		}
-
-		// Parse the list of extensions.
-		foreach ($components as &$component)
-		{
-			// Trim the menu link.
-			$component->link = trim($component->link);
-
-			if ($component->parent_id == 1)
-			{
-				// Only add this top level if it is authorised and enabled.
-				if ($authCheck == false || ($authCheck && $user->authorise('core.manage', $component->element)))
-				{
-					// Root level.
-					$result[$component->id] = $component;
-
-					if (!isset($result[$component->id]->submenu))
-					{
-						$result[$component->id]->submenu = array();
-					}
-
-					// If the root menu link is empty, add it in.
-					if (empty($component->link))
-					{
-						$component->link = 'index.php?option=' . $component->element;
-					}
-
-					if (!empty($component->element))
-					{
-						// Load the core file then
-						// Load extension-local file.
-						$lang->load($component->element . '.sys', JPATH_BASE, null, false, true)
-						|| $lang->load($component->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $component->element, null, false, true);
-					}
-
-					$component->text = JText::_(strtoupper($component->title));
-				}
-			}
-			// Sub-menu level.
-			// Add the submenu link if it is defined.
-			elseif (isset($result[$component->parent_id]) && isset($result[$component->parent_id]->submenu) && !empty($component->link))
-			{
-				$component->text = JText::_(strtoupper($component->title));
-
-				$result[$component->parent_id]->submenu[] = &$component;
-			}
-		}
-
-		return ArrayHelper::sortObjects($result, 'text', 1, false, true);
-	}
-
-	/**
-	 * Load the menu items from database for the given menutype
-	 *
-	 * @param   string  $menutype  The selected menu type
-	 *
-	 * @return  array
-	 *
-	 * @since   3.7.0
-	 */
-	public static function getMenuItems($menutype)
-	{
-		$db    = JFactory::getDbo();
-		$query = $db->getQuery(true);
-
-		// Prepare the query.
-		$query->select('m.*')
-			->from('#__menu AS m')
-			->where('m.menutype = ' . $db->q($menutype))
-			->where('m.client_id = 1')
-			->where('m.published = 1')
-			->where('m.id > 1');
-
-		// Filter on the enabled states.
-		$query->select('e.element')
-			->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
-			->where('(e.enabled = 1 OR e.enabled IS NULL)');
-
-		// Order by lft.
-		$query->order('m.lft');
-
-		$db->setQuery($query);
-
-		// Component list
-		try
-		{
-			$menuItems = $db->loadObjectList();
-
-			foreach ($menuItems as &$menuitem)
-			{
-				$menuitem->params = new Registry($menuitem->params);
-			}
-		}
-		catch (RuntimeException $e)
-		{
-			$menuItems = array();
-			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
-		}
-
-		return $menuItems;
-	}
-
-	/**
-	 * Parse the list of extensions.
-	 *
-	 * @param   array  $menuItems  List of loaded components
-	 * @param   bool   $authCheck  An optional switch to turn off the auth check (to support custom layouts 'grey out' behaviour).
-	 *
-	 * @return  array
-	 *
-	 * @since   3.7.0
-	 */
-	public static function parseItems($menuItems, $authCheck = true)
-	{
-		$result = array();
-		$user   = JFactory::getUser();
-		$lang   = JFactory::getLanguage();
-		$levels = $user->getAuthorisedViewLevels();
-
-		// Process each item
-		foreach ($menuItems as $i => &$menuitem)
-		{
-			/*
-			 * Exclude item with menu item option set to exclude from menu modules
-			 * Exclude item if the component is not authorised
-			 * Exclude item if menu item set access level is not met
-			 */
-			if (($menuitem->params->get('menu_show', 1) == 0)
-				|| ($menuitem->element && $authCheck && !$user->authorise('core.manage', $menuitem->element))
-				|| ($menuitem->access && !in_array($menuitem->access, $levels)))
-			{
-				continue;
-			}
-
-			// Evaluate link url
-			switch ($menuitem->type)
-			{
-				case 'url':
-				case 'component':
-					$menuitem->link = trim($menuitem->link);
-					break;
-				case 'separator':
-				case 'heading':
-				case 'container':
-					$menuitem->link = '#';
-					break;
-				case 'alias':
-					$aliasTo        = $menuitem->params->get('aliasoptions');
-					$menuitem->link = static::getLink($aliasTo);
-					break;
-				default:
-			}
-
-			if ($menuitem->link == '')
-			{
-				continue;
-			}
-
-			// Translate Menu item label, if needed
-			if (!empty($menuitem->element))
-			{
-				$lang->load($menuitem->element . '.sys', JPATH_BASE, null, false, true)
-				|| $lang->load($menuitem->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $menuitem->element, null, false, true);
-			}
-
-			$menuitem->text    = $lang->hasKey($menuitem->title) ? JText::_($menuitem->title) : $menuitem->title;
-			$menuitem->submenu = array();
-
-			$result[$menuitem->parent_id][$menuitem->id] = $menuitem;
-		}
-
-		// Do an early exit if there are no top level menu items.
-		if (!isset($result[1]))
-		{
-			return array();
-		}
-
-		// Put the items under respective parent menu items.
-		foreach ($result as $parentId => &$mItems)
-		{
-			foreach ($mItems as &$mItem)
-			{
-				if (isset($result[$mItem->id]))
-				{
-					static::cleanup($result[$mItem->id]);
-
-					$mItem->submenu = &$result[$mItem->id];
-				}
-			}
-		}
-
-		// Return only top level items
-		return $result[1];
-	}
-
-	/**
-	 * Method to get a link to the aliased menu item
-	 *
-	 * @param   int  $menuId  The record id of the referencing menu item
-	 *
-	 * @return  string
-	 *
-	 * @since   3.7.0
-	 */
-	protected static function getLink($menuId)
-	{
-		$table = JTable::getInstance('Menu');
-		$table->load($menuId);
-
-		// Look for an alias-to-alias
-		if ($table->type == 'alias')
-		{
-			$params  = new Registry($table->params);
-			$aliasTo = $params->get('aliasoptions');
-
-			return static::getLink($aliasTo);
-		}
-
-		return $table->link;
-	}
-
-	/**
-	 * Method to cleanup the menu items for repeated, leading or trailing separators in a given menu level
-	 *
-	 * @param   array  &$items  The list of menu items in the selected level
-	 *
-	 * @return  void
-	 *
-	 * @since   3.7.0
-	 */
-	protected static function cleanup(&$items)
-	{
-		$b = true;
-
-		foreach ($items as $k => &$item)
-		{
-			if ($item->type == 'separator')
-			{
-				if ($b)
-				{
-					$item = false;
-				}
-
-				$b = true;
-			}
-			else
-			{
-				$b = false;
-			}
-		}
-
-		if ($b)
-		{
-			$item = false;
-		}
-
-		$items = array_filter($items);
-	}
 }
diff --git a/administrator/modules/mod_menu/menu.php b/administrator/modules/mod_menu/menu.php
index ca2095d9a1dc3..958df090eaa4e 100644
--- a/administrator/modules/mod_menu/menu.php
+++ b/administrator/modules/mod_menu/menu.php
@@ -9,6 +9,9 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Menu\Node;
+use Joomla\CMS\Menu\Tree;
+use Joomla\CMS\Menu\MenuHelper;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -20,679 +23,385 @@
 class JAdminCssMenu
 {
 	/**
-	 * CSS string to add to document head
+	 * The Menu tree object
 	 *
-	 * @var  string
-	 */
-	protected $_css = null;
-
-	/**
-	 * Root node
+	 * @var   Tree
 	 *
-	 * @var  object
+	 * @since   __DEPLOY_VERSION__
 	 */
-	protected $_root = null;
+	protected $tree;
 
 	/**
-	 * Current working node
+	 * The module options
 	 *
-	 * @var  object
+	 * @var   Registry
+	 *
+	 * @since   _DEPLOY_VERSION__
 	 */
-	protected $_current = null;
+	protected $params;
 
 	/**
-	 * Constructor
+	 * The menu bar state
+	 *
+	 * @var   bool
+	 *
+	 * @since   _DEPLOY_VERSION__
 	 */
-	public function __construct()
-	{
-		$this->_root    = new JMenuNode('ROOT');
-		$this->_current = &$this->_root;
-	}
+	protected $enabled;
 
 	/**
-	 * Method to add a child
+	 * Get the current menu tree
 	 *
-	 * @param   JMenuNode  $node        The node to process
-	 * @param   boolean    $setCurrent  True to set as current working node
+	 * @return  Tree
 	 *
-	 * @return  void
+	 * @since   __DEPLOY_VERSION__
 	 */
-	public function addChild(JMenuNode $node, $setCurrent = false)
+	public function getTree()
 	{
-		$this->_current->addChild($node);
-
-		if ($setCurrent)
+		if (!$this->tree)
 		{
-			$this->_current = &$node;
+			$this->tree = new Tree;
 		}
-	}
 
-	/**
-	 * Method to get the parent
-	 *
-	 * @return  void
-	 */
-	public function getParent()
-	{
-		$this->_current = &$this->_current->getParent();
+		return $this->tree;
 	}
 
 	/**
-	 * Method to get the parent
+	 * Populate the menu items in the menu tree object
 	 *
-	 * @param   bool  $clear  Whether to clear the existing menu items or just reset the pointer to root element
+	 * @param   Registry  $params   Menu configuration parameters
+	 * @param   bool      $enabled  Whether the menu should be enabled or disabled
 	 *
 	 * @return  void
+	 *
+	 * @since   3.7.0
 	 */
-	public function reset($clear = false)
+	public function load($params, $enabled)
 	{
-		if ($clear)
+		$this->tree    = $this->getTree();
+		$this->params  = $params;
+		$this->enabled = $enabled;
+		$menutype      = $this->params->get('menutype', '*');
+
+		if ($menutype == '*')
 		{
-			$this->_root = new JMenuNode('ROOT');
+			$name   = $this->params->get('preset', 'joomla');
+			$levels = MenuHelper::loadPreset($name);
 		}
+		else
+		{
+			$items = MenusHelper::getMenuItems($menutype, true);
 
-		$this->_current = &$this->_root;
-	}
+			if ($this->enabled && $this->params->get('check'))
+			{
+				if ($this->check($items, $this->params))
+				{
+					$this->params->set('recovery', true);
 
-	/**
-	 * Method to add a separator node
-	 *
-	 * @param   string  $title  The separator label text. A dash "-" can be used to use a horizontal bar instead of text label.
-	 *
-	 * @return  void
-	 */
-	public function addSeparator($title = null)
-	{
-		if ($title == '-' || $title == '')
-		{
-			$title = null;
+					// In recovery mode, load the preset inside a special root node.
+					$this->tree->addChild(new Node\Heading('MOD_MENU_RECOVERY_MENU_ROOT'), true);
+
+					$levels = MenuHelper::loadPreset('joomla');
+					$levels = $this->preprocess($levels);
+
+					$this->populateTree($levels);
+
+					$this->tree->addChild(new Node\Separator);
+
+					// Add link to exit recovery mode
+					$uri = clone JUri::getInstance();
+					$uri->setVar('recover_menu', 0);
+
+					$this->tree->addChild(new Node\Url('MOD_MENU_RECOVERY_EXIT', $uri->toString()));
+
+					$this->tree->getParent();
+				}
+			}
+
+			$levels = MenuHelper::createLevels($items);
 		}
 
-		$this->addChild(new JMenuNode($title, null, 'separator', false));
+		$levels = $this->preprocess($levels);
+
+		$this->populateTree($levels);
 	}
 
 	/**
-	 * Method to render the menu
+	 * Method to render a given level of a menu using provided layout file
 	 *
-	 * @param   string  $id     The id of the menu to be rendered
-	 * @param   string  $class  The class of the menu to be rendered
+	 * @param   string  $layoutFile  The layout file to be used to render
 	 *
 	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
-	public function renderMenu($id = 'menu', $class = '')
+	public function renderSubmenu($layoutFile)
 	{
-		$depth = 1;
-
-		if (!empty($id))
+		if (is_file($layoutFile))
 		{
-			$id = 'id="' . $id . '"';
-		}
+			$children = $this->tree->getCurrent()->getChildren();
 
-		if (!empty($class))
-		{
-			$class = 'class="' . $class . '"';
-		}
-
-		// Recurse through children if they exist
-		while ($this->_current->hasChildren())
-		{
-			echo '<ul ' . $id . ' ' . $class . ">\n";
-
-			foreach ($this->_current->getChildren() as $child)
+			foreach ($children as $child)
 			{
-				$this->_current = & $child;
-				$this->renderLevel($depth++);
-			}
+				$this->tree->setCurrent($child);
 
-			echo "</ul>\n";
-
-			echo '<ul id="nav-empty" class="dropdown-menu nav-empty hidden-phone"></ul>';
-		}
-
-		if ($this->_css)
-		{
-			// Add style to document head
-			JFactory::getDocument()->addStyleDeclaration($this->_css);
+				// This sets the scope to this object for the layout file and also isolates other `include`s
+				require $layoutFile;
+			}
 		}
 	}
 
 	/**
-	 * Method to render a given level of a menu
+	 * Check the flat list of menu items for important links
 	 *
-	 * @param   integer  $depth  The level of the menu to be rendered
+	 * @param   array     $items   The menu items array
+	 * @param   Registry  $params  Module options
 	 *
-	 * @return  void
+	 * @return  bool  Whether to show recovery menu
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
-	public function renderLevel($depth)
+	protected function check($items, Registry $params)
 	{
-		// Build the CSS class suffix
-		$class = '';
+		$me          = JFactory::getUser();
+		$authMenus   = $me->authorise('core.manage', 'com_menus');
+		$authModules = $me->authorise('core.manage', 'com_modules');
 
-		if ($this->_current->hasChildren())
+		if (!$authMenus && !$authModules)
 		{
-			$class = ' class="dropdown"';
+			return false;
 		}
 
-		if ($this->_current->class == 'separator')
-		{
-			$class = $this->_current->title ? ' class="menuitem-group"' : ' class="divider"';
-		}
+		$app        = JFactory::getApplication();
+		$types      = ArrayHelper::getColumn($items, 'type');
+		$elements   = ArrayHelper::getColumn($items, 'element');
+		$rMenu      = $authMenus && !in_array('com_menus', $elements);
+		$rModule    = $authModules && !in_array('com_modules', $elements);
+		$rContainer = !in_array('container', $types);
 
-		if ($this->_current->hasChildren() && $this->_current->class)
+		if ($rMenu || $rModule || $rContainer)
 		{
-			$class = ' class="dropdown-submenu"';
+			$recovery = $app->getUserStateFromRequest('mod_menu.recovery', 'recover_menu', 0, 'int');
 
-			if ($this->_current->class == 'scrollable-menu')
+			if ($recovery)
 			{
-				$class = ' class="dropdown scrollable-menu"';
+				return true;
 			}
-		}
-
-		if ($this->_current->class == 'disabled')
-		{
-			$class = ' class="disabled"';
-		}
 
-		// Print the item
-		echo '<li' . $class . '>';
+			$missing = array();
 
-		// Print a link if it exists
-		$linkClass     = array();
-		$dataToggle    = '';
-		$dropdownCaret = '';
-
-		if ($this->_current->hasChildren())
-		{
-			$linkClass[] = 'dropdown-toggle';
-			$dataToggle  = ' data-toggle="dropdown"';
-
-			if (!$this->_current->getParent()->hasParent())
+			if ($rMenu)
 			{
-				$dropdownCaret = ' <span class="caret"></span>';
+				$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_MENU_MANAGER');
 			}
-		}
-		else
-		{
-			$linkClass[] = 'no-dropdown';
-		}
-
-		if ($this->_current->link != null && $this->_current->getParent()->title != 'ROOT')
-		{
-			$iconClass = $this->getIconClass($this->_current->class);
 
-			if (!empty($iconClass))
+			if ($rModule)
 			{
-				$linkClass[] = $iconClass;
+				$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_MODULE_MANAGER');
 			}
-		}
-
-		// Implode out $linkClass for rendering
-		$linkClass = ' class="' . implode(' ', $linkClass) . '"';
-
-		if ($this->_current->link != null && $this->_current->target != null)
-		{
-			echo '<a' . $linkClass . ' ' . $dataToggle . ' href="' . $this->_current->link . '" target="' . $this->_current->target . '">'
-				. $this->_current->title . $dropdownCaret . '</a>';
-		}
-		elseif ($this->_current->link != null && $this->_current->target == null)
-		{
-			echo '<a' . $linkClass . ' ' . $dataToggle . ' href="' . $this->_current->link . '">' . $this->_current->title . $dropdownCaret . '</a>';
-		}
-		elseif ($this->_current->title != null && $this->_current->class != 'separator')
-		{
-			echo '<a' . $linkClass . ' ' . $dataToggle . '>' . $this->_current->title . $dropdownCaret . '</a>';
-		}
-		else
-		{
-			echo '<span>' . $this->_current->title . '</span>';
-		}
 
-		// Recurse through children if they exist
-		while ($this->_current->hasChildren())
-		{
-			if ($this->_current->class)
+			if ($rContainer)
 			{
-				$id = '';
+				$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_COMPONENTS_CONTAINER');
+			}
 
-				if (!empty($this->_current->id))
-				{
-					$id = ' id="menu-' . strtolower($this->_current->id) . '"';
-				}
+			$uri = clone JUri::getInstance();
+			$uri->setVar('recover_menu', 1);
 
-				echo '<ul' . $id . ' class="dropdown-menu menu-scrollable">' . "\n";
-			}
-			else
-			{
-				echo '<ul class="dropdown-menu scroll-menu">' . "\n";
-			}
+			$table    = JTable::getInstance('MenuType');
+			$menutype = $params->get('menutype');
 
-			foreach ($this->_current->getChildren() as $child)
-			{
-				$this->_current = & $child;
-				$this->renderLevel($depth++);
-			}
+			$table->load(array('menutype' => $menutype));
 
-			echo "</ul>\n";
+			$menutype = $table->get('title', $menutype);
+			$message  = JText::sprintf('MOD_MENU_IMPORTANT_ITEMS_INACCESSIBLE_LIST_WARNING', $menutype, implode(', ', $missing), $uri);
+
+			$app->enqueueMessage($message, 'warning');
 		}
 
-		echo "</li>\n";
+		return false;
 	}
 
 	/**
-	 * Method to get the CSS class name for an icon identifier or create one if
-	 * a custom image path is passed as the identifier
+	 * Filter and perform other preparatory tasks for loaded menu items based on access rights and module configurations for display
 	 *
-	 * @param   string  $identifier  Icon identification string
+	 * @param   \stdClass[]  $items  The levelled array of menu item objects
 	 *
-	 * @return  string	CSS class name
+	 * @return  array
 	 *
-	 * @since   1.5
+	 * @since   __DEPLOY_VERSION__
 	 */
-	public function getIconClass($identifier)
+	protected function preprocess($items)
 	{
-		static $classes;
+		$result     = array();
+		$user       = JFactory::getUser();
+		$authLevels = $user->getAuthorisedViewLevels();
+		$language   = JFactory::getLanguage();
 
-		// Initialise the known classes array if it does not exist
-		if (!is_array($classes))
-		{
-			$classes = array();
-		}
+		$noSeparator = true;
 
-		/*
-		 * If we don't already know about the class... build it and mark it
-		 * known so we don't have to build it again
-		 */
-		if (!isset($classes[$identifier]))
+		foreach ($items as $i => &$item)
 		{
-			if (substr($identifier, 0, 6) == 'class:')
+			// Exclude item with menu item option set to exclude from menu modules
+			if ($item->params->get('menu_show', 1) == 0)
 			{
-				// We were passed a class name
-				$class = substr($identifier, 6);
-				$classes[$identifier] = "menu-$class";
+				continue;
 			}
-			else
-			{
-				if ($identifier == null)
-				{
-					return null;
-				}
 
-				// Build the CSS class for the icon
-				$class = preg_replace('#\.[^.]*$#', '', basename($identifier));
-				$class = preg_replace('#\.\.[^A-Za-z0-9\.\_\- ]#', '', $class);
+			$item->scope = isset($item->scope) ? $item->scope : 'default';
 
-				$this->_css  .= "\n.menu-$class {\n" .
-						"	background: url($identifier) no-repeat;\n" .
-						"}\n";
+			// Whether this scope can be displayed. Applies only to preset items. Db driven items should use un/published state.
+			if (($item->scope == 'help' && !$this->params->get('showhelp')) || ($item->scope == 'edit' && !$this->params->get('shownew')))
+			{
+				continue;
+			}
 
-				$classes[$identifier] = "menu-$class";
+			// Exclude item if the component is not authorised
+			if ($item->element && !$user->authorise(($item->scope == 'edit') ? 'core.create' : 'core.manage', $item->element))
+			{
+				continue;
 			}
-		}
 
-		return $classes[$identifier];
-	}
+			// Exclude if menu item set access level is not met
+			if ($item->access && !in_array($item->access, $authLevels))
+			{
+				continue;
+			}
 
-	/**
-	 * Populate the menu items in the menu object for disabled state
-	 *
-	 * @param   Registry  $params   Menu configuration parameters
-	 * @param   bool      $enabled  Whether the menu should be enabled or disabled
-	 *
-	 * @return  void
-	 *
-	 * @since   3.7.0
-	 */
-	public function load($params, $enabled)
-	{
-		$menutype = $params->get('menutype', '*');
+			// Exclude if link is invalid
+			if (!in_array($item->type, array('separator', 'heading', 'container')) && trim($item->link) == '')
+			{
+				continue;
+			}
 
-		$this->reset(true);
+			// Process any children if exists
+			$item->submenu = $this->preprocess($item->submenu);
 
-		if ($menutype == '*')
-		{
-			require __DIR__ . '/preset/' . ($enabled ? 'enabled.php' : 'disabled.php');
-		}
-		else
-		{
-			$items = ModMenuHelper::getMenuItems($menutype);
-			$types = ArrayHelper::getColumn($items, 'type');
-			$app   = JFactory::getApplication();
-			$me    = JFactory::getUser();
+			// Populate automatic children for container items
+			if ($item->type == 'container')
+			{
+				$exclude    = (array) $item->params->get('hideitems') ?: array();
+				$components = MenusHelper::getMenuItems('main', false, $exclude);
 
-			$authMenus   = $me->authorise('core.manage', 'com_menus');
-			$authModules = $me->authorise('core.manage', 'com_modules');
+				$item->components = MenuHelper::createLevels($components);
+				$item->components = $this->preprocess($item->components);
+				$item->components = ArrayHelper::sortObjects($item->components, 'text', 1, false, true);
+			}
 
-			if ($enabled && $params->get('check') && ($authMenus || $authModules))
+			// Exclude if there are no child items under heading or container
+			if (in_array($item->type, array('heading', 'container')) && empty($item->submenu) && empty($item->components))
 			{
-				$elements = ArrayHelper::getColumn($items, 'element');
-
-				$rMenu      = $authMenus && !in_array('com_menus', $elements);
-				$rModule    = $authModules && !in_array('com_modules', $elements);
-				$rContainer = !in_array('container', $types);
+				continue;
+			}
 
-				if ($rMenu || $rModule || $rContainer)
+			// Remove repeated and edge positioned separators, It is important to put this check at the end of any logical filtering.
+			if ($item->type == 'separator')
+			{
+				if ($noSeparator)
 				{
-					$recovery = $app->getUserStateFromRequest('mod_menu.recovery', 'recover_menu', 0, 'int');
-
-					if ($recovery)
-					{
-						$params->set('recovery', true);
-
-						// In recovery mode, load the preset inside a special root node.
-						$this->addChild(new JMenuNode(JText::_('MOD_MENU_RECOVERY_MENU_ROOT'), '#'), true);
-
-						require __DIR__ . '/preset/enabled.php';
-
-						$this->addSeparator();
-
-						$uri = clone JUri::getInstance();
-						$uri->setVar('recover_menu', 0);
-
-						$this->addChild(new JMenuNode(JText::_('MOD_MENU_RECOVERY_EXIT'), $uri->toString()));
-
-						$this->getParent();
-					}
-					else
-					{
-						$missing = array();
-
-						if ($rMenu)
-						{
-							$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_MENU_MANAGER');
-						}
-
-						if ($rModule)
-						{
-							$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_MODULE_MANAGER');
-						}
-
-						if ($rContainer)
-						{
-							$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_COMPONENTS_CONTAINER');
-						}
-
-						$uri = clone JUri::getInstance();
-						$uri->setVar('recover_menu', 1);
-
-						$table = JTable::getInstance('MenuType');
-						$table->load(array('menutype' => $menutype));
-						$mType = $table->get('title', $menutype);
+					continue;
+				}
 
-						$msg = JText::sprintf('MOD_MENU_IMPORTANT_ITEMS_INACCESSIBLE_LIST_WARNING', $mType, implode(', ', $missing), $uri);
+				$noSeparator = true;
+			}
+			else
+			{
+				$noSeparator = false;
+			}
 
-						$app->enqueueMessage($msg, 'warning');
-					}
-				}
+			// Ok we passed everything, load language at last only
+			if ($item->element)
+			{
+				$language->load($item->element . '.sys', JPATH_ADMINISTRATOR, null, false, true) ||
+				$language->load($item->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $item->element, null, false, true);
 			}
 
-			// Create levels
-			$items = ModMenuHelper::parseItems($items);
+			$item->text = JText::_($item->title);
 
-			// Menu items for dynamic db driven setup to load here
-			$this->loadItems($items, $enabled);
+			$result[$i] = $item;
 		}
+
+		// If last one was a separator remove it too.
+		if ($noSeparator && isset($i))
+		{
+			unset($result[$i]);
+		}
+
+		return $result;
 	}
 
 	/**
-	 * Load the menu items from an array
+	 * Load the menu items from a hierarchical list of items into the menu tree
 	 *
-	 * @param   array  $items    Menu items loaded from database
-	 * @param   bool   $enabled  Whether the menu should be enabled or disabled
+	 * @param   stdClass[]  $levels  Menu items as a hierarchical list format
 	 *
 	 * @return  void
 	 *
-	 * @since   3.7.0
+	 * @since   __DEPLOY_VERSION__
 	 */
-	protected function loadItems($items, $enabled = true)
+	protected function populateTree($levels)
 	{
-		foreach ($items as $item)
+		foreach ($levels as $item)
 		{
+			$class = $this->enabled ? $item->class : 'disabled';
+
 			if ($item->type == 'separator')
 			{
-				$this->addSeparator($item->text);
-			}
-			elseif ($item->type == 'heading' && !count($item->submenu))
-			{
-				// Exclude if it is a heading type menu item, and has no children.
+				$this->tree->addChild(new Node\Separator($item->title));
 			}
-			elseif ($item->type == 'container')
+			elseif ($item->type == 'heading')
 			{
-				$exclude    = (array) $item->params->get('hideitems') ?: array();
-				$components = ModMenuHelper::getComponents(true, false, $exclude);
+				// We already excluded heading type menu item with no children.
+				$this->tree->addChild(new Node\Heading($item->title, $class), $this->enabled);
 
-				// Exclude if it is a container type menu item, and has no children.
-				if (count($item->submenu) || count($components))
+				if ($this->enabled)
 				{
-					$this->addChild(new JMenuNode($item->text, $item->link, $item->parent_id == 1 ? null : 'class:'), true);
-
-					if ($enabled)
-					{
-						// Load explicitly assigned child items first.
-						$this->loadItems($item->submenu);
-
-						// Add a separator between dynamic menu items and components menu items
-						if (count($item->submenu) && count($components))
-						{
-							$this->addSeparator($item->text);
-						}
-
-						// Adding component submenu the old way, this assumes 2-level menu only
-						foreach ($components as $component)
-						{
-							if (empty($component->submenu))
-							{
-								$this->addChild(new JMenuNode($component->text, $component->link, $component->img));
-							}
-							else
-							{
-								$this->addChild(new JMenuNode($component->text, $component->link, $component->img), true);
-
-								foreach ($component->submenu as $sub)
-								{
-									$this->addChild(new JMenuNode($sub->text, $sub->link, $sub->img));
-								}
-
-								$this->getParent();
-							}
-						}
-					}
-
-					$this->getParent();
+					$this->populateTree($item->submenu);
+					$this->tree->getParent();
 				}
 			}
-			elseif (!$enabled)
+			elseif ($item->type == 'url')
 			{
-				$this->addChild(new JMenuNode($item->text, $item->link, 'disabled'));
+				$cNode = new Node\Url($item->title, $item->link, $item->browserNav, $class);
+				$this->tree->addChild($cNode, $this->enabled);
+
+				if ($this->enabled)
+				{
+					$this->populateTree($item->submenu);
+					$this->tree->getParent();
+				}
 			}
-			else
+			elseif ($item->type == 'component')
 			{
-				$target = $item->browserNav ? '_blank' : null;
+				$cNode = new Node\Component($item->title, $item->element, $item->link, $item->browserNav, $class);
+				$this->tree->addChild($cNode, $this->enabled);
 
-				$this->addChild(new JMenuNode($item->text, $item->link, $item->parent_id == 1 ? null : 'class:', false, $target), true);
-				$this->loadItems($item->submenu);
-				$this->getParent();
+				if ($this->enabled)
+				{
+					$this->populateTree($item->submenu);
+					$this->tree->getParent();
+				}
 			}
-		}
-	}
-}
-
-/**
- * A Node for JAdminCssMenu
- *
- * @see    JAdminCssMenu
- * @since  1.5
- */
-class JMenuNode
-{
-	/**
-	 * Node Title
-	 *
-	 * @var  string
-	 */
-	public $title = null;
-
-	/**
-	 * Node Id
-	 *
-	 * @var  string
-	 */
-	public $id = null;
-
-	/**
-	 * Node Link
-	 *
-	 * @var  string
-	 */
-	public $link = null;
-
-	/**
-	 * Link Target
-	 *
-	 * @var  string
-	 */
-	public $target = null;
-
-	/**
-	 * CSS Class for node
-	 *
-	 * @var  string
-	 */
-	public $class = null;
-
-	/**
-	 * Active Node?
-	 *
-	 * @var  boolean
-	 */
-	public $active = false;
-
-	/**
-	 * Parent node
-	 *
-	 * @var  JMenuNode
-	 */
-	protected $_parent = null;
-
-	/**
-	 * Array of Children
-	 *
-	 * @var  array
-	 */
-	protected $_children = array();
-
-	/**
-	 * Constructor for the class.
-	 *
-	 * @param   string   $title      The title of the node
-	 * @param   string   $link       The node link
-	 * @param   string   $class      The CSS class for the node
-	 * @param   boolean  $active     True if node is active, false otherwise
-	 * @param   string   $target     The link target
-	 * @param   string   $titleicon  The title icon for the node
-	 */
-	public function __construct($title, $link = null, $class = null, $active = false, $target = null, $titleicon = null)
-	{
-		$this->title  = $titleicon ? $title . $titleicon : $title;
-		$this->link   = JFilterOutput::ampReplace($link);
-		$this->class  = $class;
-		$this->active = $active;
-
-		$this->id = null;
-
-		if (!empty($link) && $link !== '#')
-		{
-			$uri    = new JUri($link);
-			$params = $uri->getQuery(true);
-			$parts  = array();
-
-			foreach ($params as $value)
+			elseif ($item->type == 'container')
 			{
-				$parts[] = str_replace(array('.', '_'), '-', $value);
-			}
+				// We already excluded container type menu item with no children.
+				$this->tree->addChild(new Node\Container($item->title, $item->class), $this->enabled);
 
-			$this->id = implode('-', $parts);
-		}
-
-		$this->target = $target;
-	}
-
-	/**
-	 * Add child to this node
-	 *
-	 * If the child already has a parent, the link is unset
-	 *
-	 * @param   JMenuNode  &$child  The child to be added
-	 *
-	 * @return  void
-	 */
-	public function addChild(JMenuNode &$child)
-	{
-		$child->setParent($this);
-	}
+				if ($this->enabled)
+				{
+					$this->populateTree($item->submenu);
 
-	/**
-	 * Set the parent of a this node
-	 *
-	 * If the node already has a parent, the link is unset
-	 *
-	 * @param   JMenuNode  &$parent  The JMenuNode for parent to be set or null
-	 *
-	 * @return  void
-	 */
-	public function setParent(JMenuNode &$parent = null)
-	{
-		$hash = spl_object_hash($this);
+					// Add a separator between dynamic menu items and components menu items
+					if (count($item->submenu) && count($item->components))
+					{
+						$this->tree->addChild(new Node\Separator);
+					}
 
-		if (!is_null($this->_parent))
-		{
-			unset($this->_parent->_children[$hash]);
-		}
+					$this->populateTree($item->components);
 
-		if (!is_null($parent))
-		{
-			$parent->_children[$hash] = &$this;
+					$this->tree->getParent();
+				}
+			}
 		}
-
-		$this->_parent = &$parent;
-	}
-
-	/**
-	 * Get the children of this node
-	 *
-	 * @return  array  The children
-	 */
-	public function &getChildren()
-	{
-		return $this->_children;
-	}
-
-	/**
-	 * Get the parent of this node
-	 *
-	 * @return  mixed  JMenuNode object with the parent or null for no parent
-	 */
-	public function &getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Test if this node has children
-	 *
-	 * @return  boolean  True if there are children
-	 */
-	public function hasChildren()
-	{
-		return (bool) count($this->_children);
-	}
-
-	/**
-	 * Test if this node has a parent
-	 *
-	 * @return  boolean  True if there is a parent
-	 */
-	public function hasParent()
-	{
-		return $this->getParent() != null;
 	}
 }
diff --git a/administrator/modules/mod_menu/mod_menu.php b/administrator/modules/mod_menu/mod_menu.php
index a625f99b0b11e..85a2a1e419d13 100644
--- a/administrator/modules/mod_menu/mod_menu.php
+++ b/administrator/modules/mod_menu/mod_menu.php
@@ -12,6 +12,7 @@
 use Joomla\Registry\Registry;
 
 // Include the module helper classes.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
 JLoader::register('ModMenuHelper', __DIR__ . '/helper.php');
 JLoader::register('JAdminCssMenu', __DIR__ . '/menu.php');
 
diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml
index 3721d11415ba6..2f896d54aec44 100644
--- a/administrator/modules/mod_menu/mod_menu.xml
+++ b/administrator/modules/mod_menu/mod_menu.xml
@@ -23,7 +23,7 @@
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU" />
 	<config>
 		<fields name="params">
-			<fieldset name="advanced">
+			<fieldset name="basic">
 				<field
 					name="menutype"
 					type="menu"
@@ -33,7 +33,16 @@
 					>
 					<option value="*">MOD_MENU_FIELD_MENUTYPE_OPTION_PREDEFINED</option>
 				</field>
-	
+
+				<field
+					name="preset"
+					type="menuPreset"
+					label="MOD_MENU_FIELD_PRESET_LABEL"
+					description="MOD_MENU_FIELD_PRESET_DESC"
+					addfieldpath="administrator/components/com_menus/models/fields"
+					showon="menutype:*"
+				/>
+
 				<field
 					name="check"
 					type="radio"
@@ -41,26 +50,12 @@
 					description="MOD_MENU_FIELD_CHECK_DESC"
 					class="btn-group btn-group-yesno"
 					default="1"
+					showon="menutype!:*"
 					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
-				<field
-					name="layout"
-					type="modulelayout"
-					label="JFIELD_ALT_LAYOUT_LABEL"
-					description="JFIELD_ALT_MODULE_LAYOUT_DESC" 
-				/>
-
-				<field
-					name="moduleclass_sfx"
-					type="textarea"
-					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
-					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
-					rows="3"
-				/>
-
 				<field
 					name="shownew"
 					type="radio"
@@ -68,6 +63,7 @@
 					description="MOD_MENU_FIELD_SHOWNEW_DESC"
 					class="btn-group btn-group-yesno"
 					default="1"
+					showon="menutype:*"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
@@ -80,10 +76,28 @@
 					description="MOD_MENU_FIELD_SHOWHELP_DESC"
 					class="btn-group btn-group-yesno"
 					default="1"
+					showon="menutype:*"
 					>
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
 
 				<field
 					name="forum_url"
diff --git a/administrator/modules/mod_menu/preset/disabled.php b/administrator/modules/mod_menu/preset/disabled.php
deleted file mode 100644
index 91ac2b32ed174..0000000000000
--- a/administrator/modules/mod_menu/preset/disabled.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  mod_menu
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-/* @var  $this    JAdminCSSMenu */
-/* @var  $params  Joomla\Registry\Registry */
-$user = JFactory::getUser();
-
-/**
- * Site SubMenu
- */
-$this->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), null, 'disabled'));
-
-/**
- * Users Submenu
- */
-if ($user->authorise('core.manage', 'com_users'))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS'), null, 'disabled'));
-}
-
-/**
- * Menus Submenu
- */
-if ($user->authorise('core.manage', 'com_menus'))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), null, 'disabled'));
-}
-
-/**
- * Content Submenu
- */
-if ($user->authorise('core.manage', 'com_content'))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), null, 'disabled'));
-}
-
-/**
- * Components Submenu
- */
-
-// Get the authorised components and sub-menus.
-$components = ModMenuHelper::getComponents(true);
-
-// Check if there are any components, otherwise, don't display the components menu item
-if ($components)
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), null, 'disabled'));
-}
-
-/**
- * Extensions Submenu
- */
-$im = $user->authorise('core.manage', 'com_installer');
-$mm = $user->authorise('core.manage', 'com_modules');
-$pm = $user->authorise('core.manage', 'com_plugins');
-$tm = $user->authorise('core.manage', 'com_templates');
-$lm = $user->authorise('core.manage', 'com_languages');
-
-if ($im || $mm || $pm || $tm || $lm)
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), null, 'disabled'));
-}
-
-/**
- * Help Submenu
- */
-if ($params->get('showhelp', 1))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), null, 'disabled'));
-}
diff --git a/administrator/modules/mod_menu/preset/enabled.php b/administrator/modules/mod_menu/preset/enabled.php
deleted file mode 100644
index 610c4e1a50805..0000000000000
--- a/administrator/modules/mod_menu/preset/enabled.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  mod_menu
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\Utilities\ArrayHelper;
-
-/* @var  $this    JAdminCSSMenu */
-/* @var  $params  Joomla\Registry\Registry */
-
-$recovery  = (boolean) $params->get('recovery', 0);
-$shownew   = (boolean) $params->get('shownew', 1);
-$showhelp  = (boolean) $params->get('showhelp', 1);
-$user      = JFactory::getUser();
-$lang      = JFactory::getLanguage();
-$rootClass = $recovery ? 'class:' : null;
-
-// Is com_fields installed and enabled?
-$comFieldsEnabled = JComponentHelper::isInstalled('com_fields') && JComponentHelper::isEnabled('com_fields');
-
-/**
- * Site Submenu
- */
-$this->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), '#', $rootClass), true);
-$this->addChild(new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php', 'class:cpanel'));
-
-if ($user->authorise('core.admin'))
-{
-	$this->addSeparator();
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_CONFIGURATION'), 'index.php?option=com_config', 'class:config'));
-}
-
-if ($user->authorise('core.manage', 'com_checkin'))
-{
-	$this->addSeparator();
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_GLOBAL_CHECKIN'), 'index.php?option=com_checkin', 'class:checkin'));
-}
-
-if ($user->authorise('core.manage', 'com_cache'))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_CLEAR_CACHE'), 'index.php?option=com_cache', 'class:clear'));
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_PURGE_EXPIRED_CACHE'), 'index.php?option=com_cache&view=purge', 'class:purge'));
-}
-
-if ($user->authorise('core.admin'))
-{
-	$this->addSeparator();
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM_INFORMATION'), 'index.php?option=com_admin&view=sysinfo', 'class:info'));
-}
-
-$this->getParent();
-
-/**
- * Users Submenu
- */
-if ($user->authorise('core.manage', 'com_users'))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USERS'), '#', $rootClass), true);
-	$createUser = $shownew && $user->authorise('core.create', 'com_users');
-	$createGrp  = $user->authorise('core.admin', 'com_users');
-
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USER_MANAGER'), 'index.php?option=com_users&view=users', 'class:user'), $createUser);
-
-	if ($createUser)
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_USER'), 'index.php?option=com_users&task=user.add', 'class:newarticle'));
-		$this->getParent();
-	}
-
-	if ($createGrp)
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_GROUPS'), 'index.php?option=com_users&view=groups', 'class:groups'), $createUser);
-
-		if ($createUser)
-		{
-			$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_GROUP'), 'index.php?option=com_users&task=group.add', 'class:newarticle'));
-			$this->getParent();
-		}
-
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_LEVELS'), 'index.php?option=com_users&view=levels', 'class:levels'), $createUser);
-
-		if ($createUser)
-		{
-			$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_LEVEL'), 'index.php?option=com_users&task=level.add', 'class:newarticle'));
-			$this->getParent();
-		}
-	}
-
-	if ($comFieldsEnabled && JComponentHelper::getParams('com_users')->get('custom_fields_enable', '1'))
-	{
-		$this->addSeparator();
-		$this->addChild(
-				new JMenuNode(
-						JText::_('MOD_MENU_FIELDS'), 'index.php?option=com_fields&context=com_users.user', 'class:fields')
-				);
-
-		$this->addChild(
-				new JMenuNode(
-						JText::_('MOD_MENU_FIELDS_GROUP'), 'index.php?option=com_fields&view=groups&context=com_users.user', 'class:category')
-				);
-	}
-
-	$this->addSeparator();
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_NOTES'), 'index.php?option=com_users&view=notes', 'class:user-note'), $createUser);
-
-	if ($createUser)
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_NOTE'), 'index.php?option=com_users&task=note.add', 'class:newarticle'));
-		$this->getParent();
-	}
-
-	$this->addChild(
-		new JMenuNode(
-			JText::_('MOD_MENU_COM_USERS_NOTE_CATEGORIES'), 'index.php?option=com_categories&view=categories&extension=com_users', 'class:category'),
-			$createUser
-	);
-
-	if ($createUser)
-	{
-		$this->addChild(
-			new JMenuNode(
-				JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'), 'index.php?option=com_categories&task=category.add&extension=com_users',
-				'class:newarticle'
-			)
-		);
-
-		$this->getParent();
-	}
-
-	if (JFactory::getApplication()->get('massmailoff') != 1)
-	{
-		$this->addSeparator();
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_MASS_MAIL_USERS'), 'index.php?option=com_users&view=mail', 'class:massmail'));
-	}
-
-	$this->getParent();
-}
-
-/**
- * Menus Submenu
- */
-if ($user->authorise('core.manage', 'com_menus'))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), '#', $rootClass), true);
-	$createMenu = $shownew && $user->authorise('core.create', 'com_menus');
-
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER'), 'index.php?option=com_menus&view=menus', 'class:menumgr'), $createMenu);
-
-	if ($createMenu)
-	{
-		$this->addChild(
-			new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER_NEW_MENU'), 'index.php?option=com_menus&view=menu&layout=edit', 'class:newarticle')
-		);
-		$this->getParent();
-	}
-
-	$this->addSeparator();
-
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS_ALL_ITEMS'), 'index.php?option=com_menus&view=items&menutype=', 'class:allmenu'));
-	$this->addSeparator(JText::_('JSITE'));
-
-	// Menu Types
-	$menuTypes = ModMenuHelper::getMenus();
-	$menuTypes = ArrayHelper::sortObjects($menuTypes, isset($menuTypes[0]->client_id) ? array('client_id', 'title') : 'title', 1, false);
-
-	foreach ($menuTypes as $mti => $menuType)
-	{
-		if (!$user->authorise('core.manage', 'com_menus.menu.' . (int) $menuType->id))
-		{
-			continue;
-		}
-
-		$alt = '*' . $menuType->sef . '*';
-
-		if ($menuType->home == 0)
-		{
-			$titleicon = '';
-		}
-		elseif ($menuType->home == 1 && $menuType->language == '*')
-		{
-			$titleicon = ' <span class="icon-home" aria-hidden="true"></span>';
-		}
-		elseif ($menuType->home > 1)
-		{
-			$titleicon = ' <span>'
-				. JHtml::_('image', 'mod_languages/icon-16-language.png', $menuType->home, array('title' => JText::_('MOD_MENU_HOME_MULTIPLE')), true)
-				. '</span>';
-		}
-		elseif ($menuType->image && JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', null, null, true, true))
-		{
-			$titleicon = ' <span>' .
-				JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', $alt, array('title' => $menuType->title_native), true) . '</span>';
-		}
-		else
-		{
-			$titleicon = ' <span class="label" title="' . $menuType->title_native . '">' . $menuType->sef . '</span>';
-		}
-
-		if (isset($menuTypes[$mti - 1], $menuType->client_id) && $menuTypes[$mti - 1]->client_id != $menuType->client_id)
-		{
-			$this->addSeparator(JText::_('JADMINISTRATOR'));
-		}
-
-		$this->addChild(
-			new JMenuNode(
-				$menuType->title, 'index.php?option=com_menus&view=items&menutype=' . $menuType->menutype, 'class:menu', null, null, $titleicon
-			),
-			$user->authorise('core.create', 'com_menus.menu.' . (int) $menuType->id)
-		);
-
-		if ($user->authorise('core.create', 'com_menus.menu.' . (int) $menuType->id))
-		{
-			$this->addChild(
-				new JMenuNode(
-					JText::_('MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM'),
-					'index.php?option=com_menus&view=item&layout=edit&menutype=' . $menuType->menutype, 'class:newarticle'
-				)
-			);
-
-			$this->getParent();
-		}
-	}
-
-	$this->getParent();
-}
-
-/**
- * Content Submenu
- */
-if ($user->authorise('core.manage', 'com_content'))
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT'), '#', $rootClass), true);
-	$createContent = $shownew && $user->authorise('core.create', 'com_content');
-
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_ARTICLE_MANAGER'), 'index.php?option=com_content', 'class:article'), $createContent);
-
-	if ($createContent)
-	{
-		$this->addChild(
-			new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_NEW_ARTICLE'), 'index.php?option=com_content&task=article.add', 'class:newarticle')
-		);
-		$this->getParent();
-	}
-
-	$this->addChild(
-		new JMenuNode(
-			JText::_('MOD_MENU_COM_CONTENT_CATEGORY_MANAGER'), 'index.php?option=com_categories&extension=com_content', 'class:category'
-		),
-		$createContent
-	);
-
-	if ($createContent)
-	{
-		$this->addChild(
-			new JMenuNode(
-				JText::_('MOD_MENU_COM_CONTENT_NEW_CATEGORY'),
-				'index.php?option=com_categories&task=category.add&extension=com_content', 'class:newarticle'
-			)
-		);
-		$this->getParent();
-	}
-
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COM_CONTENT_FEATURED'), 'index.php?option=com_content&view=featured', 'class:featured'));
-
-	if ($comFieldsEnabled && JComponentHelper::getParams('com_content')->get('custom_fields_enable', '1'))
-	{
-		$this->addSeparator();
-		$this->addChild(
-			new JMenuNode(
-				JText::_('MOD_MENU_FIELDS'), 'index.php?option=com_fields&context=com_content.article', 'class:fields')
-		);
-
-		$this->addChild(
-			new JMenuNode(
-				JText::_('MOD_MENU_FIELDS_GROUP'), 'index.php?option=com_fields&view=groups&context=com_content.article', 'class:category')
-		);
-	}
-
-	if ($user->authorise('core.manage', 'com_media'))
-	{
-		$this->addSeparator();
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_MEDIA_MANAGER'), 'index.php?option=com_media', 'class:media'));
-	}
-
-	$this->getParent();
-}
-
-/**
- * Components Submenu
- */
-
-// Get the authorised components and sub-menus.
-$components = ModMenuHelper::getComponents(true);
-
-// Check if there are any components, otherwise, don't render the menu
-if ($components)
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), '#', $rootClass), true);
-
-	foreach ($components as &$component)
-	{
-		if (!empty($component->submenu))
-		{
-			// This component has a db driven submenu.
-			$this->addChild(new JMenuNode($component->text, $component->link, $component->img), true);
-
-			foreach ($component->submenu as $sub)
-			{
-				$this->addChild(new JMenuNode($sub->text, $sub->link, $sub->img));
-			}
-
-			$this->getParent();
-		}
-		else
-		{
-			$this->addChild(new JMenuNode($component->text, $component->link, $component->img));
-		}
-	}
-
-	$this->getParent();
-}
-
-/**
- * Extensions Submenu
- */
-$im = $user->authorise('core.manage', 'com_installer');
-$mm = $user->authorise('core.manage', 'com_modules');
-$pm = $user->authorise('core.manage', 'com_plugins');
-$tm = $user->authorise('core.manage', 'com_templates');
-$lm = $user->authorise('core.manage', 'com_languages');
-
-if ($im || $mm || $pm || $tm || $lm)
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), '#', $rootClass), true);
-
-	if ($im)
-	{
-		$cls = 'class:install';
-
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), 'index.php?option=com_installer', $cls), $im);
-
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_INSTALL'), 'index.php?option=com_installer', $cls));
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATE'), 'index.php?option=com_installer&view=update', $cls));
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_MANAGE'), 'index.php?option=com_installer&view=manage', $cls));
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DISCOVER'), 'index.php?option=com_installer&view=discover', $cls));
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DATABASE'), 'index.php?option=com_installer&view=database', $cls));
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_WARNINGS'), 'index.php?option=com_installer&view=warnings', $cls));
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_LANGUAGES'), 'index.php?option=com_installer&view=languages', $cls));
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATESITES'), 'index.php?option=com_installer&view=updatesites', $cls));
-		$this->getParent();
-	}
-
-	if ($im && ($mm || $pm || $tm || $lm))
-	{
-		$this->addSeparator();
-	}
-
-	if ($mm)
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_MODULE_MANAGER'), 'index.php?option=com_modules', 'class:module'));
-	}
-
-	if ($pm)
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_PLUGIN_MANAGER'), 'index.php?option=com_plugins', 'class:plugin'));
-	}
-
-	if ($tm)
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER'), 'index.php?option=com_templates', 'class:themes'), $tm);
-
-		$this->addChild(
-			new JMenuNode(JText::_('MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES'), 'index.php?option=com_templates&view=styles', 'class:themes')
-		);
-		$this->addChild(
-			new JMenuNode(JText::_('MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES'), 'index.php?option=com_templates&view=templates', 'class:themes')
-		);
-		$this->getParent();
-	}
-
-	if ($lm)
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER'), 'index.php?option=com_languages', 'class:language'), $lm);
-
-		$this->addChild(
-			new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED'), 'index.php?option=com_languages&view=installed', 'class:language')
-		);
-		$this->addChild(
-			new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT'), 'index.php?option=com_languages&view=languages', 'class:language')
-		);
-		$this->addChild(
-			new JMenuNode(JText::_('MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES'), 'index.php?option=com_languages&view=overrides', 'class:language')
-		);
-		$this->getParent();
-	}
-
-	$this->getParent();
-}
-
-/**
- * Help Submenu
- */
-if ($showhelp == 1)
-{
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP'), '#', $rootClass), true);
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_JOOMLA'), 'index.php?option=com_admin&view=help', 'class:help'));
-	$this->addSeparator();
-
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM'), 'https://forum.joomla.org', 'class:help-forum', false, '_blank'));
-
-	if ($forum_url = $params->get('forum_url'))
-	{
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM'), $forum_url, 'class:help-forum', false, '_blank'));
-	}
-
-	$debug = $lang->setDebug(false);
-
-	if ($lang->hasKey('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE') && JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE') != '')
-	{
-		$forum_url = 'https://forum.joomla.org/viewforum.php?f=' . (int) JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
-		$lang->setDebug($debug);
-		$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM'), $forum_url, 'class:help-forum', false, '_blank'));
-	}
-
-	$lang->setDebug($debug);
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DOCUMENTATION'), 'https://docs.joomla.org', 'class:help-docs', false, '_blank'));
-	$this->addSeparator();
-
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', 'class:help-jed', false, '_blank'));
-	$this->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')
-	);
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_RESOURCES'), 'https://resources.joomla.org', 'class:help-jrd', false, '_blank'));
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_COMMUNITY'), 'https://community.joomla.org', 'class:help-community', false, '_blank'));
-	$this->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'https://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank')
-	);
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', 'class:help-dev', false, '_blank'));
-	$this->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'https://joomla.stackexchange.com', 'class:help-dev', false, '_blank'));
-	$this->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'https://community.joomla.org/the-joomla-shop.html', 'class:help-shop', false, '_blank')
-	);
-	$this->getParent();
-}
diff --git a/administrator/modules/mod_menu/tmpl/default.php b/administrator/modules/mod_menu/tmpl/default.php
index ff9edb4c9e2ef..76159f5b2c99a 100644
--- a/administrator/modules/mod_menu/tmpl/default.php
+++ b/administrator/modules/mod_menu/tmpl/default.php
@@ -9,6 +9,27 @@
 
 defined('_JEXEC') or die;
 
-$direction = JFactory::getDocument()->direction == 'rtl' ? 'pull-right' : '';
+$doc       = JFactory::getDocument();
+$direction = $doc->direction == 'rtl' ? 'pull-right' : '';
+$class     = $enabled ? 'nav ' . $direction : 'nav disabled ' . $direction;
 
-$menu->renderMenu('menu', $enabled ? 'nav ' . $direction : 'nav disabled ' . $direction);
+// Recurse through children of root node if they exist
+$menuTree = $menu->getTree();
+$root     = $menuTree->reset();
+
+if ($root->hasChildren())
+{
+	echo '<ul id="menu" class="' . $class . '">' . "\n";
+
+	// WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
+	$menu->renderSubmenu(JModuleHelper::getLayoutPath('mod_menu', 'default_submenu'));
+
+	echo "</ul>\n";
+
+	echo '<ul id="nav-empty" class="dropdown-menu nav-empty hidden-phone"></ul>';
+
+	if ($css = $menuTree->getCss())
+	{
+		$doc->addStyleDeclaration(implode("\n", $css));
+	}
+}
diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php
new file mode 100644
index 0000000000000..4f13537b35f7d
--- /dev/null
+++ b/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+use Joomla\CMS\Menu\Node\Separator;
+
+defined('_JEXEC') or die;
+
+/**
+ * =========================================================================================================
+ * IMPORTANT: The scope of this layout file is the `JAdminCssMenu` object and NOT the module context.
+ * =========================================================================================================
+ */
+/** @var  JAdminCssMenu  $this */
+$current = $this->tree->getCurrent();
+
+// Build the CSS class suffix
+if (!$this->enabled)
+{
+	$class = ' class="disabled"';
+}
+elseif ($current instanceOf Separator)
+{
+	$class = $current->get('title') ? ' class="menuitem-group"' : ' class="divider"';
+}
+elseif ($current->hasChildren())
+{
+	if ($current->getLevel() == 1)
+	{
+		$class = ' class="dropdown"';
+	}
+	elseif ($current->get('class') == 'scrollable-menu')
+	{
+		$class = ' class="dropdown scrollable-menu"';
+	}
+	else
+	{
+		$class = ' class="dropdown-submenu"';
+	}
+}
+else
+{
+	$class = '';
+}
+
+// Print the item
+echo '<li' . $class . '>';
+
+// Print a link if it exists
+$linkClass     = array();
+$dataToggle    = '';
+$dropdownCaret = '';
+
+if ($current->hasChildren())
+{
+	$linkClass[] = 'dropdown-toggle';
+	$dataToggle  = ' data-toggle="dropdown"';
+
+	if ($current->getLevel() == 1)
+	{
+		$dropdownCaret = ' <span class="caret"></span>';
+	}
+}
+else
+{
+	$linkClass[] = 'no-dropdown';
+}
+
+if (!($current instanceof Separator) && ($current->getLevel() > 1))
+{
+	$iconClass = $this->tree->getIconClass();
+
+	if (trim($iconClass))
+	{
+		$linkClass[] = $iconClass;
+	}
+}
+
+// Implode out $linkClass for rendering
+$linkClass = ' class="' . implode(' ', $linkClass) . '" ';
+
+// Links: component/url/heading/container
+if ($link = $current->get('link'))
+{
+	$target = $current->get('target') ? 'target="' . $current->get('target') . '"' : '';
+
+	echo '<a' . $linkClass . $dataToggle . ' href="' . $link . '" ' . $target . '>' .
+				JText::_($current->get('title')) . ' ' . $current->get('icon') . $dropdownCaret . '</a>';
+}
+// Separator
+else
+{
+	echo '<span>' . JText::_($current->get('title')) . '</span>';
+}
+
+// Recurse through children if they exist
+if ($this->enabled && $current->hasChildren())
+{
+	if ($current->getLevel() > 1)
+	{
+		$id = $current->get('id') ? ' id="menu-' . strtolower($current->get('id')) . '"' : '';
+
+		echo '<ul' . $id . ' class="dropdown-menu menu-scrollable">' . "\n";
+	}
+	else
+	{
+		echo '<ul class="dropdown-menu scroll-menu">' . "\n";
+	}
+
+	// WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
+	$this->renderSubmenu(__FILE__);
+
+	echo "</ul>\n";
+}
+
+echo "</li>\n";
diff --git a/libraries/src/Joomla/CMS/Menu/MenuHelper.php b/libraries/src/Joomla/CMS/Menu/MenuHelper.php
new file mode 100644
index 0000000000000..72c7574f0d0ad
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/MenuHelper.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Menu Helper utility
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class MenuHelper
+{
+	/**
+	 * List of preset include paths
+	 *
+	 * @var  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected static $presets = null;
+
+	/**
+	 * Private constructor
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	private function __construct()
+	{
+	}
+
+	/**
+	 * Add a custom preset externally via plugin or any other means.
+	 * WARNING: Presets with same name will replace previously added preset *except* Joomla's default preset (joomla)
+	 *
+	 * @param   string  $name     The unique identifier for the preset.
+	 * @param   string  $title    The display label for the preset.
+	 * @param   string  $path     The path to the preset file.
+	 * @param   bool    $replace  Whether to replace the preset with the same name if any (except 'joomla').
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function addPreset($name, $title, $path, $replace = true)
+	{
+		if (static::$presets === null)
+		{
+			static::getPresets();
+		}
+
+		if ($name == 'joomla')
+		{
+			$replace = false;
+		}
+
+		if (($replace || !array_key_exists($name, static::$presets)) && is_file($path))
+		{
+			$preset = new \stdClass;
+
+			$preset->name  = $name;
+			$preset->title = $title;
+			$preset->path  = $path;
+
+			static::$presets[$name] = $preset;
+		}
+	}
+
+	/**
+	 * Get a list of available presets.
+	 *
+	 * @return  \stdClass[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function getPresets()
+	{
+		if (static::$presets === null)
+		{
+			// Important: 'null' will cause infinite recursion.
+			static::$presets = array();
+
+			static::addPreset('joomla', 'JLIB_MENUS_PRESET_JOOMLA', JPATH_ADMINISTRATOR . '/components/com_menus/presets/joomla.xml');
+			static::addPreset('modern', 'JLIB_MENUS_PRESET_MODERN', JPATH_ADMINISTRATOR . '/components/com_menus/presets/modern.xml');
+
+			// Load from template folder automatically
+			$app = \JFactory::getApplication();
+			$tpl = JPATH_THEMES . '/' . $app->getTemplate() . '/html/com_menus/presets';
+
+			if (is_dir($tpl))
+			{
+				jimport('joomla.filesystem.folder');
+
+				$files = \JFolder::files($tpl, '\.xml$');
+
+				foreach ($files as $file)
+				{
+					$name  = substr($file, 0, -4);
+					$title = str_replace('-', ' ', $name);
+
+					static::addPreset(strtolower($name), ucwords($title), $tpl . '/' . $file);
+				}
+			}
+		}
+
+		return static::$presets;
+	}
+
+	/**
+	 * Load the menu items from a preset file into a hierarchical list of objects
+	 *
+	 * @param   string  $name      The preset name
+	 * @param   bool    $fallback  Fallback to default (joomla) preset if the specified one could not be loaded?
+	 *
+	 * @return  \stdClass[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function loadPreset($name, $fallback = true)
+	{
+		$items   = array();
+		$presets = static::getPresets();
+
+		if (isset($presets[$name]) && ($xml = simplexml_load_file($presets[$name]->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
+		{
+			static::loadXml($xml, $items);
+		}
+		elseif ($fallback && isset($presets['joomla']))
+		{
+			if (($xml = simplexml_load_file($presets['joomla']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
+			{
+				static::loadXml($xml, $items);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to resolve the menu item alias type menu item
+	 *
+	 * @param   \stdClass  &$item  The alias object
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function resolveAlias(&$item)
+	{
+		$obj = $item;
+
+		while ($obj->type == 'alias')
+		{
+			$params  = new Registry($obj->params);
+			$aliasTo = $params->get('aliasoptions');
+
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select('a.id, a.link, a.type, e.element')
+				->from('#__menu a')
+				->where('a.id = ' . (int) $aliasTo)
+				->join('left', '#__extensions e ON e.id = a.component_id = e.id');
+
+			try
+			{
+				$obj = $db->setQuery($query)->loadObject();
+
+				if (!$obj)
+				{
+					$item->link = '';
+
+					return;
+				}
+			}
+			catch (\Exception $e)
+			{
+				$item->link = '';
+
+				return;
+			}
+		}
+
+		$item->id      = $obj->id;
+		$item->link    = $obj->link;
+		$item->type    = $obj->type;
+		$item->element = $obj->element;
+	}
+
+	/**
+	 * Parse the flat list of menu items and prepare the hierarchy of them using parent-child relationship.
+	 *
+	 * @param   \stdClass[]  $menuItems  List of menu items loaded from database
+	 *
+	 * @return  \stdClass[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function createLevels($menuItems)
+	{
+		$result    = array();
+		$result[1] = array();
+
+		foreach ($menuItems as $i => &$item)
+		{
+			// Resolve the alias item to get the original item
+			if ($item->type == 'alias')
+			{
+				static::resolveAlias($item);
+			}
+
+			if ($item->link = in_array($item->type, array('separator', 'heading', 'container')) ? '#' : trim($item->link))
+			{
+				$item->submenu    = array();
+				$item->class      = isset($item->img) ? $item->img : '';
+				$item->scope      = isset($item->scope) ? $item->scope : null;
+				$item->browserNav = $item->browserNav ? '_blank' : '';
+
+				$result[$item->parent_id][$item->id] = $item;
+			}
+		}
+
+		// Move each of the items under respective parent menu items.
+		if (count($result[1]))
+		{
+			foreach ($result as $parentId => &$mItems)
+			{
+				foreach ($mItems as &$mItem)
+				{
+					if (isset($result[$mItem->id]))
+					{
+						$mItem->submenu = &$result[$mItem->id];
+					}
+				}
+			}
+		}
+
+		// Return only top level items, subtree follows
+		return $result[1];
+	}
+
+	/**
+	 * Load a menu tree from an XML file
+	 *
+	 * @param   \SimpleXMLElement[]  $elements  The xml menuitem nodes
+	 * @param   \stdClass[]          &$items    The menu hierarchy list to be populated
+	 * @param   string[]             $replace   The substring replacements for iterator type items
+	 *
+	 * @return  void
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected static function loadXml($elements, &$items, $replace = array())
+	{
+		foreach ($elements as $element)
+		{
+			if ($element->getName() != 'menuitem')
+			{
+				continue;
+			}
+
+			$select = (string) $element['sql_select'];
+			$from   = (string) $element['sql_from'];
+
+			/**
+			 * Following is a repeatable group based on simple database query. This requires sql_* attributes (sql_select and sql_from are required)
+			 * The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
+			 * The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
+			 */
+			if ($select && $from)
+			{
+				$hidden = $element['hidden'] == 'true';
+				$where  = (string) $element['sql_where'];
+				$order  = (string) $element['sql_order'];
+				$group  = (string) $element['sql_group'];
+
+				$db    = \JFactory::getDbo();
+				$query = $db->getQuery(true);
+				$query->select($select)->from($from);
+
+				if ($where)
+				{
+					$query->where($where);
+				}
+
+				if ($order)
+				{
+					$query->order($order);
+				}
+
+				if ($group)
+				{
+					$query->order($group);
+				}
+
+				$results = $db->setQuery($query)->loadObjectList();
+
+				// Skip the entire group if no items to iterate over.
+				if ($results)
+				{
+					// Show the repeatable group heading node only if not set as hidden.
+					if (!$hidden)
+					{
+						$items[] = static::parseXmlNode($element, $replace);
+					}
+
+					// Iterate over the matching records, items goes in the same level (not $item->submenu) as this node.
+					foreach ($results as $result)
+					{
+						static::loadXml($element->menuitem, $items, $result);
+					}
+				}
+			}
+			else
+			{
+				$item = static::parseXmlNode($element, $replace);
+
+				// Process the child nodes
+				static::loadXml($element->menuitem, $item->submenu, $replace);
+
+				$items[] = $item;
+			}
+		}
+	}
+
+	/**
+	 * Create a menu item node from an xml element
+	 *
+	 * @param   \SimpleXMLElement  $node     A menuitem element from preset xml
+	 * @param   string[]           $replace  The values to substitute in the title, link and element texts
+	 *
+	 * @return  \stdClass
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected static function parseXmlNode($node, $replace = array())
+	{
+		$item = new \stdClass;
+
+		$item->id         = null;
+		$item->type       = (string) $node['type'];
+		$item->title      = (string) $node['title'];
+		$item->link       = (string) $node['link'];
+		$item->element    = (string) $node['element'];
+		$item->class      = (string) $node['class'];
+		$item->browserNav = (string) $node['target'];
+		$item->access     = (int) $node['access'];
+		$item->params     = new Registry(trim($node->params));
+		$item->scope      = (string) $node['scope'] ?: 'default';
+		$item->submenu    = array();
+
+		// Translate attributes for iterator values
+		foreach ($replace as $var => $val)
+		{
+			$item->title   = str_replace("{sql:$var}", $val, $item->title);
+			$item->element = str_replace("{sql:$var}", $val, $item->element);
+			$item->link    = str_replace("{sql:$var}", $val, $item->link);
+		}
+
+		return $item;
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Menu/Node.php b/libraries/src/Joomla/CMS/Menu/Node.php
new file mode 100644
index 0000000000000..aa28b740159c4
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/Node.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * A Node for MenuTree
+ *
+ * @see    Tree
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Node
+{
+	/**
+	 * Node Id
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $id = null;
+
+	/**
+	 * CSS Class for node
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $class = null;
+
+	/**
+	 * Whether this node is active
+	 *
+	 * @var  bool
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $active = false;
+
+	/**
+	 * Additional custom node params
+	 *
+	 * @var  Registry
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $params;
+
+	/**
+	 * Parent node object
+	 *
+	 * @var  Node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $parent = null;
+
+	/**
+	 * Array of Children node objects
+	 *
+	 * @var  Node[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $children = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct()
+	{
+		$this->params = new Registry;
+	}
+
+	/**
+	 * Add child to this node
+	 *
+	 * If the child already has a parent, the link is unset
+	 *
+	 * @param   Node  $child  The child to be added
+	 *
+	 * @return  Node  The new added child
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function addChild(Node $child)
+	{
+		$hash = spl_object_hash($child);
+
+		if (isset($child->parent))
+		{
+			$child->parent->removeChild($child);
+		}
+
+		$child->parent         = $this;
+		$this->children[$hash] = $child;
+
+		return $child;
+	}
+
+	/**
+	 * Remove a child from this node
+	 *
+	 * If the child exists it is unset
+	 *
+	 * @param   Node  $child  The child to be added
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function removeChild(Node $child)
+	{
+		$hash = spl_object_hash($child);
+
+		if (isset($this->children[$hash]))
+		{
+			$child->parent = null;
+
+			unset($this->children[$hash]);
+		}
+	}
+
+	/**
+	 * Test if this node has a parent
+	 *
+	 * @return  bool  True if there is a parent
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function hasParent()
+	{
+		return isset($this->parent);
+	}
+
+	/**
+	 * Get the parent of this node
+	 *
+	 * @return  Node  The Node object's parent or null for no parent
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getParent()
+	{
+		return $this->parent;
+	}
+
+	/**
+	 * Test if this node has children
+	 *
+	 * @return  bool
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function hasChildren()
+	{
+		return count($this->children) > 0;
+	}
+
+	/**
+	 * Get the children of this node
+	 *
+	 * @return  Node[]  The children
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getChildren()
+	{
+		return $this->children;
+	}
+
+	/**
+	 * Find the current node depth in the tree hierarchy
+	 *
+	 * @return  int  The node level in the hierarchy, where ROOT == 0, First level menu item == 1, an so on.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getLevel()
+	{
+		return $this->hasParent() ? $this->getParent()->getLevel() + 1 : 0;
+	}
+
+	/**
+	 * Check whether the object instance node is the root node
+	 *
+	 * @return  bool
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function isRoot()
+	{
+		return !$this->hasParent();
+	}
+
+	/**
+	 * Set the active state on or off
+	 *
+	 * @param   bool  $active  The new active state
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function setActive($active)
+	{
+		$this->active = (bool) $active;
+	}
+
+	/**
+	 * set the params array
+	 *
+	 * @param   Registry  $params  The params attributes
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function setParams(Registry $params)
+	{
+		$this->params = $params;
+	}
+
+	/**
+	 * Get the param value from the node params
+	 *
+	 * @param   string  $key  The param name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getParam($key)
+	{
+		return isset($this->params[$key]) ? $this->params[$key] : null;
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'id':
+			case 'class':
+			case 'active':
+			case 'params':
+				return $this->$name;
+		}
+
+		return null;
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Component.php b/libraries/src/Joomla/CMS/Menu/Node/Component.php
new file mode 100644
index 0000000000000..735288626c659
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/Node/Component.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * A Component type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Component extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $title = null;
+
+	/**
+	 * The component name for this node link
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $element = null;
+
+	/**
+	 * Node Link
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $link = null;
+
+	/**
+	 * Link Target
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $target = null;
+
+	/**
+	 * Link title icon
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $icon = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title    The title of the node
+	 * @param   string  $element  The component name
+	 * @param   string  $link     The node link
+	 * @param   string  $target   The link target
+	 * @param   string  $class    The CSS class for the node
+	 * @param   string  $id       The node id
+	 * @param   string  $icon     The title icon for the node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct($title, $element, $link, $target = null, $class = null, $id = null, $icon = null)
+	{
+		$this->title   = $title;
+		$this->element = $element;
+		$this->link    = $link ? \JFilterOutput::ampReplace($link) : 'index.php?option=' . $element;
+		$this->target  = $target;
+		$this->class   = $class;
+		$this->id      = $id;
+		$this->icon    = $icon;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+			case 'element':
+			case 'link':
+			case 'target':
+			case 'icon':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Container.php b/libraries/src/Joomla/CMS/Menu/Node/Container.php
new file mode 100644
index 0000000000000..be7df8190bd45
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/Node/Container.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * A Container type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Container extends Heading
+{
+}
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Heading.php b/libraries/src/Joomla/CMS/Menu/Node/Heading.php
new file mode 100644
index 0000000000000..1b0d3007db031
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/Node/Heading.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * A Heading type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Heading extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $title = null;
+
+	/**
+	 * Node Link
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $link = '#';
+
+	/**
+	 * Link title icon
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $icon = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title  The title of the node
+	 * @param   string  $class  The CSS class for the node
+	 * @param   string  $id     The node id
+	 * @param   string  $icon   The title icon for the node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct($title, $class = null, $id = null, $icon = null)
+	{
+		$this->title = $title;
+		$this->class = $class;
+		$this->id    = $id;
+		$this->icon  = $icon;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+			case 'link':
+			case 'icon':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Separator.php b/libraries/src/Joomla/CMS/Menu/Node/Separator.php
new file mode 100644
index 0000000000000..0a90f0594a7dd
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/Node/Separator.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * A Separator type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Separator extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $title = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title  The title of the node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct($title = null)
+	{
+		$this->title = trim($title, '- ') ? $title : null;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Url.php b/libraries/src/Joomla/CMS/Menu/Node/Url.php
new file mode 100644
index 0000000000000..0d45e51ecf220
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/Node/Url.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * An external Url type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Url extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $title = null;
+
+	/**
+	 * Node Link
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $link = null;
+
+	/**
+	 * Link Target
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $target = null;
+
+	/**
+	 * Link title icon
+	 *
+	 * @var  string
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $icon = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title   The title of the node
+	 * @param   string  $link    The node link
+	 * @param   string  $target  The link target
+	 * @param   string  $class   The CSS class for the node
+	 * @param   string  $id      The node id
+	 * @param   string  $icon    The title icon for the node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct($title, $link, $target = null, $class = null, $id = null, $icon = null)
+	{
+		$this->title  = $title;
+		$this->link   =	\JFilterOutput::ampReplace($link);
+		$this->target = $target;
+		$this->class  = $class;
+		$this->id     = $id;
+		$this->icon   = $icon;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+			case 'link':
+			case 'target':
+			case 'icon':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/libraries/src/Joomla/CMS/Menu/Tree.php b/libraries/src/Joomla/CMS/Menu/Tree.php
new file mode 100644
index 0000000000000..5708c9be770bf
--- /dev/null
+++ b/libraries/src/Joomla/CMS/Menu/Tree.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Menu Tree class to represent a menu tree hierarchy
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class Tree
+{
+	/**
+	 * The root menu node
+	 *
+	 * @var  Node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $root = null;
+
+	/**
+	 * The current working menu node
+	 *
+	 * @var  Node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $current = null;
+
+	/**
+	 * The CSS style array
+	 *
+	 * @var  string[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $css = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct()
+	{
+		$this->root    = new Node;
+		$this->current = $this->root;
+	}
+
+	/**
+	 * Get the root node
+	 *
+	 * @return  Node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getRoot()
+	{
+		return $this->root;
+	}
+
+	/**
+	 * Get the current node
+	 *
+	 * @return  Node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getCurrent()
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Get the current node
+	 *
+	 * @param   Node  $node  The node to be set as current
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function setCurrent($node)
+	{
+		if ($node)
+		{
+			$this->current = $node;
+		}
+	}
+
+	/**
+	 * Method to get the parent and set it as active optionally
+	 *
+	 * @param   bool  $setCurrent  Set that parent as the current node for further working
+	 *
+	 * @return  Node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getParent($setCurrent = true)
+	{
+		$parent = $this->current->getParent();
+
+		if ($setCurrent)
+		{
+			$this->setCurrent($parent);
+		}
+
+		return $parent;
+	}
+
+	/**
+	 * Method to reset the working pointer to the root node and optionally clear all menu nodes
+	 *
+	 * @param   bool  $clear  Whether to clear the existing menu items or just reset the pointer to root element
+	 *
+	 * @return  Node  The root node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function reset($clear = false)
+	{
+		if ($clear)
+		{
+			$this->root = new Node;
+			$this->css  = array();
+		}
+
+		$this->current = $this->root;
+
+		return  $this->current;
+	}
+
+	/**
+	 * Method to add a child
+	 *
+	 * @param   Node  $node        The node to process
+	 * @param   bool  $setCurrent  Set this new child as the current node for further working
+	 *
+	 * @return  Node  The newly added node
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function addChild(Node $node, $setCurrent = false)
+	{
+		$this->current->addChild($node);
+
+		if ($setCurrent)
+		{
+			$this->setCurrent($node);
+		}
+
+		return $node;
+	}
+
+	/**
+	 * Method to get the CSS class name for an icon identifier or create one if
+	 * a custom image path is passed as the identifier
+	 *
+	 * @return  string	CSS class name
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getIconClass()
+	{
+		static $classes = array();
+
+		$identifier = $this->current->get('class');
+
+		// Top level is special
+		if (trim($identifier) == '' || !$this->current->hasParent())
+		{
+			return null;
+		}
+
+		if (!isset($classes[$identifier]))
+		{
+			// We were passed a class name
+			if (substr($identifier, 0, 6) == 'class:')
+			{
+				$class = substr($identifier, 6);
+			}
+			// We were passed background icon url. Build the CSS class for the icon
+			else
+			{
+				$class = preg_replace('#\.[^.]*$#', '', basename($identifier));
+				$class = preg_replace('#\.\.[^A-Za-z0-9\.\_\- ]#', '', $class);
+
+				if ($class)
+				{
+					$this->css[] = ".menu-$class {background: url($identifier) no-repeat;}";
+				}
+			}
+
+			$classes[$identifier] = "menu-$class";
+		}
+
+		return $classes[$identifier];
+	}
+
+	/**
+	 * Get the CSS declarations for this tree
+	 *
+	 * @return  string[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getCss()
+	{
+		return $this->css;
+	}
+}

From 0e4fb910718cde096c7f0c4eb0e195922ad00912 Mon Sep 17 00:00:00 2001
From: Guido De Gobbis <guido@degobbis.de>
Date: Mon, 31 Jul 2017 13:47:23 +0200
Subject: [PATCH 111/148] Using JLayout for combo field (#16293)

* Using JLayout for combo field

### Summary of Changes

Please make sure that combo field still work

### Usage

See [Combo form field type](https://docs.joomla.org/Combo_form_field_type) on Joomla!

### Expected result

the combo filed can be overwritten using a layout

### Actual result

No usage of a layout

### Documentation Changes Required

None

* spaces to tabs ;)

* use deploy version
---
 layouts/joomla/form/field/combo.php    | 77 ++++++++++++++++++++++++++
 libraries/joomla/form/fields/combo.php | 64 ++++++++++-----------
 2 files changed, 105 insertions(+), 36 deletions(-)
 create mode 100644 layouts/joomla/form/field/combo.php

diff --git a/layouts/joomla/form/field/combo.php b/layouts/joomla/form/field/combo.php
new file mode 100644
index 0000000000000..286ca02456b49
--- /dev/null
+++ b/layouts/joomla/form/field/combo.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $options         Options available for this field.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('behavior.combobox');
+
+$attr  = !empty($class) ? ' class="combobox ' . $class . '"' : ' class="combobox"';
+$attr .= !empty($size) ? ' size="' . $size . '"' : '';
+$attr .= !empty($readonly) ? ' readonly' : '';
+$attr .= !empty($disabled) ? ' disabled' : '';
+$attr .= !empty($required) ? ' required aria-required="true"' : '';
+
+// Initialize JavaScript field attributes.
+$attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+
+?>
+<div class="combobox input-append">
+	<input
+		type="text"
+		name="<?php echo $name; ?>"
+		id="<?php echo $id; ?>"
+		value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>"
+		<?php echo $attr; ?>
+		autocomplete="off"
+	/>
+	<div class="btn-group">
+		<button type="button" class="btn dropdown-toggle">
+			<span class="caret"></span>
+		</button>
+		<ul class="dropdown-menu">
+			<?php foreach ($options as $option) : ?>
+				<li><a href="#"><?php echo $option->text; ?></a></li>
+			<?php endforeach; ?>
+		</ul>
+	</div>
+</div>
diff --git a/libraries/joomla/form/fields/combo.php b/libraries/joomla/form/fields/combo.php
index b878898081246..8be8a009baa6b 100644
--- a/libraries/joomla/form/fields/combo.php
+++ b/libraries/joomla/form/fields/combo.php
@@ -27,6 +27,14 @@ class JFormFieldCombo extends JFormFieldList
 	 */
 	protected $type = 'Combo';
 
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $layout = 'joomla.form.field.combo';
+
 	/**
 	 * Method to get the field input markup for a combo box field.
 	 *
@@ -36,48 +44,32 @@ class JFormFieldCombo extends JFormFieldList
 	 */
 	protected function getInput()
 	{
-		$html = array();
-		$attr = '';
+		if (empty($this->layout))
+		{
+			throw new UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
 
-		// Initialize some field attributes.
-		$attr .= !empty($this->class) ? ' class="combobox ' . $this->class . '"' : ' class="combobox"';
-		$attr .= $this->readonly ? ' readonly' : '';
-		$attr .= $this->disabled ? ' disabled' : '';
-		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
-		$attr .= $this->required ? ' required aria-required="true"' : '';
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
 
-		// Initialize JavaScript field attributes.
-		$attr .= $this->onchange ? ' onchange="' . $this->onchange . '"' : '';
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
 
 		// Get the field options.
 		$options = $this->getOptions();
 
-		// Load the combobox behavior.
-		JHtml::_('behavior.combobox');
-
-		$html[] = '<div class="combobox input-append">';
-
-		// Build the input for the combo box.
-		$html[] = '<input type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
-			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"' . $attr . ' autocomplete="off" />';
-
-		$html[] = '<div class="btn-group">';
-		$html[] = '<button type="button" class="btn dropdown-toggle">';
-		$html[] = '		<span class="caret"></span>';
-		$html[] = '</button>';
-
-		// Build the list for the combo box.
-		$html[] = '<ul class="dropdown-menu">';
-
-		foreach ($options as $option)
-		{
-			$html[] = '<li><a href="#">' . $option->text . '</a></li>';
-		}
-
-		$html[] = '</ul>';
-
-		$html[] = '</div></div>';
+		$extraData = array(
+			'options' => $options,
+		);
 
-		return implode($html);
+		return array_merge($data, $extraData);
 	}
 }

From dbc7a4af478a1941f43c38c52cd053ec4168343a Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Mon, 31 Jul 2017 17:21:33 +0200
Subject: [PATCH 112/148] the default value is 1 (#17307)

---
 administrator/components/com_users/models/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php
index 697aa0764bdd3..aa7cc87572d42 100644
--- a/administrator/components/com_users/models/user.php
+++ b/administrator/components/com_users/models/user.php
@@ -131,7 +131,7 @@ public function getForm($data = array(), $loadData = true)
 		// Passwords fields are required when mail to user is set to No in joomla user plugin
 		$userId = $form->getValue('id');
 
-		if ($userId === 0 && $pluginParams->get('mail_to_user', '0') === '0')
+		if ($userId === 0 && $pluginParams->get('mail_to_user', '1') === '0')
 		{
 			$form->setFieldAttribute('password', 'required', 'true');
 			$form->setFieldAttribute('password2', 'required', 'true');

From 09a2288206b6becb4badcc2ae7a37ff79f478d5c Mon Sep 17 00:00:00 2001
From: Sven Hurt <kontakt@sven-hurt.de>
Date: Tue, 1 Aug 2017 00:31:34 +0200
Subject: [PATCH 113/148] Fix browser / version detection for firefox (#17051)

* Fix browser / version detection for firefox

* Re-add mozilla regex condition as the last in the browser check queue

* Remove markTestSkipped instruction in browser test

* Change firefox test cases to reflect changes in browser class
---
 .../src/Joomla/CMS/Environment/Browser.php    | 27 ++++++++++++-------
 .../joomla/environment/JBrowserTest.php       |  9 ++-----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Environment/Browser.php b/libraries/src/Joomla/CMS/Environment/Browser.php
index f08c1a7e06b9e..3bfa2a7c9b979 100644
--- a/libraries/src/Joomla/CMS/Environment/Browser.php
+++ b/libraries/src/Joomla/CMS/Environment/Browser.php
@@ -244,7 +244,7 @@ public function match($userAgent = null, $accept = null)
 
 			// We have to check for Edge as the first browser, because Edge has something like:
 			// Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393
-			if (preg_match('|Edge/([0-9.]+)|', $this->agent, $version))
+			if (preg_match('|Edge\/([0-9.]+)|', $this->agent, $version))
 			{
 				$this->setBrowser('edge');
 
@@ -258,9 +258,10 @@ public function match($userAgent = null, $accept = null)
 					$this->minorVersion = 0;
 				}
 			}
-			elseif (preg_match('|Opera[/ ]([0-9.]+)|', $this->agent, $version))
+			elseif (preg_match('|Opera[\/ ]([0-9.]+)|', $this->agent, $version))
 			{
 				$this->setBrowser('opera');
+
 				list ($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
 
 				/* Due to changes in Opera UA, we need to check Version/xx.yy,
@@ -275,11 +276,13 @@ public function match($userAgent = null, $accept = null)
 			elseif (preg_match('/OPR[\/ ]([0-9.]+)/', $this->agent, $version))
 			{
 				$this->setBrowser('opera');
+
 				list ($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
 			}
 			elseif (preg_match('/Chrome[\/ ]([0-9.]+)|CrMo[\/ ]([0-9.]+)|CriOS[\/ ]([0-9.]+)/i', $this->agent, $version))
 			{
 				$this->setBrowser('chrome');
+
 				list ($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
 			}
 			elseif (strpos($this->lowerAgent, 'elaine/') !== false
@@ -308,7 +311,7 @@ public function match($userAgent = null, $accept = null)
 					$this->minorVersion = 0;
 				}
 			}
-			elseif (preg_match('|amaya/([0-9.]+)|', $this->agent, $version))
+			elseif (preg_match('|amaya\/([0-9.]+)|', $this->agent, $version))
 			{
 				$this->setBrowser('amaya');
 				$this->majorVersion = $version[1];
@@ -318,7 +321,7 @@ public function match($userAgent = null, $accept = null)
 					$this->minorVersion = $version[2];
 				}
 			}
-			elseif (preg_match('|ANTFresco/([0-9]+)|', $this->agent, $version))
+			elseif (preg_match('|ANTFresco\/([0-9]+)|', $this->agent, $version))
 			{
 				$this->setBrowser('fresco');
 			}
@@ -326,7 +329,7 @@ public function match($userAgent = null, $accept = null)
 			{
 				$this->setBrowser('avantgo');
 			}
-			elseif (preg_match('|[Kk]onqueror/([0-9]+)|', $this->agent, $version) || preg_match('|Safari/([0-9]+)\.?([0-9]+)?|', $this->agent, $version))
+			elseif (preg_match('|[Kk]onqueror\/([0-9]+)|', $this->agent, $version) || preg_match('|Safari/([0-9]+)\.?([0-9]+)?|', $this->agent, $version))
 			{
 				// Konqueror and Apple's Safari both use the KHTML
 				// rendering engine.
@@ -345,13 +348,13 @@ public function match($userAgent = null, $accept = null)
 					$this->identifyBrowserVersion();
 				}
 			}
-			elseif (preg_match('|Mozilla/([0-9.]+)|', $this->agent, $version))
+			elseif (preg_match('|Firefox\/([0-9.]+)|', $this->agent, $version))
 			{
-				$this->setBrowser('mozilla');
+				$this->setBrowser('firefox');
 
 				list ($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
 			}
-			elseif (preg_match('|Lynx/([0-9]+)|', $this->agent, $version))
+			elseif (preg_match('|Lynx\/([0-9]+)|', $this->agent, $version))
 			{
 				$this->setBrowser('lynx');
 			}
@@ -359,7 +362,7 @@ public function match($userAgent = null, $accept = null)
 			{
 				$this->setBrowser('links');
 			}
-			elseif (preg_match('|HotJava/([0-9]+)|', $this->agent, $version))
+			elseif (preg_match('|HotJava\/([0-9]+)|', $this->agent, $version))
 			{
 				$this->setBrowser('hotjava');
 			}
@@ -403,6 +406,12 @@ public function match($userAgent = null, $accept = null)
 			{
 				$this->setBrowser('mml');
 			}
+			elseif (preg_match('|Mozilla\/([0-9.]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('mozilla');
+
+				list ($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+			}
 		}
 	}
 
diff --git a/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php b/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php
index d559c3cb97b0d..0abd11e340564 100644
--- a/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php
+++ b/tests/unit/suites/libraries/joomla/environment/JBrowserTest.php
@@ -122,14 +122,14 @@ public function dataMatch()
 			),
 			'Firefox 12 Android Tablet' => array(
 				'Mozilla/5.0 (Android; Tablet; rv:12.0) Gecko/12.0 Firefox/12.0',
-				'mozilla',
+				'firefox',
 				'unix',
 				'12',
 				true,
 			),
 			'Firefox 6 Windows' => array(
 				'Mozilla/5.0 (Windows NT 5.0; WOW64; rv:6.0) Gecko/20100101 Firefox/6.0',
-				'mozilla',
+				'firefox',
 				'win',
 				'6',
 				false,
@@ -151,11 +151,6 @@ public function dataMatch()
 	 */
 	public function testBrowserMatching($userAgent, $expectedBrowser, $expectedPlatform, $expectedMajorVersion, $expectedMobile)
 	{
-		if ($expectedBrowser === 'mozilla')
-		{
-			$this->markTestSkipped('Requires PR #17051 to be tested correctly');
-		}
-
 		$this->object->match($userAgent);
 
 		$this->assertSame(

From 33ad5528aeb740f71e11cc9d2f189c12b3e2bf29 Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Tue, 1 Aug 2017 14:09:40 +0200
Subject: [PATCH 114/148] Correct Admin modules warning when nativeName is not
 defined in language (#17359)

pack.
---
 administrator/components/com_menus/controller.php   | 11 ++++++++++-
 administrator/components/com_modules/controller.php | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php
index 7ef5645a6143a..9e2644e5c12ed 100644
--- a/administrator/components/com_menus/controller.php
+++ b/administrator/components/com_menus/controller.php
@@ -38,7 +38,16 @@ public function display($cachable = false, $urlparams = false)
 
 			foreach ($languages as $language)
 			{
-				$langCodes[$language->metadata['tag']] = $language->metadata['nativeName'];
+				if (isset($language->metadata['nativeName']))
+				{
+					$languageName = $language->metadata['nativeName'];
+				}
+				else
+				{
+					$languageName = $language->metadata['name'];
+				}
+
+				$langCodes[$language->metadata['tag']] = $languageName;
 			}
 
 			$db    = JFactory::getDbo();
diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php
index 38e86bbf5e151..a0f5864c8d9f8 100644
--- a/administrator/components/com_modules/controller.php
+++ b/administrator/components/com_modules/controller.php
@@ -84,7 +84,16 @@ public function display($cachable = false, $urlparams = false)
 
 			foreach ($languages as $language)
 			{
-				$langCodes[$language->metadata['tag']] = $language->metadata['nativeName'];
+				if (isset($language->metadata['nativeName']))
+				{
+					$languageName = $language->metadata['nativeName'];
+				}
+				else
+				{
+					$languageName = $language->metadata['name'];
+				}
+
+				$langCodes[$language->metadata['tag']] = $languageName;
 			}
 
 			$db    = JFactory::getDbo();

From cc2db64526f5f0e05327e6dd700060d287216bf5 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Wed, 2 Aug 2017 18:08:03 +0200
Subject: [PATCH 115/148] fix not installing on remote databases (#17248)

* fix not installing remote databases

* Update database.php

* general remove database message

* Update database.php
---
 installation/model/database.php | 86 +++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 36 deletions(-)

diff --git a/installation/model/database.php b/installation/model/database.php
index bd9875b6098bd..4b0347aa0851d 100644
--- a/installation/model/database.php
+++ b/installation/model/database.php
@@ -176,58 +176,72 @@ public function initialise($options)
 		// Check the security file if the db_host is not localhost / 127.0.0.1 / ::1
 		if ($shouldCheckLocalhost && !in_array($options->db_host, $localhost))
 		{
-			// Add the general message
-			JFactory::getApplication()->enqueueMessage(
-				JText::sprintf(
+			$remoteDbFileTestsPassed = JFactory::getSession()->get('remoteDbFileTestsPassed', false);
+			
+			// When all checks have been passed we don't need to do this here again.
+			if ($remoteDbFileTestsPassed === false)
+			{
+				$generalRemoteDatabaseMessage = JText::sprintf(
 					'INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE',
 					'https://docs.joomla.org/Special:MyLanguage/J3.x:Secured_procedure_for_installing_Joomla_with_a_remote_database'
-				),
-				'warning'
-			);
+				);
 
-			$remoteDbFile = JFactory::getSession()->get('remoteDbFile', false);
+				$remoteDbFile = JFactory::getSession()->get('remoteDbFile', false);
 
-			if ($remoteDbFile === false)
-			{
-				// This is the file you need to remove if you want to use a remote database
-				$remoteDbFile = '_Joomla' . JUserHelper::genRandomPassword(21) . '.txt';
-				JFactory::getSession()->set('remoteDbFile', $remoteDbFile);
+				if ($remoteDbFile === false)
+				{
+					// Add the general message
+					JFactory::getApplication()->enqueueMessage($generalRemoteDatabaseMessage, 'warning');
 
-				// Get the path
-				$remoteDbPath = JPATH_INSTALLATION . '/' . $remoteDbFile;
+					// This is the file you need to remove if you want to use a remote database
+					$remoteDbFile = '_Joomla' . JUserHelper::genRandomPassword(21) . '.txt';
+					JFactory::getSession()->set('remoteDbFile', $remoteDbFile);
 
-				// When the path is not writable the user needs to create the file manually
-				if (!JFile::write($remoteDbPath, ''))
-				{
-					// Request to create the file manually
-					JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE', $remoteDbFile), 'error');
+					// Get the path
+					$remoteDbPath = JPATH_INSTALLATION . '/' . $remoteDbFile;
 
-					JFactory::getSession()->set('remoteDbFileUnwritable', true);
+					// When the path is not writable the user needs to create the file manually
+					if (!JFile::write($remoteDbPath, ''))
+					{
+						// Request to create the file manually
+						JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE', $remoteDbFile), 'error');
+
+						JFactory::getSession()->set('remoteDbFileUnwritable', true);
+
+						return false;
+					}
+
+					// Save the file name to the session
+					JFactory::getSession()->set('remoteDbFileWrittenByJoomla', true);
+
+					// Request to delete that file
+					JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE', $remoteDbFile), 'error');
 
 					return false;
 				}
 
-				// Save the file name to the session
-				JFactory::getSession()->set('remoteDbFileWrittenByJoomla', true);
-
-				// Request to delete that file
-				JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE', $remoteDbFile), 'error');
+				if (JFactory::getSession()->get('remoteDbFileWrittenByJoomla', false) === true && file_exists(JPATH_INSTALLATION . '/' . $remoteDbFile))
+				{
+					// Add the general message
+					JFactory::getApplication()->enqueueMessage($generalRemoteDatabaseMessage, 'warning');
+					
+					JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE', $remoteDbFile), 'error');
 
-				return false;
-			}
+					return false;
+				}
 
-			if (JFactory::getSession()->get('remoteDbFileWrittenByJoomla', false) === true && file_exists(JPATH_INSTALLATION . '/' . $remoteDbFile))
-			{
-				JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE', $remoteDbFile), 'error');
+				if (JFactory::getSession()->get('remoteDbFileUnwritable', false) === true && !file_exists(JPATH_INSTALLATION . '/' . $remoteDbFile))
+				{
+					// Add the general message
+					JFactory::getApplication()->enqueueMessage($generalRemoteDatabaseMessage, 'warning');
 
-				return false;
-			}
+					JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE', $remoteDbFile), 'error');
 
-			if (JFactory::getSession()->get('remoteDbFileUnwritable', false) === true && !file_exists(JPATH_INSTALLATION . '/' . $remoteDbFile))
-			{
-				JFactory::getApplication()->enqueueMessage(JText::sprintf('INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE', $remoteDbFile), 'error');
+					return false;
+				}
 
-				return false;
+				// All tests for this session passed set it to the session
+				JFactory::getSession()->set('remoteDbFileTestsPassed', true);
 			}
 		}
 

From 3d1722a75307521bdb99ebb4ecebf71f9c37330c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 3 Aug 2017 13:07:21 +0100
Subject: [PATCH 116/148] Mark unused file as deprecated (#17392)

* Mark unused file as deprecated

PR for #17382

This file is not used in the core and hasnt been for a very long time as it was replaced by categoryedit. This simple PR add a deprecated notice that this will be removed in J4

* oops
---
 .../components/com_categories/models/fields/categoryparent.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php
index 2ea6216327d38..4f77d61ad0191 100644
--- a/administrator/components/com_categories/models/fields/categoryparent.php
+++ b/administrator/components/com_categories/models/fields/categoryparent.php
@@ -15,6 +15,7 @@
  * Category Parent field.
  *
  * @since  1.6
+ * @deprecated  4.0  Use categoryedit instead.
  */
 class JFormFieldCategoryParent extends JFormFieldList
 {

From d494620903b1deed66357af45dcb6cbdfbad5980 Mon Sep 17 00:00:00 2001
From: Roberto Segura <roberto@phproberto.com>
Date: Thu, 3 Aug 2017 14:12:52 +0200
Subject: [PATCH 117/148] [fix] nested mode for tags field (#17396)

---
 libraries/src/Joomla/CMS/Form/Field/TagField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Joomla/CMS/Form/Field/TagField.php b/libraries/src/Joomla/CMS/Form/Field/TagField.php
index 6cd1c59ee11a9..9b042ecca9853 100644
--- a/libraries/src/Joomla/CMS/Form/Field/TagField.php
+++ b/libraries/src/Joomla/CMS/Form/Field/TagField.php
@@ -243,7 +243,7 @@ public function isNested()
 		if ($this->isNested === null)
 		{
 			// If mode="nested" || ( mode not set & config = nested )
-			if (isset($this->element['mode']) && $this->element['mode'] === 'nested'
+			if (isset($this->element['mode']) && (string) $this->element['mode'] === 'nested'
 				|| !isset($this->element['mode']) && $this->comParams->get('tag_field_ajax_mode', 1) == 0)
 			{
 				$this->isNested = true;

From cdaee9e820340030c31e1a53dd9ee5997a3e5b8a Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Thu, 3 Aug 2017 07:32:58 -0500
Subject: [PATCH 118/148] PHPCS fix

---
 .../components/com_categories/models/fields/categoryparent.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php
index 4f77d61ad0191..6f3448508a946 100644
--- a/administrator/components/com_categories/models/fields/categoryparent.php
+++ b/administrator/components/com_categories/models/fields/categoryparent.php
@@ -14,7 +14,7 @@
 /**
  * Category Parent field.
  *
- * @since  1.6
+ * @since       1.6
  * @deprecated  4.0  Use categoryedit instead.
  */
 class JFormFieldCategoryParent extends JFormFieldList

From f70633e2ffa3bd7be40e2107eb93ca24f3281906 Mon Sep 17 00:00:00 2001
From: Elijah Madden <okonomiyaki3000@gmail.com>
Date: Thu, 3 Aug 2017 23:29:03 +0900
Subject: [PATCH 119/148] CodeMirror 5.28.0 (#17393)

---
 .../codemirror/addon/edit/matchbrackets.js    |   30 +-
 .../addon/edit/matchbrackets.min.js           |    2 +-
 .../editors/codemirror/addon/fold/foldcode.js |    2 +
 .../codemirror/addon/fold/foldcode.min.js     |    2 +-
 .../codemirror/addon/fold/indent-fold.js      |    2 +-
 .../codemirror/addon/fold/indent-fold.min.js  |    2 +-
 .../editors/codemirror/addon/hint/sql-hint.js |    9 +-
 .../codemirror/addon/hint/sql-hint.min.js     |    2 +-
 .../addon/lint/coffeescript-lint.js           |    6 +
 .../addon/lint/coffeescript-lint.min.js       |    2 +-
 .../editors/codemirror/addon/lint/css-lint.js |    7 +-
 .../codemirror/addon/lint/css-lint.min.js     |    2 +-
 .../codemirror/addon/lint/html-lint.js        |    7 +-
 .../codemirror/addon/lint/html-lint.min.js    |    2 +-
 .../codemirror/addon/lint/javascript-lint.js  |    7 +-
 .../addon/lint/javascript-lint.min.js         |    2 +-
 .../codemirror/addon/lint/json-lint.js        |    6 +
 .../codemirror/addon/lint/json-lint.min.js    |    2 +-
 media/editors/codemirror/addon/lint/lint.js   |    6 +-
 .../editors/codemirror/addon/lint/lint.min.js |    2 +-
 .../codemirror/addon/lint/yaml-lint.js        |    6 +
 .../codemirror/addon/lint/yaml-lint.min.js    |    2 +-
 media/editors/codemirror/addon/mode/simple.js |   11 +-
 .../codemirror/addon/mode/simple.min.js       |    2 +-
 .../addon/runmode/runmode-standalone.js       |    3 +-
 .../addon/runmode/runmode-standalone.min.js   |    2 +-
 .../codemirror/addon/runmode/runmode.min.js   |    2 +-
 .../codemirror/addon/runmode/runmode.node.js  |   14 +-
 .../editors/codemirror/addon/search/search.js |    2 +-
 .../codemirror/addon/search/search.min.js     |    2 +-
 .../codemirror/addon/search/searchcursor.js   |  404 +++--
 .../addon/search/searchcursor.min.js          |    2 +-
 media/editors/codemirror/addon/tern/tern.js   |   36 +-
 .../editors/codemirror/addon/tern/tern.min.js |    2 +-
 media/editors/codemirror/keymap/emacs.js      |    2 +-
 media/editors/codemirror/keymap/emacs.min.js  |    2 +-
 media/editors/codemirror/keymap/sublime.js    |   17 +
 .../editors/codemirror/keymap/sublime.min.js  |    2 +-
 media/editors/codemirror/keymap/vim.js        |   91 +-
 media/editors/codemirror/keymap/vim.min.js    |    6 +-
 media/editors/codemirror/lib/addons.js        |  521 +++---
 media/editors/codemirror/lib/addons.min.js    |    8 +-
 media/editors/codemirror/lib/codemirror.css   |    2 +-
 media/editors/codemirror/lib/codemirror.js    | 1451 +++++++++--------
 .../editors/codemirror/lib/codemirror.min.css |    2 +-
 .../editors/codemirror/lib/codemirror.min.js  |   12 +-
 media/editors/codemirror/mode/clike/clike.js  |   12 +-
 .../codemirror/mode/clike/clike.min.js        |    2 +-
 media/editors/codemirror/mode/css/css.js      |   11 +-
 media/editors/codemirror/mode/css/css.min.js  |    2 +-
 media/editors/codemirror/mode/dart/dart.js    |    2 +-
 .../editors/codemirror/mode/dart/dart.min.js  |    2 +-
 media/editors/codemirror/mode/elm/elm.js      |    2 +-
 media/editors/codemirror/mode/elm/elm.min.js  |    2 +-
 .../editors/codemirror/mode/factor/factor.js  |   50 +-
 .../codemirror/mode/factor/factor.min.js      |    2 +-
 media/editors/codemirror/mode/gfm/gfm.js      |    3 +-
 media/editors/codemirror/mode/gfm/gfm.min.js  |    2 +-
 media/editors/codemirror/mode/go/go.js        |    4 +-
 media/editors/codemirror/mode/go/go.min.js    |    2 +-
 .../editors/codemirror/mode/groovy/groovy.js  |    4 +-
 .../codemirror/mode/groovy/groovy.min.js      |    2 +-
 media/editors/codemirror/mode/haxe/haxe.js    |    2 +-
 .../editors/codemirror/mode/haxe/haxe.min.js  |    2 +-
 .../codemirror/mode/htmlmixed/htmlmixed.js    |    4 +-
 .../mode/htmlmixed/htmlmixed.min.js           |    2 +-
 .../codemirror/mode/javascript/javascript.js  |   45 +-
 .../mode/javascript/javascript.min.js         |    2 +-
 .../editors/codemirror/mode/jinja2/jinja2.js  |    2 +-
 .../codemirror/mode/jinja2/jinja2.min.js      |    2 +-
 media/editors/codemirror/mode/julia/julia.js  |   76 +-
 .../codemirror/mode/julia/julia.min.js        |    2 +-
 .../codemirror/mode/markdown/markdown.js      |  106 +-
 .../codemirror/mode/markdown/markdown.min.js  |    2 +-
 media/editors/codemirror/mode/meta.js         |    5 +-
 media/editors/codemirror/mode/meta.min.js     |    2 +-
 media/editors/codemirror/mode/mirc/mirc.js    |    2 +-
 .../editors/codemirror/mode/mirc/mirc.min.js  |    2 +-
 .../codemirror/mode/ntriples/ntriples.js      |   15 +-
 .../codemirror/mode/ntriples/ntriples.min.js  |    2 +-
 .../codemirror/mode/powershell/powershell.js  |    4 +-
 .../mode/powershell/powershell.min.js         |    2 +-
 .../editors/codemirror/mode/python/python.js  |    4 +-
 .../codemirror/mode/python/python.min.js      |    2 +-
 media/editors/codemirror/mode/q/q.js          |   14 +-
 media/editors/codemirror/mode/q/q.min.js      |    2 +-
 media/editors/codemirror/mode/rust/rust.js    |    1 +
 .../editors/codemirror/mode/rust/rust.min.js  |    2 +-
 media/editors/codemirror/mode/sass/sass.js    |    2 +-
 .../editors/codemirror/mode/sass/sass.min.js  |    2 +-
 .../editors/codemirror/mode/scheme/scheme.js  |    2 +-
 .../codemirror/mode/scheme/scheme.min.js      |    2 +-
 media/editors/codemirror/mode/shell/shell.js  |    4 +-
 .../codemirror/mode/shell/shell.min.js        |    2 +-
 media/editors/codemirror/mode/sieve/sieve.js  |    2 +-
 media/editors/codemirror/mode/solr/solr.js    |    4 +-
 .../editors/codemirror/mode/solr/solr.min.js  |    2 +-
 media/editors/codemirror/mode/soy/soy.js      |   21 +-
 media/editors/codemirror/mode/soy/soy.min.js  |    2 +-
 media/editors/codemirror/mode/sql/sql.js      |   47 +-
 media/editors/codemirror/mode/sql/sql.min.js  |    2 +-
 .../editors/codemirror/mode/stylus/stylus.js  |   10 +-
 .../codemirror/mode/stylus/stylus.min.js      |    2 +-
 .../codemirror/mode/textile/textile.js        |    2 +-
 .../codemirror/mode/textile/textile.min.js    |    2 +-
 media/editors/codemirror/mode/tiki/tiki.js    |   16 +-
 .../editors/codemirror/mode/tiki/tiki.min.js  |    2 +-
 media/editors/codemirror/mode/twig/twig.js    |    2 +-
 .../editors/codemirror/mode/twig/twig.min.js  |    2 +-
 media/editors/codemirror/mode/vb/vb.js        |    1 -
 media/editors/codemirror/mode/vb/vb.min.js    |    2 +-
 .../codemirror/mode/verilog/verilog.js        |    4 +-
 .../codemirror/mode/verilog/verilog.min.js    |    2 +-
 media/editors/codemirror/mode/yacas/yacas.js  |    2 +-
 .../codemirror/mode/yacas/yacas.min.js        |    2 +-
 media/editors/codemirror/theme/abcdef.css     |    2 +-
 media/editors/codemirror/theme/ambiance.css   |    2 +-
 media/editors/codemirror/theme/cobalt.css     |    2 +-
 media/editors/codemirror/theme/colorforth.css |    2 +-
 media/editors/codemirror/theme/dracula.css    |    2 +-
 .../editors/codemirror/theme/duotone-dark.css |    2 +-
 .../codemirror/theme/duotone-light.css        |    2 +-
 media/editors/codemirror/theme/eclipse.css    |    2 +-
 .../editors/codemirror/theme/erlang-dark.css  |    2 +-
 media/editors/codemirror/theme/icecoder.css   |    2 +-
 .../editors/codemirror/theme/lesser-dark.css  |    2 +-
 media/editors/codemirror/theme/liquibyte.css  |    6 +-
 media/editors/codemirror/theme/material.css   |    4 +-
 media/editors/codemirror/theme/mdn-like.css   |    2 +-
 media/editors/codemirror/theme/midnight.css   |    2 -
 media/editors/codemirror/theme/monokai.css    |    2 +-
 media/editors/codemirror/theme/night.css      |    2 +-
 .../editors/codemirror/theme/panda-syntax.css |    2 +-
 .../codemirror/theme/pastel-on-dark.css       |    2 +-
 media/editors/codemirror/theme/rubyblue.css   |    2 +-
 media/editors/codemirror/theme/seti.css       |    2 +-
 media/editors/codemirror/theme/solarized.css  |    2 +-
 media/editors/codemirror/theme/the-matrix.css |    2 +-
 media/editors/codemirror/theme/ttcn.css       |    2 +-
 media/editors/codemirror/theme/twilight.css   |    2 +-
 .../editors/codemirror/theme/vibrant-ink.css  |    2 +-
 media/editors/codemirror/theme/xq-dark.css    |    2 +-
 media/editors/codemirror/theme/xq-light.css   |    2 +-
 media/editors/codemirror/theme/yeti.css       |    2 +-
 plugins/editors/codemirror/codemirror.xml     |    2 +-
 145 files changed, 1969 insertions(+), 1360 deletions(-)

diff --git a/media/editors/codemirror/addon/edit/matchbrackets.js b/media/editors/codemirror/addon/edit/matchbrackets.js
index 76754ed557fe0..4d7a230855a0a 100644
--- a/media/editors/codemirror/addon/edit/matchbrackets.js
+++ b/media/editors/codemirror/addon/edit/matchbrackets.js
@@ -16,12 +16,21 @@
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
 
-  function findMatchingBracket(cm, where, strict, config) {
+  function findMatchingBracket(cm, where, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
-    var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
+    var afterCursor = config && config.afterCursor
+    if (afterCursor == null)
+      afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+
+    // A cursor is defined as between two characters, but in in vim command mode
+    // (i.e. not insert mode), the cursor is visually represented as a
+    // highlighted box on top of the 2nd character. Otherwise, we allow matches
+    // from before or after the cursor.
+    var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
+        matching[line.text.charAt(++pos)];
     if (!match) return null;
     var dir = match.charAt(1) == ">" ? 1 : -1;
-    if (strict && (dir > 0) != (pos == where.ch)) return null;
+    if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
     var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
@@ -69,7 +78,7 @@
     var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
-      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
       if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
@@ -113,8 +122,17 @@
   });
 
   CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
-    return findMatchingBracket(this, pos, strict, config);
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+    // Backwards-compatibility kludge
+    if (oldConfig || typeof config == "boolean") {
+      if (!oldConfig) {
+        config = config ? {strict: true} : null
+      } else {
+        oldConfig.strict = config
+        config = oldConfig
+      }
+    }
+    return findMatchingBracket(this, pos, config)
   });
   CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
     return scanForBracket(this, pos, dir, style, config);
diff --git a/media/editors/codemirror/addon/edit/matchbrackets.min.js b/media/editors/codemirror/addon/edit/matchbrackets.min.js
index 56c2c5e281ec0..7b0eda21f06b1 100644
--- a/media/editors/codemirror/addon/edit/matchbrackets.min.js
+++ b/media/editors/codemirror/addon/edit/matchbrackets.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,d,e){var f=a.getLineHandle(b.line),i=b.ch-1,j=i>=0&&h[f.text.charAt(i)]||h[f.text.charAt(++i)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&k>0!=(i==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,i+1)),m=c(a,g(b.line,i+(k>0?1:0)),k,l||null,e);return null==m?null:{from:g(b.line,i),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(c<0?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c!=(c>0?a.lastLine():a.firstLine())&&null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j<i.length;j++){var k=i[j].empty()&&b(a,i[j].head,!1,d);if(k&&a.getLine(k.from.line).length<=e){var l=k.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";h.push(a.markText(k.from,g(k.from.line,k.from.ch+1),{className:l})),k.to&&a.getLine(k.to.line).length<=e&&h.push(a.markText(k.to,g(k.to.line,k.to.ch+1),{className:l}))}}if(h.length){f&&a.state.focused&&a.focus();var m=function(){a.operation((function(){for(var a=0;a<h.length;a++)h[a].clear()}))};if(!c)return m;setTimeout(m,800)}}function e(a){a.operation((function(){i&&(i(),i=null),i=d(a,!1,a.state.matchBrackets)}))}var f=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),g=a.Pos,h={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"},i=null;a.defineOption("matchBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),i&&(i(),i=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))})),a.defineExtension("matchBrackets",(function(){d(this,!0)})),a.defineExtension("findMatchingBracket",(function(a,c,d){return b(this,a,c,d)})),a.defineExtension("scanForBracket",(function(a,b,d,e){return c(this,a,b,d,e)}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,d){var e=a.getLineHandle(b.line),f=b.ch-1,i=d&&d.afterCursor;null==i&&(i=/(^| )cm-fat-cursor($| )/.test(a.getWrapperElement().className));var j=!i&&f>=0&&h[e.text.charAt(f)]||h[e.text.charAt(++f)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&d.strict&&k>0!=(f==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,f+1)),m=c(a,g(b.line,f+(k>0?1:0)),k,l||null,d);return null==m?null:{from:g(b.line,f),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(c<0?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c!=(c>0?a.lastLine():a.firstLine())&&null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j<i.length;j++){var k=i[j].empty()&&b(a,i[j].head,d);if(k&&a.getLine(k.from.line).length<=e){var l=k.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";h.push(a.markText(k.from,g(k.from.line,k.from.ch+1),{className:l})),k.to&&a.getLine(k.to.line).length<=e&&h.push(a.markText(k.to,g(k.to.line,k.to.ch+1),{className:l}))}}if(h.length){f&&a.state.focused&&a.focus();var m=function(){a.operation((function(){for(var a=0;a<h.length;a++)h[a].clear()}))};if(!c)return m;setTimeout(m,800)}}function e(a){a.operation((function(){i&&(i(),i=null),i=d(a,!1,a.state.matchBrackets)}))}var f=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),g=a.Pos,h={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"},i=null;a.defineOption("matchBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),i&&(i(),i=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))})),a.defineExtension("matchBrackets",(function(){d(this,!0)})),a.defineExtension("findMatchingBracket",(function(a,c,d){return(d||"boolean"==typeof c)&&(d?(d.strict=c,c=d):c=c?{strict:!0}:null),b(this,a,c)})),a.defineExtension("scanForBracket",(function(a,b,d,e){return c(this,a,b,d,e)}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/fold/foldcode.js b/media/editors/codemirror/addon/fold/foldcode.js
index 78b36c4641985..826766b69fc1c 100644
--- a/media/editors/codemirror/addon/fold/foldcode.js
+++ b/media/editors/codemirror/addon/fold/foldcode.js
@@ -65,6 +65,8 @@
       widget = document.createElement("span");
       widget.appendChild(text);
       widget.className = "CodeMirror-foldmarker";
+    } else if (widget) {
+      widget = widget.cloneNode(true)
     }
     return widget;
   }
diff --git a/media/editors/codemirror/addon/fold/foldcode.min.js b/media/editors/codemirror/addon/fold/foldcode.min.js
index 8d46b144b963a..3b22c7eb494ac 100644
--- a/media/editors/codemirror/addon/fold/foldcode.min.js
+++ b/media/editors/codemirror/addon/fold/foldcode.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,e,f,g){function h(a){var c=i(b,e);if(!c||c.to.line-c.from.line<j)return null;for(var d=b.findMarksAt(c.from),f=0;f<d.length;++f)if(d[f].__isFold&&"fold"!==g){if(!a)return null;c.cleared=!0,d[f].clear()}return c}if(f&&f.call){var i=f;f=null}else var i=d(b,f,"rangeFinder");"number"==typeof e&&(e=a.Pos(e,0));var j=d(b,f,"minFoldSize"),k=h(!0);if(d(b,f,"scanUp"))for(;!k&&e.line>b.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",(function(b){m.clear(),a.e_preventDefault(b)}));var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",(function(c,d){a.signal(b,"unfold",b,c,d)})),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",(function(a,c,d){b(this,a,c,d)})),a.defineExtension("isFolded",(function(a){for(var b=this.findMarksAt(a),c=0;c<b.length;++c)if(b[c].__isFold)return!0})),a.commands.toggleFold=function(a){a.foldCode(a.getCursor())},a.commands.fold=function(a){a.foldCode(a.getCursor(),null,"fold")},a.commands.unfold=function(a){a.foldCode(a.getCursor(),null,"unfold")},a.commands.foldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"fold")}))},a.commands.unfoldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"unfold")}))},a.registerHelper("fold","combine",(function(){var a=Array.prototype.slice.call(arguments,0);return function(b,c){for(var d=0;d<a.length;++d){var e=a[d](b,c);if(e)return e}}})),a.registerHelper("fold","auto",(function(a,b){for(var c=a.getHelpers(b,"fold"),d=0;d<c.length;d++){var e=c[d](a,b);if(e)return e}}));var e={rangeFinder:a.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};a.defineOption("foldOptions",null),a.defineExtension("foldOption",(function(a,b){return d(this,a,b)}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,e,f,g){function h(a){var c=i(b,e);if(!c||c.to.line-c.from.line<j)return null;for(var d=b.findMarksAt(c.from),f=0;f<d.length;++f)if(d[f].__isFold&&"fold"!==g){if(!a)return null;c.cleared=!0,d[f].clear()}return c}if(f&&f.call){var i=f;f=null}else var i=d(b,f,"rangeFinder");"number"==typeof e&&(e=a.Pos(e,0));var j=d(b,f,"minFoldSize"),k=h(!0);if(d(b,f,"scanUp"))for(;!k&&e.line>b.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",(function(b){m.clear(),a.e_preventDefault(b)}));var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",(function(c,d){a.signal(b,"unfold",b,c,d)})),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}else c&&(c=c.cloneNode(!0));return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",(function(a,c,d){b(this,a,c,d)})),a.defineExtension("isFolded",(function(a){for(var b=this.findMarksAt(a),c=0;c<b.length;++c)if(b[c].__isFold)return!0})),a.commands.toggleFold=function(a){a.foldCode(a.getCursor())},a.commands.fold=function(a){a.foldCode(a.getCursor(),null,"fold")},a.commands.unfold=function(a){a.foldCode(a.getCursor(),null,"unfold")},a.commands.foldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"fold")}))},a.commands.unfoldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"unfold")}))},a.registerHelper("fold","combine",(function(){var a=Array.prototype.slice.call(arguments,0);return function(b,c){for(var d=0;d<a.length;++d){var e=a[d](b,c);if(e)return e}}})),a.registerHelper("fold","auto",(function(a,b){for(var c=a.getHelpers(b,"fold"),d=0;d<c.length;d++){var e=c[d](a,b);if(e)return e}}));var e={rangeFinder:a.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};a.defineOption("foldOptions",null),a.defineExtension("foldOption",(function(a,b){return d(this,a,b)}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/fold/indent-fold.js b/media/editors/codemirror/addon/fold/indent-fold.js
index 743150c6238e0..f93edec22c1fb 100644
--- a/media/editors/codemirror/addon/fold/indent-fold.js
+++ b/media/editors/codemirror/addon/fold/indent-fold.js
@@ -18,7 +18,7 @@ function lineIndent(cm, lineNo) {
     return -1
   return CodeMirror.countColumn(text, null, cm.getOption("tabSize"))
 }
-               !
+
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var myIndent = lineIndent(cm, start.line)
   if (myIndent < 0) return
diff --git a/media/editors/codemirror/addon/fold/indent-fold.min.js b/media/editors/codemirror/addon/fold/indent-fold.min.js
index a45fffc16e44a..f5d8bca02c9d5 100644
--- a/media/editors/codemirror/addon/fold/indent-fold.min.js
+++ b/media/editors/codemirror/addon/fold/indent-fold.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c){var d=b.getLine(c),e=d.search(/\S/);return e==-1||/\bcomment\b/.test(b.getTokenTypeAt(a.Pos(c,e+1)))?-1:a.countColumn(d,null,b.getOption("tabSize"))}!a.registerHelper("fold","indent",(function(c,d){var e=b(c,d.line);if(!(e<0)){for(var f=null,g=d.line+1,h=c.lastLine();g<=h;++g){var i=b(c,g);if(i==-1);else{if(!(i>e))break;f=g}}return f?{from:a.Pos(d.line,c.getLine(d.line).length),to:a.Pos(f,c.getLine(f).length)}:void 0}}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c){var d=b.getLine(c),e=d.search(/\S/);return e==-1||/\bcomment\b/.test(b.getTokenTypeAt(a.Pos(c,e+1)))?-1:a.countColumn(d,null,b.getOption("tabSize"))}a.registerHelper("fold","indent",(function(c,d){var e=b(c,d.line);if(!(e<0)){for(var f=null,g=d.line+1,h=c.lastLine();g<=h;++g){var i=b(c,g);if(i==-1);else{if(!(i>e))break;f=g}}return f?{from:a.Pos(d.line,c.getLine(d.line).length),to:a.Pos(f,c.getLine(f).length)}:void 0}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/hint/sql-hint.js b/media/editors/codemirror/addon/hint/sql-hint.js
index e95b6bb4e9ff2..f5ec2cac1fb04 100644
--- a/media/editors/codemirror/addon/hint/sql-hint.js
+++ b/media/editors/codemirror/addon/hint/sql-hint.js
@@ -185,12 +185,9 @@
   }
 
   function eachWord(lineText, f) {
-    if (!lineText) return;
-    var excepted = /[,;]/g;
-    var words = lineText.split(" ");
-    for (var i = 0; i < words.length; i++) {
-      f(words[i]?words[i].replace(excepted, '') : '');
-    }
+    var words = lineText.split(/\s+/)
+    for (var i = 0; i < words.length; i++)
+      if (words[i]) f(words[i].replace(/[,;]/g, ''))
   }
 
   function findTableByAlias(alias, editor) {
diff --git a/media/editors/codemirror/addon/hint/sql-hint.min.js b/media/editors/codemirror/addon/hint/sql-hint.min.js
index 958cd454a7f1c..382996c19dabe 100644
--- a/media/editors/codemirror/addon/hint/sql-hint.min.js
+++ b/media/editors/codemirror/addon/hint/sql-hint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/sql/sql")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/sql/sql"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return"[object Array]"==Object.prototype.toString.call(a)}function c(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).keywords}function d(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).identifierQuote||"`"}function e(a){return"string"==typeof a?a:a.text}function f(a,c){return b(c)&&(c={columns:c}),c.text||(c.text=a),c}function g(a){var c={};if(b(a))for(var d=a.length-1;d>=0;d--){var g=a[d];c[e(g).toUpperCase()]=f(e(g),g)}else if(a)for(var h in a)c[h.toUpperCase()]=f(h,a[h]);return c}function h(a){return q[a.toUpperCase()]}function i(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function j(a,b){var c=a.length,d=e(b).substr(0,c);return a.toUpperCase()===d.toUpperCase()}function k(a,c,d,e){if(b(d))for(var f=0;f<d.length;f++)j(c,d[f])&&a.push(e(d[f]));else for(var g in d)if(d.hasOwnProperty(g)){var h=d[g];h=h&&h!==!0?h.displayText?{text:h.text,displayText:h.displayText}:h.text:g,j(c,h)&&a.push(e(h))}}function l(a){"."==a.charAt(0)&&(a=a.substr(1));for(var b=a.split(t+t),c=0;c<b.length;c++)b[c]=b[c].replace(new RegExp(t,"g"),"");return b.join(t)}function m(a){for(var b=e(a).split("."),c=0;c<b.length;c++)b[c]=t+b[c].replace(new RegExp(t,"g"),t+t)+t;var d=b.join(".");return"string"==typeof a?d:(a=i(a),a.text=d,a)}function n(a,b,c,d){for(var e=!1,f=[],g=b.start,j=!0;j;)j="."==b.string.charAt(0),e=e||b.string.charAt(0)==t,g=b.start,f.unshift(l(b.string)),b=d.getTokenAt(v(a.line,b.start)),"."==b.string&&(j=!0,b=d.getTokenAt(v(a.line,b.start)));var n=f.join(".");k(c,n,q,(function(a){return e?m(a):a})),k(c,n,r,(function(a){return e?m(a):a})),n=f.pop();var o=f.join("."),s=!1,u=o;if(!h(o)){var w=o;o=p(o,d),o!==w&&(s=!0)}var x=h(o);return x&&x.columns&&(x=x.columns),x&&k(c,n,x,(function(a){var b=o;return 1==s&&(b=u),"string"==typeof a?a=b+"."+a:(a=i(a),a.text=b+"."+a.text),e?m(a):a})),g}function o(a,b){if(a)for(var c=/[,;]/g,d=a.split(" "),e=0;e<d.length;e++)b(d[e]?d[e].replace(c,""):"")}function p(a,b){for(var c=b.doc,d=c.getValue(),e=a.toUpperCase(),f="",g="",i=[],j={start:v(0,0),end:v(b.lastLine(),b.getLineHandle(b.lastLine()).length)},k=d.indexOf(u.QUERY_DIV);k!=-1;)i.push(c.posFromIndex(k)),k=d.indexOf(u.QUERY_DIV,k+1);i.unshift(v(0,0)),i.push(v(b.lastLine(),b.getLineHandle(b.lastLine()).text.length));for(var l=null,m=b.getCursor(),n=0;n<i.length;n++){if((null==l||w(m,l)>0)&&w(m,i[n])<=0){j={start:l,end:i[n]};break}l=i[n]}for(var p=c.getRange(j.start,j.end,!1),n=0;n<p.length;n++){var q=p[n];if(o(q,(function(a){var b=a.toUpperCase();b===e&&h(f)&&(g=f),b!==u.ALIAS_KEYWORD&&(f=a)})),g)break}return g}var q,r,s,t,u={QUERY_DIV:";",ALIAS_KEYWORD:"AS"},v=a.Pos,w=a.cmpPos;a.registerHelper("hint","sql",(function(a,b){q=g(b&&b.tables);var e=b&&b.defaultTable,f=b&&b.disableKeywords;r=e&&h(e),s=c(a),t=d(a),e&&!r&&(r=p(e,a)),r=r||[],r.columns&&(r=r.columns);var i,j,l,m=a.getCursor(),o=[],u=a.getTokenAt(m);return u.end>m.ch&&(u.end=m.ch,u.string=u.string.slice(0,m.ch-u.start)),u.string.match(/^[.`"\w@]\w*$/)?(l=u.string,i=u.start,j=u.end):(i=j=m.ch,l=""),"."==l.charAt(0)||l.charAt(0)==t?i=n(m,u,o,a):(k(o,l,q,(function(a){return a})),k(o,l,r,(function(a){return a})),f||k(o,l,s,(function(a){return a.toUpperCase()}))),{list:o,from:v(m.line,i),to:v(m.line,j)}}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/sql/sql")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/sql/sql"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return"[object Array]"==Object.prototype.toString.call(a)}function c(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).keywords}function d(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).identifierQuote||"`"}function e(a){return"string"==typeof a?a:a.text}function f(a,c){return b(c)&&(c={columns:c}),c.text||(c.text=a),c}function g(a){var c={};if(b(a))for(var d=a.length-1;d>=0;d--){var g=a[d];c[e(g).toUpperCase()]=f(e(g),g)}else if(a)for(var h in a)c[h.toUpperCase()]=f(h,a[h]);return c}function h(a){return q[a.toUpperCase()]}function i(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function j(a,b){var c=a.length,d=e(b).substr(0,c);return a.toUpperCase()===d.toUpperCase()}function k(a,c,d,e){if(b(d))for(var f=0;f<d.length;f++)j(c,d[f])&&a.push(e(d[f]));else for(var g in d)if(d.hasOwnProperty(g)){var h=d[g];h=h&&h!==!0?h.displayText?{text:h.text,displayText:h.displayText}:h.text:g,j(c,h)&&a.push(e(h))}}function l(a){"."==a.charAt(0)&&(a=a.substr(1));for(var b=a.split(t+t),c=0;c<b.length;c++)b[c]=b[c].replace(new RegExp(t,"g"),"");return b.join(t)}function m(a){for(var b=e(a).split("."),c=0;c<b.length;c++)b[c]=t+b[c].replace(new RegExp(t,"g"),t+t)+t;var d=b.join(".");return"string"==typeof a?d:(a=i(a),a.text=d,a)}function n(a,b,c,d){for(var e=!1,f=[],g=b.start,j=!0;j;)j="."==b.string.charAt(0),e=e||b.string.charAt(0)==t,g=b.start,f.unshift(l(b.string)),b=d.getTokenAt(v(a.line,b.start)),"."==b.string&&(j=!0,b=d.getTokenAt(v(a.line,b.start)));var n=f.join(".");k(c,n,q,(function(a){return e?m(a):a})),k(c,n,r,(function(a){return e?m(a):a})),n=f.pop();var o=f.join("."),s=!1,u=o;if(!h(o)){var w=o;o=p(o,d),o!==w&&(s=!0)}var x=h(o);return x&&x.columns&&(x=x.columns),x&&k(c,n,x,(function(a){var b=o;return 1==s&&(b=u),"string"==typeof a?a=b+"."+a:(a=i(a),a.text=b+"."+a.text),e?m(a):a})),g}function o(a,b){for(var c=a.split(/\s+/),d=0;d<c.length;d++)c[d]&&b(c[d].replace(/[,;]/g,""))}function p(a,b){for(var c=b.doc,d=c.getValue(),e=a.toUpperCase(),f="",g="",i=[],j={start:v(0,0),end:v(b.lastLine(),b.getLineHandle(b.lastLine()).length)},k=d.indexOf(u.QUERY_DIV);k!=-1;)i.push(c.posFromIndex(k)),k=d.indexOf(u.QUERY_DIV,k+1);i.unshift(v(0,0)),i.push(v(b.lastLine(),b.getLineHandle(b.lastLine()).text.length));for(var l=null,m=b.getCursor(),n=0;n<i.length;n++){if((null==l||w(m,l)>0)&&w(m,i[n])<=0){j={start:l,end:i[n]};break}l=i[n]}for(var p=c.getRange(j.start,j.end,!1),n=0;n<p.length;n++){var q=p[n];if(o(q,(function(a){var b=a.toUpperCase();b===e&&h(f)&&(g=f),b!==u.ALIAS_KEYWORD&&(f=a)})),g)break}return g}var q,r,s,t,u={QUERY_DIV:";",ALIAS_KEYWORD:"AS"},v=a.Pos,w=a.cmpPos;a.registerHelper("hint","sql",(function(a,b){q=g(b&&b.tables);var e=b&&b.defaultTable,f=b&&b.disableKeywords;r=e&&h(e),s=c(a),t=d(a),e&&!r&&(r=p(e,a)),r=r||[],r.columns&&(r=r.columns);var i,j,l,m=a.getCursor(),o=[],u=a.getTokenAt(m);return u.end>m.ch&&(u.end=m.ch,u.string=u.string.slice(0,m.ch-u.start)),u.string.match(/^[.`"\w@]\w*$/)?(l=u.string,i=u.start,j=u.end):(i=j=m.ch,l=""),"."==l.charAt(0)||l.charAt(0)==t?i=n(m,u,o,a):(k(o,l,q,(function(a){return a})),k(o,l,r,(function(a){return a})),f||k(o,l,s,(function(a){return a.toUpperCase()}))),{list:o,from:v(m.line,i),to:v(m.line,j)}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/coffeescript-lint.js b/media/editors/codemirror/addon/lint/coffeescript-lint.js
index 7e39428f7a664..70621a1bddf1f 100644
--- a/media/editors/codemirror/addon/lint/coffeescript-lint.js
+++ b/media/editors/codemirror/addon/lint/coffeescript-lint.js
@@ -17,6 +17,12 @@
 
 CodeMirror.registerHelper("lint", "coffeescript", function(text) {
   var found = [];
+  if (!window.coffeelint) {
+    if (window.console) {
+      window.console.error("Error: window.coffeelint not defined, CodeMirror CoffeeScript linting cannot run.");
+    }
+    return found;
+  }
   var parseError = function(err) {
     var loc = err.lineNumber;
     found.push({from: CodeMirror.Pos(loc-1, 0),
diff --git a/media/editors/codemirror/addon/lint/coffeescript-lint.min.js b/media/editors/codemirror/addon/lint/coffeescript-lint.min.js
index d516859025d01..82601c69ea260 100644
--- a/media/editors/codemirror/addon/lint/coffeescript-lint.min.js
+++ b/media/editors/codemirror/addon/lint/coffeescript-lint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","coffeescript",(function(b){var c=[],d=function(b){var d=b.lineNumber;c.push({from:a.Pos(d-1,0),to:a.Pos(d,0),severity:b.level,message:b.message})};try{for(var e=coffeelint.lint(b),f=0;f<e.length;f++)d(e[f])}catch(b){c.push({from:a.Pos(b.location.first_line,0),to:a.Pos(b.location.last_line,b.location.last_column),severity:"error",message:b.message})}return c}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","coffeescript",(function(b){var c=[];if(!window.coffeelint)return window.console&&window.console.error("Error: window.coffeelint not defined, CodeMirror CoffeeScript linting cannot run."),c;var d=function(b){var d=b.lineNumber;c.push({from:a.Pos(d-1,0),to:a.Pos(d,0),severity:b.level,message:b.message})};try{for(var e=coffeelint.lint(b),f=0;f<e.length;f++)d(e[f])}catch(b){c.push({from:a.Pos(b.location.first_line,0),to:a.Pos(b.location.last_line,b.location.last_column),severity:"error",message:b.message})}return c}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/css-lint.js b/media/editors/codemirror/addon/lint/css-lint.js
index 1f61b479b2afd..b7e1a4fe5de24 100644
--- a/media/editors/codemirror/addon/lint/css-lint.js
+++ b/media/editors/codemirror/addon/lint/css-lint.js
@@ -17,7 +17,12 @@
 
 CodeMirror.registerHelper("lint", "css", function(text) {
   var found = [];
-  if (!window.CSSLint) return found;
+  if (!window.CSSLint) {
+    if (window.console) {
+        window.console.error("Error: window.CSSLint not defined, CodeMirror CSS linting cannot run.");
+    }
+    return found;
+  }
   var results = CSSLint.verify(text), messages = results.messages, message = null;
   for ( var i = 0; i < messages.length; i++) {
     message = messages[i];
diff --git a/media/editors/codemirror/addon/lint/css-lint.min.js b/media/editors/codemirror/addon/lint/css-lint.min.js
index fbccf71fb42df..8695403a3519a 100644
--- a/media/editors/codemirror/addon/lint/css-lint.min.js
+++ b/media/editors/codemirror/addon/lint/css-lint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","css",(function(b){var c=[];if(!window.CSSLint)return c;for(var d=CSSLint.verify(b),e=d.messages,f=null,g=0;g<e.length;g++){f=e[g];var h=f.line-1,i=f.line-1,j=f.col-1,k=f.col;c.push({from:a.Pos(h,j),to:a.Pos(i,k),message:f.message,severity:f.type})}return c}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","css",(function(b){var c=[];if(!window.CSSLint)return window.console&&window.console.error("Error: window.CSSLint not defined, CodeMirror CSS linting cannot run."),c;for(var d=CSSLint.verify(b),e=d.messages,f=null,g=0;g<e.length;g++){f=e[g];var h=f.line-1,i=f.line-1,j=f.col-1,k=f.col;c.push({from:a.Pos(h,j),to:a.Pos(i,k),message:f.message,severity:f.type})}return c}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/html-lint.js b/media/editors/codemirror/addon/lint/html-lint.js
index 1e8417098d0c2..98c36b0b642e2 100644
--- a/media/editors/codemirror/addon/lint/html-lint.js
+++ b/media/editors/codemirror/addon/lint/html-lint.js
@@ -29,7 +29,12 @@
 
   CodeMirror.registerHelper("lint", "html", function(text, options) {
     var found = [];
-    if (!window.HTMLHint) return found;
+    if (!window.HTMLHint) {
+      if (window.console) {
+          window.console.error("Error: window.HTMLHint not defined, CodeMirror HTML linting cannot run.");
+      }
+      return found;
+    }
     var messages = HTMLHint.verify(text, options && options.rules || defaultRules);
     for (var i = 0; i < messages.length; i++) {
       var message = messages[i];
diff --git a/media/editors/codemirror/addon/lint/html-lint.min.js b/media/editors/codemirror/addon/lint/html-lint.min.js
index 9d62f8c653e91..7b60fdce708be 100644
--- a/media/editors/codemirror/addon/lint/html-lint.min.js
+++ b/media/editors/codemirror/addon/lint/html-lint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("htmlhint")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","htmlhint"],a):a(CodeMirror)})((function(a){"use strict";var b={"tagname-lowercase":!0,"attr-lowercase":!0,"attr-value-double-quotes":!0,"doctype-first":!1,"tag-pair":!0,"spec-char-escape":!0,"id-unique":!0,"src-not-empty":!0,"attr-no-duplication":!0};a.registerHelper("lint","html",(function(c,d){var e=[];if(!window.HTMLHint)return e;for(var f=HTMLHint.verify(c,d&&d.rules||b),g=0;g<f.length;g++){var h=f[g],i=h.line-1,j=h.line-1,k=h.col-1,l=h.col;e.push({from:a.Pos(i,k),to:a.Pos(j,l),message:h.message,severity:h.type})}return e}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("htmlhint")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","htmlhint"],a):a(CodeMirror)})((function(a){"use strict";var b={"tagname-lowercase":!0,"attr-lowercase":!0,"attr-value-double-quotes":!0,"doctype-first":!1,"tag-pair":!0,"spec-char-escape":!0,"id-unique":!0,"src-not-empty":!0,"attr-no-duplication":!0};a.registerHelper("lint","html",(function(c,d){var e=[];if(!window.HTMLHint)return window.console&&window.console.error("Error: window.HTMLHint not defined, CodeMirror HTML linting cannot run."),e;for(var f=HTMLHint.verify(c,d&&d.rules||b),g=0;g<f.length;g++){var h=f[g],i=h.line-1,j=h.line-1,k=h.col-1,l=h.col;e.push({from:a.Pos(i,k),to:a.Pos(j,l),message:h.message,severity:h.type})}return e}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/javascript-lint.js b/media/editors/codemirror/addon/lint/javascript-lint.js
index d4f2ae9a1faac..c58f785025872 100644
--- a/media/editors/codemirror/addon/lint/javascript-lint.js
+++ b/media/editors/codemirror/addon/lint/javascript-lint.js
@@ -22,7 +22,12 @@
                  "Unclosed string", "Stopping, unable to continue" ];
 
   function validator(text, options) {
-    if (!window.JSHINT) return [];
+    if (!window.JSHINT) {
+      if (window.console) {
+        window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run.");
+      }
+      return [];
+    }
     JSHINT(text, options, options.globals);
     var errors = JSHINT.data().errors, result = [];
     if (errors) parseErrors(errors, result);
diff --git a/media/editors/codemirror/addon/lint/javascript-lint.min.js b/media/editors/codemirror/addon/lint/javascript-lint.min.js
index 2a7444321e156..16a3d95bc0add 100644
--- a/media/editors/codemirror/addon/lint/javascript-lint.min.js
+++ b/media/editors/codemirror/addon/lint/javascript-lint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){if(!window.JSHINT)return[];JSHINT(a,b,b.globals);var c=JSHINT.data().errors,d=[];return c&&f(c,d),d}function c(a){return d(a,h,"warning",!0),d(a,i,"error"),e(a)?null:a}function d(a,b,c,d){var e,f,g,h,i;e=a.description;for(var j=0;j<b.length;j++)f=b[j],g="string"==typeof f?f:f[0],h="string"==typeof f?null:f[1],i=e.indexOf(g)!==-1,(d||i)&&(a.severity=c),i&&h&&(a.description=h)}function e(a){for(var b=a.description,c=0;c<g.length;c++)if(b.indexOf(g[c])!==-1)return!0;return!1}function f(b,d){for(var e=0;e<b.length;e++){var f=b[e];if(f){var g,h;if(g=[],f.evidence){var i=g[f.line];if(!i){var j=f.evidence;i=[],Array.prototype.forEach.call(j,(function(a,b){"\t"===a&&i.push(b+1)})),g[f.line]=i}if(i.length>0){var k=f.character;i.forEach((function(a){k>a&&(k-=1)})),f.character=k}}var l=f.character-1,m=l+1;f.evidence&&(h=f.evidence.substring(l).search(/.\b/),h>-1&&(m+=h)),f.description=f.reason,f.start=f.character,f.end=m,f=c(f),f&&d.push({message:f.description,severity:f.severity,from:a.Pos(f.line-1,l),to:a.Pos(f.line-1,m)})}}}var g=["Dangerous comment"],h=[["Expected '{'","Statement body should be inside '{ }' braces."]],i=["Missing semicolon","Extra comma","Missing property name","Unmatched "," and instead saw"," is not defined","Unclosed string","Stopping, unable to continue"];a.registerHelper("lint","javascript",b)}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){if(!window.JSHINT)return window.console&&window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run."),[];JSHINT(a,b,b.globals);var c=JSHINT.data().errors,d=[];return c&&f(c,d),d}function c(a){return d(a,h,"warning",!0),d(a,i,"error"),e(a)?null:a}function d(a,b,c,d){var e,f,g,h,i;e=a.description;for(var j=0;j<b.length;j++)f=b[j],g="string"==typeof f?f:f[0],h="string"==typeof f?null:f[1],i=e.indexOf(g)!==-1,(d||i)&&(a.severity=c),i&&h&&(a.description=h)}function e(a){for(var b=a.description,c=0;c<g.length;c++)if(b.indexOf(g[c])!==-1)return!0;return!1}function f(b,d){for(var e=0;e<b.length;e++){var f=b[e];if(f){var g,h;if(g=[],f.evidence){var i=g[f.line];if(!i){var j=f.evidence;i=[],Array.prototype.forEach.call(j,(function(a,b){"\t"===a&&i.push(b+1)})),g[f.line]=i}if(i.length>0){var k=f.character;i.forEach((function(a){k>a&&(k-=1)})),f.character=k}}var l=f.character-1,m=l+1;f.evidence&&(h=f.evidence.substring(l).search(/.\b/),h>-1&&(m+=h)),f.description=f.reason,f.start=f.character,f.end=m,f=c(f),f&&d.push({message:f.description,severity:f.severity,from:a.Pos(f.line-1,l),to:a.Pos(f.line-1,m)})}}}var g=["Dangerous comment"],h=[["Expected '{'","Statement body should be inside '{ }' braces."]],i=["Missing semicolon","Extra comma","Missing property name","Unmatched "," and instead saw"," is not defined","Unclosed string","Stopping, unable to continue"];a.registerHelper("lint","javascript",b)}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/json-lint.js b/media/editors/codemirror/addon/lint/json-lint.js
index 9dbb616b3b440..849641ee5e1c9 100644
--- a/media/editors/codemirror/addon/lint/json-lint.js
+++ b/media/editors/codemirror/addon/lint/json-lint.js
@@ -17,6 +17,12 @@
 
 CodeMirror.registerHelper("lint", "json", function(text) {
   var found = [];
+  if (!window.jsonlint) {
+    if (window.console) {
+      window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run.");
+    }
+    return found;
+  }
   jsonlint.parseError = function(str, hash) {
     var loc = hash.loc;
     found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
diff --git a/media/editors/codemirror/addon/lint/json-lint.min.js b/media/editors/codemirror/addon/lint/json-lint.min.js
index a382f4390a7de..8b29b49c845ed 100644
--- a/media/editors/codemirror/addon/lint/json-lint.min.js
+++ b/media/editors/codemirror/addon/lint/json-lint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","json",(function(b){var c=[];jsonlint.parseError=function(b,d){var e=d.loc;c.push({from:a.Pos(e.first_line-1,e.first_column),to:a.Pos(e.last_line-1,e.last_column),message:b})};try{jsonlint.parse(b)}catch(a){}return c}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","json",(function(b){var c=[];if(!window.jsonlint)return window.console&&window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run."),c;jsonlint.parseError=function(b,d){var e=d.loc;c.push({from:a.Pos(e.first_line-1,e.first_column),to:a.Pos(e.last_line-1,e.last_column),message:b})};try{jsonlint.parse(b)}catch(a){}return c}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/lint.js b/media/editors/codemirror/addon/lint/lint.js
index 4e0c71fb65f0f..825065ed2aaba 100644
--- a/media/editors/codemirror/addon/lint/lint.js
+++ b/media/editors/codemirror/addon/lint/lint.js
@@ -112,7 +112,11 @@
     if (!severity) severity = "error";
     var tip = document.createElement("div");
     tip.className = "CodeMirror-lint-message-" + severity;
-    tip.appendChild(document.createTextNode(ann.message));
+    if (typeof ann.messageHTML != 'undefined') {
+        tip.innerHTML = ann.messageHTML;
+    } else {
+        tip.appendChild(document.createTextNode(ann.message));
+    }
     return tip;
   }
 
diff --git a/media/editors/codemirror/addon/lint/lint.min.js b/media/editors/codemirror/addon/lint/lint.min.js
index 5d35ee6cfb33f..8c5cbde55c918 100644
--- a/media/editors/codemirror/addon/lint/lint.min.js
+++ b/media/editors/codemirror/addon/lint/lint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c){function d(b){return e.parentNode?(e.style.top=Math.max(0,b.clientY-e.offsetHeight-5)+"px",void(e.style.left=b.clientX+5+"px")):a.off(document,"mousemove",d)}var e=document.createElement("div");return e.className="CodeMirror-lint-tooltip",e.appendChild(c.cloneNode(!0)),document.body.appendChild(e),a.on(document,"mousemove",d),d(b),null!=e.style.opacity&&(e.style.opacity=1),e}function c(a){a.parentNode&&a.parentNode.removeChild(a)}function d(a){a.parentNode&&(null==a.style.opacity&&c(a),a.style.opacity=0,setTimeout((function(){c(a)}),600))}function e(c,e,f){function g(){a.off(f,"mouseout",g),h&&(d(h),h=null)}var h=b(c,e),i=setInterval((function(){if(h)for(var a=f;;a=a.parentNode){if(a&&11==a.nodeType&&(a=a.host),a==document.body)return;if(!a){g();break}}if(!h)return clearInterval(i)}),400);a.on(f,"mouseout",g)}function f(a,b,c){this.marked=[],this.options=b,this.timeout=null,this.hasGutter=c,this.onMouseOver=function(b){r(a,b)},this.waitingFor=0}function g(a,b){return b instanceof Function?{getAnnotations:b}:(b&&b!==!0||(b={}),b)}function h(a){var b=a.state.lint;b.hasGutter&&a.clearGutter(s);for(var c=0;c<b.marked.length;++c)b.marked[c].clear();b.marked.length=0}function i(b,c,d,f){var g=document.createElement("div"),h=g;return g.className="CodeMirror-lint-marker-"+c,d&&(h=g.appendChild(document.createElement("div")),h.className="CodeMirror-lint-marker-multiple"),0!=f&&a.on(h,"mouseover",(function(a){e(a,b,h)})),g}function j(a,b){return"error"==a?a:b}function k(a){for(var b=[],c=0;c<a.length;++c){var d=a[c],e=d.from.line;(b[e]||(b[e]=[])).push(d)}return b}function l(a){var b=a.severity;b||(b="error");var c=document.createElement("div");return c.className="CodeMirror-lint-message-"+b,c.appendChild(document.createTextNode(a.message)),c}function m(b,c,d){function e(){g=-1,b.off("change",e)}var f=b.state.lint,g=++f.waitingFor;b.on("change",e),c(b.getValue(),(function(c,d){b.off("change",e),f.waitingFor==g&&(d&&c instanceof a&&(c=d),o(b,c))}),d,b)}function n(b){var c=b.state.lint,d=c.options,e=d.options||d,f=d.getAnnotations||b.getHelper(a.Pos(0,0),"lint");if(f)if(d.async||f.async)m(b,f,e);else{var g=f(b.getValue(),e,b);if(!g)return;g.then?g.then((function(a){o(b,a)})):o(b,g)}}function o(a,b){h(a);for(var c=a.state.lint,d=c.options,e=k(b),f=0;f<e.length;++f){var g=e[f];if(g){for(var m=null,n=c.hasGutter&&document.createDocumentFragment(),o=0;o<g.length;++o){var p=g[o],q=p.severity;q||(q="error"),m=j(m,q),d.formatAnnotation&&(p=d.formatAnnotation(p)),c.hasGutter&&n.appendChild(l(p)),p.to&&c.marked.push(a.markText(p.from,p.to,{className:"CodeMirror-lint-mark-"+q,__annotation:p}))}c.hasGutter&&a.setGutterMarker(f,s,i(n,m,g.length>1,c.options.tooltips))}}d.onUpdateLinting&&d.onUpdateLinting(b,e,a)}function p(a){var b=a.state.lint;b&&(clearTimeout(b.timeout),b.timeout=setTimeout((function(){n(a)}),b.options.delay||500))}function q(a,b){for(var c=b.target||b.srcElement,d=document.createDocumentFragment(),f=0;f<a.length;f++){var g=a[f];d.appendChild(l(g))}e(b,d,c)}function r(a,b){var c=b.target||b.srcElement;if(/\bCodeMirror-lint-mark-/.test(c.className)){for(var d=c.getBoundingClientRect(),e=(d.left+d.right)/2,f=(d.top+d.bottom)/2,g=a.findMarksAt(a.coordsChar({left:e,top:f},"client")),h=[],i=0;i<g.length;++i){var j=g[i].__annotation;j&&h.push(j)}h.length&&q(h,b)}}var s="CodeMirror-lint-markers";a.defineOption("lint",!1,(function(b,c,d){if(d&&d!=a.Init&&(h(b),b.state.lint.options.lintOnChange!==!1&&b.off("change",p),a.off(b.getWrapperElement(),"mouseover",b.state.lint.onMouseOver),clearTimeout(b.state.lint.timeout),delete b.state.lint),c){for(var e=b.getOption("gutters"),i=!1,j=0;j<e.length;++j)e[j]==s&&(i=!0);var k=b.state.lint=new f(b,g(b,c),i);k.options.lintOnChange!==!1&&b.on("change",p),0!=k.options.tooltips&&"gutter"!=k.options.tooltips&&a.on(b.getWrapperElement(),"mouseover",k.onMouseOver),n(b)}})),a.defineExtension("performLint",(function(){this.state.lint&&n(this)}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c){function d(b){return e.parentNode?(e.style.top=Math.max(0,b.clientY-e.offsetHeight-5)+"px",void(e.style.left=b.clientX+5+"px")):a.off(document,"mousemove",d)}var e=document.createElement("div");return e.className="CodeMirror-lint-tooltip",e.appendChild(c.cloneNode(!0)),document.body.appendChild(e),a.on(document,"mousemove",d),d(b),null!=e.style.opacity&&(e.style.opacity=1),e}function c(a){a.parentNode&&a.parentNode.removeChild(a)}function d(a){a.parentNode&&(null==a.style.opacity&&c(a),a.style.opacity=0,setTimeout((function(){c(a)}),600))}function e(c,e,f){function g(){a.off(f,"mouseout",g),h&&(d(h),h=null)}var h=b(c,e),i=setInterval((function(){if(h)for(var a=f;;a=a.parentNode){if(a&&11==a.nodeType&&(a=a.host),a==document.body)return;if(!a){g();break}}if(!h)return clearInterval(i)}),400);a.on(f,"mouseout",g)}function f(a,b,c){this.marked=[],this.options=b,this.timeout=null,this.hasGutter=c,this.onMouseOver=function(b){r(a,b)},this.waitingFor=0}function g(a,b){return b instanceof Function?{getAnnotations:b}:(b&&b!==!0||(b={}),b)}function h(a){var b=a.state.lint;b.hasGutter&&a.clearGutter(s);for(var c=0;c<b.marked.length;++c)b.marked[c].clear();b.marked.length=0}function i(b,c,d,f){var g=document.createElement("div"),h=g;return g.className="CodeMirror-lint-marker-"+c,d&&(h=g.appendChild(document.createElement("div")),h.className="CodeMirror-lint-marker-multiple"),0!=f&&a.on(h,"mouseover",(function(a){e(a,b,h)})),g}function j(a,b){return"error"==a?a:b}function k(a){for(var b=[],c=0;c<a.length;++c){var d=a[c],e=d.from.line;(b[e]||(b[e]=[])).push(d)}return b}function l(a){var b=a.severity;b||(b="error");var c=document.createElement("div");return c.className="CodeMirror-lint-message-"+b,"undefined"!=typeof a.messageHTML?c.innerHTML=a.messageHTML:c.appendChild(document.createTextNode(a.message)),c}function m(b,c,d){function e(){g=-1,b.off("change",e)}var f=b.state.lint,g=++f.waitingFor;b.on("change",e),c(b.getValue(),(function(c,d){b.off("change",e),f.waitingFor==g&&(d&&c instanceof a&&(c=d),o(b,c))}),d,b)}function n(b){var c=b.state.lint,d=c.options,e=d.options||d,f=d.getAnnotations||b.getHelper(a.Pos(0,0),"lint");if(f)if(d.async||f.async)m(b,f,e);else{var g=f(b.getValue(),e,b);if(!g)return;g.then?g.then((function(a){o(b,a)})):o(b,g)}}function o(a,b){h(a);for(var c=a.state.lint,d=c.options,e=k(b),f=0;f<e.length;++f){var g=e[f];if(g){for(var m=null,n=c.hasGutter&&document.createDocumentFragment(),o=0;o<g.length;++o){var p=g[o],q=p.severity;q||(q="error"),m=j(m,q),d.formatAnnotation&&(p=d.formatAnnotation(p)),c.hasGutter&&n.appendChild(l(p)),p.to&&c.marked.push(a.markText(p.from,p.to,{className:"CodeMirror-lint-mark-"+q,__annotation:p}))}c.hasGutter&&a.setGutterMarker(f,s,i(n,m,g.length>1,c.options.tooltips))}}d.onUpdateLinting&&d.onUpdateLinting(b,e,a)}function p(a){var b=a.state.lint;b&&(clearTimeout(b.timeout),b.timeout=setTimeout((function(){n(a)}),b.options.delay||500))}function q(a,b){for(var c=b.target||b.srcElement,d=document.createDocumentFragment(),f=0;f<a.length;f++){var g=a[f];d.appendChild(l(g))}e(b,d,c)}function r(a,b){var c=b.target||b.srcElement;if(/\bCodeMirror-lint-mark-/.test(c.className)){for(var d=c.getBoundingClientRect(),e=(d.left+d.right)/2,f=(d.top+d.bottom)/2,g=a.findMarksAt(a.coordsChar({left:e,top:f},"client")),h=[],i=0;i<g.length;++i){var j=g[i].__annotation;j&&h.push(j)}h.length&&q(h,b)}}var s="CodeMirror-lint-markers";a.defineOption("lint",!1,(function(b,c,d){if(d&&d!=a.Init&&(h(b),b.state.lint.options.lintOnChange!==!1&&b.off("change",p),a.off(b.getWrapperElement(),"mouseover",b.state.lint.onMouseOver),clearTimeout(b.state.lint.timeout),delete b.state.lint),c){for(var e=b.getOption("gutters"),i=!1,j=0;j<e.length;++j)e[j]==s&&(i=!0);var k=b.state.lint=new f(b,g(b,c),i);k.options.lintOnChange!==!1&&b.on("change",p),0!=k.options.tooltips&&"gutter"!=k.options.tooltips&&a.on(b.getWrapperElement(),"mouseover",k.onMouseOver),n(b)}})),a.defineExtension("performLint",(function(){this.state.lint&&n(this)}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/lint/yaml-lint.js b/media/editors/codemirror/addon/lint/yaml-lint.js
index 90b0eaab57964..3954ed38ebf42 100644
--- a/media/editors/codemirror/addon/lint/yaml-lint.js
+++ b/media/editors/codemirror/addon/lint/yaml-lint.js
@@ -17,6 +17,12 @@
 
 CodeMirror.registerHelper("lint", "yaml", function(text) {
   var found = [];
+  if (!window.jsyaml) {
+    if (window.console) {
+      window.console.error("Error: window.jsyaml not defined, CodeMirror YAML linting cannot run.");
+    }
+    return found;
+  }
   try { jsyaml.load(text); }
   catch(e) {
       var loc = e.mark,
diff --git a/media/editors/codemirror/addon/lint/yaml-lint.min.js b/media/editors/codemirror/addon/lint/yaml-lint.min.js
index 0e680d252b607..3e5bd54e8add0 100644
--- a/media/editors/codemirror/addon/lint/yaml-lint.min.js
+++ b/media/editors/codemirror/addon/lint/yaml-lint.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","yaml",(function(b){var c=[];try{jsyaml.load(b)}catch(b){var d=b.mark,e=d?a.Pos(d.line,d.column):a.Pos(0,0),f=e;c.push({from:e,to:f,message:b.message})}return c}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","yaml",(function(b){var c=[];if(!window.jsyaml)return window.console&&window.console.error("Error: window.jsyaml not defined, CodeMirror YAML linting cannot run."),c;try{jsyaml.load(b)}catch(b){var d=b.mark,e=d?a.Pos(d.line,d.column):a.Pos(0,0),f=e;c.push({from:e,to:f,message:b.message})}return c}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/mode/simple.js b/media/editors/codemirror/addon/mode/simple.js
index df663365e8c23..15cc215825e64 100644
--- a/media/editors/codemirror/addon/mode/simple.js
+++ b/media/editors/codemirror/addon/mode/simple.js
@@ -77,6 +77,7 @@
 
   function asToken(val) {
     if (!val) return null;
+    if (val.apply) return val
     if (typeof val == "string") return val.replace(/\./g, " ");
     var result = [];
     for (var i = 0; i < val.length; i++)
@@ -133,17 +134,19 @@
             state.indent.push(stream.indentation() + config.indentUnit);
           if (rule.data.dedent)
             state.indent.pop();
+          var token = rule.token
+          if (token && token.apply) token = token(matches)
           if (matches.length > 2) {
             state.pending = [];
             for (var j = 2; j < matches.length; j++)
               if (matches[j])
                 state.pending.push({text: matches[j], token: rule.token[j - 1]});
             stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
-            return rule.token[0];
-          } else if (rule.token && rule.token.join) {
-            return rule.token[0];
+            return token[0];
+          } else if (token && token.join) {
+            return token[0];
           } else {
-            return rule.token;
+            return token;
           }
         }
       }
diff --git a/media/editors/codemirror/addon/mode/simple.min.js b/media/editors/codemirror/addon/mode/simple.min.js
index 323b22e683d29..c23b575c0db18 100644
--- a/media/editors/codemirror/addon/mode/simple.min.js
+++ b/media/editors/codemirror/addon/mode/simple.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){if(!a.hasOwnProperty(b))throw new Error("Undefined state "+b+" in simple mode")}function c(a,b){if(!a)return/(?:)/;var c="";return a instanceof RegExp?(a.ignoreCase&&(c="i"),a=a.source):a=String(a),new RegExp((b===!1?"":"^")+"(?:"+a+")",c)}function d(a){if(!a)return null;if("string"==typeof a)return a.replace(/\./g," ");for(var b=[],c=0;c<a.length;c++)b.push(a[c]&&a[c].replace(/\./g," "));return b}function e(a,e){(a.next||a.push)&&b(e,a.next||a.push),this.regex=c(a.regex),this.token=d(a.token),this.data=a}function f(a,b){return function(c,d){if(d.pending){var e=d.pending.shift();return 0==d.pending.length&&(d.pending=null),c.pos+=e.text.length,e.token}if(d.local){if(d.local.end&&c.match(d.local.end)){var f=d.local.endToken||null;return d.local=d.localState=null,f}var g,f=d.local.mode.token(c,d.localState);return d.local.endScan&&(g=d.local.endScan.exec(c.current()))&&(c.pos=c.start+g.index),f}for(var i=a[d.state],j=0;j<i.length;j++){var k=i[j],l=(!k.data.sol||c.sol())&&c.match(k.regex);if(l){if(k.data.next?d.state=k.data.next:k.data.push?((d.stack||(d.stack=[])).push(d.state),d.state=k.data.push):k.data.pop&&d.stack&&d.stack.length&&(d.state=d.stack.pop()),k.data.mode&&h(b,d,k.data.mode,k.token),k.data.indent&&d.indent.push(c.indentation()+b.indentUnit),k.data.dedent&&d.indent.pop(),l.length>2){d.pending=[];for(var m=2;m<l.length;m++)l[m]&&d.pending.push({text:l[m],token:k.token[m-1]});return c.backUp(l[0].length-(l[1]?l[1].length:0)),k.token[0]}return k.token&&k.token.join?k.token[0]:k.token}}return c.next(),null}}function g(a,b){if(a===b)return!0;if(!a||"object"!=typeof a||!b||"object"!=typeof b)return!1;var c=0;for(var d in a)if(a.hasOwnProperty(d)){if(!b.hasOwnProperty(d)||!g(a[d],b[d]))return!1;c++}for(var d in b)b.hasOwnProperty(d)&&c--;return 0==c}function h(b,d,e,f){var h;if(e.persistent)for(var i=d.persistentStates;i&&!h;i=i.next)(e.spec?g(e.spec,i.spec):e.mode==i.mode)&&(h=i);var j=h?h.mode:e.mode||a.getMode(b,e.spec),k=h?h.state:a.startState(j);e.persistent&&!h&&(d.persistentStates={mode:j,spec:e.spec,state:k,next:d.persistentStates}),d.localState=k,d.local={mode:j,end:e.end&&c(e.end),endScan:e.end&&e.forceEnd!==!1&&c(e.end,!1),endToken:f&&f.join?f[f.length-1]:f}}function i(a,b){for(var c=0;c<b.length;c++)if(b[c]===a)return!0}function j(b,c){return function(d,e,f){if(d.local&&d.local.mode.indent)return d.local.mode.indent(d.localState,e,f);if(null==d.indent||d.local||c.dontIndentStates&&i(d.state,c.dontIndentStates)>-1)return a.Pass;var g=d.indent.length-1,h=b[d.state];a:for(;;){for(var j=0;j<h.length;j++){var k=h[j];if(k.data.dedent&&k.data.dedentIfLineStart!==!1){var l=k.regex.exec(e);if(l&&l[0]){g--,(k.next||k.push)&&(h=b[k.next||k.push]),e=e.slice(l[0].length);continue a}}}break}return g<0?0:d.indent[g]}}a.defineSimpleMode=function(b,c){a.defineMode(b,(function(b){return a.simpleMode(b,c)}))},a.simpleMode=function(c,d){b(d,"start");var g={},h=d.meta||{},i=!1;for(var k in d)if(k!=h&&d.hasOwnProperty(k))for(var l=g[k]=[],m=d[k],n=0;n<m.length;n++){var o=m[n];l.push(new e(o,d)),(o.indent||o.dedent)&&(i=!0)}var p={startState:function(){return{state:"start",pending:null,local:null,localState:null,indent:i?[]:null}},copyState:function(b){var c={state:b.state,pending:b.pending,local:b.local,localState:null,indent:b.indent&&b.indent.slice(0)};b.localState&&(c.localState=a.copyState(b.local.mode,b.localState)),b.stack&&(c.stack=b.stack.slice(0));for(var d=b.persistentStates;d;d=d.next)c.persistentStates={mode:d.mode,spec:d.spec,state:d.state==b.localState?c.localState:a.copyState(d.mode,d.state),next:c.persistentStates};return c},token:f(g,c),innerMode:function(a){return a.local&&{mode:a.local.mode,state:a.localState}},indent:j(g,h)};if(h)for(var q in h)h.hasOwnProperty(q)&&(p[q]=h[q]);return p}}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){if(!a.hasOwnProperty(b))throw new Error("Undefined state "+b+" in simple mode")}function c(a,b){if(!a)return/(?:)/;var c="";return a instanceof RegExp?(a.ignoreCase&&(c="i"),a=a.source):a=String(a),new RegExp((b===!1?"":"^")+"(?:"+a+")",c)}function d(a){if(!a)return null;if(a.apply)return a;if("string"==typeof a)return a.replace(/\./g," ");for(var b=[],c=0;c<a.length;c++)b.push(a[c]&&a[c].replace(/\./g," "));return b}function e(a,e){(a.next||a.push)&&b(e,a.next||a.push),this.regex=c(a.regex),this.token=d(a.token),this.data=a}function f(a,b){return function(c,d){if(d.pending){var e=d.pending.shift();return 0==d.pending.length&&(d.pending=null),c.pos+=e.text.length,e.token}if(d.local){if(d.local.end&&c.match(d.local.end)){var f=d.local.endToken||null;return d.local=d.localState=null,f}var g,f=d.local.mode.token(c,d.localState);return d.local.endScan&&(g=d.local.endScan.exec(c.current()))&&(c.pos=c.start+g.index),f}for(var i=a[d.state],j=0;j<i.length;j++){var k=i[j],l=(!k.data.sol||c.sol())&&c.match(k.regex);if(l){k.data.next?d.state=k.data.next:k.data.push?((d.stack||(d.stack=[])).push(d.state),d.state=k.data.push):k.data.pop&&d.stack&&d.stack.length&&(d.state=d.stack.pop()),k.data.mode&&h(b,d,k.data.mode,k.token),k.data.indent&&d.indent.push(c.indentation()+b.indentUnit),k.data.dedent&&d.indent.pop();var m=k.token;if(m&&m.apply&&(m=m(l)),l.length>2){d.pending=[];for(var n=2;n<l.length;n++)l[n]&&d.pending.push({text:l[n],token:k.token[n-1]});return c.backUp(l[0].length-(l[1]?l[1].length:0)),m[0]}return m&&m.join?m[0]:m}}return c.next(),null}}function g(a,b){if(a===b)return!0;if(!a||"object"!=typeof a||!b||"object"!=typeof b)return!1;var c=0;for(var d in a)if(a.hasOwnProperty(d)){if(!b.hasOwnProperty(d)||!g(a[d],b[d]))return!1;c++}for(var d in b)b.hasOwnProperty(d)&&c--;return 0==c}function h(b,d,e,f){var h;if(e.persistent)for(var i=d.persistentStates;i&&!h;i=i.next)(e.spec?g(e.spec,i.spec):e.mode==i.mode)&&(h=i);var j=h?h.mode:e.mode||a.getMode(b,e.spec),k=h?h.state:a.startState(j);e.persistent&&!h&&(d.persistentStates={mode:j,spec:e.spec,state:k,next:d.persistentStates}),d.localState=k,d.local={mode:j,end:e.end&&c(e.end),endScan:e.end&&e.forceEnd!==!1&&c(e.end,!1),endToken:f&&f.join?f[f.length-1]:f}}function i(a,b){for(var c=0;c<b.length;c++)if(b[c]===a)return!0}function j(b,c){return function(d,e,f){if(d.local&&d.local.mode.indent)return d.local.mode.indent(d.localState,e,f);if(null==d.indent||d.local||c.dontIndentStates&&i(d.state,c.dontIndentStates)>-1)return a.Pass;var g=d.indent.length-1,h=b[d.state];a:for(;;){for(var j=0;j<h.length;j++){var k=h[j];if(k.data.dedent&&k.data.dedentIfLineStart!==!1){var l=k.regex.exec(e);if(l&&l[0]){g--,(k.next||k.push)&&(h=b[k.next||k.push]),e=e.slice(l[0].length);continue a}}}break}return g<0?0:d.indent[g]}}a.defineSimpleMode=function(b,c){a.defineMode(b,(function(b){return a.simpleMode(b,c)}))},a.simpleMode=function(c,d){b(d,"start");var g={},h=d.meta||{},i=!1;for(var k in d)if(k!=h&&d.hasOwnProperty(k))for(var l=g[k]=[],m=d[k],n=0;n<m.length;n++){var o=m[n];l.push(new e(o,d)),(o.indent||o.dedent)&&(i=!0)}var p={startState:function(){return{state:"start",pending:null,local:null,localState:null,indent:i?[]:null}},copyState:function(b){var c={state:b.state,pending:b.pending,local:b.local,localState:null,indent:b.indent&&b.indent.slice(0)};b.localState&&(c.localState=a.copyState(b.local.mode,b.localState)),b.stack&&(c.stack=b.stack.slice(0));for(var d=b.persistentStates;d;d=d.next)c.persistentStates={mode:d.mode,spec:d.spec,state:d.state==b.localState?c.localState:a.copyState(d.mode,d.state),next:c.persistentStates};return c},token:f(g,c),innerMode:function(a){return a.local&&{mode:a.local.mode,state:a.localState}},indent:j(g,h)};if(h)for(var q in h)h.hasOwnProperty(q)&&(p[q]=h[q]);return p}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/runmode/runmode-standalone.js b/media/editors/codemirror/addon/runmode/runmode-standalone.js
index f4f352c803524..1bd808c787a2f 100644
--- a/media/editors/codemirror/addon/runmode/runmode-standalone.js
+++ b/media/editors/codemirror/addon/runmode/runmode-standalone.js
@@ -65,7 +65,8 @@ StringStream.prototype = {
     this.lineStart += n;
     try { return inner(); }
     finally { this.lineStart -= n; }
-  }
+  },
+  lookAhead: function() { return null }
 };
 CodeMirror.StringStream = StringStream;
 
diff --git a/media/editors/codemirror/addon/runmode/runmode-standalone.min.js b/media/editors/codemirror/addon/runmode/runmode-standalone.min.js
index aab66803142ff..d84e40d3168f2 100644
--- a/media/editors/codemirror/addon/runmode/runmode-standalone.min.js
+++ b/media/editors/codemirror/addon/runmode/runmode-standalone.min.js
@@ -1 +1 @@
-window.CodeMirror={},(function(){"use strict";function a(a){return a.split(/\r?\n|\r/)}function b(a){this.pos=this.start=0,this.string=a,this.lineStart=0}b.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return 0==this.pos},peek:function(){return this.string.charAt(this.pos)||null},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a)var c=b==a;else var c=b&&(a.test?a.test(b):a(b));if(c)return++this.pos,b},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.start-this.lineStart},indentation:function(){return 0},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}},CodeMirror.StringStream=b,CodeMirror.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var c=CodeMirror.modes={},d=CodeMirror.mimeModes={};CodeMirror.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),c[a]=b},CodeMirror.defineMIME=function(a,b){d[a]=b},CodeMirror.resolveMode=function(a){return"string"==typeof a&&d.hasOwnProperty(a)?a=d[a]:a&&"string"==typeof a.name&&d.hasOwnProperty(a.name)&&(a=d[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}},CodeMirror.getMode=function(a,b){b=CodeMirror.resolveMode(b);var d=c[b.name];if(!d)throw new Error("Unknown mode: "+b);return d(a,b)},CodeMirror.registerHelper=CodeMirror.registerGlobalHelper=Math.min,CodeMirror.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),CodeMirror.defineMIME("text/plain","null"),CodeMirror.runMode=function(b,c,d,e){var f=CodeMirror.getMode({indentUnit:2},c);if(1==d.nodeType){var g=e&&e.tabSize||4,h=d,i=0;h.innerHTML="",d=function(a,b){if("\n"==a)return h.appendChild(document.createElement("br")),void(i=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),i+=a.length-d;break}i+=e-d,c+=a.slice(d,e);var f=g-i%g;i+=f;for(var j=0;j<f;++j)c+=" ";d=e+1}if(b){var k=h.appendChild(document.createElement("span"));k.className="cm-"+b.replace(/ +/g," cm-"),k.appendChild(document.createTextNode(c))}else h.appendChild(document.createTextNode(c))}}for(var j=a(b),k=e&&e.state||CodeMirror.startState(f),l=0,m=j.length;l<m;++l){l&&d("\n");var n=new CodeMirror.StringStream(j[l]);for(!n.string&&f.blankLine&&f.blankLine(k);!n.eol();){var o=f.token(n,k);d(n.current(),o,l,n.start,k),n.start=n.pos}}}})();
\ No newline at end of file
+window.CodeMirror={},(function(){"use strict";function a(a){return a.split(/\r?\n|\r/)}function b(a){this.pos=this.start=0,this.string=a,this.lineStart=0}b.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return 0==this.pos},peek:function(){return this.string.charAt(this.pos)||null},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a)var c=b==a;else var c=b&&(a.test?a.test(b):a(b));if(c)return++this.pos,b},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.start-this.lineStart},indentation:function(){return 0},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}},lookAhead:function(){return null}},CodeMirror.StringStream=b,CodeMirror.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var c=CodeMirror.modes={},d=CodeMirror.mimeModes={};CodeMirror.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),c[a]=b},CodeMirror.defineMIME=function(a,b){d[a]=b},CodeMirror.resolveMode=function(a){return"string"==typeof a&&d.hasOwnProperty(a)?a=d[a]:a&&"string"==typeof a.name&&d.hasOwnProperty(a.name)&&(a=d[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}},CodeMirror.getMode=function(a,b){b=CodeMirror.resolveMode(b);var d=c[b.name];if(!d)throw new Error("Unknown mode: "+b);return d(a,b)},CodeMirror.registerHelper=CodeMirror.registerGlobalHelper=Math.min,CodeMirror.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),CodeMirror.defineMIME("text/plain","null"),CodeMirror.runMode=function(b,c,d,e){var f=CodeMirror.getMode({indentUnit:2},c);if(1==d.nodeType){var g=e&&e.tabSize||4,h=d,i=0;h.innerHTML="",d=function(a,b){if("\n"==a)return h.appendChild(document.createElement("br")),void(i=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),i+=a.length-d;break}i+=e-d,c+=a.slice(d,e);var f=g-i%g;i+=f;for(var j=0;j<f;++j)c+=" ";d=e+1}if(b){var k=h.appendChild(document.createElement("span"));k.className="cm-"+b.replace(/ +/g," cm-"),k.appendChild(document.createTextNode(c))}else h.appendChild(document.createTextNode(c))}}for(var j=a(b),k=e&&e.state||CodeMirror.startState(f),l=0,m=j.length;l<m;++l){l&&d("\n");var n=new CodeMirror.StringStream(j[l]);for(!n.string&&f.blankLine&&f.blankLine(k);!n.eol();){var o=f.token(n,k);d(n.current(),o,l,n.start,k),n.start=n.pos}}}})();
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/runmode/runmode.min.js b/media/editors/codemirror/addon/runmode/runmode.min.js
index da8bf13cfdddf..6dc0fc8e69cf2 100644
--- a/media/editors/codemirror/addon/runmode/runmode.min.js
+++ b/media/editors/codemirror/addon/runmode/runmode.min.js
@@ -1 +1 @@
-function splitLines(a){return a.split(/\r\n?|\n/)}function StringStream(a,b){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0}function copyObj(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||c===!1&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.runMode=function(b,c,d,e){var f=a.getMode(a.defaults,c),g=/MSIE \d/.test(navigator.userAgent),h=g&&(null==document.documentMode||document.documentMode<9);if(d.appendChild){var i=e&&e.tabSize||a.defaults.tabSize,j=d,k=0;j.innerHTML="",d=function(a,b){if("\n"==a)return j.appendChild(document.createTextNode(h?"\r":a)),void(k=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),k+=a.length-d;break}k+=e-d,c+=a.slice(d,e);var f=i-k%i;k+=f;for(var g=0;g<f;++g)c+=" ";d=e+1}if(b){var l=j.appendChild(document.createElement("span"));l.className="cm-"+b.replace(/ +/g," cm-"),l.appendChild(document.createTextNode(c))}else j.appendChild(document.createTextNode(c))}}for(var l=a.splitLines(b),m=e&&e.state||a.startState(f),n=0,o=l.length;n<o;++n){n&&d("\n");var p=new a.StringStream(l[n]);for(!p.string&&f.blankLine&&f.blankLine(m);!p.eol();){var q=f.token(p,m);d(p.current(),q,n,p.start,m),p.start=p.pos}}}}));var countColumn=function(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),b==-1&&(b=a.length));for(var f=d||0,g=e||0;;){var h=a.indexOf("\t",f);if(h<0||h>=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}};StringStream.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a)var c=b==a;else var c=b&&(a.test?a.test(b):a(b));if(c)return++this.pos,b},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=countColumn(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?countColumn(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return countColumn(this.string,null,this.tabSize)-(this.lineStart?countColumn(this.string,this.lineStart,this.tabSize):0)},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}},exports.StringStream=StringStream,exports.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var modes=exports.modes={},mimeModes=exports.mimeModes={};exports.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),modes[a]=b},exports.defineMIME=function(a,b){mimeModes[a]=b},exports.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),exports.defineMIME("text/plain","null"),exports.resolveMode=function(a){return"string"==typeof a&&mimeModes.hasOwnProperty(a)?a=mimeModes[a]:a&&"string"==typeof a.name&&mimeModes.hasOwnProperty(a.name)&&(a=mimeModes[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}};var modeExtensions=exports.modeExtensions={};exports.extendMode=function(a,b){var c=modeExtensions.hasOwnProperty(a)?modeExtensions[a]:modeExtensions[a]={};copyObj(b,c)},exports.getMode=function(a,b){var b=exports.resolveMode(b),c=modes[b.name];if(!c)return exports.getMode(a,"text/plain");var d=c(a,b);if(modeExtensions.hasOwnProperty(b.name)){var e=modeExtensions[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var f in b.modeProps)d[f]=b.modeProps[f];return d},exports.registerHelper=exports.registerGlobalHelper=Math.min,exports.runMode=function(a,b,c,d){for(var e=exports.getMode({indentUnit:2},b),f=splitLines(a),g=d&&d.state||exports.startState(e),h=0,i=f.length;h<i;++h){h&&c("\n");var j=new exports.StringStream(f[h]);for(!j.string&&e.blankLine&&e.blankLine(g);!j.eol();){var k=e.token(j,g);c(j.current(),k,h,j.start,g),j.start=j.pos}}},require.cache[require.resolve("../../lib/codemirror")]=require.cache[require.resolve("./runmode.node")],require.cache[require.resolve("../../addon/runmode/runmode")]=require.cache[require.resolve("./runmode.node")];
\ No newline at end of file
+function splitLines(a){return a.split(/\r\n?|\n/)}function StringStream(a,b,c){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.context=c}function copyObj(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||c===!1&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.runMode=function(b,c,d,e){var f=a.getMode(a.defaults,c),g=/MSIE \d/.test(navigator.userAgent),h=g&&(null==document.documentMode||document.documentMode<9);if(d.appendChild){var i=e&&e.tabSize||a.defaults.tabSize,j=d,k=0;j.innerHTML="",d=function(a,b){if("\n"==a)return j.appendChild(document.createTextNode(h?"\r":a)),void(k=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),k+=a.length-d;break}k+=e-d,c+=a.slice(d,e);var f=i-k%i;k+=f;for(var g=0;g<f;++g)c+=" ";d=e+1}if(b){var l=j.appendChild(document.createElement("span"));l.className="cm-"+b.replace(/ +/g," cm-"),l.appendChild(document.createTextNode(c))}else j.appendChild(document.createTextNode(c))}}for(var l=a.splitLines(b),m=e&&e.state||a.startState(f),n=0,o=l.length;n<o;++n){n&&d("\n");var p=new a.StringStream(l[n]);for(!p.string&&f.blankLine&&f.blankLine(m);!p.eol();){var q=f.token(p,m);d(p.current(),q,n,p.start,m),p.start=p.pos}}}}));var countColumn=exports.countColumn=function(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),b==-1&&(b=a.length));for(var f=d||0,g=e||0;;){var h=a.indexOf("\t",f);if(h<0||h>=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}};StringStream.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a)var c=b==a;else var c=b&&(a.test?a.test(b):a(b));if(c)return++this.pos,b},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=countColumn(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?countColumn(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return countColumn(this.string,null,this.tabSize)-(this.lineStart?countColumn(this.string,this.lineStart,this.tabSize):0)},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}},lookAhead:function(a){var b=this.context.line+a;return b>=this.context.lines.length?null:this.context.lines[b]}},exports.StringStream=StringStream,exports.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var modes=exports.modes={},mimeModes=exports.mimeModes={};exports.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),modes[a]=b},exports.defineMIME=function(a,b){mimeModes[a]=b},exports.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),exports.defineMIME("text/plain","null"),exports.resolveMode=function(a){return"string"==typeof a&&mimeModes.hasOwnProperty(a)?a=mimeModes[a]:a&&"string"==typeof a.name&&mimeModes.hasOwnProperty(a.name)&&(a=mimeModes[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}};var modeExtensions=exports.modeExtensions={};exports.extendMode=function(a,b){var c=modeExtensions.hasOwnProperty(a)?modeExtensions[a]:modeExtensions[a]={};copyObj(b,c)},exports.getMode=function(a,b){var b=exports.resolveMode(b),c=modes[b.name];if(!c)return exports.getMode(a,"text/plain");var d=c(a,b);if(modeExtensions.hasOwnProperty(b.name)){var e=modeExtensions[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var f in b.modeProps)d[f]=b.modeProps[f];return d},exports.registerHelper=exports.registerGlobalHelper=Math.min,exports.runMode=function(a,b,c,d){for(var e=exports.getMode({indentUnit:2},b),f=splitLines(a),g=d&&d.state||exports.startState(e),h={lines:f,line:0},i=0,j=f.length;i<j;++i,++h.line){i&&c("\n");var k=new exports.StringStream(f[i],4,h);for(!k.string&&e.blankLine&&e.blankLine(g);!k.eol();){var l=e.token(k,g);c(k.current(),l,i,k.start,g),k.start=k.pos}}},require.cache[require.resolve("../../lib/codemirror")]=require.cache[require.resolve("./runmode.node")],require.cache[require.resolve("../../addon/runmode/runmode")]=require.cache[require.resolve("./runmode.node")];
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/runmode/runmode.node.js b/media/editors/codemirror/addon/runmode/runmode.node.js
index b22a5187f3b67..093cb30876180 100644
--- a/media/editors/codemirror/addon/runmode/runmode.node.js
+++ b/media/editors/codemirror/addon/runmode/runmode.node.js
@@ -7,7 +7,7 @@ function splitLines(string){return string.split(/\r\n?|\n/);};
 
 // Counts the column offset in a string, taking tabs into account.
 // Used mostly to find indentation.
-var countColumn = function(string, end, tabSize, startIndex, startValue) {
+var countColumn = exports.countColumn = function(string, end, tabSize, startIndex, startValue) {
   if (end == null) {
     end = string.search(/[^\s\u00a0]/);
     if (end == -1) end = string.length;
@@ -22,12 +22,13 @@ var countColumn = function(string, end, tabSize, startIndex, startValue) {
   }
 };
 
-function StringStream(string, tabSize) {
+function StringStream(string, tabSize, context) {
   this.pos = this.start = 0;
   this.string = string;
   this.tabSize = tabSize || 8;
   this.lastColumnPos = this.lastColumnValue = 0;
   this.lineStart = 0;
+  this.context = context
 };
 
 StringStream.prototype = {
@@ -91,6 +92,10 @@ StringStream.prototype = {
     this.lineStart += n;
     try { return inner(); }
     finally { this.lineStart -= n; }
+  },
+  lookAhead: function(n) {
+    var line = this.context.line + n
+    return line >= this.context.lines.length ? null : this.context.lines[line]
   }
 };
 exports.StringStream = StringStream;
@@ -163,9 +168,10 @@ exports.registerHelper = exports.registerGlobalHelper = Math.min;
 exports.runMode = function(string, modespec, callback, options) {
   var mode = exports.getMode({indentUnit: 2}, modespec);
   var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
+  var context = {lines: lines, line: 0}
+  for (var i = 0, e = lines.length; i < e; ++i, ++context.line) {
     if (i) callback("\n");
-    var stream = new exports.StringStream(lines[i]);
+    var stream = new exports.StringStream(lines[i], 4, context);
     if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
diff --git a/media/editors/codemirror/addon/search/search.js b/media/editors/codemirror/addon/search/search.js
index 99c87e2ef71aa..236e54cc403a1 100644
--- a/media/editors/codemirror/addon/search/search.js
+++ b/media/editors/codemirror/addon/search/search.js
@@ -54,7 +54,7 @@
 
   function getSearchCursor(cm, query, pos) {
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
+    return cm.getSearchCursor(query, pos, {caseFold: queryCaseInsensitive(query), multiline: true});
   }
 
   function persistentDialog(cm, text, deflt, onEnter, onKeyDown) {
diff --git a/media/editors/codemirror/addon/search/search.min.js b/media/editors/codemirror/addon/search/search.min.js
index 63ea9b5f463a3..e6053e5d1a9e0 100644
--- a/media/editors/codemirror/addon/search/search.min.js
+++ b/media/editors/codemirror/addon/search/search.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../dialog/dialog"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return"string"==typeof a?a=new RegExp(a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),b?"gi":"g"):a.global||(a=new RegExp(a.source,a.ignoreCase?"gi":"g")),{token:function(b){a.lastIndex=b.pos;var c=a.exec(b.string);return c&&c.index==b.pos?(b.pos+=c[0].length||1,"searching"):void(c?b.pos=c.index:b.skipToEnd())}}}function c(){this.posFrom=this.posTo=this.lastQuery=this.query=null,this.overlay=null}function d(a){return a.state.search||(a.state.search=new c)}function e(a){return"string"==typeof a&&a==a.toLowerCase()}function f(a,b,c){return a.getSearchCursor(b,c,e(b))}function g(a,b,c,d,e){a.openDialog(b,d,{value:c,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){o(a)},onKeyDown:e})}function h(a,b,c,d,e){a.openDialog?a.openDialog(b,e,{value:d,selectValueOnOpen:!0}):e(prompt(c,d))}function i(a,b,c,d){a.openConfirm?a.openConfirm(b,d):confirm(c)&&d[0]()}function j(a){return a.replace(/\\(.)/g,(function(a,b){return"n"==b?"\n":"r"==b?"\r":b}))}function k(a){var b=a.match(/^\/(.*)\/([a-z]*)$/);if(b)try{a=new RegExp(b[1],b[2].indexOf("i")==-1?"":"i")}catch(a){}else a=j(a);return("string"==typeof a?""==a:a.test(""))&&(a=/x^/),a}function l(a,c,d){c.queryText=d,c.query=k(d),a.removeOverlay(c.overlay,e(c.query)),c.overlay=b(c.query,e(c.query)),a.addOverlay(c.overlay),a.showMatchesOnScrollbar&&(c.annotate&&(c.annotate.clear(),c.annotate=null),c.annotate=a.showMatchesOnScrollbar(c.query,e(c.query)))}function m(b,c,e,f){var i=d(b);if(i.query)return n(b,c);var j=b.getSelection()||i.lastQuery;if(e&&b.openDialog){var k=null,m=function(c,d){a.e_stop(d),c&&(c!=i.queryText&&(l(b,i,c),i.posFrom=i.posTo=b.getCursor()),k&&(k.style.opacity=1),n(b,d.shiftKey,(function(a,c){var d;c.line<3&&document.querySelector&&(d=b.display.wrapper.querySelector(".CodeMirror-dialog"))&&d.getBoundingClientRect().bottom-4>b.cursorCoords(c,"window").top&&((k=d).style.opacity=.4)})))};g(b,r,j,m,(function(c,e){var f=a.keyName(c),g=a.keyMap[b.getOption("keyMap")][f];g||(g=b.getOption("extraKeys")[f]),"findNext"==g||"findPrev"==g||"findPersistentNext"==g||"findPersistentPrev"==g?(a.e_stop(c),l(b,d(b),e),b.execCommand(g)):"find"!=g&&"findPersistent"!=g||(a.e_stop(c),m(e,c))})),f&&j&&(l(b,i,j),n(b,c))}else h(b,r,"Search for:",j,(function(a){a&&!i.query&&b.operation((function(){l(b,i,a),i.posFrom=i.posTo=b.getCursor(),n(b,c)}))}))}function n(b,c,e){b.operation((function(){var g=d(b),h=f(b,g.query,c?g.posFrom:g.posTo);(h.find(c)||(h=f(b,g.query,c?a.Pos(b.lastLine()):a.Pos(b.firstLine(),0)),h.find(c)))&&(b.setSelection(h.from(),h.to()),b.scrollIntoView({from:h.from(),to:h.to()},20),g.posFrom=h.from(),g.posTo=h.to(),e&&e(h.from(),h.to()))}))}function o(a){a.operation((function(){var b=d(a);b.lastQuery=b.query,b.query&&(b.query=b.queryText=null,a.removeOverlay(b.overlay),b.annotate&&(b.annotate.clear(),b.annotate=null))}))}function p(a,b,c){a.operation((function(){for(var d=f(a,b);d.findNext();)if("string"!=typeof b){var e=a.getRange(d.from(),d.to()).match(b);d.replace(c.replace(/\$(\d)/g,(function(a,b){return e[b]})))}else d.replace(c)}))}function q(a,b){if(!a.getOption("readOnly")){var c=a.getSelection()||d(a).lastQuery,e='<span class="CodeMirror-search-label">'+(b?"Replace all:":"Replace:")+"</span>";h(a,e+s,e,c,(function(c){c&&(c=k(c),h(a,t,"Replace with:","",(function(d){if(d=j(d),b)p(a,c,d);else{o(a);var e=f(a,c,a.getCursor("from")),g=function(){var b,j=e.from();!(b=e.findNext())&&(e=f(a,c),!(b=e.findNext())||j&&e.from().line==j.line&&e.from().ch==j.ch)||(a.setSelection(e.from(),e.to()),a.scrollIntoView({from:e.from(),to:e.to()}),i(a,u,"Replace?",[function(){h(b)},g,function(){p(a,c,d)}]))},h=function(a){e.replace("string"==typeof c?d:d.replace(/\$(\d)/g,(function(b,c){return a[c]}))),g()};g()}})))}))}}var r='<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>',s=' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>',t='<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>',u='<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';a.commands.find=function(a){o(a),m(a)},a.commands.findPersistent=function(a){o(a),m(a,!1,!0)},a.commands.findPersistentNext=function(a){m(a,!1,!0,!0)},a.commands.findPersistentPrev=function(a){m(a,!0,!0,!0)},a.commands.findNext=m,a.commands.findPrev=function(a){m(a,!0)},a.commands.clearSearch=o,a.commands.replace=q,a.commands.replaceAll=function(a){q(a,!0)}}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../dialog/dialog"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return"string"==typeof a?a=new RegExp(a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),b?"gi":"g"):a.global||(a=new RegExp(a.source,a.ignoreCase?"gi":"g")),{token:function(b){a.lastIndex=b.pos;var c=a.exec(b.string);return c&&c.index==b.pos?(b.pos+=c[0].length||1,"searching"):void(c?b.pos=c.index:b.skipToEnd())}}}function c(){this.posFrom=this.posTo=this.lastQuery=this.query=null,this.overlay=null}function d(a){return a.state.search||(a.state.search=new c)}function e(a){return"string"==typeof a&&a==a.toLowerCase()}function f(a,b,c){return a.getSearchCursor(b,c,{caseFold:e(b),multiline:!0})}function g(a,b,c,d,e){a.openDialog(b,d,{value:c,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){o(a)},onKeyDown:e})}function h(a,b,c,d,e){a.openDialog?a.openDialog(b,e,{value:d,selectValueOnOpen:!0}):e(prompt(c,d))}function i(a,b,c,d){a.openConfirm?a.openConfirm(b,d):confirm(c)&&d[0]()}function j(a){return a.replace(/\\(.)/g,(function(a,b){return"n"==b?"\n":"r"==b?"\r":b}))}function k(a){var b=a.match(/^\/(.*)\/([a-z]*)$/);if(b)try{a=new RegExp(b[1],b[2].indexOf("i")==-1?"":"i")}catch(a){}else a=j(a);return("string"==typeof a?""==a:a.test(""))&&(a=/x^/),a}function l(a,c,d){c.queryText=d,c.query=k(d),a.removeOverlay(c.overlay,e(c.query)),c.overlay=b(c.query,e(c.query)),a.addOverlay(c.overlay),a.showMatchesOnScrollbar&&(c.annotate&&(c.annotate.clear(),c.annotate=null),c.annotate=a.showMatchesOnScrollbar(c.query,e(c.query)))}function m(b,c,e,f){var i=d(b);if(i.query)return n(b,c);var j=b.getSelection()||i.lastQuery;if(e&&b.openDialog){var k=null,m=function(c,d){a.e_stop(d),c&&(c!=i.queryText&&(l(b,i,c),i.posFrom=i.posTo=b.getCursor()),k&&(k.style.opacity=1),n(b,d.shiftKey,(function(a,c){var d;c.line<3&&document.querySelector&&(d=b.display.wrapper.querySelector(".CodeMirror-dialog"))&&d.getBoundingClientRect().bottom-4>b.cursorCoords(c,"window").top&&((k=d).style.opacity=.4)})))};g(b,r,j,m,(function(c,e){var f=a.keyName(c),g=a.keyMap[b.getOption("keyMap")][f];g||(g=b.getOption("extraKeys")[f]),"findNext"==g||"findPrev"==g||"findPersistentNext"==g||"findPersistentPrev"==g?(a.e_stop(c),l(b,d(b),e),b.execCommand(g)):"find"!=g&&"findPersistent"!=g||(a.e_stop(c),m(e,c))})),f&&j&&(l(b,i,j),n(b,c))}else h(b,r,"Search for:",j,(function(a){a&&!i.query&&b.operation((function(){l(b,i,a),i.posFrom=i.posTo=b.getCursor(),n(b,c)}))}))}function n(b,c,e){b.operation((function(){var g=d(b),h=f(b,g.query,c?g.posFrom:g.posTo);(h.find(c)||(h=f(b,g.query,c?a.Pos(b.lastLine()):a.Pos(b.firstLine(),0)),h.find(c)))&&(b.setSelection(h.from(),h.to()),b.scrollIntoView({from:h.from(),to:h.to()},20),g.posFrom=h.from(),g.posTo=h.to(),e&&e(h.from(),h.to()))}))}function o(a){a.operation((function(){var b=d(a);b.lastQuery=b.query,b.query&&(b.query=b.queryText=null,a.removeOverlay(b.overlay),b.annotate&&(b.annotate.clear(),b.annotate=null))}))}function p(a,b,c){a.operation((function(){for(var d=f(a,b);d.findNext();)if("string"!=typeof b){var e=a.getRange(d.from(),d.to()).match(b);d.replace(c.replace(/\$(\d)/g,(function(a,b){return e[b]})))}else d.replace(c)}))}function q(a,b){if(!a.getOption("readOnly")){var c=a.getSelection()||d(a).lastQuery,e='<span class="CodeMirror-search-label">'+(b?"Replace all:":"Replace:")+"</span>";h(a,e+s,e,c,(function(c){c&&(c=k(c),h(a,t,"Replace with:","",(function(d){if(d=j(d),b)p(a,c,d);else{o(a);var e=f(a,c,a.getCursor("from")),g=function(){var b,j=e.from();!(b=e.findNext())&&(e=f(a,c),!(b=e.findNext())||j&&e.from().line==j.line&&e.from().ch==j.ch)||(a.setSelection(e.from(),e.to()),a.scrollIntoView({from:e.from(),to:e.to()}),i(a,u,"Replace?",[function(){h(b)},g,function(){p(a,c,d)}]))},h=function(a){e.replace("string"==typeof c?d:d.replace(/\$(\d)/g,(function(b,c){return a[c]}))),g()};g()}})))}))}}var r='<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>',s=' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>',t='<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>',u='<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';a.commands.find=function(a){o(a),m(a)},a.commands.findPersistent=function(a){o(a),m(a,!1,!0)},a.commands.findPersistentNext=function(a){m(a,!1,!0,!0)},a.commands.findPersistentPrev=function(a){m(a,!0,!0,!0)},a.commands.findNext=m,a.commands.findPrev=function(a){m(a,!0)},a.commands.clearSearch=o,a.commands.replace=q,a.commands.replaceAll=function(a){q(a,!0)}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/search/searchcursor.js b/media/editors/codemirror/addon/search/searchcursor.js
index b70242ee4b8cf..eccd81aab69c1 100644
--- a/media/editors/codemirror/addon/search/searchcursor.js
+++ b/media/editors/codemirror/addon/search/searchcursor.js
@@ -3,187 +3,287 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"))
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror"], mod)
   else // Plain browser env
-    mod(CodeMirror);
+    mod(CodeMirror)
 })(function(CodeMirror) {
-  "use strict";
-  var Pos = CodeMirror.Pos;
-
-  function SearchCursor(doc, query, pos, caseFold) {
-    this.atOccurrence = false; this.doc = doc;
-    if (caseFold == null && typeof query == "string") caseFold = false;
-
-    pos = pos ? doc.clipPos(pos) : Pos(0, 0);
-    this.pos = {from: pos, to: pos};
-
-    // The matches method is filled in based on the type of query.
-    // It takes a position and a direction, and returns an object
-    // describing the next occurrence of the query, or null if no
-    // more matches were found.
-    if (typeof query != "string") { // Regexp match
-      if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
+  "use strict"
+  var Pos = CodeMirror.Pos
+
+  function regexpFlags(regexp) {
+    var flags = regexp.flags
+    return flags != null ? flags : (regexp.ignoreCase ? "i" : "")
+      + (regexp.global ? "g" : "")
+      + (regexp.multiline ? "m" : "")
+  }
+
+  function ensureGlobal(regexp) {
+    return regexp.global ? regexp : new RegExp(regexp.source, regexpFlags(regexp) + "g")
+  }
+
+  function maybeMultiline(regexp) {
+    return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source)
+  }
+
+  function searchRegexpForward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
+      regexp.lastIndex = ch
+      var string = doc.getLine(line), match = regexp.exec(string)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpForwardMultiline(doc, regexp, start) {
+    if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
+
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, last = doc.lastLine(); line <= last;) {
+      // This grows the search buffer in exponentially-sized chunks
+      // between matches, so that nearby matches are fast and don't
+      // require concatenating the whole document (in case we're
+      // searching for something that has tons of matches), but at the
+      // same time, the amount of retries is limited.
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line++)
+        string = string == null ? curLine : string + "\n" + curLine
+      }
+      chunk = chunk * 2
+      regexp.lastIndex = start.ch
+      var match = regexp.exec(string)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  function lastMatchIn(string, regexp) {
+    var cutOff = 0, match
+    for (;;) {
+      regexp.lastIndex = cutOff
+      var newMatch = regexp.exec(string)
+      if (!newMatch) return match
+      match = newMatch
+      cutOff = match.index + (match[0].length || 1)
+      if (cutOff == string.length) return match
+    }
+  }
+
+  function searchRegexpBackward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
+      var string = doc.getLine(line)
+      if (ch > -1) string = string.slice(0, ch)
+      var match = lastMatchIn(string, regexp)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpBackwardMultiline(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, first = doc.firstLine(); line >= first;) {
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line--)
+        string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+      }
+      chunk *= 2
+
+      var match = lastMatchIn(string, regexp)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = line + before.length, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  var doFold, noFold
+  if (String.prototype.normalize) {
+    doFold = function(str) { return str.normalize("NFD").toLowerCase() }
+    noFold = function(str) { return str.normalize("NFD") }
+  } else {
+    doFold = function(str) { return str.toLowerCase() }
+    noFold = function(str) { return str }
+  }
+
+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos, foldFunc) {
+    if (orig.length == folded.length) return pos
+    for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) {
+      if (min == max) return min
+      var mid = (min + max) >> 1
+      var len = foldFunc(orig.slice(0, mid)).length
+      if (len == pos) return mid
+      else if (len > pos) max = mid
+      else min = mid + 1
+    }
+  }
+
+  function searchStringForward(doc, query, start, caseFold) {
+    // Empty string would match anything and never progress, so we
+    // define it to match nothing instead.
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) {
+      var orig = doc.getLine(line).slice(ch), string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.indexOf(lines[0])
+        if (found == -1) continue search
+        var start = adjustPos(orig, string, found, fold) + ch
+        return {from: Pos(line, adjustPos(orig, string, found, fold) + ch),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch)}
+      } else {
+        var cutFrom = string.length - lines[0].length
+        if (string.slice(cutFrom) != lines[0]) continue search
+        for (var i = 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(line + i)) != lines[i]) continue search
+        var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
+        if (end.slice(0, lastLine.length) != lastLine) continue search
+        return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
+                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function searchStringBackward(doc, query, start, caseFold) {
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) {
+      var orig = doc.getLine(line)
+      if (ch > -1) orig = orig.slice(0, ch)
+      var string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.lastIndexOf(lines[0])
+        if (found == -1) continue search
+        return {from: Pos(line, adjustPos(orig, string, found, fold)),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold))}
+      } else {
+        var lastLine = lines[lines.length - 1]
+        if (string.slice(0, lastLine.length) != lastLine) continue search
+        for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(start + i)) != lines[i]) continue search
+        var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
+        if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
+        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)),
+                to: Pos(line, adjustPos(orig, string, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function SearchCursor(doc, query, pos, options) {
+    this.atOccurrence = false
+    this.doc = doc
+    pos = pos ? doc.clipPos(pos) : Pos(0, 0)
+    this.pos = {from: pos, to: pos}
+
+    var caseFold
+    if (typeof options == "object") {
+      caseFold = options.caseFold
+    } else { // Backwards compat for when caseFold was the 4th argument
+      caseFold = options
+      options = null
+    }
+
+    if (typeof query == "string") {
+      if (caseFold == null) caseFold = false
       this.matches = function(reverse, pos) {
-        if (reverse) {
-          query.lastIndex = 0;
-          var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start;
-          for (;;) {
-            query.lastIndex = cutOff;
-            var newMatch = query.exec(line);
-            if (!newMatch) break;
-            match = newMatch;
-            start = match.index;
-            cutOff = match.index + (match[0].length || 1);
-            if (cutOff == line.length) break;
-          }
-          var matchLen = (match && match[0].length) || 0;
-          if (!matchLen) {
-            if (start == 0 && line.length == 0) {match = undefined;}
-            else if (start != doc.getLine(pos.line).length) {
-              matchLen++;
-            }
-          }
-        } else {
-          query.lastIndex = pos.ch;
-          var line = doc.getLine(pos.line), match = query.exec(line);
-          var matchLen = (match && match[0].length) || 0;
-          var start = match && match.index;
-          if (start + matchLen != line.length && !matchLen) matchLen = 1;
-        }
-        if (match && matchLen)
-          return {from: Pos(pos.line, start),
-                  to: Pos(pos.line, start + matchLen),
-                  match: match};
-      };
-    } else { // String query
-      var origQuery = query;
-      if (caseFold) query = query.toLowerCase();
-      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
-      var target = query.split("\n");
-      // Different methods for single-line and multi-line queries
-      if (target.length == 1) {
-        if (!query.length) {
-          // Empty string would match anything and never progress, so
-          // we define it to match nothing instead.
-          this.matches = function() {};
-        } else {
-          this.matches = function(reverse, pos) {
-            if (reverse) {
-              var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
-              var match = line.lastIndexOf(query);
-              if (match > -1) {
-                match = adjustPos(orig, line, match);
-                return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-              }
-             } else {
-               var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
-               var match = line.indexOf(query);
-               if (match > -1) {
-                 match = adjustPos(orig, line, match) + pos.ch;
-                 return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-               }
-            }
-          };
+        return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
+      }
+    } else {
+      query = ensureGlobal(query)
+      if (!options || options.multiline !== false)
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)
         }
-      } else {
-        var origTarget = origQuery.split("\n");
+      else
         this.matches = function(reverse, pos) {
-          var last = target.length - 1;
-          if (reverse) {
-            if (pos.line - (target.length - 1) < doc.firstLine()) return;
-            if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
-            var to = Pos(pos.line, origTarget[last].length);
-            for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            return {from: Pos(ln, cut), to: to};
-          } else {
-            if (pos.line + (target.length - 1) > doc.lastLine()) return;
-            var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            var from = Pos(pos.line, cut);
-            for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
-            return {from: from, to: Pos(ln, origTarget[last].length)};
-          }
-        };
-      }
+          return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
+        }
     }
   }
 
   SearchCursor.prototype = {
-    findNext: function() {return this.find(false);},
-    findPrevious: function() {return this.find(true);},
+    findNext: function() {return this.find(false)},
+    findPrevious: function() {return this.find(true)},
 
     find: function(reverse) {
-      var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
-      function savePosAndFail(line) {
-        var pos = Pos(line, 0);
-        self.pos = {from: pos, to: pos};
-        self.atOccurrence = false;
-        return false;
-      }
+      var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
 
-      for (;;) {
-        if (this.pos = this.matches(reverse, pos)) {
-          this.atOccurrence = true;
-          return this.pos.match || true;
-        }
+      // Implements weird auto-growing behavior on null-matches for
+      // backwards-compatiblity with the vim code (unfortunately)
+      while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
         if (reverse) {
-          if (!pos.line) return savePosAndFail(0);
-          pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length);
-        }
-        else {
-          var maxLine = this.doc.lineCount();
-          if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
-          pos = Pos(pos.line + 1, 0);
+          if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
+          else if (result.from.line == this.doc.firstLine()) result = null
+          else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+        } else {
+          if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
+          else if (result.to.line == this.doc.lastLine()) result = null
+          else result = this.matches(reverse, Pos(result.to.line + 1, 0))
         }
       }
+
+      if (result) {
+        this.pos = result
+        this.atOccurrence = true
+        return this.pos.match || true
+      } else {
+        var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0)
+        this.pos = {from: end, to: end}
+        return this.atOccurrence = false
+      }
     },
 
-    from: function() {if (this.atOccurrence) return this.pos.from;},
-    to: function() {if (this.atOccurrence) return this.pos.to;},
+    from: function() {if (this.atOccurrence) return this.pos.from},
+    to: function() {if (this.atOccurrence) return this.pos.to},
 
     replace: function(newText, origin) {
-      if (!this.atOccurrence) return;
-      var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
+      if (!this.atOccurrence) return
+      var lines = CodeMirror.splitLines(newText)
+      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin)
       this.pos.to = Pos(this.pos.from.line + lines.length - 1,
-                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
-    }
-  };
-
-  // Maps a position in a case-folded line back to a position in the original line
-  // (compensating for codepoints increasing in number during folding)
-  function adjustPos(orig, folded, pos) {
-    if (orig.length == folded.length) return pos;
-    for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = orig.slice(0, pos1).toLowerCase().length;
-      if (len1 < pos) ++pos1;
-      else if (len1 > pos) --pos1;
-      else return pos1;
+                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0))
     }
   }
 
   CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this.doc, query, pos, caseFold);
-  });
+    return new SearchCursor(this.doc, query, pos, caseFold)
+  })
   CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this, query, pos, caseFold);
-  });
+    return new SearchCursor(this, query, pos, caseFold)
+  })
 
   CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
-    var ranges = [];
-    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
+    var ranges = []
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold)
     while (cur.findNext()) {
-      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
-      ranges.push({anchor: cur.from(), head: cur.to()});
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break
+      ranges.push({anchor: cur.from(), head: cur.to()})
     }
     if (ranges.length)
-      this.setSelections(ranges, 0);
-  });
+      this.setSelections(ranges, 0)
+  })
 });
diff --git a/media/editors/codemirror/addon/search/searchcursor.min.js b/media/editors/codemirror/addon/search/searchcursor.min.js
index 9413508851167..b8950749e27af 100644
--- a/media/editors/codemirror/addon/search/searchcursor.min.js
+++ b/media/editors/codemirror/addon/search/searchcursor.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,e,f){if(this.atOccurrence=!1,this.doc=a,null==f&&"string"==typeof b&&(f=!1),e=e?a.clipPos(e):d(0,0),this.pos={from:e,to:e},"string"!=typeof b)b.global||(b=new RegExp(b.source,b.ignoreCase?"ig":"g")),this.matches=function(c,e){if(c){b.lastIndex=0;for(var f,g,h=a.getLine(e.line).slice(0,e.ch),i=0;;){b.lastIndex=i;var j=b.exec(h);if(!j)break;if(f=j,g=f.index,i=f.index+(f[0].length||1),i==h.length)break}var k=f&&f[0].length||0;k||(0==g&&0==h.length?f=void 0:g!=a.getLine(e.line).length&&k++)}else{b.lastIndex=e.ch;var h=a.getLine(e.line),f=b.exec(h),k=f&&f[0].length||0,g=f&&f.index;g+k==h.length||k||(k=1)}if(f&&k)return{from:d(e.line,g),to:d(e.line,g+k),match:f}};else{var g=b;f&&(b=b.toLowerCase());var h=f?function(a){return a.toLowerCase()}:function(a){return a},i=b.split("\n");if(1==i.length)b.length?this.matches=function(e,f){if(e){var i=a.getLine(f.line).slice(0,f.ch),j=h(i),k=j.lastIndexOf(b);if(k>-1)return k=c(i,j,k),{from:d(f.line,k),to:d(f.line,k+g.length)}}else{var i=a.getLine(f.line).slice(f.ch),j=h(i),k=j.indexOf(b);if(k>-1)return k=c(i,j,k)+f.ch,{from:d(f.line,k),to:d(f.line,k+g.length)}}}:this.matches=function(){};else{var j=g.split("\n");this.matches=function(b,c){var e=i.length-1;if(b){if(c.line-(i.length-1)<a.firstLine())return;if(h(a.getLine(c.line).slice(0,j[e].length))!=i[i.length-1])return;for(var f=d(c.line,j[e].length),g=c.line-1,k=e-1;k>=1;--k,--g)if(i[k]!=h(a.getLine(g)))return;var l=a.getLine(g),m=l.length-j[0].length;if(h(l.slice(m))!=i[0])return;return{from:d(g,m),to:f}}if(!(c.line+(i.length-1)>a.lastLine())){var l=a.getLine(c.line),m=l.length-j[0].length;if(h(l.slice(m))==i[0]){for(var n=d(c.line,m),g=c.line+1,k=1;k<e;++k,++g)if(i[k]!=h(a.getLine(g)))return;if(h(a.getLine(g).slice(0,j[e].length))==i[e])return{from:n,to:d(g,j[e].length)}}}}}}}function c(a,b,c){if(a.length==b.length)return c;for(var d=Math.min(c,a.length);;){var e=a.slice(0,d).toLowerCase().length;if(e<c)++d;else{if(!(e>c))return d;--d}}}var d=a.Pos;b.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(a){function b(a){var b=d(a,0);return c.pos={from:b,to:b},c.atOccurrence=!1,!1}for(var c=this,e=this.doc.clipPos(a?this.pos.from:this.pos.to);;){if(this.pos=this.matches(a,e))return this.atOccurrence=!0,this.pos.match||!0;if(a){if(!e.line)return b(0);e=d(e.line-1,this.doc.getLine(e.line-1).length)}else{var f=this.doc.lineCount();if(e.line==f-1)return b(f);e=d(e.line+1,0)}}},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var e=a.splitLines(b);this.doc.replaceRange(e,this.pos.from,this.pos.to,c),this.pos.to=d(this.pos.from.line+e.length-1,e[e.length-1].length+(1==e.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",(function(a,c,d){return new b(this.doc,a,c,d)})),a.defineDocExtension("getSearchCursor",(function(a,c,d){return new b(this,a,c,d)})),a.defineExtension("selectMatches",(function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.flags;return null!=b?b:(a.ignoreCase?"i":"")+(a.global?"g":"")+(a.multiline?"m":"")}function c(a){return a.global?a:new RegExp(a.source,b(a)+"g")}function d(a){return/\\s|\\n|\n|\\W|\\D|\[\^/.test(a.source)}function e(a,b,d){b=c(b);for(var e=d.line,f=d.ch,g=a.lastLine();e<=g;e++,f=0){b.lastIndex=f;var h=a.getLine(e),i=b.exec(h);if(i)return{from:p(e,i.index),to:p(e,i.index+i[0].length),match:i}}}function f(a,b,f){if(!d(b))return e(a,b,f);b=c(b);for(var g,h=1,i=f.line,j=a.lastLine();i<=j;){for(var k=0;k<h;k++){var l=a.getLine(i++);g=null==g?l:g+"\n"+l}h=2*h,b.lastIndex=f.ch;var m=b.exec(g);if(m){var n=g.slice(0,m.index).split("\n"),o=m[0].split("\n"),q=f.line+n.length-1,r=n[n.length-1].length;return{from:p(q,r),to:p(q+o.length-1,1==o.length?r+o[0].length:o[o.length-1].length),match:m}}}}function g(a,b){for(var c,d=0;;){b.lastIndex=d;var e=b.exec(a);if(!e)return c;if(c=e,d=c.index+(c[0].length||1),d==a.length)return c}}function h(a,b,d){b=c(b);for(var e=d.line,f=d.ch,h=a.firstLine();e>=h;e--,f=-1){var i=a.getLine(e);f>-1&&(i=i.slice(0,f));var j=g(i,b);if(j)return{from:p(e,j.index),to:p(e,j.index+j[0].length),match:j}}}function i(a,b,d){b=c(b);for(var e,f=1,h=d.line,i=a.firstLine();h>=i;){for(var j=0;j<f;j++){var k=a.getLine(h--);e=null==e?k.slice(0,d.ch):k+"\n"+e}f*=2;var l=g(e,b);if(l){var m=e.slice(0,l.index).split("\n"),n=l[0].split("\n"),o=h+m.length,q=m[m.length-1].length;return{from:p(o,q),to:p(o+n.length-1,1==n.length?q+n[0].length:n[n.length-1].length),match:l}}}}function j(a,b,c,d){if(a.length==b.length)return c;for(var e=0,f=c+Math.max(0,a.length-b.length);;){if(e==f)return e;var g=e+f>>1,h=d(a.slice(0,g)).length;if(h==c)return g;h>c?f=g:e=g+1}}function k(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.lastLine()+1-f.length;g<=i;g++,h=0){var k=a.getLine(g).slice(h),l=e(k);if(1==f.length){var m=l.indexOf(f[0]);if(m==-1)continue a;var c=j(k,l,m,e)+h;return{from:p(g,j(k,l,m,e)+h),to:p(g,j(k,l,m+f[0].length,e)+h)}}var q=l.length-f[0].length;if(l.slice(q)==f[0]){for(var r=1;r<f.length-1;r++)if(e(a.getLine(g+r))!=f[r])continue a;var s=a.getLine(g+f.length-1),t=e(s),u=f[f.length-1];if(s.slice(0,u.length)==u)return{from:p(g,j(k,l,q,e)+h),to:p(g+f.length-1,j(s,t,u.length,e))}}}}function l(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.firstLine()-1+f.length;g>=i;g--,h=-1){var k=a.getLine(g);h>-1&&(k=k.slice(0,h));var l=e(k);if(1==f.length){var m=l.lastIndexOf(f[0]);if(m==-1)continue a;return{from:p(g,j(k,l,m,e)),to:p(g,j(k,l,m+f[0].length,e))}}var q=f[f.length-1];if(l.slice(0,q.length)==q){for(var r=1,c=g-f.length+1;r<f.length-1;r++)if(e(a.getLine(c+r))!=f[r])continue a;var s=a.getLine(g+1-f.length),t=e(s);if(t.slice(t.length-f[0].length)==f[0])return{from:p(g+1-f.length,j(s,t,s.length-f[0].length,e)),to:p(g,j(k,l,q.length,e))}}}}function m(a,b,d,g){this.atOccurrence=!1,this.doc=a,d=d?a.clipPos(d):p(0,0),this.pos={from:d,to:d};var j;"object"==typeof g?j=g.caseFold:(j=g,g=null),"string"==typeof b?(null==j&&(j=!1),this.matches=function(c,d){return(c?l:k)(a,b,d,j)}):(b=c(b),g&&g.multiline===!1?this.matches=function(c,d){return(c?h:e)(a,b,d)}:this.matches=function(c,d){return(c?i:f)(a,b,d)})}var n,o,p=a.Pos;String.prototype.normalize?(n=function(a){return a.normalize("NFD").toLowerCase()},o=function(a){return a.normalize("NFD")}):(n=function(a){return a.toLowerCase()},o=function(a){return a}),m.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(b){for(var c=this.matches(b,this.doc.clipPos(b?this.pos.from:this.pos.to));c&&0==a.cmpPos(c.from,c.to);)b?c.from.ch?c.from=p(c.from.line,c.from.ch-1):c=c.from.line==this.doc.firstLine()?null:this.matches(b,this.doc.clipPos(p(c.from.line-1))):c.to.ch<this.doc.getLine(c.to.line).length?c.to=p(c.to.line,c.to.ch+1):c=c.to.line==this.doc.lastLine()?null:this.matches(b,p(c.to.line+1,0));if(c)return this.pos=c,this.atOccurrence=!0,this.pos.match||!0;var d=p(b?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:d,to:d},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var d=a.splitLines(b);this.doc.replaceRange(d,this.pos.from,this.pos.to,c),this.pos.to=p(this.pos.from.line+d.length-1,d[d.length-1].length+(1==d.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",(function(a,b,c){return new m(this.doc,a,b,c)})),a.defineDocExtension("getSearchCursor",(function(a,b,c){return new m(this,a,b,c)})),a.defineExtension("selectMatches",(function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/addon/tern/tern.js b/media/editors/codemirror/addon/tern/tern.js
index efdf2ed628a48..644e495f6504f 100644
--- a/media/editors/codemirror/addon/tern/tern.js
+++ b/media/editors/codemirror/addon/tern/tern.js
@@ -334,7 +334,11 @@
     tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
     if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
     var place = cm.cursorCoords(null, "page");
-    ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip);
+    var tooltip = ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip)
+    setTimeout(function() {
+      tooltip.clear = onEditorActivity(cm, function() {
+        if (ts.activeArgHints == tooltip) closeArgHints(ts) })
+    }, 20)
   }
 
   function parseFnType(text) {
@@ -604,11 +608,8 @@
     }
     function clear() {
       cm.state.ternTooltip = null;
-      if (!tip.parentNode) return;
-      cm.off("cursorActivity", clear);
-      cm.off('blur', clear);
-      cm.off('scroll', clear);
-      fadeOut(tip);
+      if (tip.parentNode) fadeOut(tip)
+      clearActivity()
     }
     var mouseOnTip = false, old = false;
     CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
@@ -619,9 +620,20 @@
       }
     });
     setTimeout(maybeClear, ts.options.hintDelay ? ts.options.hintDelay : 1700);
-    cm.on("cursorActivity", clear);
-    cm.on('blur', clear);
-    cm.on('scroll', clear);
+    var clearActivity = onEditorActivity(cm, clear)
+  }
+
+  function onEditorActivity(cm, f) {
+    cm.on("cursorActivity", f)
+    cm.on("blur", f)
+    cm.on("scroll", f)
+    cm.on("setDoc", f)
+    return function() {
+      cm.off("cursorActivity", f)
+      cm.off("blur", f)
+      cm.off("scroll", f)
+      cm.off("setDoc", f)
+    }
   }
 
   function makeTooltip(x, y, content) {
@@ -650,7 +662,11 @@
   }
 
   function closeArgHints(ts) {
-    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+    if (ts.activeArgHints) {
+      if (ts.activeArgHints.clear) ts.activeArgHints.clear()
+      remove(ts.activeArgHints)
+      ts.activeArgHints = null
+    }
   }
 
   function docValue(ts, doc) {
diff --git a/media/editors/codemirror/addon/tern/tern.min.js b/media/editors/codemirror/addon/tern/tern.min.js
index b22ca2e180a56..5fee661c8ab91 100644
--- a/media/editors/codemirror/addon/tern/tern.min.js
+++ b/media/editors/codemirror/addon/tern/tern.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=a.docs[b];d?c(E(a,d)):a.options.getFile?a.options.getFile(b,c):c(null)}function c(a,b,c){for(var d in a.docs){var e=a.docs[d];if(e.doc==b)return e}if(!c)for(var f=0;;++f)if(d="[doc"+(f||"")+"]",!a.docs[d]){c=d;break}return a.addDoc(c,b)}function d(b,d){return"string"==typeof d?b.docs[d]:(d instanceof a&&(d=d.getDoc()),d instanceof a.Doc?c(b,d):void 0)}function e(a,b,d){var e=c(a,b),g=a.cachedArgHints;g&&g.doc==b&&K(g.start,d.to)>=0&&(a.cachedArgHints=null);var h=e.changed;null==h&&(e.changed=h={from:d.from.line,to:d.from.line});var i=d.from.line+(d.text.length-1);d.from.line<h.to&&(h.to=h.to-(d.to.line-i)),i>=h.to&&(h.to=i+1),h.from>d.from.line&&(h.from=d.from.line),b.lineCount()>I&&d.to-h.from>100&&setTimeout((function(){e.changed&&e.changed.to-e.changed.from>100&&f(a,e)}),200)}function f(a,b){a.server.request({files:[{type:"full",name:b.name,text:E(a,b)}]},(function(a){a?window.console.error(a):b.changed=null}))}function g(b,c,d){b.request(c,{type:"completions",types:!0,docs:!0,urls:!0},(function(e,f){if(e)return C(b,c,e);var g=[],i="",j=f.start,k=f.end;'["'==c.getRange(G(j.line,j.ch-2),j)&&'"]'!=c.getRange(k,G(k.line,k.ch+2))&&(i='"]');for(var l=0;l<f.completions.length;++l){var m=f.completions[l],n=h(m.type);f.guess&&(n+=" "+H+"guess"),g.push({text:m.name+i,displayText:m.displayName||m.name,className:n,data:m})}var o={from:j,to:k,list:g},p=null;a.on(o,"close",(function(){A(p)})),a.on(o,"update",(function(){A(p)})),a.on(o,"select",(function(a,c){A(p);var d=b.options.completionTip?b.options.completionTip(a.data):a.data.doc;d&&(p=z(c.parentNode.getBoundingClientRect().right+window.pageXOffset,c.getBoundingClientRect().top+window.pageYOffset,d),p.className+=" "+H+"hint-doc")})),d(o)}))}function h(a){var b;return b="?"==a?"unknown":"number"==a||"string"==a||"bool"==a?a:/^fn\(/.test(a)?"fn":/^\[/.test(a)?"array":"object",H+"completion "+H+"completion-"+b}function i(a,b,c,d,e){a.request(b,d,(function(c,d){if(c)return C(a,b,c);if(a.options.typeTip)var f=a.options.typeTip(d);else{var f=w("span",null,w("strong",null,d.type||"not found"));if(d.doc&&f.appendChild(document.createTextNode(" — "+d.doc)),d.url){f.appendChild(document.createTextNode(" "));var g=f.appendChild(w("a",null,"[docs]"));g.href=d.url,g.target="_blank"}}y(b,f,a),e&&e()}),c)}function j(b,c){if(D(b),!c.somethingSelected()){var d=c.getTokenAt(c.getCursor()).state,e=a.innerMode(c.getMode(),d);if("javascript"==e.mode.name){var f=e.state.lexical;if("call"==f.info){for(var g,h=f.pos||0,i=c.getOption("tabSize"),j=c.getCursor().line,m=Math.max(0,j-9),n=!1;j>=m;--j){for(var o=c.getLine(j),p=0,q=0;;){var r=o.indexOf("\t",q);if(r==-1)break;p+=i-(r+p)%i-1,q=r+1}if(g=f.column-p,"("==o.charAt(g)){n=!0;break}}if(n){var s=G(j,g),t=b.cachedArgHints;return t&&t.doc==c.getDoc()&&0==K(s,t.start)?k(b,c,h):void b.request(c,{type:"type",preferFunction:!0,end:s},(function(a,d){!a&&d.type&&/^fn\(/.test(d.type)&&(b.cachedArgHints={start:s,type:l(d.type),name:d.exprName||d.name||"fn",guess:d.guess,doc:c.getDoc()},k(b,c,h))}))}}}}}function k(a,b,c){D(a);for(var d=a.cachedArgHints,e=d.type,f=w("span",d.guess?H+"fhint-guess":null,w("span",H+"fname",d.name),"("),g=0;g<e.args.length;++g){g&&f.appendChild(document.createTextNode(", "));var h=e.args[g];f.appendChild(w("span",H+"farg"+(g==c?" "+H+"farg-current":""),h.name||"?")),"?"!=h.type&&(f.appendChild(document.createTextNode(": ")),f.appendChild(w("span",H+"type",h.type)))}f.appendChild(document.createTextNode(e.rettype?") -> ":")")),e.rettype&&f.appendChild(w("span",H+"type",e.rettype));var i=b.cursorCoords(null,"page");a.activeArgHints=z(i.right+1,i.bottom,f)}function l(a){function b(b){for(var c=0,e=d;;){var f=a.charAt(d);if(b.test(f)&&!c)return a.slice(e,d);/[{\[\(]/.test(f)?++c:/[}\]\)]/.test(f)&&--c,++d}}var c=[],d=3;if(")"!=a.charAt(d))for(;;){var e=a.slice(d).match(/^([^, \(\[\{]+): /);if(e&&(d+=e[0].length,e=e[1]),c.push({name:e,type:b(/[\),]/)}),")"==a.charAt(d))break;d+=2}var f=a.slice(d).match(/^\) -> (.*)$/);return{args:c,rettype:f&&f[1]}}function m(a,b){function d(d){var e={type:"definition",variable:d||null},f=c(a,b.getDoc());a.server.request(u(a,f,e),(function(c,d){if(c)return C(a,b,c);if(!d.file&&d.url)return void window.open(d.url);if(d.file){var e,g=a.docs[d.file];if(g&&(e=p(g.doc,d)))return a.jumpStack.push({file:f.name,start:b.getCursor("from"),end:b.getCursor("to")}),void o(a,f,g,e.start,e.end)}C(a,b,"Could not find a definition.")}))}q(b)?d():x(b,"Jump to variable",(function(a){a&&d(a)}))}function n(a,b){var d=a.jumpStack.pop(),e=d&&a.docs[d.file];e&&o(a,c(a,b.getDoc()),e,d.start,d.end)}function o(a,b,c,d,e){c.doc.setSelection(d,e),b!=c&&a.options.switchToDoc&&(D(a),a.options.switchToDoc(c.name,c.doc))}function p(a,b){for(var c=b.context.slice(0,b.contextOffset).split("\n"),d=b.start.line-(c.length-1),e=G(d,(1==c.length?b.start.ch:a.getLine(d).length)-c[0].length),f=a.getLine(d).slice(e.ch),g=d+1;g<a.lineCount()&&f.length<b.context.length;++g)f+="\n"+a.getLine(g);if(f.slice(0,b.context.length)==b.context)return b;for(var h,i=a.getSearchCursor(b.context,0,!1),j=1/0;i.findNext();){var k=i.from(),l=1e4*Math.abs(k.line-e.line);l||(l=Math.abs(k.ch-e.ch)),l<j&&(h=k,j=l)}if(!h)return null;if(1==c.length?h.ch+=c[0].length:h=G(h.line+(c.length-1),c[c.length-1].length),b.start.line==b.end.line)var m=G(h.line,h.ch+(b.end.ch-b.start.ch));else var m=G(h.line+(b.end.line-b.start.line),b.end.ch);return{start:h,end:m}}function q(a){var b=a.getCursor("end"),c=a.getTokenAt(b);return!(c.start<b.ch&&"comment"==c.type)&&/[\w)\]]/.test(a.getLine(b.line).slice(Math.max(b.ch-1,0),b.ch+1))}function r(a,b){var c=b.getTokenAt(b.getCursor());return/\w/.test(c.string)?void x(b,"New name for "+c.string,(function(c){a.request(b,{type:"rename",newName:c,fullDocs:!0},(function(c,d){return c?C(a,b,c):void t(a,d.changes)}))})):C(a,b,"Not at a variable")}function s(a,b){var d=c(a,b.doc).name;a.request(b,{type:"refs"},(function(c,e){if(c)return C(a,b,c);for(var f=[],g=0,h=b.getCursor(),i=0;i<e.refs.length;i++){var j=e.refs[i];j.file==d&&(f.push({anchor:j.start,head:j.end}),K(h,j.start)>=0&&K(h,j.end)<=0&&(g=f.length-1))}b.setSelections(f,g)}))}function t(a,b){for(var c=Object.create(null),d=0;d<b.length;++d){var e=b[d];(c[e.file]||(c[e.file]=[])).push(e)}for(var f in c){var g=a.docs[f],h=c[f];if(g){h.sort((function(a,b){return K(b.start,a.start)}));for(var i="*rename"+ ++J,d=0;d<h.length;++d){var e=h[d];g.doc.replaceRange(e.text,e.start,e.end,i)}}}}function u(a,b,c,d){var e=[],f=0,g=!c.fullDocs;g||delete c.fullDocs,"string"==typeof c&&(c={type:c}),c.lineCharPositions=!0,null==c.end&&(c.end=d||b.doc.getCursor("end"),b.doc.somethingSelected()&&(c.start=b.doc.getCursor("start")));var h=c.start||c.end;if(b.changed)if(b.doc.lineCount()>I&&g!==!1&&b.changed.to-b.changed.from<100&&b.changed.from<=h.line&&b.changed.to>c.end.line){e.push(v(b,h,c.end)),c.file="#0";var f=e[0].offsetLines;null!=c.start&&(c.start=G(c.start.line- -f,c.start.ch)),c.end=G(c.end.line-f,c.end.ch)}else e.push({type:"full",name:b.name,text:E(a,b)}),c.file=b.name,b.changed=null;else c.file=b.name;for(var i in a.docs){var j=a.docs[i];j.changed&&j!=b&&(e.push({type:"full",name:j.name,text:E(a,j)}),j.changed=null)}return{query:c,files:e}}function v(b,c,d){for(var e,f=b.doc,g=null,h=null,i=4,j=c.line-1,k=Math.max(0,j-50);j>=k;--j){var l=f.getLine(j),m=l.search(/\bfunction\b/);if(!(m<0)){var n=a.countColumn(l,null,i);null!=g&&g<=n||(g=n,h=j)}}null==h&&(h=k);var o=Math.min(f.lastLine(),d.line+20);if(null==g||g==a.countColumn(f.getLine(c.line),null,i))e=o;else for(e=d.line+1;e<o;++e){var n=a.countColumn(f.getLine(e),null,i);if(n<=g)break}var p=G(h,0);return{type:"part",name:b.name,offsetLines:p.line,text:f.getRange(p,G(e,0))}}function w(a,b){var c=document.createElement(a);b&&(c.className=b);for(var d=2;d<arguments.length;++d){var e=arguments[d];"string"==typeof e&&(e=document.createTextNode(e)),c.appendChild(e)}return c}function x(a,b,c){a.openDialog?a.openDialog(b+": <input type=text>",c):c(prompt(b,""))}function y(b,c,d){function e(){j=!0,i||f()}function f(){b.state.ternTooltip=null,h.parentNode&&(b.off("cursorActivity",f),b.off("blur",f),b.off("scroll",f),B(h))}b.state.ternTooltip&&A(b.state.ternTooltip);var g=b.cursorCoords(),h=b.state.ternTooltip=z(g.right+1,g.bottom,c),i=!1,j=!1;a.on(h,"mousemove",(function(){i=!0})),a.on(h,"mouseout",(function(b){a.contains(h,b.relatedTarget||b.toElement)||(j?f():i=!1)})),setTimeout(e,d.options.hintDelay?d.options.hintDelay:1700),b.on("cursorActivity",f),b.on("blur",f),b.on("scroll",f)}function z(a,b,c){var d=w("div",H+"tooltip",c);return d.style.left=a+"px",d.style.top=b+"px",document.body.appendChild(d),d}function A(a){var b=a&&a.parentNode;b&&b.removeChild(a)}function B(a){a.style.opacity="0",setTimeout((function(){A(a)}),1100)}function C(a,b,c){a.options.showError?a.options.showError(b,c):y(b,String(c),a)}function D(a){a.activeArgHints&&(A(a.activeArgHints),a.activeArgHints=null)}function E(a,b){var c=b.doc.getValue();return a.options.fileFilter&&(c=a.options.fileFilter(c,b.name,b.doc)),c}function F(a){function c(a,b){b&&(a.id=++e,f[e]=b),d.postMessage(a)}var d=a.worker=new Worker(a.options.workerScript);d.postMessage({type:"init",defs:a.options.defs,plugins:a.options.plugins,scripts:a.options.workerDeps});var e=0,f={};d.onmessage=function(d){var e=d.data;"getFile"==e.type?b(a,e.name,(function(a,b){c({type:"getFile",err:String(a),text:b,id:e.id})})):"debug"==e.type?window.console.log(e.message):e.id&&f[e.id]&&(f[e.id](e.err,e.body),delete f[e.id])},d.onerror=function(a){for(var b in f)f[b](a);f={}},this.addFile=function(a,b){c({type:"add",name:a,text:b})},this.delFile=function(a){c({type:"del",name:a})},this.request=function(a,b){c({type:"req",body:a},b)}}a.TernServer=function(a){var c=this;this.options=a||{};var d=this.options.plugins||(this.options.plugins={});d.doc_comment||(d.doc_comment=!0),this.docs=Object.create(null),this.options.useWorker?this.server=new F(this):this.server=new tern.Server({getFile:function(a,d){return b(c,a,d)},async:!0,defs:this.options.defs||[],plugins:d}),this.trackChange=function(a,b){e(c,a,b)},this.cachedArgHints=null,this.activeArgHints=null,this.jumpStack=[],this.getHint=function(a,b){return g(c,a,b)},this.getHint.async=!0},a.TernServer.prototype={addDoc:function(b,c){var d={doc:c,name:b,changed:null};return this.server.addFile(b,E(this,d)),a.on(c,"change",this.trackChange),this.docs[b]=d},delDoc:function(b){var c=d(this,b);c&&(a.off(c.doc,"change",this.trackChange),delete this.docs[c.name],this.server.delFile(c.name))},hideDoc:function(a){D(this);var b=d(this,a);b&&b.changed&&f(this,b)},complete:function(a){a.showHint({hint:this.getHint})},showType:function(a,b,c){i(this,a,b,"type",c)},showDocs:function(a,b,c){i(this,a,b,"documentation",c)},updateArgHints:function(a){j(this,a)},jumpToDef:function(a){m(this,a)},jumpBack:function(a){n(this,a)},rename:function(a){r(this,a)},selectName:function(a){s(this,a)},request:function(a,b,d,e){var f=this,g=c(this,a.getDoc()),h=u(this,g,b,e),i=h.query&&this.options.queryOptions&&this.options.queryOptions[h.query.type];if(i)for(var j in i)h.query[j]=i[j];this.server.request(h,(function(a,c){!a&&f.options.responseFilter&&(c=f.options.responseFilter(g,b,h,a,c)),d(a,c)}))},destroy:function(){D(this),this.worker&&(this.worker.terminate(),this.worker=null)}};var G=a.Pos,H="CodeMirror-Tern-",I=250,J=0,K=a.cmpPos}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=a.docs[b];d?c(F(a,d)):a.options.getFile?a.options.getFile(b,c):c(null)}function c(a,b,c){for(var d in a.docs){var e=a.docs[d];if(e.doc==b)return e}if(!c)for(var f=0;;++f)if(d="[doc"+(f||"")+"]",!a.docs[d]){c=d;break}return a.addDoc(c,b)}function d(b,d){return"string"==typeof d?b.docs[d]:(d instanceof a&&(d=d.getDoc()),d instanceof a.Doc?c(b,d):void 0)}function e(a,b,d){var e=c(a,b),g=a.cachedArgHints;g&&g.doc==b&&L(g.start,d.to)>=0&&(a.cachedArgHints=null);var h=e.changed;null==h&&(e.changed=h={from:d.from.line,to:d.from.line});var i=d.from.line+(d.text.length-1);d.from.line<h.to&&(h.to=h.to-(d.to.line-i)),i>=h.to&&(h.to=i+1),h.from>d.from.line&&(h.from=d.from.line),b.lineCount()>J&&d.to-h.from>100&&setTimeout((function(){e.changed&&e.changed.to-e.changed.from>100&&f(a,e)}),200)}function f(a,b){a.server.request({files:[{type:"full",name:b.name,text:F(a,b)}]},(function(a){a?window.console.error(a):b.changed=null}))}function g(b,c,d){b.request(c,{type:"completions",types:!0,docs:!0,urls:!0},(function(e,f){if(e)return D(b,c,e);var g=[],i="",j=f.start,k=f.end;'["'==c.getRange(H(j.line,j.ch-2),j)&&'"]'!=c.getRange(k,H(k.line,k.ch+2))&&(i='"]');for(var l=0;l<f.completions.length;++l){var m=f.completions[l],n=h(m.type);f.guess&&(n+=" "+I+"guess"),g.push({text:m.name+i,displayText:m.displayName||m.name,className:n,data:m})}var o={from:j,to:k,list:g},p=null;a.on(o,"close",(function(){B(p)})),a.on(o,"update",(function(){B(p)})),a.on(o,"select",(function(a,c){B(p);var d=b.options.completionTip?b.options.completionTip(a.data):a.data.doc;d&&(p=A(c.parentNode.getBoundingClientRect().right+window.pageXOffset,c.getBoundingClientRect().top+window.pageYOffset,d),p.className+=" "+I+"hint-doc")})),d(o)}))}function h(a){var b;return b="?"==a?"unknown":"number"==a||"string"==a||"bool"==a?a:/^fn\(/.test(a)?"fn":/^\[/.test(a)?"array":"object",I+"completion "+I+"completion-"+b}function i(a,b,c,d,e){a.request(b,d,(function(c,d){if(c)return D(a,b,c);if(a.options.typeTip)var f=a.options.typeTip(d);else{var f=w("span",null,w("strong",null,d.type||"not found"));if(d.doc&&f.appendChild(document.createTextNode(" — "+d.doc)),d.url){f.appendChild(document.createTextNode(" "));var g=f.appendChild(w("a",null,"[docs]"));g.href=d.url,g.target="_blank"}}y(b,f,a),e&&e()}),c)}function j(b,c){if(E(b),!c.somethingSelected()){var d=c.getTokenAt(c.getCursor()).state,e=a.innerMode(c.getMode(),d);if("javascript"==e.mode.name){var f=e.state.lexical;if("call"==f.info){for(var g,h=f.pos||0,i=c.getOption("tabSize"),j=c.getCursor().line,m=Math.max(0,j-9),n=!1;j>=m;--j){for(var o=c.getLine(j),p=0,q=0;;){var r=o.indexOf("\t",q);if(r==-1)break;p+=i-(r+p)%i-1,q=r+1}if(g=f.column-p,"("==o.charAt(g)){n=!0;break}}if(n){var s=H(j,g),t=b.cachedArgHints;return t&&t.doc==c.getDoc()&&0==L(s,t.start)?k(b,c,h):void b.request(c,{type:"type",preferFunction:!0,end:s},(function(a,d){!a&&d.type&&/^fn\(/.test(d.type)&&(b.cachedArgHints={start:s,type:l(d.type),name:d.exprName||d.name||"fn",guess:d.guess,doc:c.getDoc()},k(b,c,h))}))}}}}}function k(a,b,c){E(a);for(var d=a.cachedArgHints,e=d.type,f=w("span",d.guess?I+"fhint-guess":null,w("span",I+"fname",d.name),"("),g=0;g<e.args.length;++g){g&&f.appendChild(document.createTextNode(", "));var h=e.args[g];f.appendChild(w("span",I+"farg"+(g==c?" "+I+"farg-current":""),h.name||"?")),"?"!=h.type&&(f.appendChild(document.createTextNode(": ")),f.appendChild(w("span",I+"type",h.type)))}f.appendChild(document.createTextNode(e.rettype?") -> ":")")),e.rettype&&f.appendChild(w("span",I+"type",e.rettype));var i=b.cursorCoords(null,"page"),j=a.activeArgHints=A(i.right+1,i.bottom,f);setTimeout((function(){j.clear=z(b,(function(){a.activeArgHints==j&&E(a)}))}),20)}function l(a){function b(b){for(var c=0,e=d;;){var f=a.charAt(d);if(b.test(f)&&!c)return a.slice(e,d);/[{\[\(]/.test(f)?++c:/[}\]\)]/.test(f)&&--c,++d}}var c=[],d=3;if(")"!=a.charAt(d))for(;;){var e=a.slice(d).match(/^([^, \(\[\{]+): /);if(e&&(d+=e[0].length,e=e[1]),c.push({name:e,type:b(/[\),]/)}),")"==a.charAt(d))break;d+=2}var f=a.slice(d).match(/^\) -> (.*)$/);return{args:c,rettype:f&&f[1]}}function m(a,b){function d(d){var e={type:"definition",variable:d||null},f=c(a,b.getDoc());a.server.request(u(a,f,e),(function(c,d){if(c)return D(a,b,c);if(!d.file&&d.url)return void window.open(d.url);if(d.file){var e,g=a.docs[d.file];if(g&&(e=p(g.doc,d)))return a.jumpStack.push({file:f.name,start:b.getCursor("from"),end:b.getCursor("to")}),void o(a,f,g,e.start,e.end)}D(a,b,"Could not find a definition.")}))}q(b)?d():x(b,"Jump to variable",(function(a){a&&d(a)}))}function n(a,b){var d=a.jumpStack.pop(),e=d&&a.docs[d.file];e&&o(a,c(a,b.getDoc()),e,d.start,d.end)}function o(a,b,c,d,e){c.doc.setSelection(d,e),b!=c&&a.options.switchToDoc&&(E(a),a.options.switchToDoc(c.name,c.doc))}function p(a,b){for(var c=b.context.slice(0,b.contextOffset).split("\n"),d=b.start.line-(c.length-1),e=H(d,(1==c.length?b.start.ch:a.getLine(d).length)-c[0].length),f=a.getLine(d).slice(e.ch),g=d+1;g<a.lineCount()&&f.length<b.context.length;++g)f+="\n"+a.getLine(g);if(f.slice(0,b.context.length)==b.context)return b;for(var h,i=a.getSearchCursor(b.context,0,!1),j=1/0;i.findNext();){var k=i.from(),l=1e4*Math.abs(k.line-e.line);l||(l=Math.abs(k.ch-e.ch)),l<j&&(h=k,j=l)}if(!h)return null;if(1==c.length?h.ch+=c[0].length:h=H(h.line+(c.length-1),c[c.length-1].length),b.start.line==b.end.line)var m=H(h.line,h.ch+(b.end.ch-b.start.ch));else var m=H(h.line+(b.end.line-b.start.line),b.end.ch);return{start:h,end:m}}function q(a){var b=a.getCursor("end"),c=a.getTokenAt(b);return!(c.start<b.ch&&"comment"==c.type)&&/[\w)\]]/.test(a.getLine(b.line).slice(Math.max(b.ch-1,0),b.ch+1))}function r(a,b){var c=b.getTokenAt(b.getCursor());return/\w/.test(c.string)?void x(b,"New name for "+c.string,(function(c){a.request(b,{type:"rename",newName:c,fullDocs:!0},(function(c,d){return c?D(a,b,c):void t(a,d.changes)}))})):D(a,b,"Not at a variable")}function s(a,b){var d=c(a,b.doc).name;a.request(b,{type:"refs"},(function(c,e){if(c)return D(a,b,c);for(var f=[],g=0,h=b.getCursor(),i=0;i<e.refs.length;i++){var j=e.refs[i];j.file==d&&(f.push({anchor:j.start,head:j.end}),L(h,j.start)>=0&&L(h,j.end)<=0&&(g=f.length-1))}b.setSelections(f,g)}))}function t(a,b){for(var c=Object.create(null),d=0;d<b.length;++d){var e=b[d];(c[e.file]||(c[e.file]=[])).push(e)}for(var f in c){var g=a.docs[f],h=c[f];if(g){h.sort((function(a,b){return L(b.start,a.start)}));for(var i="*rename"+ ++K,d=0;d<h.length;++d){var e=h[d];g.doc.replaceRange(e.text,e.start,e.end,i)}}}}function u(a,b,c,d){var e=[],f=0,g=!c.fullDocs;g||delete c.fullDocs,"string"==typeof c&&(c={type:c}),c.lineCharPositions=!0,null==c.end&&(c.end=d||b.doc.getCursor("end"),b.doc.somethingSelected()&&(c.start=b.doc.getCursor("start")));var h=c.start||c.end;if(b.changed)if(b.doc.lineCount()>J&&g!==!1&&b.changed.to-b.changed.from<100&&b.changed.from<=h.line&&b.changed.to>c.end.line){e.push(v(b,h,c.end)),c.file="#0";var f=e[0].offsetLines;null!=c.start&&(c.start=H(c.start.line- -f,c.start.ch)),c.end=H(c.end.line-f,c.end.ch)}else e.push({type:"full",name:b.name,text:F(a,b)}),c.file=b.name,b.changed=null;else c.file=b.name;for(var i in a.docs){var j=a.docs[i];j.changed&&j!=b&&(e.push({type:"full",name:j.name,text:F(a,j)}),j.changed=null)}return{query:c,files:e}}function v(b,c,d){for(var e,f=b.doc,g=null,h=null,i=4,j=c.line-1,k=Math.max(0,j-50);j>=k;--j){var l=f.getLine(j),m=l.search(/\bfunction\b/);if(!(m<0)){var n=a.countColumn(l,null,i);null!=g&&g<=n||(g=n,h=j)}}null==h&&(h=k);var o=Math.min(f.lastLine(),d.line+20);if(null==g||g==a.countColumn(f.getLine(c.line),null,i))e=o;else for(e=d.line+1;e<o;++e){var n=a.countColumn(f.getLine(e),null,i);if(n<=g)break}var p=H(h,0);return{type:"part",name:b.name,offsetLines:p.line,text:f.getRange(p,H(e,0))}}function w(a,b){var c=document.createElement(a);b&&(c.className=b);for(var d=2;d<arguments.length;++d){var e=arguments[d];"string"==typeof e&&(e=document.createTextNode(e)),c.appendChild(e)}return c}function x(a,b,c){a.openDialog?a.openDialog(b+": <input type=text>",c):c(prompt(b,""))}function y(b,c,d){function e(){j=!0,i||f()}function f(){b.state.ternTooltip=null,h.parentNode&&C(h),k()}b.state.ternTooltip&&B(b.state.ternTooltip);var g=b.cursorCoords(),h=b.state.ternTooltip=A(g.right+1,g.bottom,c),i=!1,j=!1;a.on(h,"mousemove",(function(){i=!0})),a.on(h,"mouseout",(function(b){a.contains(h,b.relatedTarget||b.toElement)||(j?f():i=!1)})),setTimeout(e,d.options.hintDelay?d.options.hintDelay:1700);var k=z(b,f)}function z(a,b){return a.on("cursorActivity",b),a.on("blur",b),a.on("scroll",b),a.on("setDoc",b),function(){a.off("cursorActivity",b),a.off("blur",b),a.off("scroll",b),a.off("setDoc",b)}}function A(a,b,c){var d=w("div",I+"tooltip",c);return d.style.left=a+"px",d.style.top=b+"px",document.body.appendChild(d),d}function B(a){var b=a&&a.parentNode;b&&b.removeChild(a)}function C(a){a.style.opacity="0",setTimeout((function(){B(a)}),1100)}function D(a,b,c){a.options.showError?a.options.showError(b,c):y(b,String(c),a)}function E(a){a.activeArgHints&&(a.activeArgHints.clear&&a.activeArgHints.clear(),B(a.activeArgHints),a.activeArgHints=null)}function F(a,b){var c=b.doc.getValue();return a.options.fileFilter&&(c=a.options.fileFilter(c,b.name,b.doc)),c}function G(a){function c(a,b){b&&(a.id=++e,f[e]=b),d.postMessage(a)}var d=a.worker=new Worker(a.options.workerScript);d.postMessage({type:"init",defs:a.options.defs,plugins:a.options.plugins,scripts:a.options.workerDeps});var e=0,f={};d.onmessage=function(d){var e=d.data;"getFile"==e.type?b(a,e.name,(function(a,b){c({type:"getFile",err:String(a),text:b,id:e.id})})):"debug"==e.type?window.console.log(e.message):e.id&&f[e.id]&&(f[e.id](e.err,e.body),delete f[e.id])},d.onerror=function(a){for(var b in f)f[b](a);f={}},this.addFile=function(a,b){c({type:"add",name:a,text:b})},this.delFile=function(a){c({type:"del",name:a})},this.request=function(a,b){c({type:"req",body:a},b)}}a.TernServer=function(a){var c=this;this.options=a||{};var d=this.options.plugins||(this.options.plugins={});d.doc_comment||(d.doc_comment=!0),this.docs=Object.create(null),this.options.useWorker?this.server=new G(this):this.server=new tern.Server({getFile:function(a,d){return b(c,a,d)},async:!0,defs:this.options.defs||[],plugins:d}),this.trackChange=function(a,b){e(c,a,b)},this.cachedArgHints=null,this.activeArgHints=null,this.jumpStack=[],this.getHint=function(a,b){return g(c,a,b)},this.getHint.async=!0},a.TernServer.prototype={addDoc:function(b,c){var d={doc:c,name:b,changed:null};return this.server.addFile(b,F(this,d)),a.on(c,"change",this.trackChange),this.docs[b]=d},delDoc:function(b){var c=d(this,b);c&&(a.off(c.doc,"change",this.trackChange),delete this.docs[c.name],this.server.delFile(c.name))},hideDoc:function(a){E(this);var b=d(this,a);b&&b.changed&&f(this,b)},complete:function(a){a.showHint({hint:this.getHint})},showType:function(a,b,c){i(this,a,b,"type",c)},showDocs:function(a,b,c){i(this,a,b,"documentation",c)},updateArgHints:function(a){j(this,a)},jumpToDef:function(a){m(this,a)},jumpBack:function(a){n(this,a)},rename:function(a){r(this,a)},selectName:function(a){s(this,a)},request:function(a,b,d,e){var f=this,g=c(this,a.getDoc()),h=u(this,g,b,e),i=h.query&&this.options.queryOptions&&this.options.queryOptions[h.query.type];if(i)for(var j in i)h.query[j]=i[j];this.server.request(h,(function(a,c){!a&&f.options.responseFilter&&(c=f.options.responseFilter(g,b,h,a,c)),d(a,c)}))},destroy:function(){E(this),this.worker&&(this.worker.terminate(),this.worker=null)}};var H=a.Pos,I="CodeMirror-Tern-",J=250,K=0,L=a.cmpPos}));
\ No newline at end of file
diff --git a/media/editors/codemirror/keymap/emacs.js b/media/editors/codemirror/keymap/emacs.js
index 2d5fe1b815823..63da52fa37531 100644
--- a/media/editors/codemirror/keymap/emacs.js
+++ b/media/editors/codemirror/keymap/emacs.js
@@ -97,7 +97,7 @@
 
   function byExpr(cm, pos, dir) {
     var wrap;
-    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
+    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, {strict: true}))
         && wrap.match && (wrap.forward ? 1 : -1) == dir)
       return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
 
diff --git a/media/editors/codemirror/keymap/emacs.min.js b/media/editors/codemirror/keymap/emacs.min.js
index 04d98b7356b52..be8248c781770 100644
--- a/media/editors/codemirror/keymap/emacs.min.js
+++ b/media/editors/codemirror/keymap/emacs.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line==b.line&&a.ch==b.ch}function c(a){I.push(a),I.length>50&&I.shift()}function d(a){return I.length?void(I[I.length-1]+=a):c(a)}function e(a){return I[I.length-(a?Math.min(a,1):1)]||""}function f(){return I.length>1&&I.pop(),e()}function g(a,e,f,g,h){null==h&&(h=a.getRange(e,f)),g&&J&&J.cm==a&&b(e,J.pos)&&a.isClean(J.gen)?d(h):c(h),a.replaceRange("",e,f,"+delete"),J=g?{cm:a,pos:e,gen:a.changeGeneration()}:null}function h(a,b,c){return a.findPosH(b,c,"char",!0)}function i(a,b,c){return a.findPosH(b,c,"word",!0)}function j(a,b,c){return a.findPosV(b,c,"line",a.doc.sel.goalColumn)}function k(a,b,c){return a.findPosV(b,c,"page",a.doc.sel.goalColumn)}function l(a,b,c){for(var d=b.line,e=a.getLine(d),f=/\S/.test(c<0?e.slice(0,b.ch):e.slice(b.ch)),g=a.firstLine(),h=a.lastLine();;){if(d+=c,d<g||d>h)return a.clipPos(H(d-c,c<0?0:null));e=a.getLine(d);var i=/\S/.test(e);if(i)f=!0;else if(f)return H(d,0)}}function m(a,b,c){for(var d=b.line,e=b.ch,f=a.getLine(b.line),g=!1;;){var h=f.charAt(e+(c<0?-1:0));if(h){if(g&&/[!?.]/.test(h))return H(d,e+(c>0?1:0));g||(g=/\w/.test(h)),e+=c}else{if(d==(c<0?a.firstLine():a.lastLine()))return H(d,e);if(f=a.getLine(d+c),!/\S/.test(f))return H(d,e);d+=c,e=c<0?f.length:0}}}function n(a,c,d){var e;if(a.findMatchingBracket&&(e=a.findMatchingBracket(c,!0))&&e.match&&(e.forward?1:-1)==d)return d>0?H(e.to.line,e.to.ch+1):e.to;for(var f=!0;;f=!1){var g=a.getTokenAt(c),h=H(c.line,d<0?g.start:g.end);if(!(f&&d>0&&g.end==c.ch)&&/\w/.test(g.string))return h;var i=a.findPosH(h,d,"char");if(b(h,i))return c;c=i}}function o(a,b){var c=a.state.emacsPrefix;return c?(w(a),"-"==c?-1:Number(c)):b?null:1}function p(a){var b="string"==typeof a?function(b){b.execCommand(a)}:a;return function(a){var c=o(a);b(a);for(var d=1;d<c;++d)b(a)}}function q(a,c,d,e){var f=o(a);f<0&&(e=-e,f=-f);for(var g=0;g<f;++g){var h=d(a,c,e);if(b(h,c))break;c=h}return c}function r(a,b){var c=function(c){c.extendSelection(q(c,c.getCursor(),a,b))};return c.motion=!0,c}function s(a,b,c){for(var d,e=a.listSelections(),f=e.length;f--;)d=e[f].head,g(a,d,q(a,d,b,c),!0)}function t(a){if(a.somethingSelected()){for(var b,c=a.listSelections(),d=c.length;d--;)b=c[d],g(a,b.anchor,b.head);return!0}}function u(a,b){return a.state.emacsPrefix?void("-"!=b&&(a.state.emacsPrefix+=b)):(a.state.emacsPrefix=b,a.on("keyHandled",v),void a.on("inputRead",x))}function v(a,b){a.state.emacsPrefixMap||K.hasOwnProperty(b)||w(a)}function w(a){a.state.emacsPrefix=null,a.off("keyHandled",v),a.off("inputRead",x)}function x(a,b){var c=o(a);if(c>1&&"+input"==b.origin){for(var d=b.text.join("\n"),e="",f=1;f<c;++f)e+=d;a.replaceSelection(e)}}function y(a){a.state.emacsPrefixMap=!0,a.addKeyMap(M),a.on("keyHandled",z),a.on("inputRead",z)}function z(a,b){("string"!=typeof b||!/^\d$/.test(b)&&"Ctrl-U"!=b)&&(a.removeKeyMap(M),a.state.emacsPrefixMap=!1,a.off("keyHandled",z),a.off("inputRead",z))}function A(a){a.setCursor(a.getCursor()),a.setExtending(!a.getExtending()),a.on("change",(function(){a.setExtending(!1)}))}function B(a){a.setExtending(!1),a.setCursor(a.getCursor())}function C(a,b,c){a.openDialog?a.openDialog(b+': <input type="text" style="width: 10em"/>',c,{bottom:!0}):c(prompt(b,""))}function D(a,b){var c=a.getCursor(),d=a.findPosH(c,1,"word");a.replaceRange(b(a.getRange(c,d)),c,d),a.setCursor(d)}function E(a){for(var b=a.getCursor(),c=b.line,d=b.ch,e=[];c>=a.firstLine();){for(var f=a.getLine(c),g=null==d?f.length:d;g>0;){var d=f.charAt(--g);if(")"==d)e.push("(");else if("]"==d)e.push("[");else if("}"==d)e.push("{");else if(/[\(\{\[]/.test(d)&&(!e.length||e.pop()!=d))return a.extendSelection(H(c,g))}--c,d=null}}function F(a){a.execCommand("clearSearch"),B(a)}function G(a){M[a]=function(b){u(b,a)},L["Ctrl-"+a]=function(b){u(b,a)},K["Ctrl-"+a]=!0}var H=a.Pos,I=[],J=null,K={"Alt-G":!0,"Ctrl-X":!0,"Ctrl-Q":!0,"Ctrl-U":!0};a.emacs={kill:g,killRegion:t,repeated:p};for(var L=a.keyMap.emacs=a.normalizeKeyMap({"Ctrl-W":function(a){g(a,a.getCursor("start"),a.getCursor("end"))},"Ctrl-K":p((function(a){var b=a.getCursor(),c=a.clipPos(H(b.line)),d=a.getRange(b,c);/\S/.test(d)||(d+="\n",c=H(b.line+1,0)),g(a,b,c,!0,d)})),"Alt-W":function(a){c(a.getSelection()),B(a)},"Ctrl-Y":function(a){var b=a.getCursor();a.replaceRange(e(o(a)),b,b,"paste"),a.setSelection(b,a.getCursor())},"Alt-Y":function(a){a.replaceSelection(f(),"around","paste")},"Ctrl-Space":A,"Ctrl-Shift-2":A,"Ctrl-F":r(h,1),"Ctrl-B":r(h,-1),Right:r(h,1),Left:r(h,-1),"Ctrl-D":function(a){s(a,h,1)},Delete:function(a){t(a)||s(a,h,1)},"Ctrl-H":function(a){s(a,h,-1)},Backspace:function(a){t(a)||s(a,h,-1)},"Alt-F":r(i,1),"Alt-B":r(i,-1),"Alt-D":function(a){s(a,i,1)},"Alt-Backspace":function(a){s(a,i,-1)},"Ctrl-N":r(j,1),"Ctrl-P":r(j,-1),Down:r(j,1),Up:r(j,-1),"Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd",End:"goLineEnd",Home:"goLineStart","Alt-V":r(k,-1),"Ctrl-V":r(k,1),PageUp:r(k,-1),PageDown:r(k,1),"Ctrl-Up":r(l,-1),"Ctrl-Down":r(l,1),"Alt-A":r(m,-1),"Alt-E":r(m,1),"Alt-K":function(a){s(a,m,1)},"Ctrl-Alt-K":function(a){s(a,n,1)},"Ctrl-Alt-Backspace":function(a){s(a,n,-1)},"Ctrl-Alt-F":r(n,1),"Ctrl-Alt-B":r(n,-1),"Shift-Ctrl-Alt-2":function(a){var b=a.getCursor();a.setSelection(q(a,b,n,1),b)},"Ctrl-Alt-T":function(a){var b=n(a,a.getCursor(),-1),c=n(a,b,1),d=n(a,c,1),e=n(a,d,-1);a.replaceRange(a.getRange(e,d)+a.getRange(c,e)+a.getRange(b,c),b,d)},"Ctrl-Alt-U":p(E),"Alt-Space":function(a){for(var b=a.getCursor(),c=b.ch,d=b.ch,e=a.getLine(b.line);c&&/\s/.test(e.charAt(c-1));)--c;for(;d<e.length&&/\s/.test(e.charAt(d));)++d;a.replaceRange(" ",H(b.line,c),H(b.line,d))},"Ctrl-O":p((function(a){a.replaceSelection("\n","start")})),"Ctrl-T":p((function(a){a.execCommand("transposeChars")})),"Alt-C":p((function(a){D(a,(function(a){var b=a.search(/\w/);return b==-1?a:a.slice(0,b)+a.charAt(b).toUpperCase()+a.slice(b+1).toLowerCase()}))})),"Alt-U":p((function(a){D(a,(function(a){return a.toUpperCase()}))})),"Alt-L":p((function(a){D(a,(function(a){return a.toLowerCase()}))})),"Alt-;":"toggleComment","Ctrl-/":p("undo"),"Shift-Ctrl--":p("undo"),"Ctrl-Z":p("undo"),"Cmd-Z":p("undo"),"Shift-Alt-,":"goDocStart","Shift-Alt-.":"goDocEnd","Ctrl-S":"findNext","Ctrl-R":"findPrev","Ctrl-G":F,"Shift-Alt-5":"replace","Alt-/":"autocomplete",Enter:"newlineAndIndent","Ctrl-J":p((function(a){a.replaceSelection("\n","end")})),Tab:"indentAuto","Alt-G G":function(a){var b=o(a,!0);return null!=b&&b>0?a.setCursor(b-1):void C(a,"Goto line",(function(b){var c;b&&!isNaN(c=Number(b))&&c==(0|c)&&c>0&&a.setCursor(c-1)}))},"Ctrl-X Tab":function(a){a.indentSelection(o(a,!0)||a.getOption("indentUnit"))},"Ctrl-X Ctrl-X":function(a){a.setSelection(a.getCursor("head"),a.getCursor("anchor"))},"Ctrl-X Ctrl-S":"save","Ctrl-X Ctrl-W":"save","Ctrl-X S":"saveAll","Ctrl-X F":"open","Ctrl-X U":p("undo"),"Ctrl-X K":"close","Ctrl-X Delete":function(a){g(a,a.getCursor(),m(a,a.getCursor(),1),!0)},"Ctrl-X H":"selectAll","Ctrl-Q Tab":p("insertTab"),"Ctrl-U":y}),M={"Ctrl-G":w},N=0;N<10;++N)G(String(N));G("-")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line==b.line&&a.ch==b.ch}function c(a){I.push(a),I.length>50&&I.shift()}function d(a){return I.length?void(I[I.length-1]+=a):c(a)}function e(a){return I[I.length-(a?Math.min(a,1):1)]||""}function f(){return I.length>1&&I.pop(),e()}function g(a,e,f,g,h){null==h&&(h=a.getRange(e,f)),g&&J&&J.cm==a&&b(e,J.pos)&&a.isClean(J.gen)?d(h):c(h),a.replaceRange("",e,f,"+delete"),J=g?{cm:a,pos:e,gen:a.changeGeneration()}:null}function h(a,b,c){return a.findPosH(b,c,"char",!0)}function i(a,b,c){return a.findPosH(b,c,"word",!0)}function j(a,b,c){return a.findPosV(b,c,"line",a.doc.sel.goalColumn)}function k(a,b,c){return a.findPosV(b,c,"page",a.doc.sel.goalColumn)}function l(a,b,c){for(var d=b.line,e=a.getLine(d),f=/\S/.test(c<0?e.slice(0,b.ch):e.slice(b.ch)),g=a.firstLine(),h=a.lastLine();;){if(d+=c,d<g||d>h)return a.clipPos(H(d-c,c<0?0:null));e=a.getLine(d);var i=/\S/.test(e);if(i)f=!0;else if(f)return H(d,0)}}function m(a,b,c){for(var d=b.line,e=b.ch,f=a.getLine(b.line),g=!1;;){var h=f.charAt(e+(c<0?-1:0));if(h){if(g&&/[!?.]/.test(h))return H(d,e+(c>0?1:0));g||(g=/\w/.test(h)),e+=c}else{if(d==(c<0?a.firstLine():a.lastLine()))return H(d,e);if(f=a.getLine(d+c),!/\S/.test(f))return H(d,e);d+=c,e=c<0?f.length:0}}}function n(a,c,d){var e;if(a.findMatchingBracket&&(e=a.findMatchingBracket(c,{strict:!0}))&&e.match&&(e.forward?1:-1)==d)return d>0?H(e.to.line,e.to.ch+1):e.to;for(var f=!0;;f=!1){var g=a.getTokenAt(c),h=H(c.line,d<0?g.start:g.end);if(!(f&&d>0&&g.end==c.ch)&&/\w/.test(g.string))return h;var i=a.findPosH(h,d,"char");if(b(h,i))return c;c=i}}function o(a,b){var c=a.state.emacsPrefix;return c?(w(a),"-"==c?-1:Number(c)):b?null:1}function p(a){var b="string"==typeof a?function(b){b.execCommand(a)}:a;return function(a){var c=o(a);b(a);for(var d=1;d<c;++d)b(a)}}function q(a,c,d,e){var f=o(a);f<0&&(e=-e,f=-f);for(var g=0;g<f;++g){var h=d(a,c,e);if(b(h,c))break;c=h}return c}function r(a,b){var c=function(c){c.extendSelection(q(c,c.getCursor(),a,b))};return c.motion=!0,c}function s(a,b,c){for(var d,e=a.listSelections(),f=e.length;f--;)d=e[f].head,g(a,d,q(a,d,b,c),!0)}function t(a){if(a.somethingSelected()){for(var b,c=a.listSelections(),d=c.length;d--;)b=c[d],g(a,b.anchor,b.head);return!0}}function u(a,b){return a.state.emacsPrefix?void("-"!=b&&(a.state.emacsPrefix+=b)):(a.state.emacsPrefix=b,a.on("keyHandled",v),void a.on("inputRead",x))}function v(a,b){a.state.emacsPrefixMap||K.hasOwnProperty(b)||w(a)}function w(a){a.state.emacsPrefix=null,a.off("keyHandled",v),a.off("inputRead",x)}function x(a,b){var c=o(a);if(c>1&&"+input"==b.origin){for(var d=b.text.join("\n"),e="",f=1;f<c;++f)e+=d;a.replaceSelection(e)}}function y(a){a.state.emacsPrefixMap=!0,a.addKeyMap(M),a.on("keyHandled",z),a.on("inputRead",z)}function z(a,b){("string"!=typeof b||!/^\d$/.test(b)&&"Ctrl-U"!=b)&&(a.removeKeyMap(M),a.state.emacsPrefixMap=!1,a.off("keyHandled",z),a.off("inputRead",z))}function A(a){a.setCursor(a.getCursor()),a.setExtending(!a.getExtending()),a.on("change",(function(){a.setExtending(!1)}))}function B(a){a.setExtending(!1),a.setCursor(a.getCursor())}function C(a,b,c){a.openDialog?a.openDialog(b+': <input type="text" style="width: 10em"/>',c,{bottom:!0}):c(prompt(b,""))}function D(a,b){var c=a.getCursor(),d=a.findPosH(c,1,"word");a.replaceRange(b(a.getRange(c,d)),c,d),a.setCursor(d)}function E(a){for(var b=a.getCursor(),c=b.line,d=b.ch,e=[];c>=a.firstLine();){for(var f=a.getLine(c),g=null==d?f.length:d;g>0;){var d=f.charAt(--g);if(")"==d)e.push("(");else if("]"==d)e.push("[");else if("}"==d)e.push("{");else if(/[\(\{\[]/.test(d)&&(!e.length||e.pop()!=d))return a.extendSelection(H(c,g))}--c,d=null}}function F(a){a.execCommand("clearSearch"),B(a)}function G(a){M[a]=function(b){u(b,a)},L["Ctrl-"+a]=function(b){u(b,a)},K["Ctrl-"+a]=!0}var H=a.Pos,I=[],J=null,K={"Alt-G":!0,"Ctrl-X":!0,"Ctrl-Q":!0,"Ctrl-U":!0};a.emacs={kill:g,killRegion:t,repeated:p};for(var L=a.keyMap.emacs=a.normalizeKeyMap({"Ctrl-W":function(a){g(a,a.getCursor("start"),a.getCursor("end"))},"Ctrl-K":p((function(a){var b=a.getCursor(),c=a.clipPos(H(b.line)),d=a.getRange(b,c);/\S/.test(d)||(d+="\n",c=H(b.line+1,0)),g(a,b,c,!0,d)})),"Alt-W":function(a){c(a.getSelection()),B(a)},"Ctrl-Y":function(a){var b=a.getCursor();a.replaceRange(e(o(a)),b,b,"paste"),a.setSelection(b,a.getCursor())},"Alt-Y":function(a){a.replaceSelection(f(),"around","paste")},"Ctrl-Space":A,"Ctrl-Shift-2":A,"Ctrl-F":r(h,1),"Ctrl-B":r(h,-1),Right:r(h,1),Left:r(h,-1),"Ctrl-D":function(a){s(a,h,1)},Delete:function(a){t(a)||s(a,h,1)},"Ctrl-H":function(a){s(a,h,-1)},Backspace:function(a){t(a)||s(a,h,-1)},"Alt-F":r(i,1),"Alt-B":r(i,-1),"Alt-D":function(a){s(a,i,1)},"Alt-Backspace":function(a){s(a,i,-1)},"Ctrl-N":r(j,1),"Ctrl-P":r(j,-1),Down:r(j,1),Up:r(j,-1),"Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd",End:"goLineEnd",Home:"goLineStart","Alt-V":r(k,-1),"Ctrl-V":r(k,1),PageUp:r(k,-1),PageDown:r(k,1),"Ctrl-Up":r(l,-1),"Ctrl-Down":r(l,1),"Alt-A":r(m,-1),"Alt-E":r(m,1),"Alt-K":function(a){s(a,m,1)},"Ctrl-Alt-K":function(a){s(a,n,1)},"Ctrl-Alt-Backspace":function(a){s(a,n,-1)},"Ctrl-Alt-F":r(n,1),"Ctrl-Alt-B":r(n,-1),"Shift-Ctrl-Alt-2":function(a){var b=a.getCursor();a.setSelection(q(a,b,n,1),b)},"Ctrl-Alt-T":function(a){var b=n(a,a.getCursor(),-1),c=n(a,b,1),d=n(a,c,1),e=n(a,d,-1);a.replaceRange(a.getRange(e,d)+a.getRange(c,e)+a.getRange(b,c),b,d)},"Ctrl-Alt-U":p(E),"Alt-Space":function(a){for(var b=a.getCursor(),c=b.ch,d=b.ch,e=a.getLine(b.line);c&&/\s/.test(e.charAt(c-1));)--c;for(;d<e.length&&/\s/.test(e.charAt(d));)++d;a.replaceRange(" ",H(b.line,c),H(b.line,d))},"Ctrl-O":p((function(a){a.replaceSelection("\n","start")})),"Ctrl-T":p((function(a){a.execCommand("transposeChars")})),"Alt-C":p((function(a){D(a,(function(a){var b=a.search(/\w/);return b==-1?a:a.slice(0,b)+a.charAt(b).toUpperCase()+a.slice(b+1).toLowerCase()}))})),"Alt-U":p((function(a){D(a,(function(a){return a.toUpperCase()}))})),"Alt-L":p((function(a){D(a,(function(a){return a.toLowerCase()}))})),"Alt-;":"toggleComment","Ctrl-/":p("undo"),"Shift-Ctrl--":p("undo"),"Ctrl-Z":p("undo"),"Cmd-Z":p("undo"),"Shift-Alt-,":"goDocStart","Shift-Alt-.":"goDocEnd","Ctrl-S":"findNext","Ctrl-R":"findPrev","Ctrl-G":F,"Shift-Alt-5":"replace","Alt-/":"autocomplete",Enter:"newlineAndIndent","Ctrl-J":p((function(a){a.replaceSelection("\n","end")})),Tab:"indentAuto","Alt-G G":function(a){var b=o(a,!0);return null!=b&&b>0?a.setCursor(b-1):void C(a,"Goto line",(function(b){var c;b&&!isNaN(c=Number(b))&&c==(0|c)&&c>0&&a.setCursor(c-1)}))},"Ctrl-X Tab":function(a){a.indentSelection(o(a,!0)||a.getOption("indentUnit"))},"Ctrl-X Ctrl-X":function(a){a.setSelection(a.getCursor("head"),a.getCursor("anchor"))},"Ctrl-X Ctrl-S":"save","Ctrl-X Ctrl-W":"save","Ctrl-X S":"saveAll","Ctrl-X F":"open","Ctrl-X U":p("undo"),"Ctrl-X K":"close","Ctrl-X Delete":function(a){g(a,a.getCursor(),m(a,a.getCursor(),1),!0)},"Ctrl-X H":"selectAll","Ctrl-Q Tab":p("insertTab"),"Ctrl-U":y}),M={"Ctrl-G":w},N=0;N<10;++N)G(String(N));G("-")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/keymap/sublime.js b/media/editors/codemirror/keymap/sublime.js
index 0ce89558750c1..98266e44f07cf 100644
--- a/media/editors/codemirror/keymap/sublime.js
+++ b/media/editors/codemirror/keymap/sublime.js
@@ -165,6 +165,23 @@
       cm.state.sublimeFindFullWord = cm.doc.sel;
   };
 
+  function addCursorToSelection(cm, dir) {
+    var ranges = cm.listSelections(), newRanges = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      var newAnchor = cm.findPosV(range.anchor, dir, "line");
+      var newHead = cm.findPosV(range.head, dir, "line");
+      var newRange = {anchor: newAnchor, head: newHead};
+      newRanges.push(range);
+      newRanges.push(newRange);
+    }
+    cm.setSelections(newRanges);
+  }
+
+  var addCursorToLineCombo = mac ? "Shift-Cmd" : 'Alt-Ctrl';
+  cmds[map[addCursorToLineCombo + "Up"] = "addCursorToPrevLine"] = function(cm) { addCursorToSelection(cm, -1); };
+  cmds[map[addCursorToLineCombo + "Down"] = "addCursorToNextLine"] = function(cm) { addCursorToSelection(cm, 1); };
+
   function isSelectedRange(ranges, from, to) {
     for (var i = 0; i < ranges.length; i++)
       if (ranges[i].from() == from && ranges[i].to() == to) return true
diff --git a/media/editors/codemirror/keymap/sublime.min.js b/media/editors/codemirror/keymap/sublime.min.js
index be9c5d45faa67..e6bf885aede51 100644
--- a/media/editors/codemirror/keymap/sublime.min.js
+++ b/media/editors/codemirror/keymap/sublime.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/edit/matchbrackets")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){if(d<0&&0==c.ch)return b.clipPos(n(c.line-1));var e=b.getLine(c.line);if(d>0&&c.ch>=e.length)return b.clipPos(n(c.line+1,0));for(var f,g="start",h=c.ch,i=d<0?0:e.length,j=0;h!=i;h+=d,j++){var k=e.charAt(d<0?h-1:h),l="_"!=k&&a.isWordChar(k)?"w":"o";if("w"==l&&k.toUpperCase()==k&&(l="W"),"start"==g)"o"!=l&&(g="in",f=l);else if("in"==g&&f!=l){if("w"==f&&"W"==l&&d<0&&h--,"W"==f&&"w"==l&&d>0){f="w";continue}break}}return n(c.line,h)}function c(a,c){a.extendSelectionsBy((function(d){return a.display.shift||a.doc.extend||d.empty()?b(a.doc,d.head,c):c<0?d.from():d.to()}))}function d(b,c){return b.isReadOnly()?a.Pass:(b.operation((function(){for(var a=b.listSelections().length,d=[],e=-1,f=0;f<a;f++){var g=b.listSelections()[f].head;if(!(g.line<=e)){var h=n(g.line+(c?0:1),0);b.replaceRange("\n",h,null,"+insertLine"),b.indentLine(h.line,null,!0),d.push({head:h,anchor:h}),e=g.line+1}}b.setSelections(d)})),void b.execCommand("indentAuto"))}function e(b,c){for(var d=c.ch,e=d,f=b.getLine(c.line);d&&a.isWordChar(f.charAt(d-1));)--d;for(;e<f.length&&a.isWordChar(f.charAt(e));)++e;return{from:n(c.line,d),to:n(c.line,e),word:f.slice(d,e)}}function f(a,b,c){for(var d=0;d<a.length;d++)if(a[d].from()==b&&a[d].to()==c)return!0;return!1}function g(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){var e=b[d],f=e.head,g=a.scanForBracket(f,-1);if(!g)return!1;for(;;){var h=a.scanForBracket(f,1);if(!h)return!1;if(h.ch==s.charAt(s.indexOf(g.ch)+1)){c.push({anchor:n(g.pos.line,g.pos.ch+1),head:h.pos});break}f=n(h.pos.line,h.pos.ch+1)}}return a.setSelections(c),!0}function h(b,c){if(b.isReadOnly())return a.Pass;for(var d,e=b.listSelections(),f=[],g=0;g<e.length;g++){var h=e[g];if(!h.empty()){for(var i=h.from().line,j=h.to().line;g<e.length-1&&e[g+1].from().line==j;)j=e[++g].to().line;e[g].to().ch||j--,f.push(i,j)}}f.length?d=!0:f.push(b.firstLine(),b.lastLine()),b.operation((function(){for(var a=[],e=0;e<f.length;e+=2){var g=f[e],h=f[e+1],i=n(g,0),j=n(h),k=b.getRange(i,j,!1);c?k.sort():k.sort((function(a,b){var c=a.toUpperCase(),d=b.toUpperCase();return c!=d&&(a=c,b=d),a<b?-1:a==b?0:1})),b.replaceRange(k,i,j),d&&a.push({anchor:i,head:n(h+1,0)})}d&&b.setSelections(a,0)}))}function i(b,c){b.operation((function(){for(var d=b.listSelections(),f=[],g=[],h=0;h<d.length;h++){var i=d[h];i.empty()?(f.push(h),g.push("")):g.push(c(b.getRange(i.from(),i.to())))}b.replaceSelections(g,"around","case");for(var j,h=f.length-1;h>=0;h--){var i=d[f[h]];if(!(j&&a.cmpPos(i.head,j)>0)){var k=e(b,i.head);j=k.from,b.replaceRange(c(k.word),k.from,k.to)}}}))}function j(b){var c=b.getCursor("from"),d=b.getCursor("to");if(0==a.cmpPos(c,d)){var f=e(b,c);if(!f.word)return;c=f.from,d=f.to}return{from:c,to:d,query:b.getRange(c,d),word:f}}function k(a,b){var c=j(a);if(c){var d=c.query,e=a.getSearchCursor(d,b?c.to:c.from);(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):(e=a.getSearchCursor(d,b?n(a.firstLine(),0):a.clipPos(n(a.lastLine()))),(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):c.word&&a.setSelection(c.from,c.to))}}var l=a.keyMap.sublime={fallthrough:"default"},m=a.commands,n=a.Pos,o=a.keyMap.default==a.keyMap.macDefault,p=o?"Cmd-":"Ctrl-",q=o?"Ctrl-":"Alt-";m[l[q+"Left"]="goSubwordLeft"]=function(a){c(a,-1)},m[l[q+"Right"]="goSubwordRight"]=function(a){c(a,1)},o&&(l["Cmd-Left"]="goLineStartSmart");var r=o?"Ctrl-Alt-":"Ctrl-";m[l[r+"Up"]="scrollLineUp"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top+b.clientHeight,"local");a.getCursor().line>=c&&a.execCommand("goLineUp")}a.scrollTo(null,b.top-a.defaultTextHeight())},m[l[r+"Down"]="scrollLineDown"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top,"local")+1;a.getCursor().line<=c&&a.execCommand("goLineDown")}a.scrollTo(null,b.top+a.defaultTextHeight())},m[l["Shift-"+p+"L"]="splitSelectionByLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++)for(var e=b[d].from(),f=b[d].to(),g=e.line;g<=f.line;++g)f.line>e.line&&g==f.line&&0==f.ch||c.push({anchor:g==e.line?e:n(g,0),head:g==f.line?f:n(g)});a.setSelections(c,0)},l["Shift-Tab"]="indentLess",m[l.Esc="singleSelectionTop"]=function(a){var b=a.listSelections()[0];a.setSelection(b.anchor,b.head,{scroll:!1})},m[l[p+"L"]="selectLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){var e=b[d];c.push({anchor:n(e.from().line,0),head:n(e.to().line+1,0)})}a.setSelections(c)},l["Shift-Ctrl-K"]="deleteLine",m[l[p+"Enter"]="insertLineAfter"]=function(a){return d(a,!1)},m[l["Shift-"+p+"Enter"]="insertLineBefore"]=function(a){return d(a,!0)},m[l[p+"D"]="selectNextOccurrence"]=function(b){var c=b.getCursor("from"),d=b.getCursor("to"),g=b.state.sublimeFindFullWord==b.doc.sel;if(0==a.cmpPos(c,d)){var h=e(b,c);if(!h.word)return;b.setSelection(h.from,h.to),g=!0}else{var i=b.getRange(c,d),j=g?new RegExp("\\b"+i+"\\b"):i,k=b.getSearchCursor(j,d),l=k.findNext();if(l||(k=b.getSearchCursor(j,n(b.firstLine(),0)),l=k.findNext()),!l||f(b.listSelections(),k.from(),k.to()))return a.Pass;b.addSelection(k.from(),k.to())}g&&(b.state.sublimeFindFullWord=b.doc.sel)};var s="(){}[]";m[l["Shift-"+p+"Space"]="selectScope"]=function(a){g(a)||a.execCommand("selectAll")},m[l["Shift-"+p+"M"]="selectBetweenBrackets"]=function(b){if(!g(b))return a.Pass},m[l[p+"M"]="goToBracket"]=function(b){b.extendSelectionsBy((function(c){var d=b.scanForBracket(c.head,1);if(d&&0!=a.cmpPos(d.pos,c.head))return d.pos;var e=b.scanForBracket(c.head,-1);return e&&n(e.pos.line,e.pos.ch+1)||c.head}))};var t=o?"Cmd-Ctrl-":"Shift-Ctrl-";m[l[t+"Up"]="swapLineUp"]=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.firstLine()-1,f=[],g=0;g<c.length;g++){var h=c[g],i=h.from().line-1,j=h.to().line;f.push({anchor:n(h.anchor.line-1,h.anchor.ch),head:n(h.head.line-1,h.head.ch)}),0!=h.to().ch||h.empty()||--j,i>e?d.push(i,j):d.length&&(d[d.length-1]=j),e=j}b.operation((function(){for(var a=0;a<d.length;a+=2){var c=d[a],e=d[a+1],g=b.getLine(c);b.replaceRange("",n(c,0),n(c+1,0),"+swapLine"),e>b.lastLine()?b.replaceRange("\n"+g,n(b.lastLine()),null,"+swapLine"):b.replaceRange(g+"\n",n(e,0),null,"+swapLine")}b.setSelections(f),b.scrollIntoView()}))},m[l[t+"Down"]="swapLineDown"]=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.lastLine()+1,f=c.length-1;f>=0;f--){var g=c[f],h=g.to().line+1,i=g.from().line;0!=g.to().ch||g.empty()||h--,h<e?d.push(h,i):d.length&&(d[d.length-1]=i),e=i}b.operation((function(){for(var a=d.length-2;a>=0;a-=2){var c=d[a],e=d[a+1],f=b.getLine(c);c==b.lastLine()?b.replaceRange("",n(c-1),n(c),"+swapLine"):b.replaceRange("",n(c,0),n(c+1,0),"+swapLine"),b.replaceRange(f+"\n",n(e,0),null,"+swapLine")}b.scrollIntoView()}))},m[l[p+"/"]="toggleCommentIndented"]=function(a){a.toggleComment({indent:!0})},m[l[p+"J"]="joinLines"]=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){for(var e=b[d],f=e.from(),g=f.line,h=e.to().line;d<b.length-1&&b[d+1].from().line==h;)h=b[++d].to().line;c.push({start:g,end:h,anchor:!e.empty()&&f})}a.operation((function(){for(var b=0,d=[],e=0;e<c.length;e++){for(var f,g=c[e],h=g.anchor&&n(g.anchor.line-b,g.anchor.ch),i=g.start;i<=g.end;i++){var j=i-b;i==g.end&&(f=n(j,a.getLine(j).length+1)),j<a.lastLine()&&(a.replaceRange(" ",n(j),n(j+1,/^\s*/.exec(a.getLine(j+1))[0].length)),++b)}d.push({anchor:h||f,head:f})}a.setSelections(d,0)}))},m[l["Shift-"+p+"D"]="duplicateLine"]=function(a){a.operation((function(){for(var b=a.listSelections().length,c=0;c<b;c++){var d=a.listSelections()[c];d.empty()?a.replaceRange(a.getLine(d.head.line)+"\n",n(d.head.line,0)):a.replaceRange(a.getRange(d.from(),d.to()),d.from())}a.scrollIntoView()}))},o||(l[p+"T"]="transposeChars"),m[l.F9="sortLines"]=function(a){h(a,!0)},m[l[p+"F9"]="sortLinesInsensitive"]=function(a){h(a,!1)},m[l.F2="nextBookmark"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){var c=b.shift(),d=c.find();if(d)return b.push(c),a.setSelection(d.from,d.to)}},m[l["Shift-F2"]="prevBookmark"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){b.unshift(b.pop());var c=b[b.length-1].find();if(c)return a.setSelection(c.from,c.to);b.pop()}},m[l[p+"F2"]="toggleBookmark"]=function(a){for(var b=a.listSelections(),c=a.state.sublimeBookmarks||(a.state.sublimeBookmarks=[]),d=0;d<b.length;d++){for(var e=b[d].from(),f=b[d].to(),g=a.findMarks(e,f),h=0;h<g.length;h++)if(g[h].sublimeBookmark){g[h].clear();for(var i=0;i<c.length;i++)c[i]==g[h]&&c.splice(i--,1);break}h==g.length&&c.push(a.markText(e,f,{sublimeBookmark:!0,clearWhenEmpty:!1}))}},m[l["Shift-"+p+"F2"]="clearBookmarks"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(var c=0;c<b.length;c++)b[c].clear();b.length=0},m[l["Alt-F2"]="selectBookmarks"]=function(a){var b=a.state.sublimeBookmarks,c=[];if(b)for(var d=0;d<b.length;d++){var e=b[d].find();e?c.push({anchor:e.from,head:e.to}):b.splice(d--,0)}c.length&&a.setSelections(c,0)},l["Alt-Q"]="wrapLines";var u=p+"K ";l[u+p+"Backspace"]="delLineLeft",m[l.Backspace="smartBackspace"]=function(b){return b.somethingSelected()?a.Pass:void b.operation((function(){for(var c=b.listSelections(),d=b.getOption("indentUnit"),e=c.length-1;e>=0;e--){var f=c[e].head,g=b.getRange({line:f.line,ch:0},f),h=a.countColumn(g,null,b.getOption("tabSize")),i=b.findPosH(f,-1,"char",!1);if(g&&!/\S/.test(g)&&h%d==0){var j=new n(f.line,a.findColumn(g,h-d,d));j.ch!=f.ch&&(i=j)}b.replaceRange("",i,f,"+delete")}}))},m[l[u+p+"K"]="delLineRight"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange("",b[c].anchor,n(b[c].to().line),"+delete");a.scrollIntoView()}))},m[l[u+p+"U"]="upcaseAtCursor"]=function(a){i(a,(function(a){return a.toUpperCase()}))},m[l[u+p+"L"]="downcaseAtCursor"]=function(a){i(a,(function(a){return a.toLowerCase()}))},m[l[u+p+"Space"]="setSublimeMark"]=function(a){a.state.sublimeMark&&a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor())},m[l[u+p+"A"]="selectToSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&a.setSelection(a.getCursor(),b)},m[l[u+p+"W"]="deleteToSublimeMark"]=function(b){var c=b.state.sublimeMark&&b.state.sublimeMark.find();if(c){var d=b.getCursor(),e=c;if(a.cmpPos(d,e)>0){var f=e;e=d,d=f}b.state.sublimeKilled=b.getRange(d,e),b.replaceRange("",d,e)}},m[l[u+p+"X"]="swapWithSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&(a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor()),a.setCursor(b))},m[l[u+p+"Y"]="sublimeYank"]=function(a){null!=a.state.sublimeKilled&&a.replaceSelection(a.state.sublimeKilled,null,"paste")},l[u+p+"G"]="clearBookmarks",m[l[u+p+"C"]="showInCenter"]=function(a){var b=a.cursorCoords(null,"local");a.scrollTo(null,(b.top+b.bottom)/2-a.getScrollInfo().clientHeight/2)};var v=o?"Ctrl-Shift-":"Ctrl-Alt-";m[l[v+"Up"]="selectLinesUpward"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=0;c<b.length;c++){var d=b[c];d.head.line>a.firstLine()&&a.addSelection(n(d.head.line-1,d.head.ch))}}))},m[l[v+"Down"]="selectLinesDownward"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=0;c<b.length;c++){var d=b[c];d.head.line<a.lastLine()&&a.addSelection(n(d.head.line+1,d.head.ch))}}))},m[l[p+"F3"]="findUnder"]=function(a){k(a,!0)},m[l["Shift-"+p+"F3"]="findUnderPrevious"]=function(a){k(a,!1)},m[l["Alt-F3"]="findAllUnder"]=function(a){var b=j(a);if(b){for(var c=a.getSearchCursor(b.query),d=[],e=-1;c.findNext();)d.push({anchor:c.from(),head:c.to()}),c.from().line<=b.from.line&&c.from().ch<=b.from.ch&&e++;a.setSelections(d,e)}},l["Shift-"+p+"["]="fold",l["Shift-"+p+"]"]="unfold",l[u+p+"0"]=l[u+p+"J"]="unfoldAll",l[p+"I"]="findIncremental",l["Shift-"+p+"I"]="findIncrementalReverse",l[p+"H"]="replace",l.F3="findNext",l["Shift-F3"]="findPrev",a.normalizeKeyMap(l)}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/edit/matchbrackets")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){if(d<0&&0==c.ch)return b.clipPos(o(c.line-1));var e=b.getLine(c.line);if(d>0&&c.ch>=e.length)return b.clipPos(o(c.line+1,0));for(var f,g="start",h=c.ch,i=d<0?0:e.length,j=0;h!=i;h+=d,j++){var k=e.charAt(d<0?h-1:h),l="_"!=k&&a.isWordChar(k)?"w":"o";if("w"==l&&k.toUpperCase()==k&&(l="W"),"start"==g)"o"!=l&&(g="in",f=l);else if("in"==g&&f!=l){if("w"==f&&"W"==l&&d<0&&h--,"W"==f&&"w"==l&&d>0){f="w";continue}break}}return o(c.line,h)}function c(a,c){a.extendSelectionsBy((function(d){return a.display.shift||a.doc.extend||d.empty()?b(a.doc,d.head,c):c<0?d.from():d.to()}))}function d(b,c){return b.isReadOnly()?a.Pass:(b.operation((function(){for(var a=b.listSelections().length,d=[],e=-1,f=0;f<a;f++){var g=b.listSelections()[f].head;if(!(g.line<=e)){var h=o(g.line+(c?0:1),0);b.replaceRange("\n",h,null,"+insertLine"),b.indentLine(h.line,null,!0),d.push({head:h,anchor:h}),e=g.line+1}}b.setSelections(d)})),void b.execCommand("indentAuto"))}function e(b,c){for(var d=c.ch,e=d,f=b.getLine(c.line);d&&a.isWordChar(f.charAt(d-1));)--d;for(;e<f.length&&a.isWordChar(f.charAt(e));)++e;return{from:o(c.line,d),to:o(c.line,e),word:f.slice(d,e)}}function f(a,b){for(var c=a.listSelections(),d=[],e=0;e<c.length;e++){var f=c[e],g=a.findPosV(f.anchor,b,"line"),h=a.findPosV(f.head,b,"line"),i={anchor:g,head:h};d.push(f),d.push(i)}a.setSelections(d)}function g(a,b,c){for(var d=0;d<a.length;d++)if(a[d].from()==b&&a[d].to()==c)return!0;return!1}function h(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){var e=b[d],f=e.head,g=a.scanForBracket(f,-1);if(!g)return!1;for(;;){var h=a.scanForBracket(f,1);if(!h)return!1;if(h.ch==u.charAt(u.indexOf(g.ch)+1)){c.push({anchor:o(g.pos.line,g.pos.ch+1),head:h.pos});break}f=o(h.pos.line,h.pos.ch+1)}}return a.setSelections(c),!0}function i(b,c){if(b.isReadOnly())return a.Pass;for(var d,e=b.listSelections(),f=[],g=0;g<e.length;g++){var h=e[g];if(!h.empty()){for(var i=h.from().line,j=h.to().line;g<e.length-1&&e[g+1].from().line==j;)j=e[++g].to().line;e[g].to().ch||j--,f.push(i,j)}}f.length?d=!0:f.push(b.firstLine(),b.lastLine()),b.operation((function(){for(var a=[],e=0;e<f.length;e+=2){var g=f[e],h=f[e+1],i=o(g,0),j=o(h),k=b.getRange(i,j,!1);c?k.sort():k.sort((function(a,b){var c=a.toUpperCase(),d=b.toUpperCase();return c!=d&&(a=c,b=d),a<b?-1:a==b?0:1})),b.replaceRange(k,i,j),d&&a.push({anchor:i,head:o(h+1,0)})}d&&b.setSelections(a,0)}))}function j(b,c){b.operation((function(){for(var d=b.listSelections(),f=[],g=[],h=0;h<d.length;h++){var i=d[h];i.empty()?(f.push(h),g.push("")):g.push(c(b.getRange(i.from(),i.to())))}b.replaceSelections(g,"around","case");for(var j,h=f.length-1;h>=0;h--){var i=d[f[h]];if(!(j&&a.cmpPos(i.head,j)>0)){var k=e(b,i.head);j=k.from,b.replaceRange(c(k.word),k.from,k.to)}}}))}function k(b){var c=b.getCursor("from"),d=b.getCursor("to");if(0==a.cmpPos(c,d)){var f=e(b,c);if(!f.word)return;c=f.from,d=f.to}return{from:c,to:d,query:b.getRange(c,d),word:f}}function l(a,b){var c=k(a);if(c){var d=c.query,e=a.getSearchCursor(d,b?c.to:c.from);(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):(e=a.getSearchCursor(d,b?o(a.firstLine(),0):a.clipPos(o(a.lastLine()))),(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):c.word&&a.setSelection(c.from,c.to))}}var m=a.keyMap.sublime={fallthrough:"default"},n=a.commands,o=a.Pos,p=a.keyMap.default==a.keyMap.macDefault,q=p?"Cmd-":"Ctrl-",r=p?"Ctrl-":"Alt-";n[m[r+"Left"]="goSubwordLeft"]=function(a){c(a,-1)},n[m[r+"Right"]="goSubwordRight"]=function(a){c(a,1)},p&&(m["Cmd-Left"]="goLineStartSmart");var s=p?"Ctrl-Alt-":"Ctrl-";n[m[s+"Up"]="scrollLineUp"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top+b.clientHeight,"local");a.getCursor().line>=c&&a.execCommand("goLineUp")}a.scrollTo(null,b.top-a.defaultTextHeight())},n[m[s+"Down"]="scrollLineDown"]=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top,"local")+1;a.getCursor().line<=c&&a.execCommand("goLineDown")}a.scrollTo(null,b.top+a.defaultTextHeight())},n[m["Shift-"+q+"L"]="splitSelectionByLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++)for(var e=b[d].from(),f=b[d].to(),g=e.line;g<=f.line;++g)f.line>e.line&&g==f.line&&0==f.ch||c.push({anchor:g==e.line?e:o(g,0),head:g==f.line?f:o(g)});a.setSelections(c,0)},m["Shift-Tab"]="indentLess",n[m.Esc="singleSelectionTop"]=function(a){var b=a.listSelections()[0];a.setSelection(b.anchor,b.head,{scroll:!1})},n[m[q+"L"]="selectLine"]=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){var e=b[d];c.push({anchor:o(e.from().line,0),head:o(e.to().line+1,0)})}a.setSelections(c)},m["Shift-Ctrl-K"]="deleteLine",n[m[q+"Enter"]="insertLineAfter"]=function(a){return d(a,!1)},n[m["Shift-"+q+"Enter"]="insertLineBefore"]=function(a){return d(a,!0)},n[m[q+"D"]="selectNextOccurrence"]=function(b){var c=b.getCursor("from"),d=b.getCursor("to"),f=b.state.sublimeFindFullWord==b.doc.sel;if(0==a.cmpPos(c,d)){var h=e(b,c);if(!h.word)return;b.setSelection(h.from,h.to),f=!0}else{var i=b.getRange(c,d),j=f?new RegExp("\\b"+i+"\\b"):i,k=b.getSearchCursor(j,d),l=k.findNext();if(l||(k=b.getSearchCursor(j,o(b.firstLine(),0)),l=k.findNext()),!l||g(b.listSelections(),k.from(),k.to()))return a.Pass;b.addSelection(k.from(),k.to())}f&&(b.state.sublimeFindFullWord=b.doc.sel)};var t=p?"Shift-Cmd":"Alt-Ctrl";n[m[t+"Up"]="addCursorToPrevLine"]=function(a){f(a,-1)},n[m[t+"Down"]="addCursorToNextLine"]=function(a){f(a,1)};var u="(){}[]";n[m["Shift-"+q+"Space"]="selectScope"]=function(a){h(a)||a.execCommand("selectAll")},n[m["Shift-"+q+"M"]="selectBetweenBrackets"]=function(b){if(!h(b))return a.Pass},n[m[q+"M"]="goToBracket"]=function(b){b.extendSelectionsBy((function(c){var d=b.scanForBracket(c.head,1);if(d&&0!=a.cmpPos(d.pos,c.head))return d.pos;var e=b.scanForBracket(c.head,-1);return e&&o(e.pos.line,e.pos.ch+1)||c.head}))};var v=p?"Cmd-Ctrl-":"Shift-Ctrl-";n[m[v+"Up"]="swapLineUp"]=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.firstLine()-1,f=[],g=0;g<c.length;g++){var h=c[g],i=h.from().line-1,j=h.to().line;f.push({anchor:o(h.anchor.line-1,h.anchor.ch),head:o(h.head.line-1,h.head.ch)}),0!=h.to().ch||h.empty()||--j,i>e?d.push(i,j):d.length&&(d[d.length-1]=j),e=j}b.operation((function(){for(var a=0;a<d.length;a+=2){var c=d[a],e=d[a+1],g=b.getLine(c);b.replaceRange("",o(c,0),o(c+1,0),"+swapLine"),e>b.lastLine()?b.replaceRange("\n"+g,o(b.lastLine()),null,"+swapLine"):b.replaceRange(g+"\n",o(e,0),null,"+swapLine")}b.setSelections(f),b.scrollIntoView()}))},n[m[v+"Down"]="swapLineDown"]=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.lastLine()+1,f=c.length-1;f>=0;f--){var g=c[f],h=g.to().line+1,i=g.from().line;0!=g.to().ch||g.empty()||h--,h<e?d.push(h,i):d.length&&(d[d.length-1]=i),e=i}b.operation((function(){for(var a=d.length-2;a>=0;a-=2){var c=d[a],e=d[a+1],f=b.getLine(c);c==b.lastLine()?b.replaceRange("",o(c-1),o(c),"+swapLine"):b.replaceRange("",o(c,0),o(c+1,0),"+swapLine"),b.replaceRange(f+"\n",o(e,0),null,"+swapLine")}b.scrollIntoView()}))},n[m[q+"/"]="toggleCommentIndented"]=function(a){a.toggleComment({indent:!0})},n[m[q+"J"]="joinLines"]=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){for(var e=b[d],f=e.from(),g=f.line,h=e.to().line;d<b.length-1&&b[d+1].from().line==h;)h=b[++d].to().line;c.push({start:g,end:h,anchor:!e.empty()&&f})}a.operation((function(){for(var b=0,d=[],e=0;e<c.length;e++){for(var f,g=c[e],h=g.anchor&&o(g.anchor.line-b,g.anchor.ch),i=g.start;i<=g.end;i++){var j=i-b;i==g.end&&(f=o(j,a.getLine(j).length+1)),j<a.lastLine()&&(a.replaceRange(" ",o(j),o(j+1,/^\s*/.exec(a.getLine(j+1))[0].length)),++b)}d.push({anchor:h||f,head:f})}a.setSelections(d,0)}))},n[m["Shift-"+q+"D"]="duplicateLine"]=function(a){a.operation((function(){for(var b=a.listSelections().length,c=0;c<b;c++){var d=a.listSelections()[c];d.empty()?a.replaceRange(a.getLine(d.head.line)+"\n",o(d.head.line,0)):a.replaceRange(a.getRange(d.from(),d.to()),d.from())}a.scrollIntoView()}))},p||(m[q+"T"]="transposeChars"),n[m.F9="sortLines"]=function(a){i(a,!0)},n[m[q+"F9"]="sortLinesInsensitive"]=function(a){i(a,!1)},n[m.F2="nextBookmark"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){var c=b.shift(),d=c.find();if(d)return b.push(c),a.setSelection(d.from,d.to)}},n[m["Shift-F2"]="prevBookmark"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){b.unshift(b.pop());var c=b[b.length-1].find();if(c)return a.setSelection(c.from,c.to);b.pop()}},n[m[q+"F2"]="toggleBookmark"]=function(a){for(var b=a.listSelections(),c=a.state.sublimeBookmarks||(a.state.sublimeBookmarks=[]),d=0;d<b.length;d++){for(var e=b[d].from(),f=b[d].to(),g=a.findMarks(e,f),h=0;h<g.length;h++)if(g[h].sublimeBookmark){g[h].clear();for(var i=0;i<c.length;i++)c[i]==g[h]&&c.splice(i--,1);break}h==g.length&&c.push(a.markText(e,f,{sublimeBookmark:!0,clearWhenEmpty:!1}))}},n[m["Shift-"+q+"F2"]="clearBookmarks"]=function(a){var b=a.state.sublimeBookmarks;if(b)for(var c=0;c<b.length;c++)b[c].clear();b.length=0},n[m["Alt-F2"]="selectBookmarks"]=function(a){var b=a.state.sublimeBookmarks,c=[];if(b)for(var d=0;d<b.length;d++){var e=b[d].find();e?c.push({anchor:e.from,head:e.to}):b.splice(d--,0)}c.length&&a.setSelections(c,0)},m["Alt-Q"]="wrapLines";var w=q+"K ";m[w+q+"Backspace"]="delLineLeft",n[m.Backspace="smartBackspace"]=function(b){return b.somethingSelected()?a.Pass:void b.operation((function(){for(var c=b.listSelections(),d=b.getOption("indentUnit"),e=c.length-1;e>=0;e--){var f=c[e].head,g=b.getRange({line:f.line,ch:0},f),h=a.countColumn(g,null,b.getOption("tabSize")),i=b.findPosH(f,-1,"char",!1);if(g&&!/\S/.test(g)&&h%d==0){var j=new o(f.line,a.findColumn(g,h-d,d));j.ch!=f.ch&&(i=j)}b.replaceRange("",i,f,"+delete")}}))},n[m[w+q+"K"]="delLineRight"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange("",b[c].anchor,o(b[c].to().line),"+delete");a.scrollIntoView()}))},n[m[w+q+"U"]="upcaseAtCursor"]=function(a){j(a,(function(a){return a.toUpperCase()}))},n[m[w+q+"L"]="downcaseAtCursor"]=function(a){j(a,(function(a){return a.toLowerCase()}))},n[m[w+q+"Space"]="setSublimeMark"]=function(a){a.state.sublimeMark&&a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor())},n[m[w+q+"A"]="selectToSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&a.setSelection(a.getCursor(),b)},n[m[w+q+"W"]="deleteToSublimeMark"]=function(b){var c=b.state.sublimeMark&&b.state.sublimeMark.find();if(c){var d=b.getCursor(),e=c;if(a.cmpPos(d,e)>0){var f=e;e=d,d=f}b.state.sublimeKilled=b.getRange(d,e),b.replaceRange("",d,e)}},n[m[w+q+"X"]="swapWithSublimeMark"]=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&(a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor()),a.setCursor(b))},n[m[w+q+"Y"]="sublimeYank"]=function(a){null!=a.state.sublimeKilled&&a.replaceSelection(a.state.sublimeKilled,null,"paste")},m[w+q+"G"]="clearBookmarks",n[m[w+q+"C"]="showInCenter"]=function(a){var b=a.cursorCoords(null,"local");a.scrollTo(null,(b.top+b.bottom)/2-a.getScrollInfo().clientHeight/2)};var x=p?"Ctrl-Shift-":"Ctrl-Alt-";n[m[x+"Up"]="selectLinesUpward"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=0;c<b.length;c++){var d=b[c];d.head.line>a.firstLine()&&a.addSelection(o(d.head.line-1,d.head.ch))}}))},n[m[x+"Down"]="selectLinesDownward"]=function(a){a.operation((function(){for(var b=a.listSelections(),c=0;c<b.length;c++){var d=b[c];d.head.line<a.lastLine()&&a.addSelection(o(d.head.line+1,d.head.ch))}}))},n[m[q+"F3"]="findUnder"]=function(a){l(a,!0)},n[m["Shift-"+q+"F3"]="findUnderPrevious"]=function(a){l(a,!1)},n[m["Alt-F3"]="findAllUnder"]=function(a){var b=k(a);if(b){for(var c=a.getSearchCursor(b.query),d=[],e=-1;c.findNext();)d.push({anchor:c.from(),head:c.to()}),c.from().line<=b.from.line&&c.from().ch<=b.from.ch&&e++;a.setSelections(d,e)}},m["Shift-"+q+"["]="fold",m["Shift-"+q+"]"]="unfold",m[w+q+"0"]=m[w+q+"J"]="unfoldAll",m[q+"I"]="findIncremental",m["Shift-"+q+"I"]="findIncrementalReverse",m[q+"H"]="replace",m.F3="findNext",m["Shift-F3"]="findPrev",a.normalizeKeyMap(m)}));
\ No newline at end of file
diff --git a/media/editors/codemirror/keymap/vim.js b/media/editors/codemirror/keymap/vim.js
index b2c404d45ea15..d8a2d60d416c5 100644
--- a/media/editors/codemirror/keymap/vim.js
+++ b/media/editors/codemirror/keymap/vim.js
@@ -259,7 +259,7 @@
         CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
 
       if (!next || next.attach != attachVimMap)
-        leaveVimMode(cm, false);
+        leaveVimMode(cm);
     }
     function attachVimMap(cm, prev) {
       if (this == CodeMirror.keyMap.vim)
@@ -411,11 +411,11 @@
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.type == 'boolean') {
         if (value && value !== true) {
-          throw Error('Invalid argument: ' + name + '=' + value);
+          return new Error('Invalid argument: ' + name + '=' + value);
         } else if (value !== false) {
           // Boolean options are set to true if value is not defined.
           value = true;
@@ -443,7 +443,7 @@
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.callback) {
         var local = cm && option.callback(undefined, cm);
@@ -649,9 +649,9 @@
         lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({}),
         // search history buffer
-        searchHistoryController: new HistoryController({}),
+        searchHistoryController: new HistoryController(),
         // ex Command history buffer
-        exCommandHistoryController : new HistoryController({})
+        exCommandHistoryController : new HistoryController()
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -958,7 +958,7 @@
      * for a reference implementation.
      */
     function defineRegister(name, register) {
-      var registers = vimGlobalState.registerController.registers[name];
+      var registers = vimGlobalState.registerController.registers;
       if (!name || name.length != 1) {
         throw Error('Register name must be 1 character');
       }
@@ -986,9 +986,6 @@
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise, blockwise) {
-        if (linewise && text.charAt(0) == '\n') {
-          text = text.slice(1) + '\n';
-        }
         if (linewise && text.charAt(text.length - 1) !== '\n'){
           text += '\n';
         }
@@ -1110,7 +1107,9 @@
           }
         }
         if (bestMatch.keys.slice(-11) == '<character>') {
-          inputState.selectedCharacter = lastChar(keys);
+          var character = lastChar(keys);
+          if (!character) return {type: 'none'};
+          inputState.selectedCharacter = character;
         }
         return {type: 'full', command: bestMatch};
       },
@@ -1836,16 +1835,16 @@
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
         var symbol;
-        do {
-          symbol = lineText.charAt(ch++);
+        for (; ch < lineText.length; ch++) {
+          symbol = lineText.charAt(ch);
           if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(Pos(line, ch));
+            var style = cm.getTokenTypeAt(Pos(line, ch + 1));
             if (style !== "string" && style !== "comment") {
               break;
             }
           }
-        } while (symbol);
-        if (symbol) {
+        }
+        if (ch < lineText.length) {
           var matched = cm.findMatchingBracket(Pos(line, ch));
           return matched.to;
         } else {
@@ -2186,7 +2185,9 @@
       enterMacroRecordMode: function(cm, actionArgs) {
         var macroModeState = vimGlobalState.macroModeState;
         var registerName = actionArgs.selectedCharacter;
-        macroModeState.enterMacroRecordMode(cm, registerName);
+        if (vimGlobalState.registerController.isValidRegister(registerName)) {
+          macroModeState.enterMacroRecordMode(cm, registerName);
+        }
       },
       toggleOverwrite: function(cm) {
         if (!cm.state.overwrite) {
@@ -2704,7 +2705,7 @@
       }
     }
     function lastChar(keys) {
-      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var match = /^.*(<[^>]+>)$/.exec(keys);
       var selectedCharacter = match ? match[1] : keys.slice(-1);
       if (selectedCharacter.length > 1){
         switch(selectedCharacter){
@@ -2715,6 +2716,7 @@
             selectedCharacter=' ';
             break;
           default:
+            selectedCharacter='';
             break;
         }
       }
@@ -2815,7 +2817,6 @@
         var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
         selections.push(range);
       }
-      primIndex = head.line == lastLine ? selections.length - 1 : 0;
       cm.setSelections(selections);
       selectionEnd.ch = headCh;
       base.ch = baseCh;
@@ -4083,23 +4084,42 @@
       parseLineSpec_: function(cm, inputStream) {
         var numberMatch = inputStream.match(/^(\d+)/);
         if (numberMatch) {
+          // Absolute line number plus offset (N+M or N-M) is probably a typo,
+          // not something the user actually wanted. (NB: vim does allow this.)
           return parseInt(numberMatch[1], 10) - 1;
         }
         switch (inputStream.next()) {
           case '.':
-            return cm.getCursor().line;
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           case '$':
-            return cm.lastLine();
+            return this.parseLineSpecOffset_(inputStream, cm.lastLine());
           case '\'':
             var markName = inputStream.next();
             var markPos = getMarkPos(cm, cm.state.vim, markName);
             if (!markPos) throw new Error('Mark not set');
-            return markPos.line;
+            return this.parseLineSpecOffset_(inputStream, markPos.line);
+          case '-':
+          case '+':
+            inputStream.backUp(1);
+            // Offset is relative to current line if not otherwise specified.
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           default:
             inputStream.backUp(1);
             return undefined;
         }
       },
+      parseLineSpecOffset_: function(inputStream, line) {
+        var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
+        if (offsetMatch) {
+          var offset = parseInt(offsetMatch[2], 10);
+          if (offsetMatch[1] == "-") {
+            line -= offset;
+          } else {
+            line += offset;
+          }
+        }
+        return line;
+      },
       parseCommandArgs_: function(inputStream, params, command) {
         if (inputStream.eol()) {
           return;
@@ -4279,13 +4299,18 @@
         // If no value is provided, then we assume this is a get.
         if (!optionIsBoolean && value === undefined || forceGet) {
           var oldValue = getOption(optionName, cm, setCfg);
-          if (oldValue === true || oldValue === false) {
+          if (oldValue instanceof Error) {
+            showConfirm(cm, oldValue.message);
+          } else if (oldValue === true || oldValue === false) {
             showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
           } else {
             showConfirm(cm, '  ' + optionName + '=' + oldValue);
           }
         } else {
-          setOption(optionName, value, cm, setCfg);
+          var setOptionReturn = setOption(optionName, value, cm, setCfg);
+          if (setOptionReturn instanceof Error) {
+            showConfirm(cm, setOptionReturn.message);
+          }
         }
       },
       setlocal: function (cm, params) {
@@ -4484,6 +4509,10 @@
         if (tokens.length) {
           regexPart = tokens[0];
           replacePart = tokens[1];
+          if (regexPart && regexPart[regexPart.length - 1] === '$') {
+            regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
+            replacePart = replacePart ? replacePart + '\n' : '\n';
+          }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart);
@@ -4903,7 +4932,7 @@
      * Listens for changes made in insert mode.
      * Should only be active in insert mode.
      */
-    function onChange(_cm, changeObj) {
+    function onChange(cm, changeObj) {
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       if (!macroModeState.isPlaying) {
@@ -4916,7 +4945,11 @@
               lastChange.changes = [];
               lastChange.maybeReset = false;
             }
-            lastChange.changes.push(text);
+            if (cm.state.overwrite && !/\n/.test(text)) {
+                lastChange.changes.push([text]);
+            } else {
+                lastChange.changes.push(text);
+            }
           }
           // Change objects may be chained with next.
           changeObj = changeObj.next;
@@ -5098,9 +5131,13 @@
           var change = changes[j];
           if (change instanceof InsertModeKey) {
             CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
-          } else {
+          } else if (typeof change == "string") {
             var cur = cm.getCursor();
             cm.replaceRange(change, cur, cur);
+          } else {
+            var start = cm.getCursor();
+            var end = offsetCursor(start, 0, change[0].length);
+            cm.replaceRange(change[0], start, end);
           }
         }
       }
diff --git a/media/editors/codemirror/keymap/vim.min.js b/media/editors/codemirror/keymap/vim.min.js
index c508ba75aaee3..f86805c3cce8a 100644
--- a/media/editors/codemirror/keymap/vim.min.js
+++ b/media/editors/codemirror/keymap/vim.min.js
@@ -1,3 +1,3 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/dialog/dialog"),require("../addon/edit/matchbrackets.js")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/dialog/dialog","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";var b=[{keys:"<Left>",type:"keyToKey",toKeys:"h"},{keys:"<Right>",type:"keyToKey",toKeys:"l"},{keys:"<Up>",type:"keyToKey",toKeys:"k"},{keys:"<Down>",type:"keyToKey",toKeys:"j"},{keys:"<Space>",type:"keyToKey",toKeys:"l"},{keys:"<BS>",type:"keyToKey",toKeys:"h",context:"normal"},{keys:"<C-Space>",type:"keyToKey",toKeys:"W"},{keys:"<C-BS>",type:"keyToKey",toKeys:"B",context:"normal"},{keys:"<S-Space>",type:"keyToKey",toKeys:"w"},{keys:"<S-BS>",type:"keyToKey",toKeys:"b",context:"normal"},{keys:"<C-n>",type:"keyToKey",toKeys:"j"},{keys:"<C-p>",type:"keyToKey",toKeys:"k"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:"<Home>",type:"keyToKey",toKeys:"0"},{keys:"<End>",type:"keyToKey",toKeys:"$"},{keys:"<PageUp>",type:"keyToKey",toKeys:"<C-b>"},{keys:"<PageDown>",type:"keyToKey",toKeys:"<C-f>"},{keys:"<CR>",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"<Ins>",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:"<C-f>",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:"<C-b>",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:"<C-d>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:"<C-u>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"'<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"`<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"]<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"expandToLine",motionArgs:{linewise:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:"<C-w>",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:"<C-i>",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:"<C-o>",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:"<C-e>",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:"<C-y>",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:"<C-v>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"<C-q>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r<character>",type:"action",action:"replace",isEdit:!0},{keys:"@<character>",type:"action",action:"replayMacro"},{keys:"q<character>",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:"<C-r>",type:"action",action:"redo"},{keys:"m<character>",type:"action",action:"setMark"},{keys:'"<character>',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z<CR>",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:"<C-a>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:"<C-x>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"<C-t>",type:"action",action:"indent",actionArgs:{indentRight:!0},context:"insert"},{keys:"<C-d>",type:"action",action:"indent",actionArgs:{indentRight:!1},context:"insert"},{keys:"a<character>",type:"motion",motion:"textObjectManipulation"},{keys:"i<character>",type:"motion",motion:"textObjectManipulation",motionArgs:{textObjectInner:!0}},{keys:"/",type:"search",searchArgs:{forward:!0,querySrc:"prompt",toJumplist:!0}},{keys:"?",type:"search",searchArgs:{forward:!1,querySrc:"prompt",toJumplist:!0}},{keys:"*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"g*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:"g#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:":",type:"ex"}],c=[{name:"colorscheme",shortName:"colo"},{name:"map"},{name:"imap",shortName:"im"},{name:"nmap",shortName:"nm"},{name:"vmap",shortName:"vm"},{name:"unmap"},{name:"write",shortName:"w"},{name:"undo",shortName:"u"},{name:"redo",shortName:"red"},{name:"set",shortName:"se"},{name:"set",shortName:"se"},{name:"setlocal",shortName:"setl"},{name:"setglobal",shortName:"setg"},{name:"sort",shortName:"sor"},{name:"substitute",shortName:"s",possiblyAsync:!0},{name:"nohlsearch",shortName:"noh"},{name:"yank",shortName:"y"},{name:"delmarks",shortName:"delm"},{name:"registers",shortName:"reg",excludeFromCommandHistory:!0},{name:"global",shortName:"g"}],d=a.Pos,e=function(){function e(b){b.setOption("disableInput",!0),b.setOption("showCursorWhenSelecting",!1),a.signal(b,"vim-mode-change",{mode:"normal"}),b.on("cursorActivity",bb),x(b),a.on(b.getInputField(),"paste",k(b))}function f(b){b.setOption("disableInput",!1),b.off("cursorActivity",bb),a.off(b.getInputField(),"paste",k(b)),b.state.vim=null}function g(b,c){this==a.keyMap.vim&&a.rmClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||f(b,!1)}function h(b,c){this==a.keyMap.vim&&a.addClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||e(b)}function i(b,c){if(c){if(this[b])return this[b];var d=j(b);if(!d)return!1;var e=a.Vim.findKey(c,d);return"function"==typeof e&&a.signal(c,"vim-keypress",d),e}}function j(a){if("'"==a.charAt(0))return a.charAt(1);var b=a.split(/-(?!$)/),c=b[b.length-1];if(1==b.length&&1==b[0].length)return!1;if(2==b.length&&"Shift"==b[0]&&1==c.length)return!1;for(var d=!1,e=0;e<b.length;e++){var f=b[e];f in ib?b[e]=ib[f]:d=!0,f in jb&&(b[e]=jb[f])}return!!d&&(q(c)&&(b[b.length-1]=c.toLowerCase()),"<"+b.join("-")+">")}function k(a){var b=a.state.vim;return b.onPasteFn||(b.onPasteFn=function(){b.insertMode||(a.setCursor(L(a.getCursor(),0,1)),Bb.enterInsertMode(a,{},b))}),b.onPasteFn}function l(a,b){for(var c=[],d=a;d<a+b;d++)c.push(String.fromCharCode(d));return c}function m(a,b){return b>=a.firstLine()&&b<=a.lastLine()}function n(a){return/^[a-z]$/.test(a)}function o(a){return"()[]{}".indexOf(a)!=-1}function p(a){return kb.test(a)}function q(a){return/^[A-Z]$/.test(a)}function r(a){return/^\s*$/.test(a)}function s(a,b){for(var c=0;c<b.length;c++)if(b[c]==a)return!0;return!1}function t(a,b,c,d,e){if(void 0===b&&!e)throw Error("defaultValue is required unless callback is provided");if(c||(c="string"),sb[a]={type:c,defaultValue:b,callback:e},d)for(var f=0;f<d.length;f++)sb[d[f]]=sb[a];b&&u(a,b)}function u(a,b,c,d){var e=sb[a];d=d||{};var f=d.scope;if(!e)throw Error("Unknown option: "+a);if("boolean"==e.type){if(b&&b!==!0)throw Error("Invalid argument: "+a+"="+b);b!==!1&&(b=!0)}e.callback?("local"!==f&&e.callback(b,void 0),"global"!==f&&c&&e.callback(b,c)):("local"!==f&&(e.value="boolean"==e.type?!!b:b),"global"!==f&&c&&(c.state.vim.options[a]={value:b}))}function v(a,b,c){var d=sb[a];c=c||{};var e=c.scope;if(!d)throw Error("Unknown option: "+a);{if(!d.callback){var f="global"!==e&&b&&b.state.vim.options[a];return(f||"local"!==e&&d||{}).value}var f=b&&d.callback(void 0,b);if("global"!==e&&void 0!==f)return f;if("local"!==e)return d.callback()}}function w(){this.latestRegister=void 0,this.isPlaying=!1,this.isRecording=!1,this.replaySearchQueries=[],this.onRecordingDone=void 0,this.lastInsertModeChanges=ub()}function x(a){return a.state.vim||(a.state.vim={inputState:new z,lastEditInputState:void 0,lastEditActionCommand:void 0,lastHPos:-1,lastHSPos:-1,lastMotion:null,marks:{},fakeCursor:null,insertMode:!1,insertModeRepeat:void 0,visualMode:!1,visualLine:!1,visualBlock:!1,lastSelection:null,lastPastedText:null,sel:{},options:{}}),a.state.vim}function y(){vb={searchQuery:null,searchIsReversed:!1,lastSubstituteReplacePart:void 0,jumpList:tb(),macroModeState:new w,lastCharacterSearch:{increment:0,forward:!0,selectedCharacter:""},registerController:new D({}),searchHistoryController:new E({}),exCommandHistoryController:new E({})};for(var a in sb){var b=sb[a];b.value=b.defaultValue}}function z(){this.prefixRepeat=[],this.motionRepeat=[],this.operator=null,this.operatorArgs=null,this.motion=null,this.motionArgs=null,this.keyBuffer=[],this.registerName=null}function A(b,c){b.state.vim.inputState=new z,a.signal(b,"vim-command-done",c)}function B(a,b,c){this.clear(),this.keyBuffer=[a||""],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!!b,this.blockwise=!!c}function C(a,b){var c=vb.registerController.registers[a];if(!a||1!=a.length)throw Error("Register name must be 1 character");if(c[a])throw Error("Register already defined "+a);c[a]=b,rb.push(a)}function D(a){this.registers=a,this.unnamedRegister=a['"']=new B,a["."]=new B,a[":"]=new B,a["/"]=new B}function E(){this.historyBuffer=[],this.iterator=0,this.initialPrefix=null}function F(a,b){zb[a]=b}function G(a,b){for(var c=[],d=0;d<b;d++)c.push(a);return c}function H(a,b){Ab[a]=b}function I(a,b){Bb[a]=b}function J(a,b,c){var e=Math.min(Math.max(a.firstLine(),b.line),a.lastLine()),f=X(a,e)-1;f=c?f+1:f;var g=Math.min(Math.max(0,b.ch),f);return d(e,g)}function K(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function L(a,b,c){return"object"==typeof b&&(c=b.ch,b=b.line),d(a.line+b,a.ch+c)}function M(a,b){return{line:b.line-a.line,ch:b.line-a.line}}function N(a,b,c,d){for(var e,f=[],g=[],h=0;h<b.length;h++){var i=b[h];"insert"==c&&"insert"!=i.context||i.context&&i.context!=c||d.operator&&"action"==i.type||!(e=O(a,i.keys))||("partial"==e&&f.push(i),"full"==e&&g.push(i))}return{partial:f.length&&f,full:g.length&&g}}function O(a,b){if("<character>"==b.slice(-11)){var c=b.length-11,d=a.slice(0,c),e=b.slice(0,c);return d==e&&a.length>c?"full":0==e.indexOf(d)&&"partial"}return a==b?"full":0==b.indexOf(a)&&"partial"}function P(a){var b=/^.*(<[\w\-]+>)$/.exec(a),c=b?b[1]:a.slice(-1);if(c.length>1)switch(c){case"<CR>":c="\n";break;case"<Space>":c=" "}return c}function Q(a,b,c){return function(){for(var d=0;d<c;d++)b(a)}}function R(a){return d(a.line,a.ch)}function S(a,b){return a.ch==b.ch&&a.line==b.line}function T(a,b){return a.line<b.line||a.line==b.line&&a.ch<b.ch}function U(a,b){return arguments.length>2&&(b=U.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?a:b}function V(a,b){return arguments.length>2&&(b=V.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?b:a}function W(a,b,c){var d=T(a,b),e=T(b,c);return d&&e}function X(a,b){return a.getLine(b).length}function Y(a){return a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function Z(a){return a.replace(/([.?*+$\[\]\/\\(){}|\-])/g,"\\$1")}function $(a,b,c){var e=X(a,b),f=new Array(c-e+1).join(" ");a.setCursor(d(b,e)),a.replaceRange(f,a.getCursor())}function _(a,b){var c=[],e=a.listSelections(),f=R(a.clipPos(b)),g=!S(b,f),h=a.getCursor("head"),i=ba(e,h),j=S(e[i].head,e[i].anchor),k=e.length-1,l=k-i>i?k:0,m=e[l].anchor,n=Math.min(m.line,f.line),o=Math.max(m.line,f.line),p=m.ch,q=f.ch,r=e[l].head.ch-p,s=q-p;r>0&&s<=0?(p++,g||q--):r<0&&s>=0?(p--,j||q++):r<0&&s==-1&&(p--,q++);for(var t=n;t<=o;t++){var u={anchor:new d(t,p),head:new d(t,q)};c.push(u)}return i=f.line==o?c.length-1:0,a.setSelections(c),b.ch=q,m.ch=p,m}function aa(a,b,c){for(var d=[],e=0;e<c;e++){var f=L(b,e,0);d.push({anchor:f,head:f})}a.setSelections(d,0)}function ba(a,b,c){for(var d=0;d<a.length;d++){var e="head"!=c&&S(a[d].anchor,b),f="anchor"!=c&&S(a[d].head,b);if(e||f)return d}return-1}function ca(a,b){var c=b.lastSelection,e=function(){var b=a.listSelections(),c=b[0],d=b[b.length-1],e=T(c.anchor,c.head)?c.anchor:c.head,f=T(d.anchor,d.head)?d.head:d.anchor;return[e,f]},f=function(){var b=a.getCursor(),e=a.getCursor(),f=c.visualBlock;if(f){var g=f.width,h=f.height;e=d(b.line+h,b.ch+g);for(var i=[],j=b.line;j<e.line;j++){var k=d(j,b.ch),l=d(j,e.ch),m={anchor:k,head:l};i.push(m)}a.setSelections(i)}else{var n=c.anchorMark.find(),o=c.headMark.find(),p=o.line-n.line,q=o.ch-n.ch;e={line:e.line+p,ch:p?e.ch:q+e.ch},c.visualLine&&(b=d(b.line,0),e=d(e.line,X(a,e.line))),a.setSelection(b,e)}return[b,e]};return b.visualMode?e():f()}function da(a,b){var c=b.sel.anchor,d=b.sel.head;b.lastPastedText&&(d=a.posFromIndex(a.indexFromPos(c)+b.lastPastedText.length),b.lastPastedText=null),b.lastSelection={anchorMark:a.setBookmark(c),headMark:a.setBookmark(d),anchor:R(c),head:R(d),visualMode:b.visualMode,visualLine:b.visualLine,visualBlock:b.visualBlock}}function ea(a,b,c){var e,f=a.state.vim.sel,g=f.head,h=f.anchor;return T(c,b)&&(e=c,c=b,b=e),T(g,h)?(g=U(b,g),h=V(h,c)):(h=U(b,h),g=V(g,c),g=L(g,0,-1),g.ch==-1&&g.line!=a.firstLine()&&(g=d(g.line-1,X(a,g.line-1)))),[h,g]}function fa(a,b,c){var d=a.state.vim;b=b||d.sel;var c=c||d.visualLine?"line":d.visualBlock?"block":"char",e=ga(a,b,c);a.setSelections(e.ranges,e.primary),cb(a)}function ga(a,b,c,e){var f=R(b.head),g=R(b.anchor);if("char"==c){var h=e||T(b.head,b.anchor)?0:1,i=T(b.head,b.anchor)?1:0;return f=L(b.head,0,h),g=L(b.anchor,0,i),{ranges:[{anchor:g,head:f}],primary:0}}if("line"==c){if(T(b.head,b.anchor))f.ch=0,g.ch=X(a,g.line);else{g.ch=0;var j=a.lastLine();f.line>j&&(f.line=j),f.ch=X(a,f.line)}return{ranges:[{anchor:g,head:f}],primary:0}}if("block"==c){for(var k=Math.min(g.line,f.line),l=Math.min(g.ch,f.ch),m=Math.max(g.line,f.line),n=Math.max(g.ch,f.ch)+1,o=m-k+1,p=f.line==k?0:o-1,q=[],r=0;r<o;r++)q.push({anchor:d(k+r,l),head:d(k+r,n)});return{ranges:q,primary:p}}}function ha(a){var b=a.getCursor("head");return 1==a.getSelection().length&&(b=U(b,a.getCursor("anchor"))),b}function ia(b,c){var d=b.state.vim;c!==!1&&b.setCursor(J(b,d.sel.head)),da(b,d),d.visualMode=!1,d.visualLine=!1,d.visualBlock=!1,a.signal(b,"vim-mode-change",{mode:"normal"}),d.fakeCursor&&d.fakeCursor.clear()}function ja(a,b,c){var d=a.getRange(b,c);if(/\n\s*$/.test(d)){var e=d.split("\n");e.pop();for(var f,f=e.pop();e.length>0&&f&&r(f);f=e.pop())c.line--,c.ch=0;f?(c.line--,c.ch=X(a,c.line)):c.ch=0}}function ka(a,b,c){b.ch=0,c.ch=0,c.line++}function la(a){if(!a)return 0;var b=a.search(/\S/);return b==-1?a.length:b}function ma(a,b,c,e,f){for(var g=ha(a),h=a.getLine(g.line),i=g.ch,j=f?lb[0]:mb[0];!j(h.charAt(i));)if(i++,i>=h.length)return null;e?j=mb[0]:(j=lb[0],j(h.charAt(i))||(j=lb[1]));for(var k=i,l=i;j(h.charAt(k))&&k<h.length;)k++;for(;j(h.charAt(l))&&l>=0;)l--;if(l++,b){for(var m=k;/\s/.test(h.charAt(k))&&k<h.length;)k++;if(m==k){for(var n=l;/\s/.test(h.charAt(l-1))&&l>0;)l--;l||(l=n)}}return{start:d(g.line,l),end:d(g.line,k)}}function na(a,b,c){S(b,c)||vb.jumpList.add(a,b,c)}function oa(a,b){vb.lastCharacterSearch.increment=a,vb.lastCharacterSearch.forward=b.forward,vb.lastCharacterSearch.selectedCharacter=b.selectedCharacter}function pa(a,b,c,e){var f=R(a.getCursor()),g=c?1:-1,h=c?a.lineCount():-1,i=f.ch,j=f.line,k=a.getLine(j),l={lineText:k,nextCh:k.charAt(i),lastCh:null,index:i,symb:e,reverseSymb:(c?{")":"(","}":"{"}:{"(":")","{":"}"})[e],forward:c,depth:0,curMoveThrough:!1},m=Cb[e];if(!m)return f;var n=Db[m].init,o=Db[m].isComplete;for(n&&n(l);j!==h&&b;){if(l.index+=g,l.nextCh=l.lineText.charAt(l.index),!l.nextCh){if(j+=g,l.lineText=a.getLine(j)||"",g>0)l.index=0;else{var p=l.lineText.length;l.index=p>0?p-1:0}l.nextCh=l.lineText.charAt(l.index)}o(l)&&(f.line=j,f.ch=l.index,b--)}return l.nextCh||l.curMoveThrough?d(j,l.index):f}function qa(a,b,c,d,e){var f=b.line,g=b.ch,h=a.getLine(f),i=c?1:-1,j=d?mb:lb;if(e&&""==h){if(f+=i,h=a.getLine(f),!m(a,f))return null;g=c?0:h.length}for(;;){if(e&&""==h)return{from:0,to:0,line:f};for(var k=i>0?h.length:-1,l=k,n=k;g!=k;){for(var o=!1,p=0;p<j.length&&!o;++p)if(j[p](h.charAt(g))){for(l=g;g!=k&&j[p](h.charAt(g));)g+=i;if(n=g,o=l!=n,l==b.ch&&f==b.line&&n==l+i)continue;return{from:Math.min(l,n+1),to:Math.max(l,n),line:f}}o||(g+=i)}if(f+=i,!m(a,f))return null;h=a.getLine(f),g=i>0?0:h.length}}function ra(a,b,c,e,f,g){var h=R(b),i=[];(e&&!f||!e&&f)&&c++;for(var j=!(e&&f),k=0;k<c;k++){var l=qa(a,b,e,g,j);if(!l){var m=X(a,a.lastLine());i.push(e?{line:a.lastLine(),from:m,to:m}:{line:0,from:0,to:0});break}i.push(l),b=d(l.line,e?l.to-1:l.from)}var n=i.length!=c,o=i[0],p=i.pop();return e&&!f?(n||o.from==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.from)):e&&f?d(p.line,p.to-1):!e&&f?(n||o.to==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.to)):d(p.line,p.from)}function sa(a,b,c,e){for(var f,g=a.getCursor(),h=g.ch,i=0;i<b;i++){var j=a.getLine(g.line);if(f=va(h,j,e,c,!0),f==-1)return null;h=f}return d(a.getCursor().line,f)}function ta(a,b){var c=a.getCursor().line;return J(a,d(c,b-1))}function ua(a,b,c,d){s(c,qb)&&(b.marks[c]&&b.marks[c].clear(),b.marks[c]=a.setBookmark(d))}function va(a,b,c,d,e){var f;return d?(f=b.indexOf(c,a+1),f==-1||e||(f-=1)):(f=b.lastIndexOf(c,a-1),f==-1||e||(f+=1)),f}function wa(a,b,c,e,f){function g(b){return!a.getLine(b)}function h(a,b,c){return c?g(a)!=g(a+b):!g(a)&&g(a+b)}var i,j,k=b.line,l=a.firstLine(),m=a.lastLine(),n=k;if(e){for(;l<=n&&n<=m&&c>0;)h(n,e)&&c--,n+=e;return new d(n,0)}var o=a.state.vim;if(o.visualLine&&h(k,1,!0)){var p=o.sel.anchor;h(p.line,-1,!0)&&(f&&p.line==k||(k+=1))}var q=g(k);for(n=k;n<=m&&c;n++)h(n,1,!0)&&(f&&g(n)==q||c--);for(j=new d(n,0),n>m&&!q?q=!0:f=!1,n=k;n>l&&(f&&g(n)!=q&&n!=k||!h(n,-1,!0));n--);return i=new d(n,0),{start:i,end:j}}function xa(a,b,c,e){var f,g,h=b,i={"(":/[()]/,")":/[()]/,"[":/[[\]]/,"]":/[[\]]/,"{":/[{}]/,"}":/[{}]/}[c],j={"(":"(",")":"(","[":"[","]":"[","{":"{","}":"{"}[c],k=a.getLine(h.line).charAt(h.ch),l=k===j?1:0;if(f=a.scanForBracket(d(h.line,h.ch+l),-1,null,{bracketRegex:i}),g=a.scanForBracket(d(h.line,h.ch+l),1,null,{bracketRegex:i}),!f||!g)return{start:h,end:h};if(f=f.pos,g=g.pos,f.line==g.line&&f.ch>g.ch||f.line>g.line){var m=f;f=g,g=m}return e?g.ch+=1:f.ch+=1,{start:f,end:g}}function ya(a,b,c,e){var f,g,h,i,j=R(b),k=a.getLine(j.line),l=k.split(""),m=l.indexOf(c);if(j.ch<m?j.ch=m:m<j.ch&&l[j.ch]==c&&(g=j.ch,--j.ch),l[j.ch]!=c||g)for(h=j.ch;h>-1&&!f;h--)l[h]==c&&(f=h+1);else f=j.ch+1;if(f&&!g)for(h=f,i=l.length;h<i&&!g;h++)l[h]==c&&(g=h);return f&&g?(e&&(--f,++g),{start:d(j.line,f),end:d(j.line,g)}):{start:j,end:j}}function za(){}function Aa(a){var b=a.state.vim;return b.searchState_||(b.searchState_=new za)}function Ba(a,b,c,d,e){a.openDialog?a.openDialog(b,d,{bottom:!0,value:e.value,onKeyDown:e.onKeyDown,onKeyUp:e.onKeyUp,selectValueOnOpen:!1}):d(prompt(c,""))}function Ca(a){var b=Da(a)||[];if(!b.length)return[];var c=[];if(0===b[0]){for(var d=0;d<b.length;d++)"number"==typeof b[d]&&c.push(a.substring(b[d]+1,b[d+1]));return c}}function Da(a){for(var b=!1,c=[],d=0;d<a.length;d++){var e=a.charAt(d);b||"/"!=e||c.push(d),b=!b&&"\\"==e}return c}function Ea(a){for(var b="|(){",c="}",d=!1,e=[],f=-1;f<a.length;f++){var g=a.charAt(f)||"",h=a.charAt(f+1)||"",i=h&&b.indexOf(h)!=-1;d?("\\"===g&&i||e.push(g),d=!1):"\\"===g?(d=!0,h&&c.indexOf(h)!=-1&&(i=!0),i&&"\\"!==h||e.push(g)):(e.push(g),i&&"\\"!==h&&e.push("\\"))}return e.join("")}function Fa(a){for(var b=!1,c=[],d=-1;d<a.length;d++){var e=a.charAt(d)||"",f=a.charAt(d+1)||"";Eb[e+f]?(c.push(Eb[e+f]),d++):b?(c.push(e),b=!1):"\\"===e?(b=!0,p(f)||"$"===f?c.push("$"):"/"!==f&&"\\"!==f&&c.push("\\")):("$"===e&&c.push("$"),c.push(e),"/"===f&&c.push("\\"))}return c.join("")}function Ga(b){for(var c=new a.StringStream(b),d=[];!c.eol();){for(;c.peek()&&"\\"!=c.peek();)d.push(c.next());var e=!1;for(var f in Fb)if(c.match(f,!0)){e=!0,d.push(Fb[f]);break}e||d.push(c.next())}return d.join("")}function Ha(a,b,c){var d=vb.registerController.getRegister("/");if(d.setText(a),a instanceof RegExp)return a;var e,f,g=Da(a);if(g.length){e=a.substring(0,g[0]);var h=a.substring(g[0]);f=h.indexOf("i")!=-1}else e=a;if(!e)return null;v("pcre")||(e=Ea(e)),c&&(b=/^[^A-Z]*$/.test(e));var i=new RegExp(e,b||f?"i":void 0);return i}function Ia(a,b){a.openNotification?a.openNotification('<span style="color: red">'+b+"</span>",{bottom:!0,duration:5e3}):alert(b)}function Ja(a,b){var c='<span style="font-family: monospace; white-space: pre">'+(a||"")+'<input type="text"></span>';return b&&(c+=' <span style="color: #888">'+b+"</span>"),c}function Ka(a,b){var c=(b.prefix||"")+" "+(b.desc||""),d=Ja(b.prefix,b.desc);Ba(a,d,c,b.onClose,b)}function La(a,b){if(a instanceof RegExp&&b instanceof RegExp){for(var c=["global","multiline","ignoreCase","source"],d=0;d<c.length;d++){var e=c[d];if(a[e]!==b[e])return!1}return!0}return!1}function Ma(a,b,c,d){if(b){var e=Aa(a),f=Ha(b,!!c,!!d);if(f)return Oa(a,f),La(f,e.getQuery())?f:(e.setQuery(f),f)}}function Na(a){if("^"==a.source.charAt(0))var b=!0;return{token:function(c){if(b&&!c.sol())return void c.skipToEnd();var d=c.match(a,!1);if(d)return 0==d[0].length?(c.next(),"searching"):c.sol()||(c.backUp(1),a.exec(c.next()+d[0]))?(c.match(a),"searching"):(c.next(),null);for(;!c.eol()&&(c.next(),!c.match(a,!1)););},query:a}}function Oa(a,b){var c=Aa(a),d=c.getOverlay();d&&b==d.query||(d&&a.removeOverlay(d),d=Na(b),a.addOverlay(d),a.showMatchesOnScrollbar&&(c.getScrollbarAnnotate()&&c.getScrollbarAnnotate().clear(),c.setScrollbarAnnotate(a.showMatchesOnScrollbar(b))),c.setOverlay(d))}function Pa(a,b,c,e){return void 0===e&&(e=1),a.operation((function(){for(var f=a.getCursor(),g=a.getSearchCursor(c,f),h=0;h<e;h++){var i=g.find(b);if(0==h&&i&&S(g.from(),f)&&(i=g.find(b)),!i&&(g=a.getSearchCursor(c,b?d(a.lastLine()):d(a.firstLine(),0)),!g.find(b)))return}return g.from()}))}function Qa(a){var b=Aa(a);a.removeOverlay(Aa(a).getOverlay()),b.setOverlay(null),b.getScrollbarAnnotate()&&(b.getScrollbarAnnotate().clear(),b.setScrollbarAnnotate(null))}function Ra(a,b,c){return"number"!=typeof a&&(a=a.line),b instanceof Array?s(a,b):c?a>=b&&a<=c:a==b}function Sa(a){var b=a.getScrollInfo(),c=6,d=10,e=a.coordsChar({left:0,top:c+b.top},"local"),f=b.clientHeight-d+b.top,g=a.coordsChar({left:0,top:f},"local");return{top:e.line,bottom:g.line}}function Ta(a,b,c){if("'"==c){var d=a.doc.history.done,e=d[d.length-2];return e&&e.ranges&&e.ranges[0].head}var f=b.marks[c];return f&&f.find()}function Ua(b,c,d,e,f,g,h,i,j){function k(){b.operation((function(){for(;!p;)l(),m();n()}))}function l(){var a=b.getRange(g.from(),g.to()),c=a.replace(h,i);g.replace(c)}function m(){for(;g.findNext()&&Ra(g.from(),e,f);)if(d||!q||g.from().line!=q.line)return b.scrollIntoView(g.from(),30),b.setSelection(g.from(),g.to()),q=g.from(),void(p=!1);p=!0}function n(a){if(a&&a(),b.focus(),q){b.setCursor(q);var c=b.state.vim;c.exMode=!1,c.lastHPos=c.lastHSPos=q.ch}j&&j()}function o(c,d,e){a.e_stop(c);var f=a.keyName(c);switch(f){case"Y":l(),m();break;case"N":m();break;case"A":var g=j;j=void 0,b.operation(k),j=g;break;case"L":l();case"Q":case"Esc":case"Ctrl-C":case"Ctrl-[":n(e)}return p&&n(e),!0}b.state.vim.exMode=!0;var p=!1,q=g.from();return m(),p?void Ia(b,"No matches for "+h.source):c?void Ka(b,{prefix:"replace with <strong>"+i+"</strong> (y/n/a/q/l)",onKeyDown:o}):(k(),void(j&&j()))}function Va(b){var c=b.state.vim,d=vb.macroModeState,e=vb.registerController.getRegister("."),f=d.isPlaying,g=d.lastInsertModeChanges,h=[];if(!f){for(var i=g.inVisualBlock?c.lastSelection.visualBlock.height:1,j=g.changes,h=[],k=0;k<j.length;)h.push(j[k]),j[k]instanceof eb?k++:k+=i;g.changes=h,b.off("change",ab),a.off(b.getInputField(),"keydown",fb)}!f&&c.insertModeRepeat>1&&(gb(b,c,c.insertModeRepeat-1,!0),c.lastEditInputState.repeatOverride=c.insertModeRepeat),delete c.insertModeRepeat,c.insertMode=!1,b.setCursor(b.getCursor().line,b.getCursor().ch-1),b.setOption("keyMap","vim"),b.setOption("disableInput",!0),b.toggleOverwrite(!1),e.setText(g.changes.join("")),a.signal(b,"vim-mode-change",{mode:"normal"}),d.isRecording&&$a(d)}function Wa(a){b.unshift(a)}function Xa(a,b,c,d,e){var f={keys:a,type:b};f[b]=c,f[b+"Args"]=d;for(var g in e)f[g]=e[g];Wa(f)}function Ya(b,c,d,e){var f=vb.registerController.getRegister(e);
-if(":"==e)return f.keyBuffer[0]&&Jb.processCommand(b,f.keyBuffer[0]),void(d.isPlaying=!1);var g=f.keyBuffer,h=0;d.isPlaying=!0,d.replaySearchQueries=f.searchQueries.slice(0);for(var i=0;i<g.length;i++)for(var j,k,l=g[i];l;)if(j=/<\w+-.+?>|<\w+>|./.exec(l),k=j[0],l=l.substring(j.index+k.length),a.Vim.handleKey(b,k,"macro"),c.insertMode){var m=f.insertModeChanges[h++].changes;vb.macroModeState.lastInsertModeChanges.changes=m,hb(b,m,1),Va(b)}d.isPlaying=!1}function Za(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushText(b)}}function $a(a){if(!a.isPlaying){var b=a.latestRegister,c=vb.registerController.getRegister(b);c&&c.pushInsertModeChanges&&c.pushInsertModeChanges(a.lastInsertModeChanges)}}function _a(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushSearchQuery&&d.pushSearchQuery(b)}}function ab(a,b){var c=vb.macroModeState,d=c.lastInsertModeChanges;if(!c.isPlaying)for(;b;){if(d.expectCursorActivityForChange=!0,"+input"==b.origin||"paste"==b.origin||void 0===b.origin){var e=b.text.join("\n");d.maybeReset&&(d.changes=[],d.maybeReset=!1),d.changes.push(e)}b=b.next}}function bb(a){var b=a.state.vim;if(b.insertMode){var c=vb.macroModeState;if(c.isPlaying)return;var d=c.lastInsertModeChanges;d.expectCursorActivityForChange?d.expectCursorActivityForChange=!1:d.maybeReset=!0}else a.curOp.isVimOp||db(a,b);b.visualMode&&cb(a)}function cb(a){var b=a.state.vim,c=J(a,R(b.sel.head)),d=L(c,0,1);b.fakeCursor&&b.fakeCursor.clear(),b.fakeCursor=a.markText(c,d,{className:"cm-animate-fat-cursor"})}function db(b,c){var d=b.getCursor("anchor"),e=b.getCursor("head");if(c.visualMode&&!b.somethingSelected()?ia(b,!1):c.visualMode||c.insertMode||!b.somethingSelected()||(c.visualMode=!0,c.visualLine=!1,a.signal(b,"vim-mode-change",{mode:"visual"})),c.visualMode){var f=T(e,d)?0:-1,g=T(e,d)?-1:0;e=L(e,0,f),d=L(d,0,g),c.sel={anchor:d,head:e},ua(b,c,"<",U(e,d)),ua(b,c,">",V(e,d))}else c.insertMode||(c.lastHPos=b.getCursor().ch)}function eb(a){this.keyName=a}function fb(b){function c(){return e.maybeReset&&(e.changes=[],e.maybeReset=!1),e.changes.push(new eb(f)),!0}var d=vb.macroModeState,e=d.lastInsertModeChanges,f=a.keyName(b);f&&(f.indexOf("Delete")==-1&&f.indexOf("Backspace")==-1||a.lookupKey(f,"vim-insert",c))}function gb(a,b,c,d){function e(){h?yb.processAction(a,b,b.lastEditActionCommand):yb.evalInput(a,b)}function f(c){if(g.lastInsertModeChanges.changes.length>0){c=b.lastEditActionCommand?c:1;var d=g.lastInsertModeChanges;hb(a,d.changes,c)}}var g=vb.macroModeState;g.isPlaying=!0;var h=!!b.lastEditActionCommand,i=b.inputState;if(b.inputState=b.lastEditInputState,h&&b.lastEditActionCommand.interlaceInsertRepeat)for(var j=0;j<c;j++)e(),f(1);else d||e(),f(c);b.inputState=i,b.insertMode&&!d&&Va(a),g.isPlaying=!1}function hb(b,c,d){function e(c){return"string"==typeof c?a.commands[c](b):c(b),!0}var f=b.getCursor("head"),g=vb.macroModeState.lastInsertModeChanges.inVisualBlock;if(g){var h=b.state.vim,i=h.lastSelection,j=M(i.anchor,i.head);aa(b,f,j.line+1),d=b.listSelections().length,b.setCursor(f)}for(var k=0;k<d;k++){g&&b.setCursor(L(f,k,0));for(var l=0;l<c.length;l++){var m=c[l];if(m instanceof eb)a.lookupKey(m.keyName,"vim-insert",e);else{var n=b.getCursor();b.replaceRange(m,n,n)}}}g&&b.setCursor(L(f,0,1))}a.defineOption("vimMode",!1,(function(b,c,d){c&&"vim"!=b.getOption("keyMap")?b.setOption("keyMap","vim"):!c&&d!=a.Init&&/^vim/.test(b.getOption("keyMap"))&&b.setOption("keyMap","default")}));var ib={Shift:"S",Ctrl:"C",Alt:"A",Cmd:"D",Mod:"A"},jb={Enter:"CR",Backspace:"BS",Delete:"Del",Insert:"Ins"},kb=/[\d]/,lb=[a.isWordChar,function(b){return b&&!a.isWordChar(b)&&!/\s/.test(b)}],mb=[function(a){return/\S/.test(a)}],nb=l(65,26),ob=l(97,26),pb=l(48,10),qb=[].concat(nb,ob,pb,["<",">"]),rb=[].concat(nb,ob,pb,["-",'"',".",":","/"]),sb={};t("filetype",void 0,"string",["ft"],(function(a,b){if(void 0!==b){if(void 0===a){var c=b.getOption("mode");return"null"==c?"":c}var c=""==a?"null":a;b.setOption("mode",c)}}));var tb=function(){function a(a,b,h){function i(b){var e=++d%c,f=g[e];f&&f.clear(),g[e]=a.setBookmark(b)}var j=d%c,k=g[j];if(k){var l=k.find();l&&!S(l,b)&&i(b)}else i(b);i(h),e=d,f=d-c+1,f<0&&(f=0)}function b(a,b){d+=b,d>e?d=e:d<f&&(d=f);var h=g[(c+d)%c];if(h&&!h.find()){var i,j=b>0?1:-1,k=a.getCursor();do if(d+=j,h=g[(c+d)%c],h&&(i=h.find())&&!S(k,i))break;while(d<e&&d>f)}return h}var c=100,d=-1,e=0,f=0,g=new Array(c);return{cachedCursor:void 0,add:a,move:b}},ub=function(a){return a?{changes:a.changes,expectCursorActivityForChange:a.expectCursorActivityForChange}:{changes:[],expectCursorActivityForChange:!1}};w.prototype={exitMacroRecordMode:function(){var a=vb.macroModeState;a.onRecordingDone&&a.onRecordingDone(),a.onRecordingDone=void 0,a.isRecording=!1},enterMacroRecordMode:function(a,b){var c=vb.registerController.getRegister(b);c&&(c.clear(),this.latestRegister=b,a.openDialog&&(this.onRecordingDone=a.openDialog("(recording)["+b+"]",null,{bottom:!0})),this.isRecording=!0)}};var vb,wb,xb={buildKeyMap:function(){},getRegisterController:function(){return vb.registerController},resetVimGlobalState_:y,getVimGlobalState_:function(){return vb},maybeInitVimState_:x,suppressErrorLogging:!1,InsertModeKey:eb,map:function(a,b,c){Jb.map(a,b,c)},unmap:function(a,b){Jb.unmap(a,b)},setOption:u,getOption:v,defineOption:t,defineEx:function(a,b,c){if(b){if(0!==a.indexOf(b))throw new Error('(Vim.defineEx) "'+b+'" is not a prefix of "'+a+'", command not registered')}else b=a;Ib[a]=c,Jb.commandMap_[b]={name:a,shortName:b,type:"api"}},handleKey:function(a,b,c){var d=this.findKey(a,b,c);if("function"==typeof d)return d()},findKey:function(c,d,e){function f(){var a=vb.macroModeState;if(a.isRecording){if("q"==d)return a.exitMacroRecordMode(),A(c),!0;"mapping"!=e&&Za(a,d)}}function g(){if("<Esc>"==d)return A(c),l.visualMode?ia(c):l.insertMode&&Va(c),!0}function h(b){for(var e;b;)e=/<\w+-.+?>|<\w+>|./.exec(b),d=e[0],b=b.substring(e.index+d.length),a.Vim.handleKey(c,d,"mapping")}function i(){if(g())return!0;for(var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d,e=1==d.length,f=yb.matchCommand(a,b,l.inputState,"insert");a.length>1&&"full"!=f.type;){var a=l.inputState.keyBuffer=a.slice(1),h=yb.matchCommand(a,b,l.inputState,"insert");"none"!=h.type&&(f=h)}if("none"==f.type)return A(c),!1;if("partial"==f.type)return wb&&window.clearTimeout(wb),wb=window.setTimeout((function(){l.insertMode&&l.inputState.keyBuffer&&A(c)}),v("insertModeEscKeysTimeout")),!e;if(wb&&window.clearTimeout(wb),e){for(var i=c.listSelections(),j=0;j<i.length;j++){var k=i[j].head;c.replaceRange("",L(k,0,-(a.length-1)),k,"+input")}vb.macroModeState.lastInsertModeChanges.changes.pop()}return A(c),f.command}function j(){if(f()||g())return!0;var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d;if(/^[1-9]\d*$/.test(a))return!0;var e=/^(\d*)(.*)$/.exec(a);if(!e)return A(c),!1;var h=l.visualMode?"visual":"normal",i=yb.matchCommand(e[2]||e[1],b,l.inputState,h);if("none"==i.type)return A(c),!1;if("partial"==i.type)return!0;l.inputState.keyBuffer="";var e=/^(\d*)(.*)$/.exec(a);return e[1]&&"0"!=e[1]&&l.inputState.pushRepeatDigit(e[1]),i.command}var k,l=x(c);return k=l.insertMode?i():j(),k===!1?void 0:k===!0?function(){return!0}:function(){return c.operation((function(){c.curOp.isVimOp=!0;try{"keyToKey"==k.type?h(k.toKeys):yb.processCommand(c,l,k)}catch(b){throw c.state.vim=void 0,x(c),a.Vim.suppressErrorLogging||console.log(b),b}return!0}))}},handleEx:function(a,b){Jb.processCommand(a,b)},defineMotion:F,defineAction:I,defineOperator:H,mapCommand:Xa,_mapCommand:Wa,defineRegister:C,exitVisualMode:ia,exitInsertMode:Va};z.prototype.pushRepeatDigit=function(a){this.operator?this.motionRepeat=this.motionRepeat.concat(a):this.prefixRepeat=this.prefixRepeat.concat(a)},z.prototype.getRepeat=function(){var a=0;return(this.prefixRepeat.length>0||this.motionRepeat.length>0)&&(a=1,this.prefixRepeat.length>0&&(a*=parseInt(this.prefixRepeat.join(""),10)),this.motionRepeat.length>0&&(a*=parseInt(this.motionRepeat.join(""),10))),a},B.prototype={setText:function(a,b,c){this.keyBuffer=[a||""],this.linewise=!!b,this.blockwise=!!c},pushText:function(a,b){b&&(this.linewise||this.keyBuffer.push("\n"),this.linewise=!0),this.keyBuffer.push(a)},pushInsertModeChanges:function(a){this.insertModeChanges.push(ub(a))},pushSearchQuery:function(a){this.searchQueries.push(a)},clear:function(){this.keyBuffer=[],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!1},toString:function(){return this.keyBuffer.join("")}},D.prototype={pushText:function(a,b,c,d,e){d&&"\n"==c.charAt(0)&&(c=c.slice(1)+"\n"),d&&"\n"!==c.charAt(c.length-1)&&(c+="\n");var f=this.isValidRegister(a)?this.getRegister(a):null;if(!f){switch(b){case"yank":this.registers[0]=new B(c,d,e);break;case"delete":case"change":c.indexOf("\n")==-1?this.registers["-"]=new B(c,d):(this.shiftNumericRegisters_(),this.registers[1]=new B(c,d))}return void this.unnamedRegister.setText(c,d,e)}var g=q(a);g?f.pushText(c,d):f.setText(c,d,e),this.unnamedRegister.setText(f.toString(),d)},getRegister:function(a){return this.isValidRegister(a)?(a=a.toLowerCase(),this.registers[a]||(this.registers[a]=new B),this.registers[a]):this.unnamedRegister},isValidRegister:function(a){return a&&s(a,rb)},shiftNumericRegisters_:function(){for(var a=9;a>=2;a--)this.registers[a]=this.getRegister(""+(a-1))}},E.prototype={nextMatch:function(a,b){var c=this.historyBuffer,d=b?-1:1;null===this.initialPrefix&&(this.initialPrefix=a);for(var e=this.iterator+d;b?e>=0:e<c.length;e+=d)for(var f=c[e],g=0;g<=f.length;g++)if(this.initialPrefix==f.substring(0,g))return this.iterator=e,f;return e>=c.length?(this.iterator=c.length,this.initialPrefix):e<0?a:void 0},pushInput:function(a){var b=this.historyBuffer.indexOf(a);b>-1&&this.historyBuffer.splice(b,1),a.length&&this.historyBuffer.push(a)},reset:function(){this.initialPrefix=null,this.iterator=this.historyBuffer.length}};var yb={matchCommand:function(a,b,c,d){var e=N(a,b,d,c);if(!e.full&&!e.partial)return{type:"none"};if(!e.full&&e.partial)return{type:"partial"};for(var f,g=0;g<e.full.length;g++){var h=e.full[g];f||(f=h)}return"<character>"==f.keys.slice(-11)&&(c.selectedCharacter=P(a)),{type:"full",command:f}},processCommand:function(a,b,c){switch(b.inputState.repeatOverride=c.repeatOverride,c.type){case"motion":this.processMotion(a,b,c);break;case"operator":this.processOperator(a,b,c);break;case"operatorMotion":this.processOperatorMotion(a,b,c);break;case"action":this.processAction(a,b,c);break;case"search":this.processSearch(a,b,c);break;case"ex":case"keyToEx":this.processEx(a,b,c)}},processMotion:function(a,b,c){b.inputState.motion=c.motion,b.inputState.motionArgs=K(c.motionArgs),this.evalInput(a,b)},processOperator:function(a,b,c){var d=b.inputState;if(d.operator){if(d.operator==c.operator)return d.motion="expandToLine",d.motionArgs={linewise:!0},void this.evalInput(a,b);A(a)}d.operator=c.operator,d.operatorArgs=K(c.operatorArgs),b.visualMode&&this.evalInput(a,b)},processOperatorMotion:function(a,b,c){var d=b.visualMode,e=K(c.operatorMotionArgs);e&&d&&e.visualLine&&(b.visualLine=!0),this.processOperator(a,b,c),d||this.processMotion(a,b,c)},processAction:function(a,b,c){var d=b.inputState,e=d.getRepeat(),f=!!e,g=K(c.actionArgs)||{};d.selectedCharacter&&(g.selectedCharacter=d.selectedCharacter),c.operator&&this.processOperator(a,b,c),c.motion&&this.processMotion(a,b,c),(c.motion||c.operator)&&this.evalInput(a,b),g.repeat=e||1,g.repeatIsExplicit=f,g.registerName=d.registerName,A(a),b.lastMotion=null,c.isEdit&&this.recordLastEdit(b,d,c),Bb[c.action](a,g,b)},processSearch:function(b,c,d){function e(a,e,f){vb.searchHistoryController.pushInput(a),vb.searchHistoryController.reset();try{Ma(b,a,e,f)}catch(c){return Ia(b,"Invalid regex: "+a),void A(b)}yb.processMotion(b,c,{type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:d.searchArgs.toJumplist}})}function f(a){b.scrollTo(m.left,m.top),e(a,!0,!0);var c=vb.macroModeState;c.isRecording&&_a(c,a)}function g(c,d,e){var f,g,h=a.keyName(c);"Up"==h||"Down"==h?(f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.searchHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.searchHistoryController.reset();var j;try{j=Ma(b,d,!0,!0)}catch(a){}j?b.scrollIntoView(Pa(b,!i,j),30):(Qa(b),b.scrollTo(m.left,m.top))}function h(c,d,e){var f=a.keyName(c);"Esc"==f||"Ctrl-C"==f||"Ctrl-["==f||"Backspace"==f&&""==d?(vb.searchHistoryController.pushInput(d),vb.searchHistoryController.reset(),Ma(b,l),Qa(b),b.scrollTo(m.left,m.top),a.e_stop(c),A(b),e(),b.focus()):"Up"==f||"Down"==f?a.e_stop(c):"Ctrl-U"==f&&(a.e_stop(c),e(""))}if(b.getSearchCursor){var i=d.searchArgs.forward,j=d.searchArgs.wholeWordOnly;Aa(b).setReversed(!i);var k=i?"/":"?",l=Aa(b).getQuery(),m=b.getScrollInfo();switch(d.searchArgs.querySrc){case"prompt":var n=vb.macroModeState;if(n.isPlaying){var o=n.replaySearchQueries.shift();e(o,!0,!1)}else Ka(b,{onClose:f,prefix:k,desc:Gb,onKeyUp:g,onKeyDown:h});break;case"wordUnderCursor":var p=ma(b,!1,!0,!1,!0),q=!0;if(p||(p=ma(b,!1,!0,!1,!1),q=!1),!p)return;var o=b.getLine(p.start.line).substring(p.start.ch,p.end.ch);o=q&&j?"\\b"+o+"\\b":Z(o),vb.jumpList.cachedCursor=b.getCursor(),b.setCursor(p.start),e(o,!0,!1)}}},processEx:function(b,c,d){function e(a){vb.exCommandHistoryController.pushInput(a),vb.exCommandHistoryController.reset(),Jb.processCommand(b,a)}function f(c,d,e){var f,g,h=a.keyName(c);("Esc"==h||"Ctrl-C"==h||"Ctrl-["==h||"Backspace"==h&&""==d)&&(vb.exCommandHistoryController.pushInput(d),vb.exCommandHistoryController.reset(),a.e_stop(c),A(b),e(),b.focus()),"Up"==h||"Down"==h?(a.e_stop(c),f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.exCommandHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Ctrl-U"==h?(a.e_stop(c),e("")):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.exCommandHistoryController.reset()}"keyToEx"==d.type?Jb.processCommand(b,d.exArgs.input):c.visualMode?Ka(b,{onClose:e,prefix:":",value:"'<,'>",onKeyDown:f}):Ka(b,{onClose:e,prefix:":",onKeyDown:f})},evalInput:function(a,b){var c,e,f,g=b.inputState,h=g.motion,i=g.motionArgs||{},j=g.operator,k=g.operatorArgs||{},l=g.registerName,m=b.sel,n=R(b.visualMode?J(a,m.head):a.getCursor("head")),o=R(b.visualMode?J(a,m.anchor):a.getCursor("anchor")),p=R(n),q=R(o);if(j&&this.recordLastEdit(b,g),f=void 0!==g.repeatOverride?g.repeatOverride:g.getRepeat(),f>0&&i.explicitRepeat?i.repeatIsExplicit=!0:(i.noRepeat||!i.explicitRepeat&&0===f)&&(f=1,i.repeatIsExplicit=!1),g.selectedCharacter&&(i.selectedCharacter=k.selectedCharacter=g.selectedCharacter),i.repeat=f,A(a),h){var r=zb[h](a,n,i,b);if(b.lastMotion=zb[h],!r)return;if(i.toJumplist){var s=vb.jumpList,t=s.cachedCursor;t?(na(a,t,r),delete s.cachedCursor):na(a,n,r)}r instanceof Array?(e=r[0],c=r[1]):c=r,c||(c=R(n)),b.visualMode?(b.visualBlock&&c.ch===1/0||(c=J(a,c,b.visualBlock)),e&&(e=J(a,e,!0)),e=e||q,m.anchor=e,m.head=c,fa(a),ua(a,b,"<",T(e,c)?e:c),ua(a,b,">",T(e,c)?c:e)):j||(c=J(a,c),a.setCursor(c.line,c.ch))}if(j){if(k.lastSel){e=q;var u=k.lastSel,v=Math.abs(u.head.line-u.anchor.line),w=Math.abs(u.head.ch-u.anchor.ch);c=u.visualLine?d(q.line+v,q.ch):u.visualBlock?d(q.line+v,q.ch+w):u.head.line==u.anchor.line?d(q.line,q.ch+w):d(q.line+v,q.ch),b.visualMode=!0,b.visualLine=u.visualLine,b.visualBlock=u.visualBlock,m=b.sel={anchor:e,head:c},fa(a)}else b.visualMode&&(k.lastSel={anchor:R(m.anchor),head:R(m.head),visualBlock:b.visualBlock,visualLine:b.visualLine});var x,y,z,B,C;if(b.visualMode){if(x=U(m.head,m.anchor),y=V(m.head,m.anchor),z=b.visualLine||k.linewise,B=b.visualBlock?"block":z?"line":"char",C=ga(a,{anchor:x,head:y},B),z){var D=C.ranges;if("block"==B)for(var E=0;E<D.length;E++)D[E].head.ch=X(a,D[E].head.line);else"line"==B&&(D[0].head=d(D[0].head.line+1,0))}}else{if(x=R(e||q),y=R(c||p),T(y,x)){var F=x;x=y,y=F}z=i.linewise||k.linewise,z?ka(a,x,y):i.forward&&ja(a,x,y),B="char";var G=!i.inclusive||z;C=ga(a,{anchor:x,head:y},B,G)}a.setSelections(C.ranges,C.primary),b.lastMotion=null,k.repeat=f,k.registerName=l,k.linewise=z;var H=Ab[j](a,k,C.ranges,q,c);b.visualMode&&ia(a,null!=H),H&&a.setCursor(H)}},recordLastEdit:function(a,b,c){var d=vb.macroModeState;d.isPlaying||(a.lastEditInputState=b,a.lastEditActionCommand=c,d.lastInsertModeChanges.changes=[],d.lastInsertModeChanges.expectCursorActivityForChange=!1)}},zb={moveToTopLine:function(a,b,c){var e=Sa(a).top+c.repeat-1;return d(e,la(a.getLine(e)))},moveToMiddleLine:function(a){var b=Sa(a),c=Math.floor(.5*(b.top+b.bottom));return d(c,la(a.getLine(c)))},moveToBottomLine:function(a,b,c){var e=Sa(a).bottom-c.repeat+1;return d(e,la(a.getLine(e)))},expandToLine:function(a,b,c){var e=b;return d(e.line+c.repeat-1,1/0)},findNext:function(a,b,c){var d=Aa(a),e=d.getQuery();if(e){var f=!c.forward;return f=d.isReversed()?!f:f,Oa(a,e),Pa(a,f,e,c.repeat)}},goToMark:function(a,b,c,d){var e=Ta(a,d,c.selectedCharacter);return e?c.linewise?{line:e.line,ch:la(a.getLine(e.line))}:e:null},moveToOtherHighlightedEnd:function(a,b,c,e){if(e.visualBlock&&c.sameLine){var f=e.sel;return[J(a,d(f.anchor.line,f.head.ch)),J(a,d(f.head.line,f.anchor.ch))]}return[e.sel.head,e.sel.anchor]},jumpToMark:function(a,b,c,e){for(var f=b,g=0;g<c.repeat;g++){var h=f;for(var i in e.marks)if(n(i)){var j=e.marks[i].find(),k=c.forward?T(j,h):T(h,j);if(!(k||c.linewise&&j.line==h.line)){var l=S(h,f),m=c.forward?W(h,j,f):W(f,j,h);(l||m)&&(f=j)}}}return c.linewise&&(f=d(f.line,la(a.getLine(f.line)))),f},moveByCharacters:function(a,b,c){var e=b,f=c.repeat,g=c.forward?e.ch+f:e.ch-f;return d(e.line,g)},moveByLines:function(a,b,c,e){var f=b,g=f.ch;switch(e.lastMotion){case this.moveByLines:case this.moveByDisplayLines:case this.moveByScroll:case this.moveToColumn:case this.moveToEol:g=e.lastHPos;break;default:e.lastHPos=g}var h=c.repeat+(c.repeatOffset||0),i=c.forward?f.line+h:f.line-h,j=a.firstLine(),k=a.lastLine();return i<j&&f.line==j?this.moveToStartOfLine(a,b,c,e):i>k&&f.line==k?this.moveToEol(a,b,c,e):(c.toFirstChar&&(g=la(a.getLine(i)),e.lastHPos=g),e.lastHSPos=a.charCoords(d(i,g),"div").left,d(i,g))},moveByDisplayLines:function(a,b,c,e){var f=b;switch(e.lastMotion){case this.moveByDisplayLines:case this.moveByScroll:case this.moveByLines:case this.moveToColumn:case this.moveToEol:break;default:e.lastHSPos=a.charCoords(f,"div").left}var g=c.repeat,h=a.findPosV(f,c.forward?g:-g,"line",e.lastHSPos);if(h.hitSide)if(c.forward)var i=a.charCoords(h,"div"),j={top:i.top+8,left:e.lastHSPos},h=a.coordsChar(j,"div");else{var k=a.charCoords(d(a.firstLine(),0),"div");k.left=e.lastHSPos,h=a.coordsChar(k,"div")}return e.lastHPos=h.ch,h},moveByPage:function(a,b,c){var d=b,e=c.repeat;return a.findPosV(d,c.forward?e:-e,"page")},moveByParagraph:function(a,b,c){var d=c.forward?1:-1;return wa(a,b,c.repeat,d)},moveByScroll:function(a,b,c,d){var e=a.getScrollInfo(),f=null,g=c.repeat;g||(g=e.clientHeight/(2*a.defaultTextHeight()));var h=a.charCoords(b,"local");c.repeat=g;var f=zb.moveByDisplayLines(a,b,c,d);if(!f)return null;var i=a.charCoords(f,"local");return a.scrollTo(null,e.top+i.top-h.top),f},moveByWords:function(a,b,c){return ra(a,b,c.repeat,!!c.forward,!!c.wordEnd,!!c.bigWord)},moveTillCharacter:function(a,b,c){var d=c.repeat,e=sa(a,d,c.forward,c.selectedCharacter),f=c.forward?-1:1;return oa(f,c),e?(e.ch+=f,e):null},moveToCharacter:function(a,b,c){var d=c.repeat;return oa(0,c),sa(a,d,c.forward,c.selectedCharacter)||b},moveToSymbol:function(a,b,c){var d=c.repeat;return pa(a,d,c.forward,c.selectedCharacter)||b},moveToColumn:function(a,b,c,d){var e=c.repeat;return d.lastHPos=e-1,d.lastHSPos=a.charCoords(b,"div").left,ta(a,e)},moveToEol:function(a,b,c,e){var f=b;e.lastHPos=1/0;var g=d(f.line+c.repeat-1,1/0),h=a.clipPos(g);return h.ch--,e.lastHSPos=a.charCoords(h,"div").left,g},moveToFirstNonWhiteSpaceCharacter:function(a,b){var c=b;return d(c.line,la(a.getLine(c.line)))},moveToMatchedSymbol:function(a,b){var c,e=b,f=e.line,g=e.ch,h=a.getLine(f);do if(c=h.charAt(g++),c&&o(c)){var i=a.getTokenTypeAt(d(f,g));if("string"!==i&&"comment"!==i)break}while(c);if(c){var j=a.findMatchingBracket(d(f,g));return j.to}return e},moveToStartOfLine:function(a,b){return d(b.line,0)},moveToLineOrEdgeOfDocument:function(a,b,c){var e=c.forward?a.lastLine():a.firstLine();return c.repeatIsExplicit&&(e=c.repeat-a.getOption("firstLineNumber")),d(e,la(a.getLine(e)))},textObjectManipulation:function(a,b,c,d){var e={"(":")",")":"(","{":"}","}":"{","[":"]","]":"["},f={"'":!0,'"':!0},g=c.selectedCharacter;"b"==g?g="(":"B"==g&&(g="{");var h,i=!c.textObjectInner;if(e[g])h=xa(a,b,g,i);else if(f[g])h=ya(a,b,g,i);else if("W"===g)h=ma(a,i,!0,!0);else if("w"===g)h=ma(a,i,!0,!1);else{if("p"!==g)return null;if(h=wa(a,b,c.repeat,0,i),c.linewise=!0,d.visualMode)d.visualLine||(d.visualLine=!0);else{var j=d.inputState.operatorArgs;j&&(j.linewise=!0),h.end.line--}}return a.state.vim.visualMode?ea(a,h.start,h.end):[h.start,h.end]},repeatLastCharacterSearch:function(a,b,c){var d=vb.lastCharacterSearch,e=c.repeat,f=c.forward===d.forward,g=(d.increment?1:0)*(f?-1:1);a.moveH(-g,"char"),c.inclusive=!!f;var h=sa(a,e,f,d.selectedCharacter);return h?(h.ch+=g,h):(a.moveH(g,"char"),b)}},Ab={change:function(b,c,e){var f,g,h=b.state.vim;if(vb.macroModeState.lastInsertModeChanges.inVisualBlock=h.visualBlock,h.visualMode){g=b.getSelection();var i=G("",e.length);b.replaceSelections(i),f=U(e[0].head,e[0].anchor)}else{var j=e[0].anchor,k=e[0].head;g=b.getRange(j,k);var l=h.lastEditInputState||{};if("moveByWords"==l.motion&&!r(g)){var m=/\s+$/.exec(g);m&&l.motionArgs&&l.motionArgs.forward&&(k=L(k,0,-m[0].length),g=g.slice(0,-m[0].length))}var n=new d(j.line-1,Number.MAX_VALUE),o=b.firstLine()==b.lastLine();k.line>b.lastLine()&&c.linewise&&!o?b.replaceRange("",n,k):b.replaceRange("",j,k),c.linewise&&(o||(b.setCursor(n),a.commands.newlineAndIndent(b)),j.ch=Number.MAX_VALUE),f=j}vb.registerController.pushText(c.registerName,"change",g,c.linewise,e.length>1),Bb.enterInsertMode(b,{head:f},b.state.vim)},delete:function(a,b,c){var e,f,g=a.state.vim;if(g.visualBlock){f=a.getSelection();var h=G("",c.length);a.replaceSelections(h),e=c[0].anchor}else{var i=c[0].anchor,j=c[0].head;b.linewise&&j.line!=a.firstLine()&&i.line==a.lastLine()&&i.line==j.line-1&&(i.line==a.firstLine()?i.ch=0:i=d(i.line-1,X(a,i.line-1))),f=a.getRange(i,j),a.replaceRange("",i,j),e=i,b.linewise&&(e=zb.moveToFirstNonWhiteSpaceCharacter(a,i))}return vb.registerController.pushText(b.registerName,"delete",f,b.linewise,g.visualBlock),J(a,e)},indent:function(a,b,c){var d=a.state.vim,e=c[0].anchor.line,f=d.visualBlock?c[c.length-1].anchor.line:c[0].head.line,g=d.visualMode?b.repeat:1;b.linewise&&f--;for(var h=e;h<=f;h++)for(var i=0;i<g;i++)a.indentLine(h,b.indentRight);return zb.moveToFirstNonWhiteSpaceCharacter(a,c[0].anchor)},changeCase:function(a,b,c,d,e){for(var f=a.getSelections(),g=[],h=b.toLower,i=0;i<f.length;i++){var j=f[i],k="";if(h===!0)k=j.toLowerCase();else if(h===!1)k=j.toUpperCase();else for(var l=0;l<j.length;l++){var m=j.charAt(l);k+=q(m)?m.toLowerCase():m.toUpperCase()}g.push(k)}return a.replaceSelections(g),b.shouldMoveCursor?e:!a.state.vim.visualMode&&b.linewise&&c[0].anchor.line+1==c[0].head.line?zb.moveToFirstNonWhiteSpaceCharacter(a,d):b.linewise?d:U(c[0].anchor,c[0].head)},yank:function(a,b,c,d){var e=a.state.vim,f=a.getSelection(),g=e.visualMode?U(e.sel.anchor,e.sel.head,c[0].head,c[0].anchor):d;return vb.registerController.pushText(b.registerName,"yank",f,b.linewise,e.visualBlock),g}},Bb={jumpListWalk:function(a,b,c){if(!c.visualMode){var d=b.repeat,e=b.forward,f=vb.jumpList,g=f.move(a,e?d:-d),h=g?g.find():void 0;h=h?h:a.getCursor(),a.setCursor(h)}},scroll:function(a,b,c){if(!c.visualMode){var d=b.repeat||1,e=a.defaultTextHeight(),f=a.getScrollInfo().top,g=e*d,h=b.forward?f+g:f-g,i=R(a.getCursor()),j=a.charCoords(i,"local");if(b.forward)h>j.top?(i.line+=(h-j.top)/e,i.line=Math.ceil(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.top)):a.scrollTo(null,h);else{var k=h+a.getScrollInfo().clientHeight;k<j.bottom?(i.line-=(j.bottom-k)/e,i.line=Math.floor(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.bottom-a.getScrollInfo().clientHeight)):a.scrollTo(null,h)}}},scrollToCursor:function(a,b){var c=a.getCursor().line,e=a.charCoords(d(c,0),"local"),f=a.getScrollInfo().clientHeight,g=e.top,h=e.bottom-g;switch(b.position){case"center":g=g-f/2+h;break;case"bottom":g=g-f+h}a.scrollTo(null,g)},replayMacro:function(a,b,c){var d=b.selectedCharacter,e=b.repeat,f=vb.macroModeState;for("@"==d&&(d=f.latestRegister);e--;)Ya(a,c,f,d)},enterMacroRecordMode:function(a,b){var c=vb.macroModeState,d=b.selectedCharacter;c.enterMacroRecordMode(a,d)},toggleOverwrite:function(b){b.state.overwrite?(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})):(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"}))},enterInsertMode:function(b,c,e){if(!b.getOption("readOnly")){e.insertMode=!0,e.insertModeRepeat=c&&c.repeat||1;var f=c?c.insertAt:null,g=e.sel,h=c.head||b.getCursor("head"),i=b.listSelections().length;if("eol"==f)h=d(h.line,X(b,h.line));else if("charAfter"==f)h=L(h,0,1);else if("firstNonBlank"==f)h=zb.moveToFirstNonWhiteSpaceCharacter(b,h);else if("startOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.min(g.head.ch,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line<g.anchor.line?g.head:d(g.anchor.line,0);else if("endOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.max(g.head.ch+1,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line>=g.anchor.line?L(g.head,0,1):d(g.anchor.line,0);else if("inplace"==f&&e.visualMode)return;b.setOption("disableInput",!1),c&&c.replace?(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"})):(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})),vb.macroModeState.isPlaying||(b.on("change",ab),a.on(b.getInputField(),"keydown",fb)),e.visualMode&&ia(b),aa(b,h,i)}},toggleVisualMode:function(b,c,e){var f,g=c.repeat,h=b.getCursor();e.visualMode?e.visualLine^c.linewise||e.visualBlock^c.blockwise?(e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b)):ia(b):(e.visualMode=!0,e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,f=J(b,d(h.line,h.ch+g-1),!0),e.sel={anchor:h,head:f},a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b),ua(b,e,"<",U(h,f)),ua(b,e,">",V(h,f)))},reselectLastSelection:function(b,c,d){var e=d.lastSelection;if(d.visualMode&&da(b,d),e){var f=e.anchorMark.find(),g=e.headMark.find();if(!f||!g)return;d.sel={anchor:f,head:g},d.visualMode=!0,d.visualLine=e.visualLine,d.visualBlock=e.visualBlock,fa(b),ua(b,d,"<",U(f,g)),ua(b,d,">",V(f,g)),a.signal(b,"vim-mode-change",{mode:"visual",subMode:d.visualLine?"linewise":d.visualBlock?"blockwise":""})}},joinLines:function(a,b,c){var e,f;if(c.visualMode){if(e=a.getCursor("anchor"),f=a.getCursor("head"),T(f,e)){var g=f;f=e,e=g}f.ch=X(a,f.line)-1}else{var h=Math.max(b.repeat,2);e=a.getCursor(),f=J(a,d(e.line+h-1,1/0))}for(var i=0,j=e.line;j<f.line;j++){i=X(a,e.line);var g=d(e.line+1,X(a,e.line+1)),k=a.getRange(e,g);k=k.replace(/\n\s*/g," "),a.replaceRange(k,e,g)}var l=d(e.line,i);c.visualMode&&ia(a,!1),a.setCursor(l)},newLineAndEnterInsertMode:function(b,c,e){e.insertMode=!0;var f=R(b.getCursor());if(f.line!==b.firstLine()||c.after){f.line=c.after?f.line:f.line-1,f.ch=X(b,f.line),b.setCursor(f);var g=a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent;g(b)}else b.replaceRange("\n",d(b.firstLine(),0)),b.setCursor(b.firstLine(),0);this.enterInsertMode(b,{repeat:c.repeat},e)},paste:function(a,b,c){var e=R(a.getCursor()),f=vb.registerController.getRegister(b.registerName),g=f.toString();if(g){if(b.matchIndent){var h=a.getOption("tabSize"),i=function(a){var b=a.split("\t").length-1,c=a.split(" ").length-1;return b*h+1*c},j=a.getLine(a.getCursor().line),k=i(j.match(/^\s*/)[0]),l=g.replace(/\n$/,""),m=g!==l,n=i(g.match(/^\s*/)[0]),g=l.replace(/^\s*/gm,(function(b){var c=k+(i(b)-n);if(c<0)return"";if(a.getOption("indentWithTabs")){var d=Math.floor(c/h);return Array(d+1).join("\t")}return Array(c+1).join(" ")}));g+=m?"\n":""}if(b.repeat>1)var g=Array(b.repeat+1).join(g);var o=f.linewise,p=f.blockwise;if(o)c.visualMode?g=c.visualLine?g.slice(0,-1):"\n"+g.slice(0,g.length-1)+"\n":b.after?(g="\n"+g.slice(0,g.length-1),e.ch=X(a,e.line)):e.ch=0;else{if(p){g=g.split("\n");for(var q=0;q<g.length;q++)g[q]=""==g[q]?" ":g[q]}e.ch+=b.after?1:0}var r,s;if(c.visualMode){c.lastPastedText=g;var t,u=ca(a,c),v=u[0],w=u[1],x=a.getSelection(),y=a.listSelections(),z=new Array(y.length).join("1").split("1");c.lastSelection&&(t=c.lastSelection.headMark.find()),vb.registerController.unnamedRegister.setText(x),p?(a.replaceSelections(z),w=d(v.line+g.length-1,v.ch),a.setCursor(v),_(a,w),a.replaceSelections(g),r=v):c.visualBlock?(a.replaceSelections(z),a.setCursor(v),a.replaceRange(g,v,v),r=v):(a.replaceRange(g,v,w),r=a.posFromIndex(a.indexFromPos(v)+g.length-1)),t&&(c.lastSelection.headMark=a.setBookmark(t)),o&&(r.ch=0)}else if(p){a.setCursor(e);for(var q=0;q<g.length;q++){var A=e.line+q;A>a.lastLine()&&a.replaceRange("\n",d(A,0));var B=X(a,A);B<e.ch&&$(a,A,e.ch)}a.setCursor(e),_(a,d(e.line+g.length-1,e.ch)),a.replaceSelections(g),r=e}else a.replaceRange(g,e),o&&b.after?r=d(e.line+1,la(a.getLine(e.line+1))):o&&!b.after?r=d(e.line,la(a.getLine(e.line))):!o&&b.after?(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length-1)):(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length));c.visualMode&&ia(a,!1),a.setCursor(r)}},undo:function(b,c){b.operation((function(){Q(b,a.commands.undo,c.repeat)(),b.setCursor(b.getCursor("anchor"))}))},redo:function(b,c){Q(b,a.commands.redo,c.repeat)()},setRegister:function(a,b,c){c.inputState.registerName=b.selectedCharacter},setMark:function(a,b,c){var d=b.selectedCharacter;ua(a,c,d,a.getCursor())},replace:function(b,c,e){var f,g,h=c.selectedCharacter,i=b.getCursor(),j=b.listSelections();if(e.visualMode)i=b.getCursor("start"),g=b.getCursor("end");else{var k=b.getLine(i.line);f=i.ch+c.repeat,f>k.length&&(f=k.length),g=d(i.line,f)}if("\n"==h)e.visualMode||b.replaceRange("",i,g),(a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent)(b);else{var l=b.getRange(i,g);if(l=l.replace(/[^\n]/g,h),e.visualBlock){var m=new Array(b.getOption("tabSize")+1).join(" ");l=b.getSelection(),l=l.replace(/\t/g,m).replace(/[^\n]/g,h).split("\n"),b.replaceSelections(l)}else b.replaceRange(l,i,g);e.visualMode?(i=T(j[0].anchor,j[0].head)?j[0].anchor:j[0].head,b.setCursor(i),ia(b,!1)):b.setCursor(L(g,0,-1))}},incrementNumberToken:function(a,b){for(var c,e,f,g,h,i=a.getCursor(),j=a.getLine(i.line),k=/-?\d+/g;null!==(c=k.exec(j))&&(h=c[0],e=c.index,f=e+h.length,!(i.ch<f)););if((b.backtrack||!(f<=i.ch))&&h){var l=b.increase?1:-1,m=parseInt(h)+l*b.repeat,n=d(i.line,e),o=d(i.line,f);g=m.toString(),a.replaceRange(g,n,o),a.setCursor(d(i.line,e+g.length-1))}},repeatLastEdit:function(a,b,c){var d=c.lastEditInputState;if(d){var e=b.repeat;e&&b.repeatIsExplicit?c.lastEditInputState.repeatOverride=e:e=c.lastEditInputState.repeatOverride||e,gb(a,c,e,!1)}},indent:function(a,b){a.indentLine(a.getCursor().line,b.indentRight)},exitInsertMode:Va},Cb={"(":"bracket",")":"bracket","{":"bracket","}":"bracket","[":"section","]":"section","*":"comment","/":"comment",m:"method",M:"method","#":"preprocess"},Db={bracket:{isComplete:function(a){if(a.nextCh===a.symb){if(a.depth++,a.depth>=1)return!0}else a.nextCh===a.reverseSymb&&a.depth--;return!1}},section:{
-init:function(a){a.curMoveThrough=!0,a.symb=(a.forward?"]":"[")===a.symb?"{":"}"},isComplete:function(a){return 0===a.index&&a.nextCh===a.symb}},comment:{isComplete:function(a){var b="*"===a.lastCh&&"/"===a.nextCh;return a.lastCh=a.nextCh,b}},method:{init:function(a){a.symb="m"===a.symb?"{":"}",a.reverseSymb="{"===a.symb?"}":"{"},isComplete:function(a){return a.nextCh===a.symb}},preprocess:{init:function(a){a.index=0},isComplete:function(a){if("#"===a.nextCh){var b=a.lineText.match(/#(\w+)/)[1];if("endif"===b){if(a.forward&&0===a.depth)return!0;a.depth++}else if("if"===b){if(!a.forward&&0===a.depth)return!0;a.depth--}if("else"===b&&0===a.depth)return!0}return!1}}};t("pcre",!0,"boolean"),za.prototype={getQuery:function(){return vb.query},setQuery:function(a){vb.query=a},getOverlay:function(){return this.searchOverlay},setOverlay:function(a){this.searchOverlay=a},isReversed:function(){return vb.isReversed},setReversed:function(a){vb.isReversed=a},getScrollbarAnnotate:function(){return this.annotate},setScrollbarAnnotate:function(a){this.annotate=a}};var Eb={"\\n":"\n","\\r":"\r","\\t":"\t"},Fb={"\\/":"/","\\\\":"\\","\\n":"\n","\\r":"\r","\\t":"\t"},Gb="(Javascript regexp)",Hb=function(){this.buildCommandMap_()};Hb.prototype={processCommand:function(a,b,c){var d=this;a.operation((function(){a.curOp.isVimOp=!0,d._processCommand(a,b,c)}))},_processCommand:function(b,c,d){var e=b.state.vim,f=vb.registerController.getRegister(":"),g=f.toString();e.visualMode&&ia(b);var h=new a.StringStream(c);f.setText(c);var i=d||{};i.input=c;try{this.parseInput_(b,h,i)}catch(a){throw Ia(b,a),a}var j,k;if(i.commandName){if(j=this.matchCommand_(i.commandName)){if(k=j.name,j.excludeFromCommandHistory&&f.setText(g),this.parseCommandArgs_(h,i,j),"exToKey"==j.type){for(var l=0;l<j.toKeys.length;l++)a.Vim.handleKey(b,j.toKeys[l],"mapping");return}if("exToEx"==j.type)return void this.processCommand(b,j.toInput)}}else void 0!==i.line&&(k="move");if(!k)return void Ia(b,'Not an editor command ":'+c+'"');try{Ib[k](b,i),j&&j.possiblyAsync||!i.callback||i.callback()}catch(a){throw Ia(b,a),a}},parseInput_:function(a,b,c){b.eatWhile(":"),b.eat("%")?(c.line=a.firstLine(),c.lineEnd=a.lastLine()):(c.line=this.parseLineSpec_(a,b),void 0!==c.line&&b.eat(",")&&(c.lineEnd=this.parseLineSpec_(a,b)));var d=b.match(/^(\w+)/);return d?c.commandName=d[1]:c.commandName=b.match(/.*/)[0],c},parseLineSpec_:function(a,b){var c=b.match(/^(\d+)/);if(c)return parseInt(c[1],10)-1;switch(b.next()){case".":return a.getCursor().line;case"$":return a.lastLine();case"'":var d=b.next(),e=Ta(a,a.state.vim,d);if(!e)throw new Error("Mark not set");return e.line;default:return void b.backUp(1)}},parseCommandArgs_:function(a,b,c){if(!a.eol()){b.argString=a.match(/.*/)[0];var d=c.argDelimiter||/\s+/,e=Y(b.argString).split(d);e.length&&e[0]&&(b.args=e)}},matchCommand_:function(a){for(var b=a.length;b>0;b--){var c=a.substring(0,b);if(this.commandMap_[c]){var d=this.commandMap_[c];if(0===d.name.indexOf(a))return d}}return null},buildCommandMap_:function(){this.commandMap_={};for(var a=0;a<c.length;a++){var b=c[a],d=b.shortName||b.name;this.commandMap_[d]=b}},map:function(a,c,d){if(":"!=a&&":"==a.charAt(0)){if(d)throw Error("Mode not supported for ex mappings");var e=a.substring(1);":"!=c&&":"==c.charAt(0)?this.commandMap_[e]={name:e,type:"exToEx",toInput:c.substring(1),user:!0}:this.commandMap_[e]={name:e,type:"exToKey",toKeys:c,user:!0}}else if(":"!=c&&":"==c.charAt(0)){var f={keys:a,type:"keyToEx",exArgs:{input:c.substring(1)}};d&&(f.context=d),b.unshift(f)}else{var f={keys:a,type:"keyToKey",toKeys:c};d&&(f.context=d),b.unshift(f)}},unmap:function(a,c){if(":"!=a&&":"==a.charAt(0)){if(c)throw Error("Mode not supported for ex mappings");var d=a.substring(1);if(this.commandMap_[d]&&this.commandMap_[d].user)return void delete this.commandMap_[d]}else for(var e=a,f=0;f<b.length;f++)if(e==b[f].keys&&b[f].context===c)return void b.splice(f,1);throw Error("No such mapping.")}};var Ib={colorscheme:function(a,b){return!b.args||b.args.length<1?void Ia(a,a.getOption("theme")):void a.setOption("theme",b.args[0])},map:function(a,b,c){var d=b.args;return!d||d.length<2?void(a&&Ia(a,"Invalid mapping: "+b.input)):void Jb.map(d[0],d[1],c)},imap:function(a,b){this.map(a,b,"insert")},nmap:function(a,b){this.map(a,b,"normal")},vmap:function(a,b){this.map(a,b,"visual")},unmap:function(a,b,c){var d=b.args;return!d||d.length<1?void(a&&Ia(a,"No such mapping: "+b.input)):void Jb.unmap(d[0],c)},move:function(a,b){yb.processCommand(a,a.state.vim,{type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0},repeatOverride:b.line+1})},set:function(a,b){var c=b.args,d=b.setCfg||{};if(!c||c.length<1)return void(a&&Ia(a,"Invalid mapping: "+b.input));var e=c[0].split("="),f=e[0],g=e[1],h=!1;if("?"==f.charAt(f.length-1)){if(g)throw Error("Trailing characters: "+b.argString);f=f.substring(0,f.length-1),h=!0}void 0===g&&"no"==f.substring(0,2)&&(f=f.substring(2),g=!1);var i=sb[f]&&"boolean"==sb[f].type;if(i&&void 0==g&&(g=!0),!i&&void 0===g||h){var j=v(f,a,d);j===!0||j===!1?Ia(a," "+(j?"":"no")+f):Ia(a,"  "+f+"="+j)}else u(f,g,a,d)},setlocal:function(a,b){b.setCfg={scope:"local"},this.set(a,b)},setglobal:function(a,b){b.setCfg={scope:"global"},this.set(a,b)},registers:function(a,b){var c=b.args,d=vb.registerController.registers,e="----------Registers----------<br><br>";if(c){var f;c=c.join("");for(var g=0;g<c.length;g++)if(f=c.charAt(g),vb.registerController.isValidRegister(f)){var h=d[f]||new B;e+='"'+f+"    "+h.toString()+"<br>"}}else for(var f in d){var i=d[f].toString();i.length&&(e+='"'+f+"    "+i+"<br>")}Ia(a,e)},sort:function(b,c){function e(){if(c.argString){var b=new a.StringStream(c.argString);if(b.eat("!")&&(h=!0),b.eol())return;if(!b.eatSpace())return"Invalid arguments";var d=b.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);if(!d&&!b.eol())return"Invalid arguments";if(d[1]){i=d[1].indexOf("i")!=-1,j=d[1].indexOf("u")!=-1;var e=d[1].indexOf("d")!=-1||d[1].indexOf("n")!=-1&&1,f=d[1].indexOf("x")!=-1&&1,g=d[1].indexOf("o")!=-1&&1;if(e+f+g>1)return"Invalid arguments";k=e&&"decimal"||f&&"hex"||g&&"octal"}d[2]&&(l=new RegExp(d[2].substr(1,d[2].length-2),i?"i":""))}}function f(a,b){if(h){var c;c=a,a=b,b=c}i&&(a=a.toLowerCase(),b=b.toLowerCase());var d=k&&s.exec(a),e=k&&s.exec(b);return d?(d=parseInt((d[1]+d[2]).toLowerCase(),t),e=parseInt((e[1]+e[2]).toLowerCase(),t),d-e):a<b?-1:1}function g(a,b){if(h){var c;c=a,a=b,b=c}return i&&(a[0]=a[0].toLowerCase(),b[0]=b[0].toLowerCase()),a[0]<b[0]?-1:1}var h,i,j,k,l,m=e();if(m)return void Ia(b,m+": "+c.argString);var n=c.line||b.firstLine(),o=c.lineEnd||c.line||b.lastLine();if(n!=o){var p=d(n,0),q=d(o,X(b,o)),r=b.getRange(p,q).split("\n"),s=l?l:"decimal"==k?/(-?)([\d]+)/:"hex"==k?/(-?)(?:0x)?([0-9a-f]+)/i:"octal"==k?/([0-7]+)/:null,t="decimal"==k?10:"hex"==k?16:"octal"==k?8:null,u=[],v=[];if(k||l)for(var w=0;w<r.length;w++){var x=l?r[w].match(l):null;x&&""!=x[0]?u.push(x):!l&&s.exec(r[w])?u.push(r[w]):v.push(r[w])}else v=r;if(u.sort(l?g:f),l)for(var w=0;w<u.length;w++)u[w]=u[w].input;else k||v.sort(f);if(r=h?u.concat(v):v.concat(u),j){var y,z=r;r=[];for(var w=0;w<z.length;w++)z[w]!=y&&r.push(z[w]),y=z[w]}b.replaceRange(r.join("\n"),p,q)}},global:function(a,b){var c=b.argString;if(!c)return void Ia(a,"Regular Expression missing from global");var d,e=void 0!==b.line?b.line:a.firstLine(),f=b.lineEnd||b.line||a.lastLine(),g=Ca(c),h=c;if(g.length&&(h=g[0],d=g.slice(1,g.length).join("/")),h)try{Ma(a,h,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+h)}for(var i=Aa(a).getQuery(),j=[],k="",l=e;l<=f;l++){var m=i.test(a.getLine(l));m&&(j.push(l+1),k+=a.getLine(l)+"<br>")}if(!d)return void Ia(a,k);var n=0,o=function(){if(n<j.length){var b=j[n]+d;Jb.processCommand(a,b,{callback:o})}n++};o()},substitute:function(a,b){if(!a.getSearchCursor)throw new Error("Search feature not available. Requires searchcursor.js or any other getSearchCursor implementation.");var c,e,f,g,h=b.argString,i=h?Ca(h):[],j="",k=!1,l=!1;if(i.length)c=i[0],j=i[1],void 0!==j&&(j=v("pcre")?Ga(j):Fa(j),vb.lastSubstituteReplacePart=j),e=i[2]?i[2].split(" "):[];else if(h&&h.length)return void Ia(a,"Substitutions should be of the form :s/pattern/replace/");if(e&&(f=e[0],g=parseInt(e[1]),f&&(f.indexOf("c")!=-1&&(k=!0,f.replace("c","")),f.indexOf("g")!=-1&&(l=!0,f.replace("g","")),c=c+"/"+f)),c)try{Ma(a,c,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+c)}if(j=j||vb.lastSubstituteReplacePart,void 0===j)return void Ia(a,"No previous substitute regular expression");var m=Aa(a),n=m.getQuery(),o=void 0!==b.line?b.line:a.getCursor().line,p=b.lineEnd||o;o==a.firstLine()&&p==a.lastLine()&&(p=1/0),g&&(o=p,p=o+g-1);var q=J(a,d(o,0)),r=a.getSearchCursor(n,q);Ua(a,k,l,o,p,r,n,j,b.callback)},redo:a.commands.redo,undo:a.commands.undo,write:function(b){a.commands.save?a.commands.save(b):b.save&&b.save()},nohlsearch:function(a){Qa(a)},yank:function(a){var b=R(a.getCursor()),c=b.line,d=a.getLine(c);vb.registerController.pushText("0","yank",d,!0,!0)},delmarks:function(b,c){if(!c.argString||!Y(c.argString))return void Ia(b,"Argument required");for(var d=b.state.vim,e=new a.StringStream(Y(c.argString));!e.eol();){e.eatSpace();var f=e.pos;if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var g=e.next();if(e.match("-",!0)){if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var h=g,i=e.next();if(!(n(h)&&n(i)||q(h)&&q(i)))return void Ia(b,"Invalid argument: "+h+"-");var j=h.charCodeAt(0),k=i.charCodeAt(0);if(j>=k)return void Ia(b,"Invalid argument: "+c.argString.substring(f));for(var l=0;l<=k-j;l++){var m=String.fromCharCode(j+l);delete d.marks[m]}}else delete d.marks[g]}}},Jb=new Hb;return a.keyMap.vim={attach:h,detach:g,call:i},t("insertModeEscKeysTimeout",200,"number"),a.keyMap["vim-insert"]={fallthrough:["default"],attach:h,detach:g,call:i},a.keyMap["vim-replace"]={Backspace:"goCharLeft",fallthrough:["vim-insert"],attach:h,detach:g,call:i},y(),xb};a.Vim=e()}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/dialog/dialog"),require("../addon/edit/matchbrackets.js")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/dialog/dialog","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";var b=[{keys:"<Left>",type:"keyToKey",toKeys:"h"},{keys:"<Right>",type:"keyToKey",toKeys:"l"},{keys:"<Up>",type:"keyToKey",toKeys:"k"},{keys:"<Down>",type:"keyToKey",toKeys:"j"},{keys:"<Space>",type:"keyToKey",toKeys:"l"},{keys:"<BS>",type:"keyToKey",toKeys:"h",context:"normal"},{keys:"<C-Space>",type:"keyToKey",toKeys:"W"},{keys:"<C-BS>",type:"keyToKey",toKeys:"B",context:"normal"},{keys:"<S-Space>",type:"keyToKey",toKeys:"w"},{keys:"<S-BS>",type:"keyToKey",toKeys:"b",context:"normal"},{keys:"<C-n>",type:"keyToKey",toKeys:"j"},{keys:"<C-p>",type:"keyToKey",toKeys:"k"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:"<Home>",type:"keyToKey",toKeys:"0"},{keys:"<End>",type:"keyToKey",toKeys:"$"},{keys:"<PageUp>",type:"keyToKey",toKeys:"<C-b>"},{keys:"<PageDown>",type:"keyToKey",toKeys:"<C-f>"},{keys:"<CR>",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"<Ins>",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:"<C-f>",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:"<C-b>",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:"<C-d>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:"<C-u>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"'<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"`<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"]<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"expandToLine",motionArgs:{linewise:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:"<C-w>",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:"<C-i>",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:"<C-o>",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:"<C-e>",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:"<C-y>",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:"<C-v>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"<C-q>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r<character>",type:"action",action:"replace",isEdit:!0},{keys:"@<character>",type:"action",action:"replayMacro"},{keys:"q<character>",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:"<C-r>",type:"action",action:"redo"},{keys:"m<character>",type:"action",action:"setMark"},{keys:'"<character>',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z<CR>",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:"<C-a>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:"<C-x>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"<C-t>",type:"action",action:"indent",actionArgs:{indentRight:!0},context:"insert"},{keys:"<C-d>",type:"action",action:"indent",actionArgs:{indentRight:!1},context:"insert"},{keys:"a<character>",type:"motion",motion:"textObjectManipulation"},{keys:"i<character>",type:"motion",motion:"textObjectManipulation",motionArgs:{textObjectInner:!0}},{keys:"/",type:"search",searchArgs:{forward:!0,querySrc:"prompt",toJumplist:!0}},{keys:"?",type:"search",searchArgs:{forward:!1,querySrc:"prompt",toJumplist:!0}},{keys:"*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"g*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:"g#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:":",type:"ex"}],c=[{name:"colorscheme",shortName:"colo"},{name:"map"},{name:"imap",shortName:"im"},{name:"nmap",shortName:"nm"},{name:"vmap",shortName:"vm"},{name:"unmap"},{name:"write",shortName:"w"},{name:"undo",shortName:"u"},{name:"redo",shortName:"red"},{name:"set",shortName:"se"},{name:"set",shortName:"se"},{name:"setlocal",shortName:"setl"},{name:"setglobal",shortName:"setg"},{name:"sort",shortName:"sor"},{name:"substitute",shortName:"s",possiblyAsync:!0},{name:"nohlsearch",shortName:"noh"},{name:"yank",shortName:"y"},{name:"delmarks",shortName:"delm"},{name:"registers",shortName:"reg",excludeFromCommandHistory:!0},{name:"global",shortName:"g"}],d=a.Pos,e=function(){function e(b){b.setOption("disableInput",!0),b.setOption("showCursorWhenSelecting",!1),a.signal(b,"vim-mode-change",{mode:"normal"}),b.on("cursorActivity",bb),x(b),a.on(b.getInputField(),"paste",k(b))}function f(b){b.setOption("disableInput",!1),b.off("cursorActivity",bb),a.off(b.getInputField(),"paste",k(b)),b.state.vim=null}function g(b,c){this==a.keyMap.vim&&a.rmClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||f(b)}function h(b,c){this==a.keyMap.vim&&a.addClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||e(b)}function i(b,c){if(c){if(this[b])return this[b];var d=j(b);if(!d)return!1;var e=a.Vim.findKey(c,d);return"function"==typeof e&&a.signal(c,"vim-keypress",d),e}}function j(a){if("'"==a.charAt(0))return a.charAt(1);var b=a.split(/-(?!$)/),c=b[b.length-1];if(1==b.length&&1==b[0].length)return!1;if(2==b.length&&"Shift"==b[0]&&1==c.length)return!1;for(var d=!1,e=0;e<b.length;e++){var f=b[e];f in ib?b[e]=ib[f]:d=!0,f in jb&&(b[e]=jb[f])}return!!d&&(q(c)&&(b[b.length-1]=c.toLowerCase()),"<"+b.join("-")+">")}function k(a){var b=a.state.vim;return b.onPasteFn||(b.onPasteFn=function(){b.insertMode||(a.setCursor(L(a.getCursor(),0,1)),Bb.enterInsertMode(a,{},b))}),b.onPasteFn}function l(a,b){for(var c=[],d=a;d<a+b;d++)c.push(String.fromCharCode(d));return c}function m(a,b){return b>=a.firstLine()&&b<=a.lastLine()}function n(a){return/^[a-z]$/.test(a)}function o(a){return"()[]{}".indexOf(a)!=-1}function p(a){return kb.test(a)}function q(a){return/^[A-Z]$/.test(a)}function r(a){return/^\s*$/.test(a)}function s(a,b){for(var c=0;c<b.length;c++)if(b[c]==a)return!0;return!1}function t(a,b,c,d,e){if(void 0===b&&!e)throw Error("defaultValue is required unless callback is provided");if(c||(c="string"),sb[a]={type:c,defaultValue:b,callback:e},d)for(var f=0;f<d.length;f++)sb[d[f]]=sb[a];b&&u(a,b)}function u(a,b,c,d){var e=sb[a];d=d||{};var f=d.scope;if(!e)return new Error("Unknown option: "+a);if("boolean"==e.type){if(b&&b!==!0)return new Error("Invalid argument: "+a+"="+b);b!==!1&&(b=!0)}e.callback?("local"!==f&&e.callback(b,void 0),"global"!==f&&c&&e.callback(b,c)):("local"!==f&&(e.value="boolean"==e.type?!!b:b),"global"!==f&&c&&(c.state.vim.options[a]={value:b}))}function v(a,b,c){var d=sb[a];c=c||{};var e=c.scope;if(!d)return new Error("Unknown option: "+a);{if(!d.callback){var f="global"!==e&&b&&b.state.vim.options[a];return(f||"local"!==e&&d||{}).value}var f=b&&d.callback(void 0,b);if("global"!==e&&void 0!==f)return f;if("local"!==e)return d.callback()}}function w(){this.latestRegister=void 0,this.isPlaying=!1,this.isRecording=!1,this.replaySearchQueries=[],this.onRecordingDone=void 0,this.lastInsertModeChanges=ub()}function x(a){return a.state.vim||(a.state.vim={inputState:new z,lastEditInputState:void 0,lastEditActionCommand:void 0,lastHPos:-1,lastHSPos:-1,lastMotion:null,marks:{},fakeCursor:null,insertMode:!1,insertModeRepeat:void 0,visualMode:!1,visualLine:!1,visualBlock:!1,lastSelection:null,lastPastedText:null,sel:{},options:{}}),a.state.vim}function y(){vb={searchQuery:null,searchIsReversed:!1,lastSubstituteReplacePart:void 0,jumpList:tb(),macroModeState:new w,lastCharacterSearch:{increment:0,forward:!0,selectedCharacter:""},registerController:new D({}),searchHistoryController:new E,exCommandHistoryController:new E};for(var a in sb){var b=sb[a];b.value=b.defaultValue}}function z(){this.prefixRepeat=[],this.motionRepeat=[],this.operator=null,this.operatorArgs=null,this.motion=null,this.motionArgs=null,this.keyBuffer=[],this.registerName=null}function A(b,c){b.state.vim.inputState=new z,a.signal(b,"vim-command-done",c)}function B(a,b,c){this.clear(),this.keyBuffer=[a||""],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!!b,this.blockwise=!!c}function C(a,b){var c=vb.registerController.registers;if(!a||1!=a.length)throw Error("Register name must be 1 character");if(c[a])throw Error("Register already defined "+a);c[a]=b,rb.push(a)}function D(a){this.registers=a,this.unnamedRegister=a['"']=new B,a["."]=new B,a[":"]=new B,a["/"]=new B}function E(){this.historyBuffer=[],this.iterator=0,this.initialPrefix=null}function F(a,b){zb[a]=b}function G(a,b){for(var c=[],d=0;d<b;d++)c.push(a);return c}function H(a,b){Ab[a]=b}function I(a,b){Bb[a]=b}function J(a,b,c){var e=Math.min(Math.max(a.firstLine(),b.line),a.lastLine()),f=X(a,e)-1;f=c?f+1:f;var g=Math.min(Math.max(0,b.ch),f);return d(e,g)}function K(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function L(a,b,c){return"object"==typeof b&&(c=b.ch,b=b.line),d(a.line+b,a.ch+c)}function M(a,b){return{line:b.line-a.line,ch:b.line-a.line}}function N(a,b,c,d){for(var e,f=[],g=[],h=0;h<b.length;h++){var i=b[h];"insert"==c&&"insert"!=i.context||i.context&&i.context!=c||d.operator&&"action"==i.type||!(e=O(a,i.keys))||("partial"==e&&f.push(i),"full"==e&&g.push(i))}return{partial:f.length&&f,full:g.length&&g}}function O(a,b){if("<character>"==b.slice(-11)){var c=b.length-11,d=a.slice(0,c),e=b.slice(0,c);return d==e&&a.length>c?"full":0==e.indexOf(d)&&"partial"}return a==b?"full":0==b.indexOf(a)&&"partial"}function P(a){var b=/^.*(<[^>]+>)$/.exec(a),c=b?b[1]:a.slice(-1);if(c.length>1)switch(c){case"<CR>":c="\n";break;case"<Space>":c=" ";break;default:c=""}return c}function Q(a,b,c){return function(){for(var d=0;d<c;d++)b(a)}}function R(a){return d(a.line,a.ch)}function S(a,b){return a.ch==b.ch&&a.line==b.line}function T(a,b){return a.line<b.line||a.line==b.line&&a.ch<b.ch}function U(a,b){return arguments.length>2&&(b=U.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?a:b}function V(a,b){return arguments.length>2&&(b=V.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?b:a}function W(a,b,c){var d=T(a,b),e=T(b,c);return d&&e}function X(a,b){return a.getLine(b).length}function Y(a){return a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function Z(a){return a.replace(/([.?*+$\[\]\/\\(){}|\-])/g,"\\$1")}function $(a,b,c){var e=X(a,b),f=new Array(c-e+1).join(" ");a.setCursor(d(b,e)),a.replaceRange(f,a.getCursor())}function _(a,b){var c=[],e=a.listSelections(),f=R(a.clipPos(b)),g=!S(b,f),h=a.getCursor("head"),i=ba(e,h),j=S(e[i].head,e[i].anchor),k=e.length-1,l=k-i>i?k:0,m=e[l].anchor,n=Math.min(m.line,f.line),o=Math.max(m.line,f.line),p=m.ch,q=f.ch,r=e[l].head.ch-p,s=q-p;r>0&&s<=0?(p++,g||q--):r<0&&s>=0?(p--,j||q++):r<0&&s==-1&&(p--,q++);for(var t=n;t<=o;t++){var u={anchor:new d(t,p),head:new d(t,q)};c.push(u)}return a.setSelections(c),b.ch=q,m.ch=p,m}function aa(a,b,c){for(var d=[],e=0;e<c;e++){var f=L(b,e,0);d.push({anchor:f,head:f})}a.setSelections(d,0)}function ba(a,b,c){for(var d=0;d<a.length;d++){var e="head"!=c&&S(a[d].anchor,b),f="anchor"!=c&&S(a[d].head,b);if(e||f)return d}return-1}function ca(a,b){var c=b.lastSelection,e=function(){var b=a.listSelections(),c=b[0],d=b[b.length-1],e=T(c.anchor,c.head)?c.anchor:c.head,f=T(d.anchor,d.head)?d.head:d.anchor;return[e,f]},f=function(){var b=a.getCursor(),e=a.getCursor(),f=c.visualBlock;if(f){var g=f.width,h=f.height;e=d(b.line+h,b.ch+g);for(var i=[],j=b.line;j<e.line;j++){var k=d(j,b.ch),l=d(j,e.ch),m={anchor:k,head:l};i.push(m)}a.setSelections(i)}else{var n=c.anchorMark.find(),o=c.headMark.find(),p=o.line-n.line,q=o.ch-n.ch;e={line:e.line+p,ch:p?e.ch:q+e.ch},c.visualLine&&(b=d(b.line,0),e=d(e.line,X(a,e.line))),a.setSelection(b,e)}return[b,e]};return b.visualMode?e():f()}function da(a,b){var c=b.sel.anchor,d=b.sel.head;b.lastPastedText&&(d=a.posFromIndex(a.indexFromPos(c)+b.lastPastedText.length),b.lastPastedText=null),b.lastSelection={anchorMark:a.setBookmark(c),headMark:a.setBookmark(d),anchor:R(c),head:R(d),visualMode:b.visualMode,visualLine:b.visualLine,visualBlock:b.visualBlock}}function ea(a,b,c){var e,f=a.state.vim.sel,g=f.head,h=f.anchor;return T(c,b)&&(e=c,c=b,b=e),T(g,h)?(g=U(b,g),h=V(h,c)):(h=U(b,h),g=V(g,c),g=L(g,0,-1),g.ch==-1&&g.line!=a.firstLine()&&(g=d(g.line-1,X(a,g.line-1)))),[h,g]}function fa(a,b,c){var d=a.state.vim;b=b||d.sel;var c=c||d.visualLine?"line":d.visualBlock?"block":"char",e=ga(a,b,c);a.setSelections(e.ranges,e.primary),cb(a)}function ga(a,b,c,e){var f=R(b.head),g=R(b.anchor);if("char"==c){var h=e||T(b.head,b.anchor)?0:1,i=T(b.head,b.anchor)?1:0;return f=L(b.head,0,h),g=L(b.anchor,0,i),{ranges:[{anchor:g,head:f}],primary:0}}if("line"==c){if(T(b.head,b.anchor))f.ch=0,g.ch=X(a,g.line);else{g.ch=0;var j=a.lastLine();f.line>j&&(f.line=j),f.ch=X(a,f.line)}return{ranges:[{anchor:g,head:f}],primary:0}}if("block"==c){for(var k=Math.min(g.line,f.line),l=Math.min(g.ch,f.ch),m=Math.max(g.line,f.line),n=Math.max(g.ch,f.ch)+1,o=m-k+1,p=f.line==k?0:o-1,q=[],r=0;r<o;r++)q.push({anchor:d(k+r,l),head:d(k+r,n)});return{ranges:q,primary:p}}}function ha(a){var b=a.getCursor("head");return 1==a.getSelection().length&&(b=U(b,a.getCursor("anchor"))),b}function ia(b,c){var d=b.state.vim;c!==!1&&b.setCursor(J(b,d.sel.head)),da(b,d),d.visualMode=!1,d.visualLine=!1,d.visualBlock=!1,a.signal(b,"vim-mode-change",{mode:"normal"}),d.fakeCursor&&d.fakeCursor.clear()}function ja(a,b,c){var d=a.getRange(b,c);if(/\n\s*$/.test(d)){var e=d.split("\n");e.pop();for(var f,f=e.pop();e.length>0&&f&&r(f);f=e.pop())c.line--,c.ch=0;f?(c.line--,c.ch=X(a,c.line)):c.ch=0}}function ka(a,b,c){b.ch=0,c.ch=0,c.line++}function la(a){if(!a)return 0;var b=a.search(/\S/);return b==-1?a.length:b}function ma(a,b,c,e,f){for(var g=ha(a),h=a.getLine(g.line),i=g.ch,j=f?lb[0]:mb[0];!j(h.charAt(i));)if(i++,i>=h.length)return null;e?j=mb[0]:(j=lb[0],j(h.charAt(i))||(j=lb[1]));for(var k=i,l=i;j(h.charAt(k))&&k<h.length;)k++;for(;j(h.charAt(l))&&l>=0;)l--;if(l++,b){for(var m=k;/\s/.test(h.charAt(k))&&k<h.length;)k++;if(m==k){for(var n=l;/\s/.test(h.charAt(l-1))&&l>0;)l--;l||(l=n)}}return{start:d(g.line,l),end:d(g.line,k)}}function na(a,b,c){S(b,c)||vb.jumpList.add(a,b,c)}function oa(a,b){vb.lastCharacterSearch.increment=a,vb.lastCharacterSearch.forward=b.forward,vb.lastCharacterSearch.selectedCharacter=b.selectedCharacter}function pa(a,b,c,e){var f=R(a.getCursor()),g=c?1:-1,h=c?a.lineCount():-1,i=f.ch,j=f.line,k=a.getLine(j),l={lineText:k,nextCh:k.charAt(i),lastCh:null,index:i,symb:e,reverseSymb:(c?{")":"(","}":"{"}:{"(":")","{":"}"})[e],forward:c,depth:0,curMoveThrough:!1},m=Cb[e];if(!m)return f;var n=Db[m].init,o=Db[m].isComplete;for(n&&n(l);j!==h&&b;){if(l.index+=g,l.nextCh=l.lineText.charAt(l.index),!l.nextCh){if(j+=g,l.lineText=a.getLine(j)||"",g>0)l.index=0;else{var p=l.lineText.length;l.index=p>0?p-1:0}l.nextCh=l.lineText.charAt(l.index)}o(l)&&(f.line=j,f.ch=l.index,b--)}return l.nextCh||l.curMoveThrough?d(j,l.index):f}function qa(a,b,c,d,e){var f=b.line,g=b.ch,h=a.getLine(f),i=c?1:-1,j=d?mb:lb;if(e&&""==h){if(f+=i,h=a.getLine(f),!m(a,f))return null;g=c?0:h.length}for(;;){if(e&&""==h)return{from:0,to:0,line:f};for(var k=i>0?h.length:-1,l=k,n=k;g!=k;){for(var o=!1,p=0;p<j.length&&!o;++p)if(j[p](h.charAt(g))){for(l=g;g!=k&&j[p](h.charAt(g));)g+=i;if(n=g,o=l!=n,l==b.ch&&f==b.line&&n==l+i)continue;return{from:Math.min(l,n+1),to:Math.max(l,n),line:f}}o||(g+=i)}if(f+=i,!m(a,f))return null;h=a.getLine(f),g=i>0?0:h.length}}function ra(a,b,c,e,f,g){var h=R(b),i=[];(e&&!f||!e&&f)&&c++;for(var j=!(e&&f),k=0;k<c;k++){var l=qa(a,b,e,g,j);if(!l){var m=X(a,a.lastLine());i.push(e?{line:a.lastLine(),from:m,to:m}:{line:0,from:0,to:0});break}i.push(l),b=d(l.line,e?l.to-1:l.from)}var n=i.length!=c,o=i[0],p=i.pop();return e&&!f?(n||o.from==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.from)):e&&f?d(p.line,p.to-1):!e&&f?(n||o.to==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.to)):d(p.line,p.from)}function sa(a,b,c,e){for(var f,g=a.getCursor(),h=g.ch,i=0;i<b;i++){var j=a.getLine(g.line);if(f=va(h,j,e,c,!0),f==-1)return null;h=f}return d(a.getCursor().line,f)}function ta(a,b){var c=a.getCursor().line;return J(a,d(c,b-1))}function ua(a,b,c,d){s(c,qb)&&(b.marks[c]&&b.marks[c].clear(),b.marks[c]=a.setBookmark(d))}function va(a,b,c,d,e){var f;return d?(f=b.indexOf(c,a+1),f==-1||e||(f-=1)):(f=b.lastIndexOf(c,a-1),f==-1||e||(f+=1)),f}function wa(a,b,c,e,f){function g(b){return!a.getLine(b)}function h(a,b,c){return c?g(a)!=g(a+b):!g(a)&&g(a+b)}var i,j,k=b.line,l=a.firstLine(),m=a.lastLine(),n=k;if(e){for(;l<=n&&n<=m&&c>0;)h(n,e)&&c--,n+=e;return new d(n,0)}var o=a.state.vim;if(o.visualLine&&h(k,1,!0)){var p=o.sel.anchor;h(p.line,-1,!0)&&(f&&p.line==k||(k+=1))}var q=g(k);for(n=k;n<=m&&c;n++)h(n,1,!0)&&(f&&g(n)==q||c--);for(j=new d(n,0),n>m&&!q?q=!0:f=!1,n=k;n>l&&(f&&g(n)!=q&&n!=k||!h(n,-1,!0));n--);return i=new d(n,0),{start:i,end:j}}function xa(a,b,c,e){var f,g,h=b,i={"(":/[()]/,")":/[()]/,"[":/[[\]]/,"]":/[[\]]/,"{":/[{}]/,"}":/[{}]/}[c],j={"(":"(",")":"(","[":"[","]":"[","{":"{","}":"{"}[c],k=a.getLine(h.line).charAt(h.ch),l=k===j?1:0;if(f=a.scanForBracket(d(h.line,h.ch+l),-1,null,{bracketRegex:i}),g=a.scanForBracket(d(h.line,h.ch+l),1,null,{bracketRegex:i}),!f||!g)return{start:h,end:h};if(f=f.pos,g=g.pos,f.line==g.line&&f.ch>g.ch||f.line>g.line){var m=f;f=g,g=m}return e?g.ch+=1:f.ch+=1,{start:f,end:g}}function ya(a,b,c,e){var f,g,h,i,j=R(b),k=a.getLine(j.line),l=k.split(""),m=l.indexOf(c);if(j.ch<m?j.ch=m:m<j.ch&&l[j.ch]==c&&(g=j.ch,--j.ch),l[j.ch]!=c||g)for(h=j.ch;h>-1&&!f;h--)l[h]==c&&(f=h+1);else f=j.ch+1;if(f&&!g)for(h=f,i=l.length;h<i&&!g;h++)l[h]==c&&(g=h);return f&&g?(e&&(--f,++g),{start:d(j.line,f),end:d(j.line,g)}):{start:j,end:j}}function za(){}function Aa(a){var b=a.state.vim;return b.searchState_||(b.searchState_=new za)}function Ba(a,b,c,d,e){a.openDialog?a.openDialog(b,d,{bottom:!0,value:e.value,onKeyDown:e.onKeyDown,onKeyUp:e.onKeyUp,selectValueOnOpen:!1}):d(prompt(c,""))}function Ca(a){var b=Da(a)||[];if(!b.length)return[];var c=[];if(0===b[0]){for(var d=0;d<b.length;d++)"number"==typeof b[d]&&c.push(a.substring(b[d]+1,b[d+1]));return c}}function Da(a){for(var b=!1,c=[],d=0;d<a.length;d++){var e=a.charAt(d);b||"/"!=e||c.push(d),b=!b&&"\\"==e}return c}function Ea(a){for(var b="|(){",c="}",d=!1,e=[],f=-1;f<a.length;f++){var g=a.charAt(f)||"",h=a.charAt(f+1)||"",i=h&&b.indexOf(h)!=-1;d?("\\"===g&&i||e.push(g),d=!1):"\\"===g?(d=!0,h&&c.indexOf(h)!=-1&&(i=!0),i&&"\\"!==h||e.push(g)):(e.push(g),i&&"\\"!==h&&e.push("\\"))}return e.join("")}function Fa(a){for(var b=!1,c=[],d=-1;d<a.length;d++){var e=a.charAt(d)||"",f=a.charAt(d+1)||"";Eb[e+f]?(c.push(Eb[e+f]),d++):b?(c.push(e),b=!1):"\\"===e?(b=!0,p(f)||"$"===f?c.push("$"):"/"!==f&&"\\"!==f&&c.push("\\")):("$"===e&&c.push("$"),c.push(e),"/"===f&&c.push("\\"))}return c.join("")}function Ga(b){for(var c=new a.StringStream(b),d=[];!c.eol();){for(;c.peek()&&"\\"!=c.peek();)d.push(c.next());var e=!1;for(var f in Fb)if(c.match(f,!0)){e=!0,d.push(Fb[f]);break}e||d.push(c.next())}return d.join("")}function Ha(a,b,c){var d=vb.registerController.getRegister("/");if(d.setText(a),a instanceof RegExp)return a;var e,f,g=Da(a);if(g.length){e=a.substring(0,g[0]);var h=a.substring(g[0]);f=h.indexOf("i")!=-1}else e=a;if(!e)return null;v("pcre")||(e=Ea(e)),c&&(b=/^[^A-Z]*$/.test(e));var i=new RegExp(e,b||f?"i":void 0);return i}function Ia(a,b){a.openNotification?a.openNotification('<span style="color: red">'+b+"</span>",{bottom:!0,duration:5e3}):alert(b)}function Ja(a,b){var c='<span style="font-family: monospace; white-space: pre">'+(a||"")+'<input type="text"></span>';return b&&(c+=' <span style="color: #888">'+b+"</span>"),c}function Ka(a,b){var c=(b.prefix||"")+" "+(b.desc||""),d=Ja(b.prefix,b.desc);Ba(a,d,c,b.onClose,b)}function La(a,b){if(a instanceof RegExp&&b instanceof RegExp){for(var c=["global","multiline","ignoreCase","source"],d=0;d<c.length;d++){var e=c[d];if(a[e]!==b[e])return!1}return!0}return!1}function Ma(a,b,c,d){if(b){var e=Aa(a),f=Ha(b,!!c,!!d);if(f)return Oa(a,f),La(f,e.getQuery())?f:(e.setQuery(f),f)}}function Na(a){if("^"==a.source.charAt(0))var b=!0;return{token:function(c){if(b&&!c.sol())return void c.skipToEnd();var d=c.match(a,!1);if(d)return 0==d[0].length?(c.next(),"searching"):c.sol()||(c.backUp(1),a.exec(c.next()+d[0]))?(c.match(a),"searching"):(c.next(),null);for(;!c.eol()&&(c.next(),!c.match(a,!1)););},query:a}}function Oa(a,b){var c=Aa(a),d=c.getOverlay();d&&b==d.query||(d&&a.removeOverlay(d),d=Na(b),a.addOverlay(d),a.showMatchesOnScrollbar&&(c.getScrollbarAnnotate()&&c.getScrollbarAnnotate().clear(),c.setScrollbarAnnotate(a.showMatchesOnScrollbar(b))),c.setOverlay(d))}function Pa(a,b,c,e){return void 0===e&&(e=1),a.operation((function(){for(var f=a.getCursor(),g=a.getSearchCursor(c,f),h=0;h<e;h++){var i=g.find(b);if(0==h&&i&&S(g.from(),f)&&(i=g.find(b)),!i&&(g=a.getSearchCursor(c,b?d(a.lastLine()):d(a.firstLine(),0)),!g.find(b)))return}return g.from()}))}function Qa(a){var b=Aa(a);a.removeOverlay(Aa(a).getOverlay()),b.setOverlay(null),b.getScrollbarAnnotate()&&(b.getScrollbarAnnotate().clear(),b.setScrollbarAnnotate(null))}function Ra(a,b,c){return"number"!=typeof a&&(a=a.line),b instanceof Array?s(a,b):c?a>=b&&a<=c:a==b}function Sa(a){var b=a.getScrollInfo(),c=6,d=10,e=a.coordsChar({left:0,top:c+b.top},"local"),f=b.clientHeight-d+b.top,g=a.coordsChar({left:0,top:f},"local");return{top:e.line,bottom:g.line}}function Ta(a,b,c){if("'"==c){var d=a.doc.history.done,e=d[d.length-2];return e&&e.ranges&&e.ranges[0].head}var f=b.marks[c];return f&&f.find()}function Ua(b,c,d,e,f,g,h,i,j){function k(){b.operation((function(){for(;!p;)l(),m();n()}))}function l(){var a=b.getRange(g.from(),g.to()),c=a.replace(h,i);g.replace(c)}function m(){for(;g.findNext()&&Ra(g.from(),e,f);)if(d||!q||g.from().line!=q.line)return b.scrollIntoView(g.from(),30),b.setSelection(g.from(),g.to()),q=g.from(),void(p=!1);p=!0}function n(a){if(a&&a(),b.focus(),q){b.setCursor(q);var c=b.state.vim;c.exMode=!1,c.lastHPos=c.lastHSPos=q.ch}j&&j()}function o(c,d,e){a.e_stop(c);var f=a.keyName(c);switch(f){case"Y":l(),m();break;case"N":m();break;case"A":var g=j;j=void 0,b.operation(k),j=g;break;case"L":l();case"Q":case"Esc":case"Ctrl-C":case"Ctrl-[":n(e)}return p&&n(e),!0}b.state.vim.exMode=!0;var p=!1,q=g.from();return m(),p?void Ia(b,"No matches for "+h.source):c?void Ka(b,{prefix:"replace with <strong>"+i+"</strong> (y/n/a/q/l)",onKeyDown:o}):(k(),void(j&&j()))}function Va(b){var c=b.state.vim,d=vb.macroModeState,e=vb.registerController.getRegister("."),f=d.isPlaying,g=d.lastInsertModeChanges,h=[];if(!f){for(var i=g.inVisualBlock?c.lastSelection.visualBlock.height:1,j=g.changes,h=[],k=0;k<j.length;)h.push(j[k]),j[k]instanceof eb?k++:k+=i;g.changes=h,b.off("change",ab),a.off(b.getInputField(),"keydown",fb)}!f&&c.insertModeRepeat>1&&(gb(b,c,c.insertModeRepeat-1,!0),c.lastEditInputState.repeatOverride=c.insertModeRepeat),delete c.insertModeRepeat,c.insertMode=!1,b.setCursor(b.getCursor().line,b.getCursor().ch-1),b.setOption("keyMap","vim"),b.setOption("disableInput",!0),b.toggleOverwrite(!1),e.setText(g.changes.join("")),a.signal(b,"vim-mode-change",{mode:"normal"}),d.isRecording&&$a(d)}function Wa(a){b.unshift(a)}function Xa(a,b,c,d,e){var f={keys:a,type:b};f[b]=c,f[b+"Args"]=d;for(var g in e)f[g]=e[g];Wa(f)}function Ya(b,c,d,e){var f=vb.registerController.getRegister(e);if(":"==e)return f.keyBuffer[0]&&Jb.processCommand(b,f.keyBuffer[0]),
+void(d.isPlaying=!1);var g=f.keyBuffer,h=0;d.isPlaying=!0,d.replaySearchQueries=f.searchQueries.slice(0);for(var i=0;i<g.length;i++)for(var j,k,l=g[i];l;)if(j=/<\w+-.+?>|<\w+>|./.exec(l),k=j[0],l=l.substring(j.index+k.length),a.Vim.handleKey(b,k,"macro"),c.insertMode){var m=f.insertModeChanges[h++].changes;vb.macroModeState.lastInsertModeChanges.changes=m,hb(b,m,1),Va(b)}d.isPlaying=!1}function Za(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushText(b)}}function $a(a){if(!a.isPlaying){var b=a.latestRegister,c=vb.registerController.getRegister(b);c&&c.pushInsertModeChanges&&c.pushInsertModeChanges(a.lastInsertModeChanges)}}function _a(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushSearchQuery&&d.pushSearchQuery(b)}}function ab(a,b){var c=vb.macroModeState,d=c.lastInsertModeChanges;if(!c.isPlaying)for(;b;){if(d.expectCursorActivityForChange=!0,"+input"==b.origin||"paste"==b.origin||void 0===b.origin){var e=b.text.join("\n");d.maybeReset&&(d.changes=[],d.maybeReset=!1),a.state.overwrite&&!/\n/.test(e)?d.changes.push([e]):d.changes.push(e)}b=b.next}}function bb(a){var b=a.state.vim;if(b.insertMode){var c=vb.macroModeState;if(c.isPlaying)return;var d=c.lastInsertModeChanges;d.expectCursorActivityForChange?d.expectCursorActivityForChange=!1:d.maybeReset=!0}else a.curOp.isVimOp||db(a,b);b.visualMode&&cb(a)}function cb(a){var b=a.state.vim,c=J(a,R(b.sel.head)),d=L(c,0,1);b.fakeCursor&&b.fakeCursor.clear(),b.fakeCursor=a.markText(c,d,{className:"cm-animate-fat-cursor"})}function db(b,c){var d=b.getCursor("anchor"),e=b.getCursor("head");if(c.visualMode&&!b.somethingSelected()?ia(b,!1):c.visualMode||c.insertMode||!b.somethingSelected()||(c.visualMode=!0,c.visualLine=!1,a.signal(b,"vim-mode-change",{mode:"visual"})),c.visualMode){var f=T(e,d)?0:-1,g=T(e,d)?-1:0;e=L(e,0,f),d=L(d,0,g),c.sel={anchor:d,head:e},ua(b,c,"<",U(e,d)),ua(b,c,">",V(e,d))}else c.insertMode||(c.lastHPos=b.getCursor().ch)}function eb(a){this.keyName=a}function fb(b){function c(){return e.maybeReset&&(e.changes=[],e.maybeReset=!1),e.changes.push(new eb(f)),!0}var d=vb.macroModeState,e=d.lastInsertModeChanges,f=a.keyName(b);f&&(f.indexOf("Delete")==-1&&f.indexOf("Backspace")==-1||a.lookupKey(f,"vim-insert",c))}function gb(a,b,c,d){function e(){h?yb.processAction(a,b,b.lastEditActionCommand):yb.evalInput(a,b)}function f(c){if(g.lastInsertModeChanges.changes.length>0){c=b.lastEditActionCommand?c:1;var d=g.lastInsertModeChanges;hb(a,d.changes,c)}}var g=vb.macroModeState;g.isPlaying=!0;var h=!!b.lastEditActionCommand,i=b.inputState;if(b.inputState=b.lastEditInputState,h&&b.lastEditActionCommand.interlaceInsertRepeat)for(var j=0;j<c;j++)e(),f(1);else d||e(),f(c);b.inputState=i,b.insertMode&&!d&&Va(a),g.isPlaying=!1}function hb(b,c,d){function e(c){return"string"==typeof c?a.commands[c](b):c(b),!0}var f=b.getCursor("head"),g=vb.macroModeState.lastInsertModeChanges.inVisualBlock;if(g){var h=b.state.vim,i=h.lastSelection,j=M(i.anchor,i.head);aa(b,f,j.line+1),d=b.listSelections().length,b.setCursor(f)}for(var k=0;k<d;k++){g&&b.setCursor(L(f,k,0));for(var l=0;l<c.length;l++){var m=c[l];if(m instanceof eb)a.lookupKey(m.keyName,"vim-insert",e);else if("string"==typeof m){var n=b.getCursor();b.replaceRange(m,n,n)}else{var o=b.getCursor(),p=L(o,0,m[0].length);b.replaceRange(m[0],o,p)}}}g&&b.setCursor(L(f,0,1))}a.defineOption("vimMode",!1,(function(b,c,d){c&&"vim"!=b.getOption("keyMap")?b.setOption("keyMap","vim"):!c&&d!=a.Init&&/^vim/.test(b.getOption("keyMap"))&&b.setOption("keyMap","default")}));var ib={Shift:"S",Ctrl:"C",Alt:"A",Cmd:"D",Mod:"A"},jb={Enter:"CR",Backspace:"BS",Delete:"Del",Insert:"Ins"},kb=/[\d]/,lb=[a.isWordChar,function(b){return b&&!a.isWordChar(b)&&!/\s/.test(b)}],mb=[function(a){return/\S/.test(a)}],nb=l(65,26),ob=l(97,26),pb=l(48,10),qb=[].concat(nb,ob,pb,["<",">"]),rb=[].concat(nb,ob,pb,["-",'"',".",":","/"]),sb={};t("filetype",void 0,"string",["ft"],(function(a,b){if(void 0!==b){if(void 0===a){var c=b.getOption("mode");return"null"==c?"":c}var c=""==a?"null":a;b.setOption("mode",c)}}));var tb=function(){function a(a,b,h){function i(b){var e=++d%c,f=g[e];f&&f.clear(),g[e]=a.setBookmark(b)}var j=d%c,k=g[j];if(k){var l=k.find();l&&!S(l,b)&&i(b)}else i(b);i(h),e=d,f=d-c+1,f<0&&(f=0)}function b(a,b){d+=b,d>e?d=e:d<f&&(d=f);var h=g[(c+d)%c];if(h&&!h.find()){var i,j=b>0?1:-1,k=a.getCursor();do if(d+=j,h=g[(c+d)%c],h&&(i=h.find())&&!S(k,i))break;while(d<e&&d>f)}return h}var c=100,d=-1,e=0,f=0,g=new Array(c);return{cachedCursor:void 0,add:a,move:b}},ub=function(a){return a?{changes:a.changes,expectCursorActivityForChange:a.expectCursorActivityForChange}:{changes:[],expectCursorActivityForChange:!1}};w.prototype={exitMacroRecordMode:function(){var a=vb.macroModeState;a.onRecordingDone&&a.onRecordingDone(),a.onRecordingDone=void 0,a.isRecording=!1},enterMacroRecordMode:function(a,b){var c=vb.registerController.getRegister(b);c&&(c.clear(),this.latestRegister=b,a.openDialog&&(this.onRecordingDone=a.openDialog("(recording)["+b+"]",null,{bottom:!0})),this.isRecording=!0)}};var vb,wb,xb={buildKeyMap:function(){},getRegisterController:function(){return vb.registerController},resetVimGlobalState_:y,getVimGlobalState_:function(){return vb},maybeInitVimState_:x,suppressErrorLogging:!1,InsertModeKey:eb,map:function(a,b,c){Jb.map(a,b,c)},unmap:function(a,b){Jb.unmap(a,b)},setOption:u,getOption:v,defineOption:t,defineEx:function(a,b,c){if(b){if(0!==a.indexOf(b))throw new Error('(Vim.defineEx) "'+b+'" is not a prefix of "'+a+'", command not registered')}else b=a;Ib[a]=c,Jb.commandMap_[b]={name:a,shortName:b,type:"api"}},handleKey:function(a,b,c){var d=this.findKey(a,b,c);if("function"==typeof d)return d()},findKey:function(c,d,e){function f(){var a=vb.macroModeState;if(a.isRecording){if("q"==d)return a.exitMacroRecordMode(),A(c),!0;"mapping"!=e&&Za(a,d)}}function g(){if("<Esc>"==d)return A(c),l.visualMode?ia(c):l.insertMode&&Va(c),!0}function h(b){for(var e;b;)e=/<\w+-.+?>|<\w+>|./.exec(b),d=e[0],b=b.substring(e.index+d.length),a.Vim.handleKey(c,d,"mapping")}function i(){if(g())return!0;for(var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d,e=1==d.length,f=yb.matchCommand(a,b,l.inputState,"insert");a.length>1&&"full"!=f.type;){var a=l.inputState.keyBuffer=a.slice(1),h=yb.matchCommand(a,b,l.inputState,"insert");"none"!=h.type&&(f=h)}if("none"==f.type)return A(c),!1;if("partial"==f.type)return wb&&window.clearTimeout(wb),wb=window.setTimeout((function(){l.insertMode&&l.inputState.keyBuffer&&A(c)}),v("insertModeEscKeysTimeout")),!e;if(wb&&window.clearTimeout(wb),e){for(var i=c.listSelections(),j=0;j<i.length;j++){var k=i[j].head;c.replaceRange("",L(k,0,-(a.length-1)),k,"+input")}vb.macroModeState.lastInsertModeChanges.changes.pop()}return A(c),f.command}function j(){if(f()||g())return!0;var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d;if(/^[1-9]\d*$/.test(a))return!0;var e=/^(\d*)(.*)$/.exec(a);if(!e)return A(c),!1;var h=l.visualMode?"visual":"normal",i=yb.matchCommand(e[2]||e[1],b,l.inputState,h);if("none"==i.type)return A(c),!1;if("partial"==i.type)return!0;l.inputState.keyBuffer="";var e=/^(\d*)(.*)$/.exec(a);return e[1]&&"0"!=e[1]&&l.inputState.pushRepeatDigit(e[1]),i.command}var k,l=x(c);return k=l.insertMode?i():j(),k===!1?void 0:k===!0?function(){return!0}:function(){return c.operation((function(){c.curOp.isVimOp=!0;try{"keyToKey"==k.type?h(k.toKeys):yb.processCommand(c,l,k)}catch(b){throw c.state.vim=void 0,x(c),a.Vim.suppressErrorLogging||console.log(b),b}return!0}))}},handleEx:function(a,b){Jb.processCommand(a,b)},defineMotion:F,defineAction:I,defineOperator:H,mapCommand:Xa,_mapCommand:Wa,defineRegister:C,exitVisualMode:ia,exitInsertMode:Va};z.prototype.pushRepeatDigit=function(a){this.operator?this.motionRepeat=this.motionRepeat.concat(a):this.prefixRepeat=this.prefixRepeat.concat(a)},z.prototype.getRepeat=function(){var a=0;return(this.prefixRepeat.length>0||this.motionRepeat.length>0)&&(a=1,this.prefixRepeat.length>0&&(a*=parseInt(this.prefixRepeat.join(""),10)),this.motionRepeat.length>0&&(a*=parseInt(this.motionRepeat.join(""),10))),a},B.prototype={setText:function(a,b,c){this.keyBuffer=[a||""],this.linewise=!!b,this.blockwise=!!c},pushText:function(a,b){b&&(this.linewise||this.keyBuffer.push("\n"),this.linewise=!0),this.keyBuffer.push(a)},pushInsertModeChanges:function(a){this.insertModeChanges.push(ub(a))},pushSearchQuery:function(a){this.searchQueries.push(a)},clear:function(){this.keyBuffer=[],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!1},toString:function(){return this.keyBuffer.join("")}},D.prototype={pushText:function(a,b,c,d,e){d&&"\n"!==c.charAt(c.length-1)&&(c+="\n");var f=this.isValidRegister(a)?this.getRegister(a):null;if(!f){switch(b){case"yank":this.registers[0]=new B(c,d,e);break;case"delete":case"change":c.indexOf("\n")==-1?this.registers["-"]=new B(c,d):(this.shiftNumericRegisters_(),this.registers[1]=new B(c,d))}return void this.unnamedRegister.setText(c,d,e)}var g=q(a);g?f.pushText(c,d):f.setText(c,d,e),this.unnamedRegister.setText(f.toString(),d)},getRegister:function(a){return this.isValidRegister(a)?(a=a.toLowerCase(),this.registers[a]||(this.registers[a]=new B),this.registers[a]):this.unnamedRegister},isValidRegister:function(a){return a&&s(a,rb)},shiftNumericRegisters_:function(){for(var a=9;a>=2;a--)this.registers[a]=this.getRegister(""+(a-1))}},E.prototype={nextMatch:function(a,b){var c=this.historyBuffer,d=b?-1:1;null===this.initialPrefix&&(this.initialPrefix=a);for(var e=this.iterator+d;b?e>=0:e<c.length;e+=d)for(var f=c[e],g=0;g<=f.length;g++)if(this.initialPrefix==f.substring(0,g))return this.iterator=e,f;return e>=c.length?(this.iterator=c.length,this.initialPrefix):e<0?a:void 0},pushInput:function(a){var b=this.historyBuffer.indexOf(a);b>-1&&this.historyBuffer.splice(b,1),a.length&&this.historyBuffer.push(a)},reset:function(){this.initialPrefix=null,this.iterator=this.historyBuffer.length}};var yb={matchCommand:function(a,b,c,d){var e=N(a,b,d,c);if(!e.full&&!e.partial)return{type:"none"};if(!e.full&&e.partial)return{type:"partial"};for(var f,g=0;g<e.full.length;g++){var h=e.full[g];f||(f=h)}if("<character>"==f.keys.slice(-11)){var i=P(a);if(!i)return{type:"none"};c.selectedCharacter=i}return{type:"full",command:f}},processCommand:function(a,b,c){switch(b.inputState.repeatOverride=c.repeatOverride,c.type){case"motion":this.processMotion(a,b,c);break;case"operator":this.processOperator(a,b,c);break;case"operatorMotion":this.processOperatorMotion(a,b,c);break;case"action":this.processAction(a,b,c);break;case"search":this.processSearch(a,b,c);break;case"ex":case"keyToEx":this.processEx(a,b,c)}},processMotion:function(a,b,c){b.inputState.motion=c.motion,b.inputState.motionArgs=K(c.motionArgs),this.evalInput(a,b)},processOperator:function(a,b,c){var d=b.inputState;if(d.operator){if(d.operator==c.operator)return d.motion="expandToLine",d.motionArgs={linewise:!0},void this.evalInput(a,b);A(a)}d.operator=c.operator,d.operatorArgs=K(c.operatorArgs),b.visualMode&&this.evalInput(a,b)},processOperatorMotion:function(a,b,c){var d=b.visualMode,e=K(c.operatorMotionArgs);e&&d&&e.visualLine&&(b.visualLine=!0),this.processOperator(a,b,c),d||this.processMotion(a,b,c)},processAction:function(a,b,c){var d=b.inputState,e=d.getRepeat(),f=!!e,g=K(c.actionArgs)||{};d.selectedCharacter&&(g.selectedCharacter=d.selectedCharacter),c.operator&&this.processOperator(a,b,c),c.motion&&this.processMotion(a,b,c),(c.motion||c.operator)&&this.evalInput(a,b),g.repeat=e||1,g.repeatIsExplicit=f,g.registerName=d.registerName,A(a),b.lastMotion=null,c.isEdit&&this.recordLastEdit(b,d,c),Bb[c.action](a,g,b)},processSearch:function(b,c,d){function e(a,e,f){vb.searchHistoryController.pushInput(a),vb.searchHistoryController.reset();try{Ma(b,a,e,f)}catch(c){return Ia(b,"Invalid regex: "+a),void A(b)}yb.processMotion(b,c,{type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:d.searchArgs.toJumplist}})}function f(a){b.scrollTo(m.left,m.top),e(a,!0,!0);var c=vb.macroModeState;c.isRecording&&_a(c,a)}function g(c,d,e){var f,g,h=a.keyName(c);"Up"==h||"Down"==h?(f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.searchHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.searchHistoryController.reset();var j;try{j=Ma(b,d,!0,!0)}catch(a){}j?b.scrollIntoView(Pa(b,!i,j),30):(Qa(b),b.scrollTo(m.left,m.top))}function h(c,d,e){var f=a.keyName(c);"Esc"==f||"Ctrl-C"==f||"Ctrl-["==f||"Backspace"==f&&""==d?(vb.searchHistoryController.pushInput(d),vb.searchHistoryController.reset(),Ma(b,l),Qa(b),b.scrollTo(m.left,m.top),a.e_stop(c),A(b),e(),b.focus()):"Up"==f||"Down"==f?a.e_stop(c):"Ctrl-U"==f&&(a.e_stop(c),e(""))}if(b.getSearchCursor){var i=d.searchArgs.forward,j=d.searchArgs.wholeWordOnly;Aa(b).setReversed(!i);var k=i?"/":"?",l=Aa(b).getQuery(),m=b.getScrollInfo();switch(d.searchArgs.querySrc){case"prompt":var n=vb.macroModeState;if(n.isPlaying){var o=n.replaySearchQueries.shift();e(o,!0,!1)}else Ka(b,{onClose:f,prefix:k,desc:Gb,onKeyUp:g,onKeyDown:h});break;case"wordUnderCursor":var p=ma(b,!1,!0,!1,!0),q=!0;if(p||(p=ma(b,!1,!0,!1,!1),q=!1),!p)return;var o=b.getLine(p.start.line).substring(p.start.ch,p.end.ch);o=q&&j?"\\b"+o+"\\b":Z(o),vb.jumpList.cachedCursor=b.getCursor(),b.setCursor(p.start),e(o,!0,!1)}}},processEx:function(b,c,d){function e(a){vb.exCommandHistoryController.pushInput(a),vb.exCommandHistoryController.reset(),Jb.processCommand(b,a)}function f(c,d,e){var f,g,h=a.keyName(c);("Esc"==h||"Ctrl-C"==h||"Ctrl-["==h||"Backspace"==h&&""==d)&&(vb.exCommandHistoryController.pushInput(d),vb.exCommandHistoryController.reset(),a.e_stop(c),A(b),e(),b.focus()),"Up"==h||"Down"==h?(a.e_stop(c),f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.exCommandHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Ctrl-U"==h?(a.e_stop(c),e("")):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.exCommandHistoryController.reset()}"keyToEx"==d.type?Jb.processCommand(b,d.exArgs.input):c.visualMode?Ka(b,{onClose:e,prefix:":",value:"'<,'>",onKeyDown:f}):Ka(b,{onClose:e,prefix:":",onKeyDown:f})},evalInput:function(a,b){var c,e,f,g=b.inputState,h=g.motion,i=g.motionArgs||{},j=g.operator,k=g.operatorArgs||{},l=g.registerName,m=b.sel,n=R(b.visualMode?J(a,m.head):a.getCursor("head")),o=R(b.visualMode?J(a,m.anchor):a.getCursor("anchor")),p=R(n),q=R(o);if(j&&this.recordLastEdit(b,g),f=void 0!==g.repeatOverride?g.repeatOverride:g.getRepeat(),f>0&&i.explicitRepeat?i.repeatIsExplicit=!0:(i.noRepeat||!i.explicitRepeat&&0===f)&&(f=1,i.repeatIsExplicit=!1),g.selectedCharacter&&(i.selectedCharacter=k.selectedCharacter=g.selectedCharacter),i.repeat=f,A(a),h){var r=zb[h](a,n,i,b);if(b.lastMotion=zb[h],!r)return;if(i.toJumplist){var s=vb.jumpList,t=s.cachedCursor;t?(na(a,t,r),delete s.cachedCursor):na(a,n,r)}r instanceof Array?(e=r[0],c=r[1]):c=r,c||(c=R(n)),b.visualMode?(b.visualBlock&&c.ch===1/0||(c=J(a,c,b.visualBlock)),e&&(e=J(a,e,!0)),e=e||q,m.anchor=e,m.head=c,fa(a),ua(a,b,"<",T(e,c)?e:c),ua(a,b,">",T(e,c)?c:e)):j||(c=J(a,c),a.setCursor(c.line,c.ch))}if(j){if(k.lastSel){e=q;var u=k.lastSel,v=Math.abs(u.head.line-u.anchor.line),w=Math.abs(u.head.ch-u.anchor.ch);c=u.visualLine?d(q.line+v,q.ch):u.visualBlock?d(q.line+v,q.ch+w):u.head.line==u.anchor.line?d(q.line,q.ch+w):d(q.line+v,q.ch),b.visualMode=!0,b.visualLine=u.visualLine,b.visualBlock=u.visualBlock,m=b.sel={anchor:e,head:c},fa(a)}else b.visualMode&&(k.lastSel={anchor:R(m.anchor),head:R(m.head),visualBlock:b.visualBlock,visualLine:b.visualLine});var x,y,z,B,C;if(b.visualMode){if(x=U(m.head,m.anchor),y=V(m.head,m.anchor),z=b.visualLine||k.linewise,B=b.visualBlock?"block":z?"line":"char",C=ga(a,{anchor:x,head:y},B),z){var D=C.ranges;if("block"==B)for(var E=0;E<D.length;E++)D[E].head.ch=X(a,D[E].head.line);else"line"==B&&(D[0].head=d(D[0].head.line+1,0))}}else{if(x=R(e||q),y=R(c||p),T(y,x)){var F=x;x=y,y=F}z=i.linewise||k.linewise,z?ka(a,x,y):i.forward&&ja(a,x,y),B="char";var G=!i.inclusive||z;C=ga(a,{anchor:x,head:y},B,G)}a.setSelections(C.ranges,C.primary),b.lastMotion=null,k.repeat=f,k.registerName=l,k.linewise=z;var H=Ab[j](a,k,C.ranges,q,c);b.visualMode&&ia(a,null!=H),H&&a.setCursor(H)}},recordLastEdit:function(a,b,c){var d=vb.macroModeState;d.isPlaying||(a.lastEditInputState=b,a.lastEditActionCommand=c,d.lastInsertModeChanges.changes=[],d.lastInsertModeChanges.expectCursorActivityForChange=!1)}},zb={moveToTopLine:function(a,b,c){var e=Sa(a).top+c.repeat-1;return d(e,la(a.getLine(e)))},moveToMiddleLine:function(a){var b=Sa(a),c=Math.floor(.5*(b.top+b.bottom));return d(c,la(a.getLine(c)))},moveToBottomLine:function(a,b,c){var e=Sa(a).bottom-c.repeat+1;return d(e,la(a.getLine(e)))},expandToLine:function(a,b,c){var e=b;return d(e.line+c.repeat-1,1/0)},findNext:function(a,b,c){var d=Aa(a),e=d.getQuery();if(e){var f=!c.forward;return f=d.isReversed()?!f:f,Oa(a,e),Pa(a,f,e,c.repeat)}},goToMark:function(a,b,c,d){var e=Ta(a,d,c.selectedCharacter);return e?c.linewise?{line:e.line,ch:la(a.getLine(e.line))}:e:null},moveToOtherHighlightedEnd:function(a,b,c,e){if(e.visualBlock&&c.sameLine){var f=e.sel;return[J(a,d(f.anchor.line,f.head.ch)),J(a,d(f.head.line,f.anchor.ch))]}return[e.sel.head,e.sel.anchor]},jumpToMark:function(a,b,c,e){for(var f=b,g=0;g<c.repeat;g++){var h=f;for(var i in e.marks)if(n(i)){var j=e.marks[i].find(),k=c.forward?T(j,h):T(h,j);if(!(k||c.linewise&&j.line==h.line)){var l=S(h,f),m=c.forward?W(h,j,f):W(f,j,h);(l||m)&&(f=j)}}}return c.linewise&&(f=d(f.line,la(a.getLine(f.line)))),f},moveByCharacters:function(a,b,c){var e=b,f=c.repeat,g=c.forward?e.ch+f:e.ch-f;return d(e.line,g)},moveByLines:function(a,b,c,e){var f=b,g=f.ch;switch(e.lastMotion){case this.moveByLines:case this.moveByDisplayLines:case this.moveByScroll:case this.moveToColumn:case this.moveToEol:g=e.lastHPos;break;default:e.lastHPos=g}var h=c.repeat+(c.repeatOffset||0),i=c.forward?f.line+h:f.line-h,j=a.firstLine(),k=a.lastLine();return i<j&&f.line==j?this.moveToStartOfLine(a,b,c,e):i>k&&f.line==k?this.moveToEol(a,b,c,e):(c.toFirstChar&&(g=la(a.getLine(i)),e.lastHPos=g),e.lastHSPos=a.charCoords(d(i,g),"div").left,d(i,g))},moveByDisplayLines:function(a,b,c,e){var f=b;switch(e.lastMotion){case this.moveByDisplayLines:case this.moveByScroll:case this.moveByLines:case this.moveToColumn:case this.moveToEol:break;default:e.lastHSPos=a.charCoords(f,"div").left}var g=c.repeat,h=a.findPosV(f,c.forward?g:-g,"line",e.lastHSPos);if(h.hitSide)if(c.forward)var i=a.charCoords(h,"div"),j={top:i.top+8,left:e.lastHSPos},h=a.coordsChar(j,"div");else{var k=a.charCoords(d(a.firstLine(),0),"div");k.left=e.lastHSPos,h=a.coordsChar(k,"div")}return e.lastHPos=h.ch,h},moveByPage:function(a,b,c){var d=b,e=c.repeat;return a.findPosV(d,c.forward?e:-e,"page")},moveByParagraph:function(a,b,c){var d=c.forward?1:-1;return wa(a,b,c.repeat,d)},moveByScroll:function(a,b,c,d){var e=a.getScrollInfo(),f=null,g=c.repeat;g||(g=e.clientHeight/(2*a.defaultTextHeight()));var h=a.charCoords(b,"local");c.repeat=g;var f=zb.moveByDisplayLines(a,b,c,d);if(!f)return null;var i=a.charCoords(f,"local");return a.scrollTo(null,e.top+i.top-h.top),f},moveByWords:function(a,b,c){return ra(a,b,c.repeat,!!c.forward,!!c.wordEnd,!!c.bigWord)},moveTillCharacter:function(a,b,c){var d=c.repeat,e=sa(a,d,c.forward,c.selectedCharacter),f=c.forward?-1:1;return oa(f,c),e?(e.ch+=f,e):null},moveToCharacter:function(a,b,c){var d=c.repeat;return oa(0,c),sa(a,d,c.forward,c.selectedCharacter)||b},moveToSymbol:function(a,b,c){var d=c.repeat;return pa(a,d,c.forward,c.selectedCharacter)||b},moveToColumn:function(a,b,c,d){var e=c.repeat;return d.lastHPos=e-1,d.lastHSPos=a.charCoords(b,"div").left,ta(a,e)},moveToEol:function(a,b,c,e){var f=b;e.lastHPos=1/0;var g=d(f.line+c.repeat-1,1/0),h=a.clipPos(g);return h.ch--,e.lastHSPos=a.charCoords(h,"div").left,g},moveToFirstNonWhiteSpaceCharacter:function(a,b){var c=b;return d(c.line,la(a.getLine(c.line)))},moveToMatchedSymbol:function(a,b){for(var c,e=b,f=e.line,g=e.ch,h=a.getLine(f);g<h.length;g++)if(c=h.charAt(g),c&&o(c)){var i=a.getTokenTypeAt(d(f,g+1));if("string"!==i&&"comment"!==i)break}if(g<h.length){var j=a.findMatchingBracket(d(f,g));return j.to}return e},moveToStartOfLine:function(a,b){return d(b.line,0)},moveToLineOrEdgeOfDocument:function(a,b,c){var e=c.forward?a.lastLine():a.firstLine();return c.repeatIsExplicit&&(e=c.repeat-a.getOption("firstLineNumber")),d(e,la(a.getLine(e)))},textObjectManipulation:function(a,b,c,d){var e={"(":")",")":"(","{":"}","}":"{","[":"]","]":"["},f={"'":!0,'"':!0},g=c.selectedCharacter;"b"==g?g="(":"B"==g&&(g="{");var h,i=!c.textObjectInner;if(e[g])h=xa(a,b,g,i);else if(f[g])h=ya(a,b,g,i);else if("W"===g)h=ma(a,i,!0,!0);else if("w"===g)h=ma(a,i,!0,!1);else{if("p"!==g)return null;if(h=wa(a,b,c.repeat,0,i),c.linewise=!0,d.visualMode)d.visualLine||(d.visualLine=!0);else{var j=d.inputState.operatorArgs;j&&(j.linewise=!0),h.end.line--}}return a.state.vim.visualMode?ea(a,h.start,h.end):[h.start,h.end]},repeatLastCharacterSearch:function(a,b,c){var d=vb.lastCharacterSearch,e=c.repeat,f=c.forward===d.forward,g=(d.increment?1:0)*(f?-1:1);a.moveH(-g,"char"),c.inclusive=!!f;var h=sa(a,e,f,d.selectedCharacter);return h?(h.ch+=g,h):(a.moveH(g,"char"),b)}},Ab={change:function(b,c,e){var f,g,h=b.state.vim;if(vb.macroModeState.lastInsertModeChanges.inVisualBlock=h.visualBlock,h.visualMode){g=b.getSelection();var i=G("",e.length);b.replaceSelections(i),f=U(e[0].head,e[0].anchor)}else{var j=e[0].anchor,k=e[0].head;g=b.getRange(j,k);var l=h.lastEditInputState||{};if("moveByWords"==l.motion&&!r(g)){var m=/\s+$/.exec(g);m&&l.motionArgs&&l.motionArgs.forward&&(k=L(k,0,-m[0].length),g=g.slice(0,-m[0].length))}var n=new d(j.line-1,Number.MAX_VALUE),o=b.firstLine()==b.lastLine();k.line>b.lastLine()&&c.linewise&&!o?b.replaceRange("",n,k):b.replaceRange("",j,k),c.linewise&&(o||(b.setCursor(n),a.commands.newlineAndIndent(b)),j.ch=Number.MAX_VALUE),f=j}vb.registerController.pushText(c.registerName,"change",g,c.linewise,e.length>1),Bb.enterInsertMode(b,{head:f},b.state.vim)},delete:function(a,b,c){var e,f,g=a.state.vim;if(g.visualBlock){f=a.getSelection();var h=G("",c.length);a.replaceSelections(h),e=c[0].anchor}else{var i=c[0].anchor,j=c[0].head;b.linewise&&j.line!=a.firstLine()&&i.line==a.lastLine()&&i.line==j.line-1&&(i.line==a.firstLine()?i.ch=0:i=d(i.line-1,X(a,i.line-1))),f=a.getRange(i,j),a.replaceRange("",i,j),e=i,b.linewise&&(e=zb.moveToFirstNonWhiteSpaceCharacter(a,i))}return vb.registerController.pushText(b.registerName,"delete",f,b.linewise,g.visualBlock),J(a,e)},indent:function(a,b,c){var d=a.state.vim,e=c[0].anchor.line,f=d.visualBlock?c[c.length-1].anchor.line:c[0].head.line,g=d.visualMode?b.repeat:1;b.linewise&&f--;for(var h=e;h<=f;h++)for(var i=0;i<g;i++)a.indentLine(h,b.indentRight);return zb.moveToFirstNonWhiteSpaceCharacter(a,c[0].anchor)},changeCase:function(a,b,c,d,e){for(var f=a.getSelections(),g=[],h=b.toLower,i=0;i<f.length;i++){var j=f[i],k="";if(h===!0)k=j.toLowerCase();else if(h===!1)k=j.toUpperCase();else for(var l=0;l<j.length;l++){var m=j.charAt(l);k+=q(m)?m.toLowerCase():m.toUpperCase()}g.push(k)}return a.replaceSelections(g),b.shouldMoveCursor?e:!a.state.vim.visualMode&&b.linewise&&c[0].anchor.line+1==c[0].head.line?zb.moveToFirstNonWhiteSpaceCharacter(a,d):b.linewise?d:U(c[0].anchor,c[0].head)},yank:function(a,b,c,d){var e=a.state.vim,f=a.getSelection(),g=e.visualMode?U(e.sel.anchor,e.sel.head,c[0].head,c[0].anchor):d;return vb.registerController.pushText(b.registerName,"yank",f,b.linewise,e.visualBlock),g}},Bb={jumpListWalk:function(a,b,c){if(!c.visualMode){var d=b.repeat,e=b.forward,f=vb.jumpList,g=f.move(a,e?d:-d),h=g?g.find():void 0;h=h?h:a.getCursor(),a.setCursor(h)}},scroll:function(a,b,c){if(!c.visualMode){var d=b.repeat||1,e=a.defaultTextHeight(),f=a.getScrollInfo().top,g=e*d,h=b.forward?f+g:f-g,i=R(a.getCursor()),j=a.charCoords(i,"local");if(b.forward)h>j.top?(i.line+=(h-j.top)/e,i.line=Math.ceil(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.top)):a.scrollTo(null,h);else{var k=h+a.getScrollInfo().clientHeight;k<j.bottom?(i.line-=(j.bottom-k)/e,i.line=Math.floor(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.bottom-a.getScrollInfo().clientHeight)):a.scrollTo(null,h)}}},scrollToCursor:function(a,b){var c=a.getCursor().line,e=a.charCoords(d(c,0),"local"),f=a.getScrollInfo().clientHeight,g=e.top,h=e.bottom-g;switch(b.position){case"center":g=g-f/2+h;break;case"bottom":g=g-f+h}a.scrollTo(null,g)},replayMacro:function(a,b,c){var d=b.selectedCharacter,e=b.repeat,f=vb.macroModeState;for("@"==d&&(d=f.latestRegister);e--;)Ya(a,c,f,d)},enterMacroRecordMode:function(a,b){var c=vb.macroModeState,d=b.selectedCharacter;vb.registerController.isValidRegister(d)&&c.enterMacroRecordMode(a,d)},toggleOverwrite:function(b){b.state.overwrite?(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})):(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"}))},enterInsertMode:function(b,c,e){if(!b.getOption("readOnly")){e.insertMode=!0,e.insertModeRepeat=c&&c.repeat||1;var f=c?c.insertAt:null,g=e.sel,h=c.head||b.getCursor("head"),i=b.listSelections().length;if("eol"==f)h=d(h.line,X(b,h.line));else if("charAfter"==f)h=L(h,0,1);else if("firstNonBlank"==f)h=zb.moveToFirstNonWhiteSpaceCharacter(b,h);else if("startOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.min(g.head.ch,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line<g.anchor.line?g.head:d(g.anchor.line,0);else if("endOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.max(g.head.ch+1,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line>=g.anchor.line?L(g.head,0,1):d(g.anchor.line,0);else if("inplace"==f&&e.visualMode)return;b.setOption("disableInput",!1),c&&c.replace?(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"})):(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})),vb.macroModeState.isPlaying||(b.on("change",ab),a.on(b.getInputField(),"keydown",fb)),e.visualMode&&ia(b),aa(b,h,i)}},toggleVisualMode:function(b,c,e){var f,g=c.repeat,h=b.getCursor();e.visualMode?e.visualLine^c.linewise||e.visualBlock^c.blockwise?(e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b)):ia(b):(e.visualMode=!0,e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,f=J(b,d(h.line,h.ch+g-1),!0),e.sel={anchor:h,head:f},a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b),ua(b,e,"<",U(h,f)),ua(b,e,">",V(h,f)))},reselectLastSelection:function(b,c,d){var e=d.lastSelection;if(d.visualMode&&da(b,d),e){var f=e.anchorMark.find(),g=e.headMark.find();if(!f||!g)return;d.sel={anchor:f,head:g},d.visualMode=!0,d.visualLine=e.visualLine,d.visualBlock=e.visualBlock,fa(b),ua(b,d,"<",U(f,g)),ua(b,d,">",V(f,g)),a.signal(b,"vim-mode-change",{mode:"visual",subMode:d.visualLine?"linewise":d.visualBlock?"blockwise":""})}},joinLines:function(a,b,c){var e,f;if(c.visualMode){if(e=a.getCursor("anchor"),f=a.getCursor("head"),T(f,e)){var g=f;f=e,e=g}f.ch=X(a,f.line)-1}else{var h=Math.max(b.repeat,2);e=a.getCursor(),f=J(a,d(e.line+h-1,1/0))}for(var i=0,j=e.line;j<f.line;j++){i=X(a,e.line);var g=d(e.line+1,X(a,e.line+1)),k=a.getRange(e,g);k=k.replace(/\n\s*/g," "),a.replaceRange(k,e,g)}var l=d(e.line,i);c.visualMode&&ia(a,!1),a.setCursor(l)},newLineAndEnterInsertMode:function(b,c,e){e.insertMode=!0;var f=R(b.getCursor());if(f.line!==b.firstLine()||c.after){f.line=c.after?f.line:f.line-1,f.ch=X(b,f.line),b.setCursor(f);var g=a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent;g(b)}else b.replaceRange("\n",d(b.firstLine(),0)),b.setCursor(b.firstLine(),0);this.enterInsertMode(b,{repeat:c.repeat},e)},paste:function(a,b,c){var e=R(a.getCursor()),f=vb.registerController.getRegister(b.registerName),g=f.toString();if(g){if(b.matchIndent){var h=a.getOption("tabSize"),i=function(a){var b=a.split("\t").length-1,c=a.split(" ").length-1;return b*h+1*c},j=a.getLine(a.getCursor().line),k=i(j.match(/^\s*/)[0]),l=g.replace(/\n$/,""),m=g!==l,n=i(g.match(/^\s*/)[0]),g=l.replace(/^\s*/gm,(function(b){var c=k+(i(b)-n);if(c<0)return"";if(a.getOption("indentWithTabs")){var d=Math.floor(c/h);return Array(d+1).join("\t")}return Array(c+1).join(" ")}));g+=m?"\n":""}if(b.repeat>1)var g=Array(b.repeat+1).join(g);var o=f.linewise,p=f.blockwise;if(o)c.visualMode?g=c.visualLine?g.slice(0,-1):"\n"+g.slice(0,g.length-1)+"\n":b.after?(g="\n"+g.slice(0,g.length-1),e.ch=X(a,e.line)):e.ch=0;else{if(p){g=g.split("\n");for(var q=0;q<g.length;q++)g[q]=""==g[q]?" ":g[q]}e.ch+=b.after?1:0}var r,s;if(c.visualMode){c.lastPastedText=g;var t,u=ca(a,c),v=u[0],w=u[1],x=a.getSelection(),y=a.listSelections(),z=new Array(y.length).join("1").split("1");c.lastSelection&&(t=c.lastSelection.headMark.find()),vb.registerController.unnamedRegister.setText(x),p?(a.replaceSelections(z),w=d(v.line+g.length-1,v.ch),a.setCursor(v),_(a,w),a.replaceSelections(g),r=v):c.visualBlock?(a.replaceSelections(z),a.setCursor(v),a.replaceRange(g,v,v),r=v):(a.replaceRange(g,v,w),r=a.posFromIndex(a.indexFromPos(v)+g.length-1)),t&&(c.lastSelection.headMark=a.setBookmark(t)),o&&(r.ch=0)}else if(p){a.setCursor(e);for(var q=0;q<g.length;q++){var A=e.line+q;A>a.lastLine()&&a.replaceRange("\n",d(A,0));var B=X(a,A);B<e.ch&&$(a,A,e.ch)}a.setCursor(e),_(a,d(e.line+g.length-1,e.ch)),a.replaceSelections(g),r=e}else a.replaceRange(g,e),o&&b.after?r=d(e.line+1,la(a.getLine(e.line+1))):o&&!b.after?r=d(e.line,la(a.getLine(e.line))):!o&&b.after?(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length-1)):(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length));c.visualMode&&ia(a,!1),a.setCursor(r)}},undo:function(b,c){b.operation((function(){Q(b,a.commands.undo,c.repeat)(),b.setCursor(b.getCursor("anchor"))}))},redo:function(b,c){Q(b,a.commands.redo,c.repeat)()},setRegister:function(a,b,c){c.inputState.registerName=b.selectedCharacter},setMark:function(a,b,c){var d=b.selectedCharacter;ua(a,c,d,a.getCursor())},replace:function(b,c,e){var f,g,h=c.selectedCharacter,i=b.getCursor(),j=b.listSelections();if(e.visualMode)i=b.getCursor("start"),g=b.getCursor("end");else{var k=b.getLine(i.line);f=i.ch+c.repeat,f>k.length&&(f=k.length),g=d(i.line,f)}if("\n"==h)e.visualMode||b.replaceRange("",i,g),(a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent)(b);else{var l=b.getRange(i,g);if(l=l.replace(/[^\n]/g,h),e.visualBlock){var m=new Array(b.getOption("tabSize")+1).join(" ");l=b.getSelection(),l=l.replace(/\t/g,m).replace(/[^\n]/g,h).split("\n"),b.replaceSelections(l)}else b.replaceRange(l,i,g);e.visualMode?(i=T(j[0].anchor,j[0].head)?j[0].anchor:j[0].head,b.setCursor(i),ia(b,!1)):b.setCursor(L(g,0,-1))}},incrementNumberToken:function(a,b){for(var c,e,f,g,h,i=a.getCursor(),j=a.getLine(i.line),k=/-?\d+/g;null!==(c=k.exec(j))&&(h=c[0],e=c.index,f=e+h.length,!(i.ch<f)););if((b.backtrack||!(f<=i.ch))&&h){var l=b.increase?1:-1,m=parseInt(h)+l*b.repeat,n=d(i.line,e),o=d(i.line,f);g=m.toString(),a.replaceRange(g,n,o),a.setCursor(d(i.line,e+g.length-1))}},repeatLastEdit:function(a,b,c){var d=c.lastEditInputState;if(d){var e=b.repeat;e&&b.repeatIsExplicit?c.lastEditInputState.repeatOverride=e:e=c.lastEditInputState.repeatOverride||e,gb(a,c,e,!1)}},indent:function(a,b){a.indentLine(a.getCursor().line,b.indentRight)},exitInsertMode:Va},Cb={"(":"bracket",")":"bracket","{":"bracket","}":"bracket","[":"section","]":"section","*":"comment","/":"comment",m:"method",M:"method","#":"preprocess"},Db={bracket:{isComplete:function(a){
+if(a.nextCh===a.symb){if(a.depth++,a.depth>=1)return!0}else a.nextCh===a.reverseSymb&&a.depth--;return!1}},section:{init:function(a){a.curMoveThrough=!0,a.symb=(a.forward?"]":"[")===a.symb?"{":"}"},isComplete:function(a){return 0===a.index&&a.nextCh===a.symb}},comment:{isComplete:function(a){var b="*"===a.lastCh&&"/"===a.nextCh;return a.lastCh=a.nextCh,b}},method:{init:function(a){a.symb="m"===a.symb?"{":"}",a.reverseSymb="{"===a.symb?"}":"{"},isComplete:function(a){return a.nextCh===a.symb}},preprocess:{init:function(a){a.index=0},isComplete:function(a){if("#"===a.nextCh){var b=a.lineText.match(/#(\w+)/)[1];if("endif"===b){if(a.forward&&0===a.depth)return!0;a.depth++}else if("if"===b){if(!a.forward&&0===a.depth)return!0;a.depth--}if("else"===b&&0===a.depth)return!0}return!1}}};t("pcre",!0,"boolean"),za.prototype={getQuery:function(){return vb.query},setQuery:function(a){vb.query=a},getOverlay:function(){return this.searchOverlay},setOverlay:function(a){this.searchOverlay=a},isReversed:function(){return vb.isReversed},setReversed:function(a){vb.isReversed=a},getScrollbarAnnotate:function(){return this.annotate},setScrollbarAnnotate:function(a){this.annotate=a}};var Eb={"\\n":"\n","\\r":"\r","\\t":"\t"},Fb={"\\/":"/","\\\\":"\\","\\n":"\n","\\r":"\r","\\t":"\t"},Gb="(Javascript regexp)",Hb=function(){this.buildCommandMap_()};Hb.prototype={processCommand:function(a,b,c){var d=this;a.operation((function(){a.curOp.isVimOp=!0,d._processCommand(a,b,c)}))},_processCommand:function(b,c,d){var e=b.state.vim,f=vb.registerController.getRegister(":"),g=f.toString();e.visualMode&&ia(b);var h=new a.StringStream(c);f.setText(c);var i=d||{};i.input=c;try{this.parseInput_(b,h,i)}catch(a){throw Ia(b,a),a}var j,k;if(i.commandName){if(j=this.matchCommand_(i.commandName)){if(k=j.name,j.excludeFromCommandHistory&&f.setText(g),this.parseCommandArgs_(h,i,j),"exToKey"==j.type){for(var l=0;l<j.toKeys.length;l++)a.Vim.handleKey(b,j.toKeys[l],"mapping");return}if("exToEx"==j.type)return void this.processCommand(b,j.toInput)}}else void 0!==i.line&&(k="move");if(!k)return void Ia(b,'Not an editor command ":'+c+'"');try{Ib[k](b,i),j&&j.possiblyAsync||!i.callback||i.callback()}catch(a){throw Ia(b,a),a}},parseInput_:function(a,b,c){b.eatWhile(":"),b.eat("%")?(c.line=a.firstLine(),c.lineEnd=a.lastLine()):(c.line=this.parseLineSpec_(a,b),void 0!==c.line&&b.eat(",")&&(c.lineEnd=this.parseLineSpec_(a,b)));var d=b.match(/^(\w+)/);return d?c.commandName=d[1]:c.commandName=b.match(/.*/)[0],c},parseLineSpec_:function(a,b){var c=b.match(/^(\d+)/);if(c)return parseInt(c[1],10)-1;switch(b.next()){case".":return this.parseLineSpecOffset_(b,a.getCursor().line);case"$":return this.parseLineSpecOffset_(b,a.lastLine());case"'":var d=b.next(),e=Ta(a,a.state.vim,d);if(!e)throw new Error("Mark not set");return this.parseLineSpecOffset_(b,e.line);case"-":case"+":return b.backUp(1),this.parseLineSpecOffset_(b,a.getCursor().line);default:return void b.backUp(1)}},parseLineSpecOffset_:function(a,b){var c=a.match(/^([+-])?(\d+)/);if(c){var d=parseInt(c[2],10);"-"==c[1]?b-=d:b+=d}return b},parseCommandArgs_:function(a,b,c){if(!a.eol()){b.argString=a.match(/.*/)[0];var d=c.argDelimiter||/\s+/,e=Y(b.argString).split(d);e.length&&e[0]&&(b.args=e)}},matchCommand_:function(a){for(var b=a.length;b>0;b--){var c=a.substring(0,b);if(this.commandMap_[c]){var d=this.commandMap_[c];if(0===d.name.indexOf(a))return d}}return null},buildCommandMap_:function(){this.commandMap_={};for(var a=0;a<c.length;a++){var b=c[a],d=b.shortName||b.name;this.commandMap_[d]=b}},map:function(a,c,d){if(":"!=a&&":"==a.charAt(0)){if(d)throw Error("Mode not supported for ex mappings");var e=a.substring(1);":"!=c&&":"==c.charAt(0)?this.commandMap_[e]={name:e,type:"exToEx",toInput:c.substring(1),user:!0}:this.commandMap_[e]={name:e,type:"exToKey",toKeys:c,user:!0}}else if(":"!=c&&":"==c.charAt(0)){var f={keys:a,type:"keyToEx",exArgs:{input:c.substring(1)}};d&&(f.context=d),b.unshift(f)}else{var f={keys:a,type:"keyToKey",toKeys:c};d&&(f.context=d),b.unshift(f)}},unmap:function(a,c){if(":"!=a&&":"==a.charAt(0)){if(c)throw Error("Mode not supported for ex mappings");var d=a.substring(1);if(this.commandMap_[d]&&this.commandMap_[d].user)return void delete this.commandMap_[d]}else for(var e=a,f=0;f<b.length;f++)if(e==b[f].keys&&b[f].context===c)return void b.splice(f,1);throw Error("No such mapping.")}};var Ib={colorscheme:function(a,b){return!b.args||b.args.length<1?void Ia(a,a.getOption("theme")):void a.setOption("theme",b.args[0])},map:function(a,b,c){var d=b.args;return!d||d.length<2?void(a&&Ia(a,"Invalid mapping: "+b.input)):void Jb.map(d[0],d[1],c)},imap:function(a,b){this.map(a,b,"insert")},nmap:function(a,b){this.map(a,b,"normal")},vmap:function(a,b){this.map(a,b,"visual")},unmap:function(a,b,c){var d=b.args;return!d||d.length<1?void(a&&Ia(a,"No such mapping: "+b.input)):void Jb.unmap(d[0],c)},move:function(a,b){yb.processCommand(a,a.state.vim,{type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0},repeatOverride:b.line+1})},set:function(a,b){var c=b.args,d=b.setCfg||{};if(!c||c.length<1)return void(a&&Ia(a,"Invalid mapping: "+b.input));var e=c[0].split("="),f=e[0],g=e[1],h=!1;if("?"==f.charAt(f.length-1)){if(g)throw Error("Trailing characters: "+b.argString);f=f.substring(0,f.length-1),h=!0}void 0===g&&"no"==f.substring(0,2)&&(f=f.substring(2),g=!1);var i=sb[f]&&"boolean"==sb[f].type;if(i&&void 0==g&&(g=!0),!i&&void 0===g||h){var j=v(f,a,d);j instanceof Error?Ia(a,j.message):j===!0||j===!1?Ia(a," "+(j?"":"no")+f):Ia(a,"  "+f+"="+j)}else{var k=u(f,g,a,d);k instanceof Error&&Ia(a,k.message)}},setlocal:function(a,b){b.setCfg={scope:"local"},this.set(a,b)},setglobal:function(a,b){b.setCfg={scope:"global"},this.set(a,b)},registers:function(a,b){var c=b.args,d=vb.registerController.registers,e="----------Registers----------<br><br>";if(c){var f;c=c.join("");for(var g=0;g<c.length;g++)if(f=c.charAt(g),vb.registerController.isValidRegister(f)){var h=d[f]||new B;e+='"'+f+"    "+h.toString()+"<br>"}}else for(var f in d){var i=d[f].toString();i.length&&(e+='"'+f+"    "+i+"<br>")}Ia(a,e)},sort:function(b,c){function e(){if(c.argString){var b=new a.StringStream(c.argString);if(b.eat("!")&&(h=!0),b.eol())return;if(!b.eatSpace())return"Invalid arguments";var d=b.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);if(!d&&!b.eol())return"Invalid arguments";if(d[1]){i=d[1].indexOf("i")!=-1,j=d[1].indexOf("u")!=-1;var e=d[1].indexOf("d")!=-1||d[1].indexOf("n")!=-1&&1,f=d[1].indexOf("x")!=-1&&1,g=d[1].indexOf("o")!=-1&&1;if(e+f+g>1)return"Invalid arguments";k=e&&"decimal"||f&&"hex"||g&&"octal"}d[2]&&(l=new RegExp(d[2].substr(1,d[2].length-2),i?"i":""))}}function f(a,b){if(h){var c;c=a,a=b,b=c}i&&(a=a.toLowerCase(),b=b.toLowerCase());var d=k&&s.exec(a),e=k&&s.exec(b);return d?(d=parseInt((d[1]+d[2]).toLowerCase(),t),e=parseInt((e[1]+e[2]).toLowerCase(),t),d-e):a<b?-1:1}function g(a,b){if(h){var c;c=a,a=b,b=c}return i&&(a[0]=a[0].toLowerCase(),b[0]=b[0].toLowerCase()),a[0]<b[0]?-1:1}var h,i,j,k,l,m=e();if(m)return void Ia(b,m+": "+c.argString);var n=c.line||b.firstLine(),o=c.lineEnd||c.line||b.lastLine();if(n!=o){var p=d(n,0),q=d(o,X(b,o)),r=b.getRange(p,q).split("\n"),s=l?l:"decimal"==k?/(-?)([\d]+)/:"hex"==k?/(-?)(?:0x)?([0-9a-f]+)/i:"octal"==k?/([0-7]+)/:null,t="decimal"==k?10:"hex"==k?16:"octal"==k?8:null,u=[],v=[];if(k||l)for(var w=0;w<r.length;w++){var x=l?r[w].match(l):null;x&&""!=x[0]?u.push(x):!l&&s.exec(r[w])?u.push(r[w]):v.push(r[w])}else v=r;if(u.sort(l?g:f),l)for(var w=0;w<u.length;w++)u[w]=u[w].input;else k||v.sort(f);if(r=h?u.concat(v):v.concat(u),j){var y,z=r;r=[];for(var w=0;w<z.length;w++)z[w]!=y&&r.push(z[w]),y=z[w]}b.replaceRange(r.join("\n"),p,q)}},global:function(a,b){var c=b.argString;if(!c)return void Ia(a,"Regular Expression missing from global");var d,e=void 0!==b.line?b.line:a.firstLine(),f=b.lineEnd||b.line||a.lastLine(),g=Ca(c),h=c;if(g.length&&(h=g[0],d=g.slice(1,g.length).join("/")),h)try{Ma(a,h,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+h)}for(var i=Aa(a).getQuery(),j=[],k="",l=e;l<=f;l++){var m=i.test(a.getLine(l));m&&(j.push(l+1),k+=a.getLine(l)+"<br>")}if(!d)return void Ia(a,k);var n=0,o=function(){if(n<j.length){var b=j[n]+d;Jb.processCommand(a,b,{callback:o})}n++};o()},substitute:function(a,b){if(!a.getSearchCursor)throw new Error("Search feature not available. Requires searchcursor.js or any other getSearchCursor implementation.");var c,e,f,g,h=b.argString,i=h?Ca(h):[],j="",k=!1,l=!1;if(i.length)c=i[0],j=i[1],c&&"$"===c[c.length-1]&&(c=c.slice(0,c.length-1)+"\\n",j=j?j+"\n":"\n"),void 0!==j&&(j=v("pcre")?Ga(j):Fa(j),vb.lastSubstituteReplacePart=j),e=i[2]?i[2].split(" "):[];else if(h&&h.length)return void Ia(a,"Substitutions should be of the form :s/pattern/replace/");if(e&&(f=e[0],g=parseInt(e[1]),f&&(f.indexOf("c")!=-1&&(k=!0,f.replace("c","")),f.indexOf("g")!=-1&&(l=!0,f.replace("g","")),c=c+"/"+f)),c)try{Ma(a,c,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+c)}if(j=j||vb.lastSubstituteReplacePart,void 0===j)return void Ia(a,"No previous substitute regular expression");var m=Aa(a),n=m.getQuery(),o=void 0!==b.line?b.line:a.getCursor().line,p=b.lineEnd||o;o==a.firstLine()&&p==a.lastLine()&&(p=1/0),g&&(o=p,p=o+g-1);var q=J(a,d(o,0)),r=a.getSearchCursor(n,q);Ua(a,k,l,o,p,r,n,j,b.callback)},redo:a.commands.redo,undo:a.commands.undo,write:function(b){a.commands.save?a.commands.save(b):b.save&&b.save()},nohlsearch:function(a){Qa(a)},yank:function(a){var b=R(a.getCursor()),c=b.line,d=a.getLine(c);vb.registerController.pushText("0","yank",d,!0,!0)},delmarks:function(b,c){if(!c.argString||!Y(c.argString))return void Ia(b,"Argument required");for(var d=b.state.vim,e=new a.StringStream(Y(c.argString));!e.eol();){e.eatSpace();var f=e.pos;if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var g=e.next();if(e.match("-",!0)){if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var h=g,i=e.next();if(!(n(h)&&n(i)||q(h)&&q(i)))return void Ia(b,"Invalid argument: "+h+"-");var j=h.charCodeAt(0),k=i.charCodeAt(0);if(j>=k)return void Ia(b,"Invalid argument: "+c.argString.substring(f));for(var l=0;l<=k-j;l++){var m=String.fromCharCode(j+l);delete d.marks[m]}}else delete d.marks[g]}}},Jb=new Hb;return a.keyMap.vim={attach:h,detach:g,call:i},t("insertModeEscKeysTimeout",200,"number"),a.keyMap["vim-insert"]={fallthrough:["default"],attach:h,detach:g,call:i},a.keyMap["vim-replace"]={Backspace:"goCharLeft",fallthrough:["vim-insert"],attach:h,detach:g,call:i},y(),xb};a.Vim=e()}));
\ No newline at end of file
diff --git a/media/editors/codemirror/lib/addons.js b/media/editors/codemirror/lib/addons.js
index b4050aa2d19a8..daa976ab339c3 100644
--- a/media/editors/codemirror/lib/addons.js
+++ b/media/editors/codemirror/lib/addons.js
@@ -555,12 +555,21 @@
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
 
-  function findMatchingBracket(cm, where, strict, config) {
+  function findMatchingBracket(cm, where, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
-    var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
+    var afterCursor = config && config.afterCursor
+    if (afterCursor == null)
+      afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+
+    // A cursor is defined as between two characters, but in in vim command mode
+    // (i.e. not insert mode), the cursor is visually represented as a
+    // highlighted box on top of the 2nd character. Otherwise, we allow matches
+    // from before or after the cursor.
+    var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
+        matching[line.text.charAt(++pos)];
     if (!match) return null;
     var dir = match.charAt(1) == ">" ? 1 : -1;
-    if (strict && (dir > 0) != (pos == where.ch)) return null;
+    if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
     var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
@@ -608,7 +617,7 @@
     var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
-      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
       if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
@@ -652,8 +661,17 @@
   });
 
   CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
-    return findMatchingBracket(this, pos, strict, config);
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+    // Backwards-compatibility kludge
+    if (oldConfig || typeof config == "boolean") {
+      if (!oldConfig) {
+        config = config ? {strict: true} : null
+      } else {
+        oldConfig.strict = config
+        config = oldConfig
+      }
+    }
+    return findMatchingBracket(this, pos, config)
   });
   CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
     return scanForBracket(this, pos, dir, style, config);
@@ -900,6 +918,8 @@ CodeMirror.registerHelper("fold", "include", function(cm, start) {
       widget = document.createElement("span");
       widget.appendChild(text);
       widget.className = "CodeMirror-foldmarker";
+    } else if (widget) {
+      widget = widget.cloneNode(true)
     }
     return widget;
   }
@@ -2048,189 +2068,289 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"))
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror"], mod)
   else // Plain browser env
-    mod(CodeMirror);
+    mod(CodeMirror)
 })(function(CodeMirror) {
-  "use strict";
-  var Pos = CodeMirror.Pos;
+  "use strict"
+  var Pos = CodeMirror.Pos
+
+  function regexpFlags(regexp) {
+    var flags = regexp.flags
+    return flags != null ? flags : (regexp.ignoreCase ? "i" : "")
+      + (regexp.global ? "g" : "")
+      + (regexp.multiline ? "m" : "")
+  }
+
+  function ensureGlobal(regexp) {
+    return regexp.global ? regexp : new RegExp(regexp.source, regexpFlags(regexp) + "g")
+  }
+
+  function maybeMultiline(regexp) {
+    return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source)
+  }
 
-  function SearchCursor(doc, query, pos, caseFold) {
-    this.atOccurrence = false; this.doc = doc;
-    if (caseFold == null && typeof query == "string") caseFold = false;
+  function searchRegexpForward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
+      regexp.lastIndex = ch
+      var string = doc.getLine(line), match = regexp.exec(string)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpForwardMultiline(doc, regexp, start) {
+    if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
+
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, last = doc.lastLine(); line <= last;) {
+      // This grows the search buffer in exponentially-sized chunks
+      // between matches, so that nearby matches are fast and don't
+      // require concatenating the whole document (in case we're
+      // searching for something that has tons of matches), but at the
+      // same time, the amount of retries is limited.
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line++)
+        string = string == null ? curLine : string + "\n" + curLine
+      }
+      chunk = chunk * 2
+      regexp.lastIndex = start.ch
+      var match = regexp.exec(string)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  function lastMatchIn(string, regexp) {
+    var cutOff = 0, match
+    for (;;) {
+      regexp.lastIndex = cutOff
+      var newMatch = regexp.exec(string)
+      if (!newMatch) return match
+      match = newMatch
+      cutOff = match.index + (match[0].length || 1)
+      if (cutOff == string.length) return match
+    }
+  }
+
+  function searchRegexpBackward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
+      var string = doc.getLine(line)
+      if (ch > -1) string = string.slice(0, ch)
+      var match = lastMatchIn(string, regexp)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
 
-    pos = pos ? doc.clipPos(pos) : Pos(0, 0);
-    this.pos = {from: pos, to: pos};
+  function searchRegexpBackwardMultiline(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, first = doc.firstLine(); line >= first;) {
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line--)
+        string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+      }
+      chunk *= 2
+
+      var match = lastMatchIn(string, regexp)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = line + before.length, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  var doFold, noFold
+  if (String.prototype.normalize) {
+    doFold = function(str) { return str.normalize("NFD").toLowerCase() }
+    noFold = function(str) { return str.normalize("NFD") }
+  } else {
+    doFold = function(str) { return str.toLowerCase() }
+    noFold = function(str) { return str }
+  }
+
+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos, foldFunc) {
+    if (orig.length == folded.length) return pos
+    for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) {
+      if (min == max) return min
+      var mid = (min + max) >> 1
+      var len = foldFunc(orig.slice(0, mid)).length
+      if (len == pos) return mid
+      else if (len > pos) max = mid
+      else min = mid + 1
+    }
+  }
+
+  function searchStringForward(doc, query, start, caseFold) {
+    // Empty string would match anything and never progress, so we
+    // define it to match nothing instead.
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) {
+      var orig = doc.getLine(line).slice(ch), string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.indexOf(lines[0])
+        if (found == -1) continue search
+        var start = adjustPos(orig, string, found, fold) + ch
+        return {from: Pos(line, adjustPos(orig, string, found, fold) + ch),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch)}
+      } else {
+        var cutFrom = string.length - lines[0].length
+        if (string.slice(cutFrom) != lines[0]) continue search
+        for (var i = 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(line + i)) != lines[i]) continue search
+        var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
+        if (end.slice(0, lastLine.length) != lastLine) continue search
+        return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
+                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function searchStringBackward(doc, query, start, caseFold) {
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) {
+      var orig = doc.getLine(line)
+      if (ch > -1) orig = orig.slice(0, ch)
+      var string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.lastIndexOf(lines[0])
+        if (found == -1) continue search
+        return {from: Pos(line, adjustPos(orig, string, found, fold)),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold))}
+      } else {
+        var lastLine = lines[lines.length - 1]
+        if (string.slice(0, lastLine.length) != lastLine) continue search
+        for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(start + i)) != lines[i]) continue search
+        var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
+        if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
+        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)),
+                to: Pos(line, adjustPos(orig, string, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function SearchCursor(doc, query, pos, options) {
+    this.atOccurrence = false
+    this.doc = doc
+    pos = pos ? doc.clipPos(pos) : Pos(0, 0)
+    this.pos = {from: pos, to: pos}
+
+    var caseFold
+    if (typeof options == "object") {
+      caseFold = options.caseFold
+    } else { // Backwards compat for when caseFold was the 4th argument
+      caseFold = options
+      options = null
+    }
 
-    // The matches method is filled in based on the type of query.
-    // It takes a position and a direction, and returns an object
-    // describing the next occurrence of the query, or null if no
-    // more matches were found.
-    if (typeof query != "string") { // Regexp match
-      if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
+    if (typeof query == "string") {
+      if (caseFold == null) caseFold = false
       this.matches = function(reverse, pos) {
-        if (reverse) {
-          query.lastIndex = 0;
-          var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start;
-          for (;;) {
-            query.lastIndex = cutOff;
-            var newMatch = query.exec(line);
-            if (!newMatch) break;
-            match = newMatch;
-            start = match.index;
-            cutOff = match.index + (match[0].length || 1);
-            if (cutOff == line.length) break;
-          }
-          var matchLen = (match && match[0].length) || 0;
-          if (!matchLen) {
-            if (start == 0 && line.length == 0) {match = undefined;}
-            else if (start != doc.getLine(pos.line).length) {
-              matchLen++;
-            }
-          }
-        } else {
-          query.lastIndex = pos.ch;
-          var line = doc.getLine(pos.line), match = query.exec(line);
-          var matchLen = (match && match[0].length) || 0;
-          var start = match && match.index;
-          if (start + matchLen != line.length && !matchLen) matchLen = 1;
-        }
-        if (match && matchLen)
-          return {from: Pos(pos.line, start),
-                  to: Pos(pos.line, start + matchLen),
-                  match: match};
-      };
-    } else { // String query
-      var origQuery = query;
-      if (caseFold) query = query.toLowerCase();
-      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
-      var target = query.split("\n");
-      // Different methods for single-line and multi-line queries
-      if (target.length == 1) {
-        if (!query.length) {
-          // Empty string would match anything and never progress, so
-          // we define it to match nothing instead.
-          this.matches = function() {};
-        } else {
-          this.matches = function(reverse, pos) {
-            if (reverse) {
-              var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
-              var match = line.lastIndexOf(query);
-              if (match > -1) {
-                match = adjustPos(orig, line, match);
-                return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-              }
-             } else {
-               var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
-               var match = line.indexOf(query);
-               if (match > -1) {
-                 match = adjustPos(orig, line, match) + pos.ch;
-                 return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-               }
-            }
-          };
+        return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
+      }
+    } else {
+      query = ensureGlobal(query)
+      if (!options || options.multiline !== false)
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)
         }
-      } else {
-        var origTarget = origQuery.split("\n");
+      else
         this.matches = function(reverse, pos) {
-          var last = target.length - 1;
-          if (reverse) {
-            if (pos.line - (target.length - 1) < doc.firstLine()) return;
-            if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
-            var to = Pos(pos.line, origTarget[last].length);
-            for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            return {from: Pos(ln, cut), to: to};
-          } else {
-            if (pos.line + (target.length - 1) > doc.lastLine()) return;
-            var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            var from = Pos(pos.line, cut);
-            for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
-            return {from: from, to: Pos(ln, origTarget[last].length)};
-          }
-        };
-      }
+          return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
+        }
     }
   }
 
   SearchCursor.prototype = {
-    findNext: function() {return this.find(false);},
-    findPrevious: function() {return this.find(true);},
+    findNext: function() {return this.find(false)},
+    findPrevious: function() {return this.find(true)},
 
     find: function(reverse) {
-      var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
-      function savePosAndFail(line) {
-        var pos = Pos(line, 0);
-        self.pos = {from: pos, to: pos};
-        self.atOccurrence = false;
-        return false;
-      }
+      var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
 
-      for (;;) {
-        if (this.pos = this.matches(reverse, pos)) {
-          this.atOccurrence = true;
-          return this.pos.match || true;
-        }
+      // Implements weird auto-growing behavior on null-matches for
+      // backwards-compatiblity with the vim code (unfortunately)
+      while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
         if (reverse) {
-          if (!pos.line) return savePosAndFail(0);
-          pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length);
-        }
-        else {
-          var maxLine = this.doc.lineCount();
-          if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
-          pos = Pos(pos.line + 1, 0);
+          if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
+          else if (result.from.line == this.doc.firstLine()) result = null
+          else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+        } else {
+          if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
+          else if (result.to.line == this.doc.lastLine()) result = null
+          else result = this.matches(reverse, Pos(result.to.line + 1, 0))
         }
       }
+
+      if (result) {
+        this.pos = result
+        this.atOccurrence = true
+        return this.pos.match || true
+      } else {
+        var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0)
+        this.pos = {from: end, to: end}
+        return this.atOccurrence = false
+      }
     },
 
-    from: function() {if (this.atOccurrence) return this.pos.from;},
-    to: function() {if (this.atOccurrence) return this.pos.to;},
+    from: function() {if (this.atOccurrence) return this.pos.from},
+    to: function() {if (this.atOccurrence) return this.pos.to},
 
     replace: function(newText, origin) {
-      if (!this.atOccurrence) return;
-      var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
+      if (!this.atOccurrence) return
+      var lines = CodeMirror.splitLines(newText)
+      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin)
       this.pos.to = Pos(this.pos.from.line + lines.length - 1,
-                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
-    }
-  };
-
-  // Maps a position in a case-folded line back to a position in the original line
-  // (compensating for codepoints increasing in number during folding)
-  function adjustPos(orig, folded, pos) {
-    if (orig.length == folded.length) return pos;
-    for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = orig.slice(0, pos1).toLowerCase().length;
-      if (len1 < pos) ++pos1;
-      else if (len1 > pos) --pos1;
-      else return pos1;
+                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0))
     }
   }
 
   CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this.doc, query, pos, caseFold);
-  });
+    return new SearchCursor(this.doc, query, pos, caseFold)
+  })
   CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this, query, pos, caseFold);
-  });
+    return new SearchCursor(this, query, pos, caseFold)
+  })
 
   CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
-    var ranges = [];
-    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
+    var ranges = []
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold)
     while (cur.findNext()) {
-      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
-      ranges.push({anchor: cur.from(), head: cur.to()});
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break
+      ranges.push({anchor: cur.from(), head: cur.to()})
     }
     if (ranges.length)
-      this.setSelections(ranges, 0);
-  });
+      this.setSelections(ranges, 0)
+  })
 });
 
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
@@ -2567,7 +2687,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
 
       if (!next || next.attach != attachVimMap)
-        leaveVimMode(cm, false);
+        leaveVimMode(cm);
     }
     function attachVimMap(cm, prev) {
       if (this == CodeMirror.keyMap.vim)
@@ -2719,11 +2839,11 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.type == 'boolean') {
         if (value && value !== true) {
-          throw Error('Invalid argument: ' + name + '=' + value);
+          return new Error('Invalid argument: ' + name + '=' + value);
         } else if (value !== false) {
           // Boolean options are set to true if value is not defined.
           value = true;
@@ -2751,7 +2871,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.callback) {
         var local = cm && option.callback(undefined, cm);
@@ -2957,9 +3077,9 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({}),
         // search history buffer
-        searchHistoryController: new HistoryController({}),
+        searchHistoryController: new HistoryController(),
         // ex Command history buffer
-        exCommandHistoryController : new HistoryController({})
+        exCommandHistoryController : new HistoryController()
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -3266,7 +3386,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
      * for a reference implementation.
      */
     function defineRegister(name, register) {
-      var registers = vimGlobalState.registerController.registers[name];
+      var registers = vimGlobalState.registerController.registers;
       if (!name || name.length != 1) {
         throw Error('Register name must be 1 character');
       }
@@ -3294,9 +3414,6 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise, blockwise) {
-        if (linewise && text.charAt(0) == '\n') {
-          text = text.slice(1) + '\n';
-        }
         if (linewise && text.charAt(text.length - 1) !== '\n'){
           text += '\n';
         }
@@ -3418,7 +3535,9 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           }
         }
         if (bestMatch.keys.slice(-11) == '<character>') {
-          inputState.selectedCharacter = lastChar(keys);
+          var character = lastChar(keys);
+          if (!character) return {type: 'none'};
+          inputState.selectedCharacter = character;
         }
         return {type: 'full', command: bestMatch};
       },
@@ -4144,16 +4263,16 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
         var symbol;
-        do {
-          symbol = lineText.charAt(ch++);
+        for (; ch < lineText.length; ch++) {
+          symbol = lineText.charAt(ch);
           if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(Pos(line, ch));
+            var style = cm.getTokenTypeAt(Pos(line, ch + 1));
             if (style !== "string" && style !== "comment") {
               break;
             }
           }
-        } while (symbol);
-        if (symbol) {
+        }
+        if (ch < lineText.length) {
           var matched = cm.findMatchingBracket(Pos(line, ch));
           return matched.to;
         } else {
@@ -4494,7 +4613,9 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       enterMacroRecordMode: function(cm, actionArgs) {
         var macroModeState = vimGlobalState.macroModeState;
         var registerName = actionArgs.selectedCharacter;
-        macroModeState.enterMacroRecordMode(cm, registerName);
+        if (vimGlobalState.registerController.isValidRegister(registerName)) {
+          macroModeState.enterMacroRecordMode(cm, registerName);
+        }
       },
       toggleOverwrite: function(cm) {
         if (!cm.state.overwrite) {
@@ -5012,7 +5133,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       }
     }
     function lastChar(keys) {
-      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var match = /^.*(<[^>]+>)$/.exec(keys);
       var selectedCharacter = match ? match[1] : keys.slice(-1);
       if (selectedCharacter.length > 1){
         switch(selectedCharacter){
@@ -5023,6 +5144,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
             selectedCharacter=' ';
             break;
           default:
+            selectedCharacter='';
             break;
         }
       }
@@ -5123,7 +5245,6 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
         selections.push(range);
       }
-      primIndex = head.line == lastLine ? selections.length - 1 : 0;
       cm.setSelections(selections);
       selectionEnd.ch = headCh;
       base.ch = baseCh;
@@ -6391,23 +6512,42 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       parseLineSpec_: function(cm, inputStream) {
         var numberMatch = inputStream.match(/^(\d+)/);
         if (numberMatch) {
+          // Absolute line number plus offset (N+M or N-M) is probably a typo,
+          // not something the user actually wanted. (NB: vim does allow this.)
           return parseInt(numberMatch[1], 10) - 1;
         }
         switch (inputStream.next()) {
           case '.':
-            return cm.getCursor().line;
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           case '$':
-            return cm.lastLine();
+            return this.parseLineSpecOffset_(inputStream, cm.lastLine());
           case '\'':
             var markName = inputStream.next();
             var markPos = getMarkPos(cm, cm.state.vim, markName);
             if (!markPos) throw new Error('Mark not set');
-            return markPos.line;
+            return this.parseLineSpecOffset_(inputStream, markPos.line);
+          case '-':
+          case '+':
+            inputStream.backUp(1);
+            // Offset is relative to current line if not otherwise specified.
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           default:
             inputStream.backUp(1);
             return undefined;
         }
       },
+      parseLineSpecOffset_: function(inputStream, line) {
+        var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
+        if (offsetMatch) {
+          var offset = parseInt(offsetMatch[2], 10);
+          if (offsetMatch[1] == "-") {
+            line -= offset;
+          } else {
+            line += offset;
+          }
+        }
+        return line;
+      },
       parseCommandArgs_: function(inputStream, params, command) {
         if (inputStream.eol()) {
           return;
@@ -6587,13 +6727,18 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         // If no value is provided, then we assume this is a get.
         if (!optionIsBoolean && value === undefined || forceGet) {
           var oldValue = getOption(optionName, cm, setCfg);
-          if (oldValue === true || oldValue === false) {
+          if (oldValue instanceof Error) {
+            showConfirm(cm, oldValue.message);
+          } else if (oldValue === true || oldValue === false) {
             showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
           } else {
             showConfirm(cm, '  ' + optionName + '=' + oldValue);
           }
         } else {
-          setOption(optionName, value, cm, setCfg);
+          var setOptionReturn = setOption(optionName, value, cm, setCfg);
+          if (setOptionReturn instanceof Error) {
+            showConfirm(cm, setOptionReturn.message);
+          }
         }
       },
       setlocal: function (cm, params) {
@@ -6792,6 +6937,10 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         if (tokens.length) {
           regexPart = tokens[0];
           replacePart = tokens[1];
+          if (regexPart && regexPart[regexPart.length - 1] === '$') {
+            regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
+            replacePart = replacePart ? replacePart + '\n' : '\n';
+          }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart);
@@ -7211,7 +7360,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
      * Listens for changes made in insert mode.
      * Should only be active in insert mode.
      */
-    function onChange(_cm, changeObj) {
+    function onChange(cm, changeObj) {
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       if (!macroModeState.isPlaying) {
@@ -7224,7 +7373,11 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
               lastChange.changes = [];
               lastChange.maybeReset = false;
             }
-            lastChange.changes.push(text);
+            if (cm.state.overwrite && !/\n/.test(text)) {
+                lastChange.changes.push([text]);
+            } else {
+                lastChange.changes.push(text);
+            }
           }
           // Change objects may be chained with next.
           changeObj = changeObj.next;
@@ -7406,9 +7559,13 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           var change = changes[j];
           if (change instanceof InsertModeKey) {
             CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
-          } else {
+          } else if (typeof change == "string") {
             var cur = cm.getCursor();
             cm.replaceRange(change, cur, cur);
+          } else {
+            var start = cm.getCursor();
+            var end = offsetCursor(start, 0, change[0].length);
+            cm.replaceRange(change[0], start, end);
           }
         }
       }
diff --git a/media/editors/codemirror/lib/addons.min.js b/media/editors/codemirror/lib/addons.min.js
index 9f9a5eb05a30f..ae7bd034aa9b3 100644
--- a/media/editors/codemirror/lib/addons.min.js
+++ b/media/editors/codemirror/lib/addons.min.js
@@ -1,4 +1,4 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.getWrapperElement();a.state.fullScreenRestore={scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,width:b.style.width,height:b.style.height},b.style.width="",b.style.height="auto",b.className+=" CodeMirror-fullscreen",document.documentElement.style.overflow="hidden",a.refresh()}function c(a){var b=a.getWrapperElement();b.className=b.className.replace(/\s*CodeMirror-fullscreen\b/,""),document.documentElement.style.overflow="";var c=a.state.fullScreenRestore;b.style.width=c.width,b.style.height=c.height,window.scrollTo(c.scrollLeft,c.scrollTop),a.refresh()}a.defineOption("fullScreen",!1,(function(d,e,f){f==a.Init&&(f=!1),!f!=!e&&(e?b(d):c(d))}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,c,d){this.cm=a,this.node=b,this.options=c,this.height=d,this.cleared=!1}function c(a){var b=a.getWrapperElement(),c=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,d=parseInt(c.height),e=a.state.panels={setHeight:b.style.height,heightLeft:d,panels:0,wrapper:document.createElement("div")};b.parentNode.insertBefore(e.wrapper,b);var f=a.hasFocus();e.wrapper.appendChild(b),f&&a.focus(),a._setSize=a.setSize,null!=d&&(a.setSize=function(b,c){if(null==c)return this._setSize(b,c);if(e.setHeight=c,"number"!=typeof c){var f=/^(\d+\.?\d*)px$/.exec(c);f?c=Number(f[1]):(e.wrapper.style.height=c,c=e.wrapper.offsetHeight,e.wrapper.style.height="")}a._setSize(b,e.heightLeft+=c-d),d=c})}function d(a){var b=a.state.panels;a.state.panels=null;var c=a.getWrapperElement();b.wrapper.parentNode.replaceChild(c,b.wrapper),c.style.height=b.setHeight,a.setSize=a._setSize,a.setSize()}function e(a,b){for(var c=b.nextSibling;c;c=c.nextSibling)if(c==a.getWrapperElement())return!0;return!1}a.defineExtension("addPanel",(function(a,d){d=d||{},this.state.panels||c(this);var f=this.state.panels,g=f.wrapper,h=this.getWrapperElement();d.after instanceof b&&!d.after.cleared?g.insertBefore(a,d.before.node.nextSibling):d.before instanceof b&&!d.before.cleared?g.insertBefore(a,d.before.node):d.replace instanceof b&&!d.replace.cleared?(g.insertBefore(a,d.replace.node),d.replace.clear()):"bottom"==d.position?g.appendChild(a):"before-bottom"==d.position?g.insertBefore(a,h.nextSibling):"after-top"==d.position?g.insertBefore(a,h):g.insertBefore(a,g.firstChild);var i=d&&d.height||a.offsetHeight;return this._setSize(null,f.heightLeft-=i),f.panels++,d.stable&&e(this,a)&&this.scrollTo(null,this.getScrollInfo().top+i),new b(this,a,d,i)})),b.prototype.clear=function(){if(!this.cleared){this.cleared=!0;var a=this.cm.state.panels;this.cm._setSize(null,a.heightLeft+=this.height),this.options.stable&&e(this.cm,this.node)&&this.cm.scrollTo(null,this.cm.getScrollInfo().top-this.height),a.wrapper.removeChild(this.node),0==--a.panels&&d(this.cm)}},b.prototype.changed=function(a){var b=null==a?this.node.offsetHeight:a,c=this.cm.state.panels;this.cm._setSize(null,c.heightLeft-=b-this.height),this.height=b}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b){return"pairs"==b&&"string"==typeof a?a:"object"==typeof a&&null!=a[b]?a[b]:m[b]}function c(a){return function(b){return h(b,a)}}function d(a){var b=a.state.closeBrackets;if(!b||b.override)return b;var c=a.getModeAt(a.getCursor());return c.closeBrackets||b}function e(c){var e=d(c);if(!e||c.getOption("disableInput"))return a.Pass;for(var f=b(e,"pairs"),g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=j(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}for(var h=g.length-1;h>=0;h--){var k=g[h].head;c.replaceRange("",n(k.line,k.ch-1),n(k.line,k.ch+1),"+delete")}}function f(c){var e=d(c),f=e&&b(e,"explode");if(!f||c.getOption("disableInput"))return a.Pass;for(var g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=j(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}c.operation((function(){c.replaceSelection("\n\n",null),c.execCommand("goCharLeft"),g=c.listSelections();for(var a=0;a<g.length;a++){var b=g[a].head.line;c.indentLine(b,null,!0),c.indentLine(b+1,null,!0)}}))}function g(b){var c=a.cmpPos(b.anchor,b.head)>0;return{anchor:new n(b.anchor.line,b.anchor.ch+(c?-1:1)),head:new n(b.head.line,b.head.ch+(c?1:-1))}}function h(c,e){var f=d(c);if(!f||c.getOption("disableInput"))return a.Pass;var h=b(f,"pairs"),j=h.indexOf(e);if(j==-1)return a.Pass;for(var m,o=b(f,"triples"),p=h.charAt(j+1)==e,q=c.listSelections(),r=j%2==0,s=0;s<q.length;s++){var t,u=q[s],v=u.head,w=c.getRange(v,n(v.line,v.ch+1));if(r&&!u.empty())t="surround";else if(!p&&r||w!=e)if(p&&v.ch>1&&o.indexOf(e)>=0&&c.getRange(n(v.line,v.ch-2),v)==e+e&&(v.ch<=2||c.getRange(n(v.line,v.ch-3),n(v.line,v.ch-2))!=e))t="addFour";else if(p){if(a.isWordChar(w)||!k(c,v,e))return a.Pass;t="both"}else{if(!r||c.getLine(v.line).length!=v.ch&&!i(w,h)&&!/\s/.test(w))return a.Pass;t="both"}else t=p&&l(c,v)?"both":o.indexOf(e)>=0&&c.getRange(v,n(v.line,v.ch+3))==e+e+e?"skipThree":"skip";if(m){if(m!=t)return a.Pass}else m=t}var x=j%2?h.charAt(j-1):e,y=j%2?e:h.charAt(j+1);c.operation((function(){if("skip"==m)c.execCommand("goCharRight");else if("skipThree"==m)for(var a=0;a<3;a++)c.execCommand("goCharRight");else if("surround"==m){for(var b=c.getSelections(),a=0;a<b.length;a++)b[a]=x+b[a]+y;c.replaceSelections(b,"around"),b=c.listSelections().slice();for(var a=0;a<b.length;a++)b[a]=g(b[a]);c.setSelections(b)}else"both"==m?(c.replaceSelection(x+y,null),c.triggerElectric(x+y),c.execCommand("goCharLeft")):"addFour"==m&&(c.replaceSelection(x+x+x+x,"before"),c.execCommand("goCharRight"))}))}function i(a,b){var c=b.lastIndexOf(a);return c>-1&&c%2==1}function j(a,b){var c=a.getRange(n(b.line,b.ch-1),n(b.line,b.ch+1));return 2==c.length?c:null}function k(b,c,d){var e=b.getLine(c.line),f=b.getTokenAt(c);if(/\bstring2?\b/.test(f.type)||l(b,c))return!1;var g=new a.StringStream(e.slice(0,c.ch)+d+e.slice(c.ch),4);for(g.pos=g.start=f.start;;){var h=b.getMode().token(g,f.state);if(g.pos>=c.ch+1)return/\bstring2?\b/.test(h);g.start=g.pos}}function l(a,b){var c=a.getTokenAt(n(b.line,b.ch+1));return/\bstring/.test(c.type)&&c.start==b.ch}var m={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},n=a.Pos;a.defineOption("autoCloseBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.removeKeyMap(p),b.state.closeBrackets=null),c&&(b.state.closeBrackets=c,b.addKeyMap(p))}));for(var o=m.pairs+"`",p={Backspace:e,Enter:f},q=0;q<o.length;q++)p["'"+o.charAt(q)+"'"]=c(o.charAt(q))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){function b(b){if(b.getOption("disableInput"))return a.Pass;for(var c=b.listSelections(),d=[],i=0;i<c.length;i++){if(!c[i].empty())return a.Pass;var j=c[i].head,k=b.getTokenAt(j),l=a.innerMode(b.getMode(),k.state),m=l.state;if("xml"!=l.mode.name||!m.tagName)return a.Pass;var n=b.getOption("autoCloseTags"),o="html"==l.mode.configuration,p="object"==typeof n&&n.dontCloseTags||o&&g,q="object"==typeof n&&n.indentTags||o&&h,r=m.tagName;k.end>j.ch&&(r=r.slice(0,r.length-k.end+j.ch));var s=r.toLowerCase();if(!r||"string"==k.type&&(k.end!=j.ch||!/[\"\']/.test(k.string.charAt(k.string.length-1))||1==k.string.length)||"tag"==k.type&&"closeTag"==m.type||k.string.indexOf("/")==k.string.length-1||p&&e(p,s)>-1||f(b,r,j,m,!0))return a.Pass;var t=q&&e(q,s)>-1;d[i]={indent:t,text:">"+(t?"\n\n":"")+"</"+r+">",newPos:t?a.Pos(j.line+1,0):a.Pos(j.line,j.ch+1)}}for(var i=c.length-1;i>=0;i--){var u=d[i];b.replaceRange(u.text,c[i].head,c[i].anchor,"+insert");var v=b.listSelections().slice(0);v[i]={head:u.newPos,anchor:u.newPos},b.setSelections(v),u.indent&&(b.indentLine(u.newPos.line,null,!0),b.indentLine(u.newPos.line+1,null,!0))}}function c(b,c){for(var d=b.listSelections(),e=[],g=c?"/":"</",h=0;h<d.length;h++){if(!d[h].empty())return a.Pass;var i=d[h].head,j=b.getTokenAt(i),k=a.innerMode(b.getMode(),j.state),l=k.state;if(c&&("string"==j.type||"<"!=j.string.charAt(0)||j.start!=i.ch-1))return a.Pass;var m;if("xml"!=k.mode.name)if("htmlmixed"==b.getMode().name&&"javascript"==k.mode.name)m=g+"script";else{if("htmlmixed"!=b.getMode().name||"css"!=k.mode.name)return a.Pass;m=g+"style"}else{if(!l.context||!l.context.tagName||f(b,l.context.tagName,i,l))return a.Pass;m=g+l.context.tagName}">"!=b.getLine(i.line).charAt(j.end)&&(m+=">"),e[h]=m}b.replaceSelections(e),d=b.listSelections();for(var h=0;h<d.length;h++)(h==d.length-1||d[h].head.line<d[h+1].head.line)&&b.indentLine(d[h].head.line)}function d(b){return b.getOption("disableInput")?a.Pass:c(b,!0)}function e(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;++c)if(a[c]==b)return c;return-1}function f(b,c,d,e,f){if(!a.scanForClosingTag)return!1;var g=Math.min(b.lastLine()+1,d.line+500),h=a.scanForClosingTag(b,d,null,g);if(!h||h.tag!=c)return!1;for(var i=e.context,j=f?1:0;i&&i.tagName==c;i=i.prev)++j;d=h.to;for(var k=1;k<j;k++){var l=a.scanForClosingTag(b,d,null,g);if(!l||l.tag!=c)return!1;d=l.to}return!0}a.defineOption("autoCloseTags",!1,(function(c,e,f){if(f!=a.Init&&f&&c.removeKeyMap("autoCloseTags"),e){var g={name:"autoCloseTags"};("object"!=typeof e||e.whenClosing)&&(g["'/'"]=function(a){return d(a)}),("object"!=typeof e||e.whenOpening)&&(g["'>'"]=function(a){return b(a)}),c.addKeyMap(g)}}));var g=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],h=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];a.commands.closeTag=function(a){return c(a)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,d,e){var f=a.getLineHandle(b.line),i=b.ch-1,j=i>=0&&h[f.text.charAt(i)]||h[f.text.charAt(++i)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&k>0!=(i==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,i+1)),m=c(a,g(b.line,i+(k>0?1:0)),k,l||null,e);return null==m?null:{from:g(b.line,i),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(c<0?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c!=(c>0?a.lastLine():a.firstLine())&&null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j<i.length;j++){var k=i[j].empty()&&b(a,i[j].head,!1,d);if(k&&a.getLine(k.from.line).length<=e){var l=k.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";h.push(a.markText(k.from,g(k.from.line,k.from.ch+1),{className:l})),k.to&&a.getLine(k.to.line).length<=e&&h.push(a.markText(k.to,g(k.to.line,k.to.ch+1),{className:l}))}}if(h.length){f&&a.state.focused&&a.focus();var m=function(){a.operation((function(){for(var a=0;a<h.length;a++)h[a].clear()}))};if(!c)return m;setTimeout(m,800)}}function e(a){a.operation((function(){i&&(i(),i=null),i=d(a,!1,a.state.matchBrackets)}))}var f=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),g=a.Pos,h={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"},i=null;a.defineOption("matchBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),i&&(i(),i=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))})),a.defineExtension("matchBrackets",(function(){d(this,!0)})),a.defineExtension("findMatchingBracket",(function(a,c,d){return b(this,a,c,d)})),a.defineExtension("scanForBracket",(function(a,b,d,e){return c(this,a,b,d,e)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){"use strict";function b(a){a.state.tagHit&&a.state.tagHit.clear(),a.state.tagOther&&a.state.tagOther.clear(),a.state.tagHit=a.state.tagOther=null}function c(c){c.state.failedTagMatch=!1,c.operation((function(){if(b(c),!c.somethingSelected()){var d=c.getCursor(),e=c.getViewport();e.from=Math.min(e.from,d.line),e.to=Math.max(d.line+1,e.to);var f=a.findMatchingTag(c,d,e);if(f){if(c.state.matchBothTags){var g="open"==f.at?f.open:f.close;g&&(c.state.tagHit=c.markText(g.from,g.to,{className:"CodeMirror-matchingtag"}))}var h="close"==f.at?f.open:f.close;h?c.state.tagOther=c.markText(h.from,h.to,{className:"CodeMirror-matchingtag"}):c.state.failedTagMatch=!0}}}))}function d(a){a.state.failedTagMatch&&c(a)}a.defineOption("matchTags",!1,(function(e,f,g){g&&g!=a.Init&&(e.off("cursorActivity",c),e.off("viewportChange",d),b(e)),f&&(e.state.matchBothTags="object"==typeof f&&f.bothTags,e.on("cursorActivity",c),e.on("viewportChange",d),c(e))})),a.commands.toMatchingTag=function(b){var c=a.findMatchingTag(b,b.getCursor());if(c){var d="close"==c.at?c.open:c.close;d&&b.extendSelection(d.to,d.from)}}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","brace",(function(b,c){function d(d){for(var h=c.ch,i=0;;){var j=h<=0?-1:g.lastIndexOf(d,h-1);if(j!=-1){if(1==i&&j<c.ch)break;if(e=b.getTokenTypeAt(a.Pos(f,j+1)),!/^(comment|string)/.test(e))return j+1;h=j-1}else{if(1==i)break;i=1,h=g.length}}}var e,f=c.line,g=b.getLine(f),h="{",i="}",j=d("{");if(null==j&&(h="[",i="]",j=d("[")),null!=j){var k,l,m=1,n=b.lastLine();a:for(var o=f;o<=n;++o)for(var p=b.getLine(o),q=o==f?j:0;;){var r=p.indexOf(h,q),s=p.indexOf(i,q);if(r<0&&(r=p.length),s<0&&(s=p.length),q=Math.min(r,s),q==p.length)break;if(b.getTokenTypeAt(a.Pos(o,q+1))==e)if(q==r)++m;else if(!--m){k=o,l=q;break a}++q}if(null!=k&&(f!=k||l!=j))return{from:a.Pos(f,j),to:a.Pos(k,l)}}})),a.registerHelper("fold","import",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));if(/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"keyword"!=d.type||"import"!=d.string)return null;for(var e=c,f=Math.min(b.lastLine(),c+10);e<=f;++e){var g=b.getLine(e),h=g.indexOf(";");if(h!=-1)return{startCh:d.end,end:a.Pos(e,h)}}}var e,f=c.line,g=d(f);if(!g||d(f-1)||(e=d(f-2))&&e.end.line==f-1)return null;for(var h=g.end;;){var i=d(h.line+1);if(null==i)break;h=i.end}return{from:b.clipPos(a.Pos(f,g.startCh+1)),to:h}})),a.registerHelper("fold","include",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));return/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"meta"==d.type&&"#include"==d.string.slice(0,8)?d.start+8:void 0}var e=c.line,f=d(e);if(null==f||null!=d(e-1))return null;for(var g=e;;){var h=d(g+1);if(null==h)break;++g}return{from:a.Pos(e,f+1),to:b.clipPos(a.Pos(g))}}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,e,f,g){function h(a){var c=i(b,e);if(!c||c.to.line-c.from.line<j)return null;for(var d=b.findMarksAt(c.from),f=0;f<d.length;++f)if(d[f].__isFold&&"fold"!==g){if(!a)return null;c.cleared=!0,d[f].clear()}return c}if(f&&f.call){var i=f;f=null}else var i=d(b,f,"rangeFinder");"number"==typeof e&&(e=a.Pos(e,0));var j=d(b,f,"minFoldSize"),k=h(!0);if(d(b,f,"scanUp"))for(;!k&&e.line>b.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",(function(b){m.clear(),a.e_preventDefault(b)}));var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",(function(c,d){a.signal(b,"unfold",b,c,d)})),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",(function(a,c,d){b(this,a,c,d)})),a.defineExtension("isFolded",(function(a){for(var b=this.findMarksAt(a),c=0;c<b.length;++c)if(b[c].__isFold)return!0})),a.commands.toggleFold=function(a){a.foldCode(a.getCursor())},a.commands.fold=function(a){a.foldCode(a.getCursor(),null,"fold")},a.commands.unfold=function(a){a.foldCode(a.getCursor(),null,"unfold")},a.commands.foldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"fold")}))},a.commands.unfoldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"unfold")}))},a.registerHelper("fold","combine",(function(){var a=Array.prototype.slice.call(arguments,0);return function(b,c){for(var d=0;d<a.length;++d){var e=a[d](b,c);if(e)return e}}})),a.registerHelper("fold","auto",(function(a,b){for(var c=a.getHelpers(b,"fold"),d=0;d<c.length;d++){var e=c[d](a,b);if(e)return e}}));var e={rangeFinder:a.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};a.defineOption("foldOptions",null),a.defineExtension("foldOption",(function(a,b){return d(this,a,b)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options=a,this.from=this.to=0}function c(a){return a===!0&&(a={}),null==a.gutter&&(a.gutter="CodeMirror-foldgutter"),null==a.indicatorOpen&&(a.indicatorOpen="CodeMirror-foldgutter-open"),null==a.indicatorFolded&&(a.indicatorFolded="CodeMirror-foldgutter-folded"),a}function d(a,b){for(var c=a.findMarks(l(b,0),l(b+1,0)),d=0;d<c.length;++d)if(c[d].__isFold&&c[d].find().from.line==b)return c[d]}function e(a){if("string"==typeof a){var b=document.createElement("div");return b.className=a+" CodeMirror-guttermarker-subtle",b}return a.cloneNode(!0)}function f(a,b,c){var f=a.state.foldGutter.options,g=b,h=a.foldOption(f,"minFoldSize"),i=a.foldOption(f,"rangeFinder");a.eachLine(b,c,(function(b){var c=null;if(d(a,g))c=e(f.indicatorFolded);else{var j=l(g,0),k=i&&i(a,j);k&&k.to.line-k.from.line>=h&&(c=e(f.indicatorOpen))}a.setGutterMarker(b,f.gutter,c),++g}))}function g(a){var b=a.getViewport(),c=a.state.foldGutter;c&&(a.operation((function(){f(a,b.from,b.to)})),c.from=b.from,c.to=b.to)}function h(a,b,c){var e=a.state.foldGutter;if(e){var f=e.options;if(c==f.gutter){var g=d(a,b);g?g.clear():a.foldCode(l(b,0),f.rangeFinder)}}}function i(a){var b=a.state.foldGutter;if(b){var c=b.options;b.from=b.to=0,clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){g(a)}),c.foldOnChangeTimeSpan||600)}}function j(a){var b=a.state.foldGutter;if(b){var c=b.options;clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){var c=a.getViewport();b.from==b.to||c.from-b.to>20||b.from-c.to>20?g(a):a.operation((function(){c.from<b.from&&(f(a,c.from,b.from),b.from=c.from),c.to>b.to&&(f(a,b.to,c.to),b.to=c.to)}))}),c.updateViewportTimeSpan||400)}}function k(a,b){var c=a.state.foldGutter;if(c){var d=b.line;d>=c.from&&d<c.to&&f(a,d,d+1)}}a.defineOption("foldGutter",!1,(function(d,e,f){f&&f!=a.Init&&(d.clearGutter(d.state.foldGutter.options.gutter),d.state.foldGutter=null,d.off("gutterClick",h),d.off("change",i),d.off("viewportChange",j),d.off("fold",k),d.off("unfold",k),d.off("swapDoc",i)),e&&(d.state.foldGutter=new b(c(e)),g(d),d.on("gutterClick",h),d.on("change",i),d.on("viewportChange",j),d.on("fold",k),d.on("unfold",k),d.on("swapDoc",i))}));var l=a.Pos})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line-b.line||a.ch-b.ch}function c(a,b,c,d){this.line=b,this.ch=c,this.cm=a,this.text=a.getLine(b),this.min=d?Math.max(d.from,a.firstLine()):a.firstLine(),this.max=d?Math.min(d.to-1,a.lastLine()):a.lastLine()}function d(a,b){var c=a.cm.getTokenTypeAt(m(a.line,b));return c&&/\btag\b/.test(c)}function e(a){if(!(a.line>=a.max))return a.ch=0,a.text=a.cm.getLine(++a.line),!0}function f(a){if(!(a.line<=a.min))return a.text=a.cm.getLine(--a.line),a.ch=a.text.length,!0}function g(a){for(;;){var b=a.text.indexOf(">",a.ch);if(b==-1){if(e(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),f=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,f?"selfClose":"regular"}a.ch=b+1}}}function h(a){for(;;){var b=a.ch?a.text.lastIndexOf("<",a.ch-1):-1;if(b==-1){if(f(a))continue;return}if(d(a,b+1)){p.lastIndex=b,a.ch=b;var c=p.exec(a.text);if(c&&c.index==b)return c}else a.ch=b}}function i(a){for(;;){p.lastIndex=a.ch;var b=p.exec(a.text);if(!b){if(e(a))continue;return}{if(d(a,b.index+1))return a.ch=b.index+b[0].length,b;a.ch=b.index+1}}}function j(a){for(;;){var b=a.ch?a.text.lastIndexOf(">",a.ch-1):-1;if(b==-1){if(f(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),e=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,e?"selfClose":"regular"}a.ch=b}}}function k(a,b){for(var c=[];;){var d,e=i(a),f=a.line,h=a.ch-(e?e[0].length:0);if(!e||!(d=g(a)))return;if("selfClose"!=d)if(e[1]){for(var j=c.length-1;j>=0;--j)if(c[j]==e[2]){c.length=j;break}if(j<0&&(!b||b==e[2]))return{tag:e[2],from:m(f,h),to:m(a.line,a.ch)}}else c.push(e[2])}}function l(a,b){for(var c=[];;){var d=j(a);if(!d)return;if("selfClose"!=d){var e=a.line,f=a.ch,g=h(a);if(!g)return;if(g[1])c.push(g[2]);else{for(var i=c.length-1;i>=0;--i)if(c[i]==g[2]){c.length=i;break}if(i<0&&(!b||b==g[2]))return{tag:g[2],from:m(a.line,a.ch),to:m(e,f)}}}else h(a)}}var m=a.Pos,n="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",o=n+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",p=new RegExp("<(/?)(["+n+"]["+o+"]*)","g");a.registerHelper("fold","xml",(function(a,b){for(var d=new c(a,b.line,0);;){var e,f=i(d);if(!f||d.line!=b.line||!(e=g(d)))return;if(!f[1]&&"selfClose"!=e){var h=m(d.line,d.ch),j=k(d,f[2]);return j&&{from:h,to:j.from}}}})),a.findMatchingTag=function(a,d,e){var f=new c(a,d.line,d.ch,e);if(f.text.indexOf(">")!=-1||f.text.indexOf("<")!=-1){var i=g(f),j=i&&m(f.line,f.ch),n=i&&h(f);if(i&&n&&!(b(f,d)>0)){var o={from:m(f.line,f.ch),to:j,tag:n[2]};return"selfClose"==i?{open:o,close:null,at:"open"}:n[1]?{open:l(f,n[2]),close:o,at:"close"}:(f=new c(a,j.line,j.ch,e),{open:o,close:k(f,n[2]),at:"open"})}}},a.findEnclosingTag=function(a,b,d,e){for(var f=new c(a,b.line,b.ch,d);;){var g=l(f,e);if(!g)break;var h=new c(a,b.line,b.ch,d),i=k(h,g.tag);if(i)return{open:g,close:i}}},a.scanForClosingTag=function(a,b,d,e){var f=new c(a,b.line,b.ch,e?{from:0,to:e}:null);return k(f,d)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),"cjs"):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],(function(b){a(b,"amd")})):a(CodeMirror,"plain")})((function(a,b){function c(a,b){var c=b;return function(){0==--c&&a()}}function d(b,d){var e=a.modes[b].dependencies;if(!e)return d();for(var f=[],g=0;g<e.length;++g)a.modes.hasOwnProperty(e[g])||f.push(e[g]);if(!f.length)return d();for(var h=c(d,f.length),g=0;g<f.length;++g)a.requireMode(f[g],h)}a.modeURL||(a.modeURL="../mode/%N/%N.js");var e={};a.requireMode=function(c,f){if("string"!=typeof c&&(c=c.name),a.modes.hasOwnProperty(c))return d(c,f);if(e.hasOwnProperty(c))return e[c].push(f);var g=a.modeURL.replace(/%N/g,c);if("plain"==b){var h=document.createElement("script");h.src=g;var i=document.getElementsByTagName("script")[0],j=e[c]=[f];a.on(h,"load",(function(){d(c,(function(){for(var a=0;a<j.length;++a)j[a]()}))})),i.parentNode.insertBefore(h,i)}else"cjs"==b?(require(g),f()):"amd"==b&&requirejs([g],f)},a.autoLoadMode=function(b,c){a.modes.hasOwnProperty(c)||a.requireMode(c,(function(){b.setOption("mode",b.getOption("mode"))}))}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.multiplexingMode=function(b){function c(a,b,c,d){if("string"==typeof b){var e=a.indexOf(b,c);return d&&e>-1?e+b.length:e}var f=b.exec(c?a.slice(c):a);return f?f.index+c+(d?f[0].length:0):-1}var d=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:a.startState(b),innerActive:null,inner:null}},copyState:function(c){return{outer:a.copyState(b,c.outer),innerActive:c.innerActive,inner:c.innerActive&&a.copyState(c.innerActive.mode,c.inner)}},token:function(e,f){if(f.innerActive){var g=f.innerActive,h=e.string;if(!g.close&&e.sol())return f.innerActive=f.inner=null,this.token(e,f);var i=g.close?c(h,g.close,e.pos,g.parseDelimiters):-1;if(i==e.pos&&!g.parseDelimiters)return e.match(g.close),f.innerActive=f.inner=null,g.delimStyle&&g.delimStyle+" "+g.delimStyle+"-close";i>-1&&(e.string=h.slice(0,i));var j=g.mode.token(e,f.inner);return i>-1&&(e.string=h),i==e.pos&&g.parseDelimiters&&(f.innerActive=f.inner=null),g.innerStyle&&(j=j?j+" "+g.innerStyle:g.innerStyle),j}for(var k=1/0,h=e.string,l=0;l<d.length;++l){var m=d[l],i=c(h,m.open,e.pos);if(i==e.pos)return m.parseDelimiters||e.match(m.open),f.innerActive=m,f.inner=a.startState(m.mode,b.indent?b.indent(f.outer,""):0),m.delimStyle&&m.delimStyle+" "+m.delimStyle+"-open";i!=-1&&i<k&&(k=i)}k!=1/0&&(e.string=h.slice(0,k));var n=b.token(e,f.outer);return k!=1/0&&(e.string=h),n},indent:function(c,d){var e=c.innerActive?c.innerActive.mode:b;return e.indent?e.indent(c.innerActive?c.inner:c.outer,d):a.Pass},blankLine:function(c){var e=c.innerActive?c.innerActive.mode:b;if(e.blankLine&&e.blankLine(c.innerActive?c.inner:c.outer),c.innerActive)"\n"===c.innerActive.close&&(c.innerActive=c.inner=null);else for(var f=0;f<d.length;++f){var g=d[f];"\n"===g.open&&(c.innerActive=g,c.inner=a.startState(g.mode,e.indent?e.indent(c.outer,""):0))}},electricChars:b.electricChars,innerMode:function(a){return a.inner?{state:a.inner,mode:a.innerActive.mode}:{state:a.outer,mode:b}}}}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){function c(a){clearTimeout(d.doRedraw),d.doRedraw=setTimeout((function(){d.redraw()}),a)}this.cm=a,this.options=b,this.buttonHeight=b.scrollButtonHeight||a.getOption("scrollButtonHeight"),this.annotations=[],this.doRedraw=this.doUpdate=null,this.div=a.getWrapperElement().appendChild(document.createElement("div")),this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none",this.computeScale();var d=this;a.on("refresh",this.resizeHandler=function(){clearTimeout(d.doUpdate),d.doUpdate=setTimeout((function(){d.computeScale()&&c(20)}),100)}),a.on("markerAdded",this.resizeHandler),a.on("markerCleared",this.resizeHandler),b.listenForChanges!==!1&&a.on("change",this.changeHandler=function(){c(250)})}a.defineExtension("annotateScrollbar",(function(a){return"string"==typeof a&&(a={className:a}),new b(this,a)})),a.defineOption("scrollButtonHeight",0),b.prototype.computeScale=function(){var a=this.cm,b=(a.getWrapperElement().clientHeight-a.display.barHeight-2*this.buttonHeight)/a.getScrollerElement().scrollHeight;if(b!=this.hScale)return this.hScale=b,!0},b.prototype.update=function(a){this.annotations=a,this.redraw()},b.prototype.redraw=function(a){function b(a,b){if(i!=a.line&&(i=a.line,j=c.getLineHandle(i)),j.widgets&&j.widgets.length||g&&j.height>h)return c.charCoords(a,"local")[b?"top":"bottom"];var d=c.heightAtLine(j,"local");return d+(b?0:j.height)}a!==!1&&this.computeScale();var c=this.cm,d=this.hScale,e=document.createDocumentFragment(),f=this.annotations,g=c.getOption("lineWrapping"),h=g&&1.5*c.defaultTextHeight(),i=null,j=null,k=c.lastLine();if(c.display.barWidth)for(var l,m=0;m<f.length;m++){var n=f[m];if(!(n.to.line>k)){for(var o=l||b(n.from,!0)*d,p=b(n.to,!1)*d;m<f.length-1&&!(f[m+1].to.line>k)&&(l=b(f[m+1].from,!0)*d,!(l>p+.9));)n=f[++m],p=b(n.to,!1)*d;if(p!=o){var q=Math.max(p-o,3),r=e.appendChild(document.createElement("div"));r.style.cssText="position: absolute; right: 0px; width: "+Math.max(c.display.barWidth-1,2)+"px; top: "+(o+this.buttonHeight)+"px; height: "+q+"px",r.className=this.options.className,n.id&&r.setAttribute("annotation-id",n.id)}}}this.div.textContent="",this.div.appendChild(e)},b.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler),this.cm.off("markerAdded",this.resizeHandler),this.cm.off("markerCleared",this.resizeHandler),this.changeHandler&&this.cm.off("change",this.changeHandler),this.div.parentNode.removeChild(this.div)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){function e(b){var c=a.wheelEventPixels(b)["horizontal"==f.orientation?"x":"y"],d=f.pos;f.moveTo(f.pos+c),f.pos!=d&&a.e_preventDefault(b)}this.orientation=c,this.scroll=d,this.screen=this.total=this.size=1,this.pos=0,this.node=document.createElement("div"),this.node.className=b+"-"+c,this.inner=this.node.appendChild(document.createElement("div"));var f=this;a.on(this.inner,"mousedown",(function(b){function c(){a.off(document,"mousemove",d),a.off(document,"mouseup",c)}function d(a){return 1!=a.which?c():void f.moveTo(h+(a[e]-g)*(f.total/f.size))}if(1==b.which){a.e_preventDefault(b);var e="horizontal"==f.orientation?"pageX":"pageY",g=b[e],h=f.pos;a.on(document,"mousemove",d),a.on(document,"mouseup",c)}})),a.on(this.node,"click",(function(b){a.e_preventDefault(b);var c,d=f.inner.getBoundingClientRect();c="horizontal"==f.orientation?b.clientX<d.left?-1:b.clientX>d.right?1:0:b.clientY<d.top?-1:b.clientY>d.bottom?1:0,f.moveTo(f.pos+c*f.screen)})),a.on(this.node,"mousewheel",e),a.on(this.node,"DOMMouseScroll",e)}function c(a,c,d){this.addClass=a,this.horiz=new b(a,"horizontal",d),c(this.horiz.node),this.vert=new b(a,"vertical",d),c(this.vert.node),this.width=null}b.prototype.setPos=function(a,b){return a<0&&(a=0),a>this.total-this.screen&&(a=this.total-this.screen),!(!b&&a==this.pos)&&(this.pos=a,this.inner.style["horizontal"==this.orientation?"left":"top"]=a*(this.size/this.total)+"px",!0)},b.prototype.moveTo=function(a){this.setPos(a)&&this.scroll(a,this.orientation)};var d=10;b.prototype.update=function(a,b,c){var e=this.screen!=b||this.total!=a||this.size!=c;e&&(this.screen=b,this.total=a,this.size=c);var f=this.screen*(this.size/this.total);f<d&&(this.size-=d-f,f=d),this.inner.style["horizontal"==this.orientation?"width":"height"]=f+"px",this.setPos(this.pos,e);
-},c.prototype.update=function(a){if(null==this.width){var b=window.getComputedStyle?window.getComputedStyle(this.horiz.node):this.horiz.node.currentStyle;b&&(this.width=parseInt(b.height))}var c=this.width||0,d=a.scrollWidth>a.clientWidth+1,e=a.scrollHeight>a.clientHeight+1;return this.vert.node.style.display=e?"block":"none",this.horiz.node.style.display=d?"block":"none",e&&(this.vert.update(a.scrollHeight,a.clientHeight,a.viewHeight-(d?c:0)),this.vert.node.style.bottom=d?c+"px":"0"),d&&(this.horiz.update(a.scrollWidth,a.clientWidth,a.viewWidth-(e?c:0)-a.barLeft),this.horiz.node.style.right=e?c+"px":"0",this.horiz.node.style.left=a.barLeft+"px"),{right:e?c:0,bottom:d?c:0}},c.prototype.setScrollTop=function(a){this.vert.setPos(a)},c.prototype.setScrollLeft=function(a){this.horiz.setPos(a)},c.prototype.clear=function(){var a=this.horiz.node.parentNode;a.removeChild(this.horiz.node),a.removeChild(this.vert.node)},a.scrollbarModel.simple=function(a,b){return new c("CodeMirror-simplescroll",a,b)},a.scrollbarModel.overlay=function(a,b){return new c("CodeMirror-overlayscroll",a,b)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../scroll/annotatescrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../scroll/annotatescrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d){this.cm=a,this.options=d;var e={listenForChanges:!1};for(var f in d)e[f]=d[f];e.className||(e.className="CodeMirror-search-match"),this.annotation=a.annotateScrollbar(e),this.query=b,this.caseFold=c,this.gap={from:a.firstLine(),to:a.lastLine()+1},this.matches=[],this.update=null,this.findMatches(),this.annotation.update(this.matches);var g=this;a.on("change",this.changeHandler=function(a,b){g.onChange(b)})}function c(a,b,c){return a<=b?a:Math.max(b,a+c)}a.defineExtension("showMatchesOnScrollbar",(function(a,c,d){return"string"==typeof d&&(d={className:d}),d||(d={}),new b(this,a,c,d)}));var d=1e3;b.prototype.findMatches=function(){if(this.gap){for(var b=0;b<this.matches.length;b++){var c=this.matches[b];if(c.from.line>=this.gap.to)break;c.to.line>=this.gap.from&&this.matches.splice(b--,1)}for(var e=this.cm.getSearchCursor(this.query,a.Pos(this.gap.from,0),this.caseFold),f=this.options&&this.options.maxMatches||d;e.findNext();){var c={from:e.from(),to:e.to()};if(c.from.line>=this.gap.to)break;if(this.matches.splice(b++,0,c),this.matches.length>f)break}this.gap=null}},b.prototype.onChange=function(b){var d=b.from.line,e=a.changeEnd(b).line,f=e-b.to.line;if(this.gap?(this.gap.from=Math.min(c(this.gap.from,d,f),b.from.line),this.gap.to=Math.max(c(this.gap.to,d,f),b.from.line)):this.gap={from:b.from.line,to:e+1},f)for(var g=0;g<this.matches.length;g++){var h=this.matches[g],i=c(h.from.line,d,f);i!=h.from.line&&(h.from=a.Pos(i,h.from.ch));var j=c(h.to.line,d,f);j!=h.to.line&&(h.to=a.Pos(j,h.to.ch))}clearTimeout(this.update);var k=this;this.update=setTimeout((function(){k.updateAfterChange()}),250)},b.prototype.updateAfterChange=function(){this.findMatches(),this.annotation.update(this.matches)},b.prototype.clear=function(){this.cm.off("change",this.changeHandler),this.annotation.clear()}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./matchesonscrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./matchesonscrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options={};for(var b in l)this.options[b]=(a&&a.hasOwnProperty(b)?a:l)[b];this.overlay=this.timeout=null,this.matchesonscroll=null,this.active=!1}function c(a){var b=a.state.matchHighlighter;(b.active||a.hasFocus())&&e(a,b)}function d(a){var b=a.state.matchHighlighter;b.active||(b.active=!0,e(a,b))}function e(a,b){clearTimeout(b.timeout),b.timeout=setTimeout((function(){h(a)}),b.options.delay)}function f(a,b,c,d){var e=a.state.matchHighlighter;if(a.addOverlay(e.overlay=k(b,c,d)),e.options.annotateScrollbar&&a.showMatchesOnScrollbar){var f=c?new RegExp("\\b"+b+"\\b"):b;e.matchesonscroll=a.showMatchesOnScrollbar(f,!1,{className:"CodeMirror-selection-highlight-scrollbar"})}}function g(a){var b=a.state.matchHighlighter;b.overlay&&(a.removeOverlay(b.overlay),b.overlay=null,b.matchesonscroll&&(b.matchesonscroll.clear(),b.matchesonscroll=null))}function h(a){a.operation((function(){var b=a.state.matchHighlighter;if(g(a),!a.somethingSelected()&&b.options.showToken){for(var c=b.options.showToken===!0?/[\w$]/:b.options.showToken,d=a.getCursor(),e=a.getLine(d.line),h=d.ch,j=h;h&&c.test(e.charAt(h-1));)--h;for(;j<e.length&&c.test(e.charAt(j));)++j;return void(h<j&&f(a,e.slice(h,j),c,b.options.style))}var k=a.getCursor("from"),l=a.getCursor("to");if(k.line==l.line&&(!b.options.wordsOnly||i(a,k,l))){var m=a.getRange(k,l);b.options.trim&&(m=m.replace(/^\s+|\s+$/g,"")),m.length>=b.options.minChars&&f(a,m,!1,b.options.style)}}))}function i(a,b,c){var d=a.getRange(b,c);if(null!==d.match(/^\w+$/)){if(b.ch>0){var e={line:b.line,ch:b.ch-1},f=a.getRange(e,b);if(null===f.match(/\W/))return!1}if(c.ch<a.getLine(b.line).length){var e={line:c.line,ch:c.ch+1},f=a.getRange(c,e);if(null===f.match(/\W/))return!1}return!0}return!1}function j(a,b){return!(a.start&&b.test(a.string.charAt(a.start-1))||a.pos!=a.string.length&&b.test(a.string.charAt(a.pos)))}function k(a,b,c){return{token:function(d){return!d.match(a)||b&&!j(d,b)?(d.next(),void(d.skipTo(a.charAt(0))||d.skipToEnd())):c}}}var l={style:"matchhighlight",minChars:2,delay:100,wordsOnly:!1,annotateScrollbar:!1,showToken:!1,trim:!0};a.defineOption("highlightSelectionMatches",!1,(function(e,f,i){if(i&&i!=a.Init&&(g(e),clearTimeout(e.state.matchHighlighter.timeout),e.state.matchHighlighter=null,e.off("cursorActivity",c),e.off("focus",d)),f){var j=e.state.matchHighlighter=new b(f);e.hasFocus()?(j.active=!0,h(e)):e.on("focus",d),e.on("cursorActivity",c)}}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,e,f){if(this.atOccurrence=!1,this.doc=a,null==f&&"string"==typeof b&&(f=!1),e=e?a.clipPos(e):d(0,0),this.pos={from:e,to:e},"string"!=typeof b)b.global||(b=new RegExp(b.source,b.ignoreCase?"ig":"g")),this.matches=function(c,e){if(c){b.lastIndex=0;for(var f,g,h=a.getLine(e.line).slice(0,e.ch),i=0;;){b.lastIndex=i;var j=b.exec(h);if(!j)break;if(f=j,g=f.index,i=f.index+(f[0].length||1),i==h.length)break}var k=f&&f[0].length||0;k||(0==g&&0==h.length?f=void 0:g!=a.getLine(e.line).length&&k++)}else{b.lastIndex=e.ch;var h=a.getLine(e.line),f=b.exec(h),k=f&&f[0].length||0,g=f&&f.index;g+k==h.length||k||(k=1)}if(f&&k)return{from:d(e.line,g),to:d(e.line,g+k),match:f}};else{var g=b;f&&(b=b.toLowerCase());var h=f?function(a){return a.toLowerCase()}:function(a){return a},i=b.split("\n");if(1==i.length)b.length?this.matches=function(e,f){if(e){var i=a.getLine(f.line).slice(0,f.ch),j=h(i),k=j.lastIndexOf(b);if(k>-1)return k=c(i,j,k),{from:d(f.line,k),to:d(f.line,k+g.length)}}else{var i=a.getLine(f.line).slice(f.ch),j=h(i),k=j.indexOf(b);if(k>-1)return k=c(i,j,k)+f.ch,{from:d(f.line,k),to:d(f.line,k+g.length)}}}:this.matches=function(){};else{var j=g.split("\n");this.matches=function(b,c){var e=i.length-1;if(b){if(c.line-(i.length-1)<a.firstLine())return;if(h(a.getLine(c.line).slice(0,j[e].length))!=i[i.length-1])return;for(var f=d(c.line,j[e].length),g=c.line-1,k=e-1;k>=1;--k,--g)if(i[k]!=h(a.getLine(g)))return;var l=a.getLine(g),m=l.length-j[0].length;if(h(l.slice(m))!=i[0])return;return{from:d(g,m),to:f}}if(!(c.line+(i.length-1)>a.lastLine())){var l=a.getLine(c.line),m=l.length-j[0].length;if(h(l.slice(m))==i[0]){for(var n=d(c.line,m),g=c.line+1,k=1;k<e;++k,++g)if(i[k]!=h(a.getLine(g)))return;if(h(a.getLine(g).slice(0,j[e].length))==i[e])return{from:n,to:d(g,j[e].length)}}}}}}}function c(a,b,c){if(a.length==b.length)return c;for(var d=Math.min(c,a.length);;){var e=a.slice(0,d).toLowerCase().length;if(e<c)++d;else{if(!(e>c))return d;--d}}}var d=a.Pos;b.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(a){function b(a){var b=d(a,0);return c.pos={from:b,to:b},c.atOccurrence=!1,!1}for(var c=this,e=this.doc.clipPos(a?this.pos.from:this.pos.to);;){if(this.pos=this.matches(a,e))return this.atOccurrence=!0,this.pos.match||!0;if(a){if(!e.line)return b(0);e=d(e.line-1,this.doc.getLine(e.line-1).length)}else{var f=this.doc.lineCount();if(e.line==f-1)return b(f);e=d(e.line+1,0)}}},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var e=a.splitLines(b);this.doc.replaceRange(e,this.pos.from,this.pos.to,c),this.pos.to=d(this.pos.from.line+e.length-1,e[e.length-1].length+(1==e.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",(function(a,c,d){return new b(this.doc,a,c,d)})),a.defineDocExtension("getSearchCursor",(function(a,c,d){return new b(this,a,c,d)})),a.defineExtension("selectMatches",(function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b=0;b<a.state.activeLines.length;b++)a.removeLineClass(a.state.activeLines[b],"wrap",f),a.removeLineClass(a.state.activeLines[b],"background",g),a.removeLineClass(a.state.activeLines[b],"gutter",h)}function c(a,b){if(a.length!=b.length)return!1;for(var c=0;c<a.length;c++)if(a[c]!=b[c])return!1;return!0}function d(a,d){for(var e=[],i=0;i<d.length;i++){var j=d[i],k=a.getOption("styleActiveLine");if("object"==typeof k&&k.nonEmpty?j.anchor.line==j.head.line:j.empty()){var l=a.getLineHandleVisualStart(j.head.line);e[e.length-1]!=l&&e.push(l)}}c(a.state.activeLines,e)||a.operation((function(){b(a);for(var c=0;c<e.length;c++)a.addLineClass(e[c],"wrap",f),a.addLineClass(e[c],"background",g),a.addLineClass(e[c],"gutter",h);a.state.activeLines=e}))}function e(a,b){d(a,b.ranges)}var f="CodeMirror-activeline",g="CodeMirror-activeline-background",h="CodeMirror-activeline-gutter";a.defineOption("styleActiveLine",!1,(function(c,f,g){var h=g!=a.Init&&g;f!=h&&(h&&(c.off("beforeSelectionChange",e),b(c),delete c.state.activeLines),f&&(c.state.activeLines=[],d(c,c.listSelections()),c.on("beforeSelectionChange",e)))}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/dialog/dialog"),require("../addon/edit/matchbrackets.js")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/dialog/dialog","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";var b=[{keys:"<Left>",type:"keyToKey",toKeys:"h"},{keys:"<Right>",type:"keyToKey",toKeys:"l"},{keys:"<Up>",type:"keyToKey",toKeys:"k"},{keys:"<Down>",type:"keyToKey",toKeys:"j"},{keys:"<Space>",type:"keyToKey",toKeys:"l"},{keys:"<BS>",type:"keyToKey",toKeys:"h",context:"normal"},{keys:"<C-Space>",type:"keyToKey",toKeys:"W"},{keys:"<C-BS>",type:"keyToKey",toKeys:"B",context:"normal"},{keys:"<S-Space>",type:"keyToKey",toKeys:"w"},{keys:"<S-BS>",type:"keyToKey",toKeys:"b",context:"normal"},{keys:"<C-n>",type:"keyToKey",toKeys:"j"},{keys:"<C-p>",type:"keyToKey",toKeys:"k"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:"<Home>",type:"keyToKey",toKeys:"0"},{keys:"<End>",type:"keyToKey",toKeys:"$"},{keys:"<PageUp>",type:"keyToKey",toKeys:"<C-b>"},{keys:"<PageDown>",type:"keyToKey",toKeys:"<C-f>"},{keys:"<CR>",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"<Ins>",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:"<C-f>",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:"<C-b>",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:"<C-d>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:"<C-u>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"'<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"`<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"]<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"expandToLine",motionArgs:{linewise:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:"<C-w>",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:"<C-i>",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:"<C-o>",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:"<C-e>",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:"<C-y>",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:"<C-v>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"<C-q>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r<character>",type:"action",action:"replace",isEdit:!0},{keys:"@<character>",type:"action",action:"replayMacro"},{keys:"q<character>",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:"<C-r>",type:"action",action:"redo"},{keys:"m<character>",type:"action",action:"setMark"},{keys:'"<character>',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z<CR>",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:"<C-a>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:"<C-x>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"<C-t>",type:"action",action:"indent",actionArgs:{indentRight:!0},context:"insert"},{keys:"<C-d>",type:"action",action:"indent",actionArgs:{indentRight:!1},context:"insert"},{keys:"a<character>",type:"motion",motion:"textObjectManipulation"},{keys:"i<character>",type:"motion",motion:"textObjectManipulation",motionArgs:{textObjectInner:!0}},{keys:"/",type:"search",searchArgs:{forward:!0,querySrc:"prompt",toJumplist:!0}},{keys:"?",type:"search",searchArgs:{forward:!1,querySrc:"prompt",toJumplist:!0}},{keys:"*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"g*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:"g#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:":",type:"ex"}],c=[{name:"colorscheme",shortName:"colo"},{name:"map"},{name:"imap",shortName:"im"},{name:"nmap",shortName:"nm"},{name:"vmap",shortName:"vm"},{name:"unmap"},{name:"write",shortName:"w"},{name:"undo",shortName:"u"},{name:"redo",shortName:"red"},{name:"set",shortName:"se"},{name:"set",shortName:"se"},{name:"setlocal",shortName:"setl"},{name:"setglobal",shortName:"setg"},{name:"sort",shortName:"sor"},{name:"substitute",shortName:"s",possiblyAsync:!0},{name:"nohlsearch",shortName:"noh"},{name:"yank",shortName:"y"},{name:"delmarks",shortName:"delm"},{name:"registers",shortName:"reg",excludeFromCommandHistory:!0},{name:"global",shortName:"g"}],d=a.Pos,e=function(){function e(b){b.setOption("disableInput",!0),b.setOption("showCursorWhenSelecting",!1),a.signal(b,"vim-mode-change",{mode:"normal"}),b.on("cursorActivity",bb),x(b),a.on(b.getInputField(),"paste",k(b))}function f(b){b.setOption("disableInput",!1),b.off("cursorActivity",bb),a.off(b.getInputField(),"paste",k(b)),b.state.vim=null}function g(b,c){this==a.keyMap.vim&&a.rmClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||f(b,!1)}function h(b,c){this==a.keyMap.vim&&a.addClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||e(b)}function i(b,c){if(c){if(this[b])return this[b];var d=j(b);if(!d)return!1;var e=a.Vim.findKey(c,d);return"function"==typeof e&&a.signal(c,"vim-keypress",d),e}}function j(a){if("'"==a.charAt(0))return a.charAt(1);var b=a.split(/-(?!$)/),c=b[b.length-1];if(1==b.length&&1==b[0].length)return!1;if(2==b.length&&"Shift"==b[0]&&1==c.length)return!1;for(var d=!1,e=0;e<b.length;e++){var f=b[e];f in ib?b[e]=ib[f]:d=!0,f in jb&&(b[e]=jb[f])}return!!d&&(q(c)&&(b[b.length-1]=c.toLowerCase()),"<"+b.join("-")+">")}function k(a){var b=a.state.vim;return b.onPasteFn||(b.onPasteFn=function(){b.insertMode||(a.setCursor(L(a.getCursor(),0,1)),Bb.enterInsertMode(a,{},b))}),b.onPasteFn}function l(a,b){for(var c=[],d=a;d<a+b;d++)c.push(String.fromCharCode(d));return c}function m(a,b){return b>=a.firstLine()&&b<=a.lastLine()}function n(a){return/^[a-z]$/.test(a)}function o(a){return"()[]{}".indexOf(a)!=-1}function p(a){return kb.test(a)}function q(a){return/^[A-Z]$/.test(a)}function r(a){return/^\s*$/.test(a)}function s(a,b){for(var c=0;c<b.length;c++)if(b[c]==a)return!0;return!1}function t(a,b,c,d,e){if(void 0===b&&!e)throw Error("defaultValue is required unless callback is provided");if(c||(c="string"),sb[a]={type:c,defaultValue:b,callback:e},d)for(var f=0;f<d.length;f++)sb[d[f]]=sb[a];b&&u(a,b)}function u(a,b,c,d){var e=sb[a];d=d||{};var f=d.scope;if(!e)throw Error("Unknown option: "+a);if("boolean"==e.type){if(b&&b!==!0)throw Error("Invalid argument: "+a+"="+b);b!==!1&&(b=!0)}e.callback?("local"!==f&&e.callback(b,void 0),"global"!==f&&c&&e.callback(b,c)):("local"!==f&&(e.value="boolean"==e.type?!!b:b),"global"!==f&&c&&(c.state.vim.options[a]={value:b}))}function v(a,b,c){var d=sb[a];c=c||{};var e=c.scope;if(!d)throw Error("Unknown option: "+a);{if(!d.callback){var f="global"!==e&&b&&b.state.vim.options[a];return(f||"local"!==e&&d||{}).value}var f=b&&d.callback(void 0,b);if("global"!==e&&void 0!==f)return f;if("local"!==e)return d.callback()}}function w(){this.latestRegister=void 0,this.isPlaying=!1,this.isRecording=!1,this.replaySearchQueries=[],this.onRecordingDone=void 0,this.lastInsertModeChanges=ub()}function x(a){return a.state.vim||(a.state.vim={inputState:new z,lastEditInputState:void 0,lastEditActionCommand:void 0,lastHPos:-1,lastHSPos:-1,lastMotion:null,marks:{},fakeCursor:null,insertMode:!1,insertModeRepeat:void 0,visualMode:!1,visualLine:!1,visualBlock:!1,lastSelection:null,lastPastedText:null,sel:{},options:{}}),a.state.vim}function y(){vb={searchQuery:null,searchIsReversed:!1,lastSubstituteReplacePart:void 0,jumpList:tb(),macroModeState:new w,lastCharacterSearch:{increment:0,forward:!0,selectedCharacter:""},registerController:new D({}),searchHistoryController:new E({}),exCommandHistoryController:new E({})};for(var a in sb){var b=sb[a];b.value=b.defaultValue}}function z(){this.prefixRepeat=[],this.motionRepeat=[],this.operator=null,this.operatorArgs=null,this.motion=null,this.motionArgs=null,this.keyBuffer=[],this.registerName=null}function A(b,c){b.state.vim.inputState=new z,a.signal(b,"vim-command-done",c)}function B(a,b,c){this.clear(),this.keyBuffer=[a||""],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!!b,this.blockwise=!!c}function C(a,b){var c=vb.registerController.registers[a];if(!a||1!=a.length)throw Error("Register name must be 1 character");if(c[a])throw Error("Register already defined "+a);c[a]=b,rb.push(a)}function D(a){this.registers=a,this.unnamedRegister=a['"']=new B,a["."]=new B,a[":"]=new B,a["/"]=new B}function E(){this.historyBuffer=[],this.iterator=0,this.initialPrefix=null}function F(a,b){zb[a]=b}function G(a,b){for(var c=[],d=0;d<b;d++)c.push(a);return c}function H(a,b){Ab[a]=b}function I(a,b){Bb[a]=b}function J(a,b,c){var e=Math.min(Math.max(a.firstLine(),b.line),a.lastLine()),f=X(a,e)-1;f=c?f+1:f;var g=Math.min(Math.max(0,b.ch),f);return d(e,g)}function K(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function L(a,b,c){return"object"==typeof b&&(c=b.ch,b=b.line),d(a.line+b,a.ch+c)}function M(a,b){return{line:b.line-a.line,ch:b.line-a.line}}function N(a,b,c,d){for(var e,f=[],g=[],h=0;h<b.length;h++){var i=b[h];"insert"==c&&"insert"!=i.context||i.context&&i.context!=c||d.operator&&"action"==i.type||!(e=O(a,i.keys))||("partial"==e&&f.push(i),"full"==e&&g.push(i))}return{partial:f.length&&f,full:g.length&&g}}function O(a,b){if("<character>"==b.slice(-11)){var c=b.length-11,d=a.slice(0,c),e=b.slice(0,c);return d==e&&a.length>c?"full":0==e.indexOf(d)&&"partial"}return a==b?"full":0==b.indexOf(a)&&"partial"}function P(a){var b=/^.*(<[\w\-]+>)$/.exec(a),c=b?b[1]:a.slice(-1);if(c.length>1)switch(c){case"<CR>":c="\n";break;case"<Space>":c=" "}return c}function Q(a,b,c){return function(){for(var d=0;d<c;d++)b(a)}}function R(a){return d(a.line,a.ch)}function S(a,b){return a.ch==b.ch&&a.line==b.line}function T(a,b){return a.line<b.line||a.line==b.line&&a.ch<b.ch}function U(a,b){return arguments.length>2&&(b=U.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?a:b}function V(a,b){return arguments.length>2&&(b=V.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?b:a}function W(a,b,c){var d=T(a,b),e=T(b,c);return d&&e}function X(a,b){return a.getLine(b).length}function Y(a){return a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function Z(a){return a.replace(/([.?*+$\[\]\/\\(){}|\-])/g,"\\$1")}function $(a,b,c){var e=X(a,b),f=new Array(c-e+1).join(" ");a.setCursor(d(b,e)),a.replaceRange(f,a.getCursor())}function _(a,b){var c=[],e=a.listSelections(),f=R(a.clipPos(b)),g=!S(b,f),h=a.getCursor("head"),i=ba(e,h),j=S(e[i].head,e[i].anchor),k=e.length-1,l=k-i>i?k:0,m=e[l].anchor,n=Math.min(m.line,f.line),o=Math.max(m.line,f.line),p=m.ch,q=f.ch,r=e[l].head.ch-p,s=q-p;r>0&&s<=0?(p++,g||q--):r<0&&s>=0?(p--,j||q++):r<0&&s==-1&&(p--,q++);for(var t=n;t<=o;t++){var u={anchor:new d(t,p),head:new d(t,q)};c.push(u)}return i=f.line==o?c.length-1:0,a.setSelections(c),b.ch=q,m.ch=p,m}function aa(a,b,c){for(var d=[],e=0;e<c;e++){var f=L(b,e,0);d.push({anchor:f,head:f})}a.setSelections(d,0)}function ba(a,b,c){for(var d=0;d<a.length;d++){var e="head"!=c&&S(a[d].anchor,b),f="anchor"!=c&&S(a[d].head,b);if(e||f)return d}return-1}function ca(a,b){var c=b.lastSelection,e=function(){var b=a.listSelections(),c=b[0],d=b[b.length-1],e=T(c.anchor,c.head)?c.anchor:c.head,f=T(d.anchor,d.head)?d.head:d.anchor;return[e,f]},f=function(){var b=a.getCursor(),e=a.getCursor(),f=c.visualBlock;if(f){var g=f.width,h=f.height;e=d(b.line+h,b.ch+g);for(var i=[],j=b.line;j<e.line;j++){var k=d(j,b.ch),l=d(j,e.ch),m={anchor:k,head:l};i.push(m)}a.setSelections(i)}else{var n=c.anchorMark.find(),o=c.headMark.find(),p=o.line-n.line,q=o.ch-n.ch;e={line:e.line+p,ch:p?e.ch:q+e.ch},c.visualLine&&(b=d(b.line,0),e=d(e.line,X(a,e.line))),a.setSelection(b,e)}return[b,e]};return b.visualMode?e():f()}function da(a,b){var c=b.sel.anchor,d=b.sel.head;b.lastPastedText&&(d=a.posFromIndex(a.indexFromPos(c)+b.lastPastedText.length),b.lastPastedText=null),b.lastSelection={anchorMark:a.setBookmark(c),headMark:a.setBookmark(d),anchor:R(c),head:R(d),visualMode:b.visualMode,visualLine:b.visualLine,visualBlock:b.visualBlock}}function ea(a,b,c){var e,f=a.state.vim.sel,g=f.head,h=f.anchor;return T(c,b)&&(e=c,c=b,b=e),T(g,h)?(g=U(b,g),h=V(h,c)):(h=U(b,h),g=V(g,c),g=L(g,0,-1),g.ch==-1&&g.line!=a.firstLine()&&(g=d(g.line-1,X(a,g.line-1)))),[h,g]}function fa(a,b,c){var d=a.state.vim;b=b||d.sel;var c=c||d.visualLine?"line":d.visualBlock?"block":"char",e=ga(a,b,c);a.setSelections(e.ranges,e.primary),cb(a)}function ga(a,b,c,e){var f=R(b.head),g=R(b.anchor);if("char"==c){var h=e||T(b.head,b.anchor)?0:1,i=T(b.head,b.anchor)?1:0;return f=L(b.head,0,h),g=L(b.anchor,0,i),{ranges:[{
-anchor:g,head:f}],primary:0}}if("line"==c){if(T(b.head,b.anchor))f.ch=0,g.ch=X(a,g.line);else{g.ch=0;var j=a.lastLine();f.line>j&&(f.line=j),f.ch=X(a,f.line)}return{ranges:[{anchor:g,head:f}],primary:0}}if("block"==c){for(var k=Math.min(g.line,f.line),l=Math.min(g.ch,f.ch),m=Math.max(g.line,f.line),n=Math.max(g.ch,f.ch)+1,o=m-k+1,p=f.line==k?0:o-1,q=[],r=0;r<o;r++)q.push({anchor:d(k+r,l),head:d(k+r,n)});return{ranges:q,primary:p}}}function ha(a){var b=a.getCursor("head");return 1==a.getSelection().length&&(b=U(b,a.getCursor("anchor"))),b}function ia(b,c){var d=b.state.vim;c!==!1&&b.setCursor(J(b,d.sel.head)),da(b,d),d.visualMode=!1,d.visualLine=!1,d.visualBlock=!1,a.signal(b,"vim-mode-change",{mode:"normal"}),d.fakeCursor&&d.fakeCursor.clear()}function ja(a,b,c){var d=a.getRange(b,c);if(/\n\s*$/.test(d)){var e=d.split("\n");e.pop();for(var f,f=e.pop();e.length>0&&f&&r(f);f=e.pop())c.line--,c.ch=0;f?(c.line--,c.ch=X(a,c.line)):c.ch=0}}function ka(a,b,c){b.ch=0,c.ch=0,c.line++}function la(a){if(!a)return 0;var b=a.search(/\S/);return b==-1?a.length:b}function ma(a,b,c,e,f){for(var g=ha(a),h=a.getLine(g.line),i=g.ch,j=f?lb[0]:mb[0];!j(h.charAt(i));)if(i++,i>=h.length)return null;e?j=mb[0]:(j=lb[0],j(h.charAt(i))||(j=lb[1]));for(var k=i,l=i;j(h.charAt(k))&&k<h.length;)k++;for(;j(h.charAt(l))&&l>=0;)l--;if(l++,b){for(var m=k;/\s/.test(h.charAt(k))&&k<h.length;)k++;if(m==k){for(var n=l;/\s/.test(h.charAt(l-1))&&l>0;)l--;l||(l=n)}}return{start:d(g.line,l),end:d(g.line,k)}}function na(a,b,c){S(b,c)||vb.jumpList.add(a,b,c)}function oa(a,b){vb.lastCharacterSearch.increment=a,vb.lastCharacterSearch.forward=b.forward,vb.lastCharacterSearch.selectedCharacter=b.selectedCharacter}function pa(a,b,c,e){var f=R(a.getCursor()),g=c?1:-1,h=c?a.lineCount():-1,i=f.ch,j=f.line,k=a.getLine(j),l={lineText:k,nextCh:k.charAt(i),lastCh:null,index:i,symb:e,reverseSymb:(c?{")":"(","}":"{"}:{"(":")","{":"}"})[e],forward:c,depth:0,curMoveThrough:!1},m=Cb[e];if(!m)return f;var n=Db[m].init,o=Db[m].isComplete;for(n&&n(l);j!==h&&b;){if(l.index+=g,l.nextCh=l.lineText.charAt(l.index),!l.nextCh){if(j+=g,l.lineText=a.getLine(j)||"",g>0)l.index=0;else{var p=l.lineText.length;l.index=p>0?p-1:0}l.nextCh=l.lineText.charAt(l.index)}o(l)&&(f.line=j,f.ch=l.index,b--)}return l.nextCh||l.curMoveThrough?d(j,l.index):f}function qa(a,b,c,d,e){var f=b.line,g=b.ch,h=a.getLine(f),i=c?1:-1,j=d?mb:lb;if(e&&""==h){if(f+=i,h=a.getLine(f),!m(a,f))return null;g=c?0:h.length}for(;;){if(e&&""==h)return{from:0,to:0,line:f};for(var k=i>0?h.length:-1,l=k,n=k;g!=k;){for(var o=!1,p=0;p<j.length&&!o;++p)if(j[p](h.charAt(g))){for(l=g;g!=k&&j[p](h.charAt(g));)g+=i;if(n=g,o=l!=n,l==b.ch&&f==b.line&&n==l+i)continue;return{from:Math.min(l,n+1),to:Math.max(l,n),line:f}}o||(g+=i)}if(f+=i,!m(a,f))return null;h=a.getLine(f),g=i>0?0:h.length}}function ra(a,b,c,e,f,g){var h=R(b),i=[];(e&&!f||!e&&f)&&c++;for(var j=!(e&&f),k=0;k<c;k++){var l=qa(a,b,e,g,j);if(!l){var m=X(a,a.lastLine());i.push(e?{line:a.lastLine(),from:m,to:m}:{line:0,from:0,to:0});break}i.push(l),b=d(l.line,e?l.to-1:l.from)}var n=i.length!=c,o=i[0],p=i.pop();return e&&!f?(n||o.from==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.from)):e&&f?d(p.line,p.to-1):!e&&f?(n||o.to==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.to)):d(p.line,p.from)}function sa(a,b,c,e){for(var f,g=a.getCursor(),h=g.ch,i=0;i<b;i++){var j=a.getLine(g.line);if(f=va(h,j,e,c,!0),f==-1)return null;h=f}return d(a.getCursor().line,f)}function ta(a,b){var c=a.getCursor().line;return J(a,d(c,b-1))}function ua(a,b,c,d){s(c,qb)&&(b.marks[c]&&b.marks[c].clear(),b.marks[c]=a.setBookmark(d))}function va(a,b,c,d,e){var f;return d?(f=b.indexOf(c,a+1),f==-1||e||(f-=1)):(f=b.lastIndexOf(c,a-1),f==-1||e||(f+=1)),f}function wa(a,b,c,e,f){function g(b){return!a.getLine(b)}function h(a,b,c){return c?g(a)!=g(a+b):!g(a)&&g(a+b)}var i,j,k=b.line,l=a.firstLine(),m=a.lastLine(),n=k;if(e){for(;l<=n&&n<=m&&c>0;)h(n,e)&&c--,n+=e;return new d(n,0)}var o=a.state.vim;if(o.visualLine&&h(k,1,!0)){var p=o.sel.anchor;h(p.line,-1,!0)&&(f&&p.line==k||(k+=1))}var q=g(k);for(n=k;n<=m&&c;n++)h(n,1,!0)&&(f&&g(n)==q||c--);for(j=new d(n,0),n>m&&!q?q=!0:f=!1,n=k;n>l&&(f&&g(n)!=q&&n!=k||!h(n,-1,!0));n--);return i=new d(n,0),{start:i,end:j}}function xa(a,b,c,e){var f,g,h=b,i={"(":/[()]/,")":/[()]/,"[":/[[\]]/,"]":/[[\]]/,"{":/[{}]/,"}":/[{}]/}[c],j={"(":"(",")":"(","[":"[","]":"[","{":"{","}":"{"}[c],k=a.getLine(h.line).charAt(h.ch),l=k===j?1:0;if(f=a.scanForBracket(d(h.line,h.ch+l),-1,null,{bracketRegex:i}),g=a.scanForBracket(d(h.line,h.ch+l),1,null,{bracketRegex:i}),!f||!g)return{start:h,end:h};if(f=f.pos,g=g.pos,f.line==g.line&&f.ch>g.ch||f.line>g.line){var m=f;f=g,g=m}return e?g.ch+=1:f.ch+=1,{start:f,end:g}}function ya(a,b,c,e){var f,g,h,i,j=R(b),k=a.getLine(j.line),l=k.split(""),m=l.indexOf(c);if(j.ch<m?j.ch=m:m<j.ch&&l[j.ch]==c&&(g=j.ch,--j.ch),l[j.ch]!=c||g)for(h=j.ch;h>-1&&!f;h--)l[h]==c&&(f=h+1);else f=j.ch+1;if(f&&!g)for(h=f,i=l.length;h<i&&!g;h++)l[h]==c&&(g=h);return f&&g?(e&&(--f,++g),{start:d(j.line,f),end:d(j.line,g)}):{start:j,end:j}}function za(){}function Aa(a){var b=a.state.vim;return b.searchState_||(b.searchState_=new za)}function Ba(a,b,c,d,e){a.openDialog?a.openDialog(b,d,{bottom:!0,value:e.value,onKeyDown:e.onKeyDown,onKeyUp:e.onKeyUp,selectValueOnOpen:!1}):d(prompt(c,""))}function Ca(a){var b=Da(a)||[];if(!b.length)return[];var c=[];if(0===b[0]){for(var d=0;d<b.length;d++)"number"==typeof b[d]&&c.push(a.substring(b[d]+1,b[d+1]));return c}}function Da(a){for(var b=!1,c=[],d=0;d<a.length;d++){var e=a.charAt(d);b||"/"!=e||c.push(d),b=!b&&"\\"==e}return c}function Ea(a){for(var b="|(){",c="}",d=!1,e=[],f=-1;f<a.length;f++){var g=a.charAt(f)||"",h=a.charAt(f+1)||"",i=h&&b.indexOf(h)!=-1;d?("\\"===g&&i||e.push(g),d=!1):"\\"===g?(d=!0,h&&c.indexOf(h)!=-1&&(i=!0),i&&"\\"!==h||e.push(g)):(e.push(g),i&&"\\"!==h&&e.push("\\"))}return e.join("")}function Fa(a){for(var b=!1,c=[],d=-1;d<a.length;d++){var e=a.charAt(d)||"",f=a.charAt(d+1)||"";Eb[e+f]?(c.push(Eb[e+f]),d++):b?(c.push(e),b=!1):"\\"===e?(b=!0,p(f)||"$"===f?c.push("$"):"/"!==f&&"\\"!==f&&c.push("\\")):("$"===e&&c.push("$"),c.push(e),"/"===f&&c.push("\\"))}return c.join("")}function Ga(b){for(var c=new a.StringStream(b),d=[];!c.eol();){for(;c.peek()&&"\\"!=c.peek();)d.push(c.next());var e=!1;for(var f in Fb)if(c.match(f,!0)){e=!0,d.push(Fb[f]);break}e||d.push(c.next())}return d.join("")}function Ha(a,b,c){var d=vb.registerController.getRegister("/");if(d.setText(a),a instanceof RegExp)return a;var e,f,g=Da(a);if(g.length){e=a.substring(0,g[0]);var h=a.substring(g[0]);f=h.indexOf("i")!=-1}else e=a;if(!e)return null;v("pcre")||(e=Ea(e)),c&&(b=/^[^A-Z]*$/.test(e));var i=new RegExp(e,b||f?"i":void 0);return i}function Ia(a,b){a.openNotification?a.openNotification('<span style="color: red">'+b+"</span>",{bottom:!0,duration:5e3}):alert(b)}function Ja(a,b){var c='<span style="font-family: monospace; white-space: pre">'+(a||"")+'<input type="text"></span>';return b&&(c+=' <span style="color: #888">'+b+"</span>"),c}function Ka(a,b){var c=(b.prefix||"")+" "+(b.desc||""),d=Ja(b.prefix,b.desc);Ba(a,d,c,b.onClose,b)}function La(a,b){if(a instanceof RegExp&&b instanceof RegExp){for(var c=["global","multiline","ignoreCase","source"],d=0;d<c.length;d++){var e=c[d];if(a[e]!==b[e])return!1}return!0}return!1}function Ma(a,b,c,d){if(b){var e=Aa(a),f=Ha(b,!!c,!!d);if(f)return Oa(a,f),La(f,e.getQuery())?f:(e.setQuery(f),f)}}function Na(a){if("^"==a.source.charAt(0))var b=!0;return{token:function(c){if(b&&!c.sol())return void c.skipToEnd();var d=c.match(a,!1);if(d)return 0==d[0].length?(c.next(),"searching"):c.sol()||(c.backUp(1),a.exec(c.next()+d[0]))?(c.match(a),"searching"):(c.next(),null);for(;!c.eol()&&(c.next(),!c.match(a,!1)););},query:a}}function Oa(a,b){var c=Aa(a),d=c.getOverlay();d&&b==d.query||(d&&a.removeOverlay(d),d=Na(b),a.addOverlay(d),a.showMatchesOnScrollbar&&(c.getScrollbarAnnotate()&&c.getScrollbarAnnotate().clear(),c.setScrollbarAnnotate(a.showMatchesOnScrollbar(b))),c.setOverlay(d))}function Pa(a,b,c,e){return void 0===e&&(e=1),a.operation((function(){for(var f=a.getCursor(),g=a.getSearchCursor(c,f),h=0;h<e;h++){var i=g.find(b);if(0==h&&i&&S(g.from(),f)&&(i=g.find(b)),!i&&(g=a.getSearchCursor(c,b?d(a.lastLine()):d(a.firstLine(),0)),!g.find(b)))return}return g.from()}))}function Qa(a){var b=Aa(a);a.removeOverlay(Aa(a).getOverlay()),b.setOverlay(null),b.getScrollbarAnnotate()&&(b.getScrollbarAnnotate().clear(),b.setScrollbarAnnotate(null))}function Ra(a,b,c){return"number"!=typeof a&&(a=a.line),b instanceof Array?s(a,b):c?a>=b&&a<=c:a==b}function Sa(a){var b=a.getScrollInfo(),c=6,d=10,e=a.coordsChar({left:0,top:c+b.top},"local"),f=b.clientHeight-d+b.top,g=a.coordsChar({left:0,top:f},"local");return{top:e.line,bottom:g.line}}function Ta(a,b,c){if("'"==c){var d=a.doc.history.done,e=d[d.length-2];return e&&e.ranges&&e.ranges[0].head}var f=b.marks[c];return f&&f.find()}function Ua(b,c,d,e,f,g,h,i,j){function k(){b.operation((function(){for(;!p;)l(),m();n()}))}function l(){var a=b.getRange(g.from(),g.to()),c=a.replace(h,i);g.replace(c)}function m(){for(;g.findNext()&&Ra(g.from(),e,f);)if(d||!q||g.from().line!=q.line)return b.scrollIntoView(g.from(),30),b.setSelection(g.from(),g.to()),q=g.from(),void(p=!1);p=!0}function n(a){if(a&&a(),b.focus(),q){b.setCursor(q);var c=b.state.vim;c.exMode=!1,c.lastHPos=c.lastHSPos=q.ch}j&&j()}function o(c,d,e){a.e_stop(c);var f=a.keyName(c);switch(f){case"Y":l(),m();break;case"N":m();break;case"A":var g=j;j=void 0,b.operation(k),j=g;break;case"L":l();case"Q":case"Esc":case"Ctrl-C":case"Ctrl-[":n(e)}return p&&n(e),!0}b.state.vim.exMode=!0;var p=!1,q=g.from();return m(),p?void Ia(b,"No matches for "+h.source):c?void Ka(b,{prefix:"replace with <strong>"+i+"</strong> (y/n/a/q/l)",onKeyDown:o}):(k(),void(j&&j()))}function Va(b){var c=b.state.vim,d=vb.macroModeState,e=vb.registerController.getRegister("."),f=d.isPlaying,g=d.lastInsertModeChanges,h=[];if(!f){for(var i=g.inVisualBlock?c.lastSelection.visualBlock.height:1,j=g.changes,h=[],k=0;k<j.length;)h.push(j[k]),j[k]instanceof eb?k++:k+=i;g.changes=h,b.off("change",ab),a.off(b.getInputField(),"keydown",fb)}!f&&c.insertModeRepeat>1&&(gb(b,c,c.insertModeRepeat-1,!0),c.lastEditInputState.repeatOverride=c.insertModeRepeat),delete c.insertModeRepeat,c.insertMode=!1,b.setCursor(b.getCursor().line,b.getCursor().ch-1),b.setOption("keyMap","vim"),b.setOption("disableInput",!0),b.toggleOverwrite(!1),e.setText(g.changes.join("")),a.signal(b,"vim-mode-change",{mode:"normal"}),d.isRecording&&$a(d)}function Wa(a){b.unshift(a)}function Xa(a,b,c,d,e){var f={keys:a,type:b};f[b]=c,f[b+"Args"]=d;for(var g in e)f[g]=e[g];Wa(f)}function Ya(b,c,d,e){var f=vb.registerController.getRegister(e);if(":"==e)return f.keyBuffer[0]&&Jb.processCommand(b,f.keyBuffer[0]),void(d.isPlaying=!1);var g=f.keyBuffer,h=0;d.isPlaying=!0,d.replaySearchQueries=f.searchQueries.slice(0);for(var i=0;i<g.length;i++)for(var j,k,l=g[i];l;)if(j=/<\w+-.+?>|<\w+>|./.exec(l),k=j[0],l=l.substring(j.index+k.length),a.Vim.handleKey(b,k,"macro"),c.insertMode){var m=f.insertModeChanges[h++].changes;vb.macroModeState.lastInsertModeChanges.changes=m,hb(b,m,1),Va(b)}d.isPlaying=!1}function Za(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushText(b)}}function $a(a){if(!a.isPlaying){var b=a.latestRegister,c=vb.registerController.getRegister(b);c&&c.pushInsertModeChanges&&c.pushInsertModeChanges(a.lastInsertModeChanges)}}function _a(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushSearchQuery&&d.pushSearchQuery(b)}}function ab(a,b){var c=vb.macroModeState,d=c.lastInsertModeChanges;if(!c.isPlaying)for(;b;){if(d.expectCursorActivityForChange=!0,"+input"==b.origin||"paste"==b.origin||void 0===b.origin){var e=b.text.join("\n");d.maybeReset&&(d.changes=[],d.maybeReset=!1),d.changes.push(e)}b=b.next}}function bb(a){var b=a.state.vim;if(b.insertMode){var c=vb.macroModeState;if(c.isPlaying)return;var d=c.lastInsertModeChanges;d.expectCursorActivityForChange?d.expectCursorActivityForChange=!1:d.maybeReset=!0}else a.curOp.isVimOp||db(a,b);b.visualMode&&cb(a)}function cb(a){var b=a.state.vim,c=J(a,R(b.sel.head)),d=L(c,0,1);b.fakeCursor&&b.fakeCursor.clear(),b.fakeCursor=a.markText(c,d,{className:"cm-animate-fat-cursor"})}function db(b,c){var d=b.getCursor("anchor"),e=b.getCursor("head");if(c.visualMode&&!b.somethingSelected()?ia(b,!1):c.visualMode||c.insertMode||!b.somethingSelected()||(c.visualMode=!0,c.visualLine=!1,a.signal(b,"vim-mode-change",{mode:"visual"})),c.visualMode){var f=T(e,d)?0:-1,g=T(e,d)?-1:0;e=L(e,0,f),d=L(d,0,g),c.sel={anchor:d,head:e},ua(b,c,"<",U(e,d)),ua(b,c,">",V(e,d))}else c.insertMode||(c.lastHPos=b.getCursor().ch)}function eb(a){this.keyName=a}function fb(b){function c(){return e.maybeReset&&(e.changes=[],e.maybeReset=!1),e.changes.push(new eb(f)),!0}var d=vb.macroModeState,e=d.lastInsertModeChanges,f=a.keyName(b);f&&(f.indexOf("Delete")==-1&&f.indexOf("Backspace")==-1||a.lookupKey(f,"vim-insert",c))}function gb(a,b,c,d){function e(){h?yb.processAction(a,b,b.lastEditActionCommand):yb.evalInput(a,b)}function f(c){if(g.lastInsertModeChanges.changes.length>0){c=b.lastEditActionCommand?c:1;var d=g.lastInsertModeChanges;hb(a,d.changes,c)}}var g=vb.macroModeState;g.isPlaying=!0;var h=!!b.lastEditActionCommand,i=b.inputState;if(b.inputState=b.lastEditInputState,h&&b.lastEditActionCommand.interlaceInsertRepeat)for(var j=0;j<c;j++)e(),f(1);else d||e(),f(c);b.inputState=i,b.insertMode&&!d&&Va(a),g.isPlaying=!1}function hb(b,c,d){function e(c){return"string"==typeof c?a.commands[c](b):c(b),!0}var f=b.getCursor("head"),g=vb.macroModeState.lastInsertModeChanges.inVisualBlock;if(g){var h=b.state.vim,i=h.lastSelection,j=M(i.anchor,i.head);aa(b,f,j.line+1),d=b.listSelections().length,b.setCursor(f)}for(var k=0;k<d;k++){g&&b.setCursor(L(f,k,0));for(var l=0;l<c.length;l++){var m=c[l];if(m instanceof eb)a.lookupKey(m.keyName,"vim-insert",e);else{var n=b.getCursor();b.replaceRange(m,n,n)}}}g&&b.setCursor(L(f,0,1))}a.defineOption("vimMode",!1,(function(b,c,d){c&&"vim"!=b.getOption("keyMap")?b.setOption("keyMap","vim"):!c&&d!=a.Init&&/^vim/.test(b.getOption("keyMap"))&&b.setOption("keyMap","default")}));var ib={Shift:"S",Ctrl:"C",Alt:"A",Cmd:"D",Mod:"A"},jb={Enter:"CR",Backspace:"BS",Delete:"Del",Insert:"Ins"},kb=/[\d]/,lb=[a.isWordChar,function(b){return b&&!a.isWordChar(b)&&!/\s/.test(b)}],mb=[function(a){return/\S/.test(a)}],nb=l(65,26),ob=l(97,26),pb=l(48,10),qb=[].concat(nb,ob,pb,["<",">"]),rb=[].concat(nb,ob,pb,["-",'"',".",":","/"]),sb={};t("filetype",void 0,"string",["ft"],(function(a,b){if(void 0!==b){if(void 0===a){var c=b.getOption("mode");return"null"==c?"":c}var c=""==a?"null":a;b.setOption("mode",c)}}));var tb=function(){function a(a,b,h){function i(b){var e=++d%c,f=g[e];f&&f.clear(),g[e]=a.setBookmark(b)}var j=d%c,k=g[j];if(k){var l=k.find();l&&!S(l,b)&&i(b)}else i(b);i(h),e=d,f=d-c+1,f<0&&(f=0)}function b(a,b){d+=b,d>e?d=e:d<f&&(d=f);var h=g[(c+d)%c];if(h&&!h.find()){var i,j=b>0?1:-1,k=a.getCursor();do if(d+=j,h=g[(c+d)%c],h&&(i=h.find())&&!S(k,i))break;while(d<e&&d>f)}return h}var c=100,d=-1,e=0,f=0,g=new Array(c);return{cachedCursor:void 0,add:a,move:b}},ub=function(a){return a?{changes:a.changes,expectCursorActivityForChange:a.expectCursorActivityForChange}:{changes:[],expectCursorActivityForChange:!1}};w.prototype={exitMacroRecordMode:function(){var a=vb.macroModeState;a.onRecordingDone&&a.onRecordingDone(),a.onRecordingDone=void 0,a.isRecording=!1},enterMacroRecordMode:function(a,b){var c=vb.registerController.getRegister(b);c&&(c.clear(),this.latestRegister=b,a.openDialog&&(this.onRecordingDone=a.openDialog("(recording)["+b+"]",null,{bottom:!0})),this.isRecording=!0)}};var vb,wb,xb={buildKeyMap:function(){},getRegisterController:function(){return vb.registerController},resetVimGlobalState_:y,getVimGlobalState_:function(){return vb},maybeInitVimState_:x,suppressErrorLogging:!1,InsertModeKey:eb,map:function(a,b,c){Jb.map(a,b,c)},unmap:function(a,b){Jb.unmap(a,b)},setOption:u,getOption:v,defineOption:t,defineEx:function(a,b,c){if(b){if(0!==a.indexOf(b))throw new Error('(Vim.defineEx) "'+b+'" is not a prefix of "'+a+'", command not registered')}else b=a;Ib[a]=c,Jb.commandMap_[b]={name:a,shortName:b,type:"api"}},handleKey:function(a,b,c){var d=this.findKey(a,b,c);if("function"==typeof d)return d()},findKey:function(c,d,e){function f(){var a=vb.macroModeState;if(a.isRecording){if("q"==d)return a.exitMacroRecordMode(),A(c),!0;"mapping"!=e&&Za(a,d)}}function g(){if("<Esc>"==d)return A(c),l.visualMode?ia(c):l.insertMode&&Va(c),!0}function h(b){for(var e;b;)e=/<\w+-.+?>|<\w+>|./.exec(b),d=e[0],b=b.substring(e.index+d.length),a.Vim.handleKey(c,d,"mapping")}function i(){if(g())return!0;for(var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d,e=1==d.length,f=yb.matchCommand(a,b,l.inputState,"insert");a.length>1&&"full"!=f.type;){var a=l.inputState.keyBuffer=a.slice(1),h=yb.matchCommand(a,b,l.inputState,"insert");"none"!=h.type&&(f=h)}if("none"==f.type)return A(c),!1;if("partial"==f.type)return wb&&window.clearTimeout(wb),wb=window.setTimeout((function(){l.insertMode&&l.inputState.keyBuffer&&A(c)}),v("insertModeEscKeysTimeout")),!e;if(wb&&window.clearTimeout(wb),e){for(var i=c.listSelections(),j=0;j<i.length;j++){var k=i[j].head;c.replaceRange("",L(k,0,-(a.length-1)),k,"+input")}vb.macroModeState.lastInsertModeChanges.changes.pop()}return A(c),f.command}function j(){if(f()||g())return!0;var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d;if(/^[1-9]\d*$/.test(a))return!0;var e=/^(\d*)(.*)$/.exec(a);if(!e)return A(c),!1;var h=l.visualMode?"visual":"normal",i=yb.matchCommand(e[2]||e[1],b,l.inputState,h);if("none"==i.type)return A(c),!1;if("partial"==i.type)return!0;l.inputState.keyBuffer="";var e=/^(\d*)(.*)$/.exec(a);return e[1]&&"0"!=e[1]&&l.inputState.pushRepeatDigit(e[1]),i.command}var k,l=x(c);return k=l.insertMode?i():j(),k===!1?void 0:k===!0?function(){return!0}:function(){return c.operation((function(){c.curOp.isVimOp=!0;try{"keyToKey"==k.type?h(k.toKeys):yb.processCommand(c,l,k)}catch(b){throw c.state.vim=void 0,x(c),a.Vim.suppressErrorLogging||console.log(b),b}return!0}))}},handleEx:function(a,b){Jb.processCommand(a,b)},defineMotion:F,defineAction:I,defineOperator:H,mapCommand:Xa,_mapCommand:Wa,defineRegister:C,exitVisualMode:ia,exitInsertMode:Va};z.prototype.pushRepeatDigit=function(a){this.operator?this.motionRepeat=this.motionRepeat.concat(a):this.prefixRepeat=this.prefixRepeat.concat(a)},z.prototype.getRepeat=function(){var a=0;return(this.prefixRepeat.length>0||this.motionRepeat.length>0)&&(a=1,this.prefixRepeat.length>0&&(a*=parseInt(this.prefixRepeat.join(""),10)),this.motionRepeat.length>0&&(a*=parseInt(this.motionRepeat.join(""),10))),a},B.prototype={setText:function(a,b,c){this.keyBuffer=[a||""],this.linewise=!!b,this.blockwise=!!c},pushText:function(a,b){b&&(this.linewise||this.keyBuffer.push("\n"),this.linewise=!0),this.keyBuffer.push(a)},pushInsertModeChanges:function(a){this.insertModeChanges.push(ub(a))},pushSearchQuery:function(a){this.searchQueries.push(a)},clear:function(){this.keyBuffer=[],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!1},toString:function(){return this.keyBuffer.join("")}},D.prototype={pushText:function(a,b,c,d,e){d&&"\n"==c.charAt(0)&&(c=c.slice(1)+"\n"),d&&"\n"!==c.charAt(c.length-1)&&(c+="\n");var f=this.isValidRegister(a)?this.getRegister(a):null;if(!f){switch(b){case"yank":this.registers[0]=new B(c,d,e);break;case"delete":case"change":c.indexOf("\n")==-1?this.registers["-"]=new B(c,d):(this.shiftNumericRegisters_(),this.registers[1]=new B(c,d))}return void this.unnamedRegister.setText(c,d,e)}var g=q(a);g?f.pushText(c,d):f.setText(c,d,e),this.unnamedRegister.setText(f.toString(),d)},getRegister:function(a){return this.isValidRegister(a)?(a=a.toLowerCase(),this.registers[a]||(this.registers[a]=new B),this.registers[a]):this.unnamedRegister},isValidRegister:function(a){return a&&s(a,rb)},shiftNumericRegisters_:function(){for(var a=9;a>=2;a--)this.registers[a]=this.getRegister(""+(a-1))}},E.prototype={nextMatch:function(a,b){var c=this.historyBuffer,d=b?-1:1;null===this.initialPrefix&&(this.initialPrefix=a);for(var e=this.iterator+d;b?e>=0:e<c.length;e+=d)for(var f=c[e],g=0;g<=f.length;g++)if(this.initialPrefix==f.substring(0,g))return this.iterator=e,f;return e>=c.length?(this.iterator=c.length,this.initialPrefix):e<0?a:void 0},pushInput:function(a){var b=this.historyBuffer.indexOf(a);b>-1&&this.historyBuffer.splice(b,1),a.length&&this.historyBuffer.push(a)},reset:function(){this.initialPrefix=null,this.iterator=this.historyBuffer.length}};var yb={matchCommand:function(a,b,c,d){var e=N(a,b,d,c);if(!e.full&&!e.partial)return{type:"none"};if(!e.full&&e.partial)return{type:"partial"};for(var f,g=0;g<e.full.length;g++){var h=e.full[g];f||(f=h)}return"<character>"==f.keys.slice(-11)&&(c.selectedCharacter=P(a)),{type:"full",command:f}},processCommand:function(a,b,c){switch(b.inputState.repeatOverride=c.repeatOverride,c.type){case"motion":this.processMotion(a,b,c);break;case"operator":this.processOperator(a,b,c);break;case"operatorMotion":this.processOperatorMotion(a,b,c);break;case"action":this.processAction(a,b,c);break;case"search":this.processSearch(a,b,c);break;case"ex":case"keyToEx":this.processEx(a,b,c)}},processMotion:function(a,b,c){b.inputState.motion=c.motion,b.inputState.motionArgs=K(c.motionArgs),this.evalInput(a,b)},processOperator:function(a,b,c){var d=b.inputState;if(d.operator){if(d.operator==c.operator)return d.motion="expandToLine",d.motionArgs={linewise:!0},void this.evalInput(a,b);A(a)}d.operator=c.operator,d.operatorArgs=K(c.operatorArgs),b.visualMode&&this.evalInput(a,b)},processOperatorMotion:function(a,b,c){var d=b.visualMode,e=K(c.operatorMotionArgs);e&&d&&e.visualLine&&(b.visualLine=!0),this.processOperator(a,b,c),d||this.processMotion(a,b,c)},processAction:function(a,b,c){var d=b.inputState,e=d.getRepeat(),f=!!e,g=K(c.actionArgs)||{};d.selectedCharacter&&(g.selectedCharacter=d.selectedCharacter),c.operator&&this.processOperator(a,b,c),c.motion&&this.processMotion(a,b,c),(c.motion||c.operator)&&this.evalInput(a,b),g.repeat=e||1,g.repeatIsExplicit=f,g.registerName=d.registerName,A(a),b.lastMotion=null,c.isEdit&&this.recordLastEdit(b,d,c),Bb[c.action](a,g,b)},processSearch:function(b,c,d){function e(a,e,f){vb.searchHistoryController.pushInput(a),vb.searchHistoryController.reset();try{Ma(b,a,e,f)}catch(c){return Ia(b,"Invalid regex: "+a),void A(b)}yb.processMotion(b,c,{type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:d.searchArgs.toJumplist}})}function f(a){b.scrollTo(m.left,m.top),e(a,!0,!0);var c=vb.macroModeState;c.isRecording&&_a(c,a)}function g(c,d,e){var f,g,h=a.keyName(c);"Up"==h||"Down"==h?(f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.searchHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.searchHistoryController.reset();var j;try{j=Ma(b,d,!0,!0)}catch(a){}j?b.scrollIntoView(Pa(b,!i,j),30):(Qa(b),b.scrollTo(m.left,m.top))}function h(c,d,e){var f=a.keyName(c);"Esc"==f||"Ctrl-C"==f||"Ctrl-["==f||"Backspace"==f&&""==d?(vb.searchHistoryController.pushInput(d),vb.searchHistoryController.reset(),Ma(b,l),Qa(b),b.scrollTo(m.left,m.top),a.e_stop(c),A(b),e(),b.focus()):"Up"==f||"Down"==f?a.e_stop(c):"Ctrl-U"==f&&(a.e_stop(c),e(""))}if(b.getSearchCursor){var i=d.searchArgs.forward,j=d.searchArgs.wholeWordOnly;Aa(b).setReversed(!i);var k=i?"/":"?",l=Aa(b).getQuery(),m=b.getScrollInfo();switch(d.searchArgs.querySrc){case"prompt":var n=vb.macroModeState;if(n.isPlaying){var o=n.replaySearchQueries.shift();e(o,!0,!1)}else Ka(b,{onClose:f,prefix:k,desc:Gb,onKeyUp:g,onKeyDown:h});break;case"wordUnderCursor":var p=ma(b,!1,!0,!1,!0),q=!0;if(p||(p=ma(b,!1,!0,!1,!1),q=!1),!p)return;var o=b.getLine(p.start.line).substring(p.start.ch,p.end.ch);o=q&&j?"\\b"+o+"\\b":Z(o),vb.jumpList.cachedCursor=b.getCursor(),b.setCursor(p.start),e(o,!0,!1)}}},processEx:function(b,c,d){function e(a){vb.exCommandHistoryController.pushInput(a),vb.exCommandHistoryController.reset(),Jb.processCommand(b,a)}function f(c,d,e){var f,g,h=a.keyName(c);("Esc"==h||"Ctrl-C"==h||"Ctrl-["==h||"Backspace"==h&&""==d)&&(vb.exCommandHistoryController.pushInput(d),vb.exCommandHistoryController.reset(),a.e_stop(c),A(b),e(),b.focus()),"Up"==h||"Down"==h?(a.e_stop(c),f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.exCommandHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Ctrl-U"==h?(a.e_stop(c),e("")):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.exCommandHistoryController.reset()}"keyToEx"==d.type?Jb.processCommand(b,d.exArgs.input):c.visualMode?Ka(b,{onClose:e,prefix:":",value:"'<,'>",onKeyDown:f}):Ka(b,{onClose:e,prefix:":",onKeyDown:f})},evalInput:function(a,b){var c,e,f,g=b.inputState,h=g.motion,i=g.motionArgs||{},j=g.operator,k=g.operatorArgs||{},l=g.registerName,m=b.sel,n=R(b.visualMode?J(a,m.head):a.getCursor("head")),o=R(b.visualMode?J(a,m.anchor):a.getCursor("anchor")),p=R(n),q=R(o);if(j&&this.recordLastEdit(b,g),f=void 0!==g.repeatOverride?g.repeatOverride:g.getRepeat(),f>0&&i.explicitRepeat?i.repeatIsExplicit=!0:(i.noRepeat||!i.explicitRepeat&&0===f)&&(f=1,i.repeatIsExplicit=!1),g.selectedCharacter&&(i.selectedCharacter=k.selectedCharacter=g.selectedCharacter),i.repeat=f,A(a),h){var r=zb[h](a,n,i,b);if(b.lastMotion=zb[h],!r)return;if(i.toJumplist){var s=vb.jumpList,t=s.cachedCursor;t?(na(a,t,r),delete s.cachedCursor):na(a,n,r)}r instanceof Array?(e=r[0],c=r[1]):c=r,c||(c=R(n)),b.visualMode?(b.visualBlock&&c.ch===1/0||(c=J(a,c,b.visualBlock)),e&&(e=J(a,e,!0)),e=e||q,m.anchor=e,m.head=c,fa(a),ua(a,b,"<",T(e,c)?e:c),ua(a,b,">",T(e,c)?c:e)):j||(c=J(a,c),a.setCursor(c.line,c.ch))}if(j){if(k.lastSel){e=q;var u=k.lastSel,v=Math.abs(u.head.line-u.anchor.line),w=Math.abs(u.head.ch-u.anchor.ch);c=u.visualLine?d(q.line+v,q.ch):u.visualBlock?d(q.line+v,q.ch+w):u.head.line==u.anchor.line?d(q.line,q.ch+w):d(q.line+v,q.ch),b.visualMode=!0,b.visualLine=u.visualLine,b.visualBlock=u.visualBlock,m=b.sel={anchor:e,head:c},fa(a)}else b.visualMode&&(k.lastSel={anchor:R(m.anchor),head:R(m.head),visualBlock:b.visualBlock,visualLine:b.visualLine});var x,y,z,B,C;if(b.visualMode){if(x=U(m.head,m.anchor),y=V(m.head,m.anchor),z=b.visualLine||k.linewise,B=b.visualBlock?"block":z?"line":"char",C=ga(a,{anchor:x,head:y},B),z){var D=C.ranges;if("block"==B)for(var E=0;E<D.length;E++)D[E].head.ch=X(a,D[E].head.line);else"line"==B&&(D[0].head=d(D[0].head.line+1,0))}}else{if(x=R(e||q),y=R(c||p),T(y,x)){var F=x;x=y,y=F}z=i.linewise||k.linewise,z?ka(a,x,y):i.forward&&ja(a,x,y),B="char";var G=!i.inclusive||z;C=ga(a,{anchor:x,head:y},B,G)}a.setSelections(C.ranges,C.primary),b.lastMotion=null,k.repeat=f,k.registerName=l,k.linewise=z;var H=Ab[j](a,k,C.ranges,q,c);b.visualMode&&ia(a,null!=H),H&&a.setCursor(H)}},recordLastEdit:function(a,b,c){var d=vb.macroModeState;d.isPlaying||(a.lastEditInputState=b,a.lastEditActionCommand=c,d.lastInsertModeChanges.changes=[],d.lastInsertModeChanges.expectCursorActivityForChange=!1)}},zb={moveToTopLine:function(a,b,c){var e=Sa(a).top+c.repeat-1;return d(e,la(a.getLine(e)))},moveToMiddleLine:function(a){var b=Sa(a),c=Math.floor(.5*(b.top+b.bottom));return d(c,la(a.getLine(c)))},moveToBottomLine:function(a,b,c){var e=Sa(a).bottom-c.repeat+1;return d(e,la(a.getLine(e)))},expandToLine:function(a,b,c){var e=b;return d(e.line+c.repeat-1,1/0)},findNext:function(a,b,c){var d=Aa(a),e=d.getQuery();if(e){var f=!c.forward;return f=d.isReversed()?!f:f,Oa(a,e),Pa(a,f,e,c.repeat)}},goToMark:function(a,b,c,d){var e=Ta(a,d,c.selectedCharacter);return e?c.linewise?{line:e.line,ch:la(a.getLine(e.line))}:e:null},moveToOtherHighlightedEnd:function(a,b,c,e){if(e.visualBlock&&c.sameLine){var f=e.sel;return[J(a,d(f.anchor.line,f.head.ch)),J(a,d(f.head.line,f.anchor.ch))]}return[e.sel.head,e.sel.anchor]},jumpToMark:function(a,b,c,e){for(var f=b,g=0;g<c.repeat;g++){var h=f;for(var i in e.marks)if(n(i)){var j=e.marks[i].find(),k=c.forward?T(j,h):T(h,j);if(!(k||c.linewise&&j.line==h.line)){var l=S(h,f),m=c.forward?W(h,j,f):W(f,j,h);(l||m)&&(f=j)}}}return c.linewise&&(f=d(f.line,la(a.getLine(f.line)))),f},moveByCharacters:function(a,b,c){var e=b,f=c.repeat,g=c.forward?e.ch+f:e.ch-f;return d(e.line,g)},moveByLines:function(a,b,c,e){var f=b,g=f.ch;switch(e.lastMotion){case this.moveByLines:case this.moveByDisplayLines:case this.moveByScroll:case this.moveToColumn:case this.moveToEol:g=e.lastHPos;break;default:e.lastHPos=g}var h=c.repeat+(c.repeatOffset||0),i=c.forward?f.line+h:f.line-h,j=a.firstLine(),k=a.lastLine();return i<j&&f.line==j?this.moveToStartOfLine(a,b,c,e):i>k&&f.line==k?this.moveToEol(a,b,c,e):(c.toFirstChar&&(g=la(a.getLine(i)),e.lastHPos=g),e.lastHSPos=a.charCoords(d(i,g),"div").left,d(i,g))},moveByDisplayLines:function(a,b,c,e){var f=b;switch(e.lastMotion){case this.moveByDisplayLines:case this.moveByScroll:case this.moveByLines:case this.moveToColumn:case this.moveToEol:break;default:e.lastHSPos=a.charCoords(f,"div").left}var g=c.repeat,h=a.findPosV(f,c.forward?g:-g,"line",e.lastHSPos);if(h.hitSide)if(c.forward)var i=a.charCoords(h,"div"),j={top:i.top+8,left:e.lastHSPos},h=a.coordsChar(j,"div");else{var k=a.charCoords(d(a.firstLine(),0),"div");k.left=e.lastHSPos,h=a.coordsChar(k,"div")}return e.lastHPos=h.ch,h},moveByPage:function(a,b,c){var d=b,e=c.repeat;return a.findPosV(d,c.forward?e:-e,"page")},moveByParagraph:function(a,b,c){var d=c.forward?1:-1;return wa(a,b,c.repeat,d)},moveByScroll:function(a,b,c,d){var e=a.getScrollInfo(),f=null,g=c.repeat;g||(g=e.clientHeight/(2*a.defaultTextHeight()));var h=a.charCoords(b,"local");c.repeat=g;var f=zb.moveByDisplayLines(a,b,c,d);if(!f)return null;var i=a.charCoords(f,"local");return a.scrollTo(null,e.top+i.top-h.top),f},moveByWords:function(a,b,c){return ra(a,b,c.repeat,!!c.forward,!!c.wordEnd,!!c.bigWord)},moveTillCharacter:function(a,b,c){var d=c.repeat,e=sa(a,d,c.forward,c.selectedCharacter),f=c.forward?-1:1;return oa(f,c),e?(e.ch+=f,e):null},moveToCharacter:function(a,b,c){var d=c.repeat;return oa(0,c),sa(a,d,c.forward,c.selectedCharacter)||b},moveToSymbol:function(a,b,c){var d=c.repeat;return pa(a,d,c.forward,c.selectedCharacter)||b},moveToColumn:function(a,b,c,d){var e=c.repeat;return d.lastHPos=e-1,d.lastHSPos=a.charCoords(b,"div").left,ta(a,e)},moveToEol:function(a,b,c,e){var f=b;e.lastHPos=1/0;var g=d(f.line+c.repeat-1,1/0),h=a.clipPos(g);return h.ch--,e.lastHSPos=a.charCoords(h,"div").left,g},moveToFirstNonWhiteSpaceCharacter:function(a,b){var c=b;return d(c.line,la(a.getLine(c.line)))},moveToMatchedSymbol:function(a,b){var c,e=b,f=e.line,g=e.ch,h=a.getLine(f);do if(c=h.charAt(g++),c&&o(c)){var i=a.getTokenTypeAt(d(f,g));if("string"!==i&&"comment"!==i)break}while(c);if(c){var j=a.findMatchingBracket(d(f,g));return j.to}return e},moveToStartOfLine:function(a,b){return d(b.line,0)},moveToLineOrEdgeOfDocument:function(a,b,c){var e=c.forward?a.lastLine():a.firstLine();return c.repeatIsExplicit&&(e=c.repeat-a.getOption("firstLineNumber")),d(e,la(a.getLine(e)))},textObjectManipulation:function(a,b,c,d){var e={"(":")",")":"(","{":"}","}":"{","[":"]","]":"["},f={"'":!0,'"':!0},g=c.selectedCharacter;"b"==g?g="(":"B"==g&&(g="{");var h,i=!c.textObjectInner;if(e[g])h=xa(a,b,g,i);else if(f[g])h=ya(a,b,g,i);else if("W"===g)h=ma(a,i,!0,!0);else if("w"===g)h=ma(a,i,!0,!1);else{if("p"!==g)return null;if(h=wa(a,b,c.repeat,0,i),c.linewise=!0,d.visualMode)d.visualLine||(d.visualLine=!0);else{var j=d.inputState.operatorArgs;j&&(j.linewise=!0),h.end.line--}}return a.state.vim.visualMode?ea(a,h.start,h.end):[h.start,h.end]},repeatLastCharacterSearch:function(a,b,c){var d=vb.lastCharacterSearch,e=c.repeat,f=c.forward===d.forward,g=(d.increment?1:0)*(f?-1:1);a.moveH(-g,"char"),c.inclusive=!!f;var h=sa(a,e,f,d.selectedCharacter);
-return h?(h.ch+=g,h):(a.moveH(g,"char"),b)}},Ab={change:function(b,c,e){var f,g,h=b.state.vim;if(vb.macroModeState.lastInsertModeChanges.inVisualBlock=h.visualBlock,h.visualMode){g=b.getSelection();var i=G("",e.length);b.replaceSelections(i),f=U(e[0].head,e[0].anchor)}else{var j=e[0].anchor,k=e[0].head;g=b.getRange(j,k);var l=h.lastEditInputState||{};if("moveByWords"==l.motion&&!r(g)){var m=/\s+$/.exec(g);m&&l.motionArgs&&l.motionArgs.forward&&(k=L(k,0,-m[0].length),g=g.slice(0,-m[0].length))}var n=new d(j.line-1,Number.MAX_VALUE),o=b.firstLine()==b.lastLine();k.line>b.lastLine()&&c.linewise&&!o?b.replaceRange("",n,k):b.replaceRange("",j,k),c.linewise&&(o||(b.setCursor(n),a.commands.newlineAndIndent(b)),j.ch=Number.MAX_VALUE),f=j}vb.registerController.pushText(c.registerName,"change",g,c.linewise,e.length>1),Bb.enterInsertMode(b,{head:f},b.state.vim)},delete:function(a,b,c){var e,f,g=a.state.vim;if(g.visualBlock){f=a.getSelection();var h=G("",c.length);a.replaceSelections(h),e=c[0].anchor}else{var i=c[0].anchor,j=c[0].head;b.linewise&&j.line!=a.firstLine()&&i.line==a.lastLine()&&i.line==j.line-1&&(i.line==a.firstLine()?i.ch=0:i=d(i.line-1,X(a,i.line-1))),f=a.getRange(i,j),a.replaceRange("",i,j),e=i,b.linewise&&(e=zb.moveToFirstNonWhiteSpaceCharacter(a,i))}return vb.registerController.pushText(b.registerName,"delete",f,b.linewise,g.visualBlock),J(a,e)},indent:function(a,b,c){var d=a.state.vim,e=c[0].anchor.line,f=d.visualBlock?c[c.length-1].anchor.line:c[0].head.line,g=d.visualMode?b.repeat:1;b.linewise&&f--;for(var h=e;h<=f;h++)for(var i=0;i<g;i++)a.indentLine(h,b.indentRight);return zb.moveToFirstNonWhiteSpaceCharacter(a,c[0].anchor)},changeCase:function(a,b,c,d,e){for(var f=a.getSelections(),g=[],h=b.toLower,i=0;i<f.length;i++){var j=f[i],k="";if(h===!0)k=j.toLowerCase();else if(h===!1)k=j.toUpperCase();else for(var l=0;l<j.length;l++){var m=j.charAt(l);k+=q(m)?m.toLowerCase():m.toUpperCase()}g.push(k)}return a.replaceSelections(g),b.shouldMoveCursor?e:!a.state.vim.visualMode&&b.linewise&&c[0].anchor.line+1==c[0].head.line?zb.moveToFirstNonWhiteSpaceCharacter(a,d):b.linewise?d:U(c[0].anchor,c[0].head)},yank:function(a,b,c,d){var e=a.state.vim,f=a.getSelection(),g=e.visualMode?U(e.sel.anchor,e.sel.head,c[0].head,c[0].anchor):d;return vb.registerController.pushText(b.registerName,"yank",f,b.linewise,e.visualBlock),g}},Bb={jumpListWalk:function(a,b,c){if(!c.visualMode){var d=b.repeat,e=b.forward,f=vb.jumpList,g=f.move(a,e?d:-d),h=g?g.find():void 0;h=h?h:a.getCursor(),a.setCursor(h)}},scroll:function(a,b,c){if(!c.visualMode){var d=b.repeat||1,e=a.defaultTextHeight(),f=a.getScrollInfo().top,g=e*d,h=b.forward?f+g:f-g,i=R(a.getCursor()),j=a.charCoords(i,"local");if(b.forward)h>j.top?(i.line+=(h-j.top)/e,i.line=Math.ceil(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.top)):a.scrollTo(null,h);else{var k=h+a.getScrollInfo().clientHeight;k<j.bottom?(i.line-=(j.bottom-k)/e,i.line=Math.floor(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.bottom-a.getScrollInfo().clientHeight)):a.scrollTo(null,h)}}},scrollToCursor:function(a,b){var c=a.getCursor().line,e=a.charCoords(d(c,0),"local"),f=a.getScrollInfo().clientHeight,g=e.top,h=e.bottom-g;switch(b.position){case"center":g=g-f/2+h;break;case"bottom":g=g-f+h}a.scrollTo(null,g)},replayMacro:function(a,b,c){var d=b.selectedCharacter,e=b.repeat,f=vb.macroModeState;for("@"==d&&(d=f.latestRegister);e--;)Ya(a,c,f,d)},enterMacroRecordMode:function(a,b){var c=vb.macroModeState,d=b.selectedCharacter;c.enterMacroRecordMode(a,d)},toggleOverwrite:function(b){b.state.overwrite?(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})):(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"}))},enterInsertMode:function(b,c,e){if(!b.getOption("readOnly")){e.insertMode=!0,e.insertModeRepeat=c&&c.repeat||1;var f=c?c.insertAt:null,g=e.sel,h=c.head||b.getCursor("head"),i=b.listSelections().length;if("eol"==f)h=d(h.line,X(b,h.line));else if("charAfter"==f)h=L(h,0,1);else if("firstNonBlank"==f)h=zb.moveToFirstNonWhiteSpaceCharacter(b,h);else if("startOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.min(g.head.ch,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line<g.anchor.line?g.head:d(g.anchor.line,0);else if("endOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.max(g.head.ch+1,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line>=g.anchor.line?L(g.head,0,1):d(g.anchor.line,0);else if("inplace"==f&&e.visualMode)return;b.setOption("disableInput",!1),c&&c.replace?(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"})):(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})),vb.macroModeState.isPlaying||(b.on("change",ab),a.on(b.getInputField(),"keydown",fb)),e.visualMode&&ia(b),aa(b,h,i)}},toggleVisualMode:function(b,c,e){var f,g=c.repeat,h=b.getCursor();e.visualMode?e.visualLine^c.linewise||e.visualBlock^c.blockwise?(e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b)):ia(b):(e.visualMode=!0,e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,f=J(b,d(h.line,h.ch+g-1),!0),e.sel={anchor:h,head:f},a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b),ua(b,e,"<",U(h,f)),ua(b,e,">",V(h,f)))},reselectLastSelection:function(b,c,d){var e=d.lastSelection;if(d.visualMode&&da(b,d),e){var f=e.anchorMark.find(),g=e.headMark.find();if(!f||!g)return;d.sel={anchor:f,head:g},d.visualMode=!0,d.visualLine=e.visualLine,d.visualBlock=e.visualBlock,fa(b),ua(b,d,"<",U(f,g)),ua(b,d,">",V(f,g)),a.signal(b,"vim-mode-change",{mode:"visual",subMode:d.visualLine?"linewise":d.visualBlock?"blockwise":""})}},joinLines:function(a,b,c){var e,f;if(c.visualMode){if(e=a.getCursor("anchor"),f=a.getCursor("head"),T(f,e)){var g=f;f=e,e=g}f.ch=X(a,f.line)-1}else{var h=Math.max(b.repeat,2);e=a.getCursor(),f=J(a,d(e.line+h-1,1/0))}for(var i=0,j=e.line;j<f.line;j++){i=X(a,e.line);var g=d(e.line+1,X(a,e.line+1)),k=a.getRange(e,g);k=k.replace(/\n\s*/g," "),a.replaceRange(k,e,g)}var l=d(e.line,i);c.visualMode&&ia(a,!1),a.setCursor(l)},newLineAndEnterInsertMode:function(b,c,e){e.insertMode=!0;var f=R(b.getCursor());if(f.line!==b.firstLine()||c.after){f.line=c.after?f.line:f.line-1,f.ch=X(b,f.line),b.setCursor(f);var g=a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent;g(b)}else b.replaceRange("\n",d(b.firstLine(),0)),b.setCursor(b.firstLine(),0);this.enterInsertMode(b,{repeat:c.repeat},e)},paste:function(a,b,c){var e=R(a.getCursor()),f=vb.registerController.getRegister(b.registerName),g=f.toString();if(g){if(b.matchIndent){var h=a.getOption("tabSize"),i=function(a){var b=a.split("\t").length-1,c=a.split(" ").length-1;return b*h+1*c},j=a.getLine(a.getCursor().line),k=i(j.match(/^\s*/)[0]),l=g.replace(/\n$/,""),m=g!==l,n=i(g.match(/^\s*/)[0]),g=l.replace(/^\s*/gm,(function(b){var c=k+(i(b)-n);if(c<0)return"";if(a.getOption("indentWithTabs")){var d=Math.floor(c/h);return Array(d+1).join("\t")}return Array(c+1).join(" ")}));g+=m?"\n":""}if(b.repeat>1)var g=Array(b.repeat+1).join(g);var o=f.linewise,p=f.blockwise;if(o)c.visualMode?g=c.visualLine?g.slice(0,-1):"\n"+g.slice(0,g.length-1)+"\n":b.after?(g="\n"+g.slice(0,g.length-1),e.ch=X(a,e.line)):e.ch=0;else{if(p){g=g.split("\n");for(var q=0;q<g.length;q++)g[q]=""==g[q]?" ":g[q]}e.ch+=b.after?1:0}var r,s;if(c.visualMode){c.lastPastedText=g;var t,u=ca(a,c),v=u[0],w=u[1],x=a.getSelection(),y=a.listSelections(),z=new Array(y.length).join("1").split("1");c.lastSelection&&(t=c.lastSelection.headMark.find()),vb.registerController.unnamedRegister.setText(x),p?(a.replaceSelections(z),w=d(v.line+g.length-1,v.ch),a.setCursor(v),_(a,w),a.replaceSelections(g),r=v):c.visualBlock?(a.replaceSelections(z),a.setCursor(v),a.replaceRange(g,v,v),r=v):(a.replaceRange(g,v,w),r=a.posFromIndex(a.indexFromPos(v)+g.length-1)),t&&(c.lastSelection.headMark=a.setBookmark(t)),o&&(r.ch=0)}else if(p){a.setCursor(e);for(var q=0;q<g.length;q++){var A=e.line+q;A>a.lastLine()&&a.replaceRange("\n",d(A,0));var B=X(a,A);B<e.ch&&$(a,A,e.ch)}a.setCursor(e),_(a,d(e.line+g.length-1,e.ch)),a.replaceSelections(g),r=e}else a.replaceRange(g,e),o&&b.after?r=d(e.line+1,la(a.getLine(e.line+1))):o&&!b.after?r=d(e.line,la(a.getLine(e.line))):!o&&b.after?(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length-1)):(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length));c.visualMode&&ia(a,!1),a.setCursor(r)}},undo:function(b,c){b.operation((function(){Q(b,a.commands.undo,c.repeat)(),b.setCursor(b.getCursor("anchor"))}))},redo:function(b,c){Q(b,a.commands.redo,c.repeat)()},setRegister:function(a,b,c){c.inputState.registerName=b.selectedCharacter},setMark:function(a,b,c){var d=b.selectedCharacter;ua(a,c,d,a.getCursor())},replace:function(b,c,e){var f,g,h=c.selectedCharacter,i=b.getCursor(),j=b.listSelections();if(e.visualMode)i=b.getCursor("start"),g=b.getCursor("end");else{var k=b.getLine(i.line);f=i.ch+c.repeat,f>k.length&&(f=k.length),g=d(i.line,f)}if("\n"==h)e.visualMode||b.replaceRange("",i,g),(a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent)(b);else{var l=b.getRange(i,g);if(l=l.replace(/[^\n]/g,h),e.visualBlock){var m=new Array(b.getOption("tabSize")+1).join(" ");l=b.getSelection(),l=l.replace(/\t/g,m).replace(/[^\n]/g,h).split("\n"),b.replaceSelections(l)}else b.replaceRange(l,i,g);e.visualMode?(i=T(j[0].anchor,j[0].head)?j[0].anchor:j[0].head,b.setCursor(i),ia(b,!1)):b.setCursor(L(g,0,-1))}},incrementNumberToken:function(a,b){for(var c,e,f,g,h,i=a.getCursor(),j=a.getLine(i.line),k=/-?\d+/g;null!==(c=k.exec(j))&&(h=c[0],e=c.index,f=e+h.length,!(i.ch<f)););if((b.backtrack||!(f<=i.ch))&&h){var l=b.increase?1:-1,m=parseInt(h)+l*b.repeat,n=d(i.line,e),o=d(i.line,f);g=m.toString(),a.replaceRange(g,n,o),a.setCursor(d(i.line,e+g.length-1))}},repeatLastEdit:function(a,b,c){var d=c.lastEditInputState;if(d){var e=b.repeat;e&&b.repeatIsExplicit?c.lastEditInputState.repeatOverride=e:e=c.lastEditInputState.repeatOverride||e,gb(a,c,e,!1)}},indent:function(a,b){a.indentLine(a.getCursor().line,b.indentRight)},exitInsertMode:Va},Cb={"(":"bracket",")":"bracket","{":"bracket","}":"bracket","[":"section","]":"section","*":"comment","/":"comment",m:"method",M:"method","#":"preprocess"},Db={bracket:{isComplete:function(a){if(a.nextCh===a.symb){if(a.depth++,a.depth>=1)return!0}else a.nextCh===a.reverseSymb&&a.depth--;return!1}},section:{init:function(a){a.curMoveThrough=!0,a.symb=(a.forward?"]":"[")===a.symb?"{":"}"},isComplete:function(a){return 0===a.index&&a.nextCh===a.symb}},comment:{isComplete:function(a){var b="*"===a.lastCh&&"/"===a.nextCh;return a.lastCh=a.nextCh,b}},method:{init:function(a){a.symb="m"===a.symb?"{":"}",a.reverseSymb="{"===a.symb?"}":"{"},isComplete:function(a){return a.nextCh===a.symb}},preprocess:{init:function(a){a.index=0},isComplete:function(a){if("#"===a.nextCh){var b=a.lineText.match(/#(\w+)/)[1];if("endif"===b){if(a.forward&&0===a.depth)return!0;a.depth++}else if("if"===b){if(!a.forward&&0===a.depth)return!0;a.depth--}if("else"===b&&0===a.depth)return!0}return!1}}};t("pcre",!0,"boolean"),za.prototype={getQuery:function(){return vb.query},setQuery:function(a){vb.query=a},getOverlay:function(){return this.searchOverlay},setOverlay:function(a){this.searchOverlay=a},isReversed:function(){return vb.isReversed},setReversed:function(a){vb.isReversed=a},getScrollbarAnnotate:function(){return this.annotate},setScrollbarAnnotate:function(a){this.annotate=a}};var Eb={"\\n":"\n","\\r":"\r","\\t":"\t"},Fb={"\\/":"/","\\\\":"\\","\\n":"\n","\\r":"\r","\\t":"\t"},Gb="(Javascript regexp)",Hb=function(){this.buildCommandMap_()};Hb.prototype={processCommand:function(a,b,c){var d=this;a.operation((function(){a.curOp.isVimOp=!0,d._processCommand(a,b,c)}))},_processCommand:function(b,c,d){var e=b.state.vim,f=vb.registerController.getRegister(":"),g=f.toString();e.visualMode&&ia(b);var h=new a.StringStream(c);f.setText(c);var i=d||{};i.input=c;try{this.parseInput_(b,h,i)}catch(a){throw Ia(b,a),a}var j,k;if(i.commandName){if(j=this.matchCommand_(i.commandName)){if(k=j.name,j.excludeFromCommandHistory&&f.setText(g),this.parseCommandArgs_(h,i,j),"exToKey"==j.type){for(var l=0;l<j.toKeys.length;l++)a.Vim.handleKey(b,j.toKeys[l],"mapping");return}if("exToEx"==j.type)return void this.processCommand(b,j.toInput)}}else void 0!==i.line&&(k="move");if(!k)return void Ia(b,'Not an editor command ":'+c+'"');try{Ib[k](b,i),j&&j.possiblyAsync||!i.callback||i.callback()}catch(a){throw Ia(b,a),a}},parseInput_:function(a,b,c){b.eatWhile(":"),b.eat("%")?(c.line=a.firstLine(),c.lineEnd=a.lastLine()):(c.line=this.parseLineSpec_(a,b),void 0!==c.line&&b.eat(",")&&(c.lineEnd=this.parseLineSpec_(a,b)));var d=b.match(/^(\w+)/);return d?c.commandName=d[1]:c.commandName=b.match(/.*/)[0],c},parseLineSpec_:function(a,b){var c=b.match(/^(\d+)/);if(c)return parseInt(c[1],10)-1;switch(b.next()){case".":return a.getCursor().line;case"$":return a.lastLine();case"'":var d=b.next(),e=Ta(a,a.state.vim,d);if(!e)throw new Error("Mark not set");return e.line;default:return void b.backUp(1)}},parseCommandArgs_:function(a,b,c){if(!a.eol()){b.argString=a.match(/.*/)[0];var d=c.argDelimiter||/\s+/,e=Y(b.argString).split(d);e.length&&e[0]&&(b.args=e)}},matchCommand_:function(a){for(var b=a.length;b>0;b--){var c=a.substring(0,b);if(this.commandMap_[c]){var d=this.commandMap_[c];if(0===d.name.indexOf(a))return d}}return null},buildCommandMap_:function(){this.commandMap_={};for(var a=0;a<c.length;a++){var b=c[a],d=b.shortName||b.name;this.commandMap_[d]=b}},map:function(a,c,d){if(":"!=a&&":"==a.charAt(0)){if(d)throw Error("Mode not supported for ex mappings");var e=a.substring(1);":"!=c&&":"==c.charAt(0)?this.commandMap_[e]={name:e,type:"exToEx",toInput:c.substring(1),user:!0}:this.commandMap_[e]={name:e,type:"exToKey",toKeys:c,user:!0}}else if(":"!=c&&":"==c.charAt(0)){var f={keys:a,type:"keyToEx",exArgs:{input:c.substring(1)}};d&&(f.context=d),b.unshift(f)}else{var f={keys:a,type:"keyToKey",toKeys:c};d&&(f.context=d),b.unshift(f)}},unmap:function(a,c){if(":"!=a&&":"==a.charAt(0)){if(c)throw Error("Mode not supported for ex mappings");var d=a.substring(1);if(this.commandMap_[d]&&this.commandMap_[d].user)return void delete this.commandMap_[d]}else for(var e=a,f=0;f<b.length;f++)if(e==b[f].keys&&b[f].context===c)return void b.splice(f,1);throw Error("No such mapping.")}};var Ib={colorscheme:function(a,b){return!b.args||b.args.length<1?void Ia(a,a.getOption("theme")):void a.setOption("theme",b.args[0])},map:function(a,b,c){var d=b.args;return!d||d.length<2?void(a&&Ia(a,"Invalid mapping: "+b.input)):void Jb.map(d[0],d[1],c)},imap:function(a,b){this.map(a,b,"insert")},nmap:function(a,b){this.map(a,b,"normal")},vmap:function(a,b){this.map(a,b,"visual")},unmap:function(a,b,c){var d=b.args;return!d||d.length<1?void(a&&Ia(a,"No such mapping: "+b.input)):void Jb.unmap(d[0],c)},move:function(a,b){yb.processCommand(a,a.state.vim,{type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0},repeatOverride:b.line+1})},set:function(a,b){var c=b.args,d=b.setCfg||{};if(!c||c.length<1)return void(a&&Ia(a,"Invalid mapping: "+b.input));var e=c[0].split("="),f=e[0],g=e[1],h=!1;if("?"==f.charAt(f.length-1)){if(g)throw Error("Trailing characters: "+b.argString);f=f.substring(0,f.length-1),h=!0}void 0===g&&"no"==f.substring(0,2)&&(f=f.substring(2),g=!1);var i=sb[f]&&"boolean"==sb[f].type;if(i&&void 0==g&&(g=!0),!i&&void 0===g||h){var j=v(f,a,d);j===!0||j===!1?Ia(a," "+(j?"":"no")+f):Ia(a,"  "+f+"="+j)}else u(f,g,a,d)},setlocal:function(a,b){b.setCfg={scope:"local"},this.set(a,b)},setglobal:function(a,b){b.setCfg={scope:"global"},this.set(a,b)},registers:function(a,b){var c=b.args,d=vb.registerController.registers,e="----------Registers----------<br><br>";if(c){var f;c=c.join("");for(var g=0;g<c.length;g++)if(f=c.charAt(g),vb.registerController.isValidRegister(f)){var h=d[f]||new B;e+='"'+f+"    "+h.toString()+"<br>"}}else for(var f in d){var i=d[f].toString();i.length&&(e+='"'+f+"    "+i+"<br>")}Ia(a,e)},sort:function(b,c){function e(){if(c.argString){var b=new a.StringStream(c.argString);if(b.eat("!")&&(h=!0),b.eol())return;if(!b.eatSpace())return"Invalid arguments";var d=b.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);if(!d&&!b.eol())return"Invalid arguments";if(d[1]){i=d[1].indexOf("i")!=-1,j=d[1].indexOf("u")!=-1;var e=d[1].indexOf("d")!=-1||d[1].indexOf("n")!=-1&&1,f=d[1].indexOf("x")!=-1&&1,g=d[1].indexOf("o")!=-1&&1;if(e+f+g>1)return"Invalid arguments";k=e&&"decimal"||f&&"hex"||g&&"octal"}d[2]&&(l=new RegExp(d[2].substr(1,d[2].length-2),i?"i":""))}}function f(a,b){if(h){var c;c=a,a=b,b=c}i&&(a=a.toLowerCase(),b=b.toLowerCase());var d=k&&s.exec(a),e=k&&s.exec(b);return d?(d=parseInt((d[1]+d[2]).toLowerCase(),t),e=parseInt((e[1]+e[2]).toLowerCase(),t),d-e):a<b?-1:1}function g(a,b){if(h){var c;c=a,a=b,b=c}return i&&(a[0]=a[0].toLowerCase(),b[0]=b[0].toLowerCase()),a[0]<b[0]?-1:1}var h,i,j,k,l,m=e();if(m)return void Ia(b,m+": "+c.argString);var n=c.line||b.firstLine(),o=c.lineEnd||c.line||b.lastLine();if(n!=o){var p=d(n,0),q=d(o,X(b,o)),r=b.getRange(p,q).split("\n"),s=l?l:"decimal"==k?/(-?)([\d]+)/:"hex"==k?/(-?)(?:0x)?([0-9a-f]+)/i:"octal"==k?/([0-7]+)/:null,t="decimal"==k?10:"hex"==k?16:"octal"==k?8:null,u=[],v=[];if(k||l)for(var w=0;w<r.length;w++){var x=l?r[w].match(l):null;x&&""!=x[0]?u.push(x):!l&&s.exec(r[w])?u.push(r[w]):v.push(r[w])}else v=r;if(u.sort(l?g:f),l)for(var w=0;w<u.length;w++)u[w]=u[w].input;else k||v.sort(f);if(r=h?u.concat(v):v.concat(u),j){var y,z=r;r=[];for(var w=0;w<z.length;w++)z[w]!=y&&r.push(z[w]),y=z[w]}b.replaceRange(r.join("\n"),p,q)}},global:function(a,b){var c=b.argString;if(!c)return void Ia(a,"Regular Expression missing from global");var d,e=void 0!==b.line?b.line:a.firstLine(),f=b.lineEnd||b.line||a.lastLine(),g=Ca(c),h=c;if(g.length&&(h=g[0],d=g.slice(1,g.length).join("/")),h)try{Ma(a,h,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+h)}for(var i=Aa(a).getQuery(),j=[],k="",l=e;l<=f;l++){var m=i.test(a.getLine(l));m&&(j.push(l+1),k+=a.getLine(l)+"<br>")}if(!d)return void Ia(a,k);var n=0,o=function(){if(n<j.length){var b=j[n]+d;Jb.processCommand(a,b,{callback:o})}n++};o()},substitute:function(a,b){if(!a.getSearchCursor)throw new Error("Search feature not available. Requires searchcursor.js or any other getSearchCursor implementation.");var c,e,f,g,h=b.argString,i=h?Ca(h):[],j="",k=!1,l=!1;if(i.length)c=i[0],j=i[1],void 0!==j&&(j=v("pcre")?Ga(j):Fa(j),vb.lastSubstituteReplacePart=j),e=i[2]?i[2].split(" "):[];else if(h&&h.length)return void Ia(a,"Substitutions should be of the form :s/pattern/replace/");if(e&&(f=e[0],g=parseInt(e[1]),f&&(f.indexOf("c")!=-1&&(k=!0,f.replace("c","")),f.indexOf("g")!=-1&&(l=!0,f.replace("g","")),c=c+"/"+f)),c)try{Ma(a,c,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+c)}if(j=j||vb.lastSubstituteReplacePart,void 0===j)return void Ia(a,"No previous substitute regular expression");var m=Aa(a),n=m.getQuery(),o=void 0!==b.line?b.line:a.getCursor().line,p=b.lineEnd||o;o==a.firstLine()&&p==a.lastLine()&&(p=1/0),g&&(o=p,p=o+g-1);var q=J(a,d(o,0)),r=a.getSearchCursor(n,q);Ua(a,k,l,o,p,r,n,j,b.callback)},redo:a.commands.redo,undo:a.commands.undo,write:function(b){a.commands.save?a.commands.save(b):b.save&&b.save()},nohlsearch:function(a){Qa(a)},yank:function(a){var b=R(a.getCursor()),c=b.line,d=a.getLine(c);vb.registerController.pushText("0","yank",d,!0,!0)},delmarks:function(b,c){if(!c.argString||!Y(c.argString))return void Ia(b,"Argument required");for(var d=b.state.vim,e=new a.StringStream(Y(c.argString));!e.eol();){e.eatSpace();var f=e.pos;if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var g=e.next();if(e.match("-",!0)){if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var h=g,i=e.next();if(!(n(h)&&n(i)||q(h)&&q(i)))return void Ia(b,"Invalid argument: "+h+"-");var j=h.charCodeAt(0),k=i.charCodeAt(0);if(j>=k)return void Ia(b,"Invalid argument: "+c.argString.substring(f));for(var l=0;l<=k-j;l++){var m=String.fromCharCode(j+l);delete d.marks[m]}}else delete d.marks[g]}}},Jb=new Hb;return a.keyMap.vim={attach:h,detach:g,call:i},t("insertModeEscKeysTimeout",200,"number"),a.keyMap["vim-insert"]={fallthrough:["default"],attach:h,detach:g,call:i},a.keyMap["vim-replace"]={Backspace:"goCharLeft",fallthrough:["vim-insert"],attach:h,detach:g,call:i},y(),xb};a.Vim=e()}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.getWrapperElement();a.state.fullScreenRestore={scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,width:b.style.width,height:b.style.height},b.style.width="",b.style.height="auto",b.className+=" CodeMirror-fullscreen",document.documentElement.style.overflow="hidden",a.refresh()}function c(a){var b=a.getWrapperElement();b.className=b.className.replace(/\s*CodeMirror-fullscreen\b/,""),document.documentElement.style.overflow="";var c=a.state.fullScreenRestore;b.style.width=c.width,b.style.height=c.height,window.scrollTo(c.scrollLeft,c.scrollTop),a.refresh()}a.defineOption("fullScreen",!1,(function(d,e,f){f==a.Init&&(f=!1),!f!=!e&&(e?b(d):c(d))}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,c,d){this.cm=a,this.node=b,this.options=c,this.height=d,this.cleared=!1}function c(a){var b=a.getWrapperElement(),c=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,d=parseInt(c.height),e=a.state.panels={setHeight:b.style.height,heightLeft:d,panels:0,wrapper:document.createElement("div")};b.parentNode.insertBefore(e.wrapper,b);var f=a.hasFocus();e.wrapper.appendChild(b),f&&a.focus(),a._setSize=a.setSize,null!=d&&(a.setSize=function(b,c){if(null==c)return this._setSize(b,c);if(e.setHeight=c,"number"!=typeof c){var f=/^(\d+\.?\d*)px$/.exec(c);f?c=Number(f[1]):(e.wrapper.style.height=c,c=e.wrapper.offsetHeight,e.wrapper.style.height="")}a._setSize(b,e.heightLeft+=c-d),d=c})}function d(a){var b=a.state.panels;a.state.panels=null;var c=a.getWrapperElement();b.wrapper.parentNode.replaceChild(c,b.wrapper),c.style.height=b.setHeight,a.setSize=a._setSize,a.setSize()}function e(a,b){for(var c=b.nextSibling;c;c=c.nextSibling)if(c==a.getWrapperElement())return!0;return!1}a.defineExtension("addPanel",(function(a,d){d=d||{},this.state.panels||c(this);var f=this.state.panels,g=f.wrapper,h=this.getWrapperElement();d.after instanceof b&&!d.after.cleared?g.insertBefore(a,d.before.node.nextSibling):d.before instanceof b&&!d.before.cleared?g.insertBefore(a,d.before.node):d.replace instanceof b&&!d.replace.cleared?(g.insertBefore(a,d.replace.node),d.replace.clear()):"bottom"==d.position?g.appendChild(a):"before-bottom"==d.position?g.insertBefore(a,h.nextSibling):"after-top"==d.position?g.insertBefore(a,h):g.insertBefore(a,g.firstChild);var i=d&&d.height||a.offsetHeight;return this._setSize(null,f.heightLeft-=i),f.panels++,d.stable&&e(this,a)&&this.scrollTo(null,this.getScrollInfo().top+i),new b(this,a,d,i)})),b.prototype.clear=function(){if(!this.cleared){this.cleared=!0;var a=this.cm.state.panels;this.cm._setSize(null,a.heightLeft+=this.height),this.options.stable&&e(this.cm,this.node)&&this.cm.scrollTo(null,this.cm.getScrollInfo().top-this.height),a.wrapper.removeChild(this.node),0==--a.panels&&d(this.cm)}},b.prototype.changed=function(a){var b=null==a?this.node.offsetHeight:a,c=this.cm.state.panels;this.cm._setSize(null,c.heightLeft-=b-this.height),this.height=b}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b){return"pairs"==b&&"string"==typeof a?a:"object"==typeof a&&null!=a[b]?a[b]:m[b]}function c(a){return function(b){return h(b,a)}}function d(a){var b=a.state.closeBrackets;if(!b||b.override)return b;var c=a.getModeAt(a.getCursor());return c.closeBrackets||b}function e(c){var e=d(c);if(!e||c.getOption("disableInput"))return a.Pass;for(var f=b(e,"pairs"),g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=j(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}for(var h=g.length-1;h>=0;h--){var k=g[h].head;c.replaceRange("",n(k.line,k.ch-1),n(k.line,k.ch+1),"+delete")}}function f(c){var e=d(c),f=e&&b(e,"explode");if(!f||c.getOption("disableInput"))return a.Pass;for(var g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=j(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}c.operation((function(){c.replaceSelection("\n\n",null),c.execCommand("goCharLeft"),g=c.listSelections();for(var a=0;a<g.length;a++){var b=g[a].head.line;c.indentLine(b,null,!0),c.indentLine(b+1,null,!0)}}))}function g(b){var c=a.cmpPos(b.anchor,b.head)>0;return{anchor:new n(b.anchor.line,b.anchor.ch+(c?-1:1)),head:new n(b.head.line,b.head.ch+(c?1:-1))}}function h(c,e){var f=d(c);if(!f||c.getOption("disableInput"))return a.Pass;var h=b(f,"pairs"),j=h.indexOf(e);if(j==-1)return a.Pass;for(var m,o=b(f,"triples"),p=h.charAt(j+1)==e,q=c.listSelections(),r=j%2==0,s=0;s<q.length;s++){var t,u=q[s],v=u.head,w=c.getRange(v,n(v.line,v.ch+1));if(r&&!u.empty())t="surround";else if(!p&&r||w!=e)if(p&&v.ch>1&&o.indexOf(e)>=0&&c.getRange(n(v.line,v.ch-2),v)==e+e&&(v.ch<=2||c.getRange(n(v.line,v.ch-3),n(v.line,v.ch-2))!=e))t="addFour";else if(p){if(a.isWordChar(w)||!k(c,v,e))return a.Pass;t="both"}else{if(!r||c.getLine(v.line).length!=v.ch&&!i(w,h)&&!/\s/.test(w))return a.Pass;t="both"}else t=p&&l(c,v)?"both":o.indexOf(e)>=0&&c.getRange(v,n(v.line,v.ch+3))==e+e+e?"skipThree":"skip";if(m){if(m!=t)return a.Pass}else m=t}var x=j%2?h.charAt(j-1):e,y=j%2?e:h.charAt(j+1);c.operation((function(){if("skip"==m)c.execCommand("goCharRight");else if("skipThree"==m)for(var a=0;a<3;a++)c.execCommand("goCharRight");else if("surround"==m){for(var b=c.getSelections(),a=0;a<b.length;a++)b[a]=x+b[a]+y;c.replaceSelections(b,"around"),b=c.listSelections().slice();for(var a=0;a<b.length;a++)b[a]=g(b[a]);c.setSelections(b)}else"both"==m?(c.replaceSelection(x+y,null),c.triggerElectric(x+y),c.execCommand("goCharLeft")):"addFour"==m&&(c.replaceSelection(x+x+x+x,"before"),c.execCommand("goCharRight"))}))}function i(a,b){var c=b.lastIndexOf(a);return c>-1&&c%2==1}function j(a,b){var c=a.getRange(n(b.line,b.ch-1),n(b.line,b.ch+1));return 2==c.length?c:null}function k(b,c,d){var e=b.getLine(c.line),f=b.getTokenAt(c);if(/\bstring2?\b/.test(f.type)||l(b,c))return!1;var g=new a.StringStream(e.slice(0,c.ch)+d+e.slice(c.ch),4);for(g.pos=g.start=f.start;;){var h=b.getMode().token(g,f.state);if(g.pos>=c.ch+1)return/\bstring2?\b/.test(h);g.start=g.pos}}function l(a,b){var c=a.getTokenAt(n(b.line,b.ch+1));return/\bstring/.test(c.type)&&c.start==b.ch}var m={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},n=a.Pos;a.defineOption("autoCloseBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.removeKeyMap(p),b.state.closeBrackets=null),c&&(b.state.closeBrackets=c,b.addKeyMap(p))}));for(var o=m.pairs+"`",p={Backspace:e,Enter:f},q=0;q<o.length;q++)p["'"+o.charAt(q)+"'"]=c(o.charAt(q))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){function b(b){if(b.getOption("disableInput"))return a.Pass;for(var c=b.listSelections(),d=[],i=0;i<c.length;i++){if(!c[i].empty())return a.Pass;var j=c[i].head,k=b.getTokenAt(j),l=a.innerMode(b.getMode(),k.state),m=l.state;if("xml"!=l.mode.name||!m.tagName)return a.Pass;var n=b.getOption("autoCloseTags"),o="html"==l.mode.configuration,p="object"==typeof n&&n.dontCloseTags||o&&g,q="object"==typeof n&&n.indentTags||o&&h,r=m.tagName;k.end>j.ch&&(r=r.slice(0,r.length-k.end+j.ch));var s=r.toLowerCase();if(!r||"string"==k.type&&(k.end!=j.ch||!/[\"\']/.test(k.string.charAt(k.string.length-1))||1==k.string.length)||"tag"==k.type&&"closeTag"==m.type||k.string.indexOf("/")==k.string.length-1||p&&e(p,s)>-1||f(b,r,j,m,!0))return a.Pass;var t=q&&e(q,s)>-1;d[i]={indent:t,text:">"+(t?"\n\n":"")+"</"+r+">",newPos:t?a.Pos(j.line+1,0):a.Pos(j.line,j.ch+1)}}for(var i=c.length-1;i>=0;i--){var u=d[i];b.replaceRange(u.text,c[i].head,c[i].anchor,"+insert");var v=b.listSelections().slice(0);v[i]={head:u.newPos,anchor:u.newPos},b.setSelections(v),u.indent&&(b.indentLine(u.newPos.line,null,!0),b.indentLine(u.newPos.line+1,null,!0))}}function c(b,c){for(var d=b.listSelections(),e=[],g=c?"/":"</",h=0;h<d.length;h++){if(!d[h].empty())return a.Pass;var i=d[h].head,j=b.getTokenAt(i),k=a.innerMode(b.getMode(),j.state),l=k.state;if(c&&("string"==j.type||"<"!=j.string.charAt(0)||j.start!=i.ch-1))return a.Pass;var m;if("xml"!=k.mode.name)if("htmlmixed"==b.getMode().name&&"javascript"==k.mode.name)m=g+"script";else{if("htmlmixed"!=b.getMode().name||"css"!=k.mode.name)return a.Pass;m=g+"style"}else{if(!l.context||!l.context.tagName||f(b,l.context.tagName,i,l))return a.Pass;m=g+l.context.tagName}">"!=b.getLine(i.line).charAt(j.end)&&(m+=">"),e[h]=m}b.replaceSelections(e),d=b.listSelections();for(var h=0;h<d.length;h++)(h==d.length-1||d[h].head.line<d[h+1].head.line)&&b.indentLine(d[h].head.line)}function d(b){return b.getOption("disableInput")?a.Pass:c(b,!0)}function e(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;++c)if(a[c]==b)return c;return-1}function f(b,c,d,e,f){if(!a.scanForClosingTag)return!1;var g=Math.min(b.lastLine()+1,d.line+500),h=a.scanForClosingTag(b,d,null,g);if(!h||h.tag!=c)return!1;for(var i=e.context,j=f?1:0;i&&i.tagName==c;i=i.prev)++j;d=h.to;for(var k=1;k<j;k++){var l=a.scanForClosingTag(b,d,null,g);if(!l||l.tag!=c)return!1;d=l.to}return!0}a.defineOption("autoCloseTags",!1,(function(c,e,f){if(f!=a.Init&&f&&c.removeKeyMap("autoCloseTags"),e){var g={name:"autoCloseTags"};("object"!=typeof e||e.whenClosing)&&(g["'/'"]=function(a){return d(a)}),("object"!=typeof e||e.whenOpening)&&(g["'>'"]=function(a){return b(a)}),c.addKeyMap(g)}}));var g=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],h=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];a.commands.closeTag=function(a){return c(a)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,d){var e=a.getLineHandle(b.line),f=b.ch-1,i=d&&d.afterCursor;null==i&&(i=/(^| )cm-fat-cursor($| )/.test(a.getWrapperElement().className));var j=!i&&f>=0&&h[e.text.charAt(f)]||h[e.text.charAt(++f)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&d.strict&&k>0!=(f==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,f+1)),m=c(a,g(b.line,f+(k>0?1:0)),k,l||null,d);return null==m?null:{from:g(b.line,f),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(c<0?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c!=(c>0?a.lastLine():a.firstLine())&&null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j<i.length;j++){var k=i[j].empty()&&b(a,i[j].head,d);if(k&&a.getLine(k.from.line).length<=e){var l=k.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";h.push(a.markText(k.from,g(k.from.line,k.from.ch+1),{className:l})),k.to&&a.getLine(k.to.line).length<=e&&h.push(a.markText(k.to,g(k.to.line,k.to.ch+1),{className:l}))}}if(h.length){f&&a.state.focused&&a.focus();var m=function(){a.operation((function(){for(var a=0;a<h.length;a++)h[a].clear()}))};if(!c)return m;setTimeout(m,800)}}function e(a){a.operation((function(){i&&(i(),i=null),i=d(a,!1,a.state.matchBrackets)}))}var f=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),g=a.Pos,h={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"},i=null;a.defineOption("matchBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),i&&(i(),i=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))})),a.defineExtension("matchBrackets",(function(){d(this,!0)})),a.defineExtension("findMatchingBracket",(function(a,c,d){return(d||"boolean"==typeof c)&&(d?(d.strict=c,c=d):c=c?{strict:!0}:null),b(this,a,c)})),a.defineExtension("scanForBracket",(function(a,b,d,e){return c(this,a,b,d,e)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){"use strict";function b(a){a.state.tagHit&&a.state.tagHit.clear(),a.state.tagOther&&a.state.tagOther.clear(),a.state.tagHit=a.state.tagOther=null}function c(c){c.state.failedTagMatch=!1,c.operation((function(){if(b(c),!c.somethingSelected()){var d=c.getCursor(),e=c.getViewport();e.from=Math.min(e.from,d.line),e.to=Math.max(d.line+1,e.to);var f=a.findMatchingTag(c,d,e);if(f){if(c.state.matchBothTags){var g="open"==f.at?f.open:f.close;g&&(c.state.tagHit=c.markText(g.from,g.to,{className:"CodeMirror-matchingtag"}))}var h="close"==f.at?f.open:f.close;h?c.state.tagOther=c.markText(h.from,h.to,{className:"CodeMirror-matchingtag"}):c.state.failedTagMatch=!0}}}))}function d(a){a.state.failedTagMatch&&c(a)}a.defineOption("matchTags",!1,(function(e,f,g){g&&g!=a.Init&&(e.off("cursorActivity",c),e.off("viewportChange",d),b(e)),f&&(e.state.matchBothTags="object"==typeof f&&f.bothTags,e.on("cursorActivity",c),e.on("viewportChange",d),c(e))})),a.commands.toMatchingTag=function(b){var c=a.findMatchingTag(b,b.getCursor());if(c){var d="close"==c.at?c.open:c.close;d&&b.extendSelection(d.to,d.from)}}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","brace",(function(b,c){function d(d){for(var h=c.ch,i=0;;){var j=h<=0?-1:g.lastIndexOf(d,h-1);if(j!=-1){if(1==i&&j<c.ch)break;if(e=b.getTokenTypeAt(a.Pos(f,j+1)),!/^(comment|string)/.test(e))return j+1;h=j-1}else{if(1==i)break;i=1,h=g.length}}}var e,f=c.line,g=b.getLine(f),h="{",i="}",j=d("{");if(null==j&&(h="[",i="]",j=d("[")),null!=j){var k,l,m=1,n=b.lastLine();a:for(var o=f;o<=n;++o)for(var p=b.getLine(o),q=o==f?j:0;;){var r=p.indexOf(h,q),s=p.indexOf(i,q);if(r<0&&(r=p.length),s<0&&(s=p.length),q=Math.min(r,s),q==p.length)break;if(b.getTokenTypeAt(a.Pos(o,q+1))==e)if(q==r)++m;else if(!--m){k=o,l=q;break a}++q}if(null!=k&&(f!=k||l!=j))return{from:a.Pos(f,j),to:a.Pos(k,l)}}})),a.registerHelper("fold","import",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));if(/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"keyword"!=d.type||"import"!=d.string)return null;for(var e=c,f=Math.min(b.lastLine(),c+10);e<=f;++e){var g=b.getLine(e),h=g.indexOf(";");if(h!=-1)return{startCh:d.end,end:a.Pos(e,h)}}}var e,f=c.line,g=d(f);if(!g||d(f-1)||(e=d(f-2))&&e.end.line==f-1)return null;for(var h=g.end;;){var i=d(h.line+1);if(null==i)break;h=i.end}return{from:b.clipPos(a.Pos(f,g.startCh+1)),to:h}})),a.registerHelper("fold","include",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));return/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"meta"==d.type&&"#include"==d.string.slice(0,8)?d.start+8:void 0}var e=c.line,f=d(e);if(null==f||null!=d(e-1))return null;for(var g=e;;){var h=d(g+1);if(null==h)break;++g}return{from:a.Pos(e,f+1),to:b.clipPos(a.Pos(g))}}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,e,f,g){function h(a){var c=i(b,e);if(!c||c.to.line-c.from.line<j)return null;for(var d=b.findMarksAt(c.from),f=0;f<d.length;++f)if(d[f].__isFold&&"fold"!==g){if(!a)return null;c.cleared=!0,d[f].clear()}return c}if(f&&f.call){var i=f;f=null}else var i=d(b,f,"rangeFinder");"number"==typeof e&&(e=a.Pos(e,0));var j=d(b,f,"minFoldSize"),k=h(!0);if(d(b,f,"scanUp"))for(;!k&&e.line>b.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",(function(b){m.clear(),a.e_preventDefault(b)}));var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",(function(c,d){a.signal(b,"unfold",b,c,d)})),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}else c&&(c=c.cloneNode(!0));return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",(function(a,c,d){b(this,a,c,d)})),a.defineExtension("isFolded",(function(a){for(var b=this.findMarksAt(a),c=0;c<b.length;++c)if(b[c].__isFold)return!0})),a.commands.toggleFold=function(a){a.foldCode(a.getCursor())},a.commands.fold=function(a){a.foldCode(a.getCursor(),null,"fold")},a.commands.unfold=function(a){a.foldCode(a.getCursor(),null,"unfold")},a.commands.foldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"fold")}))},a.commands.unfoldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"unfold")}))},a.registerHelper("fold","combine",(function(){var a=Array.prototype.slice.call(arguments,0);return function(b,c){for(var d=0;d<a.length;++d){var e=a[d](b,c);if(e)return e}}})),a.registerHelper("fold","auto",(function(a,b){for(var c=a.getHelpers(b,"fold"),d=0;d<c.length;d++){var e=c[d](a,b);if(e)return e}}));var e={rangeFinder:a.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};a.defineOption("foldOptions",null),a.defineExtension("foldOption",(function(a,b){return d(this,a,b)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options=a,this.from=this.to=0}function c(a){return a===!0&&(a={}),null==a.gutter&&(a.gutter="CodeMirror-foldgutter"),null==a.indicatorOpen&&(a.indicatorOpen="CodeMirror-foldgutter-open"),null==a.indicatorFolded&&(a.indicatorFolded="CodeMirror-foldgutter-folded"),a}function d(a,b){for(var c=a.findMarks(l(b,0),l(b+1,0)),d=0;d<c.length;++d)if(c[d].__isFold&&c[d].find().from.line==b)return c[d]}function e(a){if("string"==typeof a){var b=document.createElement("div");return b.className=a+" CodeMirror-guttermarker-subtle",b}return a.cloneNode(!0)}function f(a,b,c){var f=a.state.foldGutter.options,g=b,h=a.foldOption(f,"minFoldSize"),i=a.foldOption(f,"rangeFinder");a.eachLine(b,c,(function(b){var c=null;if(d(a,g))c=e(f.indicatorFolded);else{var j=l(g,0),k=i&&i(a,j);k&&k.to.line-k.from.line>=h&&(c=e(f.indicatorOpen))}a.setGutterMarker(b,f.gutter,c),++g}))}function g(a){var b=a.getViewport(),c=a.state.foldGutter;c&&(a.operation((function(){f(a,b.from,b.to)})),c.from=b.from,c.to=b.to)}function h(a,b,c){var e=a.state.foldGutter;if(e){var f=e.options;if(c==f.gutter){var g=d(a,b);g?g.clear():a.foldCode(l(b,0),f.rangeFinder)}}}function i(a){var b=a.state.foldGutter;if(b){var c=b.options;b.from=b.to=0,clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){g(a)}),c.foldOnChangeTimeSpan||600)}}function j(a){var b=a.state.foldGutter;if(b){var c=b.options;clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){var c=a.getViewport();b.from==b.to||c.from-b.to>20||b.from-c.to>20?g(a):a.operation((function(){c.from<b.from&&(f(a,c.from,b.from),b.from=c.from),c.to>b.to&&(f(a,b.to,c.to),b.to=c.to)}))}),c.updateViewportTimeSpan||400)}}function k(a,b){var c=a.state.foldGutter;if(c){var d=b.line;d>=c.from&&d<c.to&&f(a,d,d+1)}}a.defineOption("foldGutter",!1,(function(d,e,f){f&&f!=a.Init&&(d.clearGutter(d.state.foldGutter.options.gutter),d.state.foldGutter=null,d.off("gutterClick",h),d.off("change",i),d.off("viewportChange",j),d.off("fold",k),d.off("unfold",k),d.off("swapDoc",i)),e&&(d.state.foldGutter=new b(c(e)),g(d),d.on("gutterClick",h),d.on("change",i),d.on("viewportChange",j),d.on("fold",k),d.on("unfold",k),d.on("swapDoc",i))}));var l=a.Pos})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line-b.line||a.ch-b.ch}function c(a,b,c,d){this.line=b,this.ch=c,this.cm=a,this.text=a.getLine(b),this.min=d?Math.max(d.from,a.firstLine()):a.firstLine(),this.max=d?Math.min(d.to-1,a.lastLine()):a.lastLine()}function d(a,b){var c=a.cm.getTokenTypeAt(m(a.line,b));return c&&/\btag\b/.test(c)}function e(a){if(!(a.line>=a.max))return a.ch=0,a.text=a.cm.getLine(++a.line),!0}function f(a){if(!(a.line<=a.min))return a.text=a.cm.getLine(--a.line),a.ch=a.text.length,!0}function g(a){for(;;){var b=a.text.indexOf(">",a.ch);if(b==-1){if(e(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),f=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,f?"selfClose":"regular"}a.ch=b+1}}}function h(a){for(;;){var b=a.ch?a.text.lastIndexOf("<",a.ch-1):-1;if(b==-1){if(f(a))continue;return}if(d(a,b+1)){p.lastIndex=b,a.ch=b;var c=p.exec(a.text);if(c&&c.index==b)return c}else a.ch=b}}function i(a){for(;;){p.lastIndex=a.ch;var b=p.exec(a.text);if(!b){if(e(a))continue;return}{if(d(a,b.index+1))return a.ch=b.index+b[0].length,b;a.ch=b.index+1}}}function j(a){for(;;){var b=a.ch?a.text.lastIndexOf(">",a.ch-1):-1;if(b==-1){if(f(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),e=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,e?"selfClose":"regular"}a.ch=b}}}function k(a,b){for(var c=[];;){var d,e=i(a),f=a.line,h=a.ch-(e?e[0].length:0);if(!e||!(d=g(a)))return;if("selfClose"!=d)if(e[1]){for(var j=c.length-1;j>=0;--j)if(c[j]==e[2]){c.length=j;break}if(j<0&&(!b||b==e[2]))return{tag:e[2],from:m(f,h),to:m(a.line,a.ch)}}else c.push(e[2])}}function l(a,b){for(var c=[];;){var d=j(a);if(!d)return;if("selfClose"!=d){var e=a.line,f=a.ch,g=h(a);if(!g)return;if(g[1])c.push(g[2]);else{for(var i=c.length-1;i>=0;--i)if(c[i]==g[2]){c.length=i;break}if(i<0&&(!b||b==g[2]))return{tag:g[2],from:m(a.line,a.ch),to:m(e,f)}}}else h(a)}}var m=a.Pos,n="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",o=n+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",p=new RegExp("<(/?)(["+n+"]["+o+"]*)","g");a.registerHelper("fold","xml",(function(a,b){for(var d=new c(a,b.line,0);;){var e,f=i(d);if(!f||d.line!=b.line||!(e=g(d)))return;if(!f[1]&&"selfClose"!=e){var h=m(d.line,d.ch),j=k(d,f[2]);return j&&{from:h,to:j.from}}}})),a.findMatchingTag=function(a,d,e){var f=new c(a,d.line,d.ch,e);if(f.text.indexOf(">")!=-1||f.text.indexOf("<")!=-1){var i=g(f),j=i&&m(f.line,f.ch),n=i&&h(f);if(i&&n&&!(b(f,d)>0)){var o={from:m(f.line,f.ch),to:j,tag:n[2]};return"selfClose"==i?{open:o,close:null,at:"open"}:n[1]?{open:l(f,n[2]),close:o,at:"close"}:(f=new c(a,j.line,j.ch,e),{open:o,close:k(f,n[2]),at:"open"})}}},a.findEnclosingTag=function(a,b,d,e){for(var f=new c(a,b.line,b.ch,d);;){var g=l(f,e);if(!g)break;var h=new c(a,b.line,b.ch,d),i=k(h,g.tag);if(i)return{open:g,close:i}}},a.scanForClosingTag=function(a,b,d,e){var f=new c(a,b.line,b.ch,e?{from:0,to:e}:null);return k(f,d)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),"cjs"):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],(function(b){a(b,"amd")})):a(CodeMirror,"plain")})((function(a,b){function c(a,b){var c=b;return function(){0==--c&&a()}}function d(b,d){var e=a.modes[b].dependencies;if(!e)return d();for(var f=[],g=0;g<e.length;++g)a.modes.hasOwnProperty(e[g])||f.push(e[g]);if(!f.length)return d();for(var h=c(d,f.length),g=0;g<f.length;++g)a.requireMode(f[g],h)}a.modeURL||(a.modeURL="../mode/%N/%N.js");var e={};a.requireMode=function(c,f){if("string"!=typeof c&&(c=c.name),a.modes.hasOwnProperty(c))return d(c,f);if(e.hasOwnProperty(c))return e[c].push(f);var g=a.modeURL.replace(/%N/g,c);if("plain"==b){var h=document.createElement("script");h.src=g;var i=document.getElementsByTagName("script")[0],j=e[c]=[f];a.on(h,"load",(function(){d(c,(function(){for(var a=0;a<j.length;++a)j[a]()}))})),i.parentNode.insertBefore(h,i)}else"cjs"==b?(require(g),f()):"amd"==b&&requirejs([g],f)},a.autoLoadMode=function(b,c){a.modes.hasOwnProperty(c)||a.requireMode(c,(function(){b.setOption("mode",b.getOption("mode"))}))}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.multiplexingMode=function(b){function c(a,b,c,d){if("string"==typeof b){var e=a.indexOf(b,c);return d&&e>-1?e+b.length:e}var f=b.exec(c?a.slice(c):a);return f?f.index+c+(d?f[0].length:0):-1}var d=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:a.startState(b),innerActive:null,inner:null}},copyState:function(c){return{outer:a.copyState(b,c.outer),innerActive:c.innerActive,inner:c.innerActive&&a.copyState(c.innerActive.mode,c.inner)}},token:function(e,f){if(f.innerActive){var g=f.innerActive,h=e.string;if(!g.close&&e.sol())return f.innerActive=f.inner=null,this.token(e,f);var i=g.close?c(h,g.close,e.pos,g.parseDelimiters):-1;if(i==e.pos&&!g.parseDelimiters)return e.match(g.close),f.innerActive=f.inner=null,g.delimStyle&&g.delimStyle+" "+g.delimStyle+"-close";i>-1&&(e.string=h.slice(0,i));var j=g.mode.token(e,f.inner);return i>-1&&(e.string=h),i==e.pos&&g.parseDelimiters&&(f.innerActive=f.inner=null),g.innerStyle&&(j=j?j+" "+g.innerStyle:g.innerStyle),j}for(var k=1/0,h=e.string,l=0;l<d.length;++l){var m=d[l],i=c(h,m.open,e.pos);if(i==e.pos)return m.parseDelimiters||e.match(m.open),f.innerActive=m,f.inner=a.startState(m.mode,b.indent?b.indent(f.outer,""):0),m.delimStyle&&m.delimStyle+" "+m.delimStyle+"-open";i!=-1&&i<k&&(k=i)}k!=1/0&&(e.string=h.slice(0,k));var n=b.token(e,f.outer);return k!=1/0&&(e.string=h),n},indent:function(c,d){var e=c.innerActive?c.innerActive.mode:b;return e.indent?e.indent(c.innerActive?c.inner:c.outer,d):a.Pass},blankLine:function(c){var e=c.innerActive?c.innerActive.mode:b;if(e.blankLine&&e.blankLine(c.innerActive?c.inner:c.outer),c.innerActive)"\n"===c.innerActive.close&&(c.innerActive=c.inner=null);else for(var f=0;f<d.length;++f){var g=d[f];"\n"===g.open&&(c.innerActive=g,c.inner=a.startState(g.mode,e.indent?e.indent(c.outer,""):0))}},electricChars:b.electricChars,innerMode:function(a){return a.inner?{state:a.inner,mode:a.innerActive.mode}:{state:a.outer,mode:b}}}}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){function c(a){clearTimeout(d.doRedraw),d.doRedraw=setTimeout((function(){d.redraw()}),a)}this.cm=a,this.options=b,this.buttonHeight=b.scrollButtonHeight||a.getOption("scrollButtonHeight"),this.annotations=[],this.doRedraw=this.doUpdate=null,this.div=a.getWrapperElement().appendChild(document.createElement("div")),this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none",this.computeScale();var d=this;a.on("refresh",this.resizeHandler=function(){clearTimeout(d.doUpdate),d.doUpdate=setTimeout((function(){d.computeScale()&&c(20)}),100)}),a.on("markerAdded",this.resizeHandler),a.on("markerCleared",this.resizeHandler),b.listenForChanges!==!1&&a.on("change",this.changeHandler=function(){c(250)})}a.defineExtension("annotateScrollbar",(function(a){return"string"==typeof a&&(a={className:a}),new b(this,a)})),a.defineOption("scrollButtonHeight",0),b.prototype.computeScale=function(){var a=this.cm,b=(a.getWrapperElement().clientHeight-a.display.barHeight-2*this.buttonHeight)/a.getScrollerElement().scrollHeight;if(b!=this.hScale)return this.hScale=b,!0},b.prototype.update=function(a){this.annotations=a,this.redraw()},b.prototype.redraw=function(a){function b(a,b){if(i!=a.line&&(i=a.line,j=c.getLineHandle(i)),j.widgets&&j.widgets.length||g&&j.height>h)return c.charCoords(a,"local")[b?"top":"bottom"];var d=c.heightAtLine(j,"local");return d+(b?0:j.height)}a!==!1&&this.computeScale();var c=this.cm,d=this.hScale,e=document.createDocumentFragment(),f=this.annotations,g=c.getOption("lineWrapping"),h=g&&1.5*c.defaultTextHeight(),i=null,j=null,k=c.lastLine();if(c.display.barWidth)for(var l,m=0;m<f.length;m++){var n=f[m];if(!(n.to.line>k)){for(var o=l||b(n.from,!0)*d,p=b(n.to,!1)*d;m<f.length-1&&!(f[m+1].to.line>k)&&(l=b(f[m+1].from,!0)*d,!(l>p+.9));)n=f[++m],p=b(n.to,!1)*d;if(p!=o){var q=Math.max(p-o,3),r=e.appendChild(document.createElement("div"));r.style.cssText="position: absolute; right: 0px; width: "+Math.max(c.display.barWidth-1,2)+"px; top: "+(o+this.buttonHeight)+"px; height: "+q+"px",r.className=this.options.className,n.id&&r.setAttribute("annotation-id",n.id)}}}this.div.textContent="",this.div.appendChild(e)},b.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler),this.cm.off("markerAdded",this.resizeHandler),this.cm.off("markerCleared",this.resizeHandler),this.changeHandler&&this.cm.off("change",this.changeHandler),this.div.parentNode.removeChild(this.div)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){function e(b){var c=a.wheelEventPixels(b)["horizontal"==f.orientation?"x":"y"],d=f.pos;f.moveTo(f.pos+c),f.pos!=d&&a.e_preventDefault(b)}this.orientation=c,this.scroll=d,this.screen=this.total=this.size=1,this.pos=0,this.node=document.createElement("div"),this.node.className=b+"-"+c,this.inner=this.node.appendChild(document.createElement("div"));var f=this;a.on(this.inner,"mousedown",(function(b){function c(){a.off(document,"mousemove",d),a.off(document,"mouseup",c)}function d(a){return 1!=a.which?c():void f.moveTo(h+(a[e]-g)*(f.total/f.size))}if(1==b.which){a.e_preventDefault(b);var e="horizontal"==f.orientation?"pageX":"pageY",g=b[e],h=f.pos;a.on(document,"mousemove",d),a.on(document,"mouseup",c)}})),a.on(this.node,"click",(function(b){a.e_preventDefault(b);var c,d=f.inner.getBoundingClientRect();c="horizontal"==f.orientation?b.clientX<d.left?-1:b.clientX>d.right?1:0:b.clientY<d.top?-1:b.clientY>d.bottom?1:0,f.moveTo(f.pos+c*f.screen)})),a.on(this.node,"mousewheel",e),a.on(this.node,"DOMMouseScroll",e)}function c(a,c,d){this.addClass=a,this.horiz=new b(a,"horizontal",d),c(this.horiz.node),this.vert=new b(a,"vertical",d),c(this.vert.node),this.width=null}b.prototype.setPos=function(a,b){return a<0&&(a=0),a>this.total-this.screen&&(a=this.total-this.screen),!(!b&&a==this.pos)&&(this.pos=a,this.inner.style["horizontal"==this.orientation?"left":"top"]=a*(this.size/this.total)+"px",!0)},b.prototype.moveTo=function(a){this.setPos(a)&&this.scroll(a,this.orientation)};var d=10;b.prototype.update=function(a,b,c){var e=this.screen!=b||this.total!=a||this.size!=c;
+e&&(this.screen=b,this.total=a,this.size=c);var f=this.screen*(this.size/this.total);f<d&&(this.size-=d-f,f=d),this.inner.style["horizontal"==this.orientation?"width":"height"]=f+"px",this.setPos(this.pos,e)},c.prototype.update=function(a){if(null==this.width){var b=window.getComputedStyle?window.getComputedStyle(this.horiz.node):this.horiz.node.currentStyle;b&&(this.width=parseInt(b.height))}var c=this.width||0,d=a.scrollWidth>a.clientWidth+1,e=a.scrollHeight>a.clientHeight+1;return this.vert.node.style.display=e?"block":"none",this.horiz.node.style.display=d?"block":"none",e&&(this.vert.update(a.scrollHeight,a.clientHeight,a.viewHeight-(d?c:0)),this.vert.node.style.bottom=d?c+"px":"0"),d&&(this.horiz.update(a.scrollWidth,a.clientWidth,a.viewWidth-(e?c:0)-a.barLeft),this.horiz.node.style.right=e?c+"px":"0",this.horiz.node.style.left=a.barLeft+"px"),{right:e?c:0,bottom:d?c:0}},c.prototype.setScrollTop=function(a){this.vert.setPos(a)},c.prototype.setScrollLeft=function(a){this.horiz.setPos(a)},c.prototype.clear=function(){var a=this.horiz.node.parentNode;a.removeChild(this.horiz.node),a.removeChild(this.vert.node)},a.scrollbarModel.simple=function(a,b){return new c("CodeMirror-simplescroll",a,b)},a.scrollbarModel.overlay=function(a,b){return new c("CodeMirror-overlayscroll",a,b)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../scroll/annotatescrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../scroll/annotatescrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d){this.cm=a,this.options=d;var e={listenForChanges:!1};for(var f in d)e[f]=d[f];e.className||(e.className="CodeMirror-search-match"),this.annotation=a.annotateScrollbar(e),this.query=b,this.caseFold=c,this.gap={from:a.firstLine(),to:a.lastLine()+1},this.matches=[],this.update=null,this.findMatches(),this.annotation.update(this.matches);var g=this;a.on("change",this.changeHandler=function(a,b){g.onChange(b)})}function c(a,b,c){return a<=b?a:Math.max(b,a+c)}a.defineExtension("showMatchesOnScrollbar",(function(a,c,d){return"string"==typeof d&&(d={className:d}),d||(d={}),new b(this,a,c,d)}));var d=1e3;b.prototype.findMatches=function(){if(this.gap){for(var b=0;b<this.matches.length;b++){var c=this.matches[b];if(c.from.line>=this.gap.to)break;c.to.line>=this.gap.from&&this.matches.splice(b--,1)}for(var e=this.cm.getSearchCursor(this.query,a.Pos(this.gap.from,0),this.caseFold),f=this.options&&this.options.maxMatches||d;e.findNext();){var c={from:e.from(),to:e.to()};if(c.from.line>=this.gap.to)break;if(this.matches.splice(b++,0,c),this.matches.length>f)break}this.gap=null}},b.prototype.onChange=function(b){var d=b.from.line,e=a.changeEnd(b).line,f=e-b.to.line;if(this.gap?(this.gap.from=Math.min(c(this.gap.from,d,f),b.from.line),this.gap.to=Math.max(c(this.gap.to,d,f),b.from.line)):this.gap={from:b.from.line,to:e+1},f)for(var g=0;g<this.matches.length;g++){var h=this.matches[g],i=c(h.from.line,d,f);i!=h.from.line&&(h.from=a.Pos(i,h.from.ch));var j=c(h.to.line,d,f);j!=h.to.line&&(h.to=a.Pos(j,h.to.ch))}clearTimeout(this.update);var k=this;this.update=setTimeout((function(){k.updateAfterChange()}),250)},b.prototype.updateAfterChange=function(){this.findMatches(),this.annotation.update(this.matches)},b.prototype.clear=function(){this.cm.off("change",this.changeHandler),this.annotation.clear()}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./matchesonscrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./matchesonscrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options={};for(var b in l)this.options[b]=(a&&a.hasOwnProperty(b)?a:l)[b];this.overlay=this.timeout=null,this.matchesonscroll=null,this.active=!1}function c(a){var b=a.state.matchHighlighter;(b.active||a.hasFocus())&&e(a,b)}function d(a){var b=a.state.matchHighlighter;b.active||(b.active=!0,e(a,b))}function e(a,b){clearTimeout(b.timeout),b.timeout=setTimeout((function(){h(a)}),b.options.delay)}function f(a,b,c,d){var e=a.state.matchHighlighter;if(a.addOverlay(e.overlay=k(b,c,d)),e.options.annotateScrollbar&&a.showMatchesOnScrollbar){var f=c?new RegExp("\\b"+b+"\\b"):b;e.matchesonscroll=a.showMatchesOnScrollbar(f,!1,{className:"CodeMirror-selection-highlight-scrollbar"})}}function g(a){var b=a.state.matchHighlighter;b.overlay&&(a.removeOverlay(b.overlay),b.overlay=null,b.matchesonscroll&&(b.matchesonscroll.clear(),b.matchesonscroll=null))}function h(a){a.operation((function(){var b=a.state.matchHighlighter;if(g(a),!a.somethingSelected()&&b.options.showToken){for(var c=b.options.showToken===!0?/[\w$]/:b.options.showToken,d=a.getCursor(),e=a.getLine(d.line),h=d.ch,j=h;h&&c.test(e.charAt(h-1));)--h;for(;j<e.length&&c.test(e.charAt(j));)++j;return void(h<j&&f(a,e.slice(h,j),c,b.options.style))}var k=a.getCursor("from"),l=a.getCursor("to");if(k.line==l.line&&(!b.options.wordsOnly||i(a,k,l))){var m=a.getRange(k,l);b.options.trim&&(m=m.replace(/^\s+|\s+$/g,"")),m.length>=b.options.minChars&&f(a,m,!1,b.options.style)}}))}function i(a,b,c){var d=a.getRange(b,c);if(null!==d.match(/^\w+$/)){if(b.ch>0){var e={line:b.line,ch:b.ch-1},f=a.getRange(e,b);if(null===f.match(/\W/))return!1}if(c.ch<a.getLine(b.line).length){var e={line:c.line,ch:c.ch+1},f=a.getRange(c,e);if(null===f.match(/\W/))return!1}return!0}return!1}function j(a,b){return!(a.start&&b.test(a.string.charAt(a.start-1))||a.pos!=a.string.length&&b.test(a.string.charAt(a.pos)))}function k(a,b,c){return{token:function(d){return!d.match(a)||b&&!j(d,b)?(d.next(),void(d.skipTo(a.charAt(0))||d.skipToEnd())):c}}}var l={style:"matchhighlight",minChars:2,delay:100,wordsOnly:!1,annotateScrollbar:!1,showToken:!1,trim:!0};a.defineOption("highlightSelectionMatches",!1,(function(e,f,i){if(i&&i!=a.Init&&(g(e),clearTimeout(e.state.matchHighlighter.timeout),e.state.matchHighlighter=null,e.off("cursorActivity",c),e.off("focus",d)),f){var j=e.state.matchHighlighter=new b(f);e.hasFocus()?(j.active=!0,h(e)):e.on("focus",d),e.on("cursorActivity",c)}}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.flags;return null!=b?b:(a.ignoreCase?"i":"")+(a.global?"g":"")+(a.multiline?"m":"")}function c(a){return a.global?a:new RegExp(a.source,b(a)+"g")}function d(a){return/\\s|\\n|\n|\\W|\\D|\[\^/.test(a.source)}function e(a,b,d){b=c(b);for(var e=d.line,f=d.ch,g=a.lastLine();e<=g;e++,f=0){b.lastIndex=f;var h=a.getLine(e),i=b.exec(h);if(i)return{from:p(e,i.index),to:p(e,i.index+i[0].length),match:i}}}function f(a,b,f){if(!d(b))return e(a,b,f);b=c(b);for(var g,h=1,i=f.line,j=a.lastLine();i<=j;){for(var k=0;k<h;k++){var l=a.getLine(i++);g=null==g?l:g+"\n"+l}h=2*h,b.lastIndex=f.ch;var m=b.exec(g);if(m){var n=g.slice(0,m.index).split("\n"),o=m[0].split("\n"),q=f.line+n.length-1,r=n[n.length-1].length;return{from:p(q,r),to:p(q+o.length-1,1==o.length?r+o[0].length:o[o.length-1].length),match:m}}}}function g(a,b){for(var c,d=0;;){b.lastIndex=d;var e=b.exec(a);if(!e)return c;if(c=e,d=c.index+(c[0].length||1),d==a.length)return c}}function h(a,b,d){b=c(b);for(var e=d.line,f=d.ch,h=a.firstLine();e>=h;e--,f=-1){var i=a.getLine(e);f>-1&&(i=i.slice(0,f));var j=g(i,b);if(j)return{from:p(e,j.index),to:p(e,j.index+j[0].length),match:j}}}function i(a,b,d){b=c(b);for(var e,f=1,h=d.line,i=a.firstLine();h>=i;){for(var j=0;j<f;j++){var k=a.getLine(h--);e=null==e?k.slice(0,d.ch):k+"\n"+e}f*=2;var l=g(e,b);if(l){var m=e.slice(0,l.index).split("\n"),n=l[0].split("\n"),o=h+m.length,q=m[m.length-1].length;return{from:p(o,q),to:p(o+n.length-1,1==n.length?q+n[0].length:n[n.length-1].length),match:l}}}}function j(a,b,c,d){if(a.length==b.length)return c;for(var e=0,f=c+Math.max(0,a.length-b.length);;){if(e==f)return e;var g=e+f>>1,h=d(a.slice(0,g)).length;if(h==c)return g;h>c?f=g:e=g+1}}function k(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.lastLine()+1-f.length;g<=i;g++,h=0){var k=a.getLine(g).slice(h),l=e(k);if(1==f.length){var m=l.indexOf(f[0]);if(m==-1)continue a;var c=j(k,l,m,e)+h;return{from:p(g,j(k,l,m,e)+h),to:p(g,j(k,l,m+f[0].length,e)+h)}}var q=l.length-f[0].length;if(l.slice(q)==f[0]){for(var r=1;r<f.length-1;r++)if(e(a.getLine(g+r))!=f[r])continue a;var s=a.getLine(g+f.length-1),t=e(s),u=f[f.length-1];if(s.slice(0,u.length)==u)return{from:p(g,j(k,l,q,e)+h),to:p(g+f.length-1,j(s,t,u.length,e))}}}}function l(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.firstLine()-1+f.length;g>=i;g--,h=-1){var k=a.getLine(g);h>-1&&(k=k.slice(0,h));var l=e(k);if(1==f.length){var m=l.lastIndexOf(f[0]);if(m==-1)continue a;return{from:p(g,j(k,l,m,e)),to:p(g,j(k,l,m+f[0].length,e))}}var q=f[f.length-1];if(l.slice(0,q.length)==q){for(var r=1,c=g-f.length+1;r<f.length-1;r++)if(e(a.getLine(c+r))!=f[r])continue a;var s=a.getLine(g+1-f.length),t=e(s);if(t.slice(t.length-f[0].length)==f[0])return{from:p(g+1-f.length,j(s,t,s.length-f[0].length,e)),to:p(g,j(k,l,q.length,e))}}}}function m(a,b,d,g){this.atOccurrence=!1,this.doc=a,d=d?a.clipPos(d):p(0,0),this.pos={from:d,to:d};var j;"object"==typeof g?j=g.caseFold:(j=g,g=null),"string"==typeof b?(null==j&&(j=!1),this.matches=function(c,d){return(c?l:k)(a,b,d,j)}):(b=c(b),g&&g.multiline===!1?this.matches=function(c,d){return(c?h:e)(a,b,d)}:this.matches=function(c,d){return(c?i:f)(a,b,d)})}var n,o,p=a.Pos;String.prototype.normalize?(n=function(a){return a.normalize("NFD").toLowerCase()},o=function(a){return a.normalize("NFD")}):(n=function(a){return a.toLowerCase()},o=function(a){return a}),m.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(b){for(var c=this.matches(b,this.doc.clipPos(b?this.pos.from:this.pos.to));c&&0==a.cmpPos(c.from,c.to);)b?c.from.ch?c.from=p(c.from.line,c.from.ch-1):c=c.from.line==this.doc.firstLine()?null:this.matches(b,this.doc.clipPos(p(c.from.line-1))):c.to.ch<this.doc.getLine(c.to.line).length?c.to=p(c.to.line,c.to.ch+1):c=c.to.line==this.doc.lastLine()?null:this.matches(b,p(c.to.line+1,0));if(c)return this.pos=c,this.atOccurrence=!0,this.pos.match||!0;var d=p(b?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:d,to:d},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var d=a.splitLines(b);this.doc.replaceRange(d,this.pos.from,this.pos.to,c),this.pos.to=p(this.pos.from.line+d.length-1,d[d.length-1].length+(1==d.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",(function(a,b,c){return new m(this.doc,a,b,c)})),a.defineDocExtension("getSearchCursor",(function(a,b,c){return new m(this,a,b,c)})),a.defineExtension("selectMatches",(function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b=0;b<a.state.activeLines.length;b++)a.removeLineClass(a.state.activeLines[b],"wrap",f),a.removeLineClass(a.state.activeLines[b],"background",g),a.removeLineClass(a.state.activeLines[b],"gutter",h)}function c(a,b){if(a.length!=b.length)return!1;for(var c=0;c<a.length;c++)if(a[c]!=b[c])return!1;return!0}function d(a,d){for(var e=[],i=0;i<d.length;i++){var j=d[i],k=a.getOption("styleActiveLine");if("object"==typeof k&&k.nonEmpty?j.anchor.line==j.head.line:j.empty()){var l=a.getLineHandleVisualStart(j.head.line);e[e.length-1]!=l&&e.push(l)}}c(a.state.activeLines,e)||a.operation((function(){b(a);for(var c=0;c<e.length;c++)a.addLineClass(e[c],"wrap",f),a.addLineClass(e[c],"background",g),a.addLineClass(e[c],"gutter",h);a.state.activeLines=e}))}function e(a,b){d(a,b.ranges)}var f="CodeMirror-activeline",g="CodeMirror-activeline-background",h="CodeMirror-activeline-gutter";a.defineOption("styleActiveLine",!1,(function(c,f,g){var h=g!=a.Init&&g;f!=h&&(h&&(c.off("beforeSelectionChange",e),b(c),delete c.state.activeLines),f&&(c.state.activeLines=[],d(c,c.listSelections()),c.on("beforeSelectionChange",e)))}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/dialog/dialog"),require("../addon/edit/matchbrackets.js")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/dialog/dialog","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";var b=[{keys:"<Left>",type:"keyToKey",toKeys:"h"},{keys:"<Right>",type:"keyToKey",toKeys:"l"},{keys:"<Up>",type:"keyToKey",toKeys:"k"},{keys:"<Down>",type:"keyToKey",toKeys:"j"},{keys:"<Space>",type:"keyToKey",toKeys:"l"},{keys:"<BS>",type:"keyToKey",toKeys:"h",context:"normal"},{keys:"<C-Space>",type:"keyToKey",toKeys:"W"},{keys:"<C-BS>",type:"keyToKey",toKeys:"B",context:"normal"},{keys:"<S-Space>",type:"keyToKey",toKeys:"w"},{keys:"<S-BS>",type:"keyToKey",toKeys:"b",context:"normal"},{keys:"<C-n>",type:"keyToKey",toKeys:"j"},{keys:"<C-p>",type:"keyToKey",toKeys:"k"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:"<Home>",type:"keyToKey",toKeys:"0"},{keys:"<End>",type:"keyToKey",toKeys:"$"},{keys:"<PageUp>",type:"keyToKey",toKeys:"<C-b>"},{keys:"<PageDown>",type:"keyToKey",toKeys:"<C-f>"},{keys:"<CR>",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"<Ins>",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:"<C-f>",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:"<C-b>",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:"<C-d>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:"<C-u>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"'<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"`<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"]<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"expandToLine",motionArgs:{linewise:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:"<C-w>",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:"<C-i>",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:"<C-o>",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:"<C-e>",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:"<C-y>",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:"<C-v>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"<C-q>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r<character>",type:"action",action:"replace",isEdit:!0},{keys:"@<character>",type:"action",action:"replayMacro"},{keys:"q<character>",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:"<C-r>",type:"action",action:"redo"},{keys:"m<character>",type:"action",action:"setMark"},{keys:'"<character>',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z<CR>",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:"<C-a>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:"<C-x>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"<C-t>",type:"action",action:"indent",actionArgs:{indentRight:!0},context:"insert"},{keys:"<C-d>",type:"action",action:"indent",actionArgs:{indentRight:!1},context:"insert"},{keys:"a<character>",type:"motion",motion:"textObjectManipulation"},{keys:"i<character>",type:"motion",motion:"textObjectManipulation",motionArgs:{textObjectInner:!0}},{keys:"/",type:"search",searchArgs:{forward:!0,querySrc:"prompt",toJumplist:!0}},{keys:"?",type:"search",searchArgs:{forward:!1,querySrc:"prompt",toJumplist:!0}},{keys:"*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"g*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:"g#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:":",type:"ex"}],c=[{name:"colorscheme",shortName:"colo"},{name:"map"},{name:"imap",shortName:"im"},{name:"nmap",shortName:"nm"},{name:"vmap",shortName:"vm"},{name:"unmap"},{name:"write",shortName:"w"},{name:"undo",shortName:"u"},{name:"redo",shortName:"red"},{name:"set",shortName:"se"},{name:"set",shortName:"se"},{name:"setlocal",shortName:"setl"},{name:"setglobal",shortName:"setg"},{name:"sort",shortName:"sor"},{name:"substitute",shortName:"s",possiblyAsync:!0},{name:"nohlsearch",shortName:"noh"},{name:"yank",shortName:"y"},{name:"delmarks",shortName:"delm"},{name:"registers",shortName:"reg",excludeFromCommandHistory:!0},{name:"global",shortName:"g"}],d=a.Pos,e=function(){function e(b){b.setOption("disableInput",!0),b.setOption("showCursorWhenSelecting",!1),a.signal(b,"vim-mode-change",{mode:"normal"}),b.on("cursorActivity",bb),x(b),a.on(b.getInputField(),"paste",k(b))}function f(b){b.setOption("disableInput",!1),b.off("cursorActivity",bb),a.off(b.getInputField(),"paste",k(b)),b.state.vim=null}function g(b,c){this==a.keyMap.vim&&a.rmClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||f(b)}function h(b,c){this==a.keyMap.vim&&a.addClass(b.getWrapperElement(),"cm-fat-cursor"),c&&c.attach==h||e(b)}function i(b,c){if(c){if(this[b])return this[b];var d=j(b);if(!d)return!1;var e=a.Vim.findKey(c,d);return"function"==typeof e&&a.signal(c,"vim-keypress",d),e}}function j(a){if("'"==a.charAt(0))return a.charAt(1);var b=a.split(/-(?!$)/),c=b[b.length-1];if(1==b.length&&1==b[0].length)return!1;if(2==b.length&&"Shift"==b[0]&&1==c.length)return!1;for(var d=!1,e=0;e<b.length;e++){var f=b[e];f in ib?b[e]=ib[f]:d=!0,f in jb&&(b[e]=jb[f])}return!!d&&(q(c)&&(b[b.length-1]=c.toLowerCase()),"<"+b.join("-")+">")}function k(a){var b=a.state.vim;return b.onPasteFn||(b.onPasteFn=function(){b.insertMode||(a.setCursor(L(a.getCursor(),0,1)),Bb.enterInsertMode(a,{},b))}),b.onPasteFn}function l(a,b){for(var c=[],d=a;d<a+b;d++)c.push(String.fromCharCode(d));return c}function m(a,b){return b>=a.firstLine()&&b<=a.lastLine()}function n(a){return/^[a-z]$/.test(a)}function o(a){return"()[]{}".indexOf(a)!=-1}function p(a){return kb.test(a)}function q(a){return/^[A-Z]$/.test(a)}function r(a){return/^\s*$/.test(a)}function s(a,b){for(var c=0;c<b.length;c++)if(b[c]==a)return!0;return!1}function t(a,b,c,d,e){if(void 0===b&&!e)throw Error("defaultValue is required unless callback is provided");if(c||(c="string"),sb[a]={type:c,defaultValue:b,callback:e},d)for(var f=0;f<d.length;f++)sb[d[f]]=sb[a];b&&u(a,b)}function u(a,b,c,d){var e=sb[a];d=d||{};var f=d.scope;if(!e)return new Error("Unknown option: "+a);if("boolean"==e.type){if(b&&b!==!0)return new Error("Invalid argument: "+a+"="+b);b!==!1&&(b=!0)}e.callback?("local"!==f&&e.callback(b,void 0),"global"!==f&&c&&e.callback(b,c)):("local"!==f&&(e.value="boolean"==e.type?!!b:b),"global"!==f&&c&&(c.state.vim.options[a]={value:b}))}function v(a,b,c){var d=sb[a];c=c||{};var e=c.scope;if(!d)return new Error("Unknown option: "+a);{if(!d.callback){var f="global"!==e&&b&&b.state.vim.options[a];return(f||"local"!==e&&d||{}).value}var f=b&&d.callback(void 0,b);if("global"!==e&&void 0!==f)return f;if("local"!==e)return d.callback()}}function w(){this.latestRegister=void 0,this.isPlaying=!1,this.isRecording=!1,this.replaySearchQueries=[],this.onRecordingDone=void 0,this.lastInsertModeChanges=ub()}function x(a){return a.state.vim||(a.state.vim={inputState:new z,lastEditInputState:void 0,lastEditActionCommand:void 0,lastHPos:-1,lastHSPos:-1,lastMotion:null,marks:{},fakeCursor:null,insertMode:!1,insertModeRepeat:void 0,visualMode:!1,visualLine:!1,visualBlock:!1,lastSelection:null,lastPastedText:null,sel:{},options:{}}),a.state.vim}function y(){vb={searchQuery:null,searchIsReversed:!1,lastSubstituteReplacePart:void 0,jumpList:tb(),macroModeState:new w,lastCharacterSearch:{increment:0,forward:!0,selectedCharacter:""},registerController:new D({}),searchHistoryController:new E,exCommandHistoryController:new E};for(var a in sb){var b=sb[a];b.value=b.defaultValue}}function z(){this.prefixRepeat=[],this.motionRepeat=[],this.operator=null,this.operatorArgs=null,this.motion=null,this.motionArgs=null,this.keyBuffer=[],this.registerName=null}function A(b,c){b.state.vim.inputState=new z,a.signal(b,"vim-command-done",c)}function B(a,b,c){this.clear(),this.keyBuffer=[a||""],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!!b,this.blockwise=!!c}function C(a,b){var c=vb.registerController.registers;if(!a||1!=a.length)throw Error("Register name must be 1 character");if(c[a])throw Error("Register already defined "+a);c[a]=b,rb.push(a)}function D(a){this.registers=a,this.unnamedRegister=a['"']=new B,a["."]=new B,a[":"]=new B,a["/"]=new B}function E(){this.historyBuffer=[],this.iterator=0,this.initialPrefix=null}function F(a,b){zb[a]=b}function G(a,b){for(var c=[],d=0;d<b;d++)c.push(a);return c}function H(a,b){Ab[a]=b}function I(a,b){Bb[a]=b}function J(a,b,c){var e=Math.min(Math.max(a.firstLine(),b.line),a.lastLine()),f=X(a,e)-1;f=c?f+1:f;var g=Math.min(Math.max(0,b.ch),f);return d(e,g)}function K(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function L(a,b,c){return"object"==typeof b&&(c=b.ch,b=b.line),d(a.line+b,a.ch+c)}function M(a,b){return{line:b.line-a.line,ch:b.line-a.line}}function N(a,b,c,d){for(var e,f=[],g=[],h=0;h<b.length;h++){var i=b[h];"insert"==c&&"insert"!=i.context||i.context&&i.context!=c||d.operator&&"action"==i.type||!(e=O(a,i.keys))||("partial"==e&&f.push(i),"full"==e&&g.push(i))}return{partial:f.length&&f,full:g.length&&g}}function O(a,b){if("<character>"==b.slice(-11)){var c=b.length-11,d=a.slice(0,c),e=b.slice(0,c);return d==e&&a.length>c?"full":0==e.indexOf(d)&&"partial"}return a==b?"full":0==b.indexOf(a)&&"partial"}function P(a){var b=/^.*(<[^>]+>)$/.exec(a),c=b?b[1]:a.slice(-1);if(c.length>1)switch(c){case"<CR>":c="\n";break;case"<Space>":c=" ";break;default:c=""}return c}function Q(a,b,c){return function(){for(var d=0;d<c;d++)b(a)}}function R(a){return d(a.line,a.ch)}function S(a,b){return a.ch==b.ch&&a.line==b.line}function T(a,b){return a.line<b.line||a.line==b.line&&a.ch<b.ch}function U(a,b){return arguments.length>2&&(b=U.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?a:b}function V(a,b){return arguments.length>2&&(b=V.apply(void 0,Array.prototype.slice.call(arguments,1))),T(a,b)?b:a}function W(a,b,c){var d=T(a,b),e=T(b,c);return d&&e}function X(a,b){return a.getLine(b).length}function Y(a){return a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function Z(a){return a.replace(/([.?*+$\[\]\/\\(){}|\-])/g,"\\$1")}function $(a,b,c){var e=X(a,b),f=new Array(c-e+1).join(" ");a.setCursor(d(b,e)),a.replaceRange(f,a.getCursor())}function _(a,b){var c=[],e=a.listSelections(),f=R(a.clipPos(b)),g=!S(b,f),h=a.getCursor("head"),i=ba(e,h),j=S(e[i].head,e[i].anchor),k=e.length-1,l=k-i>i?k:0,m=e[l].anchor,n=Math.min(m.line,f.line),o=Math.max(m.line,f.line),p=m.ch,q=f.ch,r=e[l].head.ch-p,s=q-p;r>0&&s<=0?(p++,g||q--):r<0&&s>=0?(p--,j||q++):r<0&&s==-1&&(p--,q++);for(var t=n;t<=o;t++){
+var u={anchor:new d(t,p),head:new d(t,q)};c.push(u)}return a.setSelections(c),b.ch=q,m.ch=p,m}function aa(a,b,c){for(var d=[],e=0;e<c;e++){var f=L(b,e,0);d.push({anchor:f,head:f})}a.setSelections(d,0)}function ba(a,b,c){for(var d=0;d<a.length;d++){var e="head"!=c&&S(a[d].anchor,b),f="anchor"!=c&&S(a[d].head,b);if(e||f)return d}return-1}function ca(a,b){var c=b.lastSelection,e=function(){var b=a.listSelections(),c=b[0],d=b[b.length-1],e=T(c.anchor,c.head)?c.anchor:c.head,f=T(d.anchor,d.head)?d.head:d.anchor;return[e,f]},f=function(){var b=a.getCursor(),e=a.getCursor(),f=c.visualBlock;if(f){var g=f.width,h=f.height;e=d(b.line+h,b.ch+g);for(var i=[],j=b.line;j<e.line;j++){var k=d(j,b.ch),l=d(j,e.ch),m={anchor:k,head:l};i.push(m)}a.setSelections(i)}else{var n=c.anchorMark.find(),o=c.headMark.find(),p=o.line-n.line,q=o.ch-n.ch;e={line:e.line+p,ch:p?e.ch:q+e.ch},c.visualLine&&(b=d(b.line,0),e=d(e.line,X(a,e.line))),a.setSelection(b,e)}return[b,e]};return b.visualMode?e():f()}function da(a,b){var c=b.sel.anchor,d=b.sel.head;b.lastPastedText&&(d=a.posFromIndex(a.indexFromPos(c)+b.lastPastedText.length),b.lastPastedText=null),b.lastSelection={anchorMark:a.setBookmark(c),headMark:a.setBookmark(d),anchor:R(c),head:R(d),visualMode:b.visualMode,visualLine:b.visualLine,visualBlock:b.visualBlock}}function ea(a,b,c){var e,f=a.state.vim.sel,g=f.head,h=f.anchor;return T(c,b)&&(e=c,c=b,b=e),T(g,h)?(g=U(b,g),h=V(h,c)):(h=U(b,h),g=V(g,c),g=L(g,0,-1),g.ch==-1&&g.line!=a.firstLine()&&(g=d(g.line-1,X(a,g.line-1)))),[h,g]}function fa(a,b,c){var d=a.state.vim;b=b||d.sel;var c=c||d.visualLine?"line":d.visualBlock?"block":"char",e=ga(a,b,c);a.setSelections(e.ranges,e.primary),cb(a)}function ga(a,b,c,e){var f=R(b.head),g=R(b.anchor);if("char"==c){var h=e||T(b.head,b.anchor)?0:1,i=T(b.head,b.anchor)?1:0;return f=L(b.head,0,h),g=L(b.anchor,0,i),{ranges:[{anchor:g,head:f}],primary:0}}if("line"==c){if(T(b.head,b.anchor))f.ch=0,g.ch=X(a,g.line);else{g.ch=0;var j=a.lastLine();f.line>j&&(f.line=j),f.ch=X(a,f.line)}return{ranges:[{anchor:g,head:f}],primary:0}}if("block"==c){for(var k=Math.min(g.line,f.line),l=Math.min(g.ch,f.ch),m=Math.max(g.line,f.line),n=Math.max(g.ch,f.ch)+1,o=m-k+1,p=f.line==k?0:o-1,q=[],r=0;r<o;r++)q.push({anchor:d(k+r,l),head:d(k+r,n)});return{ranges:q,primary:p}}}function ha(a){var b=a.getCursor("head");return 1==a.getSelection().length&&(b=U(b,a.getCursor("anchor"))),b}function ia(b,c){var d=b.state.vim;c!==!1&&b.setCursor(J(b,d.sel.head)),da(b,d),d.visualMode=!1,d.visualLine=!1,d.visualBlock=!1,a.signal(b,"vim-mode-change",{mode:"normal"}),d.fakeCursor&&d.fakeCursor.clear()}function ja(a,b,c){var d=a.getRange(b,c);if(/\n\s*$/.test(d)){var e=d.split("\n");e.pop();for(var f,f=e.pop();e.length>0&&f&&r(f);f=e.pop())c.line--,c.ch=0;f?(c.line--,c.ch=X(a,c.line)):c.ch=0}}function ka(a,b,c){b.ch=0,c.ch=0,c.line++}function la(a){if(!a)return 0;var b=a.search(/\S/);return b==-1?a.length:b}function ma(a,b,c,e,f){for(var g=ha(a),h=a.getLine(g.line),i=g.ch,j=f?lb[0]:mb[0];!j(h.charAt(i));)if(i++,i>=h.length)return null;e?j=mb[0]:(j=lb[0],j(h.charAt(i))||(j=lb[1]));for(var k=i,l=i;j(h.charAt(k))&&k<h.length;)k++;for(;j(h.charAt(l))&&l>=0;)l--;if(l++,b){for(var m=k;/\s/.test(h.charAt(k))&&k<h.length;)k++;if(m==k){for(var n=l;/\s/.test(h.charAt(l-1))&&l>0;)l--;l||(l=n)}}return{start:d(g.line,l),end:d(g.line,k)}}function na(a,b,c){S(b,c)||vb.jumpList.add(a,b,c)}function oa(a,b){vb.lastCharacterSearch.increment=a,vb.lastCharacterSearch.forward=b.forward,vb.lastCharacterSearch.selectedCharacter=b.selectedCharacter}function pa(a,b,c,e){var f=R(a.getCursor()),g=c?1:-1,h=c?a.lineCount():-1,i=f.ch,j=f.line,k=a.getLine(j),l={lineText:k,nextCh:k.charAt(i),lastCh:null,index:i,symb:e,reverseSymb:(c?{")":"(","}":"{"}:{"(":")","{":"}"})[e],forward:c,depth:0,curMoveThrough:!1},m=Cb[e];if(!m)return f;var n=Db[m].init,o=Db[m].isComplete;for(n&&n(l);j!==h&&b;){if(l.index+=g,l.nextCh=l.lineText.charAt(l.index),!l.nextCh){if(j+=g,l.lineText=a.getLine(j)||"",g>0)l.index=0;else{var p=l.lineText.length;l.index=p>0?p-1:0}l.nextCh=l.lineText.charAt(l.index)}o(l)&&(f.line=j,f.ch=l.index,b--)}return l.nextCh||l.curMoveThrough?d(j,l.index):f}function qa(a,b,c,d,e){var f=b.line,g=b.ch,h=a.getLine(f),i=c?1:-1,j=d?mb:lb;if(e&&""==h){if(f+=i,h=a.getLine(f),!m(a,f))return null;g=c?0:h.length}for(;;){if(e&&""==h)return{from:0,to:0,line:f};for(var k=i>0?h.length:-1,l=k,n=k;g!=k;){for(var o=!1,p=0;p<j.length&&!o;++p)if(j[p](h.charAt(g))){for(l=g;g!=k&&j[p](h.charAt(g));)g+=i;if(n=g,o=l!=n,l==b.ch&&f==b.line&&n==l+i)continue;return{from:Math.min(l,n+1),to:Math.max(l,n),line:f}}o||(g+=i)}if(f+=i,!m(a,f))return null;h=a.getLine(f),g=i>0?0:h.length}}function ra(a,b,c,e,f,g){var h=R(b),i=[];(e&&!f||!e&&f)&&c++;for(var j=!(e&&f),k=0;k<c;k++){var l=qa(a,b,e,g,j);if(!l){var m=X(a,a.lastLine());i.push(e?{line:a.lastLine(),from:m,to:m}:{line:0,from:0,to:0});break}i.push(l),b=d(l.line,e?l.to-1:l.from)}var n=i.length!=c,o=i[0],p=i.pop();return e&&!f?(n||o.from==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.from)):e&&f?d(p.line,p.to-1):!e&&f?(n||o.to==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.to)):d(p.line,p.from)}function sa(a,b,c,e){for(var f,g=a.getCursor(),h=g.ch,i=0;i<b;i++){var j=a.getLine(g.line);if(f=va(h,j,e,c,!0),f==-1)return null;h=f}return d(a.getCursor().line,f)}function ta(a,b){var c=a.getCursor().line;return J(a,d(c,b-1))}function ua(a,b,c,d){s(c,qb)&&(b.marks[c]&&b.marks[c].clear(),b.marks[c]=a.setBookmark(d))}function va(a,b,c,d,e){var f;return d?(f=b.indexOf(c,a+1),f==-1||e||(f-=1)):(f=b.lastIndexOf(c,a-1),f==-1||e||(f+=1)),f}function wa(a,b,c,e,f){function g(b){return!a.getLine(b)}function h(a,b,c){return c?g(a)!=g(a+b):!g(a)&&g(a+b)}var i,j,k=b.line,l=a.firstLine(),m=a.lastLine(),n=k;if(e){for(;l<=n&&n<=m&&c>0;)h(n,e)&&c--,n+=e;return new d(n,0)}var o=a.state.vim;if(o.visualLine&&h(k,1,!0)){var p=o.sel.anchor;h(p.line,-1,!0)&&(f&&p.line==k||(k+=1))}var q=g(k);for(n=k;n<=m&&c;n++)h(n,1,!0)&&(f&&g(n)==q||c--);for(j=new d(n,0),n>m&&!q?q=!0:f=!1,n=k;n>l&&(f&&g(n)!=q&&n!=k||!h(n,-1,!0));n--);return i=new d(n,0),{start:i,end:j}}function xa(a,b,c,e){var f,g,h=b,i={"(":/[()]/,")":/[()]/,"[":/[[\]]/,"]":/[[\]]/,"{":/[{}]/,"}":/[{}]/}[c],j={"(":"(",")":"(","[":"[","]":"[","{":"{","}":"{"}[c],k=a.getLine(h.line).charAt(h.ch),l=k===j?1:0;if(f=a.scanForBracket(d(h.line,h.ch+l),-1,null,{bracketRegex:i}),g=a.scanForBracket(d(h.line,h.ch+l),1,null,{bracketRegex:i}),!f||!g)return{start:h,end:h};if(f=f.pos,g=g.pos,f.line==g.line&&f.ch>g.ch||f.line>g.line){var m=f;f=g,g=m}return e?g.ch+=1:f.ch+=1,{start:f,end:g}}function ya(a,b,c,e){var f,g,h,i,j=R(b),k=a.getLine(j.line),l=k.split(""),m=l.indexOf(c);if(j.ch<m?j.ch=m:m<j.ch&&l[j.ch]==c&&(g=j.ch,--j.ch),l[j.ch]!=c||g)for(h=j.ch;h>-1&&!f;h--)l[h]==c&&(f=h+1);else f=j.ch+1;if(f&&!g)for(h=f,i=l.length;h<i&&!g;h++)l[h]==c&&(g=h);return f&&g?(e&&(--f,++g),{start:d(j.line,f),end:d(j.line,g)}):{start:j,end:j}}function za(){}function Aa(a){var b=a.state.vim;return b.searchState_||(b.searchState_=new za)}function Ba(a,b,c,d,e){a.openDialog?a.openDialog(b,d,{bottom:!0,value:e.value,onKeyDown:e.onKeyDown,onKeyUp:e.onKeyUp,selectValueOnOpen:!1}):d(prompt(c,""))}function Ca(a){var b=Da(a)||[];if(!b.length)return[];var c=[];if(0===b[0]){for(var d=0;d<b.length;d++)"number"==typeof b[d]&&c.push(a.substring(b[d]+1,b[d+1]));return c}}function Da(a){for(var b=!1,c=[],d=0;d<a.length;d++){var e=a.charAt(d);b||"/"!=e||c.push(d),b=!b&&"\\"==e}return c}function Ea(a){for(var b="|(){",c="}",d=!1,e=[],f=-1;f<a.length;f++){var g=a.charAt(f)||"",h=a.charAt(f+1)||"",i=h&&b.indexOf(h)!=-1;d?("\\"===g&&i||e.push(g),d=!1):"\\"===g?(d=!0,h&&c.indexOf(h)!=-1&&(i=!0),i&&"\\"!==h||e.push(g)):(e.push(g),i&&"\\"!==h&&e.push("\\"))}return e.join("")}function Fa(a){for(var b=!1,c=[],d=-1;d<a.length;d++){var e=a.charAt(d)||"",f=a.charAt(d+1)||"";Eb[e+f]?(c.push(Eb[e+f]),d++):b?(c.push(e),b=!1):"\\"===e?(b=!0,p(f)||"$"===f?c.push("$"):"/"!==f&&"\\"!==f&&c.push("\\")):("$"===e&&c.push("$"),c.push(e),"/"===f&&c.push("\\"))}return c.join("")}function Ga(b){for(var c=new a.StringStream(b),d=[];!c.eol();){for(;c.peek()&&"\\"!=c.peek();)d.push(c.next());var e=!1;for(var f in Fb)if(c.match(f,!0)){e=!0,d.push(Fb[f]);break}e||d.push(c.next())}return d.join("")}function Ha(a,b,c){var d=vb.registerController.getRegister("/");if(d.setText(a),a instanceof RegExp)return a;var e,f,g=Da(a);if(g.length){e=a.substring(0,g[0]);var h=a.substring(g[0]);f=h.indexOf("i")!=-1}else e=a;if(!e)return null;v("pcre")||(e=Ea(e)),c&&(b=/^[^A-Z]*$/.test(e));var i=new RegExp(e,b||f?"i":void 0);return i}function Ia(a,b){a.openNotification?a.openNotification('<span style="color: red">'+b+"</span>",{bottom:!0,duration:5e3}):alert(b)}function Ja(a,b){var c='<span style="font-family: monospace; white-space: pre">'+(a||"")+'<input type="text"></span>';return b&&(c+=' <span style="color: #888">'+b+"</span>"),c}function Ka(a,b){var c=(b.prefix||"")+" "+(b.desc||""),d=Ja(b.prefix,b.desc);Ba(a,d,c,b.onClose,b)}function La(a,b){if(a instanceof RegExp&&b instanceof RegExp){for(var c=["global","multiline","ignoreCase","source"],d=0;d<c.length;d++){var e=c[d];if(a[e]!==b[e])return!1}return!0}return!1}function Ma(a,b,c,d){if(b){var e=Aa(a),f=Ha(b,!!c,!!d);if(f)return Oa(a,f),La(f,e.getQuery())?f:(e.setQuery(f),f)}}function Na(a){if("^"==a.source.charAt(0))var b=!0;return{token:function(c){if(b&&!c.sol())return void c.skipToEnd();var d=c.match(a,!1);if(d)return 0==d[0].length?(c.next(),"searching"):c.sol()||(c.backUp(1),a.exec(c.next()+d[0]))?(c.match(a),"searching"):(c.next(),null);for(;!c.eol()&&(c.next(),!c.match(a,!1)););},query:a}}function Oa(a,b){var c=Aa(a),d=c.getOverlay();d&&b==d.query||(d&&a.removeOverlay(d),d=Na(b),a.addOverlay(d),a.showMatchesOnScrollbar&&(c.getScrollbarAnnotate()&&c.getScrollbarAnnotate().clear(),c.setScrollbarAnnotate(a.showMatchesOnScrollbar(b))),c.setOverlay(d))}function Pa(a,b,c,e){return void 0===e&&(e=1),a.operation((function(){for(var f=a.getCursor(),g=a.getSearchCursor(c,f),h=0;h<e;h++){var i=g.find(b);if(0==h&&i&&S(g.from(),f)&&(i=g.find(b)),!i&&(g=a.getSearchCursor(c,b?d(a.lastLine()):d(a.firstLine(),0)),!g.find(b)))return}return g.from()}))}function Qa(a){var b=Aa(a);a.removeOverlay(Aa(a).getOverlay()),b.setOverlay(null),b.getScrollbarAnnotate()&&(b.getScrollbarAnnotate().clear(),b.setScrollbarAnnotate(null))}function Ra(a,b,c){return"number"!=typeof a&&(a=a.line),b instanceof Array?s(a,b):c?a>=b&&a<=c:a==b}function Sa(a){var b=a.getScrollInfo(),c=6,d=10,e=a.coordsChar({left:0,top:c+b.top},"local"),f=b.clientHeight-d+b.top,g=a.coordsChar({left:0,top:f},"local");return{top:e.line,bottom:g.line}}function Ta(a,b,c){if("'"==c){var d=a.doc.history.done,e=d[d.length-2];return e&&e.ranges&&e.ranges[0].head}var f=b.marks[c];return f&&f.find()}function Ua(b,c,d,e,f,g,h,i,j){function k(){b.operation((function(){for(;!p;)l(),m();n()}))}function l(){var a=b.getRange(g.from(),g.to()),c=a.replace(h,i);g.replace(c)}function m(){for(;g.findNext()&&Ra(g.from(),e,f);)if(d||!q||g.from().line!=q.line)return b.scrollIntoView(g.from(),30),b.setSelection(g.from(),g.to()),q=g.from(),void(p=!1);p=!0}function n(a){if(a&&a(),b.focus(),q){b.setCursor(q);var c=b.state.vim;c.exMode=!1,c.lastHPos=c.lastHSPos=q.ch}j&&j()}function o(c,d,e){a.e_stop(c);var f=a.keyName(c);switch(f){case"Y":l(),m();break;case"N":m();break;case"A":var g=j;j=void 0,b.operation(k),j=g;break;case"L":l();case"Q":case"Esc":case"Ctrl-C":case"Ctrl-[":n(e)}return p&&n(e),!0}b.state.vim.exMode=!0;var p=!1,q=g.from();return m(),p?void Ia(b,"No matches for "+h.source):c?void Ka(b,{prefix:"replace with <strong>"+i+"</strong> (y/n/a/q/l)",onKeyDown:o}):(k(),void(j&&j()))}function Va(b){var c=b.state.vim,d=vb.macroModeState,e=vb.registerController.getRegister("."),f=d.isPlaying,g=d.lastInsertModeChanges,h=[];if(!f){for(var i=g.inVisualBlock?c.lastSelection.visualBlock.height:1,j=g.changes,h=[],k=0;k<j.length;)h.push(j[k]),j[k]instanceof eb?k++:k+=i;g.changes=h,b.off("change",ab),a.off(b.getInputField(),"keydown",fb)}!f&&c.insertModeRepeat>1&&(gb(b,c,c.insertModeRepeat-1,!0),c.lastEditInputState.repeatOverride=c.insertModeRepeat),delete c.insertModeRepeat,c.insertMode=!1,b.setCursor(b.getCursor().line,b.getCursor().ch-1),b.setOption("keyMap","vim"),b.setOption("disableInput",!0),b.toggleOverwrite(!1),e.setText(g.changes.join("")),a.signal(b,"vim-mode-change",{mode:"normal"}),d.isRecording&&$a(d)}function Wa(a){b.unshift(a)}function Xa(a,b,c,d,e){var f={keys:a,type:b};f[b]=c,f[b+"Args"]=d;for(var g in e)f[g]=e[g];Wa(f)}function Ya(b,c,d,e){var f=vb.registerController.getRegister(e);if(":"==e)return f.keyBuffer[0]&&Jb.processCommand(b,f.keyBuffer[0]),void(d.isPlaying=!1);var g=f.keyBuffer,h=0;d.isPlaying=!0,d.replaySearchQueries=f.searchQueries.slice(0);for(var i=0;i<g.length;i++)for(var j,k,l=g[i];l;)if(j=/<\w+-.+?>|<\w+>|./.exec(l),k=j[0],l=l.substring(j.index+k.length),a.Vim.handleKey(b,k,"macro"),c.insertMode){var m=f.insertModeChanges[h++].changes;vb.macroModeState.lastInsertModeChanges.changes=m,hb(b,m,1),Va(b)}d.isPlaying=!1}function Za(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushText(b)}}function $a(a){if(!a.isPlaying){var b=a.latestRegister,c=vb.registerController.getRegister(b);c&&c.pushInsertModeChanges&&c.pushInsertModeChanges(a.lastInsertModeChanges)}}function _a(a,b){if(!a.isPlaying){var c=a.latestRegister,d=vb.registerController.getRegister(c);d&&d.pushSearchQuery&&d.pushSearchQuery(b)}}function ab(a,b){var c=vb.macroModeState,d=c.lastInsertModeChanges;if(!c.isPlaying)for(;b;){if(d.expectCursorActivityForChange=!0,"+input"==b.origin||"paste"==b.origin||void 0===b.origin){var e=b.text.join("\n");d.maybeReset&&(d.changes=[],d.maybeReset=!1),a.state.overwrite&&!/\n/.test(e)?d.changes.push([e]):d.changes.push(e)}b=b.next}}function bb(a){var b=a.state.vim;if(b.insertMode){var c=vb.macroModeState;if(c.isPlaying)return;var d=c.lastInsertModeChanges;d.expectCursorActivityForChange?d.expectCursorActivityForChange=!1:d.maybeReset=!0}else a.curOp.isVimOp||db(a,b);b.visualMode&&cb(a)}function cb(a){var b=a.state.vim,c=J(a,R(b.sel.head)),d=L(c,0,1);b.fakeCursor&&b.fakeCursor.clear(),b.fakeCursor=a.markText(c,d,{className:"cm-animate-fat-cursor"})}function db(b,c){var d=b.getCursor("anchor"),e=b.getCursor("head");if(c.visualMode&&!b.somethingSelected()?ia(b,!1):c.visualMode||c.insertMode||!b.somethingSelected()||(c.visualMode=!0,c.visualLine=!1,a.signal(b,"vim-mode-change",{mode:"visual"})),c.visualMode){var f=T(e,d)?0:-1,g=T(e,d)?-1:0;e=L(e,0,f),d=L(d,0,g),c.sel={anchor:d,head:e},ua(b,c,"<",U(e,d)),ua(b,c,">",V(e,d))}else c.insertMode||(c.lastHPos=b.getCursor().ch)}function eb(a){this.keyName=a}function fb(b){function c(){return e.maybeReset&&(e.changes=[],e.maybeReset=!1),e.changes.push(new eb(f)),!0}var d=vb.macroModeState,e=d.lastInsertModeChanges,f=a.keyName(b);f&&(f.indexOf("Delete")==-1&&f.indexOf("Backspace")==-1||a.lookupKey(f,"vim-insert",c))}function gb(a,b,c,d){function e(){h?yb.processAction(a,b,b.lastEditActionCommand):yb.evalInput(a,b)}function f(c){if(g.lastInsertModeChanges.changes.length>0){c=b.lastEditActionCommand?c:1;var d=g.lastInsertModeChanges;hb(a,d.changes,c)}}var g=vb.macroModeState;g.isPlaying=!0;var h=!!b.lastEditActionCommand,i=b.inputState;if(b.inputState=b.lastEditInputState,h&&b.lastEditActionCommand.interlaceInsertRepeat)for(var j=0;j<c;j++)e(),f(1);else d||e(),f(c);b.inputState=i,b.insertMode&&!d&&Va(a),g.isPlaying=!1}function hb(b,c,d){function e(c){return"string"==typeof c?a.commands[c](b):c(b),!0}var f=b.getCursor("head"),g=vb.macroModeState.lastInsertModeChanges.inVisualBlock;if(g){var h=b.state.vim,i=h.lastSelection,j=M(i.anchor,i.head);aa(b,f,j.line+1),d=b.listSelections().length,b.setCursor(f)}for(var k=0;k<d;k++){g&&b.setCursor(L(f,k,0));for(var l=0;l<c.length;l++){var m=c[l];if(m instanceof eb)a.lookupKey(m.keyName,"vim-insert",e);else if("string"==typeof m){var n=b.getCursor();b.replaceRange(m,n,n)}else{var o=b.getCursor(),p=L(o,0,m[0].length);b.replaceRange(m[0],o,p)}}}g&&b.setCursor(L(f,0,1))}a.defineOption("vimMode",!1,(function(b,c,d){c&&"vim"!=b.getOption("keyMap")?b.setOption("keyMap","vim"):!c&&d!=a.Init&&/^vim/.test(b.getOption("keyMap"))&&b.setOption("keyMap","default")}));var ib={Shift:"S",Ctrl:"C",Alt:"A",Cmd:"D",Mod:"A"},jb={Enter:"CR",Backspace:"BS",Delete:"Del",Insert:"Ins"},kb=/[\d]/,lb=[a.isWordChar,function(b){return b&&!a.isWordChar(b)&&!/\s/.test(b)}],mb=[function(a){return/\S/.test(a)}],nb=l(65,26),ob=l(97,26),pb=l(48,10),qb=[].concat(nb,ob,pb,["<",">"]),rb=[].concat(nb,ob,pb,["-",'"',".",":","/"]),sb={};t("filetype",void 0,"string",["ft"],(function(a,b){if(void 0!==b){if(void 0===a){var c=b.getOption("mode");return"null"==c?"":c}var c=""==a?"null":a;b.setOption("mode",c)}}));var tb=function(){function a(a,b,h){function i(b){var e=++d%c,f=g[e];f&&f.clear(),g[e]=a.setBookmark(b)}var j=d%c,k=g[j];if(k){var l=k.find();l&&!S(l,b)&&i(b)}else i(b);i(h),e=d,f=d-c+1,f<0&&(f=0)}function b(a,b){d+=b,d>e?d=e:d<f&&(d=f);var h=g[(c+d)%c];if(h&&!h.find()){var i,j=b>0?1:-1,k=a.getCursor();do if(d+=j,h=g[(c+d)%c],h&&(i=h.find())&&!S(k,i))break;while(d<e&&d>f)}return h}var c=100,d=-1,e=0,f=0,g=new Array(c);return{cachedCursor:void 0,add:a,move:b}},ub=function(a){return a?{changes:a.changes,expectCursorActivityForChange:a.expectCursorActivityForChange}:{changes:[],expectCursorActivityForChange:!1}};w.prototype={exitMacroRecordMode:function(){var a=vb.macroModeState;a.onRecordingDone&&a.onRecordingDone(),a.onRecordingDone=void 0,a.isRecording=!1},enterMacroRecordMode:function(a,b){var c=vb.registerController.getRegister(b);c&&(c.clear(),this.latestRegister=b,a.openDialog&&(this.onRecordingDone=a.openDialog("(recording)["+b+"]",null,{bottom:!0})),this.isRecording=!0)}};var vb,wb,xb={buildKeyMap:function(){},getRegisterController:function(){return vb.registerController},resetVimGlobalState_:y,getVimGlobalState_:function(){return vb},maybeInitVimState_:x,suppressErrorLogging:!1,InsertModeKey:eb,map:function(a,b,c){Jb.map(a,b,c)},unmap:function(a,b){Jb.unmap(a,b)},setOption:u,getOption:v,defineOption:t,defineEx:function(a,b,c){if(b){if(0!==a.indexOf(b))throw new Error('(Vim.defineEx) "'+b+'" is not a prefix of "'+a+'", command not registered')}else b=a;Ib[a]=c,Jb.commandMap_[b]={name:a,shortName:b,type:"api"}},handleKey:function(a,b,c){var d=this.findKey(a,b,c);if("function"==typeof d)return d()},findKey:function(c,d,e){function f(){var a=vb.macroModeState;if(a.isRecording){if("q"==d)return a.exitMacroRecordMode(),A(c),!0;"mapping"!=e&&Za(a,d)}}function g(){if("<Esc>"==d)return A(c),l.visualMode?ia(c):l.insertMode&&Va(c),!0}function h(b){for(var e;b;)e=/<\w+-.+?>|<\w+>|./.exec(b),d=e[0],b=b.substring(e.index+d.length),a.Vim.handleKey(c,d,"mapping")}function i(){if(g())return!0;for(var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d,e=1==d.length,f=yb.matchCommand(a,b,l.inputState,"insert");a.length>1&&"full"!=f.type;){var a=l.inputState.keyBuffer=a.slice(1),h=yb.matchCommand(a,b,l.inputState,"insert");"none"!=h.type&&(f=h)}if("none"==f.type)return A(c),!1;if("partial"==f.type)return wb&&window.clearTimeout(wb),wb=window.setTimeout((function(){l.insertMode&&l.inputState.keyBuffer&&A(c)}),v("insertModeEscKeysTimeout")),!e;if(wb&&window.clearTimeout(wb),e){for(var i=c.listSelections(),j=0;j<i.length;j++){var k=i[j].head;c.replaceRange("",L(k,0,-(a.length-1)),k,"+input")}vb.macroModeState.lastInsertModeChanges.changes.pop()}return A(c),f.command}function j(){if(f()||g())return!0;var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d;if(/^[1-9]\d*$/.test(a))return!0;var e=/^(\d*)(.*)$/.exec(a);if(!e)return A(c),!1;var h=l.visualMode?"visual":"normal",i=yb.matchCommand(e[2]||e[1],b,l.inputState,h);if("none"==i.type)return A(c),!1;if("partial"==i.type)return!0;l.inputState.keyBuffer="";var e=/^(\d*)(.*)$/.exec(a);return e[1]&&"0"!=e[1]&&l.inputState.pushRepeatDigit(e[1]),i.command}var k,l=x(c);return k=l.insertMode?i():j(),k===!1?void 0:k===!0?function(){return!0}:function(){return c.operation((function(){c.curOp.isVimOp=!0;try{"keyToKey"==k.type?h(k.toKeys):yb.processCommand(c,l,k)}catch(b){throw c.state.vim=void 0,x(c),a.Vim.suppressErrorLogging||console.log(b),b}return!0}))}},handleEx:function(a,b){Jb.processCommand(a,b)},defineMotion:F,defineAction:I,defineOperator:H,mapCommand:Xa,_mapCommand:Wa,defineRegister:C,exitVisualMode:ia,exitInsertMode:Va};z.prototype.pushRepeatDigit=function(a){this.operator?this.motionRepeat=this.motionRepeat.concat(a):this.prefixRepeat=this.prefixRepeat.concat(a)},z.prototype.getRepeat=function(){var a=0;return(this.prefixRepeat.length>0||this.motionRepeat.length>0)&&(a=1,this.prefixRepeat.length>0&&(a*=parseInt(this.prefixRepeat.join(""),10)),this.motionRepeat.length>0&&(a*=parseInt(this.motionRepeat.join(""),10))),a},B.prototype={setText:function(a,b,c){this.keyBuffer=[a||""],this.linewise=!!b,this.blockwise=!!c},pushText:function(a,b){b&&(this.linewise||this.keyBuffer.push("\n"),this.linewise=!0),this.keyBuffer.push(a)},pushInsertModeChanges:function(a){this.insertModeChanges.push(ub(a))},pushSearchQuery:function(a){this.searchQueries.push(a)},clear:function(){this.keyBuffer=[],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!1},toString:function(){return this.keyBuffer.join("")}},D.prototype={pushText:function(a,b,c,d,e){d&&"\n"!==c.charAt(c.length-1)&&(c+="\n");var f=this.isValidRegister(a)?this.getRegister(a):null;if(!f){switch(b){case"yank":this.registers[0]=new B(c,d,e);break;case"delete":case"change":c.indexOf("\n")==-1?this.registers["-"]=new B(c,d):(this.shiftNumericRegisters_(),this.registers[1]=new B(c,d))}return void this.unnamedRegister.setText(c,d,e)}var g=q(a);g?f.pushText(c,d):f.setText(c,d,e),this.unnamedRegister.setText(f.toString(),d)},getRegister:function(a){return this.isValidRegister(a)?(a=a.toLowerCase(),this.registers[a]||(this.registers[a]=new B),this.registers[a]):this.unnamedRegister},isValidRegister:function(a){return a&&s(a,rb)},shiftNumericRegisters_:function(){for(var a=9;a>=2;a--)this.registers[a]=this.getRegister(""+(a-1))}},E.prototype={nextMatch:function(a,b){var c=this.historyBuffer,d=b?-1:1;null===this.initialPrefix&&(this.initialPrefix=a);for(var e=this.iterator+d;b?e>=0:e<c.length;e+=d)for(var f=c[e],g=0;g<=f.length;g++)if(this.initialPrefix==f.substring(0,g))return this.iterator=e,f;return e>=c.length?(this.iterator=c.length,this.initialPrefix):e<0?a:void 0},pushInput:function(a){var b=this.historyBuffer.indexOf(a);b>-1&&this.historyBuffer.splice(b,1),a.length&&this.historyBuffer.push(a)},reset:function(){this.initialPrefix=null,this.iterator=this.historyBuffer.length}};var yb={matchCommand:function(a,b,c,d){var e=N(a,b,d,c);if(!e.full&&!e.partial)return{type:"none"};if(!e.full&&e.partial)return{type:"partial"};for(var f,g=0;g<e.full.length;g++){var h=e.full[g];f||(f=h)}if("<character>"==f.keys.slice(-11)){var i=P(a);if(!i)return{type:"none"};c.selectedCharacter=i}return{type:"full",command:f}},processCommand:function(a,b,c){switch(b.inputState.repeatOverride=c.repeatOverride,c.type){case"motion":this.processMotion(a,b,c);break;case"operator":this.processOperator(a,b,c);break;case"operatorMotion":this.processOperatorMotion(a,b,c);break;case"action":this.processAction(a,b,c);break;case"search":this.processSearch(a,b,c);break;case"ex":case"keyToEx":this.processEx(a,b,c)}},processMotion:function(a,b,c){b.inputState.motion=c.motion,b.inputState.motionArgs=K(c.motionArgs),this.evalInput(a,b)},processOperator:function(a,b,c){var d=b.inputState;if(d.operator){if(d.operator==c.operator)return d.motion="expandToLine",d.motionArgs={linewise:!0},void this.evalInput(a,b);A(a)}d.operator=c.operator,d.operatorArgs=K(c.operatorArgs),b.visualMode&&this.evalInput(a,b)},processOperatorMotion:function(a,b,c){var d=b.visualMode,e=K(c.operatorMotionArgs);e&&d&&e.visualLine&&(b.visualLine=!0),this.processOperator(a,b,c),d||this.processMotion(a,b,c)},processAction:function(a,b,c){var d=b.inputState,e=d.getRepeat(),f=!!e,g=K(c.actionArgs)||{};d.selectedCharacter&&(g.selectedCharacter=d.selectedCharacter),c.operator&&this.processOperator(a,b,c),c.motion&&this.processMotion(a,b,c),(c.motion||c.operator)&&this.evalInput(a,b),g.repeat=e||1,g.repeatIsExplicit=f,g.registerName=d.registerName,A(a),b.lastMotion=null,c.isEdit&&this.recordLastEdit(b,d,c),Bb[c.action](a,g,b)},processSearch:function(b,c,d){function e(a,e,f){vb.searchHistoryController.pushInput(a),vb.searchHistoryController.reset();try{Ma(b,a,e,f)}catch(c){return Ia(b,"Invalid regex: "+a),void A(b)}yb.processMotion(b,c,{type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:d.searchArgs.toJumplist}})}function f(a){b.scrollTo(m.left,m.top),e(a,!0,!0);var c=vb.macroModeState;c.isRecording&&_a(c,a)}function g(c,d,e){var f,g,h=a.keyName(c);"Up"==h||"Down"==h?(f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.searchHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.searchHistoryController.reset();var j;try{j=Ma(b,d,!0,!0)}catch(a){}j?b.scrollIntoView(Pa(b,!i,j),30):(Qa(b),b.scrollTo(m.left,m.top))}function h(c,d,e){var f=a.keyName(c);"Esc"==f||"Ctrl-C"==f||"Ctrl-["==f||"Backspace"==f&&""==d?(vb.searchHistoryController.pushInput(d),vb.searchHistoryController.reset(),Ma(b,l),Qa(b),b.scrollTo(m.left,m.top),a.e_stop(c),A(b),e(),b.focus()):"Up"==f||"Down"==f?a.e_stop(c):"Ctrl-U"==f&&(a.e_stop(c),e(""))}if(b.getSearchCursor){var i=d.searchArgs.forward,j=d.searchArgs.wholeWordOnly;Aa(b).setReversed(!i);var k=i?"/":"?",l=Aa(b).getQuery(),m=b.getScrollInfo();switch(d.searchArgs.querySrc){case"prompt":var n=vb.macroModeState;if(n.isPlaying){var o=n.replaySearchQueries.shift();e(o,!0,!1)}else Ka(b,{onClose:f,prefix:k,desc:Gb,onKeyUp:g,onKeyDown:h});break;case"wordUnderCursor":var p=ma(b,!1,!0,!1,!0),q=!0;if(p||(p=ma(b,!1,!0,!1,!1),q=!1),!p)return;var o=b.getLine(p.start.line).substring(p.start.ch,p.end.ch);o=q&&j?"\\b"+o+"\\b":Z(o),vb.jumpList.cachedCursor=b.getCursor(),b.setCursor(p.start),e(o,!0,!1)}}},processEx:function(b,c,d){function e(a){vb.exCommandHistoryController.pushInput(a),vb.exCommandHistoryController.reset(),Jb.processCommand(b,a)}function f(c,d,e){var f,g,h=a.keyName(c);("Esc"==h||"Ctrl-C"==h||"Ctrl-["==h||"Backspace"==h&&""==d)&&(vb.exCommandHistoryController.pushInput(d),vb.exCommandHistoryController.reset(),a.e_stop(c),A(b),e(),b.focus()),"Up"==h||"Down"==h?(a.e_stop(c),f="Up"==h,g=c.target?c.target.selectionEnd:0,d=vb.exCommandHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Ctrl-U"==h?(a.e_stop(c),e("")):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&vb.exCommandHistoryController.reset()}"keyToEx"==d.type?Jb.processCommand(b,d.exArgs.input):c.visualMode?Ka(b,{onClose:e,prefix:":",value:"'<,'>",onKeyDown:f}):Ka(b,{onClose:e,prefix:":",onKeyDown:f})},evalInput:function(a,b){var c,e,f,g=b.inputState,h=g.motion,i=g.motionArgs||{},j=g.operator,k=g.operatorArgs||{},l=g.registerName,m=b.sel,n=R(b.visualMode?J(a,m.head):a.getCursor("head")),o=R(b.visualMode?J(a,m.anchor):a.getCursor("anchor")),p=R(n),q=R(o);if(j&&this.recordLastEdit(b,g),f=void 0!==g.repeatOverride?g.repeatOverride:g.getRepeat(),f>0&&i.explicitRepeat?i.repeatIsExplicit=!0:(i.noRepeat||!i.explicitRepeat&&0===f)&&(f=1,i.repeatIsExplicit=!1),g.selectedCharacter&&(i.selectedCharacter=k.selectedCharacter=g.selectedCharacter),i.repeat=f,A(a),h){var r=zb[h](a,n,i,b);if(b.lastMotion=zb[h],!r)return;if(i.toJumplist){var s=vb.jumpList,t=s.cachedCursor;t?(na(a,t,r),delete s.cachedCursor):na(a,n,r)}r instanceof Array?(e=r[0],c=r[1]):c=r,c||(c=R(n)),b.visualMode?(b.visualBlock&&c.ch===1/0||(c=J(a,c,b.visualBlock)),e&&(e=J(a,e,!0)),e=e||q,m.anchor=e,m.head=c,fa(a),ua(a,b,"<",T(e,c)?e:c),ua(a,b,">",T(e,c)?c:e)):j||(c=J(a,c),a.setCursor(c.line,c.ch))}if(j){if(k.lastSel){e=q;var u=k.lastSel,v=Math.abs(u.head.line-u.anchor.line),w=Math.abs(u.head.ch-u.anchor.ch);c=u.visualLine?d(q.line+v,q.ch):u.visualBlock?d(q.line+v,q.ch+w):u.head.line==u.anchor.line?d(q.line,q.ch+w):d(q.line+v,q.ch),b.visualMode=!0,b.visualLine=u.visualLine,b.visualBlock=u.visualBlock,m=b.sel={anchor:e,head:c},fa(a)}else b.visualMode&&(k.lastSel={anchor:R(m.anchor),head:R(m.head),visualBlock:b.visualBlock,visualLine:b.visualLine});var x,y,z,B,C;if(b.visualMode){if(x=U(m.head,m.anchor),y=V(m.head,m.anchor),z=b.visualLine||k.linewise,B=b.visualBlock?"block":z?"line":"char",C=ga(a,{anchor:x,head:y},B),z){var D=C.ranges;if("block"==B)for(var E=0;E<D.length;E++)D[E].head.ch=X(a,D[E].head.line);else"line"==B&&(D[0].head=d(D[0].head.line+1,0))}}else{if(x=R(e||q),y=R(c||p),T(y,x)){var F=x;x=y,y=F}z=i.linewise||k.linewise,z?ka(a,x,y):i.forward&&ja(a,x,y),B="char";var G=!i.inclusive||z;C=ga(a,{anchor:x,head:y},B,G)}a.setSelections(C.ranges,C.primary),b.lastMotion=null,k.repeat=f,k.registerName=l,k.linewise=z;var H=Ab[j](a,k,C.ranges,q,c);b.visualMode&&ia(a,null!=H),H&&a.setCursor(H)}},recordLastEdit:function(a,b,c){var d=vb.macroModeState;d.isPlaying||(a.lastEditInputState=b,a.lastEditActionCommand=c,d.lastInsertModeChanges.changes=[],d.lastInsertModeChanges.expectCursorActivityForChange=!1)}},zb={moveToTopLine:function(a,b,c){var e=Sa(a).top+c.repeat-1;return d(e,la(a.getLine(e)))},moveToMiddleLine:function(a){var b=Sa(a),c=Math.floor(.5*(b.top+b.bottom));return d(c,la(a.getLine(c)))},moveToBottomLine:function(a,b,c){var e=Sa(a).bottom-c.repeat+1;return d(e,la(a.getLine(e)))},expandToLine:function(a,b,c){var e=b;return d(e.line+c.repeat-1,1/0)},findNext:function(a,b,c){var d=Aa(a),e=d.getQuery();if(e){var f=!c.forward;return f=d.isReversed()?!f:f,Oa(a,e),Pa(a,f,e,c.repeat)}},goToMark:function(a,b,c,d){var e=Ta(a,d,c.selectedCharacter);return e?c.linewise?{line:e.line,ch:la(a.getLine(e.line))}:e:null},moveToOtherHighlightedEnd:function(a,b,c,e){if(e.visualBlock&&c.sameLine){var f=e.sel;return[J(a,d(f.anchor.line,f.head.ch)),J(a,d(f.head.line,f.anchor.ch))]}return[e.sel.head,e.sel.anchor]},jumpToMark:function(a,b,c,e){for(var f=b,g=0;g<c.repeat;g++){var h=f;for(var i in e.marks)if(n(i)){var j=e.marks[i].find(),k=c.forward?T(j,h):T(h,j);if(!(k||c.linewise&&j.line==h.line)){var l=S(h,f),m=c.forward?W(h,j,f):W(f,j,h);(l||m)&&(f=j)}}}return c.linewise&&(f=d(f.line,la(a.getLine(f.line)))),f},moveByCharacters:function(a,b,c){var e=b,f=c.repeat,g=c.forward?e.ch+f:e.ch-f;return d(e.line,g)},moveByLines:function(a,b,c,e){var f=b,g=f.ch;switch(e.lastMotion){case this.moveByLines:case this.moveByDisplayLines:case this.moveByScroll:case this.moveToColumn:case this.moveToEol:g=e.lastHPos;break;default:e.lastHPos=g}var h=c.repeat+(c.repeatOffset||0),i=c.forward?f.line+h:f.line-h,j=a.firstLine(),k=a.lastLine();return i<j&&f.line==j?this.moveToStartOfLine(a,b,c,e):i>k&&f.line==k?this.moveToEol(a,b,c,e):(c.toFirstChar&&(g=la(a.getLine(i)),e.lastHPos=g),e.lastHSPos=a.charCoords(d(i,g),"div").left,d(i,g))},moveByDisplayLines:function(a,b,c,e){var f=b;switch(e.lastMotion){case this.moveByDisplayLines:case this.moveByScroll:case this.moveByLines:case this.moveToColumn:case this.moveToEol:break;default:e.lastHSPos=a.charCoords(f,"div").left}var g=c.repeat,h=a.findPosV(f,c.forward?g:-g,"line",e.lastHSPos);if(h.hitSide)if(c.forward)var i=a.charCoords(h,"div"),j={top:i.top+8,left:e.lastHSPos},h=a.coordsChar(j,"div");else{var k=a.charCoords(d(a.firstLine(),0),"div");k.left=e.lastHSPos,h=a.coordsChar(k,"div")}return e.lastHPos=h.ch,h},moveByPage:function(a,b,c){var d=b,e=c.repeat;return a.findPosV(d,c.forward?e:-e,"page")},moveByParagraph:function(a,b,c){var d=c.forward?1:-1;return wa(a,b,c.repeat,d)},moveByScroll:function(a,b,c,d){var e=a.getScrollInfo(),f=null,g=c.repeat;g||(g=e.clientHeight/(2*a.defaultTextHeight()));var h=a.charCoords(b,"local");c.repeat=g;var f=zb.moveByDisplayLines(a,b,c,d);if(!f)return null;var i=a.charCoords(f,"local");return a.scrollTo(null,e.top+i.top-h.top),f},moveByWords:function(a,b,c){
+return ra(a,b,c.repeat,!!c.forward,!!c.wordEnd,!!c.bigWord)},moveTillCharacter:function(a,b,c){var d=c.repeat,e=sa(a,d,c.forward,c.selectedCharacter),f=c.forward?-1:1;return oa(f,c),e?(e.ch+=f,e):null},moveToCharacter:function(a,b,c){var d=c.repeat;return oa(0,c),sa(a,d,c.forward,c.selectedCharacter)||b},moveToSymbol:function(a,b,c){var d=c.repeat;return pa(a,d,c.forward,c.selectedCharacter)||b},moveToColumn:function(a,b,c,d){var e=c.repeat;return d.lastHPos=e-1,d.lastHSPos=a.charCoords(b,"div").left,ta(a,e)},moveToEol:function(a,b,c,e){var f=b;e.lastHPos=1/0;var g=d(f.line+c.repeat-1,1/0),h=a.clipPos(g);return h.ch--,e.lastHSPos=a.charCoords(h,"div").left,g},moveToFirstNonWhiteSpaceCharacter:function(a,b){var c=b;return d(c.line,la(a.getLine(c.line)))},moveToMatchedSymbol:function(a,b){for(var c,e=b,f=e.line,g=e.ch,h=a.getLine(f);g<h.length;g++)if(c=h.charAt(g),c&&o(c)){var i=a.getTokenTypeAt(d(f,g+1));if("string"!==i&&"comment"!==i)break}if(g<h.length){var j=a.findMatchingBracket(d(f,g));return j.to}return e},moveToStartOfLine:function(a,b){return d(b.line,0)},moveToLineOrEdgeOfDocument:function(a,b,c){var e=c.forward?a.lastLine():a.firstLine();return c.repeatIsExplicit&&(e=c.repeat-a.getOption("firstLineNumber")),d(e,la(a.getLine(e)))},textObjectManipulation:function(a,b,c,d){var e={"(":")",")":"(","{":"}","}":"{","[":"]","]":"["},f={"'":!0,'"':!0},g=c.selectedCharacter;"b"==g?g="(":"B"==g&&(g="{");var h,i=!c.textObjectInner;if(e[g])h=xa(a,b,g,i);else if(f[g])h=ya(a,b,g,i);else if("W"===g)h=ma(a,i,!0,!0);else if("w"===g)h=ma(a,i,!0,!1);else{if("p"!==g)return null;if(h=wa(a,b,c.repeat,0,i),c.linewise=!0,d.visualMode)d.visualLine||(d.visualLine=!0);else{var j=d.inputState.operatorArgs;j&&(j.linewise=!0),h.end.line--}}return a.state.vim.visualMode?ea(a,h.start,h.end):[h.start,h.end]},repeatLastCharacterSearch:function(a,b,c){var d=vb.lastCharacterSearch,e=c.repeat,f=c.forward===d.forward,g=(d.increment?1:0)*(f?-1:1);a.moveH(-g,"char"),c.inclusive=!!f;var h=sa(a,e,f,d.selectedCharacter);return h?(h.ch+=g,h):(a.moveH(g,"char"),b)}},Ab={change:function(b,c,e){var f,g,h=b.state.vim;if(vb.macroModeState.lastInsertModeChanges.inVisualBlock=h.visualBlock,h.visualMode){g=b.getSelection();var i=G("",e.length);b.replaceSelections(i),f=U(e[0].head,e[0].anchor)}else{var j=e[0].anchor,k=e[0].head;g=b.getRange(j,k);var l=h.lastEditInputState||{};if("moveByWords"==l.motion&&!r(g)){var m=/\s+$/.exec(g);m&&l.motionArgs&&l.motionArgs.forward&&(k=L(k,0,-m[0].length),g=g.slice(0,-m[0].length))}var n=new d(j.line-1,Number.MAX_VALUE),o=b.firstLine()==b.lastLine();k.line>b.lastLine()&&c.linewise&&!o?b.replaceRange("",n,k):b.replaceRange("",j,k),c.linewise&&(o||(b.setCursor(n),a.commands.newlineAndIndent(b)),j.ch=Number.MAX_VALUE),f=j}vb.registerController.pushText(c.registerName,"change",g,c.linewise,e.length>1),Bb.enterInsertMode(b,{head:f},b.state.vim)},delete:function(a,b,c){var e,f,g=a.state.vim;if(g.visualBlock){f=a.getSelection();var h=G("",c.length);a.replaceSelections(h),e=c[0].anchor}else{var i=c[0].anchor,j=c[0].head;b.linewise&&j.line!=a.firstLine()&&i.line==a.lastLine()&&i.line==j.line-1&&(i.line==a.firstLine()?i.ch=0:i=d(i.line-1,X(a,i.line-1))),f=a.getRange(i,j),a.replaceRange("",i,j),e=i,b.linewise&&(e=zb.moveToFirstNonWhiteSpaceCharacter(a,i))}return vb.registerController.pushText(b.registerName,"delete",f,b.linewise,g.visualBlock),J(a,e)},indent:function(a,b,c){var d=a.state.vim,e=c[0].anchor.line,f=d.visualBlock?c[c.length-1].anchor.line:c[0].head.line,g=d.visualMode?b.repeat:1;b.linewise&&f--;for(var h=e;h<=f;h++)for(var i=0;i<g;i++)a.indentLine(h,b.indentRight);return zb.moveToFirstNonWhiteSpaceCharacter(a,c[0].anchor)},changeCase:function(a,b,c,d,e){for(var f=a.getSelections(),g=[],h=b.toLower,i=0;i<f.length;i++){var j=f[i],k="";if(h===!0)k=j.toLowerCase();else if(h===!1)k=j.toUpperCase();else for(var l=0;l<j.length;l++){var m=j.charAt(l);k+=q(m)?m.toLowerCase():m.toUpperCase()}g.push(k)}return a.replaceSelections(g),b.shouldMoveCursor?e:!a.state.vim.visualMode&&b.linewise&&c[0].anchor.line+1==c[0].head.line?zb.moveToFirstNonWhiteSpaceCharacter(a,d):b.linewise?d:U(c[0].anchor,c[0].head)},yank:function(a,b,c,d){var e=a.state.vim,f=a.getSelection(),g=e.visualMode?U(e.sel.anchor,e.sel.head,c[0].head,c[0].anchor):d;return vb.registerController.pushText(b.registerName,"yank",f,b.linewise,e.visualBlock),g}},Bb={jumpListWalk:function(a,b,c){if(!c.visualMode){var d=b.repeat,e=b.forward,f=vb.jumpList,g=f.move(a,e?d:-d),h=g?g.find():void 0;h=h?h:a.getCursor(),a.setCursor(h)}},scroll:function(a,b,c){if(!c.visualMode){var d=b.repeat||1,e=a.defaultTextHeight(),f=a.getScrollInfo().top,g=e*d,h=b.forward?f+g:f-g,i=R(a.getCursor()),j=a.charCoords(i,"local");if(b.forward)h>j.top?(i.line+=(h-j.top)/e,i.line=Math.ceil(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.top)):a.scrollTo(null,h);else{var k=h+a.getScrollInfo().clientHeight;k<j.bottom?(i.line-=(j.bottom-k)/e,i.line=Math.floor(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.bottom-a.getScrollInfo().clientHeight)):a.scrollTo(null,h)}}},scrollToCursor:function(a,b){var c=a.getCursor().line,e=a.charCoords(d(c,0),"local"),f=a.getScrollInfo().clientHeight,g=e.top,h=e.bottom-g;switch(b.position){case"center":g=g-f/2+h;break;case"bottom":g=g-f+h}a.scrollTo(null,g)},replayMacro:function(a,b,c){var d=b.selectedCharacter,e=b.repeat,f=vb.macroModeState;for("@"==d&&(d=f.latestRegister);e--;)Ya(a,c,f,d)},enterMacroRecordMode:function(a,b){var c=vb.macroModeState,d=b.selectedCharacter;vb.registerController.isValidRegister(d)&&c.enterMacroRecordMode(a,d)},toggleOverwrite:function(b){b.state.overwrite?(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})):(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"}))},enterInsertMode:function(b,c,e){if(!b.getOption("readOnly")){e.insertMode=!0,e.insertModeRepeat=c&&c.repeat||1;var f=c?c.insertAt:null,g=e.sel,h=c.head||b.getCursor("head"),i=b.listSelections().length;if("eol"==f)h=d(h.line,X(b,h.line));else if("charAfter"==f)h=L(h,0,1);else if("firstNonBlank"==f)h=zb.moveToFirstNonWhiteSpaceCharacter(b,h);else if("startOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.min(g.head.ch,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line<g.anchor.line?g.head:d(g.anchor.line,0);else if("endOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.max(g.head.ch+1,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line>=g.anchor.line?L(g.head,0,1):d(g.anchor.line,0);else if("inplace"==f&&e.visualMode)return;b.setOption("disableInput",!1),c&&c.replace?(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"})):(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})),vb.macroModeState.isPlaying||(b.on("change",ab),a.on(b.getInputField(),"keydown",fb)),e.visualMode&&ia(b),aa(b,h,i)}},toggleVisualMode:function(b,c,e){var f,g=c.repeat,h=b.getCursor();e.visualMode?e.visualLine^c.linewise||e.visualBlock^c.blockwise?(e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b)):ia(b):(e.visualMode=!0,e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,f=J(b,d(h.line,h.ch+g-1),!0),e.sel={anchor:h,head:f},a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),fa(b),ua(b,e,"<",U(h,f)),ua(b,e,">",V(h,f)))},reselectLastSelection:function(b,c,d){var e=d.lastSelection;if(d.visualMode&&da(b,d),e){var f=e.anchorMark.find(),g=e.headMark.find();if(!f||!g)return;d.sel={anchor:f,head:g},d.visualMode=!0,d.visualLine=e.visualLine,d.visualBlock=e.visualBlock,fa(b),ua(b,d,"<",U(f,g)),ua(b,d,">",V(f,g)),a.signal(b,"vim-mode-change",{mode:"visual",subMode:d.visualLine?"linewise":d.visualBlock?"blockwise":""})}},joinLines:function(a,b,c){var e,f;if(c.visualMode){if(e=a.getCursor("anchor"),f=a.getCursor("head"),T(f,e)){var g=f;f=e,e=g}f.ch=X(a,f.line)-1}else{var h=Math.max(b.repeat,2);e=a.getCursor(),f=J(a,d(e.line+h-1,1/0))}for(var i=0,j=e.line;j<f.line;j++){i=X(a,e.line);var g=d(e.line+1,X(a,e.line+1)),k=a.getRange(e,g);k=k.replace(/\n\s*/g," "),a.replaceRange(k,e,g)}var l=d(e.line,i);c.visualMode&&ia(a,!1),a.setCursor(l)},newLineAndEnterInsertMode:function(b,c,e){e.insertMode=!0;var f=R(b.getCursor());if(f.line!==b.firstLine()||c.after){f.line=c.after?f.line:f.line-1,f.ch=X(b,f.line),b.setCursor(f);var g=a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent;g(b)}else b.replaceRange("\n",d(b.firstLine(),0)),b.setCursor(b.firstLine(),0);this.enterInsertMode(b,{repeat:c.repeat},e)},paste:function(a,b,c){var e=R(a.getCursor()),f=vb.registerController.getRegister(b.registerName),g=f.toString();if(g){if(b.matchIndent){var h=a.getOption("tabSize"),i=function(a){var b=a.split("\t").length-1,c=a.split(" ").length-1;return b*h+1*c},j=a.getLine(a.getCursor().line),k=i(j.match(/^\s*/)[0]),l=g.replace(/\n$/,""),m=g!==l,n=i(g.match(/^\s*/)[0]),g=l.replace(/^\s*/gm,(function(b){var c=k+(i(b)-n);if(c<0)return"";if(a.getOption("indentWithTabs")){var d=Math.floor(c/h);return Array(d+1).join("\t")}return Array(c+1).join(" ")}));g+=m?"\n":""}if(b.repeat>1)var g=Array(b.repeat+1).join(g);var o=f.linewise,p=f.blockwise;if(o)c.visualMode?g=c.visualLine?g.slice(0,-1):"\n"+g.slice(0,g.length-1)+"\n":b.after?(g="\n"+g.slice(0,g.length-1),e.ch=X(a,e.line)):e.ch=0;else{if(p){g=g.split("\n");for(var q=0;q<g.length;q++)g[q]=""==g[q]?" ":g[q]}e.ch+=b.after?1:0}var r,s;if(c.visualMode){c.lastPastedText=g;var t,u=ca(a,c),v=u[0],w=u[1],x=a.getSelection(),y=a.listSelections(),z=new Array(y.length).join("1").split("1");c.lastSelection&&(t=c.lastSelection.headMark.find()),vb.registerController.unnamedRegister.setText(x),p?(a.replaceSelections(z),w=d(v.line+g.length-1,v.ch),a.setCursor(v),_(a,w),a.replaceSelections(g),r=v):c.visualBlock?(a.replaceSelections(z),a.setCursor(v),a.replaceRange(g,v,v),r=v):(a.replaceRange(g,v,w),r=a.posFromIndex(a.indexFromPos(v)+g.length-1)),t&&(c.lastSelection.headMark=a.setBookmark(t)),o&&(r.ch=0)}else if(p){a.setCursor(e);for(var q=0;q<g.length;q++){var A=e.line+q;A>a.lastLine()&&a.replaceRange("\n",d(A,0));var B=X(a,A);B<e.ch&&$(a,A,e.ch)}a.setCursor(e),_(a,d(e.line+g.length-1,e.ch)),a.replaceSelections(g),r=e}else a.replaceRange(g,e),o&&b.after?r=d(e.line+1,la(a.getLine(e.line+1))):o&&!b.after?r=d(e.line,la(a.getLine(e.line))):!o&&b.after?(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length-1)):(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length));c.visualMode&&ia(a,!1),a.setCursor(r)}},undo:function(b,c){b.operation((function(){Q(b,a.commands.undo,c.repeat)(),b.setCursor(b.getCursor("anchor"))}))},redo:function(b,c){Q(b,a.commands.redo,c.repeat)()},setRegister:function(a,b,c){c.inputState.registerName=b.selectedCharacter},setMark:function(a,b,c){var d=b.selectedCharacter;ua(a,c,d,a.getCursor())},replace:function(b,c,e){var f,g,h=c.selectedCharacter,i=b.getCursor(),j=b.listSelections();if(e.visualMode)i=b.getCursor("start"),g=b.getCursor("end");else{var k=b.getLine(i.line);f=i.ch+c.repeat,f>k.length&&(f=k.length),g=d(i.line,f)}if("\n"==h)e.visualMode||b.replaceRange("",i,g),(a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent)(b);else{var l=b.getRange(i,g);if(l=l.replace(/[^\n]/g,h),e.visualBlock){var m=new Array(b.getOption("tabSize")+1).join(" ");l=b.getSelection(),l=l.replace(/\t/g,m).replace(/[^\n]/g,h).split("\n"),b.replaceSelections(l)}else b.replaceRange(l,i,g);e.visualMode?(i=T(j[0].anchor,j[0].head)?j[0].anchor:j[0].head,b.setCursor(i),ia(b,!1)):b.setCursor(L(g,0,-1))}},incrementNumberToken:function(a,b){for(var c,e,f,g,h,i=a.getCursor(),j=a.getLine(i.line),k=/-?\d+/g;null!==(c=k.exec(j))&&(h=c[0],e=c.index,f=e+h.length,!(i.ch<f)););if((b.backtrack||!(f<=i.ch))&&h){var l=b.increase?1:-1,m=parseInt(h)+l*b.repeat,n=d(i.line,e),o=d(i.line,f);g=m.toString(),a.replaceRange(g,n,o),a.setCursor(d(i.line,e+g.length-1))}},repeatLastEdit:function(a,b,c){var d=c.lastEditInputState;if(d){var e=b.repeat;e&&b.repeatIsExplicit?c.lastEditInputState.repeatOverride=e:e=c.lastEditInputState.repeatOverride||e,gb(a,c,e,!1)}},indent:function(a,b){a.indentLine(a.getCursor().line,b.indentRight)},exitInsertMode:Va},Cb={"(":"bracket",")":"bracket","{":"bracket","}":"bracket","[":"section","]":"section","*":"comment","/":"comment",m:"method",M:"method","#":"preprocess"},Db={bracket:{isComplete:function(a){if(a.nextCh===a.symb){if(a.depth++,a.depth>=1)return!0}else a.nextCh===a.reverseSymb&&a.depth--;return!1}},section:{init:function(a){a.curMoveThrough=!0,a.symb=(a.forward?"]":"[")===a.symb?"{":"}"},isComplete:function(a){return 0===a.index&&a.nextCh===a.symb}},comment:{isComplete:function(a){var b="*"===a.lastCh&&"/"===a.nextCh;return a.lastCh=a.nextCh,b}},method:{init:function(a){a.symb="m"===a.symb?"{":"}",a.reverseSymb="{"===a.symb?"}":"{"},isComplete:function(a){return a.nextCh===a.symb}},preprocess:{init:function(a){a.index=0},isComplete:function(a){if("#"===a.nextCh){var b=a.lineText.match(/#(\w+)/)[1];if("endif"===b){if(a.forward&&0===a.depth)return!0;a.depth++}else if("if"===b){if(!a.forward&&0===a.depth)return!0;a.depth--}if("else"===b&&0===a.depth)return!0}return!1}}};t("pcre",!0,"boolean"),za.prototype={getQuery:function(){return vb.query},setQuery:function(a){vb.query=a},getOverlay:function(){return this.searchOverlay},setOverlay:function(a){this.searchOverlay=a},isReversed:function(){return vb.isReversed},setReversed:function(a){vb.isReversed=a},getScrollbarAnnotate:function(){return this.annotate},setScrollbarAnnotate:function(a){this.annotate=a}};var Eb={"\\n":"\n","\\r":"\r","\\t":"\t"},Fb={"\\/":"/","\\\\":"\\","\\n":"\n","\\r":"\r","\\t":"\t"},Gb="(Javascript regexp)",Hb=function(){this.buildCommandMap_()};Hb.prototype={processCommand:function(a,b,c){var d=this;a.operation((function(){a.curOp.isVimOp=!0,d._processCommand(a,b,c)}))},_processCommand:function(b,c,d){var e=b.state.vim,f=vb.registerController.getRegister(":"),g=f.toString();e.visualMode&&ia(b);var h=new a.StringStream(c);f.setText(c);var i=d||{};i.input=c;try{this.parseInput_(b,h,i)}catch(a){throw Ia(b,a),a}var j,k;if(i.commandName){if(j=this.matchCommand_(i.commandName)){if(k=j.name,j.excludeFromCommandHistory&&f.setText(g),this.parseCommandArgs_(h,i,j),"exToKey"==j.type){for(var l=0;l<j.toKeys.length;l++)a.Vim.handleKey(b,j.toKeys[l],"mapping");return}if("exToEx"==j.type)return void this.processCommand(b,j.toInput)}}else void 0!==i.line&&(k="move");if(!k)return void Ia(b,'Not an editor command ":'+c+'"');try{Ib[k](b,i),j&&j.possiblyAsync||!i.callback||i.callback()}catch(a){throw Ia(b,a),a}},parseInput_:function(a,b,c){b.eatWhile(":"),b.eat("%")?(c.line=a.firstLine(),c.lineEnd=a.lastLine()):(c.line=this.parseLineSpec_(a,b),void 0!==c.line&&b.eat(",")&&(c.lineEnd=this.parseLineSpec_(a,b)));var d=b.match(/^(\w+)/);return d?c.commandName=d[1]:c.commandName=b.match(/.*/)[0],c},parseLineSpec_:function(a,b){var c=b.match(/^(\d+)/);if(c)return parseInt(c[1],10)-1;switch(b.next()){case".":return this.parseLineSpecOffset_(b,a.getCursor().line);case"$":return this.parseLineSpecOffset_(b,a.lastLine());case"'":var d=b.next(),e=Ta(a,a.state.vim,d);if(!e)throw new Error("Mark not set");return this.parseLineSpecOffset_(b,e.line);case"-":case"+":return b.backUp(1),this.parseLineSpecOffset_(b,a.getCursor().line);default:return void b.backUp(1)}},parseLineSpecOffset_:function(a,b){var c=a.match(/^([+-])?(\d+)/);if(c){var d=parseInt(c[2],10);"-"==c[1]?b-=d:b+=d}return b},parseCommandArgs_:function(a,b,c){if(!a.eol()){b.argString=a.match(/.*/)[0];var d=c.argDelimiter||/\s+/,e=Y(b.argString).split(d);e.length&&e[0]&&(b.args=e)}},matchCommand_:function(a){for(var b=a.length;b>0;b--){var c=a.substring(0,b);if(this.commandMap_[c]){var d=this.commandMap_[c];if(0===d.name.indexOf(a))return d}}return null},buildCommandMap_:function(){this.commandMap_={};for(var a=0;a<c.length;a++){var b=c[a],d=b.shortName||b.name;this.commandMap_[d]=b}},map:function(a,c,d){if(":"!=a&&":"==a.charAt(0)){if(d)throw Error("Mode not supported for ex mappings");var e=a.substring(1);":"!=c&&":"==c.charAt(0)?this.commandMap_[e]={name:e,type:"exToEx",toInput:c.substring(1),user:!0}:this.commandMap_[e]={name:e,type:"exToKey",toKeys:c,user:!0}}else if(":"!=c&&":"==c.charAt(0)){var f={keys:a,type:"keyToEx",exArgs:{input:c.substring(1)}};d&&(f.context=d),b.unshift(f)}else{var f={keys:a,type:"keyToKey",toKeys:c};d&&(f.context=d),b.unshift(f)}},unmap:function(a,c){if(":"!=a&&":"==a.charAt(0)){if(c)throw Error("Mode not supported for ex mappings");var d=a.substring(1);if(this.commandMap_[d]&&this.commandMap_[d].user)return void delete this.commandMap_[d]}else for(var e=a,f=0;f<b.length;f++)if(e==b[f].keys&&b[f].context===c)return void b.splice(f,1);throw Error("No such mapping.")}};var Ib={colorscheme:function(a,b){return!b.args||b.args.length<1?void Ia(a,a.getOption("theme")):void a.setOption("theme",b.args[0])},map:function(a,b,c){var d=b.args;return!d||d.length<2?void(a&&Ia(a,"Invalid mapping: "+b.input)):void Jb.map(d[0],d[1],c)},imap:function(a,b){this.map(a,b,"insert")},nmap:function(a,b){this.map(a,b,"normal")},vmap:function(a,b){this.map(a,b,"visual")},unmap:function(a,b,c){var d=b.args;return!d||d.length<1?void(a&&Ia(a,"No such mapping: "+b.input)):void Jb.unmap(d[0],c)},move:function(a,b){yb.processCommand(a,a.state.vim,{type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0},repeatOverride:b.line+1})},set:function(a,b){var c=b.args,d=b.setCfg||{};if(!c||c.length<1)return void(a&&Ia(a,"Invalid mapping: "+b.input));var e=c[0].split("="),f=e[0],g=e[1],h=!1;if("?"==f.charAt(f.length-1)){if(g)throw Error("Trailing characters: "+b.argString);f=f.substring(0,f.length-1),h=!0}void 0===g&&"no"==f.substring(0,2)&&(f=f.substring(2),g=!1);var i=sb[f]&&"boolean"==sb[f].type;if(i&&void 0==g&&(g=!0),!i&&void 0===g||h){var j=v(f,a,d);j instanceof Error?Ia(a,j.message):j===!0||j===!1?Ia(a," "+(j?"":"no")+f):Ia(a,"  "+f+"="+j)}else{var k=u(f,g,a,d);k instanceof Error&&Ia(a,k.message)}},setlocal:function(a,b){b.setCfg={scope:"local"},this.set(a,b)},setglobal:function(a,b){b.setCfg={scope:"global"},this.set(a,b)},registers:function(a,b){var c=b.args,d=vb.registerController.registers,e="----------Registers----------<br><br>";if(c){var f;c=c.join("");for(var g=0;g<c.length;g++)if(f=c.charAt(g),vb.registerController.isValidRegister(f)){var h=d[f]||new B;e+='"'+f+"    "+h.toString()+"<br>"}}else for(var f in d){var i=d[f].toString();i.length&&(e+='"'+f+"    "+i+"<br>")}Ia(a,e)},sort:function(b,c){function e(){if(c.argString){var b=new a.StringStream(c.argString);if(b.eat("!")&&(h=!0),b.eol())return;if(!b.eatSpace())return"Invalid arguments";var d=b.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);if(!d&&!b.eol())return"Invalid arguments";if(d[1]){i=d[1].indexOf("i")!=-1,j=d[1].indexOf("u")!=-1;var e=d[1].indexOf("d")!=-1||d[1].indexOf("n")!=-1&&1,f=d[1].indexOf("x")!=-1&&1,g=d[1].indexOf("o")!=-1&&1;if(e+f+g>1)return"Invalid arguments";k=e&&"decimal"||f&&"hex"||g&&"octal"}d[2]&&(l=new RegExp(d[2].substr(1,d[2].length-2),i?"i":""))}}function f(a,b){if(h){var c;c=a,a=b,b=c}i&&(a=a.toLowerCase(),b=b.toLowerCase());var d=k&&s.exec(a),e=k&&s.exec(b);return d?(d=parseInt((d[1]+d[2]).toLowerCase(),t),e=parseInt((e[1]+e[2]).toLowerCase(),t),d-e):a<b?-1:1}function g(a,b){if(h){var c;c=a,a=b,b=c}return i&&(a[0]=a[0].toLowerCase(),b[0]=b[0].toLowerCase()),a[0]<b[0]?-1:1}var h,i,j,k,l,m=e();if(m)return void Ia(b,m+": "+c.argString);var n=c.line||b.firstLine(),o=c.lineEnd||c.line||b.lastLine();if(n!=o){var p=d(n,0),q=d(o,X(b,o)),r=b.getRange(p,q).split("\n"),s=l?l:"decimal"==k?/(-?)([\d]+)/:"hex"==k?/(-?)(?:0x)?([0-9a-f]+)/i:"octal"==k?/([0-7]+)/:null,t="decimal"==k?10:"hex"==k?16:"octal"==k?8:null,u=[],v=[];if(k||l)for(var w=0;w<r.length;w++){var x=l?r[w].match(l):null;x&&""!=x[0]?u.push(x):!l&&s.exec(r[w])?u.push(r[w]):v.push(r[w])}else v=r;if(u.sort(l?g:f),l)for(var w=0;w<u.length;w++)u[w]=u[w].input;else k||v.sort(f);if(r=h?u.concat(v):v.concat(u),j){var y,z=r;r=[];for(var w=0;w<z.length;w++)z[w]!=y&&r.push(z[w]),y=z[w]}b.replaceRange(r.join("\n"),p,q)}},global:function(a,b){var c=b.argString;if(!c)return void Ia(a,"Regular Expression missing from global");var d,e=void 0!==b.line?b.line:a.firstLine(),f=b.lineEnd||b.line||a.lastLine(),g=Ca(c),h=c;if(g.length&&(h=g[0],d=g.slice(1,g.length).join("/")),h)try{Ma(a,h,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+h)}for(var i=Aa(a).getQuery(),j=[],k="",l=e;l<=f;l++){var m=i.test(a.getLine(l));m&&(j.push(l+1),k+=a.getLine(l)+"<br>")}if(!d)return void Ia(a,k);var n=0,o=function(){if(n<j.length){var b=j[n]+d;Jb.processCommand(a,b,{callback:o})}n++};o()},substitute:function(a,b){if(!a.getSearchCursor)throw new Error("Search feature not available. Requires searchcursor.js or any other getSearchCursor implementation.");var c,e,f,g,h=b.argString,i=h?Ca(h):[],j="",k=!1,l=!1;if(i.length)c=i[0],j=i[1],c&&"$"===c[c.length-1]&&(c=c.slice(0,c.length-1)+"\\n",j=j?j+"\n":"\n"),void 0!==j&&(j=v("pcre")?Ga(j):Fa(j),vb.lastSubstituteReplacePart=j),e=i[2]?i[2].split(" "):[];else if(h&&h.length)return void Ia(a,"Substitutions should be of the form :s/pattern/replace/");if(e&&(f=e[0],g=parseInt(e[1]),f&&(f.indexOf("c")!=-1&&(k=!0,f.replace("c","")),f.indexOf("g")!=-1&&(l=!0,f.replace("g","")),c=c+"/"+f)),c)try{Ma(a,c,!0,!0)}catch(b){return void Ia(a,"Invalid regex: "+c)}if(j=j||vb.lastSubstituteReplacePart,void 0===j)return void Ia(a,"No previous substitute regular expression");var m=Aa(a),n=m.getQuery(),o=void 0!==b.line?b.line:a.getCursor().line,p=b.lineEnd||o;o==a.firstLine()&&p==a.lastLine()&&(p=1/0),g&&(o=p,p=o+g-1);var q=J(a,d(o,0)),r=a.getSearchCursor(n,q);Ua(a,k,l,o,p,r,n,j,b.callback)},redo:a.commands.redo,undo:a.commands.undo,write:function(b){a.commands.save?a.commands.save(b):b.save&&b.save()},nohlsearch:function(a){Qa(a)},yank:function(a){var b=R(a.getCursor()),c=b.line,d=a.getLine(c);vb.registerController.pushText("0","yank",d,!0,!0)},delmarks:function(b,c){if(!c.argString||!Y(c.argString))return void Ia(b,"Argument required");for(var d=b.state.vim,e=new a.StringStream(Y(c.argString));!e.eol();){e.eatSpace();var f=e.pos;if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var g=e.next();if(e.match("-",!0)){if(!e.match(/[a-zA-Z]/,!1))return void Ia(b,"Invalid argument: "+c.argString.substring(f));var h=g,i=e.next();if(!(n(h)&&n(i)||q(h)&&q(i)))return void Ia(b,"Invalid argument: "+h+"-");var j=h.charCodeAt(0),k=i.charCodeAt(0);if(j>=k)return void Ia(b,"Invalid argument: "+c.argString.substring(f));for(var l=0;l<=k-j;l++){var m=String.fromCharCode(j+l);delete d.marks[m]}}else delete d.marks[g]}}},Jb=new Hb;return a.keyMap.vim={attach:h,detach:g,call:i},t("insertModeEscKeysTimeout",200,"number"),a.keyMap["vim-insert"]={fallthrough:["default"],attach:h,detach:g,call:i},a.keyMap["vim-replace"]={Backspace:"goCharLeft",fallthrough:["vim-insert"],attach:h,detach:g,call:i},y(),xb};a.Vim=e()}));
\ No newline at end of file
diff --git a/media/editors/codemirror/lib/codemirror.css b/media/editors/codemirror/lib/codemirror.css
index b962b383740e7..b008351a62319 100644
--- a/media/editors/codemirror/lib/codemirror.css
+++ b/media/editors/codemirror/lib/codemirror.css
@@ -119,7 +119,7 @@
 .cm-s-default .cm-property,
 .cm-s-default .cm-operator {}
 .cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
 .cm-s-default .cm-comment {color: #a50;}
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
diff --git a/media/editors/codemirror/lib/codemirror.js b/media/editors/codemirror/lib/codemirror.js
index a0d3be5fea603..a225331ef711d 100644
--- a/media/editors/codemirror/lib/codemirror.js
+++ b/media/editors/codemirror/lib/codemirror.js
@@ -1134,7 +1134,7 @@ function endOfLine(visually, cm, lineObj, lineNo, dir) {
         ch = dir < 0 ? lineObj.text.length - 1 : 0;
         var targetTop = measureCharPrepared(cm, prep, ch).top;
         ch = findFirst(function (ch) { return measureCharPrepared(cm, prep, ch).top == targetTop; }, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch);
-        if (sticky == "before") { ch = moveCharLogically(lineObj, ch, 1, true); }
+        if (sticky == "before") { ch = moveCharLogically(lineObj, ch, 1); }
       } else { ch = dir < 0 ? part.to : part.from; }
       return new Pos(lineNo, ch, sticky)
     }
@@ -1495,12 +1495,13 @@ function startState(mode, a1, a2) {
 // Fed to the mode parsers, provides helper functions to make
 // parsers more succinct.
 
-var StringStream = function(string, tabSize) {
+var StringStream = function(string, tabSize, lineOracle) {
   this.pos = this.start = 0;
   this.string = string;
   this.tabSize = tabSize || 8;
   this.lastColumnPos = this.lastColumnValue = 0;
   this.lineStart = 0;
+  this.lineOracle = lineOracle;
 };
 
 StringStream.prototype.eol = function () {return this.pos >= this.string.length};
@@ -1567,23 +1568,65 @@ StringStream.prototype.hideFirstChars = function (n, inner) {
   try { return inner() }
   finally { this.lineStart -= n; }
 };
+StringStream.prototype.lookAhead = function (n) {
+  var oracle = this.lineOracle;
+  return oracle && oracle.lookAhead(n)
+};
+
+var SavedContext = function(state, lookAhead) {
+  this.state = state;
+  this.lookAhead = lookAhead;
+};
+
+var Context = function(doc, state, line, lookAhead) {
+  this.state = state;
+  this.doc = doc;
+  this.line = line;
+  this.maxLookAhead = lookAhead || 0;
+};
+
+Context.prototype.lookAhead = function (n) {
+  var line = this.doc.getLine(this.line + n);
+  if (line != null && n > this.maxLookAhead) { this.maxLookAhead = n; }
+  return line
+};
+
+Context.prototype.nextLine = function () {
+  this.line++;
+  if (this.maxLookAhead > 0) { this.maxLookAhead--; }
+};
+
+Context.fromSaved = function (doc, saved, line) {
+  if (saved instanceof SavedContext)
+    { return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead) }
+  else
+    { return new Context(doc, copyState(doc.mode, saved), line) }
+};
+
+Context.prototype.save = function (copy) {
+  var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state;
+  return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state
+};
+
 
 // Compute a style array (an array starting with a mode generation
 // -- for invalidation -- followed by pairs of end positions and
 // style strings), which is used to highlight the tokens on the
 // line.
-function highlightLine(cm, line, state, forceToEnd) {
+function highlightLine(cm, line, context, forceToEnd) {
   // A styles array always starts with a number identifying the
   // mode/overlays that it is based on (for easy invalidation).
   var st = [cm.state.modeGen], lineClasses = {};
   // Compute the base array of styles
-  runMode(cm, line.text, cm.doc.mode, state, function (end, style) { return st.push(end, style); },
-    lineClasses, forceToEnd);
+  runMode(cm, line.text, cm.doc.mode, context, function (end, style) { return st.push(end, style); },
+          lineClasses, forceToEnd);
+  var state = context.state;
 
   // Run overlays, adjust style array.
   var loop = function ( o ) {
     var overlay = cm.state.overlays[o], i = 1, at = 0;
-    runMode(cm, line.text, overlay.mode, true, function (end, style) {
+    context.state = true;
+    runMode(cm, line.text, overlay.mode, context, function (end, style) {
       var start = i;
       // Ensure there's a token end at the current position, and that i points at it
       while (at < end) {
@@ -1607,49 +1650,54 @@ function highlightLine(cm, line, state, forceToEnd) {
   };
 
   for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );
+  context.state = state;
 
   return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
 }
 
 function getLineStyles(cm, line, updateFrontier) {
   if (!line.styles || line.styles[0] != cm.state.modeGen) {
-    var state = getStateBefore(cm, lineNo(line));
-    var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
-    line.stateAfter = state;
+    var context = getContextBefore(cm, lineNo(line));
+    var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state);
+    var result = highlightLine(cm, line, context);
+    if (resetState) { context.state = resetState; }
+    line.stateAfter = context.save(!resetState);
     line.styles = result.styles;
     if (result.classes) { line.styleClasses = result.classes; }
     else if (line.styleClasses) { line.styleClasses = null; }
-    if (updateFrontier === cm.doc.frontier) { cm.doc.frontier++; }
+    if (updateFrontier === cm.doc.highlightFrontier)
+      { cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); }
   }
   return line.styles
 }
 
-function getStateBefore(cm, n, precise) {
+function getContextBefore(cm, n, precise) {
   var doc = cm.doc, display = cm.display;
-  if (!doc.mode.startState) { return true }
-  var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
-  if (!state) { state = startState(doc.mode); }
-  else { state = copyState(doc.mode, state); }
-  doc.iter(pos, n, function (line) {
-    processLine(cm, line.text, state);
-    var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
-    line.stateAfter = save ? copyState(doc.mode, state) : null;
-    ++pos;
+  if (!doc.mode.startState) { return new Context(doc, true, n) }
+  var start = findStartLine(cm, n, precise);
+  var saved = start > doc.first && getLine(doc, start - 1).stateAfter;
+  var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start);
+
+  doc.iter(start, n, function (line) {
+    processLine(cm, line.text, context);
+    var pos = context.line;
+    line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null;
+    context.nextLine();
   });
-  if (precise) { doc.frontier = pos; }
-  return state
+  if (precise) { doc.modeFrontier = context.line; }
+  return context
 }
 
 // Lightweight form of highlight -- proceed over this line and
 // update state, but don't save a style array. Used for lines that
 // aren't currently visible.
-function processLine(cm, text, state, startAt) {
+function processLine(cm, text, context, startAt) {
   var mode = cm.doc.mode;
-  var stream = new StringStream(text, cm.options.tabSize);
+  var stream = new StringStream(text, cm.options.tabSize, context);
   stream.start = stream.pos = startAt || 0;
-  if (text == "") { callBlankLine(mode, state); }
+  if (text == "") { callBlankLine(mode, context.state); }
   while (!stream.eol()) {
-    readToken(mode, stream, state);
+    readToken(mode, stream, context.state);
     stream.start = stream.pos;
   }
 }
@@ -1670,26 +1718,26 @@ function readToken(mode, stream, state, inner) {
   throw new Error("Mode " + mode.name + " failed to advance stream.")
 }
 
+var Token = function(stream, type, state) {
+  this.start = stream.start; this.end = stream.pos;
+  this.string = stream.current();
+  this.type = type || null;
+  this.state = state;
+};
+
 // Utility for getTokenAt and getLineTokens
 function takeToken(cm, pos, precise, asArray) {
-  var getObj = function (copy) { return ({
-    start: stream.start, end: stream.pos,
-    string: stream.current(),
-    type: style || null,
-    state: copy ? copyState(doc.mode, state) : state
-  }); };
-
   var doc = cm.doc, mode = doc.mode, style;
   pos = clipPos(doc, pos);
-  var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-  var stream = new StringStream(line.text, cm.options.tabSize), tokens;
+  var line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise);
+  var stream = new StringStream(line.text, cm.options.tabSize, context), tokens;
   if (asArray) { tokens = []; }
   while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
     stream.start = stream.pos;
-    style = readToken(mode, stream, state);
-    if (asArray) { tokens.push(getObj(true)); }
+    style = readToken(mode, stream, context.state);
+    if (asArray) { tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); }
   }
-  return asArray ? tokens : getObj()
+  return asArray ? tokens : new Token(stream, style, context.state)
 }
 
 function extractLineClasses(type, output) {
@@ -1707,21 +1755,21 @@ function extractLineClasses(type, output) {
 }
 
 // Run the given mode's parser over a line, calling f for each token.
-function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
+function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {
   var flattenSpans = mode.flattenSpans;
   if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans; }
   var curStart = 0, curStyle = null;
-  var stream = new StringStream(text, cm.options.tabSize), style;
+  var stream = new StringStream(text, cm.options.tabSize, context), style;
   var inner = cm.options.addModeClass && [null];
-  if (text == "") { extractLineClasses(callBlankLine(mode, state), lineClasses); }
+  if (text == "") { extractLineClasses(callBlankLine(mode, context.state), lineClasses); }
   while (!stream.eol()) {
     if (stream.pos > cm.options.maxHighlightLength) {
       flattenSpans = false;
-      if (forceToEnd) { processLine(cm, text, state, stream.pos); }
+      if (forceToEnd) { processLine(cm, text, context, stream.pos); }
       stream.pos = text.length;
       style = null;
     } else {
-      style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
+      style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses);
     }
     if (inner) {
       var mName = inner[0].name;
@@ -1756,8 +1804,9 @@ function findStartLine(cm, n, precise) {
   var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
   for (var search = n; search > lim; --search) {
     if (search <= doc.first) { return doc.first }
-    var line = getLine(doc, search - 1);
-    if (line.stateAfter && (!precise || search <= doc.frontier)) { return search }
+    var line = getLine(doc, search - 1), after = line.stateAfter;
+    if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))
+      { return search }
     var indented = countColumn(line.text, null, cm.options.tabSize);
     if (minline == null || minindent > indented) {
       minline = search - 1;
@@ -1767,6 +1816,23 @@ function findStartLine(cm, n, precise) {
   return minline
 }
 
+function retreatFrontier(doc, n) {
+  doc.modeFrontier = Math.min(doc.modeFrontier, n);
+  if (doc.highlightFrontier < n - 10) { return }
+  var start = doc.first;
+  for (var line = n - 1; line > start; line--) {
+    var saved = getLine(doc, line).stateAfter;
+    // change is on 3
+    // state on line 1 looked ahead 2 -- so saw 3
+    // test 1 + 2 < 3 should cover this
+    if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {
+      start = line + 1;
+      break
+    }
+  }
+  doc.highlightFrontier = Math.min(doc.highlightFrontier, start);
+}
+
 // LINE DATA STRUCTURE
 
 // Line objects. These hold state related to a line, including
@@ -2819,20 +2885,30 @@ function coordsCharInner(cm, lineObj, lineNo$$1, x, y) {
       var assign;
       ((assign = wrappedLineExtent(cm, lineObj, preparedMeasure, y), begin = assign.begin, end = assign.end, assign));
     }
-    pos = new Pos(lineNo$$1, begin);
+    pos = new Pos(lineNo$$1, Math.floor(begin + (end - begin) / 2));
     var beginLeft = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left;
     var dir = beginLeft < x ? 1 : -1;
     var prevDiff, diff = beginLeft - x, prevPos;
-    do {
+    var steps = Math.ceil((end - begin) / 4);
+    outer: do {
       prevDiff = diff;
       prevPos = pos;
-      pos = moveVisually(cm, lineObj, pos, dir);
-      if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
-        pos = prevPos;
-        break
+      var i = 0;
+      for (; i < steps; ++i) {
+        var prevPos$1 = pos;
+        pos = moveVisually(cm, lineObj, pos, dir);
+        if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
+          pos = prevPos$1;
+          break outer
+        }
       }
       diff = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left - x;
-    } while ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff)))
+      if (steps > 1) {
+        var diff_change_per_step = Math.abs(diff - prevDiff) / steps;
+        steps = Math.min(steps, Math.ceil(Math.abs(diff) / diff_change_per_step));
+        dir = diff < 0 ? 1 : -1;
+      }
+    } while (diff != 0 && (steps > 1 || ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff)))))
     if (Math.abs(diff) > Math.abs(prevDiff)) {
       if ((diff < 0) == (prevDiff < 0)) { throw new Error("Broke out of infinite loop in coordsCharInner") }
       pos = prevPos;
@@ -3148,49 +3224,6 @@ function onBlur(cm, e) {
   setTimeout(function () { if (!cm.state.focused) { cm.display.shift = false; } }, 150);
 }
 
-// Re-align line numbers and gutter marks to compensate for
-// horizontal scrolling.
-function alignHorizontally(cm) {
-  var display = cm.display, view = display.view;
-  if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }
-  var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-  var gutterW = display.gutters.offsetWidth, left = comp + "px";
-  for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {
-    if (cm.options.fixedGutter) {
-      if (view[i].gutter)
-        { view[i].gutter.style.left = left; }
-      if (view[i].gutterBackground)
-        { view[i].gutterBackground.style.left = left; }
-    }
-    var align = view[i].alignable;
-    if (align) { for (var j = 0; j < align.length; j++)
-      { align[j].style.left = left; } }
-  } }
-  if (cm.options.fixedGutter)
-    { display.gutters.style.left = (comp + gutterW) + "px"; }
-}
-
-// Used to ensure that the line number gutter is still the right
-// size for the current document size. Returns true when an update
-// is needed.
-function maybeUpdateLineNumberWidth(cm) {
-  if (!cm.options.lineNumbers) { return false }
-  var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
-  if (last.length != display.lineNumChars) {
-    var test = display.measure.appendChild(elt("div", [elt("div", last)],
-                                               "CodeMirror-linenumber CodeMirror-gutter-elt"));
-    var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
-    display.lineGutter.style.width = "";
-    display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
-    display.lineNumWidth = display.lineNumInnerWidth + padding;
-    display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
-    display.lineGutter.style.width = display.lineNumWidth + "px";
-    updateGutterSpace(cm);
-    return true
-  }
-  return false
-}
-
 // Read the actual heights of the rendered lines, and update their
 // stored heights to match.
 function updateHeightsInViewport(cm) {
@@ -3209,7 +3242,7 @@ function updateHeightsInViewport(cm) {
     }
     var diff = cur.line.height - height;
     if (height < 2) { height = textHeight(display); }
-    if (diff > .001 || diff < -.001) {
+    if (diff > .005 || diff < -.005) {
       updateLineHeight(cur.line, height);
       updateWidgetHeight(cur.line);
       if (cur.rest) { for (var j = 0; j < cur.rest.length; j++)
@@ -3249,139 +3282,221 @@ function visibleLines(display, doc, viewport) {
   return {from: from, to: Math.max(to, from + 1)}
 }
 
-// Sync the scrollable area and scrollbars, ensure the viewport
-// covers the visible area.
-function setScrollTop(cm, val) {
-  if (Math.abs(cm.doc.scrollTop - val) < 2) { return }
-  cm.doc.scrollTop = val;
-  if (!gecko) { updateDisplaySimple(cm, {top: val}); }
-  if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val; }
-  cm.display.scrollbars.setScrollTop(val);
-  if (gecko) { updateDisplaySimple(cm); }
-  startWorker(cm, 100);
+// Re-align line numbers and gutter marks to compensate for
+// horizontal scrolling.
+function alignHorizontally(cm) {
+  var display = cm.display, view = display.view;
+  if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }
+  var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
+  var gutterW = display.gutters.offsetWidth, left = comp + "px";
+  for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {
+    if (cm.options.fixedGutter) {
+      if (view[i].gutter)
+        { view[i].gutter.style.left = left; }
+      if (view[i].gutterBackground)
+        { view[i].gutterBackground.style.left = left; }
+    }
+    var align = view[i].alignable;
+    if (align) { for (var j = 0; j < align.length; j++)
+      { align[j].style.left = left; } }
+  } }
+  if (cm.options.fixedGutter)
+    { display.gutters.style.left = (comp + gutterW) + "px"; }
 }
-// Sync scroller and scrollbar, ensure the gutter elements are
-// aligned.
-function setScrollLeft(cm, val, isScroller) {
-  if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) { return }
-  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
-  cm.doc.scrollLeft = val;
-  alignHorizontally(cm);
-  if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val; }
-  cm.display.scrollbars.setScrollLeft(val);
+
+// Used to ensure that the line number gutter is still the right
+// size for the current document size. Returns true when an update
+// is needed.
+function maybeUpdateLineNumberWidth(cm) {
+  if (!cm.options.lineNumbers) { return false }
+  var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
+  if (last.length != display.lineNumChars) {
+    var test = display.measure.appendChild(elt("div", [elt("div", last)],
+                                               "CodeMirror-linenumber CodeMirror-gutter-elt"));
+    var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
+    display.lineGutter.style.width = "";
+    display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
+    display.lineNumWidth = display.lineNumInnerWidth + padding;
+    display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
+    display.lineGutter.style.width = display.lineNumWidth + "px";
+    updateGutterSpace(cm);
+    return true
+  }
+  return false
 }
 
-// Since the delta values reported on mouse wheel events are
-// unstandardized between browsers and even browser versions, and
-// generally horribly unpredictable, this code starts by measuring
-// the scroll effect that the first few mouse wheel events have,
-// and, from that, detects the way it can convert deltas to pixel
-// offsets afterwards.
-//
-// The reason we want to know the amount a wheel event will scroll
-// is that it gives us a chance to update the display before the
-// actual scrolling happens, reducing flickering.
+// SCROLLING THINGS INTO VIEW
 
-var wheelSamples = 0;
-var wheelPixelsPerUnit = null;
-// Fill in a browser-detected starting value on browsers where we
-// know one. These don't have to be accurate -- the result of them
-// being wrong would just be a slight flicker on the first wheel
-// scroll (if it is large enough).
-if (ie) { wheelPixelsPerUnit = -.53; }
-else if (gecko) { wheelPixelsPerUnit = 15; }
-else if (chrome) { wheelPixelsPerUnit = -.7; }
-else if (safari) { wheelPixelsPerUnit = -1/3; }
+// If an editor sits on the top or bottom of the window, partially
+// scrolled out of view, this ensures that the cursor is visible.
+function maybeScrollWindow(cm, rect) {
+  if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }
 
-function wheelEventDelta(e) {
-  var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
-  if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail; }
-  if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail; }
-  else if (dy == null) { dy = e.wheelDelta; }
-  return {x: dx, y: dy}
-}
-function wheelEventPixels(e) {
-  var delta = wheelEventDelta(e);
-  delta.x *= wheelPixelsPerUnit;
-  delta.y *= wheelPixelsPerUnit;
-  return delta
+  var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
+  if (rect.top + box.top < 0) { doScroll = true; }
+  else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false; }
+  if (doScroll != null && !phantom) {
+    var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n                         top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n                         height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n                         left: " + (rect.left) + "px; width: " + (Math.max(2, rect.right - rect.left)) + "px;"));
+    cm.display.lineSpace.appendChild(scrollNode);
+    scrollNode.scrollIntoView(doScroll);
+    cm.display.lineSpace.removeChild(scrollNode);
+  }
 }
 
-function onScrollWheel(cm, e) {
-  var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
-
-  var display = cm.display, scroll = display.scroller;
-  // Quit if there's nothing to scroll here
-  var canScrollX = scroll.scrollWidth > scroll.clientWidth;
-  var canScrollY = scroll.scrollHeight > scroll.clientHeight;
-  if (!(dx && canScrollX || dy && canScrollY)) { return }
-
-  // Webkit browsers on OS X abort momentum scrolls when the target
-  // of the scroll event is removed from the scrollable element.
-  // This hack (see related code in patchDisplay) makes sure the
-  // element is kept around.
-  if (dy && mac && webkit) {
-    outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
-      for (var i = 0; i < view.length; i++) {
-        if (view[i].node == cur) {
-          cm.display.currentWheelTarget = cur;
-          break outer
-        }
-      }
+// Scroll a given position into view (immediately), verifying that
+// it actually became visible (as line heights are accurately
+// measured, the position of something may 'drift' during drawing).
+function scrollPosIntoView(cm, pos, end, margin) {
+  if (margin == null) { margin = 0; }
+  var rect;
+  if (!cm.options.lineWrapping && pos == end) {
+    // Set pos and end to the cursor positions around the character pos sticks to
+    // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch
+    // If pos == Pos(_, 0, "before"), pos and end are unchanged
+    pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos;
+    end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos;
+  }
+  for (var limit = 0; limit < 5; limit++) {
+    var changed = false;
+    var coords = cursorCoords(cm, pos);
+    var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+    rect = {left: Math.min(coords.left, endCoords.left),
+            top: Math.min(coords.top, endCoords.top) - margin,
+            right: Math.max(coords.left, endCoords.left),
+            bottom: Math.max(coords.bottom, endCoords.bottom) + margin};
+    var scrollPos = calculateScrollPos(cm, rect);
+    var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
+    if (scrollPos.scrollTop != null) {
+      updateScrollTop(cm, scrollPos.scrollTop);
+      if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true; }
     }
+    if (scrollPos.scrollLeft != null) {
+      setScrollLeft(cm, scrollPos.scrollLeft);
+      if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true; }
+    }
+    if (!changed) { break }
   }
+  return rect
+}
 
-  // On some browsers, horizontal scrolling will cause redraws to
-  // happen before the gutter has been realigned, causing it to
-  // wriggle around in a most unseemly way. When we have an
-  // estimated pixels/delta value, we just handle horizontal
-  // scrolling entirely here. It'll be slightly off from native, but
-  // better than glitching out.
-  if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-    if (dy && canScrollY)
-      { setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight))); }
-    setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-    // Only prevent default scrolling if vertical scrolling is
-    // actually possible. Otherwise, it causes vertical scroll
-    // jitter on OSX trackpads when deltaX is small and deltaY
-    // is large (issue #3579)
-    if (!dy || (dy && canScrollY))
-      { e_preventDefault(e); }
-    display.wheelStartX = null; // Abort measurement, if in progress
-    return
-  }
+// Scroll a given set of coordinates into view (immediately).
+function scrollIntoView(cm, rect) {
+  var scrollPos = calculateScrollPos(cm, rect);
+  if (scrollPos.scrollTop != null) { updateScrollTop(cm, scrollPos.scrollTop); }
+  if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft); }
+}
 
-  // 'Project' the visible viewport to cover the area that is being
-  // scrolled into view (if we know enough to estimate it).
-  if (dy && wheelPixelsPerUnit != null) {
-    var pixels = dy * wheelPixelsPerUnit;
-    var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
-    if (pixels < 0) { top = Math.max(0, top + pixels - 50); }
-    else { bot = Math.min(cm.doc.height, bot + pixels + 50); }
-    updateDisplaySimple(cm, {top: top, bottom: bot});
+// Calculate a new scroll position needed to scroll the given
+// rectangle into view. Returns an object with scrollTop and
+// scrollLeft properties. When these are undefined, the
+// vertical/horizontal position does not need to be adjusted.
+function calculateScrollPos(cm, rect) {
+  var display = cm.display, snapMargin = textHeight(cm.display);
+  if (rect.top < 0) { rect.top = 0; }
+  var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
+  var screen = displayHeight(cm), result = {};
+  if (rect.bottom - rect.top > screen) { rect.bottom = rect.top + screen; }
+  var docBottom = cm.doc.height + paddingVert(display);
+  var atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin;
+  if (rect.top < screentop) {
+    result.scrollTop = atTop ? 0 : rect.top;
+  } else if (rect.bottom > screentop + screen) {
+    var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen);
+    if (newTop != screentop) { result.scrollTop = newTop; }
   }
 
-  if (wheelSamples < 20) {
-    if (display.wheelStartX == null) {
-      display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
-      display.wheelDX = dx; display.wheelDY = dy;
-      setTimeout(function () {
-        if (display.wheelStartX == null) { return }
-        var movedX = scroll.scrollLeft - display.wheelStartX;
-        var movedY = scroll.scrollTop - display.wheelStartY;
-        var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
-          (movedX && display.wheelDX && movedX / display.wheelDX);
-        display.wheelStartX = display.wheelStartY = null;
-        if (!sample) { return }
-        wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
-        ++wheelSamples;
-      }, 200);
-    } else {
-      display.wheelDX += dx; display.wheelDY += dy;
-    }
+  var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
+  var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
+  var tooWide = rect.right - rect.left > screenw;
+  if (tooWide) { rect.right = rect.left + screenw; }
+  if (rect.left < 10)
+    { result.scrollLeft = 0; }
+  else if (rect.left < screenleft)
+    { result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10)); }
+  else if (rect.right > screenw + screenleft - 3)
+    { result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; }
+  return result
+}
+
+// Store a relative adjustment to the scroll position in the current
+// operation (to be applied when the operation finishes).
+function addToScrollTop(cm, top) {
+  if (top == null) { return }
+  resolveScrollToPos(cm);
+  cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
+}
+
+// Make sure that at the end of the operation the current cursor is
+// shown.
+function ensureCursorVisible(cm) {
+  resolveScrollToPos(cm);
+  var cur = cm.getCursor();
+  cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin};
+}
+
+function scrollToCoords(cm, x, y) {
+  if (x != null || y != null) { resolveScrollToPos(cm); }
+  if (x != null) { cm.curOp.scrollLeft = x; }
+  if (y != null) { cm.curOp.scrollTop = y; }
+}
+
+function scrollToRange(cm, range$$1) {
+  resolveScrollToPos(cm);
+  cm.curOp.scrollToPos = range$$1;
+}
+
+// When an operation has its scrollToPos property set, and another
+// scroll action is applied before the end of the operation, this
+// 'simulates' scrolling that position into view in a cheap way, so
+// that the effect of intermediate scroll commands is not ignored.
+function resolveScrollToPos(cm) {
+  var range$$1 = cm.curOp.scrollToPos;
+  if (range$$1) {
+    cm.curOp.scrollToPos = null;
+    var from = estimateCoords(cm, range$$1.from), to = estimateCoords(cm, range$$1.to);
+    scrollToCoordsRange(cm, from, to, range$$1.margin);
   }
 }
 
+function scrollToCoordsRange(cm, from, to, margin) {
+  var sPos = calculateScrollPos(cm, {
+    left: Math.min(from.left, to.left),
+    top: Math.min(from.top, to.top) - margin,
+    right: Math.max(from.right, to.right),
+    bottom: Math.max(from.bottom, to.bottom) + margin
+  });
+  scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop);
+}
+
+// Sync the scrollable area and scrollbars, ensure the viewport
+// covers the visible area.
+function updateScrollTop(cm, val) {
+  if (Math.abs(cm.doc.scrollTop - val) < 2) { return }
+  if (!gecko) { updateDisplaySimple(cm, {top: val}); }
+  setScrollTop(cm, val, true);
+  if (gecko) { updateDisplaySimple(cm); }
+  startWorker(cm, 100);
+}
+
+function setScrollTop(cm, val, forceScroll) {
+  val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val);
+  if (cm.display.scroller.scrollTop == val && !forceScroll) { return }
+  cm.doc.scrollTop = val;
+  cm.display.scrollbars.setScrollTop(val);
+  if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val; }
+}
+
+// Sync scroller and scrollbar, ensure the gutter elements are
+// aligned.
+function setScrollLeft(cm, val, isScroller, forceScroll) {
+  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
+  if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { return }
+  cm.doc.scrollLeft = val;
+  alignHorizontally(cm);
+  if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val; }
+  cm.display.scrollbars.setScrollLeft(val);
+}
+
 // SCROLLBARS
 
 // Prepare DOM reads needed to update the scrollbars. Done in one
@@ -3530,165 +3645,38 @@ function updateScrollbarsInner(cm, measure) {
 
   if (sizes.right && sizes.bottom) {
     d.scrollbarFiller.style.display = "block";
-    d.scrollbarFiller.style.height = sizes.bottom + "px";
-    d.scrollbarFiller.style.width = sizes.right + "px";
-  } else { d.scrollbarFiller.style.display = ""; }
-  if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-    d.gutterFiller.style.display = "block";
-    d.gutterFiller.style.height = sizes.bottom + "px";
-    d.gutterFiller.style.width = measure.gutterWidth + "px";
-  } else { d.gutterFiller.style.display = ""; }
-}
-
-var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
-
-function initScrollbars(cm) {
-  if (cm.display.scrollbars) {
-    cm.display.scrollbars.clear();
-    if (cm.display.scrollbars.addClass)
-      { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
-  }
-
-  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) {
-    cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
-    // Prevent clicks in the scrollbars from killing focus
-    on(node, "mousedown", function () {
-      if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0); }
-    });
-    node.setAttribute("cm-not-content", "true");
-  }, function (pos, axis) {
-    if (axis == "horizontal") { setScrollLeft(cm, pos); }
-    else { setScrollTop(cm, pos); }
-  }, cm);
-  if (cm.display.scrollbars.addClass)
-    { addClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
-}
-
-// SCROLLING THINGS INTO VIEW
-
-// If an editor sits on the top or bottom of the window, partially
-// scrolled out of view, this ensures that the cursor is visible.
-function maybeScrollWindow(cm, rect) {
-  if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }
-
-  var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
-  if (rect.top + box.top < 0) { doScroll = true; }
-  else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false; }
-  if (doScroll != null && !phantom) {
-    var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n                         top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n                         height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n                         left: " + (rect.left) + "px; width: " + (Math.max(2, rect.right - rect.left)) + "px;"));
-    cm.display.lineSpace.appendChild(scrollNode);
-    scrollNode.scrollIntoView(doScroll);
-    cm.display.lineSpace.removeChild(scrollNode);
-  }
-}
-
-// Scroll a given position into view (immediately), verifying that
-// it actually became visible (as line heights are accurately
-// measured, the position of something may 'drift' during drawing).
-function scrollPosIntoView(cm, pos, end, margin) {
-  if (margin == null) { margin = 0; }
-  var rect;
-  for (var limit = 0; limit < 5; limit++) {
-    var changed = false;
-    var coords = cursorCoords(cm, pos);
-    var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
-    rect = {left: Math.min(coords.left, endCoords.left),
-            top: Math.min(coords.top, endCoords.top) - margin,
-            right: Math.max(coords.left, endCoords.left),
-            bottom: Math.max(coords.bottom, endCoords.bottom) + margin};
-    var scrollPos = calculateScrollPos(cm, rect);
-    var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
-    if (scrollPos.scrollTop != null) {
-      setScrollTop(cm, scrollPos.scrollTop);
-      if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true; }
-    }
-    if (scrollPos.scrollLeft != null) {
-      setScrollLeft(cm, scrollPos.scrollLeft);
-      if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true; }
-    }
-    if (!changed) { break }
-  }
-  return rect
-}
-
-// Scroll a given set of coordinates into view (immediately).
-function scrollIntoView(cm, rect) {
-  var scrollPos = calculateScrollPos(cm, rect);
-  if (scrollPos.scrollTop != null) { setScrollTop(cm, scrollPos.scrollTop); }
-  if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft); }
-}
-
-// Calculate a new scroll position needed to scroll the given
-// rectangle into view. Returns an object with scrollTop and
-// scrollLeft properties. When these are undefined, the
-// vertical/horizontal position does not need to be adjusted.
-function calculateScrollPos(cm, rect) {
-  var display = cm.display, snapMargin = textHeight(cm.display);
-  if (rect.top < 0) { rect.top = 0; }
-  var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-  var screen = displayHeight(cm), result = {};
-  if (rect.bottom - rect.top > screen) { rect.bottom = rect.top + screen; }
-  var docBottom = cm.doc.height + paddingVert(display);
-  var atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin;
-  if (rect.top < screentop) {
-    result.scrollTop = atTop ? 0 : rect.top;
-  } else if (rect.bottom > screentop + screen) {
-    var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen);
-    if (newTop != screentop) { result.scrollTop = newTop; }
-  }
-
-  var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-  var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
-  var tooWide = rect.right - rect.left > screenw;
-  if (tooWide) { rect.right = rect.left + screenw; }
-  if (rect.left < 10)
-    { result.scrollLeft = 0; }
-  else if (rect.left < screenleft)
-    { result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10)); }
-  else if (rect.right > screenw + screenleft - 3)
-    { result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; }
-  return result
+    d.scrollbarFiller.style.height = sizes.bottom + "px";
+    d.scrollbarFiller.style.width = sizes.right + "px";
+  } else { d.scrollbarFiller.style.display = ""; }
+  if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
+    d.gutterFiller.style.display = "block";
+    d.gutterFiller.style.height = sizes.bottom + "px";
+    d.gutterFiller.style.width = measure.gutterWidth + "px";
+  } else { d.gutterFiller.style.display = ""; }
 }
 
-// Store a relative adjustment to the scroll position in the current
-// operation (to be applied when the operation finishes).
-function addToScrollPos(cm, left, top) {
-  if (left != null || top != null) { resolveScrollToPos(cm); }
-  if (left != null)
-    { cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left; }
-  if (top != null)
-    { cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top; }
-}
+var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
 
-// Make sure that at the end of the operation the current cursor is
-// shown.
-function ensureCursorVisible(cm) {
-  resolveScrollToPos(cm);
-  var cur = cm.getCursor(), from = cur, to = cur;
-  if (!cm.options.lineWrapping) {
-    from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
-    to = Pos(cur.line, cur.ch + 1);
+function initScrollbars(cm) {
+  if (cm.display.scrollbars) {
+    cm.display.scrollbars.clear();
+    if (cm.display.scrollbars.addClass)
+      { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
   }
-  cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin};
-}
 
-// When an operation has its scrollToPos property set, and another
-// scroll action is applied before the end of the operation, this
-// 'simulates' scrolling that position into view in a cheap way, so
-// that the effect of intermediate scroll commands is not ignored.
-function resolveScrollToPos(cm) {
-  var range$$1 = cm.curOp.scrollToPos;
-  if (range$$1) {
-    cm.curOp.scrollToPos = null;
-    var from = estimateCoords(cm, range$$1.from), to = estimateCoords(cm, range$$1.to);
-    var sPos = calculateScrollPos(cm, {
-      left: Math.min(from.left, to.left),
-      top: Math.min(from.top, to.top) - range$$1.margin,
-      right: Math.max(from.right, to.right),
-      bottom: Math.max(from.bottom, to.bottom) + range$$1.margin
+  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) {
+    cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+    // Prevent clicks in the scrollbars from killing focus
+    on(node, "mousedown", function () {
+      if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0); }
     });
-    cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-  }
+    node.setAttribute("cm-not-content", "true");
+  }, function (pos, axis) {
+    if (axis == "horizontal") { setScrollLeft(cm, pos); }
+    else { updateScrollTop(cm, pos); }
+  }, cm);
+  if (cm.display.scrollbars.addClass)
+    { addClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
 }
 
 // Operations are used to wrap a series of changes to the editor
@@ -3819,17 +3807,9 @@ function endOperation_finish(op) {
     { display.wheelStartX = display.wheelStartY = null; }
 
   // Propagate the scroll position to the actual DOM scroller
-  if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-    doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-    display.scrollbars.setScrollTop(doc.scrollTop);
-    display.scroller.scrollTop = doc.scrollTop;
-  }
-  if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-    doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
-    display.scrollbars.setScrollLeft(doc.scrollLeft);
-    display.scroller.scrollLeft = doc.scrollLeft;
-    alignHorizontally(cm);
-  }
+  if (op.scrollTop != null) { setScrollTop(cm, op.scrollTop, op.forceScroll); }
+
+  if (op.scrollLeft != null) { setScrollLeft(cm, op.scrollLeft, true, true); }
   // If we need to scroll a specific position into view, do so.
   if (op.scrollToPos) {
     var rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
@@ -4042,22 +4022,23 @@ function countDirtyView(cm) {
 // HIGHLIGHT WORKER
 
 function startWorker(cm, time) {
-  if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
+  if (cm.doc.highlightFrontier < cm.display.viewTo)
     { cm.state.highlight.set(time, bind(highlightWorker, cm)); }
 }
 
 function highlightWorker(cm) {
   var doc = cm.doc;
-  if (doc.frontier < doc.first) { doc.frontier = doc.first; }
-  if (doc.frontier >= cm.display.viewTo) { return }
+  if (doc.highlightFrontier >= cm.display.viewTo) { return }
   var end = +new Date + cm.options.workTime;
-  var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
+  var context = getContextBefore(cm, doc.highlightFrontier);
   var changedLines = [];
 
-  doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) {
-    if (doc.frontier >= cm.display.viewFrom) { // Visible
-      var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
-      var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
+  doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) {
+    if (context.line >= cm.display.viewFrom) { // Visible
+      var oldStyles = line.styles;
+      var resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null;
+      var highlighted = highlightLine(cm, line, context, true);
+      if (resetState) { context.state = resetState; }
       line.styles = highlighted.styles;
       var oldCls = line.styleClasses, newCls = highlighted.classes;
       if (newCls) { line.styleClasses = newCls; }
@@ -4065,19 +4046,22 @@ function highlightWorker(cm) {
       var ischange = !oldStyles || oldStyles.length != line.styles.length ||
         oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
       for (var i = 0; !ischange && i < oldStyles.length; ++i) { ischange = oldStyles[i] != line.styles[i]; }
-      if (ischange) { changedLines.push(doc.frontier); }
-      line.stateAfter = tooLong ? state : copyState(doc.mode, state);
+      if (ischange) { changedLines.push(context.line); }
+      line.stateAfter = context.save();
+      context.nextLine();
     } else {
       if (line.text.length <= cm.options.maxHighlightLength)
-        { processLine(cm, line.text, state); }
-      line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
+        { processLine(cm, line.text, context); }
+      line.stateAfter = context.line % 5 == 0 ? context.save() : null;
+      context.nextLine();
     }
-    ++doc.frontier;
     if (+new Date > end) {
       startWorker(cm, cm.options.workDelay);
       return true
     }
   });
+  doc.highlightFrontier = context.line;
+  doc.modeFrontier = Math.max(doc.modeFrontier, context.line);
   if (changedLines.length) { runInOp(cm, function () {
     for (var i = 0; i < changedLines.length; i++)
       { regLineChange(cm, changedLines[i], "text"); }
@@ -4123,6 +4107,36 @@ function maybeClipScrollbars(cm) {
   }
 }
 
+function selectionSnapshot(cm) {
+  if (cm.hasFocus()) { return null }
+  var active = activeElt();
+  if (!active || !contains(cm.display.lineDiv, active)) { return null }
+  var result = {activeElt: active};
+  if (window.getSelection) {
+    var sel = window.getSelection();
+    if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {
+      result.anchorNode = sel.anchorNode;
+      result.anchorOffset = sel.anchorOffset;
+      result.focusNode = sel.focusNode;
+      result.focusOffset = sel.focusOffset;
+    }
+  }
+  return result
+}
+
+function restoreSelection(snapshot) {
+  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { return }
+  snapshot.activeElt.focus();
+  if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+    var sel = window.getSelection(), range$$1 = document.createRange();
+    range$$1.setEnd(snapshot.anchorNode, snapshot.anchorOffset);
+    range$$1.collapse(false);
+    sel.removeAllRanges();
+    sel.addRange(range$$1);
+    sel.extend(snapshot.focusNode, snapshot.focusOffset);
+  }
+}
+
 // Does the actual updating of the line display. Bails out
 // (returning false) when there is nothing to be done and forced is
 // false.
@@ -4172,14 +4186,14 @@ function updateDisplayIfNeeded(cm, update) {
 
   // For big changes, we hide the enclosing element during the
   // update, since that speeds up the operations on most browsers.
-  var focused = activeElt();
+  var selSnapshot = selectionSnapshot(cm);
   if (toUpdate > 4) { display.lineDiv.style.display = "none"; }
   patchDisplay(cm, display.updateLineNumbers, update.dims);
   if (toUpdate > 4) { display.lineDiv.style.display = ""; }
   display.renderedView = display.view;
   // There might have been a widget with a focused element that got
   // hidden or updated, if so re-focus it.
-  if (focused && activeElt() != focused && focused.offsetHeight) { focused.focus(); }
+  restoreSelection(selSnapshot);
 
   // Prevent selection and cursors from interfering with the scroll
   // width and height.
@@ -4218,6 +4232,7 @@ function postUpdateDisplay(cm, update) {
     updateSelection(cm);
     updateScrollbars(cm, barMeasure);
     setDocumentHeight(cm, barMeasure);
+    update.force = false;
   }
 
   update.signal(cm, "update", cm);
@@ -4327,6 +4342,117 @@ function setGuttersForLineNumbers(options) {
   }
 }
 
+// Since the delta values reported on mouse wheel events are
+// unstandardized between browsers and even browser versions, and
+// generally horribly unpredictable, this code starts by measuring
+// the scroll effect that the first few mouse wheel events have,
+// and, from that, detects the way it can convert deltas to pixel
+// offsets afterwards.
+//
+// The reason we want to know the amount a wheel event will scroll
+// is that it gives us a chance to update the display before the
+// actual scrolling happens, reducing flickering.
+
+var wheelSamples = 0;
+var wheelPixelsPerUnit = null;
+// Fill in a browser-detected starting value on browsers where we
+// know one. These don't have to be accurate -- the result of them
+// being wrong would just be a slight flicker on the first wheel
+// scroll (if it is large enough).
+if (ie) { wheelPixelsPerUnit = -.53; }
+else if (gecko) { wheelPixelsPerUnit = 15; }
+else if (chrome) { wheelPixelsPerUnit = -.7; }
+else if (safari) { wheelPixelsPerUnit = -1/3; }
+
+function wheelEventDelta(e) {
+  var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
+  if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail; }
+  if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail; }
+  else if (dy == null) { dy = e.wheelDelta; }
+  return {x: dx, y: dy}
+}
+function wheelEventPixels(e) {
+  var delta = wheelEventDelta(e);
+  delta.x *= wheelPixelsPerUnit;
+  delta.y *= wheelPixelsPerUnit;
+  return delta
+}
+
+function onScrollWheel(cm, e) {
+  var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
+
+  var display = cm.display, scroll = display.scroller;
+  // Quit if there's nothing to scroll here
+  var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+  var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+  if (!(dx && canScrollX || dy && canScrollY)) { return }
+
+  // Webkit browsers on OS X abort momentum scrolls when the target
+  // of the scroll event is removed from the scrollable element.
+  // This hack (see related code in patchDisplay) makes sure the
+  // element is kept around.
+  if (dy && mac && webkit) {
+    outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+      for (var i = 0; i < view.length; i++) {
+        if (view[i].node == cur) {
+          cm.display.currentWheelTarget = cur;
+          break outer
+        }
+      }
+    }
+  }
+
+  // On some browsers, horizontal scrolling will cause redraws to
+  // happen before the gutter has been realigned, causing it to
+  // wriggle around in a most unseemly way. When we have an
+  // estimated pixels/delta value, we just handle horizontal
+  // scrolling entirely here. It'll be slightly off from native, but
+  // better than glitching out.
+  if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
+    if (dy && canScrollY)
+      { updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit)); }
+    setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit));
+    // Only prevent default scrolling if vertical scrolling is
+    // actually possible. Otherwise, it causes vertical scroll
+    // jitter on OSX trackpads when deltaX is small and deltaY
+    // is large (issue #3579)
+    if (!dy || (dy && canScrollY))
+      { e_preventDefault(e); }
+    display.wheelStartX = null; // Abort measurement, if in progress
+    return
+  }
+
+  // 'Project' the visible viewport to cover the area that is being
+  // scrolled into view (if we know enough to estimate it).
+  if (dy && wheelPixelsPerUnit != null) {
+    var pixels = dy * wheelPixelsPerUnit;
+    var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
+    if (pixels < 0) { top = Math.max(0, top + pixels - 50); }
+    else { bot = Math.min(cm.doc.height, bot + pixels + 50); }
+    updateDisplaySimple(cm, {top: top, bottom: bot});
+  }
+
+  if (wheelSamples < 20) {
+    if (display.wheelStartX == null) {
+      display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
+      display.wheelDX = dx; display.wheelDY = dy;
+      setTimeout(function () {
+        if (display.wheelStartX == null) { return }
+        var movedX = scroll.scrollLeft - display.wheelStartX;
+        var movedY = scroll.scrollTop - display.wheelStartY;
+        var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
+          (movedX && display.wheelDX && movedX / display.wheelDX);
+        display.wheelStartX = display.wheelStartY = null;
+        if (!sample) { return }
+        wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
+        ++wheelSamples;
+      }, 200);
+    } else {
+      display.wheelDX += dx; display.wheelDY += dy;
+    }
+  }
+}
+
 // Selection objects are immutable. A new one is created every time
 // the selection changes. A selection is one or more non-overlapping
 // (and non-touching) ranges, sorted, and an integer that indicates
@@ -4480,7 +4606,7 @@ function resetModeState(cm) {
     if (line.stateAfter) { line.stateAfter = null; }
     if (line.styles) { line.styles = null; }
   });
-  cm.doc.frontier = cm.doc.first;
+  cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first;
   startWorker(cm, 100);
   cm.state.modeGen++;
   if (cm.curOp) { regChange(cm); }
@@ -4814,8 +4940,8 @@ function copyHistoryArray(events, newGroup, instantiateSel) {
 // include a given position (and optionally a second position).
 // Otherwise, simply returns the range between the given positions.
 // Used for cursor motion and such.
-function extendRange(doc, range, head, other) {
-  if (doc.cm && doc.cm.display.shift || doc.extend) {
+function extendRange(range, head, other, extend) {
+  if (extend) {
     var anchor = range.anchor;
     if (other) {
       var posBefore = cmp(head, anchor) < 0;
@@ -4833,16 +4959,18 @@ function extendRange(doc, range, head, other) {
 }
 
 // Extend the primary selection range, discard the rest.
-function extendSelection(doc, head, other, options) {
-  setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
+function extendSelection(doc, head, other, options, extend) {
+  if (extend == null) { extend = doc.cm && (doc.cm.display.shift || doc.extend); }
+  setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options);
 }
 
 // Extend all selections (pos is an array of selections with length
 // equal the number of selections)
 function extendSelections(doc, heads, options) {
   var out = [];
+  var extend = doc.cm && (doc.cm.display.shift || doc.extend);
   for (var i = 0; i < doc.sel.ranges.length; i++)
-    { out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null); }
+    { out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend); }
   var newSel = normalizeSelection(out, doc.sel.primIndex);
   setSelection(doc, newSel, options);
 }
@@ -4923,7 +5051,7 @@ function setSelectionInner(doc, sel) {
 // Verify that the selection does not partially select any atomic
 // marked ranges.
 function reCheckSelection(doc) {
-  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
+  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false));
 }
 
 // Return a selection that does not partially select any atomic
@@ -5226,8 +5354,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
     if (recomputeMaxLength) { cm.curOp.updateMaxLine = true; }
   }
 
-  // Adjust frontier, schedule worker
-  doc.frontier = Math.min(doc.frontier, from.line);
+  retreatFrontier(doc, from.line);
   startWorker(cm, 400);
 
   var lendiff = change.text.length - (to.line - from.line) - 1;
@@ -5337,7 +5464,7 @@ function changeLine(doc, handle, changeType, op) {
 //
 // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
 
-var LeafChunk = function(lines) {
+function LeafChunk(lines) {
   var this$1 = this;
 
   this.lines = lines;
@@ -5348,47 +5475,49 @@ var LeafChunk = function(lines) {
     height += lines[i].height;
   }
   this.height = height;
-};
+}
 
-LeafChunk.prototype.chunkSize = function () { return this.lines.length };
+LeafChunk.prototype = {
+  chunkSize: function chunkSize() { return this.lines.length },
 
-// Remove the n lines at offset 'at'.
-LeafChunk.prototype.removeInner = function (at, n) {
+  // Remove the n lines at offset 'at'.
+  removeInner: function removeInner(at, n) {
     var this$1 = this;
 
-  for (var i = at, e = at + n; i < e; ++i) {
-    var line = this$1.lines[i];
-    this$1.height -= line.height;
-    cleanUpLine(line);
-    signalLater(line, "delete");
-  }
-  this.lines.splice(at, n);
-};
+    for (var i = at, e = at + n; i < e; ++i) {
+      var line = this$1.lines[i];
+      this$1.height -= line.height;
+      cleanUpLine(line);
+      signalLater(line, "delete");
+    }
+    this.lines.splice(at, n);
+  },
 
-// Helper used to collapse a small branch into a single leaf.
-LeafChunk.prototype.collapse = function (lines) {
-  lines.push.apply(lines, this.lines);
-};
+  // Helper used to collapse a small branch into a single leaf.
+  collapse: function collapse(lines) {
+    lines.push.apply(lines, this.lines);
+  },
 
-// Insert the given array of lines at offset 'at', count them as
-// having the given height.
-LeafChunk.prototype.insertInner = function (at, lines, height) {
+  // Insert the given array of lines at offset 'at', count them as
+  // having the given height.
+  insertInner: function insertInner(at, lines, height) {
     var this$1 = this;
 
-  this.height += height;
-  this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-  for (var i = 0; i < lines.length; ++i) { lines[i].parent = this$1; }
-};
+    this.height += height;
+    this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
+    for (var i = 0; i < lines.length; ++i) { lines[i].parent = this$1; }
+  },
 
-// Used to iterate over a part of the tree.
-LeafChunk.prototype.iterN = function (at, n, op) {
+  // Used to iterate over a part of the tree.
+  iterN: function iterN(at, n, op) {
     var this$1 = this;
 
-  for (var e = at + n; at < e; ++at)
-    { if (op(this$1.lines[at])) { return true } }
+    for (var e = at + n; at < e; ++at)
+      { if (op(this$1.lines[at])) { return true } }
+  }
 };
 
-var BranchChunk = function(children) {
+function BranchChunk(children) {
   var this$1 = this;
 
   this.children = children;
@@ -5401,104 +5530,106 @@ var BranchChunk = function(children) {
   this.size = size;
   this.height = height;
   this.parent = null;
-};
+}
 
-BranchChunk.prototype.chunkSize = function () { return this.size };
+BranchChunk.prototype = {
+  chunkSize: function chunkSize() { return this.size },
 
-BranchChunk.prototype.removeInner = function (at, n) {
+  removeInner: function removeInner(at, n) {
     var this$1 = this;
 
-  this.size -= n;
-  for (var i = 0; i < this.children.length; ++i) {
-    var child = this$1.children[i], sz = child.chunkSize();
-    if (at < sz) {
-      var rm = Math.min(n, sz - at), oldHeight = child.height;
-      child.removeInner(at, rm);
-      this$1.height -= oldHeight - child.height;
-      if (sz == rm) { this$1.children.splice(i--, 1); child.parent = null; }
-      if ((n -= rm) == 0) { break }
-      at = 0;
-    } else { at -= sz; }
-  }
-  // If the result is smaller than 25 lines, ensure that it is a
-  // single leaf node.
-  if (this.size - n < 25 &&
-      (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
-    var lines = [];
-    this.collapse(lines);
-    this.children = [new LeafChunk(lines)];
-    this.children[0].parent = this;
-  }
-};
+    this.size -= n;
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this$1.children[i], sz = child.chunkSize();
+      if (at < sz) {
+        var rm = Math.min(n, sz - at), oldHeight = child.height;
+        child.removeInner(at, rm);
+        this$1.height -= oldHeight - child.height;
+        if (sz == rm) { this$1.children.splice(i--, 1); child.parent = null; }
+        if ((n -= rm) == 0) { break }
+        at = 0;
+      } else { at -= sz; }
+    }
+    // If the result is smaller than 25 lines, ensure that it is a
+    // single leaf node.
+    if (this.size - n < 25 &&
+        (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
+      var lines = [];
+      this.collapse(lines);
+      this.children = [new LeafChunk(lines)];
+      this.children[0].parent = this;
+    }
+  },
 
-BranchChunk.prototype.collapse = function (lines) {
+  collapse: function collapse(lines) {
     var this$1 = this;
 
-  for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines); }
-};
+    for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines); }
+  },
 
-BranchChunk.prototype.insertInner = function (at, lines, height) {
+  insertInner: function insertInner(at, lines, height) {
     var this$1 = this;
 
-  this.size += lines.length;
-  this.height += height;
-  for (var i = 0; i < this.children.length; ++i) {
-    var child = this$1.children[i], sz = child.chunkSize();
-    if (at <= sz) {
-      child.insertInner(at, lines, height);
-      if (child.lines && child.lines.length > 50) {
-        // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
-        // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
-        var remaining = child.lines.length % 25 + 25;
-        for (var pos = remaining; pos < child.lines.length;) {
-          var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
-          child.height -= leaf.height;
-          this$1.children.splice(++i, 0, leaf);
-          leaf.parent = this$1;
+    this.size += lines.length;
+    this.height += height;
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this$1.children[i], sz = child.chunkSize();
+      if (at <= sz) {
+        child.insertInner(at, lines, height);
+        if (child.lines && child.lines.length > 50) {
+          // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
+          // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
+          var remaining = child.lines.length % 25 + 25;
+          for (var pos = remaining; pos < child.lines.length;) {
+            var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
+            child.height -= leaf.height;
+            this$1.children.splice(++i, 0, leaf);
+            leaf.parent = this$1;
+          }
+          child.lines = child.lines.slice(0, remaining);
+          this$1.maybeSpill();
         }
-        child.lines = child.lines.slice(0, remaining);
-        this$1.maybeSpill();
+        break
       }
-      break
+      at -= sz;
     }
-    at -= sz;
-  }
-};
+  },
 
-// When a node has grown, check whether it should be split.
-BranchChunk.prototype.maybeSpill = function () {
-  if (this.children.length <= 10) { return }
-  var me = this;
-  do {
-    var spilled = me.children.splice(me.children.length - 5, 5);
-    var sibling = new BranchChunk(spilled);
-    if (!me.parent) { // Become the parent node
-      var copy = new BranchChunk(me.children);
-      copy.parent = me;
-      me.children = [copy, sibling];
-      me = copy;
-   } else {
-      me.size -= sibling.size;
-      me.height -= sibling.height;
-      var myIndex = indexOf(me.parent.children, me);
-      me.parent.children.splice(myIndex + 1, 0, sibling);
-    }
-    sibling.parent = me.parent;
-  } while (me.children.length > 10)
-  me.parent.maybeSpill();
-};
+  // When a node has grown, check whether it should be split.
+  maybeSpill: function maybeSpill() {
+    if (this.children.length <= 10) { return }
+    var me = this;
+    do {
+      var spilled = me.children.splice(me.children.length - 5, 5);
+      var sibling = new BranchChunk(spilled);
+      if (!me.parent) { // Become the parent node
+        var copy = new BranchChunk(me.children);
+        copy.parent = me;
+        me.children = [copy, sibling];
+        me = copy;
+     } else {
+        me.size -= sibling.size;
+        me.height -= sibling.height;
+        var myIndex = indexOf(me.parent.children, me);
+        me.parent.children.splice(myIndex + 1, 0, sibling);
+      }
+      sibling.parent = me.parent;
+    } while (me.children.length > 10)
+    me.parent.maybeSpill();
+  },
 
-BranchChunk.prototype.iterN = function (at, n, op) {
+  iterN: function iterN(at, n, op) {
     var this$1 = this;
 
-  for (var i = 0; i < this.children.length; ++i) {
-    var child = this$1.children[i], sz = child.chunkSize();
-    if (at < sz) {
-      var used = Math.min(n, sz - at);
-      if (child.iterN(at, used, op)) { return true }
-      if ((n -= used) == 0) { break }
-      at = 0;
-    } else { at -= sz; }
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this$1.children[i], sz = child.chunkSize();
+      if (at < sz) {
+        var used = Math.min(n, sz - at);
+        if (child.iterN(at, used, op)) { return true }
+        if ((n -= used) == 0) { break }
+        at = 0;
+      } else { at -= sz; }
+    }
   }
 };
 
@@ -5551,7 +5682,7 @@ eventMixin(LineWidget);
 
 function adjustScrollWhenAboveVisible(cm, line, diff) {
   if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
-    { addToScrollPos(cm, null, diff); }
+    { addToScrollTop(cm, diff); }
 }
 
 function addLineWidget(doc, handle, node, options) {
@@ -5566,7 +5697,7 @@ function addLineWidget(doc, handle, node, options) {
     if (cm && !lineIsHidden(doc, line)) {
       var aboveVisible = heightAtLine(line) < doc.scrollTop;
       updateLineHeight(line, line.height + widgetHeight(widget));
-      if (aboveVisible) { addToScrollPos(cm, null, widget.height); }
+      if (aboveVisible) { addToScrollTop(cm, widget.height); }
       cm.curOp.forceUpdate = true;
     }
     return true
@@ -5868,7 +5999,7 @@ var Doc = function(text, mode, firstLine, lineSep, direction) {
   this.scrollTop = this.scrollLeft = 0;
   this.cantEdit = false;
   this.cleanGeneration = 1;
-  this.frontier = firstLine;
+  this.modeFrontier = this.highlightFrontier = firstLine;
   var start = Pos(firstLine, 0);
   this.sel = simpleSelection(start);
   this.history = new History(null);
@@ -5914,7 +6045,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     var top = Pos(this.first, 0), last = this.first + this.size - 1;
     makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                       text: this.splitLines(code), origin: "setValue", full: true}, true);
-    if (this.cm) { this.cm.scrollTo(0, 0); }
+    if (this.cm) { scrollToCoords(this.cm, 0, 0); }
     setSelection(this, simpleSelection(top), sel_dontScroll);
   }),
   replaceRange: function(code, from, to, origin) {
@@ -6391,8 +6522,8 @@ function clearDragCursor(cm) {
 // garbage collected.
 
 function forEachCodeMirror(f) {
-  if (!document.body.getElementsByClassName) { return }
-  var byClass = document.body.getElementsByClassName("CodeMirror");
+  if (!document.getElementsByClassName) { return }
+  var byClass = document.getElementsByClassName("CodeMirror");
   for (var i = 0; i < byClass.length; i++) {
     var cm = byClass[i].CodeMirror;
     if (cm) { f(cm); }
@@ -6566,11 +6697,8 @@ function isModifierKey(value) {
   return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
 }
 
-// Look up the name of a key as indicated by an event object.
-function keyName(event, noShift) {
-  if (presto && event.keyCode == 34 && event["char"]) { return false }
-  var base = keyNames[event.keyCode], name = base;
-  if (name == null || event.altGraphKey) { return false }
+function addModifierNames(name, event, noShift) {
+  var base = name;
   if (event.altKey && base != "Alt") { name = "Alt-" + name; }
   if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name; }
   if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") { name = "Cmd-" + name; }
@@ -6578,6 +6706,14 @@ function keyName(event, noShift) {
   return name
 }
 
+// Look up the name of a key as indicated by an event object.
+function keyName(event, noShift) {
+  if (presto && event.keyCode == 34 && event["char"]) { return false }
+  var name = keyNames[event.keyCode];
+  if (name == null || event.altGraphKey) { return false }
+  return addModifierNames(name, event, noShift)
+}
+
 function getKeyMap(val) {
   return typeof val == "string" ? keyMap[val] : val
 }
@@ -6656,15 +6792,15 @@ var commands = {
     {origin: "+move", bias: -1}
   ); },
   goLineRight: function (cm) { return cm.extendSelectionsBy(function (range) {
-    var top = cm.charCoords(range.head, "div").top + 5;
+    var top = cm.cursorCoords(range.head, "div").top + 5;
     return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
   }, sel_move); },
   goLineLeft: function (cm) { return cm.extendSelectionsBy(function (range) {
-    var top = cm.charCoords(range.head, "div").top + 5;
+    var top = cm.cursorCoords(range.head, "div").top + 5;
     return cm.coordsChar({left: 0, top: top}, "div")
   }, sel_move); },
   goLineLeftSmart: function (cm) { return cm.extendSelectionsBy(function (range) {
-    var top = cm.charCoords(range.head, "div").top + 5;
+    var top = cm.cursorCoords(range.head, "div").top + 5;
     var pos = cm.coordsChar({left: 0, top: top}, "div");
     if (pos.ch < cm.getLine(pos.line).search(/\S/)) { return lineStartSmart(cm, range.head) }
     return pos
@@ -6804,6 +6940,9 @@ function lookupKeyForEditor(cm, name, handle) {
     || lookupKey(name, cm.options.keyMap, handle, cm)
 }
 
+// Note that, despite the name, this function is also used to check
+// for bound mouse clicks.
+
 var stopSeq = new Delayed;
 function dispatchKey(cm, name, e, handle) {
   var seq = cm.state.keySeq;
@@ -6915,6 +7054,37 @@ function onKeyPress(e) {
   cm.display.input.onKeyPress(e);
 }
 
+var DOUBLECLICK_DELAY = 400;
+
+var PastClick = function(time, pos, button) {
+  this.time = time;
+  this.pos = pos;
+  this.button = button;
+};
+
+PastClick.prototype.compare = function (time, pos, button) {
+  return this.time + DOUBLECLICK_DELAY > time &&
+    cmp(pos, this.pos) == 0 && button == this.button
+};
+
+var lastClick;
+var lastDoubleClick;
+function clickRepeat(pos, button) {
+  var now = +new Date;
+  if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) {
+    lastClick = lastDoubleClick = null;
+    return "triple"
+  } else if (lastClick && lastClick.compare(now, pos, button)) {
+    lastDoubleClick = new PastClick(now, pos, button);
+    lastClick = null;
+    return "double"
+  } else {
+    lastClick = new PastClick(now, pos, button);
+    lastDoubleClick = null;
+    return "single"
+  }
+}
+
 // A mouse down can be a single click, double click, triple click,
 // start of selection drag, start of text drag, new cursor
 // (ctrl-click), rectangle drag (alt-drag), or xwin
@@ -6936,62 +7106,79 @@ function onMouseDown(e) {
     return
   }
   if (clickInGutter(cm, e)) { return }
-  var start = posFromMouse(cm, e);
+  var pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single";
   window.focus();
 
-  switch (e_button(e)) {
-  case 1:
-    // #3261: make sure, that we're not starting a second selection
-    if (cm.state.selectingText)
-      { cm.state.selectingText(e); }
-    else if (start)
-      { leftButtonDown(cm, e, start); }
-    else if (e_target(e) == display.scroller)
-      { e_preventDefault(e); }
-    break
-  case 2:
-    if (webkit) { cm.state.lastMiddleDown = +new Date; }
-    if (start) { extendSelection(cm.doc, start); }
+  // #3261: make sure, that we're not starting a second selection
+  if (button == 1 && cm.state.selectingText)
+    { cm.state.selectingText(e); }
+
+  if (pos && handleMappedButton(cm, button, pos, repeat, e)) { return }
+
+  if (button == 1) {
+    if (pos) { leftButtonDown(cm, pos, repeat, e); }
+    else if (e_target(e) == display.scroller) { e_preventDefault(e); }
+  } else if (button == 2) {
+    if (pos) { extendSelection(cm.doc, pos); }
     setTimeout(function () { return display.input.focus(); }, 20);
-    e_preventDefault(e);
-    break
-  case 3:
+  } else if (button == 3) {
     if (captureRightClick) { onContextMenu(cm, e); }
     else { delayBlurEvent(cm); }
-    break
   }
 }
 
-var lastClick;
-var lastDoubleClick;
-function leftButtonDown(cm, e, start) {
+function handleMappedButton(cm, button, pos, repeat, event) {
+  var name = "Click";
+  if (repeat == "double") { name = "Double" + name; }
+  else if (repeat == "triple") { name = "Triple" + name; }
+  name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name;
+
+  return dispatchKey(cm,  addModifierNames(name, event), event, function (bound) {
+    if (typeof bound == "string") { bound = commands[bound]; }
+    if (!bound) { return false }
+    var done = false;
+    try {
+      if (cm.isReadOnly()) { cm.state.suppressEdits = true; }
+      done = bound(cm, pos) != Pass;
+    } finally {
+      cm.state.suppressEdits = false;
+    }
+    return done
+  })
+}
+
+function configureMouse(cm, repeat, event) {
+  var option = cm.getOption("configureMouse");
+  var value = option ? option(cm, repeat, event) : {};
+  if (value.unit == null) {
+    var rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey;
+    value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line";
+  }
+  if (value.extend == null || cm.doc.extend) { value.extend = cm.doc.extend || event.shiftKey; }
+  if (value.addNew == null) { value.addNew = mac ? event.metaKey : event.ctrlKey; }
+  if (value.moveOnDrag == null) { value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey); }
+  return value
+}
+
+function leftButtonDown(cm, pos, repeat, event) {
   if (ie) { setTimeout(bind(ensureFocus, cm), 0); }
   else { cm.curOp.focus = activeElt(); }
 
-  var now = +new Date, type;
-  if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
-    type = "triple";
-  } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
-    type = "double";
-    lastDoubleClick = {time: now, pos: start};
-  } else {
-    type = "single";
-    lastClick = {time: now, pos: start};
-  }
+  var behavior = configureMouse(cm, repeat, event);
 
-  var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
+  var sel = cm.doc.sel, contained;
   if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
-      type == "single" && (contained = sel.contains(start)) > -1 &&
-      (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
-      (cmp(contained.to(), start) > 0 || start.xRel < 0))
-    { leftButtonStartDrag(cm, e, start, modifier); }
+      repeat == "single" && (contained = sel.contains(pos)) > -1 &&
+      (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) &&
+      (cmp(contained.to(), pos) > 0 || pos.xRel < 0))
+    { leftButtonStartDrag(cm, event, pos, behavior); }
   else
-    { leftButtonSelect(cm, e, start, type, modifier); }
+    { leftButtonSelect(cm, event, pos, behavior); }
 }
 
 // Start a text drag. When it ends, see if any dragging actually
 // happen, and treat as a click if it didn't.
-function leftButtonStartDrag(cm, e, start, modifier) {
+function leftButtonStartDrag(cm, event, pos, behavior) {
   var display = cm.display, moved = false;
   var dragEnd = operation(cm, function (e) {
     if (webkit) { display.scroller.draggable = false; }
@@ -7002,8 +7189,8 @@ function leftButtonStartDrag(cm, e, start, modifier) {
     off(display.scroller, "drop", dragEnd);
     if (!moved) {
       e_preventDefault(e);
-      if (!modifier)
-        { extendSelection(cm.doc, start); }
+      if (!behavior.addNew)
+        { extendSelection(cm.doc, pos, null, null, behavior.extend); }
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
       if (webkit || ie && ie_version == 9)
         { setTimeout(function () {document.body.focus(); display.input.focus();}, 20); }
@@ -7012,13 +7199,13 @@ function leftButtonStartDrag(cm, e, start, modifier) {
     }
   });
   var mouseMove = function(e2) {
-    moved = moved || Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) >= 10;
+    moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10;
   };
   var dragStart = function () { return moved = true; };
   // Let the drag handler handle this.
   if (webkit) { display.scroller.draggable = true; }
   cm.state.draggingText = dragEnd;
-  dragEnd.copy = mac ? e.altKey : e.ctrlKey;
+  dragEnd.copy = !behavior.moveOnDrag;
   // IE's approach to draggable
   if (display.scroller.dragDrop) { display.scroller.dragDrop(); }
   on(document, "mouseup", dragEnd);
@@ -7030,13 +7217,21 @@ function leftButtonStartDrag(cm, e, start, modifier) {
   setTimeout(function () { return display.input.focus(); }, 20);
 }
 
+function rangeForUnit(cm, pos, unit) {
+  if (unit == "char") { return new Range(pos, pos) }
+  if (unit == "word") { return cm.findWordAt(pos) }
+  if (unit == "line") { return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))) }
+  var result = unit(cm, pos);
+  return new Range(result.from, result.to)
+}
+
 // Normal selection, as opposed to text dragging.
-function leftButtonSelect(cm, e, start, type, addNew) {
+function leftButtonSelect(cm, event, start, behavior) {
   var display = cm.display, doc = cm.doc;
-  e_preventDefault(e);
+  e_preventDefault(event);
 
   var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
-  if (addNew && !e.shiftKey) {
+  if (behavior.addNew && !behavior.extend) {
     ourIndex = doc.sel.contains(start);
     if (ourIndex > -1)
       { ourRange = ranges[ourIndex]; }
@@ -7047,28 +7242,19 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     ourIndex = doc.sel.primIndex;
   }
 
-  if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
-    type = "rect";
-    if (!addNew) { ourRange = new Range(start, start); }
-    start = posFromMouse(cm, e, true, true);
+  if (behavior.unit == "rectangle") {
+    if (!behavior.addNew) { ourRange = new Range(start, start); }
+    start = posFromMouse(cm, event, true, true);
     ourIndex = -1;
-  } else if (type == "double") {
-    var word = cm.findWordAt(start);
-    if (cm.display.shift || doc.extend)
-      { ourRange = extendRange(doc, ourRange, word.anchor, word.head); }
-    else
-      { ourRange = word; }
-  } else if (type == "triple") {
-    var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
-    if (cm.display.shift || doc.extend)
-      { ourRange = extendRange(doc, ourRange, line.anchor, line.head); }
-    else
-      { ourRange = line; }
   } else {
-    ourRange = extendRange(doc, ourRange, start);
+    var range$$1 = rangeForUnit(cm, start, behavior.unit);
+    if (behavior.extend)
+      { ourRange = extendRange(ourRange, range$$1.anchor, range$$1.head, behavior.extend); }
+    else
+      { ourRange = range$$1; }
   }
 
-  if (!addNew) {
+  if (!behavior.addNew) {
     ourIndex = 0;
     setSelection(doc, new Selection([ourRange], 0), sel_mouse);
     startSel = doc.sel;
@@ -7076,7 +7262,7 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     ourIndex = ranges.length;
     setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                  {scroll: false, origin: "*mouse"});
-  } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
+  } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {
     setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
                  {scroll: false, origin: "*mouse"});
     startSel = doc.sel;
@@ -7089,7 +7275,7 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     if (cmp(lastPos, pos) == 0) { return }
     lastPos = pos;
 
-    if (type == "rect") {
+    if (behavior.unit == "rectangle") {
       var ranges = [], tabSize = cm.options.tabSize;
       var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
       var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
@@ -7108,20 +7294,14 @@ function leftButtonSelect(cm, e, start, type, addNew) {
       cm.scrollIntoView(pos);
     } else {
       var oldRange = ourRange;
-      var anchor = oldRange.anchor, head = pos;
-      if (type != "single") {
-        var range$$1;
-        if (type == "double")
-          { range$$1 = cm.findWordAt(pos); }
-        else
-          { range$$1 = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0))); }
-        if (cmp(range$$1.anchor, anchor) > 0) {
-          head = range$$1.head;
-          anchor = minPos(oldRange.from(), range$$1.anchor);
-        } else {
-          head = range$$1.anchor;
-          anchor = maxPos(oldRange.to(), range$$1.head);
-        }
+      var range$$1 = rangeForUnit(cm, pos, behavior.unit);
+      var anchor = oldRange.anchor, head;
+      if (cmp(range$$1.anchor, anchor) > 0) {
+        head = range$$1.head;
+        anchor = minPos(oldRange.from(), range$$1.anchor);
+      } else {
+        head = range$$1.anchor;
+        anchor = maxPos(oldRange.to(), range$$1.head);
       }
       var ranges$1 = startSel.ranges.slice(0);
       ranges$1[ourIndex] = new Range(clipPos(doc, anchor), head);
@@ -7138,7 +7318,7 @@ function leftButtonSelect(cm, e, start, type, addNew) {
 
   function extend(e) {
     var curCount = ++counter;
-    var cur = posFromMouse(cm, e, true, type == "rect");
+    var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle");
     if (!cur) { return }
     if (cmp(cur, lastPos) != 0) {
       cm.curOp.focus = activeElt();
@@ -7304,6 +7484,7 @@ function defineOptions(CodeMirror) {
     if (next.attach) { next.attach(cm, prev || null); }
   });
   option("extraKeys", null);
+  option("configureMouse", null);
 
   option("lineWrapping", false, wrappingChanged, true);
   option("gutters", [], function (cm) {
@@ -7331,14 +7512,12 @@ function defineOptions(CodeMirror) {
 
   option("resetSelectionOnContextMenu", true);
   option("lineWiseCopyCut", true);
+  option("pasteLinesPerSelection", true);
 
   option("readOnly", false, function (cm, val) {
     if (val == "nocursor") {
       onBlur(cm);
       cm.display.input.blur();
-      cm.display.disabled = true;
-    } else {
-      cm.display.disabled = false;
     }
     cm.display.input.readOnlyChanged(val);
   });
@@ -7559,7 +7738,7 @@ function registerEventHandlers(cm) {
   // area, ensure viewport is updated when scrolling.
   on(d.scroller, "scroll", function () {
     if (d.scroller.clientHeight) {
-      setScrollTop(cm, d.scroller.scrollTop);
+      updateScrollTop(cm, d.scroller.scrollTop);
       setScrollLeft(cm, d.scroller.scrollLeft, true);
       signal(cm, "scroll", cm);
     }
@@ -7603,7 +7782,7 @@ function indentLine(cm, n, how, aggressive) {
     // Fall back to "prev" when the mode doesn't have an indentation
     // method.
     if (!doc.mode.indent) { how = "prev"; }
-    else { state = getStateBefore(cm, n); }
+    else { state = getContextBefore(cm, n).state; }
   }
 
   var tabSize = cm.options.tabSize;
@@ -7679,7 +7858,7 @@ function applyTextInput(cm, inserted, deleted, sel, origin) {
         for (var i = 0; i < lastCopied.text.length; i++)
           { multiPaste.push(doc.splitLines(lastCopied.text[i])); }
       }
-    } else if (textLines.length == sel.ranges.length) {
+    } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) {
       multiPaste = map(textLines, function (l) { return [l]; });
     }
   }
@@ -7939,7 +8118,7 @@ var addEditorMethods = function(CodeMirror) {
     getStateAfter: function(line, precise) {
       var doc = this.doc;
       line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1, precise)
+      return getContextBefore(this, line + 1, precise).state
     },
 
     cursorCoords: function(start, mode) {
@@ -8020,6 +8199,7 @@ var addEditorMethods = function(CodeMirror) {
     triggerOnKeyDown: methodOp(onKeyDown),
     triggerOnKeyPress: methodOp(onKeyPress),
     triggerOnKeyUp: onKeyUp,
+    triggerOnMouseDown: methodOp(onMouseDown),
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))
@@ -8092,7 +8272,7 @@ var addEditorMethods = function(CodeMirror) {
         goals.push(headPos.left);
         var pos = findPosV(this$1, headPos, dir, unit);
         if (unit == "page" && range$$1 == doc.sel.primary())
-          { addToScrollPos(this$1, null, charCoords(this$1, pos, "div").top - headPos.top); }
+          { addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); }
         return pos
       }, sel_move);
       if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++)
@@ -8129,11 +8309,7 @@ var addEditorMethods = function(CodeMirror) {
     hasFocus: function() { return this.display.input.getField() == activeElt() },
     isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
 
-    scrollTo: methodOp(function(x, y) {
-      if (x != null || y != null) { resolveScrollToPos(this); }
-      if (x != null) { this.curOp.scrollLeft = x; }
-      if (y != null) { this.curOp.scrollTop = y; }
-    }),
+    scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y); }),
     getScrollInfo: function() {
       var scroller = this.display.scroller;
       return {left: scroller.scrollLeft, top: scroller.scrollTop,
@@ -8155,16 +8331,9 @@ var addEditorMethods = function(CodeMirror) {
       range$$1.margin = margin || 0;
 
       if (range$$1.from.line != null) {
-        resolveScrollToPos(this);
-        this.curOp.scrollToPos = range$$1;
+        scrollToRange(this, range$$1);
       } else {
-        var sPos = calculateScrollPos(this, {
-          left: Math.min(range$$1.from.left, range$$1.to.left),
-          top: Math.min(range$$1.from.top, range$$1.to.top) - range$$1.margin,
-          right: Math.max(range$$1.from.right, range$$1.to.right),
-          bottom: Math.max(range$$1.from.bottom, range$$1.to.bottom) + range$$1.margin
-        });
-        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
+        scrollToCoordsRange(this, range$$1.from, range$$1.to, range$$1.margin);
       }
     }),
 
@@ -8186,13 +8355,15 @@ var addEditorMethods = function(CodeMirror) {
     }),
 
     operation: function(f){return runInOp(this, f)},
+    startOperation: function(){return startOperation(this)},
+    endOperation: function(){return endOperation(this)},
 
     refresh: methodOp(function() {
       var oldHeight = this.display.cachedTextHeight;
       regChange(this);
       this.curOp.forceUpdate = true;
       clearCaches(this);
-      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
+      scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop);
       updateGutterSpace(this);
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         { estimateLineHeights(this); }
@@ -8205,7 +8376,7 @@ var addEditorMethods = function(CodeMirror) {
       attachDoc(this, doc);
       clearCaches(this);
       this.display.input.reset();
-      this.scrollTo(doc.scrollLeft, doc.scrollTop);
+      scrollToCoords(this, doc.scrollLeft, doc.scrollTop);
       this.curOp.forceScroll = true;
       signalLater(this, "swapDoc", this, old);
       return old
@@ -8838,9 +9009,6 @@ var TextareaInput = function(cm) {
   this.pollingFast = false;
   // Self-resetting timeout for the poller
   this.polling = new Delayed();
-  // Tracks when input.reset has punted to just putting a short
-  // string into the textarea instead of the full selection.
-  this.inaccurateSelection = false;
   // Used to work around IE issue with selection being forgotten when focus moves away from textarea
   this.hasSelection = false;
   this.composing = null;
@@ -8877,12 +9045,6 @@ TextareaInput.prototype.init = function (display) {
     if (signalDOMEvent(cm, e)) { return }
     if (cm.somethingSelected()) {
       setLastCopied({lineWise: false, text: cm.getSelections()});
-      if (input.inaccurateSelection) {
-        input.prevInput = "";
-        input.inaccurateSelection = false;
-        te.value = lastCopied.text.join("\n");
-        selectInput(te);
-      }
     } else if (!cm.options.lineWiseCopyCut) {
       return
     } else {
@@ -8960,14 +9122,11 @@ TextareaInput.prototype.showSelection = function (drawn) {
 // Reset the input to correspond to the selection (or to be empty,
 // when not typing and nothing is selected)
 TextareaInput.prototype.reset = function (typing) {
-  if (this.contextMenuPending) { return }
-  var minimal, selected, cm = this.cm, doc = cm.doc;
+  if (this.contextMenuPending || this.composing) { return }
+  var cm = this.cm;
   if (cm.somethingSelected()) {
     this.prevInput = "";
-    var range$$1 = doc.sel.primary();
-    minimal = hasCopyEvent &&
-      (range$$1.to().line - range$$1.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-    var content = minimal ? "-" : selected || cm.getSelection();
+    var content = cm.getSelection();
     this.textarea.value = content;
     if (cm.state.focused) { selectInput(this.textarea); }
     if (ie && ie_version >= 9) { this.hasSelection = content; }
@@ -8975,7 +9134,6 @@ TextareaInput.prototype.reset = function (typing) {
     this.prevInput = this.textarea.value = "";
     if (ie && ie_version >= 9) { this.hasSelection = null; }
   }
-  this.inaccurateSelection = minimal;
 };
 
 TextareaInput.prototype.getField = function () { return this.textarea };
@@ -9170,6 +9328,7 @@ TextareaInput.prototype.onContextMenu = function (e) {
 
 TextareaInput.prototype.readOnlyChanged = function (val) {
   if (!val) { this.reset(); }
+  this.textarea.disabled = val == "nocursor";
 };
 
 TextareaInput.prototype.setUneditable = function () {};
@@ -9325,7 +9484,7 @@ CodeMirror$1.fromTextArea = fromTextArea;
 
 addLegacyProps(CodeMirror$1);
 
-CodeMirror$1.version = "5.25.2";
+CodeMirror$1.version = "5.28.0";
 
 return CodeMirror$1;
 
diff --git a/media/editors/codemirror/lib/codemirror.min.css b/media/editors/codemirror/lib/codemirror.min.css
index 7ba5d35770db5..91a6235e2fbe1 100644
--- a/media/editors/codemirror/lib/codemirror.min.css
+++ b/media/editors/codemirror/lib/codemirror.min.css
@@ -1 +1 @@
-.CodeMirror{font-family:monospace;height:300px;color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}
\ No newline at end of file
+.CodeMirror{font-family:monospace;height:300px;color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}
\ No newline at end of file
diff --git a/media/editors/codemirror/lib/codemirror.min.js b/media/editors/codemirror/lib/codemirror.min.js
index 6b0065f7e90ce..3eebd44ed1de5 100644
--- a/media/editors/codemirror/lib/codemirror.min.js
+++ b/media/editors/codemirror/lib/codemirror.min.js
@@ -1,6 +1,6 @@
-!(function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.CodeMirror=b()})(this,(function(){"use strict";function a(a){return new RegExp("(^|\\s)"+a+"(?:$|\\s)\\s*")}function b(a){for(var b=a.childNodes.length;b>0;--b)a.removeChild(a.firstChild);return a}function c(a,c){return b(a).appendChild(c)}function d(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)e.appendChild(document.createTextNode(b));else if(b)for(var f=0;f<b.length;++f)e.appendChild(b[f]);return e}function e(a,b,c,e){var f=d(a,b,c,e);return f.setAttribute("role","presentation"),f}function f(a,b){if(3==b.nodeType&&(b=b.parentNode),a.contains)return a.contains(b);do if(11==b.nodeType&&(b=b.host),b==a)return!0;while(b=b.parentNode)}function g(){var a;try{a=document.activeElement}catch(b){a=document.body||null}for(;a&&a.shadowRoot&&a.shadowRoot.activeElement;)a=a.shadowRoot.activeElement;return a}function h(b,c){var d=b.className;a(c).test(d)||(b.className+=(d?" ":"")+c)}function i(b,c){for(var d=b.split(" "),e=0;e<d.length;e++)d[e]&&!a(d[e]).test(c)&&(c+=" "+d[e]);return c}function j(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function k(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||c===!1&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}function l(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),b==-1&&(b=a.length));for(var f=d||0,g=e||0;;){var h=a.indexOf("\t",f);if(h<0||h>=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}}function m(a,b){for(var c=0;c<a.length;++c)if(a[c]==b)return c;return-1}function n(a,b,c){for(var d=0,e=0;;){var f=a.indexOf("\t",d);f==-1&&(f=a.length);var g=f-d;if(f==a.length||e+g>=b)return d+Math.min(g,b-e);if(e+=f-d,e+=c-e%c,d=f+1,e>=b)return d}}function o(a){for(;Bg.length<=a;)Bg.push(p(Bg)+" ");return Bg[a]}function p(a){return a[a.length-1]}function q(a,b){for(var c=[],d=0;d<a.length;d++)c[d]=b(a[d],d);return c}function r(a,b,c){for(var d=0,e=c(b);d<a.length&&c(a[d])<=e;)d++;a.splice(d,0,b)}function s(){}function t(a,b){var c;return Object.create?c=Object.create(a):(s.prototype=a,c=new s),b&&k(b,c),c}function u(a){return/\w/.test(a)||a>"€"&&(a.toUpperCase()!=a.toLowerCase()||Cg.test(a))}function v(a,b){return b?!!(b.source.indexOf("\\w")>-1&&u(a))||b.test(a):u(a)}function w(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function x(a){return a.charCodeAt(0)>=768&&Dg.test(a)}function y(a,b,c){for(;(c<0?b>0:b<a.length)&&x(a.charAt(b));)b+=c;return b}function z(a,b,c){for(;;){if(Math.abs(b-c)<=1)return a(b)?b:c;var d=Math.floor((b+c)/2);a(d)?c=d:b=d}}function A(a,b,c){var f=this;this.input=c,f.scrollbarFiller=d("div",null,"CodeMirror-scrollbar-filler"),f.scrollbarFiller.setAttribute("cm-not-content","true"),f.gutterFiller=d("div",null,"CodeMirror-gutter-filler"),f.gutterFiller.setAttribute("cm-not-content","true"),f.lineDiv=e("div",null,"CodeMirror-code"),f.selectionDiv=d("div",null,null,"position: relative; z-index: 1"),f.cursorDiv=d("div",null,"CodeMirror-cursors"),f.measure=d("div",null,"CodeMirror-measure"),f.lineMeasure=d("div",null,"CodeMirror-measure"),f.lineSpace=e("div",[f.measure,f.lineMeasure,f.selectionDiv,f.cursorDiv,f.lineDiv],null,"position: relative; outline: none");var g=e("div",[f.lineSpace],"CodeMirror-lines");f.mover=d("div",[g],null,"position: relative"),f.sizer=d("div",[f.mover],"CodeMirror-sizer"),f.sizerWidth=null,f.heightForcer=d("div",null,null,"position: absolute; height: "+wg+"px; width: 1px;"),f.gutters=d("div",null,"CodeMirror-gutters"),f.lineGutter=null,f.scroller=d("div",[f.sizer,f.heightForcer,f.gutters],"CodeMirror-scroll"),f.scroller.setAttribute("tabIndex","-1"),f.wrapper=d("div",[f.scrollbarFiller,f.gutterFiller,f.scroller],"CodeMirror"),$f&&_f<8&&(f.gutters.style.zIndex=-1,f.scroller.style.paddingRight=0),ag||Wf&&jg||(f.scroller.draggable=!0),a&&(a.appendChild?a.appendChild(f.wrapper):a(f.wrapper)),f.viewFrom=f.viewTo=b.first,f.reportedViewFrom=f.reportedViewTo=b.first,f.view=[],f.renderedView=null,f.externalMeasured=null,f.viewOffset=0,f.lastWrapHeight=f.lastWrapWidth=0,f.updateLineNumbers=null,f.nativeBarWidth=f.barHeight=f.barWidth=0,f.scrollbarsClipped=!1,f.lineNumWidth=f.lineNumInnerWidth=f.lineNumChars=null,f.alignWidgets=!1,f.cachedCharWidth=f.cachedTextHeight=f.cachedPaddingH=null,f.maxLine=null,f.maxLineLength=0,f.maxLineChanged=!1,f.wheelDX=f.wheelDY=f.wheelStartX=f.wheelStartY=null,f.shift=!1,f.selForContextMenu=null,f.activeTouch=null,c.init(f)}function B(a,b){if(b-=a.first,b<0||b>=a.size)throw new Error("There is no line "+(b+a.first)+" in the document.");for(var c=a;!c.lines;)for(var d=0;;++d){var e=c.children[d],f=e.chunkSize();if(b<f){c=e;break}b-=f}return c.lines[b]}function C(a,b,c){var d=[],e=b.line;return a.iter(b.line,c.line+1,(function(a){var f=a.text;e==c.line&&(f=f.slice(0,c.ch)),e==b.line&&(f=f.slice(b.ch)),d.push(f),++e})),d}function D(a,b,c){var d=[];return a.iter(b,c,(function(a){d.push(a.text)})),d}function E(a,b){var c=b-a.height;if(c)for(var d=a;d;d=d.parent)d.height+=c}function F(a){if(null==a.parent)return null;for(var b=a.parent,c=m(b.lines,a),d=b.parent;d;b=d,d=d.parent)for(var e=0;d.children[e]!=b;++e)c+=d.children[e].chunkSize();return c+b.first}function G(a,b){var c=a.first;a:do{for(var d=0;d<a.children.length;++d){var e=a.children[d],f=e.height;if(b<f){a=e;continue a}b-=f,c+=e.chunkSize()}return c}while(!a.lines);for(var g=0;g<a.lines.length;++g){var h=a.lines[g],i=h.height;if(b<i)break;b-=i}return c+g}function H(a,b){return b>=a.first&&b<a.first+a.size}function I(a,b){return String(a.lineNumberFormatter(b+a.firstLineNumber))}function J(a,b,c){return void 0===c&&(c=null),this instanceof J?(this.line=a,this.ch=b,void(this.sticky=c)):new J(a,b,c)}function K(a,b){return a.line-b.line||a.ch-b.ch}function L(a,b){return a.sticky==b.sticky&&0==K(a,b)}function M(a){return J(a.line,a.ch)}function N(a,b){return K(a,b)<0?b:a}function O(a,b){return K(a,b)<0?a:b}function P(a,b){return Math.max(a.first,Math.min(b,a.first+a.size-1))}function Q(a,b){if(b.line<a.first)return J(a.first,0);var c=a.first+a.size-1;return b.line>c?J(c,B(a,c).text.length):R(b,B(a,b.line).text.length)}function R(a,b){var c=a.ch;return null==c||c>b?J(a.line,b):c<0?J(a.line,0):a}function S(a,b){for(var c=[],d=0;d<b.length;d++)c[d]=Q(a,b[d]);return c}function T(){Eg=!0}function U(){Fg=!0}function V(a,b,c){this.marker=a,this.from=b,this.to=c}function W(a,b){if(a)for(var c=0;c<a.length;++c){var d=a[c];if(d.marker==b)return d}}function X(a,b){for(var c,d=0;d<a.length;++d)a[d]!=b&&(c||(c=[])).push(a[d]);return c}function Y(a,b){a.markedSpans=a.markedSpans?a.markedSpans.concat([b]):[b],b.marker.attachLine(a)}function Z(a,b,c){var d;if(a)for(var e=0;e<a.length;++e){var f=a[e],g=f.marker,h=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);if(h||f.from==b&&"bookmark"==g.type&&(!c||!f.marker.insertLeft)){var i=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);(d||(d=[])).push(new V(g,f.from,i?null:f.to))}}return d}function $(a,b,c){var d;if(a)for(var e=0;e<a.length;++e){var f=a[e],g=f.marker,h=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);if(h||f.from==b&&"bookmark"==g.type&&(!c||f.marker.insertLeft)){var i=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);(d||(d=[])).push(new V(g,i?null:f.from-b,null==f.to?null:f.to-b))}}return d}function _(a,b){if(b.full)return null;var c=H(a,b.from.line)&&B(a,b.from.line).markedSpans,d=H(a,b.to.line)&&B(a,b.to.line).markedSpans;if(!c&&!d)return null;var e=b.from.ch,f=b.to.ch,g=0==K(b.from,b.to),h=Z(c,e,g),i=$(d,f,g),j=1==b.text.length,k=p(b.text).length+(j?e:0);if(h)for(var l=0;l<h.length;++l){var m=h[l];if(null==m.to){var n=W(i,m.marker);n?j&&(m.to=null==n.to?null:n.to+k):m.to=e}}if(i)for(var o=0;o<i.length;++o){var q=i[o];if(null!=q.to&&(q.to+=k),null==q.from){var r=W(h,q.marker);r||(q.from=k,j&&(h||(h=[])).push(q))}else q.from+=k,j&&(h||(h=[])).push(q)}h&&(h=aa(h)),i&&i!=h&&(i=aa(i));var s=[h];if(!j){var t,u=b.text.length-2;if(u>0&&h)for(var v=0;v<h.length;++v)null==h[v].to&&(t||(t=[])).push(new V(h[v].marker,null,null));for(var w=0;w<u;++w)s.push(t);s.push(i)}return s}function aa(a){for(var b=0;b<a.length;++b){var c=a[b];null!=c.from&&c.from==c.to&&c.marker.clearWhenEmpty!==!1&&a.splice(b--,1)}return a.length?a:null}function ba(a,b,c){var d=null;if(a.iter(b.line,c.line+1,(function(a){if(a.markedSpans)for(var b=0;b<a.markedSpans.length;++b){var c=a.markedSpans[b].marker;!c.readOnly||d&&m(d,c)!=-1||(d||(d=[])).push(c)}})),!d)return null;for(var e=[{from:b,to:c}],f=0;f<d.length;++f)for(var g=d[f],h=g.find(0),i=0;i<e.length;++i){var j=e[i];if(!(K(j.to,h.from)<0||K(j.from,h.to)>0)){var k=[i,1],l=K(j.from,h.from),n=K(j.to,h.to);(l<0||!g.inclusiveLeft&&!l)&&k.push({from:j.from,to:h.from}),(n>0||!g.inclusiveRight&&!n)&&k.push({from:h.to,to:j.to}),e.splice.apply(e,k),i+=k.length-3}}return e}function ca(a){var b=a.markedSpans;if(b){for(var c=0;c<b.length;++c)b[c].marker.detachLine(a);a.markedSpans=null}}function da(a,b){if(b){for(var c=0;c<b.length;++c)b[c].marker.attachLine(a);a.markedSpans=b}}function ea(a){return a.inclusiveLeft?-1:0}function fa(a){return a.inclusiveRight?1:0}function ga(a,b){var c=a.lines.length-b.lines.length;if(0!=c)return c;var d=a.find(),e=b.find(),f=K(d.from,e.from)||ea(a)-ea(b);if(f)return-f;var g=K(d.to,e.to)||fa(a)-fa(b);return g?g:b.id-a.id}function ha(a,b){var c,d=Fg&&a.markedSpans;if(d)for(var e=void 0,f=0;f<d.length;++f)e=d[f],e.marker.collapsed&&null==(b?e.from:e.to)&&(!c||ga(c,e.marker)<0)&&(c=e.marker);return c}function ia(a){return ha(a,!0)}function ja(a){return ha(a,!1)}function ka(a,b,c,d,e){var f=B(a,b),g=Fg&&f.markedSpans;if(g)for(var h=0;h<g.length;++h){var i=g[h];if(i.marker.collapsed){var j=i.marker.find(0),k=K(j.from,c)||ea(i.marker)-ea(e),l=K(j.to,d)||fa(i.marker)-fa(e);if(!(k>=0&&l<=0||k<=0&&l>=0)&&(k<=0&&(i.marker.inclusiveRight&&e.inclusiveLeft?K(j.to,c)>=0:K(j.to,c)>0)||k>=0&&(i.marker.inclusiveRight&&e.inclusiveLeft?K(j.from,d)<=0:K(j.from,d)<0)))return!0}}}function la(a){for(var b;b=ia(a);)a=b.find(-1,!0).line;return a}function ma(a){for(var b;b=ja(a);)a=b.find(1,!0).line;return a}function na(a){for(var b,c;b=ja(a);)a=b.find(1,!0).line,(c||(c=[])).push(a);return c}function oa(a,b){var c=B(a,b),d=la(c);return c==d?b:F(d)}function pa(a,b){if(b>a.lastLine())return b;var c,d=B(a,b);if(!qa(a,d))return b;for(;c=ja(d);)d=c.find(1,!0).line;return F(d)+1}function qa(a,b){var c=Fg&&b.markedSpans;if(c)for(var d=void 0,e=0;e<c.length;++e)if(d=c[e],d.marker.collapsed){if(null==d.from)return!0;if(!d.marker.widgetNode&&0==d.from&&d.marker.inclusiveLeft&&ra(a,b,d))return!0}}function ra(a,b,c){if(null==c.to){var d=c.marker.find(1,!0);return ra(a,d.line,W(d.line.markedSpans,c.marker))}if(c.marker.inclusiveRight&&c.to==b.text.length)return!0;for(var e=void 0,f=0;f<b.markedSpans.length;++f)if(e=b.markedSpans[f],e.marker.collapsed&&!e.marker.widgetNode&&e.from==c.to&&(null==e.to||e.to!=c.from)&&(e.marker.inclusiveLeft||c.marker.inclusiveRight)&&ra(a,b,e))return!0}function sa(a){a=la(a);for(var b=0,c=a.parent,d=0;d<c.lines.length;++d){var e=c.lines[d];if(e==a)break;b+=e.height}for(var f=c.parent;f;c=f,f=c.parent)for(var g=0;g<f.children.length;++g){var h=f.children[g];if(h==c)break;b+=h.height}return b}function ta(a){if(0==a.height)return 0;for(var b,c=a.text.length,d=a;b=ia(d);){var e=b.find(0,!0);d=e.from.line,c+=e.from.ch-e.to.ch}for(d=a;b=ja(d);){var f=b.find(0,!0);c-=d.text.length-f.from.ch,d=f.to.line,c+=d.text.length-f.to.ch}return c}function ua(a){var b=a.display,c=a.doc;b.maxLine=B(c,c.first),b.maxLineLength=ta(b.maxLine),b.maxLineChanged=!0,c.iter((function(a){var c=ta(a);c>b.maxLineLength&&(b.maxLineLength=c,b.maxLine=a)}))}function va(a,b,c,d){if(!a)return d(b,c,"ltr");for(var e=!1,f=0;f<a.length;++f){var g=a[f];(g.from<c&&g.to>b||b==c&&g.to==b)&&(d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr"),e=!0)}e||d(b,c,"ltr")}function wa(a,b,c){var d;Gg=null;for(var e=0;e<a.length;++e){var f=a[e];if(f.from<b&&f.to>b)return e;f.to==b&&(f.from!=f.to&&"before"==c?d=e:Gg=e),f.from==b&&(f.from!=f.to&&"before"!=c?d=e:Gg=e)}return null!=d?d:Gg}function xa(a,b){var c=a.order;return null==c&&(c=a.order=Hg(a.text,b)),c}function ya(a,b,c){var d=y(a.text,b+c,c);return d<0||d>a.text.length?null:d}function za(a,b,c){var d=ya(a,b.ch,c);return null==d?null:new J(b.line,d,c<0?"after":"before")}function Aa(a,b,c,d,e){if(a){var f=xa(c,b.doc.direction);if(f){var g,h=e<0?p(f):f[0],i=e<0==(1==h.level),j=i?"after":"before";if(h.level>0){var k=Yb(b,c);g=e<0?c.text.length-1:0;var l=Zb(b,k,g).top;g=z((function(a){return Zb(b,k,a).top==l}),e<0==(1==h.level)?h.from:h.to-1,g),"before"==j&&(g=ya(c,g,1,!0))}else g=e<0?h.to:h.from;return new J(d,g,j)}}return new J(d,e<0?c.text.length:0,e<0?"before":"after")}function Ba(a,b,c,d){var e=xa(b,a.doc.direction);if(!e)return za(b,c,d);c.ch>=b.text.length?(c.ch=b.text.length,c.sticky="before"):c.ch<=0&&(c.ch=0,c.sticky="after");var f=wa(e,c.ch,c.sticky),g=e[f];if("ltr"==a.doc.direction&&g.level%2==0&&(d>0?g.to>c.ch:g.from<c.ch))return za(b,c,d);var h,i=function(a,c){return ya(b,a instanceof J?a.ch:a,c)},j=function(c){return a.options.lineWrapping?(h=h||Yb(a,b),pc(a,b,h,c)):{begin:0,end:b.text.length}},k=j("before"==c.sticky?i(c,-1):c.ch);if("rtl"==a.doc.direction||1==g.level){var l=1==g.level==d<0,m=i(c,l?1:-1);if(null!=m&&(l?m<=g.to&&m<=k.end:m>=g.from&&m>=k.begin)){var n=l?"before":"after";return new J(c.line,m,n)}}var o=function(a,b,d){for(var f=function(a,b){return b?new J(c.line,i(a,1),"before"):new J(c.line,a,"after")};a>=0&&a<e.length;a+=b){var g=e[a],h=b>0==(1!=g.level),j=h?d.begin:i(d.end,-1);if(g.from<=j&&j<g.to)return f(j,h);if(j=h?g.from:i(g.to,-1),d.begin<=j&&j<d.end)return f(j,h)}},p=o(f+d,d,k);if(p)return p;var q=d>0?k.end:i(k.begin,-1);return null==q||d>0&&q==b.text.length||!(p=o(d>0?0:e.length-1,d,j(q)))?null:p}function Ca(a,b){return a._handlers&&a._handlers[b]||Ig}function Da(a,b,c){if(a.removeEventListener)a.removeEventListener(b,c,!1);else if(a.detachEvent)a.detachEvent("on"+b,c);else{var d=a._handlers,e=d&&d[b];if(e){var f=m(e,c);f>-1&&(d[b]=e.slice(0,f).concat(e.slice(f+1)))}}}function Ea(a,b){var c=Ca(a,b);if(c.length)for(var d=Array.prototype.slice.call(arguments,2),e=0;e<c.length;++e)c[e].apply(null,d)}function Fa(a,b,c){return"string"==typeof b&&(b={type:b,preventDefault:function(){this.defaultPrevented=!0}}),Ea(a,c||b.type,a,b),La(b)||b.codemirrorIgnore}function Ga(a){var b=a._handlers&&a._handlers.cursorActivity;if(b)for(var c=a.curOp.cursorActivityHandlers||(a.curOp.cursorActivityHandlers=[]),d=0;d<b.length;++d)m(c,b[d])==-1&&c.push(b[d])}function Ha(a,b){return Ca(a,b).length>0}function Ia(a){a.prototype.on=function(a,b){Jg(this,a,b)},a.prototype.off=function(a,b){Da(this,a,b)}}function Ja(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function Ka(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0}function La(a){return null!=a.defaultPrevented?a.defaultPrevented:0==a.returnValue}function Ma(a){Ja(a),Ka(a)}function Na(a){return a.target||a.srcElement}function Oa(a){var b=a.which;return null==b&&(1&a.button?b=1:2&a.button?b=3:4&a.button&&(b=2)),kg&&a.ctrlKey&&1==b&&(b=3),b}function Pa(a){if(null==ug){var b=d("span","​");c(a,d("span",[b,document.createTextNode("x")])),0!=a.firstChild.offsetHeight&&(ug=b.offsetWidth<=1&&b.offsetHeight>2&&!($f&&_f<8))}var e=ug?d("span","​"):d("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return e.setAttribute("cm-text",""),e}function Qa(a){if(null!=vg)return vg;var d=c(a,document.createTextNode("AخA")),e=og(d,0,1).getBoundingClientRect(),f=og(d,1,2).getBoundingClientRect();return b(a),!(!e||e.left==e.right)&&(vg=f.right-e.right<3)}function Ra(a){if(null!=Og)return Og;var b=c(a,d("span","x")),e=b.getBoundingClientRect(),f=og(b,0,1).getBoundingClientRect();return Og=Math.abs(e.left-f.left)>1}function Sa(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),Pg[a]=b}function Ta(a,b){Qg[a]=b}function Ua(a){if("string"==typeof a&&Qg.hasOwnProperty(a))a=Qg[a];else if(a&&"string"==typeof a.name&&Qg.hasOwnProperty(a.name)){var b=Qg[a.name];"string"==typeof b&&(b={name:b}),a=t(b,a),a.name=b.name}else{if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+xml$/.test(a))return Ua("application/xml");if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+json$/.test(a))return Ua("application/json")}return"string"==typeof a?{name:a}:a||{name:"null"}}function Va(a,b){b=Ua(b);var c=Pg[b.name];if(!c)return Va(a,"text/plain");var d=c(a,b);if(Rg.hasOwnProperty(b.name)){var e=Rg[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var g in b.modeProps)d[g]=b.modeProps[g];return d}function Wa(a,b){var c=Rg.hasOwnProperty(a)?Rg[a]:Rg[a]={};k(b,c)}function Xa(a,b){if(b===!0)return b;if(a.copyState)return a.copyState(b);var c={};for(var d in b){var e=b[d];e instanceof Array&&(e=e.concat([])),c[d]=e}return c}function Ya(a,b){for(var c;a.innerMode&&(c=a.innerMode(b),c&&c.mode!=a);)b=c.state,a=c.mode;return c||{mode:a,state:b}}function Za(a,b,c){return!a.startState||a.startState(b,c)}function $a(a,b,c,d){var e=[a.state.modeGen],f={};gb(a,b.text,a.doc.mode,c,(function(a,b){return e.push(a,b)}),f,d);for(var g=function(c){var d=a.state.overlays[c],g=1,h=0;gb(a,b.text,d.mode,!0,(function(a,b){for(var c=g;h<a;){var f=e[g];f>a&&e.splice(g,1,a,e[g+1],f),g+=2,h=Math.min(a,f)}if(b)if(d.opaque)e.splice(c,g-c,a,"overlay "+b),g=c+2;else for(;c<g;c+=2){var i=e[c+1];e[c+1]=(i?i+" ":"")+"overlay "+b}}),f)},h=0;h<a.state.overlays.length;++h)g(h);return{styles:e,classes:f.bgClass||f.textClass?f:null}}function _a(a,b,c){if(!b.styles||b.styles[0]!=a.state.modeGen){var d=ab(a,F(b)),e=$a(a,b,b.text.length>a.options.maxHighlightLength?Xa(a.doc.mode,d):d);b.stateAfter=d,b.styles=e.styles,e.classes?b.styleClasses=e.classes:b.styleClasses&&(b.styleClasses=null),c===a.doc.frontier&&a.doc.frontier++}return b.styles}function ab(a,b,c){var d=a.doc,e=a.display;if(!d.mode.startState)return!0;var f=hb(a,b,c),g=f>d.first&&B(d,f-1).stateAfter;return g=g?Xa(d.mode,g):Za(d.mode),d.iter(f,b,(function(c){bb(a,c.text,g);var h=f==b-1||f%5==0||f>=e.viewFrom&&f<e.viewTo;c.stateAfter=h?Xa(d.mode,g):null,++f})),c&&(d.frontier=f),g}function bb(a,b,c,d){var e=a.doc.mode,f=new Sg(b,a.options.tabSize);for(f.start=f.pos=d||0,""==b&&cb(e,c);!f.eol();)db(e,f,c),f.start=f.pos}function cb(a,b){if(a.blankLine)return a.blankLine(b);if(a.innerMode){var c=Ya(a,b);return c.mode.blankLine?c.mode.blankLine(c.state):void 0}}function db(a,b,c,d){for(var e=0;e<10;e++){d&&(d[0]=Ya(a,c).mode);var f=a.token(b,c);if(b.pos>b.start)return f}throw new Error("Mode "+a.name+" failed to advance stream.")}function eb(a,b,c,d){var e,f=function(a){return{start:l.start,end:l.pos,string:l.current(),type:e||null,state:a?Xa(g.mode,k):k}},g=a.doc,h=g.mode;b=Q(g,b);var i,j=B(g,b.line),k=ab(a,b.line,c),l=new Sg(j.text,a.options.tabSize);for(d&&(i=[]);(d||l.pos<b.ch)&&!l.eol();)l.start=l.pos,e=db(h,l,k),d&&i.push(f(!0));return d?i:f()}function fb(a,b){if(a)for(;;){var c=a.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!c)break;a=a.slice(0,c.index)+a.slice(c.index+c[0].length);var d=c[1]?"bgClass":"textClass";null==b[d]?b[d]=c[2]:new RegExp("(?:^|s)"+c[2]+"(?:$|s)").test(b[d])||(b[d]+=" "+c[2])}return a}function gb(a,b,c,d,e,f,g){var h=c.flattenSpans;null==h&&(h=a.options.flattenSpans);var i,j=0,k=null,l=new Sg(b,a.options.tabSize),m=a.options.addModeClass&&[null];for(""==b&&fb(cb(c,d),f);!l.eol();){if(l.pos>a.options.maxHighlightLength?(h=!1,g&&bb(a,b,d,l.pos),l.pos=b.length,i=null):i=fb(db(c,l,d,m),f),m){var n=m[0].name;n&&(i="m-"+(i?n+" "+i:n))}if(!h||k!=i){for(;j<l.start;)j=Math.min(l.start,j+5e3),e(j,k);k=i}l.start=l.pos}for(;j<l.pos;){var o=Math.min(l.pos,j+5e3);e(o,k),j=o}}function hb(a,b,c){for(var d,e,f=a.doc,g=c?-1:b-(a.doc.mode.innerMode?1e3:100),h=b;h>g;--h){if(h<=f.first)return f.first;var i=B(f,h-1);if(i.stateAfter&&(!c||h<=f.frontier))return h;var j=l(i.text,null,a.options.tabSize);(null==e||d>j)&&(e=h-1,d=j)}return e}function ib(a,b,c,d){a.text=b,a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null),null!=a.order&&(a.order=null),ca(a),da(a,c);var e=d?d(a):1;e!=a.height&&E(a,e)}function jb(a){a.parent=null,ca(a)}function kb(a,b){if(!a||/^\s*$/.test(a))return null;var c=b.addModeClass?Wg:Vg;return c[a]||(c[a]=a.replace(/\S+/g,"cm-$&"))}function lb(a,b){var c=e("span",null,null,ag?"padding-right: .1px":null),d={pre:e("pre",[c],"CodeMirror-line"),content:c,col:0,pos:0,cm:a,trailingSpace:!1,splitSpaces:($f||ag)&&a.getOption("lineWrapping")};b.measure={};for(var f=0;f<=(b.rest?b.rest.length:0);f++){var g=f?b.rest[f-1]:b.line,h=void 0;d.pos=0,d.addToken=nb,Qa(a.display.measure)&&(h=xa(g,a.doc.direction))&&(d.addToken=pb(d.addToken,h)),d.map=[];var j=b!=a.display.externalMeasured&&F(g);rb(g,d,_a(a,g,j)),g.styleClasses&&(g.styleClasses.bgClass&&(d.bgClass=i(g.styleClasses.bgClass,d.bgClass||"")),g.styleClasses.textClass&&(d.textClass=i(g.styleClasses.textClass,d.textClass||""))),0==d.map.length&&d.map.push(0,0,d.content.appendChild(Pa(a.display.measure))),0==f?(b.measure.map=d.map,b.measure.cache={}):((b.measure.maps||(b.measure.maps=[])).push(d.map),(b.measure.caches||(b.measure.caches=[])).push({}))}if(ag){var k=d.content.lastChild;(/\bcm-tab\b/.test(k.className)||k.querySelector&&k.querySelector(".cm-tab"))&&(d.content.className="cm-tab-wrap-hack")}return Ea(a,"renderLine",a,b.line,d.pre),d.pre.className&&(d.textClass=i(d.pre.className,d.textClass||"")),d}function mb(a){var b=d("span","•","cm-invalidchar");return b.title="\\u"+a.charCodeAt(0).toString(16),b.setAttribute("aria-label",b.title),b}function nb(a,b,c,e,f,g,h){if(b){var i,j=a.splitSpaces?ob(b,a.trailingSpace):b,k=a.cm.state.specialChars,l=!1;if(k.test(b)){i=document.createDocumentFragment();for(var m=0;;){k.lastIndex=m;var n=k.exec(b),p=n?n.index-m:b.length-m;if(p){var q=document.createTextNode(j.slice(m,m+p));$f&&_f<9?i.appendChild(d("span",[q])):i.appendChild(q),a.map.push(a.pos,a.pos+p,q),a.col+=p,a.pos+=p}if(!n)break;m+=p+1;var r=void 0;if("\t"==n[0]){var s=a.cm.options.tabSize,t=s-a.col%s;r=i.appendChild(d("span",o(t),"cm-tab")),r.setAttribute("role","presentation"),r.setAttribute("cm-text","\t"),a.col+=t}else"\r"==n[0]||"\n"==n[0]?(r=i.appendChild(d("span","\r"==n[0]?"␍":"␤","cm-invalidchar")),r.setAttribute("cm-text",n[0]),a.col+=1):(r=a.cm.options.specialCharPlaceholder(n[0]),r.setAttribute("cm-text",n[0]),$f&&_f<9?i.appendChild(d("span",[r])):i.appendChild(r),a.col+=1);a.map.push(a.pos,a.pos+1,r),a.pos++}}else a.col+=b.length,i=document.createTextNode(j),a.map.push(a.pos,a.pos+b.length,i),$f&&_f<9&&(l=!0),a.pos+=b.length;if(a.trailingSpace=32==j.charCodeAt(b.length-1),c||e||f||l||h){var u=c||"";e&&(u+=e),f&&(u+=f);var v=d("span",[i],u,h);return g&&(v.title=g),a.content.appendChild(v)}a.content.appendChild(i)}}function ob(a,b){if(a.length>1&&!/  /.test(a))return a;for(var c=b,d="",e=0;e<a.length;e++){var f=a.charAt(e);" "!=f||!c||e!=a.length-1&&32!=a.charCodeAt(e+1)||(f=" "),d+=f,c=" "==f}return d}function pb(a,b){return function(c,d,e,f,g,h,i){e=e?e+" cm-force-border":"cm-force-border";for(var j=c.pos,k=j+d.length;;){for(var l=void 0,m=0;m<b.length&&(l=b[m],!(l.to>j&&l.from<=j));m++);if(l.to>=k)return a(c,d,e,f,g,h,i);a(c,d.slice(0,l.to-j),e,f,null,h,i),f=null,d=d.slice(l.to-j),j=l.to}}}function qb(a,b,c,d){var e=!d&&c.widgetNode;e&&a.map.push(a.pos,a.pos+b,e),!d&&a.cm.display.input.needsContentAttribute&&(e||(e=a.content.appendChild(document.createElement("span"))),e.setAttribute("cm-marker",c.id)),e&&(a.cm.display.input.setUneditable(e),a.content.appendChild(e)),a.pos+=b,a.trailingSpace=!1}function rb(a,b,c){var d=a.markedSpans,e=a.text,f=0;if(d)for(var g,h,i,j,k,l,m,n=e.length,o=0,p=1,q="",r=0;;){if(r==o){i=j=k=l=h="",m=null,r=1/0;for(var s=[],t=void 0,u=0;u<d.length;++u){var v=d[u],w=v.marker;"bookmark"==w.type&&v.from==o&&w.widgetNode?s.push(w):v.from<=o&&(null==v.to||v.to>o||w.collapsed&&v.to==o&&v.from==o)?(null!=v.to&&v.to!=o&&r>v.to&&(r=v.to,j=""),w.className&&(i+=" "+w.className),w.css&&(h=(h?h+";":"")+w.css),w.startStyle&&v.from==o&&(k+=" "+w.startStyle),w.endStyle&&v.to==r&&(t||(t=[])).push(w.endStyle,v.to),w.title&&!l&&(l=w.title),w.collapsed&&(!m||ga(m.marker,w)<0)&&(m=v)):v.from>o&&r>v.from&&(r=v.from)}if(t)for(var x=0;x<t.length;x+=2)t[x+1]==r&&(j+=" "+t[x]);if(!m||m.from==o)for(var y=0;y<s.length;++y)qb(b,0,s[y]);if(m&&(m.from||0)==o){if(qb(b,(null==m.to?n+1:m.to)-o,m.marker,null==m.from),null==m.to)return;m.to==o&&(m=!1)}}if(o>=n)break;for(var z=Math.min(n,r);;){if(q){var A=o+q.length;if(!m){var B=A>z?q.slice(0,z-o):q;b.addToken(b,B,g?g+i:i,k,o+B.length==r?j:"",l,h)}if(A>=z){q=q.slice(z-o),o=z;break}o=A,k=""}q=e.slice(f,f=c[p++]),g=kb(c[p++],b.cm.options)}}else for(var C=1;C<c.length;C+=2)b.addToken(b,e.slice(f,f=c[C]),kb(c[C+1],b.cm.options))}function sb(a,b,c){this.line=b,this.rest=na(b),this.size=this.rest?F(p(this.rest))-c+1:1,this.node=this.text=null,this.hidden=qa(a,b)}function tb(a,b,c){for(var d,e=[],f=b;f<c;f=d){var g=new sb(a.doc,B(a.doc,f),f);d=f+g.size,e.push(g)}return e}function ub(a){Xg?Xg.ops.push(a):a.ownsGroup=Xg={ops:[a],delayedCallbacks:[]}}function vb(a){var b=a.delayedCallbacks,c=0;do{for(;c<b.length;c++)b[c].call(null);for(var d=0;d<a.ops.length;d++){var e=a.ops[d];if(e.cursorActivityHandlers)for(;e.cursorActivityCalled<e.cursorActivityHandlers.length;)e.cursorActivityHandlers[e.cursorActivityCalled++].call(null,e.cm)}}while(c<b.length)}function wb(a,b){var c=a.ownsGroup;if(c)try{vb(c)}finally{Xg=null,b(c)}}function xb(a,b){var c=Ca(a,b);if(c.length){var d,e=Array.prototype.slice.call(arguments,2);Xg?d=Xg.delayedCallbacks:Yg?d=Yg:(d=Yg=[],setTimeout(yb,0));for(var f=function(a){d.push((function(){return c[a].apply(null,e)}))},g=0;g<c.length;++g)f(g)}}function yb(){var a=Yg;Yg=null;for(var b=0;b<a.length;++b)a[b]()}function zb(a,b,c,d){for(var e=0;e<b.changes.length;e++){var f=b.changes[e];"text"==f?Db(a,b):"gutter"==f?Fb(a,b,c,d):"class"==f?Eb(a,b):"widget"==f&&Gb(a,b,d)}b.changes=null}function Ab(a){return a.node==a.text&&(a.node=d("div",null,null,"position: relative"),a.text.parentNode&&a.text.parentNode.replaceChild(a.node,a.text),a.node.appendChild(a.text),$f&&_f<8&&(a.node.style.zIndex=2)),a.node}function Bb(a,b){var c=b.bgClass?b.bgClass+" "+(b.line.bgClass||""):b.line.bgClass;if(c&&(c+=" CodeMirror-linebackground"),b.background)c?b.background.className=c:(b.background.parentNode.removeChild(b.background),b.background=null);else if(c){var e=Ab(b);b.background=e.insertBefore(d("div",null,c),e.firstChild),a.display.input.setUneditable(b.background)}}function Cb(a,b){var c=a.display.externalMeasured;return c&&c.line==b.line?(a.display.externalMeasured=null,b.measure=c.measure,c.built):lb(a,b)}function Db(a,b){var c=b.text.className,d=Cb(a,b);b.text==b.node&&(b.node=d.pre),b.text.parentNode.replaceChild(d.pre,b.text),b.text=d.pre,d.bgClass!=b.bgClass||d.textClass!=b.textClass?(b.bgClass=d.bgClass,b.textClass=d.textClass,Eb(a,b)):c&&(b.text.className=c)}function Eb(a,b){Bb(a,b),b.line.wrapClass?Ab(b).className=b.line.wrapClass:b.node!=b.text&&(b.node.className="");var c=b.textClass?b.textClass+" "+(b.line.textClass||""):b.line.textClass;b.text.className=c||""}function Fb(a,b,c,e){if(b.gutter&&(b.node.removeChild(b.gutter),b.gutter=null),b.gutterBackground&&(b.node.removeChild(b.gutterBackground),b.gutterBackground=null),b.line.gutterClass){var f=Ab(b);b.gutterBackground=d("div",null,"CodeMirror-gutter-background "+b.line.gutterClass,"left: "+(a.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px; width: "+e.gutterTotalWidth+"px"),a.display.input.setUneditable(b.gutterBackground),f.insertBefore(b.gutterBackground,b.text)}var g=b.line.gutterMarkers;if(a.options.lineNumbers||g){var h=Ab(b),i=b.gutter=d("div",null,"CodeMirror-gutter-wrapper","left: "+(a.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px");if(a.display.input.setUneditable(i),h.insertBefore(i,b.text),b.line.gutterClass&&(i.className+=" "+b.line.gutterClass),!a.options.lineNumbers||g&&g["CodeMirror-linenumbers"]||(b.lineNumber=i.appendChild(d("div",I(a.options,c),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+e.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+a.display.lineNumInnerWidth+"px"))),g)for(var j=0;j<a.options.gutters.length;++j){var k=a.options.gutters[j],l=g.hasOwnProperty(k)&&g[k];l&&i.appendChild(d("div",[l],"CodeMirror-gutter-elt","left: "+e.gutterLeft[k]+"px; width: "+e.gutterWidth[k]+"px"))}}}function Gb(a,b,c){b.alignable&&(b.alignable=null);for(var d=b.node.firstChild,e=void 0;d;d=e)e=d.nextSibling,"CodeMirror-linewidget"==d.className&&b.node.removeChild(d);Ib(a,b,c)}function Hb(a,b,c,d){var e=Cb(a,b);return b.text=b.node=e.pre,e.bgClass&&(b.bgClass=e.bgClass),e.textClass&&(b.textClass=e.textClass),Eb(a,b),Fb(a,b,c,d),Ib(a,b,d),b.node}function Ib(a,b,c){if(Jb(a,b.line,b,c,!0),b.rest)for(var d=0;d<b.rest.length;d++)Jb(a,b.rest[d],b,c,!1)}function Jb(a,b,c,e,f){if(b.widgets)for(var g=Ab(c),h=0,i=b.widgets;h<i.length;++h){var j=i[h],k=d("div",[j.node],"CodeMirror-linewidget");j.handleMouseEvents||k.setAttribute("cm-ignore-events","true"),Kb(j,k,c,e),a.display.input.setUneditable(k),f&&j.above?g.insertBefore(k,c.gutter||c.text):g.appendChild(k),xb(j,"redraw")}}function Kb(a,b,c,d){if(a.noHScroll){(c.alignable||(c.alignable=[])).push(b);var e=d.wrapperWidth;b.style.left=d.fixedPos+"px",a.coverGutter||(e-=d.gutterTotalWidth,b.style.paddingLeft=d.gutterTotalWidth+"px"),b.style.width=e+"px"}a.coverGutter&&(b.style.zIndex=5,b.style.position="relative",a.noHScroll||(b.style.marginLeft=-d.gutterTotalWidth+"px"))}function Lb(a){if(null!=a.height)return a.height;var b=a.doc.cm;if(!b)return 0;if(!f(document.body,a.node)){var e="position: relative;";a.coverGutter&&(e+="margin-left: -"+b.display.gutters.offsetWidth+"px;"),a.noHScroll&&(e+="width: "+b.display.wrapper.clientWidth+"px;"),c(b.display.measure,d("div",[a.node],null,e))}return a.height=a.node.parentNode.offsetHeight}function Mb(a,b){for(var c=Na(b);c!=a.wrapper;c=c.parentNode)if(!c||1==c.nodeType&&"true"==c.getAttribute("cm-ignore-events")||c.parentNode==a.sizer&&c!=a.mover)return!0}function Nb(a){return a.lineSpace.offsetTop}function Ob(a){return a.mover.offsetHeight-a.lineSpace.offsetHeight}function Pb(a){if(a.cachedPaddingH)return a.cachedPaddingH;var b=c(a.measure,d("pre","x")),e=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,f={left:parseInt(e.paddingLeft),right:parseInt(e.paddingRight)};return isNaN(f.left)||isNaN(f.right)||(a.cachedPaddingH=f),f}function Qb(a){return wg-a.display.nativeBarWidth}function Rb(a){return a.display.scroller.clientWidth-Qb(a)-a.display.barWidth}function Sb(a){return a.display.scroller.clientHeight-Qb(a)-a.display.barHeight}function Tb(a,b,c){var d=a.options.lineWrapping,e=d&&Rb(a);if(!b.measure.heights||d&&b.measure.width!=e){var f=b.measure.heights=[];if(d){b.measure.width=e;for(var g=b.text.firstChild.getClientRects(),h=0;h<g.length-1;h++){var i=g[h],j=g[h+1];Math.abs(i.bottom-j.bottom)>2&&f.push((i.bottom+j.top)/2-c.top)}}f.push(c.bottom-c.top)}}function Ub(a,b,c){if(a.line==b)return{map:a.measure.map,cache:a.measure.cache};for(var d=0;d<a.rest.length;d++)if(a.rest[d]==b)return{map:a.measure.maps[d],cache:a.measure.caches[d]};for(var e=0;e<a.rest.length;e++)if(F(a.rest[e])>c)return{map:a.measure.maps[e],cache:a.measure.caches[e],before:!0}}function Vb(a,b){b=la(b);var d=F(b),e=a.display.externalMeasured=new sb(a.doc,b,d);e.lineN=d;var f=e.built=lb(a,e);return e.text=f.pre,c(a.display.lineMeasure,f.pre),e}function Wb(a,b,c,d){return Zb(a,Yb(a,b),c,d)}function Xb(a,b){if(b>=a.display.viewFrom&&b<a.display.viewTo)return a.display.view[yc(a,b)];var c=a.display.externalMeasured;return c&&b>=c.lineN&&b<c.lineN+c.size?c:void 0}function Yb(a,b){var c=F(b),d=Xb(a,c);d&&!d.text?d=null:d&&d.changes&&(zb(a,d,c,tc(a)),a.curOp.forceUpdate=!0),d||(d=Vb(a,b));var e=Ub(d,b,c);return{line:b,view:d,rect:null,map:e.map,
-cache:e.cache,before:e.before,hasHeights:!1}}function Zb(a,b,c,d,e){b.before&&(c=-1);var f,g=c+(d||"");return b.cache.hasOwnProperty(g)?f=b.cache[g]:(b.rect||(b.rect=b.view.text.getBoundingClientRect()),b.hasHeights||(Tb(a,b.view,b.rect),b.hasHeights=!0),f=ac(a,b,c,d),f.bogus||(b.cache[g]=f)),{left:f.left,right:f.right,top:e?f.rtop:f.top,bottom:e?f.rbottom:f.bottom}}function $b(a,b,c){for(var d,e,f,g,h,i,j=0;j<a.length;j+=3)if(h=a[j],i=a[j+1],b<h?(e=0,f=1,g="left"):b<i?(e=b-h,f=e+1):(j==a.length-3||b==i&&a[j+3]>b)&&(f=i-h,e=f-1,b>=i&&(g="right")),null!=e){if(d=a[j+2],h==i&&c==(d.insertLeft?"left":"right")&&(g=c),"left"==c&&0==e)for(;j&&a[j-2]==a[j-3]&&a[j-1].insertLeft;)d=a[(j-=3)+2],g="left";if("right"==c&&e==i-h)for(;j<a.length-3&&a[j+3]==a[j+4]&&!a[j+5].insertLeft;)d=a[(j+=3)+2],g="right";break}return{node:d,start:e,end:f,collapse:g,coverStart:h,coverEnd:i}}function _b(a,b){var c=Zg;if("left"==b)for(var d=0;d<a.length&&(c=a[d]).left==c.right;d++);else for(var e=a.length-1;e>=0&&(c=a[e]).left==c.right;e--);return c}function ac(a,b,c,d){var e,f=$b(b.map,c,d),g=f.node,h=f.start,i=f.end,j=f.collapse;if(3==g.nodeType){for(var k=0;k<4;k++){for(;h&&x(b.line.text.charAt(f.coverStart+h));)--h;for(;f.coverStart+i<f.coverEnd&&x(b.line.text.charAt(f.coverStart+i));)++i;if(e=$f&&_f<9&&0==h&&i==f.coverEnd-f.coverStart?g.parentNode.getBoundingClientRect():_b(og(g,h,i).getClientRects(),d),e.left||e.right||0==h)break;i=h,h-=1,j="right"}$f&&_f<11&&(e=bc(a.display.measure,e))}else{h>0&&(j=d="right");var l;e=a.options.lineWrapping&&(l=g.getClientRects()).length>1?l["right"==d?l.length-1:0]:g.getBoundingClientRect()}if($f&&_f<9&&!h&&(!e||!e.left&&!e.right)){var m=g.parentNode.getClientRects()[0];e=m?{left:m.left,right:m.left+sc(a.display),top:m.top,bottom:m.bottom}:Zg}for(var n=e.top-b.rect.top,o=e.bottom-b.rect.top,p=(n+o)/2,q=b.view.measure.heights,r=0;r<q.length-1&&!(p<q[r]);r++);var s=r?q[r-1]:0,t=q[r],u={left:("right"==j?e.right:e.left)-b.rect.left,right:("left"==j?e.left:e.right)-b.rect.left,top:s,bottom:t};return e.left||e.right||(u.bogus=!0),a.options.singleCursorHeightPerLine||(u.rtop=n,u.rbottom=o),u}function bc(a,b){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!Ra(a))return b;var c=screen.logicalXDPI/screen.deviceXDPI,d=screen.logicalYDPI/screen.deviceYDPI;return{left:b.left*c,right:b.right*c,top:b.top*d,bottom:b.bottom*d}}function cc(a){if(a.measure&&(a.measure.cache={},a.measure.heights=null,a.rest))for(var b=0;b<a.rest.length;b++)a.measure.caches[b]={}}function dc(a){a.display.externalMeasure=null,b(a.display.lineMeasure);for(var c=0;c<a.display.view.length;c++)cc(a.display.view[c])}function ec(a){dc(a),a.display.cachedCharWidth=a.display.cachedTextHeight=a.display.cachedPaddingH=null,a.options.lineWrapping||(a.display.maxLineChanged=!0),a.display.lineNumChars=null}function fc(){return cg&&ig?-(document.body.getBoundingClientRect().left-parseInt(getComputedStyle(document.body).marginLeft)):window.pageXOffset||(document.documentElement||document.body).scrollLeft}function gc(){return cg&&ig?-(document.body.getBoundingClientRect().top-parseInt(getComputedStyle(document.body).marginTop)):window.pageYOffset||(document.documentElement||document.body).scrollTop}function hc(a,b,c,d,e){if(!e&&b.widgets)for(var f=0;f<b.widgets.length;++f)if(b.widgets[f].above){var g=Lb(b.widgets[f]);c.top+=g,c.bottom+=g}if("line"==d)return c;d||(d="local");var h=sa(b);if("local"==d?h+=Nb(a.display):h-=a.display.viewOffset,"page"==d||"window"==d){var i=a.display.lineSpace.getBoundingClientRect();h+=i.top+("window"==d?0:gc());var j=i.left+("window"==d?0:fc());c.left+=j,c.right+=j}return c.top+=h,c.bottom+=h,c}function ic(a,b,c){if("div"==c)return b;var d=b.left,e=b.top;if("page"==c)d-=fc(),e-=gc();else if("local"==c||!c){var f=a.display.sizer.getBoundingClientRect();d+=f.left,e+=f.top}var g=a.display.lineSpace.getBoundingClientRect();return{left:d-g.left,top:e-g.top}}function jc(a,b,c,d,e){return d||(d=B(a.doc,b.line)),hc(a,d,Wb(a,d,b.ch,e),c)}function kc(a,b,c,d,e,f){function g(b,g){var h=Zb(a,e,b,g?"right":"left",f);return g?h.left=h.right:h.right=h.left,hc(a,d,h,c)}function h(a,b,c){var d=i[b],e=d.level%2!=0;return g(c?a-1:a,e!=c)}d=d||B(a.doc,b.line),e||(e=Yb(a,d));var i=xa(d,a.doc.direction),j=b.ch,k=b.sticky;if(j>=d.text.length?(j=d.text.length,k="before"):j<=0&&(j=0,k="after"),!i)return g("before"==k?j-1:j,"before"==k);var l=wa(i,j,k),m=Gg,n=h(j,l,"before"==k);return null!=m&&(n.other=h(j,m,"before"!=k)),n}function lc(a,b){var c=0;b=Q(a.doc,b),a.options.lineWrapping||(c=sc(a.display)*b.ch);var d=B(a.doc,b.line),e=sa(d)+Nb(a.display);return{left:c,right:c,top:e,bottom:e+d.height}}function mc(a,b,c,d,e){var f=J(a,b,c);return f.xRel=e,d&&(f.outside=!0),f}function nc(a,b,c){var d=a.doc;if(c+=a.display.viewOffset,c<0)return mc(d.first,0,null,!0,-1);var e=G(d,c),f=d.first+d.size-1;if(e>f)return mc(d.first+d.size-1,B(d,f).text.length,null,!0,1);b<0&&(b=0);for(var g=B(d,e);;){var h=qc(a,g,e,b,c),i=ja(g),j=i&&i.find(0,!0);if(!i||!(h.ch>j.from.ch||h.ch==j.from.ch&&h.xRel>0))return h;e=F(g=j.to.line)}}function oc(a,b,c,d){var e=function(d){return hc(a,b,Zb(a,c,d),"line")},f=b.text.length,g=z((function(a){return e(a-1).bottom<=d}),f,0);return f=z((function(a){return e(a).top>d}),g,f),{begin:g,end:f}}function pc(a,b,c,d){var e=hc(a,b,Zb(a,c,d),"line").top;return oc(a,b,c,e)}function qc(a,b,c,d,e){e-=sa(b);var f,g=0,h=b.text.length,i=Yb(a,b),j=xa(b,a.doc.direction);if(j){if(a.options.lineWrapping){var k;k=oc(a,b,i,e),g=k.begin,h=k.end,k}f=new J(c,g);var l,m,n=kc(a,f,"line",b,i).left,o=n<d?1:-1,p=n-d;do{if(l=p,m=f,f=Ba(a,b,f,o),null==f||f.ch<g||h<=("before"==f.sticky?f.ch-1:f.ch)){f=m;break}p=kc(a,f,"line",b,i).left-d}while(o<0!=p<0&&Math.abs(p)<=Math.abs(l));if(Math.abs(p)>Math.abs(l)){if(p<0==l<0)throw new Error("Broke out of infinite loop in coordsCharInner");f=m}}else{var q=z((function(c){var f=hc(a,b,Zb(a,i,c),"line");return f.top>e?(h=Math.min(c,h),!0):!(f.bottom<=e)&&(f.left>d||!(f.right<d)&&d-f.left<f.right-d)}),g,h);q=y(b.text,q,1),f=new J(c,q,q==h?"before":"after")}var r=kc(a,f,"line",b,i);return(e<r.top||r.bottom<e)&&(f.outside=!0),f.xRel=d<r.left?-1:d>r.right?1:0,f}function rc(a){if(null!=a.cachedTextHeight)return a.cachedTextHeight;if(null==Ug){Ug=d("pre");for(var e=0;e<49;++e)Ug.appendChild(document.createTextNode("x")),Ug.appendChild(d("br"));Ug.appendChild(document.createTextNode("x"))}c(a.measure,Ug);var f=Ug.offsetHeight/50;return f>3&&(a.cachedTextHeight=f),b(a.measure),f||1}function sc(a){if(null!=a.cachedCharWidth)return a.cachedCharWidth;var b=d("span","xxxxxxxxxx"),e=d("pre",[b]);c(a.measure,e);var f=b.getBoundingClientRect(),g=(f.right-f.left)/10;return g>2&&(a.cachedCharWidth=g),g||10}function tc(a){for(var b=a.display,c={},d={},e=b.gutters.clientLeft,f=b.gutters.firstChild,g=0;f;f=f.nextSibling,++g)c[a.options.gutters[g]]=f.offsetLeft+f.clientLeft+e,d[a.options.gutters[g]]=f.clientWidth;return{fixedPos:uc(b),gutterTotalWidth:b.gutters.offsetWidth,gutterLeft:c,gutterWidth:d,wrapperWidth:b.wrapper.clientWidth}}function uc(a){return a.scroller.getBoundingClientRect().left-a.sizer.getBoundingClientRect().left}function vc(a){var b=rc(a.display),c=a.options.lineWrapping,d=c&&Math.max(5,a.display.scroller.clientWidth/sc(a.display)-3);return function(e){if(qa(a.doc,e))return 0;var f=0;if(e.widgets)for(var g=0;g<e.widgets.length;g++)e.widgets[g].height&&(f+=e.widgets[g].height);return c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function wc(a){var b=a.doc,c=vc(a);b.iter((function(a){var b=c(a);b!=a.height&&E(a,b)}))}function xc(a,b,c,d){var e=a.display;if(!c&&"true"==Na(b).getAttribute("cm-not-content"))return null;var f,g,h=e.lineSpace.getBoundingClientRect();try{f=b.clientX-h.left,g=b.clientY-h.top}catch(a){return null}var i,j=nc(a,f,g);if(d&&1==j.xRel&&(i=B(a.doc,j.line).text).length==j.ch){var k=l(i,i.length,a.options.tabSize)-i.length;j=J(j.line,Math.max(0,Math.round((f-Pb(a.display).left)/sc(a.display))-k))}return j}function yc(a,b){if(b>=a.display.viewTo)return null;if(b-=a.display.viewFrom,b<0)return null;for(var c=a.display.view,d=0;d<c.length;d++)if(b-=c[d].size,b<0)return d}function zc(a){a.display.input.showSelection(a.display.input.prepareSelection())}function Ac(a,b){for(var c=a.doc,d={},e=d.cursors=document.createDocumentFragment(),f=d.selection=document.createDocumentFragment(),g=0;g<c.sel.ranges.length;g++)if(b!==!1||g!=c.sel.primIndex){var h=c.sel.ranges[g];if(!(h.from().line>=a.display.viewTo||h.to().line<a.display.viewFrom)){var i=h.empty();(i||a.options.showCursorWhenSelecting)&&Bc(a,h.head,e),i||Cc(a,h,f)}}return d}function Bc(a,b,c){var e=kc(a,b,"div",null,null,!a.options.singleCursorHeightPerLine),f=c.appendChild(d("div"," ","CodeMirror-cursor"));if(f.style.left=e.left+"px",f.style.top=e.top+"px",f.style.height=Math.max(0,e.bottom-e.top)*a.options.cursorHeight+"px",e.other){var g=c.appendChild(d("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));g.style.display="",g.style.left=e.other.left+"px",g.style.top=e.other.top+"px",g.style.height=.85*(e.other.bottom-e.other.top)+"px"}}function Cc(a,b,c){function e(a,b,c,e){b<0&&(b=0),b=Math.round(b),e=Math.round(e),i.appendChild(d("div",null,"CodeMirror-selected","position: absolute; left: "+a+"px;\n                             top: "+b+"px; width: "+(null==c?l-a:c)+"px;\n                             height: "+(e-b)+"px"))}function f(b,c,d){function f(c,d){return jc(a,J(b,c),"div",j,d)}var g,i,j=B(h,b),m=j.text.length;return va(xa(j,h.direction),c||0,null==d?m:d,(function(a,b,h){var j,n,o,p=f(a,"left");if(a==b)j=p,n=o=p.left;else{if(j=f(b-1,"right"),"rtl"==h){var q=p;p=j,j=q}n=p.left,o=j.right}null==c&&0==a&&(n=k),j.top-p.top>3&&(e(n,p.top,null,p.bottom),n=k,p.bottom<j.top&&e(n,p.bottom,null,j.top)),null==d&&b==m&&(o=l),(!g||p.top<g.top||p.top==g.top&&p.left<g.left)&&(g=p),(!i||j.bottom>i.bottom||j.bottom==i.bottom&&j.right>i.right)&&(i=j),n<k+1&&(n=k),e(n,j.top,o-n,j.bottom)})),{start:g,end:i}}var g=a.display,h=a.doc,i=document.createDocumentFragment(),j=Pb(a.display),k=j.left,l=Math.max(g.sizerWidth,Rb(a)-g.sizer.offsetLeft)-j.right,m=b.from(),n=b.to();if(m.line==n.line)f(m.line,m.ch,n.ch);else{var o=B(h,m.line),p=B(h,n.line),q=la(o)==la(p),r=f(m.line,m.ch,q?o.text.length+1:null).end,s=f(n.line,q?0:null,n.ch).start;q&&(r.top<s.top-2?(e(r.right,r.top,null,r.bottom),e(k,s.top,s.left,s.bottom)):e(r.right,r.top,s.left-r.right,r.bottom)),r.bottom<s.top&&e(k,r.bottom,null,s.top)}c.appendChild(i)}function Dc(a){if(a.state.focused){var b=a.display;clearInterval(b.blinker);var c=!0;b.cursorDiv.style.visibility="",a.options.cursorBlinkRate>0?b.blinker=setInterval((function(){return b.cursorDiv.style.visibility=(c=!c)?"":"hidden"}),a.options.cursorBlinkRate):a.options.cursorBlinkRate<0&&(b.cursorDiv.style.visibility="hidden")}}function Ec(a){a.state.focused||(a.display.input.focus(),Gc(a))}function Fc(a){a.state.delayingBlurEvent=!0,setTimeout((function(){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1,Hc(a))}),100)}function Gc(a,b){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1),"nocursor"!=a.options.readOnly&&(a.state.focused||(Ea(a,"focus",a,b),a.state.focused=!0,h(a.display.wrapper,"CodeMirror-focused"),a.curOp||a.display.selForContextMenu==a.doc.sel||(a.display.input.reset(),ag&&setTimeout((function(){return a.display.input.reset(!0)}),20)),a.display.input.receivedFocus()),Dc(a))}function Hc(a,b){a.state.delayingBlurEvent||(a.state.focused&&(Ea(a,"blur",a,b),a.state.focused=!1,rg(a.display.wrapper,"CodeMirror-focused")),clearInterval(a.display.blinker),setTimeout((function(){a.state.focused||(a.display.shift=!1)}),150))}function Ic(a){var b=a.display,c=b.view;if(b.alignWidgets||b.gutters.firstChild&&a.options.fixedGutter){for(var d=uc(b)-b.scroller.scrollLeft+a.doc.scrollLeft,e=b.gutters.offsetWidth,f=d+"px",g=0;g<c.length;g++)if(!c[g].hidden){a.options.fixedGutter&&(c[g].gutter&&(c[g].gutter.style.left=f),c[g].gutterBackground&&(c[g].gutterBackground.style.left=f));var h=c[g].alignable;if(h)for(var i=0;i<h.length;i++)h[i].style.left=f}a.options.fixedGutter&&(b.gutters.style.left=d+e+"px")}}function Jc(a){if(!a.options.lineNumbers)return!1;var b=a.doc,c=I(a.options,b.first+b.size-1),e=a.display;if(c.length!=e.lineNumChars){var f=e.measure.appendChild(d("div",[d("div",c)],"CodeMirror-linenumber CodeMirror-gutter-elt")),g=f.firstChild.offsetWidth,h=f.offsetWidth-g;return e.lineGutter.style.width="",e.lineNumInnerWidth=Math.max(g,e.lineGutter.offsetWidth-h)+1,e.lineNumWidth=e.lineNumInnerWidth+h,e.lineNumChars=e.lineNumInnerWidth?c.length:-1,e.lineGutter.style.width=e.lineNumWidth+"px",Ad(a),!0}return!1}function Kc(a){for(var b=a.display,c=b.lineDiv.offsetTop,d=0;d<b.view.length;d++){var e=b.view[d],f=void 0;if(!e.hidden){if($f&&_f<8){var g=e.node.offsetTop+e.node.offsetHeight;f=g-c,c=g}else{var h=e.node.getBoundingClientRect();f=h.bottom-h.top}var i=e.line.height-f;if(f<2&&(f=rc(b)),(i>.001||i<-.001)&&(E(e.line,f),Lc(e.line),e.rest))for(var j=0;j<e.rest.length;j++)Lc(e.rest[j])}}}function Lc(a){if(a.widgets)for(var b=0;b<a.widgets.length;++b)a.widgets[b].height=a.widgets[b].node.parentNode.offsetHeight}function Mc(a,b,c){var d=c&&null!=c.top?Math.max(0,c.top):a.scroller.scrollTop;d=Math.floor(d-Nb(a));var e=c&&null!=c.bottom?c.bottom:d+a.wrapper.clientHeight,f=G(b,d),g=G(b,e);if(c&&c.ensure){var h=c.ensure.from.line,i=c.ensure.to.line;h<f?(f=h,g=G(b,sa(B(b,h))+a.wrapper.clientHeight)):Math.min(i,b.lastLine())>=g&&(f=G(b,sa(B(b,i))-a.wrapper.clientHeight),g=i)}return{from:f,to:Math.max(g,f+1)}}function Nc(a,b){Math.abs(a.doc.scrollTop-b)<2||(a.doc.scrollTop=b,Wf||yd(a,{top:b}),a.display.scroller.scrollTop!=b&&(a.display.scroller.scrollTop=b),a.display.scrollbars.setScrollTop(b),Wf&&yd(a),td(a,100))}function Oc(a,b,c){(c?b==a.doc.scrollLeft:Math.abs(a.doc.scrollLeft-b)<2)||(b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth),a.doc.scrollLeft=b,Ic(a),a.display.scroller.scrollLeft!=b&&(a.display.scroller.scrollLeft=b),a.display.scrollbars.setScrollLeft(b))}function Pc(a){var b=a.wheelDeltaX,c=a.wheelDeltaY;return null==b&&a.detail&&a.axis==a.HORIZONTAL_AXIS&&(b=a.detail),null==c&&a.detail&&a.axis==a.VERTICAL_AXIS?c=a.detail:null==c&&(c=a.wheelDelta),{x:b,y:c}}function Qc(a){var b=Pc(a);return b.x*=_g,b.y*=_g,b}function Rc(a,b){var c=Pc(b),d=c.x,e=c.y,f=a.display,g=f.scroller,h=g.scrollWidth>g.clientWidth,i=g.scrollHeight>g.clientHeight;if(d&&h||e&&i){if(e&&kg&&ag)a:for(var j=b.target,k=f.view;j!=g;j=j.parentNode)for(var l=0;l<k.length;l++)if(k[l].node==j){a.display.currentWheelTarget=j;break a}if(d&&!Wf&&!dg&&null!=_g)return e&&i&&Nc(a,Math.max(0,Math.min(g.scrollTop+e*_g,g.scrollHeight-g.clientHeight))),Oc(a,Math.max(0,Math.min(g.scrollLeft+d*_g,g.scrollWidth-g.clientWidth))),(!e||e&&i)&&Ja(b),void(f.wheelStartX=null);if(e&&null!=_g){var m=e*_g,n=a.doc.scrollTop,o=n+f.wrapper.clientHeight;m<0?n=Math.max(0,n+m-50):o=Math.min(a.doc.height,o+m+50),yd(a,{top:n,bottom:o})}$g<20&&(null==f.wheelStartX?(f.wheelStartX=g.scrollLeft,f.wheelStartY=g.scrollTop,f.wheelDX=d,f.wheelDY=e,setTimeout((function(){if(null!=f.wheelStartX){var a=g.scrollLeft-f.wheelStartX,b=g.scrollTop-f.wheelStartY,c=b&&f.wheelDY&&b/f.wheelDY||a&&f.wheelDX&&a/f.wheelDX;f.wheelStartX=f.wheelStartY=null,c&&(_g=(_g*$g+c)/($g+1),++$g)}}),200)):(f.wheelDX+=d,f.wheelDY+=e))}}function Sc(a){var b=a.display,c=b.gutters.offsetWidth,d=Math.round(a.doc.height+Ob(a.display));return{clientHeight:b.scroller.clientHeight,viewHeight:b.wrapper.clientHeight,scrollWidth:b.scroller.scrollWidth,clientWidth:b.scroller.clientWidth,viewWidth:b.wrapper.clientWidth,barLeft:a.options.fixedGutter?c:0,docHeight:d,scrollHeight:d+Qb(a)+b.barHeight,nativeBarWidth:b.nativeBarWidth,gutterWidth:c}}function Tc(a,b){b||(b=Sc(a));var c=a.display.barWidth,d=a.display.barHeight;Uc(a,b);for(var e=0;e<4&&c!=a.display.barWidth||d!=a.display.barHeight;e++)c!=a.display.barWidth&&a.options.lineWrapping&&Kc(a),Uc(a,Sc(a)),c=a.display.barWidth,d=a.display.barHeight}function Uc(a,b){var c=a.display,d=c.scrollbars.update(b);c.sizer.style.paddingRight=(c.barWidth=d.right)+"px",c.sizer.style.paddingBottom=(c.barHeight=d.bottom)+"px",c.heightForcer.style.borderBottom=d.bottom+"px solid transparent",d.right&&d.bottom?(c.scrollbarFiller.style.display="block",c.scrollbarFiller.style.height=d.bottom+"px",c.scrollbarFiller.style.width=d.right+"px"):c.scrollbarFiller.style.display="",d.bottom&&a.options.coverGutterNextToScrollbar&&a.options.fixedGutter?(c.gutterFiller.style.display="block",c.gutterFiller.style.height=d.bottom+"px",c.gutterFiller.style.width=b.gutterWidth+"px"):c.gutterFiller.style.display=""}function Vc(a){a.display.scrollbars&&(a.display.scrollbars.clear(),a.display.scrollbars.addClass&&rg(a.display.wrapper,a.display.scrollbars.addClass)),a.display.scrollbars=new ch[a.options.scrollbarStyle](function(b){a.display.wrapper.insertBefore(b,a.display.scrollbarFiller),Jg(b,"mousedown",(function(){a.state.focused&&setTimeout((function(){return a.display.input.focus()}),0)})),b.setAttribute("cm-not-content","true")},function(b,c){"horizontal"==c?Oc(a,b):Nc(a,b)},a),a.display.scrollbars.addClass&&h(a.display.wrapper,a.display.scrollbars.addClass)}function Wc(a,b){if(!Fa(a,"scrollCursorIntoView")){var c=a.display,e=c.sizer.getBoundingClientRect(),f=null;if(b.top+e.top<0?f=!0:b.bottom+e.top>(window.innerHeight||document.documentElement.clientHeight)&&(f=!1),null!=f&&!gg){var g=d("div","​",null,"position: absolute;\n                         top: "+(b.top-c.viewOffset-Nb(a.display))+"px;\n                         height: "+(b.bottom-b.top+Qb(a)+c.barHeight)+"px;\n                         left: "+b.left+"px; width: "+Math.max(2,b.right-b.left)+"px;");a.display.lineSpace.appendChild(g),g.scrollIntoView(f),a.display.lineSpace.removeChild(g)}}}function Xc(a,b,c,d){null==d&&(d=0);for(var e,f=0;f<5;f++){var g=!1,h=kc(a,b),i=c&&c!=b?kc(a,c):h;e={left:Math.min(h.left,i.left),top:Math.min(h.top,i.top)-d,right:Math.max(h.left,i.left),bottom:Math.max(h.bottom,i.bottom)+d};var j=Zc(a,e),k=a.doc.scrollTop,l=a.doc.scrollLeft;if(null!=j.scrollTop&&(Nc(a,j.scrollTop),Math.abs(a.doc.scrollTop-k)>1&&(g=!0)),null!=j.scrollLeft&&(Oc(a,j.scrollLeft),Math.abs(a.doc.scrollLeft-l)>1&&(g=!0)),!g)break}return e}function Yc(a,b){var c=Zc(a,b);null!=c.scrollTop&&Nc(a,c.scrollTop),null!=c.scrollLeft&&Oc(a,c.scrollLeft)}function Zc(a,b){var c=a.display,d=rc(a.display);b.top<0&&(b.top=0);var e=a.curOp&&null!=a.curOp.scrollTop?a.curOp.scrollTop:c.scroller.scrollTop,f=Sb(a),g={};b.bottom-b.top>f&&(b.bottom=b.top+f);var h=a.doc.height+Ob(c),i=b.top<d,j=b.bottom>h-d;if(b.top<e)g.scrollTop=i?0:b.top;else if(b.bottom>e+f){var k=Math.min(b.top,(j?h:b.bottom)-f);k!=e&&(g.scrollTop=k)}var l=a.curOp&&null!=a.curOp.scrollLeft?a.curOp.scrollLeft:c.scroller.scrollLeft,m=Rb(a)-(a.options.fixedGutter?c.gutters.offsetWidth:0),n=b.right-b.left>m;return n&&(b.right=b.left+m),b.left<10?g.scrollLeft=0:b.left<l?g.scrollLeft=Math.max(0,b.left-(n?0:10)):b.right>m+l-3&&(g.scrollLeft=b.right+(n?0:10)-m),g}function $c(a,b,c){null==b&&null==c||ad(a),null!=b&&(a.curOp.scrollLeft=(null==a.curOp.scrollLeft?a.doc.scrollLeft:a.curOp.scrollLeft)+b),null!=c&&(a.curOp.scrollTop=(null==a.curOp.scrollTop?a.doc.scrollTop:a.curOp.scrollTop)+c)}function _c(a){ad(a);var b=a.getCursor(),c=b,d=b;a.options.lineWrapping||(c=b.ch?J(b.line,b.ch-1):b,d=J(b.line,b.ch+1)),a.curOp.scrollToPos={from:c,to:d,margin:a.options.cursorScrollMargin}}function ad(a){var b=a.curOp.scrollToPos;if(b){a.curOp.scrollToPos=null;var c=lc(a,b.from),d=lc(a,b.to),e=Zc(a,{left:Math.min(c.left,d.left),top:Math.min(c.top,d.top)-b.margin,right:Math.max(c.right,d.right),bottom:Math.max(c.bottom,d.bottom)+b.margin});a.scrollTo(e.scrollLeft,e.scrollTop)}}function bd(a){a.curOp={cm:a,viewChanged:!1,startHeight:a.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++dh},ub(a.curOp)}function cd(a){var b=a.curOp;wb(b,(function(a){for(var b=0;b<a.ops.length;b++)a.ops[b].cm.curOp=null;dd(a)}))}function dd(a){for(var b=a.ops,c=0;c<b.length;c++)ed(b[c]);for(var d=0;d<b.length;d++)fd(b[d]);for(var e=0;e<b.length;e++)gd(b[e]);for(var f=0;f<b.length;f++)hd(b[f]);for(var g=0;g<b.length;g++)id(b[g])}function ed(a){var b=a.cm,c=b.display;vd(b),a.updateMaxLine&&ua(b),a.mustUpdate=a.viewChanged||a.forceUpdate||null!=a.scrollTop||a.scrollToPos&&(a.scrollToPos.from.line<c.viewFrom||a.scrollToPos.to.line>=c.viewTo)||c.maxLineChanged&&b.options.lineWrapping,a.update=a.mustUpdate&&new eh(b,a.mustUpdate&&{top:a.scrollTop,ensure:a.scrollToPos},a.forceUpdate)}function fd(a){a.updatedDisplay=a.mustUpdate&&wd(a.cm,a.update)}function gd(a){var b=a.cm,c=b.display;a.updatedDisplay&&Kc(b),a.barMeasure=Sc(b),c.maxLineChanged&&!b.options.lineWrapping&&(a.adjustWidthTo=Wb(b,c.maxLine,c.maxLine.text.length).left+3,b.display.sizerWidth=a.adjustWidthTo,a.barMeasure.scrollWidth=Math.max(c.scroller.clientWidth,c.sizer.offsetLeft+a.adjustWidthTo+Qb(b)+b.display.barWidth),a.maxScrollLeft=Math.max(0,c.sizer.offsetLeft+a.adjustWidthTo-Rb(b))),(a.updatedDisplay||a.selectionChanged)&&(a.preparedSelection=c.input.prepareSelection(a.focus))}function hd(a){var b=a.cm;null!=a.adjustWidthTo&&(b.display.sizer.style.minWidth=a.adjustWidthTo+"px",a.maxScrollLeft<b.doc.scrollLeft&&Oc(b,Math.min(b.display.scroller.scrollLeft,a.maxScrollLeft),!0),b.display.maxLineChanged=!1);var c=a.focus&&a.focus==g()&&(!document.hasFocus||document.hasFocus());a.preparedSelection&&b.display.input.showSelection(a.preparedSelection,c),(a.updatedDisplay||a.startHeight!=b.doc.height)&&Tc(b,a.barMeasure),a.updatedDisplay&&Bd(b,a.barMeasure),a.selectionChanged&&Dc(b),b.state.focused&&a.updateInput&&b.display.input.reset(a.typing),c&&Ec(a.cm)}function id(a){var b=a.cm,c=b.display,d=b.doc;if(a.updatedDisplay&&xd(b,a.update),null==c.wheelStartX||null==a.scrollTop&&null==a.scrollLeft&&!a.scrollToPos||(c.wheelStartX=c.wheelStartY=null),null==a.scrollTop||c.scroller.scrollTop==a.scrollTop&&!a.forceScroll||(d.scrollTop=Math.max(0,Math.min(c.scroller.scrollHeight-c.scroller.clientHeight,a.scrollTop)),c.scrollbars.setScrollTop(d.scrollTop),c.scroller.scrollTop=d.scrollTop),null==a.scrollLeft||c.scroller.scrollLeft==a.scrollLeft&&!a.forceScroll||(d.scrollLeft=Math.max(0,Math.min(c.scroller.scrollWidth-c.scroller.clientWidth,a.scrollLeft)),c.scrollbars.setScrollLeft(d.scrollLeft),c.scroller.scrollLeft=d.scrollLeft,Ic(b)),a.scrollToPos){var e=Xc(b,Q(d,a.scrollToPos.from),Q(d,a.scrollToPos.to),a.scrollToPos.margin);Wc(b,e)}var f=a.maybeHiddenMarkers,g=a.maybeUnhiddenMarkers;if(f)for(var h=0;h<f.length;++h)f[h].lines.length||Ea(f[h],"hide");if(g)for(var i=0;i<g.length;++i)g[i].lines.length&&Ea(g[i],"unhide");c.wrapper.offsetHeight&&(d.scrollTop=b.display.scroller.scrollTop),a.changeObjs&&Ea(b,"changes",b,a.changeObjs),a.update&&a.update.finish()}function jd(a,b){if(a.curOp)return b();bd(a);try{return b()}finally{cd(a)}}function kd(a,b){return function(){if(a.curOp)return b.apply(a,arguments);bd(a);try{return b.apply(a,arguments)}finally{cd(a)}}}function ld(a){return function(){if(this.curOp)return a.apply(this,arguments);bd(this);try{return a.apply(this,arguments)}finally{cd(this)}}}function md(a){return function(){var b=this.cm;if(!b||b.curOp)return a.apply(this,arguments);bd(b);try{return a.apply(this,arguments)}finally{cd(b)}}}function nd(a,b,c,d){null==b&&(b=a.doc.first),null==c&&(c=a.doc.first+a.doc.size),d||(d=0);var e=a.display;if(d&&c<e.viewTo&&(null==e.updateLineNumbers||e.updateLineNumbers>b)&&(e.updateLineNumbers=b),a.curOp.viewChanged=!0,b>=e.viewTo)Fg&&oa(a.doc,b)<e.viewTo&&pd(a);else if(c<=e.viewFrom)Fg&&pa(a.doc,c+d)>e.viewFrom?pd(a):(e.viewFrom+=d,e.viewTo+=d);else if(b<=e.viewFrom&&c>=e.viewTo)pd(a);else if(b<=e.viewFrom){var f=qd(a,c,c+d,1);f?(e.view=e.view.slice(f.index),e.viewFrom=f.lineN,e.viewTo+=d):pd(a)}else if(c>=e.viewTo){var g=qd(a,b,b,-1);g?(e.view=e.view.slice(0,g.index),e.viewTo=g.lineN):pd(a)}else{var h=qd(a,b,b,-1),i=qd(a,c,c+d,1);h&&i?(e.view=e.view.slice(0,h.index).concat(tb(a,h.lineN,i.lineN)).concat(e.view.slice(i.index)),e.viewTo+=d):pd(a)}var j=e.externalMeasured;j&&(c<j.lineN?j.lineN+=d:b<j.lineN+j.size&&(e.externalMeasured=null))}function od(a,b,c){a.curOp.viewChanged=!0;var d=a.display,e=a.display.externalMeasured;if(e&&b>=e.lineN&&b<e.lineN+e.size&&(d.externalMeasured=null),!(b<d.viewFrom||b>=d.viewTo)){var f=d.view[yc(a,b)];if(null!=f.node){var g=f.changes||(f.changes=[]);m(g,c)==-1&&g.push(c)}}}function pd(a){a.display.viewFrom=a.display.viewTo=a.doc.first,a.display.view=[],a.display.viewOffset=0}function qd(a,b,c,d){var e,f=yc(a,b),g=a.display.view;if(!Fg||c==a.doc.first+a.doc.size)return{index:f,lineN:c};for(var h=a.display.viewFrom,i=0;i<f;i++)h+=g[i].size;if(h!=b){if(d>0){if(f==g.length-1)return null;e=h+g[f].size-b,f++}else e=h-b;b+=e,c+=e}for(;oa(a.doc,c)!=c;){if(f==(d<0?0:g.length-1))return null;c+=d*g[f-(d<0?1:0)].size,f+=d}return{index:f,lineN:c}}function rd(a,b,c){var d=a.display,e=d.view;0==e.length||b>=d.viewTo||c<=d.viewFrom?(d.view=tb(a,b,c),d.viewFrom=b):(d.viewFrom>b?d.view=tb(a,b,d.viewFrom).concat(d.view):d.viewFrom<b&&(d.view=d.view.slice(yc(a,b))),d.viewFrom=b,d.viewTo<c?d.view=d.view.concat(tb(a,d.viewTo,c)):d.viewTo>c&&(d.view=d.view.slice(0,yc(a,c)))),d.viewTo=c}function sd(a){for(var b=a.display.view,c=0,d=0;d<b.length;d++){var e=b[d];e.hidden||e.node&&!e.changes||++c}return c}function td(a,b){a.doc.mode.startState&&a.doc.frontier<a.display.viewTo&&a.state.highlight.set(b,j(ud,a))}function ud(a){var b=a.doc;if(b.frontier<b.first&&(b.frontier=b.first),!(b.frontier>=a.display.viewTo)){var c=+new Date+a.options.workTime,d=Xa(b.mode,ab(a,b.frontier)),e=[];b.iter(b.frontier,Math.min(b.first+b.size,a.display.viewTo+500),(function(f){if(b.frontier>=a.display.viewFrom){var g=f.styles,h=f.text.length>a.options.maxHighlightLength,i=$a(a,f,h?Xa(b.mode,d):d,!0);f.styles=i.styles;var j=f.styleClasses,k=i.classes;k?f.styleClasses=k:j&&(f.styleClasses=null);for(var l=!g||g.length!=f.styles.length||j!=k&&(!j||!k||j.bgClass!=k.bgClass||j.textClass!=k.textClass),m=0;!l&&m<g.length;++m)l=g[m]!=f.styles[m];l&&e.push(b.frontier),f.stateAfter=h?d:Xa(b.mode,d)}else f.text.length<=a.options.maxHighlightLength&&bb(a,f.text,d),f.stateAfter=b.frontier%5==0?Xa(b.mode,d):null;if(++b.frontier,+new Date>c)return td(a,a.options.workDelay),!0})),e.length&&jd(a,(function(){for(var b=0;b<e.length;b++)od(a,e[b],"text")}))}}function vd(a){var b=a.display;!b.scrollbarsClipped&&b.scroller.offsetWidth&&(b.nativeBarWidth=b.scroller.offsetWidth-b.scroller.clientWidth,b.heightForcer.style.height=Qb(a)+"px",b.sizer.style.marginBottom=-b.nativeBarWidth+"px",b.sizer.style.borderRightWidth=Qb(a)+"px",b.scrollbarsClipped=!0)}function wd(a,c){var d=a.display,e=a.doc;if(c.editorIsHidden)return pd(a),!1;if(!c.force&&c.visible.from>=d.viewFrom&&c.visible.to<=d.viewTo&&(null==d.updateLineNumbers||d.updateLineNumbers>=d.viewTo)&&d.renderedView==d.view&&0==sd(a))return!1;Jc(a)&&(pd(a),c.dims=tc(a));var f=e.first+e.size,h=Math.max(c.visible.from-a.options.viewportMargin,e.first),i=Math.min(f,c.visible.to+a.options.viewportMargin);d.viewFrom<h&&h-d.viewFrom<20&&(h=Math.max(e.first,d.viewFrom)),d.viewTo>i&&d.viewTo-i<20&&(i=Math.min(f,d.viewTo)),Fg&&(h=oa(a.doc,h),i=pa(a.doc,i));var j=h!=d.viewFrom||i!=d.viewTo||d.lastWrapHeight!=c.wrapperHeight||d.lastWrapWidth!=c.wrapperWidth;rd(a,h,i),d.viewOffset=sa(B(a.doc,d.viewFrom)),a.display.mover.style.top=d.viewOffset+"px";var k=sd(a);if(!j&&0==k&&!c.force&&d.renderedView==d.view&&(null==d.updateLineNumbers||d.updateLineNumbers>=d.viewTo))return!1;var l=g();return k>4&&(d.lineDiv.style.display="none"),zd(a,d.updateLineNumbers,c.dims),k>4&&(d.lineDiv.style.display=""),d.renderedView=d.view,l&&g()!=l&&l.offsetHeight&&l.focus(),b(d.cursorDiv),b(d.selectionDiv),d.gutters.style.height=d.sizer.style.minHeight=0,j&&(d.lastWrapHeight=c.wrapperHeight,d.lastWrapWidth=c.wrapperWidth,td(a,400)),d.updateLineNumbers=null,!0}function xd(a,b){for(var c=b.viewport,d=!0;(d&&a.options.lineWrapping&&b.oldDisplayWidth!=Rb(a)||(c&&null!=c.top&&(c={top:Math.min(a.doc.height+Ob(a.display)-Sb(a),c.top)}),b.visible=Mc(a.display,a.doc,c),!(b.visible.from>=a.display.viewFrom&&b.visible.to<=a.display.viewTo)))&&wd(a,b);d=!1){Kc(a);var e=Sc(a);zc(a),Tc(a,e),Bd(a,e)}b.signal(a,"update",a),a.display.viewFrom==a.display.reportedViewFrom&&a.display.viewTo==a.display.reportedViewTo||(b.signal(a,"viewportChange",a,a.display.viewFrom,a.display.viewTo),a.display.reportedViewFrom=a.display.viewFrom,a.display.reportedViewTo=a.display.viewTo)}function yd(a,b){var c=new eh(a,b);if(wd(a,c)){Kc(a),xd(a,c);var d=Sc(a);zc(a),Tc(a,d),Bd(a,d),c.finish()}}function zd(a,c,d){function e(b){var c=b.nextSibling;return ag&&kg&&a.display.currentWheelTarget==b?b.style.display="none":b.parentNode.removeChild(b),c}for(var f=a.display,g=a.options.lineNumbers,h=f.lineDiv,i=h.firstChild,j=f.view,k=f.viewFrom,l=0;l<j.length;l++){var n=j[l];if(n.hidden);else if(n.node&&n.node.parentNode==h){for(;i!=n.node;)i=e(i);var o=g&&null!=c&&c<=k&&n.lineNumber;n.changes&&(m(n.changes,"gutter")>-1&&(o=!1),zb(a,n,k,d)),o&&(b(n.lineNumber),n.lineNumber.appendChild(document.createTextNode(I(a.options,k)))),i=n.node.nextSibling}else{var p=Hb(a,n,k,d);h.insertBefore(p,i)}k+=n.size}for(;i;)i=e(i)}function Ad(a){var b=a.display.gutters.offsetWidth;a.display.sizer.style.marginLeft=b+"px"}function Bd(a,b){a.display.sizer.style.minHeight=b.docHeight+"px",a.display.heightForcer.style.top=b.docHeight+"px",a.display.gutters.style.height=b.docHeight+a.display.barHeight+Qb(a)+"px"}function Cd(a){var c=a.display.gutters,e=a.options.gutters;b(c);for(var f=0;f<e.length;++f){var g=e[f],h=c.appendChild(d("div",null,"CodeMirror-gutter "+g));"CodeMirror-linenumbers"==g&&(a.display.lineGutter=h,h.style.width=(a.display.lineNumWidth||1)+"px")}c.style.display=f?"":"none",Ad(a)}function Dd(a){var b=m(a.gutters,"CodeMirror-linenumbers");b==-1&&a.lineNumbers?a.gutters=a.gutters.concat(["CodeMirror-linenumbers"]):b>-1&&!a.lineNumbers&&(a.gutters=a.gutters.slice(0),a.gutters.splice(b,1))}function Ed(a,b){var c=a[b];a.sort((function(a,b){return K(a.from(),b.from())})),b=m(a,c);for(var d=1;d<a.length;d++){var e=a[d],f=a[d-1];if(K(f.to(),e.from())>=0){var g=O(f.from(),e.from()),h=N(f.to(),e.to()),i=f.empty()?e.from()==e.head:f.from()==f.head;d<=b&&--b,a.splice(--d,2,new gh(i?h:g,i?g:h))}}return new fh(a,b)}function Fd(a,b){return new fh([new gh(a,b||a)],0)}function Gd(a){return a.text?J(a.from.line+a.text.length-1,p(a.text).length+(1==a.text.length?a.from.ch:0)):a.to}function Hd(a,b){if(K(a,b.from)<0)return a;if(K(a,b.to)<=0)return Gd(b);var c=a.line+b.text.length-(b.to.line-b.from.line)-1,d=a.ch;return a.line==b.to.line&&(d+=Gd(b).ch-b.to.ch),J(c,d)}function Id(a,b){for(var c=[],d=0;d<a.sel.ranges.length;d++){var e=a.sel.ranges[d];c.push(new gh(Hd(e.anchor,b),Hd(e.head,b)))}return Ed(c,a.sel.primIndex)}function Jd(a,b,c){return a.line==b.line?J(c.line,a.ch-b.ch+c.ch):J(c.line+(a.line-b.line),a.ch)}function Kd(a,b,c){for(var d=[],e=J(a.first,0),f=e,g=0;g<b.length;g++){var h=b[g],i=Jd(h.from,e,f),j=Jd(Gd(h),e,f);if(e=h.to,f=j,"around"==c){var k=a.sel.ranges[g],l=K(k.head,k.anchor)<0;d[g]=new gh(l?j:i,l?i:j)}else d[g]=new gh(i,i)}return new fh(d,a.sel.primIndex)}function Ld(a){a.doc.mode=Va(a.options,a.doc.modeOption),Md(a)}function Md(a){a.doc.iter((function(a){a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null)})),a.doc.frontier=a.doc.first,td(a,100),a.state.modeGen++,a.curOp&&nd(a)}function Nd(a,b){return 0==b.from.ch&&0==b.to.ch&&""==p(b.text)&&(!a.cm||a.cm.options.wholeLineUpdateBefore)}function Od(a,b,c,d){function e(a){return c?c[a]:null}function f(a,c,e){ib(a,c,e,d),xb(a,"change",a,b)}function g(a,b){for(var c=[],f=a;f<b;++f)c.push(new Tg(j[f],e(f),d));return c}var h=b.from,i=b.to,j=b.text,k=B(a,h.line),l=B(a,i.line),m=p(j),n=e(j.length-1),o=i.line-h.line;if(b.full)a.insert(0,g(0,j.length)),
-a.remove(j.length,a.size-j.length);else if(Nd(a,b)){var q=g(0,j.length-1);f(l,l.text,n),o&&a.remove(h.line,o),q.length&&a.insert(h.line,q)}else if(k==l)if(1==j.length)f(k,k.text.slice(0,h.ch)+m+k.text.slice(i.ch),n);else{var r=g(1,j.length-1);r.push(new Tg(m+k.text.slice(i.ch),n,d)),f(k,k.text.slice(0,h.ch)+j[0],e(0)),a.insert(h.line+1,r)}else if(1==j.length)f(k,k.text.slice(0,h.ch)+j[0]+l.text.slice(i.ch),e(0)),a.remove(h.line+1,o);else{f(k,k.text.slice(0,h.ch)+j[0],e(0)),f(l,m+l.text.slice(i.ch),n);var s=g(1,j.length-1);o>1&&a.remove(h.line+1,o-1),a.insert(h.line+1,s)}xb(a,"change",a,b)}function Pd(a,b,c){function d(a,e,f){if(a.linked)for(var g=0;g<a.linked.length;++g){var h=a.linked[g];if(h.doc!=e){var i=f&&h.sharedHist;c&&!i||(b(h.doc,i),d(h.doc,a,i))}}}d(a,null,!0)}function Qd(a,b){if(b.cm)throw new Error("This document is already in use.");a.doc=b,b.cm=a,wc(a),Ld(a),Rd(a),a.options.lineWrapping||ua(a),a.options.mode=b.modeOption,nd(a)}function Rd(a){("rtl"==a.doc.direction?h:rg)(a.display.lineDiv,"CodeMirror-rtl")}function Sd(a){jd(a,(function(){Rd(a),nd(a)}))}function Td(a){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=a||1}function Ud(a,b){var c={from:M(b.from),to:Gd(b),text:C(a,b.from,b.to)};return _d(a,c,b.from.line,b.to.line+1),Pd(a,(function(a){return _d(a,c,b.from.line,b.to.line+1)}),!0),c}function Vd(a){for(;a.length;){var b=p(a);if(!b.ranges)break;a.pop()}}function Wd(a,b){return b?(Vd(a.done),p(a.done)):a.done.length&&!p(a.done).ranges?p(a.done):a.done.length>1&&!a.done[a.done.length-2].ranges?(a.done.pop(),p(a.done)):void 0}function Xd(a,b,c,d){var e=a.history;e.undone.length=0;var f,g,h=+new Date;if((e.lastOp==d||e.lastOrigin==b.origin&&b.origin&&("+"==b.origin.charAt(0)&&a.cm&&e.lastModTime>h-a.cm.options.historyEventDelay||"*"==b.origin.charAt(0)))&&(f=Wd(e,e.lastOp==d)))g=p(f.changes),0==K(b.from,b.to)&&0==K(b.from,g.to)?g.to=Gd(b):f.changes.push(Ud(a,b));else{var i=p(e.done);for(i&&i.ranges||$d(a.sel,e.done),f={changes:[Ud(a,b)],generation:e.generation},e.done.push(f);e.done.length>e.undoDepth;)e.done.shift(),e.done[0].ranges||e.done.shift()}e.done.push(c),e.generation=++e.maxGeneration,e.lastModTime=e.lastSelTime=h,e.lastOp=e.lastSelOp=d,e.lastOrigin=e.lastSelOrigin=b.origin,g||Ea(a,"historyAdded")}function Yd(a,b,c,d){var e=b.charAt(0);return"*"==e||"+"==e&&c.ranges.length==d.ranges.length&&c.somethingSelected()==d.somethingSelected()&&new Date-a.history.lastSelTime<=(a.cm?a.cm.options.historyEventDelay:500)}function Zd(a,b,c,d){var e=a.history,f=d&&d.origin;c==e.lastSelOp||f&&e.lastSelOrigin==f&&(e.lastModTime==e.lastSelTime&&e.lastOrigin==f||Yd(a,f,p(e.done),b))?e.done[e.done.length-1]=b:$d(b,e.done),e.lastSelTime=+new Date,e.lastSelOrigin=f,e.lastSelOp=c,d&&d.clearRedo!==!1&&Vd(e.undone)}function $d(a,b){var c=p(b);c&&c.ranges&&c.equals(a)||b.push(a)}function _d(a,b,c,d){var e=b["spans_"+a.id],f=0;a.iter(Math.max(a.first,c),Math.min(a.first+a.size,d),(function(c){c.markedSpans&&((e||(e=b["spans_"+a.id]={}))[f]=c.markedSpans),++f}))}function ae(a){if(!a)return null;for(var b,c=0;c<a.length;++c)a[c].marker.explicitlyCleared?b||(b=a.slice(0,c)):b&&b.push(a[c]);return b?b.length?b:null:a}function be(a,b){var c=b["spans_"+a.id];if(!c)return null;for(var d=[],e=0;e<b.text.length;++e)d.push(ae(c[e]));return d}function ce(a,b){var c=be(a,b),d=_(a,b);if(!c)return d;if(!d)return c;for(var e=0;e<c.length;++e){var f=c[e],g=d[e];if(f&&g)a:for(var h=0;h<g.length;++h){for(var i=g[h],j=0;j<f.length;++j)if(f[j].marker==i.marker)continue a;f.push(i)}else g&&(c[e]=g)}return c}function de(a,b,c){for(var d=[],e=0;e<a.length;++e){var f=a[e];if(f.ranges)d.push(c?fh.prototype.deepCopy.call(f):f);else{var g=f.changes,h=[];d.push({changes:h});for(var i=0;i<g.length;++i){var j=g[i],k=void 0;if(h.push({from:j.from,to:j.to,text:j.text}),b)for(var l in j)(k=l.match(/^spans_(\d+)$/))&&m(b,Number(k[1]))>-1&&(p(h)[l]=j[l],delete j[l])}}}return d}function ee(a,b,c,d){if(a.cm&&a.cm.display.shift||a.extend){var e=b.anchor;if(d){var f=K(c,e)<0;f!=K(d,e)<0?(e=c,c=d):f!=K(c,d)<0&&(c=d)}return new gh(e,c)}return new gh(d||c,c)}function fe(a,b,c,d){le(a,new fh([ee(a,a.sel.primary(),b,c)],0),d)}function ge(a,b,c){for(var d=[],e=0;e<a.sel.ranges.length;e++)d[e]=ee(a,a.sel.ranges[e],b[e],null);var f=Ed(d,a.sel.primIndex);le(a,f,c)}function he(a,b,c,d){var e=a.sel.ranges.slice(0);e[b]=c,le(a,Ed(e,a.sel.primIndex),d)}function ie(a,b,c,d){le(a,Fd(b,c),d)}function je(a,b,c){var d={ranges:b.ranges,update:function(b){var c=this;this.ranges=[];for(var d=0;d<b.length;d++)c.ranges[d]=new gh(Q(a,b[d].anchor),Q(a,b[d].head))},origin:c&&c.origin};return Ea(a,"beforeSelectionChange",a,d),a.cm&&Ea(a.cm,"beforeSelectionChange",a.cm,d),d.ranges!=b.ranges?Ed(d.ranges,d.ranges.length-1):b}function ke(a,b,c){var d=a.history.done,e=p(d);e&&e.ranges?(d[d.length-1]=b,me(a,b,c)):le(a,b,c)}function le(a,b,c){me(a,b,c),Zd(a,a.sel,a.cm?a.cm.curOp.id:NaN,c)}function me(a,b,c){(Ha(a,"beforeSelectionChange")||a.cm&&Ha(a.cm,"beforeSelectionChange"))&&(b=je(a,b,c));var d=c&&c.bias||(K(b.primary().head,a.sel.primary().head)<0?-1:1);ne(a,pe(a,b,d,!0)),c&&c.scroll===!1||!a.cm||_c(a.cm)}function ne(a,b){b.equals(a.sel)||(a.sel=b,a.cm&&(a.cm.curOp.updateInput=a.cm.curOp.selectionChanged=!0,Ga(a.cm)),xb(a,"cursorActivity",a))}function oe(a){ne(a,pe(a,a.sel,null,!1),yg)}function pe(a,b,c,d){for(var e,f=0;f<b.ranges.length;f++){var g=b.ranges[f],h=b.ranges.length==a.sel.ranges.length&&a.sel.ranges[f],i=re(a,g.anchor,h&&h.anchor,c,d),j=re(a,g.head,h&&h.head,c,d);(e||i!=g.anchor||j!=g.head)&&(e||(e=b.ranges.slice(0,f)),e[f]=new gh(i,j))}return e?Ed(e,b.primIndex):b}function qe(a,b,c,d,e){var f=B(a,b.line);if(f.markedSpans)for(var g=0;g<f.markedSpans.length;++g){var h=f.markedSpans[g],i=h.marker;if((null==h.from||(i.inclusiveLeft?h.from<=b.ch:h.from<b.ch))&&(null==h.to||(i.inclusiveRight?h.to>=b.ch:h.to>b.ch))){if(e&&(Ea(i,"beforeCursorEnter"),i.explicitlyCleared)){if(f.markedSpans){--g;continue}break}if(!i.atomic)continue;if(c){var j=i.find(d<0?1:-1),k=void 0;if((d<0?i.inclusiveRight:i.inclusiveLeft)&&(j=se(a,j,-d,j&&j.line==b.line?f:null)),j&&j.line==b.line&&(k=K(j,c))&&(d<0?k<0:k>0))return qe(a,j,b,d,e)}var l=i.find(d<0?-1:1);return(d<0?i.inclusiveLeft:i.inclusiveRight)&&(l=se(a,l,d,l.line==b.line?f:null)),l?qe(a,l,b,d,e):null}}return b}function re(a,b,c,d,e){var f=d||1,g=qe(a,b,c,f,e)||!e&&qe(a,b,c,f,!0)||qe(a,b,c,-f,e)||!e&&qe(a,b,c,-f,!0);return g?g:(a.cantEdit=!0,J(a.first,0))}function se(a,b,c,d){return c<0&&0==b.ch?b.line>a.first?Q(a,J(b.line-1)):null:c>0&&b.ch==(d||B(a,b.line)).text.length?b.line<a.first+a.size-1?J(b.line+1,0):null:new J(b.line,b.ch+c)}function te(a){a.setSelection(J(a.firstLine(),0),J(a.lastLine()),yg)}function ue(a,b,c){var d={canceled:!1,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){return d.canceled=!0}};return c&&(d.update=function(b,c,e,f){b&&(d.from=Q(a,b)),c&&(d.to=Q(a,c)),e&&(d.text=e),void 0!==f&&(d.origin=f)}),Ea(a,"beforeChange",a,d),a.cm&&Ea(a.cm,"beforeChange",a.cm,d),d.canceled?null:{from:d.from,to:d.to,text:d.text,origin:d.origin}}function ve(a,b,c){if(a.cm){if(!a.cm.curOp)return kd(a.cm,ve)(a,b,c);if(a.cm.state.suppressEdits)return}if(!(Ha(a,"beforeChange")||a.cm&&Ha(a.cm,"beforeChange"))||(b=ue(a,b,!0))){var d=Eg&&!c&&ba(a,b.from,b.to);if(d)for(var e=d.length-1;e>=0;--e)we(a,{from:d[e].from,to:d[e].to,text:e?[""]:b.text});else we(a,b)}}function we(a,b){if(1!=b.text.length||""!=b.text[0]||0!=K(b.from,b.to)){var c=Id(a,b);Xd(a,b,c,a.cm?a.cm.curOp.id:NaN),ze(a,b,c,_(a,b));var d=[];Pd(a,(function(a,c){c||m(d,a.history)!=-1||(Ee(a.history,b),d.push(a.history)),ze(a,b,null,_(a,b))}))}}function xe(a,b,c){if(!a.cm||!a.cm.state.suppressEdits||c){for(var d,e=a.history,f=a.sel,g="undo"==b?e.done:e.undone,h="undo"==b?e.undone:e.done,i=0;i<g.length&&(d=g[i],c?!d.ranges||d.equals(a.sel):d.ranges);i++);if(i!=g.length){for(e.lastOrigin=e.lastSelOrigin=null;d=g.pop(),d.ranges;){if($d(d,h),c&&!d.equals(a.sel))return void le(a,d,{clearRedo:!1});f=d}var j=[];$d(f,h),h.push({changes:j,generation:e.generation}),e.generation=d.generation||++e.maxGeneration;for(var k=Ha(a,"beforeChange")||a.cm&&Ha(a.cm,"beforeChange"),l=function(c){var e=d.changes[c];if(e.origin=b,k&&!ue(a,e,!1))return g.length=0,{};j.push(Ud(a,e));var f=c?Id(a,e):p(g);ze(a,e,f,ce(a,e)),!c&&a.cm&&a.cm.scrollIntoView({from:e.from,to:Gd(e)});var h=[];Pd(a,(function(a,b){b||m(h,a.history)!=-1||(Ee(a.history,e),h.push(a.history)),ze(a,e,null,ce(a,e))}))},n=d.changes.length-1;n>=0;--n){var o=l(n);if(o)return o.v}}}}function ye(a,b){if(0!=b&&(a.first+=b,a.sel=new fh(q(a.sel.ranges,(function(a){return new gh(J(a.anchor.line+b,a.anchor.ch),J(a.head.line+b,a.head.ch))})),a.sel.primIndex),a.cm)){nd(a.cm,a.first,a.first-b,b);for(var c=a.cm.display,d=c.viewFrom;d<c.viewTo;d++)od(a.cm,d,"gutter")}}function ze(a,b,c,d){if(a.cm&&!a.cm.curOp)return kd(a.cm,ze)(a,b,c,d);if(b.to.line<a.first)return void ye(a,b.text.length-1-(b.to.line-b.from.line));if(!(b.from.line>a.lastLine())){if(b.from.line<a.first){var e=b.text.length-1-(a.first-b.from.line);ye(a,e),b={from:J(a.first,0),to:J(b.to.line+e,b.to.ch),text:[p(b.text)],origin:b.origin}}var f=a.lastLine();b.to.line>f&&(b={from:b.from,to:J(f,B(a,f).text.length),text:[b.text[0]],origin:b.origin}),b.removed=C(a,b.from,b.to),c||(c=Id(a,b)),a.cm?Ae(a.cm,b,d):Od(a,b,d),me(a,c,yg)}}function Ae(a,b,c){var d=a.doc,e=a.display,f=b.from,g=b.to,h=!1,i=f.line;a.options.lineWrapping||(i=F(la(B(d,f.line))),d.iter(i,g.line+1,(function(a){if(a==e.maxLine)return h=!0,!0}))),d.sel.contains(b.from,b.to)>-1&&Ga(a),Od(d,b,c,vc(a)),a.options.lineWrapping||(d.iter(i,f.line+b.text.length,(function(a){var b=ta(a);b>e.maxLineLength&&(e.maxLine=a,e.maxLineLength=b,e.maxLineChanged=!0,h=!1)})),h&&(a.curOp.updateMaxLine=!0)),d.frontier=Math.min(d.frontier,f.line),td(a,400);var j=b.text.length-(g.line-f.line)-1;b.full?nd(a):f.line!=g.line||1!=b.text.length||Nd(a.doc,b)?nd(a,f.line,g.line+1,j):od(a,f.line,"text");var k=Ha(a,"changes"),l=Ha(a,"change");if(l||k){var m={from:f,to:g,text:b.text,removed:b.removed,origin:b.origin};l&&xb(a,"change",a,m),k&&(a.curOp.changeObjs||(a.curOp.changeObjs=[])).push(m)}a.display.selForContextMenu=null}function Be(a,b,c,d,e){if(d||(d=c),K(d,c)<0){var f=d;d=c,c=f}"string"==typeof b&&(b=a.splitLines(b)),ve(a,{from:c,to:d,text:b,origin:e})}function Ce(a,b,c,d){c<a.line?a.line+=d:b<a.line&&(a.line=b,a.ch=0)}function De(a,b,c,d){for(var e=0;e<a.length;++e){var f=a[e],g=!0;if(f.ranges){f.copied||(f=a[e]=f.deepCopy(),f.copied=!0);for(var h=0;h<f.ranges.length;h++)Ce(f.ranges[h].anchor,b,c,d),Ce(f.ranges[h].head,b,c,d)}else{for(var i=0;i<f.changes.length;++i){var j=f.changes[i];if(c<j.from.line)j.from=J(j.from.line+d,j.from.ch),j.to=J(j.to.line+d,j.to.ch);else if(b<=j.to.line){g=!1;break}}g||(a.splice(0,e+1),e=0)}}}function Ee(a,b){var c=b.from.line,d=b.to.line,e=b.text.length-(d-c)-1;De(a.done,c,d,e),De(a.undone,c,d,e)}function Fe(a,b,c,d){var e=b,f=b;return"number"==typeof b?f=B(a,P(a,b)):e=F(b),null==e?null:(d(f,e)&&a.cm&&od(a.cm,e,c),f)}function Ge(a,b,c){sa(b)<(a.curOp&&a.curOp.scrollTop||a.doc.scrollTop)&&$c(a,null,c)}function He(a,b,c,d){var e=new jh(a,c,d),f=a.cm;return f&&e.noHScroll&&(f.display.alignWidgets=!0),Fe(a,b,"widget",(function(b){var c=b.widgets||(b.widgets=[]);if(null==e.insertAt?c.push(e):c.splice(Math.min(c.length-1,Math.max(0,e.insertAt)),0,e),e.line=b,f&&!qa(a,b)){var d=sa(b)<a.scrollTop;E(b,b.height+Lb(e)),d&&$c(f,null,e.height),f.curOp.forceUpdate=!0}return!0})),xb(f,"lineWidgetAdded",f,e,"number"==typeof b?b:F(b)),e}function Ie(a,b,c,d,f){if(d&&d.shared)return Je(a,b,c,d,f);if(a.cm&&!a.cm.curOp)return kd(a.cm,Ie)(a,b,c,d,f);var g=new lh(a,f),h=K(b,c);if(d&&k(d,g,!1),h>0||0==h&&g.clearWhenEmpty!==!1)return g;if(g.replacedWith&&(g.collapsed=!0,g.widgetNode=e("span",[g.replacedWith],"CodeMirror-widget"),d.handleMouseEvents||g.widgetNode.setAttribute("cm-ignore-events","true"),d.insertLeft&&(g.widgetNode.insertLeft=!0)),g.collapsed){if(ka(a,b.line,b,c,g)||b.line!=c.line&&ka(a,c.line,b,c,g))throw new Error("Inserting collapsed marker partially overlapping an existing one");U()}g.addToHistory&&Xd(a,{from:b,to:c,origin:"markText"},a.sel,NaN);var i,j=b.line,l=a.cm;if(a.iter(j,c.line+1,(function(a){l&&g.collapsed&&!l.options.lineWrapping&&la(a)==l.display.maxLine&&(i=!0),g.collapsed&&j!=b.line&&E(a,0),Y(a,new V(g,j==b.line?b.ch:null,j==c.line?c.ch:null)),++j})),g.collapsed&&a.iter(b.line,c.line+1,(function(b){qa(a,b)&&E(b,0)})),g.clearOnEnter&&Jg(g,"beforeCursorEnter",(function(){return g.clear()})),g.readOnly&&(T(),(a.history.done.length||a.history.undone.length)&&a.clearHistory()),g.collapsed&&(g.id=++kh,g.atomic=!0),l){if(i&&(l.curOp.updateMaxLine=!0),g.collapsed)nd(l,b.line,c.line+1);else if(g.className||g.title||g.startStyle||g.endStyle||g.css)for(var m=b.line;m<=c.line;m++)od(l,m,"text");g.atomic&&oe(l.doc),xb(l,"markerAdded",l,g)}return g}function Je(a,b,c,d,e){d=k(d),d.shared=!1;var f=[Ie(a,b,c,d,e)],g=f[0],h=d.widgetNode;return Pd(a,(function(a){h&&(d.widgetNode=h.cloneNode(!0)),f.push(Ie(a,Q(a,b),Q(a,c),d,e));for(var i=0;i<a.linked.length;++i)if(a.linked[i].isParent)return;g=p(f)})),new mh(f,g)}function Ke(a){return a.findMarks(J(a.first,0),a.clipPos(J(a.lastLine())),(function(a){return a.parent}))}function Le(a,b){for(var c=0;c<b.length;c++){var d=b[c],e=d.find(),f=a.clipPos(e.from),g=a.clipPos(e.to);if(K(f,g)){var h=Ie(a,f,g,d.primary,d.primary.type);d.markers.push(h),h.parent=d}}}function Me(a){for(var b=function(b){var c=a[b],d=[c.primary.doc];Pd(c.primary.doc,(function(a){return d.push(a)}));for(var e=0;e<c.markers.length;e++){var f=c.markers[e];m(d,f.doc)==-1&&(f.parent=null,c.markers.splice(e--,1))}},c=0;c<a.length;c++)b(c)}function Ne(a){var b=this;if(Qe(b),!Fa(b,a)&&!Mb(b.display,a)){Ja(a),$f&&(ph=+new Date);var c=xc(b,a,!0),d=a.dataTransfer.files;if(c&&!b.isReadOnly())if(d&&d.length&&window.FileReader&&window.File)for(var e=d.length,f=Array(e),g=0,h=function(a,d){if(!b.options.allowDropFileTypes||m(b.options.allowDropFileTypes,a.type)!=-1){var h=new FileReader;h.onload=kd(b,(function(){var a=h.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(a)&&(a=""),f[d]=a,++g==e){c=Q(b.doc,c);var i={from:c,to:c,text:b.doc.splitLines(f.join(b.doc.lineSeparator())),origin:"paste"};ve(b.doc,i),ke(b.doc,Fd(c,Gd(i)))}})),h.readAsText(a)}},i=0;i<e;++i)h(d[i],i);else{if(b.state.draggingText&&b.doc.sel.contains(c)>-1)return b.state.draggingText(a),void setTimeout((function(){return b.display.input.focus()}),20);try{var j=a.dataTransfer.getData("Text");if(j){var k;if(b.state.draggingText&&!b.state.draggingText.copy&&(k=b.listSelections()),me(b.doc,Fd(c,c)),k)for(var l=0;l<k.length;++l)Be(b.doc,"",k[l].anchor,k[l].head,"drag");b.replaceSelection(j,"around","paste"),b.display.input.focus()}}catch(a){}}}}function Oe(a,b){if($f&&(!a.state.draggingText||+new Date-ph<100))return void Ma(b);if(!Fa(a,b)&&!Mb(a.display,b)&&(b.dataTransfer.setData("Text",a.getSelection()),b.dataTransfer.effectAllowed="copyMove",b.dataTransfer.setDragImage&&!eg)){var c=d("img",null,null,"position: fixed; left: 0; top: 0;");c.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",dg&&(c.width=c.height=1,a.display.wrapper.appendChild(c),c._top=c.offsetTop),b.dataTransfer.setDragImage(c,0,0),dg&&c.parentNode.removeChild(c)}}function Pe(a,b){var e=xc(a,b);if(e){var f=document.createDocumentFragment();Bc(a,e,f),a.display.dragCursor||(a.display.dragCursor=d("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),a.display.lineSpace.insertBefore(a.display.dragCursor,a.display.cursorDiv)),c(a.display.dragCursor,f)}}function Qe(a){a.display.dragCursor&&(a.display.lineSpace.removeChild(a.display.dragCursor),a.display.dragCursor=null)}function Re(a){if(document.body.getElementsByClassName)for(var b=document.body.getElementsByClassName("CodeMirror"),c=0;c<b.length;c++){var d=b[c].CodeMirror;d&&a(d)}}function Se(){qh||(Te(),qh=!0)}function Te(){var a;Jg(window,"resize",(function(){null==a&&(a=setTimeout((function(){a=null,Re(Ue)}),100))})),Jg(window,"blur",(function(){return Re(Hc)}))}function Ue(a){var b=a.display;b.lastWrapHeight==b.wrapper.clientHeight&&b.lastWrapWidth==b.wrapper.clientWidth||(b.cachedCharWidth=b.cachedTextHeight=b.cachedPaddingH=null,b.scrollbarsClipped=!1,a.setSize())}function Ve(a){var b=a.split(/-(?!$)/);a=b[b.length-1];for(var c,d,e,f,g=0;g<b.length-1;g++){var h=b[g];if(/^(cmd|meta|m)$/i.test(h))f=!0;else if(/^a(lt)?$/i.test(h))c=!0;else if(/^(c|ctrl|control)$/i.test(h))d=!0;else{if(!/^s(hift)?$/i.test(h))throw new Error("Unrecognized modifier name: "+h);e=!0}}return c&&(a="Alt-"+a),d&&(a="Ctrl-"+a),f&&(a="Cmd-"+a),e&&(a="Shift-"+a),a}function We(a){var b={};for(var c in a)if(a.hasOwnProperty(c)){var d=a[c];if(/^(name|fallthrough|(de|at)tach)$/.test(c))continue;if("..."==d){delete a[c];continue}for(var e=q(c.split(" "),Ve),f=0;f<e.length;f++){var g=void 0,h=void 0;f==e.length-1?(h=e.join(" "),g=d):(h=e.slice(0,f+1).join(" "),g="...");var i=b[h];if(i){if(i!=g)throw new Error("Inconsistent bindings for "+h)}else b[h]=g}delete a[c]}for(var j in b)a[j]=b[j];return a}function Xe(a,b,c,d){b=$e(b);var e=b.call?b.call(a,d):b[a];if(e===!1)return"nothing";if("..."===e)return"multi";if(null!=e&&c(e))return"handled";if(b.fallthrough){if("[object Array]"!=Object.prototype.toString.call(b.fallthrough))return Xe(a,b.fallthrough,c,d);for(var f=0;f<b.fallthrough.length;f++){var g=Xe(a,b.fallthrough[f],c,d);if(g)return g}}}function Ye(a){var b="string"==typeof a?a:rh[a.keyCode];return"Ctrl"==b||"Alt"==b||"Shift"==b||"Mod"==b}function Ze(a,b){if(dg&&34==a.keyCode&&a.char)return!1;var c=rh[a.keyCode],d=c;return null!=d&&!a.altGraphKey&&(a.altKey&&"Alt"!=c&&(d="Alt-"+d),(pg?a.metaKey:a.ctrlKey)&&"Ctrl"!=c&&(d="Ctrl-"+d),(pg?a.ctrlKey:a.metaKey)&&"Cmd"!=c&&(d="Cmd-"+d),!b&&a.shiftKey&&"Shift"!=c&&(d="Shift-"+d),d)}function $e(a){return"string"==typeof a?vh[a]:a}function _e(a,b){for(var c=a.doc.sel.ranges,d=[],e=0;e<c.length;e++){for(var f=b(c[e]);d.length&&K(f.from,p(d).to)<=0;){var g=d.pop();if(K(g.from,f.from)<0){f.from=g.from;break}}d.push(f)}jd(a,(function(){for(var b=d.length-1;b>=0;b--)Be(a.doc,"",d[b].from,d[b].to,"+delete");_c(a)}))}function af(a,b){var c=B(a.doc,b),d=la(c);return d!=c&&(b=F(d)),Aa(!0,a,d,b,1)}function bf(a,b){var c=B(a.doc,b),d=ma(c);return d!=c&&(b=F(d)),Aa(!0,a,c,b,-1)}function cf(a,b){var c=af(a,b.line),d=B(a.doc,c.line),e=xa(d,a.doc.direction);if(!e||0==e[0].level){var f=Math.max(0,d.text.search(/\S/)),g=b.line==c.line&&b.ch<=f&&b.ch;return J(c.line,g?0:f,c.sticky)}return c}function df(a,b,c){if("string"==typeof b&&(b=yh[b],!b))return!1;a.display.input.ensurePolled();var d=a.display.shift,e=!1;try{a.isReadOnly()&&(a.state.suppressEdits=!0),c&&(a.display.shift=!1),e=b(a)!=xg}finally{a.display.shift=d,a.state.suppressEdits=!1}return e}function ef(a,b,c){for(var d=0;d<a.state.keyMaps.length;d++){var e=Xe(b,a.state.keyMaps[d],c,a);if(e)return e}return a.options.extraKeys&&Xe(b,a.options.extraKeys,c,a)||Xe(b,a.options.keyMap,c,a)}function ff(a,b,c,d){var e=a.state.keySeq;if(e){if(Ye(b))return"handled";zh.set(50,(function(){a.state.keySeq==e&&(a.state.keySeq=null,a.display.input.reset())})),b=e+" "+b}var f=ef(a,b,d);return"multi"==f&&(a.state.keySeq=b),"handled"==f&&xb(a,"keyHandled",a,b,c),"handled"!=f&&"multi"!=f||(Ja(c),Dc(a)),e&&!f&&/\'$/.test(b)?(Ja(c),!0):!!f}function gf(a,b){var c=Ze(b,!0);return!!c&&(b.shiftKey&&!a.state.keySeq?ff(a,"Shift-"+c,b,(function(b){return df(a,b,!0)}))||ff(a,c,b,(function(b){if("string"==typeof b?/^go[A-Z]/.test(b):b.motion)return df(a,b)})):ff(a,c,b,(function(b){return df(a,b)})))}function hf(a,b,c){return ff(a,"'"+c+"'",b,(function(b){return df(a,b,!0)}))}function jf(a){var b=this;if(b.curOp.focus=g(),!Fa(b,a)){$f&&_f<11&&27==a.keyCode&&(a.returnValue=!1);var c=a.keyCode;b.display.shift=16==c||a.shiftKey;var d=gf(b,a);dg&&(Ah=d?c:null,!d&&88==c&&!Ng&&(kg?a.metaKey:a.ctrlKey)&&b.replaceSelection("",null,"cut")),18!=c||/\bCodeMirror-crosshair\b/.test(b.display.lineDiv.className)||kf(b)}}function kf(a){function b(a){18!=a.keyCode&&a.altKey||(rg(c,"CodeMirror-crosshair"),Da(document,"keyup",b),Da(document,"mouseover",b))}var c=a.display.lineDiv;h(c,"CodeMirror-crosshair"),Jg(document,"keyup",b),Jg(document,"mouseover",b)}function lf(a){16==a.keyCode&&(this.doc.sel.shift=!1),Fa(this,a)}function mf(a){var b=this;if(!(Mb(b.display,a)||Fa(b,a)||a.ctrlKey&&!a.altKey||kg&&a.metaKey)){var c=a.keyCode,d=a.charCode;if(dg&&c==Ah)return Ah=null,void Ja(a);if(!dg||a.which&&!(a.which<10)||!gf(b,a)){var e=String.fromCharCode(null==d?c:d);"\b"!=e&&(hf(b,a,e)||b.display.input.onKeyPress(a))}}}function nf(a){var b=this,c=b.display;if(!(Fa(b,a)||c.activeTouch&&c.input.supportsTouch())){if(c.input.ensurePolled(),c.shift=a.shiftKey,Mb(c,a))return void(ag||(c.scroller.draggable=!1,setTimeout((function(){return c.scroller.draggable=!0}),100)));if(!sf(b,a)){var d=xc(b,a);switch(window.focus(),Oa(a)){case 1:b.state.selectingText?b.state.selectingText(a):d?of(b,a,d):Na(a)==c.scroller&&Ja(a);break;case 2:ag&&(b.state.lastMiddleDown=+new Date),d&&fe(b.doc,d),setTimeout((function(){return c.input.focus()}),20),Ja(a);break;case 3:qg?tf(b,a):Fc(b)}}}}function of(a,b,c){$f?setTimeout(j(Ec,a),0):a.curOp.focus=g();var d,e=+new Date;xh&&xh.time>e-400&&0==K(xh.pos,c)?d="triple":wh&&wh.time>e-400&&0==K(wh.pos,c)?(d="double",xh={time:e,pos:c}):(d="single",wh={time:e,pos:c});var f,h=a.doc.sel,i=kg?b.metaKey:b.ctrlKey;a.options.dragDrop&&Kg&&!a.isReadOnly()&&"single"==d&&(f=h.contains(c))>-1&&(K((f=h.ranges[f]).from(),c)<0||c.xRel>0)&&(K(f.to(),c)>0||c.xRel<0)?pf(a,b,c,i):qf(a,b,c,d,i)}function pf(a,b,c,d){var e=a.display,f=!1,g=kd(a,(function(b){ag&&(e.scroller.draggable=!1),a.state.draggingText=!1,Da(document,"mouseup",g),Da(document,"mousemove",h),Da(e.scroller,"dragstart",i),Da(e.scroller,"drop",g),f||(Ja(b),d||fe(a.doc,c),ag||$f&&9==_f?setTimeout((function(){document.body.focus(),e.input.focus()}),20):e.input.focus())})),h=function(a){f=f||Math.abs(b.clientX-a.clientX)+Math.abs(b.clientY-a.clientY)>=10},i=function(){return f=!0};ag&&(e.scroller.draggable=!0),a.state.draggingText=g,g.copy=kg?b.altKey:b.ctrlKey,e.scroller.dragDrop&&e.scroller.dragDrop(),Jg(document,"mouseup",g),Jg(document,"mousemove",h),Jg(e.scroller,"dragstart",i),Jg(e.scroller,"drop",g),Fc(a),setTimeout((function(){return e.input.focus()}),20)}function qf(a,b,c,d,e){function f(b){if(0!=K(t,b))if(t=b,"rect"==d){for(var e=[],f=a.options.tabSize,g=l(B(k,c.line).text,c.ch,f),h=l(B(k,b.line).text,b.ch,f),i=Math.min(g,h),j=Math.max(g,h),q=Math.min(c.line,b.line),r=Math.min(a.lastLine(),Math.max(c.line,b.line));q<=r;q++){var s=B(k,q).text,u=n(s,i,f);i==j?e.push(new gh(J(q,u),J(q,u))):s.length>u&&e.push(new gh(J(q,u),J(q,n(s,j,f))))}e.length||e.push(new gh(c,c)),le(k,Ed(p.ranges.slice(0,o).concat(e),o),{origin:"*mouse",scroll:!1}),a.scrollIntoView(b)}else{var v=m,w=v.anchor,x=b;if("single"!=d){var y;y="double"==d?a.findWordAt(b):new gh(J(b.line,0),Q(k,J(b.line+1,0))),K(y.anchor,w)>0?(x=y.head,w=O(v.from(),y.anchor)):(x=y.anchor,w=N(v.to(),y.head))}var z=p.ranges.slice(0);z[o]=new gh(Q(k,w),x),le(k,Ed(z,o),zg)}}function h(b){var c=++v,e=xc(a,b,!0,"rect"==d);if(e)if(0!=K(e,t)){a.curOp.focus=g(),f(e);var i=Mc(j,k);(e.line>=i.to||e.line<i.from)&&setTimeout(kd(a,(function(){v==c&&h(b)})),150)}else{var l=b.clientY<u.top?-20:b.clientY>u.bottom?20:0;l&&setTimeout(kd(a,(function(){v==c&&(j.scroller.scrollTop+=l,h(b))})),50)}}function i(b){a.state.selectingText=!1,v=1/0,Ja(b),j.input.focus(),Da(document,"mousemove",w),Da(document,"mouseup",x),k.history.lastSelOrigin=null}var j=a.display,k=a.doc;Ja(b);var m,o,p=k.sel,q=p.ranges;if(e&&!b.shiftKey?(o=k.sel.contains(c),m=o>-1?q[o]:new gh(c,c)):(m=k.sel.primary(),o=k.sel.primIndex),lg?b.shiftKey&&b.metaKey:b.altKey)d="rect",e||(m=new gh(c,c)),c=xc(a,b,!0,!0),o=-1;else if("double"==d){var r=a.findWordAt(c);m=a.display.shift||k.extend?ee(k,m,r.anchor,r.head):r}else if("triple"==d){var s=new gh(J(c.line,0),Q(k,J(c.line+1,0)));m=a.display.shift||k.extend?ee(k,m,s.anchor,s.head):s}else m=ee(k,m,c);e?o==-1?(o=q.length,le(k,Ed(q.concat([m]),o),{scroll:!1,origin:"*mouse"})):q.length>1&&q[o].empty()&&"single"==d&&!b.shiftKey?(le(k,Ed(q.slice(0,o).concat(q.slice(o+1)),0),{scroll:!1,origin:"*mouse"}),p=k.sel):he(k,o,m,zg):(o=0,le(k,new fh([m],0),zg),p=k.sel);var t=c,u=j.wrapper.getBoundingClientRect(),v=0,w=kd(a,(function(a){Oa(a)?h(a):i(a)})),x=kd(a,i);a.state.selectingText=x,Jg(document,"mousemove",w),Jg(document,"mouseup",x)}function rf(a,b,c,d){var e,f;try{e=b.clientX,f=b.clientY}catch(a){return!1}if(e>=Math.floor(a.display.gutters.getBoundingClientRect().right))return!1;d&&Ja(b);var g=a.display,h=g.lineDiv.getBoundingClientRect();if(f>h.bottom||!Ha(a,c))return La(b);f-=h.top-g.viewOffset;for(var i=0;i<a.options.gutters.length;++i){var j=g.gutters.childNodes[i];if(j&&j.getBoundingClientRect().right>=e){var k=G(a.doc,f),l=a.options.gutters[i];return Ea(a,c,a,k,l,b),La(b)}}}function sf(a,b){return rf(a,b,"gutterClick",!0)}function tf(a,b){Mb(a.display,b)||uf(a,b)||Fa(a,b,"contextmenu")||a.display.input.onContextMenu(b)}function uf(a,b){return!!Ha(a,"gutterContextMenu")&&rf(a,b,"gutterContextMenu",!1)}function vf(a){a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+a.options.theme.replace(/(^|\s)\s*/g," cm-s-"),ec(a)}function wf(a){function b(b,d,e,f){a.defaults[b]=d,e&&(c[b]=f?function(a,b,c){c!=Bh&&e(a,b,c)}:e)}var c=a.optionHandlers;a.defineOption=b,a.Init=Bh,b("value","",(function(a,b){return a.setValue(b)}),!0),b("mode",null,(function(a,b){a.doc.modeOption=b,Ld(a)}),!0),b("indentUnit",2,Ld,!0),b("indentWithTabs",!1),b("smartIndent",!0),b("tabSize",4,(function(a){Md(a),ec(a),nd(a)}),!0),b("lineSeparator",null,(function(a,b){if(a.doc.lineSep=b,b){var c=[],d=a.doc.first;a.doc.iter((function(a){for(var e=0;;){var f=a.text.indexOf(b,e);if(f==-1)break;e=f+b.length,c.push(J(d,f))}d++}));for(var e=c.length-1;e>=0;e--)Be(a.doc,b,c[e],J(c[e].line,c[e].ch+b.length))}})),b("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g,(function(a,b,c){a.state.specialChars=new RegExp(b.source+(b.test("\t")?"":"|\t"),"g"),c!=Bh&&a.refresh()})),b("specialCharPlaceholder",mb,(function(a){return a.refresh()}),!0),b("electricChars",!0),b("inputStyle",jg?"contenteditable":"textarea",(function(){throw new Error("inputStyle can not (yet) be changed in a running editor")}),!0),b("spellcheck",!1,(function(a,b){return a.getInputField().spellcheck=b}),!0),b("rtlMoveVisually",!mg),b("wholeLineUpdateBefore",!0),b("theme","default",(function(a){vf(a),xf(a)}),!0),b("keyMap","default",(function(a,b,c){var d=$e(b),e=c!=Bh&&$e(c);e&&e.detach&&e.detach(a,d),d.attach&&d.attach(a,e||null)})),b("extraKeys",null),b("lineWrapping",!1,zf,!0),b("gutters",[],(function(a){Dd(a.options),xf(a)}),!0),b("fixedGutter",!0,(function(a,b){a.display.gutters.style.left=b?uc(a.display)+"px":"0",a.refresh()}),!0),b("coverGutterNextToScrollbar",!1,(function(a){return Tc(a)}),!0),b("scrollbarStyle","native",(function(a){Vc(a),Tc(a),a.display.scrollbars.setScrollTop(a.doc.scrollTop),a.display.scrollbars.setScrollLeft(a.doc.scrollLeft)}),!0),b("lineNumbers",!1,(function(a){Dd(a.options),xf(a)}),!0),b("firstLineNumber",1,xf,!0),b("lineNumberFormatter",(function(a){return a}),xf,!0),b("showCursorWhenSelecting",!1,zc,!0),b("resetSelectionOnContextMenu",!0),b("lineWiseCopyCut",!0),b("readOnly",!1,(function(a,b){"nocursor"==b?(Hc(a),a.display.input.blur(),a.display.disabled=!0):a.display.disabled=!1,a.display.input.readOnlyChanged(b)})),b("disableInput",!1,(function(a,b){b||a.display.input.reset()}),!0),b("dragDrop",!0,yf),b("allowDropFileTypes",null),b("cursorBlinkRate",530),b("cursorScrollMargin",0),b("cursorHeight",1,zc,!0),b("singleCursorHeightPerLine",!0,zc,!0),b("workTime",100),b("workDelay",100),b("flattenSpans",!0,Md,!0),b("addModeClass",!1,Md,!0),b("pollInterval",100),b("undoDepth",200,(function(a,b){return a.doc.history.undoDepth=b})),b("historyEventDelay",1250),b("viewportMargin",10,(function(a){return a.refresh()}),!0),b("maxHighlightLength",1e4,Md,!0),b("moveInputWithCursor",!0,(function(a,b){b||a.display.input.resetPosition()})),b("tabindex",null,(function(a,b){return a.display.input.getField().tabIndex=b||""})),b("autofocus",null),b("direction","ltr",(function(a,b){return a.doc.setDirection(b)}),!0)}function xf(a){Cd(a),nd(a),Ic(a)}function yf(a,b,c){var d=c&&c!=Bh;if(!b!=!d){var e=a.display.dragFunctions,f=b?Jg:Da;f(a.display.scroller,"dragstart",e.start),f(a.display.scroller,"dragenter",e.enter),f(a.display.scroller,"dragover",e.over),f(a.display.scroller,"dragleave",e.leave),f(a.display.scroller,"drop",e.drop)}}function zf(a){a.options.lineWrapping?(h(a.display.wrapper,"CodeMirror-wrap"),a.display.sizer.style.minWidth="",a.display.sizerWidth=null):(rg(a.display.wrapper,"CodeMirror-wrap"),ua(a)),wc(a),nd(a),ec(a),setTimeout((function(){return Tc(a)}),100)}function Af(a,b){var c=this;if(!(this instanceof Af))return new Af(a,b);this.options=b=b?k(b):{},k(Ch,b,!1),Dd(b);var d=b.value;"string"==typeof d&&(d=new oh(d,b.mode,null,b.lineSeparator,b.direction)),this.doc=d;var e=new Af.inputStyles[b.inputStyle](this),f=this.display=new A(a,d,e);f.wrapper.CodeMirror=this,Cd(this),vf(this),b.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),Vc(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new tg,keySeq:null,specialChars:null},b.autofocus&&!jg&&f.input.focus(),$f&&_f<11&&setTimeout((function(){return c.display.input.reset(!0)}),20),Bf(this),Se(),bd(this),this.curOp.forceUpdate=!0,Qd(this,d),b.autofocus&&!jg||this.hasFocus()?setTimeout(j(Gc,this),20):Hc(this);for(var g in Dh)Dh.hasOwnProperty(g)&&Dh[g](c,b[g],Bh);Jc(this),b.finishInit&&b.finishInit(this);for(var h=0;h<Eh.length;++h)Eh[h](c);cd(this),ag&&b.lineWrapping&&"optimizelegibility"==getComputedStyle(f.lineDiv).textRendering&&(f.lineDiv.style.textRendering="auto")}function Bf(a){function b(){e.activeTouch&&(f=setTimeout((function(){return e.activeTouch=null}),1e3),g=e.activeTouch,g.end=+new Date)}function c(a){if(1!=a.touches.length)return!1;var b=a.touches[0];return b.radiusX<=1&&b.radiusY<=1}function d(a,b){if(null==b.left)return!0;var c=b.left-a.left,d=b.top-a.top;return c*c+d*d>400}var e=a.display;Jg(e.scroller,"mousedown",kd(a,nf)),$f&&_f<11?Jg(e.scroller,"dblclick",kd(a,(function(b){if(!Fa(a,b)){var c=xc(a,b);if(c&&!sf(a,b)&&!Mb(a.display,b)){Ja(b);var d=a.findWordAt(c);fe(a.doc,d.anchor,d.head)}}}))):Jg(e.scroller,"dblclick",(function(b){return Fa(a,b)||Ja(b)})),qg||Jg(e.scroller,"contextmenu",(function(b){return tf(a,b)}));var f,g={end:0};Jg(e.scroller,"touchstart",(function(b){if(!Fa(a,b)&&!c(b)){e.input.ensurePolled(),clearTimeout(f);var d=+new Date;e.activeTouch={start:d,moved:!1,prev:d-g.end<=300?g:null},1==b.touches.length&&(e.activeTouch.left=b.touches[0].pageX,e.activeTouch.top=b.touches[0].pageY)}})),Jg(e.scroller,"touchmove",(function(){e.activeTouch&&(e.activeTouch.moved=!0)})),Jg(e.scroller,"touchend",(function(c){var f=e.activeTouch;if(f&&!Mb(e,c)&&null!=f.left&&!f.moved&&new Date-f.start<300){var g,h=a.coordsChar(e.activeTouch,"page");g=!f.prev||d(f,f.prev)?new gh(h,h):!f.prev.prev||d(f,f.prev.prev)?a.findWordAt(h):new gh(J(h.line,0),Q(a.doc,J(h.line+1,0))),a.setSelection(g.anchor,g.head),a.focus(),Ja(c)}b()})),Jg(e.scroller,"touchcancel",b),Jg(e.scroller,"scroll",(function(){e.scroller.clientHeight&&(Nc(a,e.scroller.scrollTop),Oc(a,e.scroller.scrollLeft,!0),Ea(a,"scroll",a))})),Jg(e.scroller,"mousewheel",(function(b){return Rc(a,b)})),Jg(e.scroller,"DOMMouseScroll",(function(b){return Rc(a,b)})),Jg(e.wrapper,"scroll",(function(){return e.wrapper.scrollTop=e.wrapper.scrollLeft=0})),e.dragFunctions={enter:function(b){Fa(a,b)||Ma(b)},over:function(b){Fa(a,b)||(Pe(a,b),Ma(b))},start:function(b){return Oe(a,b)},drop:kd(a,Ne),leave:function(b){Fa(a,b)||Qe(a)}};var h=e.input.getField();
-Jg(h,"keyup",(function(b){return lf.call(a,b)})),Jg(h,"keydown",kd(a,jf)),Jg(h,"keypress",kd(a,mf)),Jg(h,"focus",(function(b){return Gc(a,b)})),Jg(h,"blur",(function(b){return Hc(a,b)}))}function Cf(a,b,c,d){var e,f=a.doc;null==c&&(c="add"),"smart"==c&&(f.mode.indent?e=ab(a,b):c="prev");var g=a.options.tabSize,h=B(f,b),i=l(h.text,null,g);h.stateAfter&&(h.stateAfter=null);var j,k=h.text.match(/^\s*/)[0];if(d||/\S/.test(h.text)){if("smart"==c&&(j=f.mode.indent(e,h.text.slice(k.length),h.text),j==xg||j>150)){if(!d)return;c="prev"}}else j=0,c="not";"prev"==c?j=b>f.first?l(B(f,b-1).text,null,g):0:"add"==c?j=i+a.options.indentUnit:"subtract"==c?j=i-a.options.indentUnit:"number"==typeof c&&(j=i+c),j=Math.max(0,j);var m="",n=0;if(a.options.indentWithTabs)for(var p=Math.floor(j/g);p;--p)n+=g,m+="\t";if(n<j&&(m+=o(j-n)),m!=k)return Be(f,m,J(b,0),J(b,k.length),"+input"),h.stateAfter=null,!0;for(var q=0;q<f.sel.ranges.length;q++){var r=f.sel.ranges[q];if(r.head.line==b&&r.head.ch<k.length){var s=J(b,k.length);he(f,q,new gh(s,s));break}}}function Df(a){Fh=a}function Ef(a,b,c,d,e){var f=a.doc;a.display.shift=!1,d||(d=f.sel);var g=a.state.pasteIncoming||"paste"==e,h=Lg(b),i=null;if(g&&d.ranges.length>1)if(Fh&&Fh.text.join("\n")==b){if(d.ranges.length%Fh.text.length==0){i=[];for(var j=0;j<Fh.text.length;j++)i.push(f.splitLines(Fh.text[j]))}}else h.length==d.ranges.length&&(i=q(h,(function(a){return[a]})));for(var k,l=d.ranges.length-1;l>=0;l--){var m=d.ranges[l],n=m.from(),o=m.to();m.empty()&&(c&&c>0?n=J(n.line,n.ch-c):a.state.overwrite&&!g?o=J(o.line,Math.min(B(f,o.line).text.length,o.ch+p(h).length)):Fh&&Fh.lineWise&&Fh.text.join("\n")==b&&(n=o=J(n.line,0))),k=a.curOp.updateInput;var r={from:n,to:o,text:i?i[l%i.length]:h,origin:e||(g?"paste":a.state.cutIncoming?"cut":"+input")};ve(a.doc,r),xb(a,"inputRead",a,r)}b&&!g&&Gf(a,b),_c(a),a.curOp.updateInput=k,a.curOp.typing=!0,a.state.pasteIncoming=a.state.cutIncoming=!1}function Ff(a,b){var c=a.clipboardData&&a.clipboardData.getData("Text");if(c)return a.preventDefault(),b.isReadOnly()||b.options.disableInput||jd(b,(function(){return Ef(b,c,0,null,"paste")})),!0}function Gf(a,b){if(a.options.electricChars&&a.options.smartIndent)for(var c=a.doc.sel,d=c.ranges.length-1;d>=0;d--){var e=c.ranges[d];if(!(e.head.ch>100||d&&c.ranges[d-1].head.line==e.head.line)){var f=a.getModeAt(e.head),g=!1;if(f.electricChars){for(var h=0;h<f.electricChars.length;h++)if(b.indexOf(f.electricChars.charAt(h))>-1){g=Cf(a,e.head.line,"smart");break}}else f.electricInput&&f.electricInput.test(B(a.doc,e.head.line).text.slice(0,e.head.ch))&&(g=Cf(a,e.head.line,"smart"));g&&xb(a,"electricInput",a,e.head.line)}}}function Hf(a){for(var b=[],c=[],d=0;d<a.doc.sel.ranges.length;d++){var e=a.doc.sel.ranges[d].head.line,f={anchor:J(e,0),head:J(e+1,0)};c.push(f),b.push(a.getRange(f.anchor,f.head))}return{text:b,ranges:c}}function If(a,b){a.setAttribute("autocorrect","off"),a.setAttribute("autocapitalize","off"),a.setAttribute("spellcheck",!!b)}function Jf(){var a=d("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),b=d("div",[a],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return ag?a.style.width="1000px":a.setAttribute("wrap","off"),hg&&(a.style.border="1px solid black"),If(a),b}function Kf(a,b,c,d,e){function f(){var d=b.line+c;return!(d<a.first||d>=a.first+a.size)&&(b=new J(d,b.ch,b.sticky),j=B(a,d))}function g(d){var g;if(g=e?Ba(a.cm,j,b,c):za(j,b,c),null==g){if(d||!f())return!1;b=Aa(e,a.cm,j,b.line,c)}else b=g;return!0}var h=b,i=c,j=B(a,b.line);if("char"==d)g();else if("column"==d)g(!0);else if("word"==d||"group"==d)for(var k=null,l="group"==d,m=a.cm&&a.cm.getHelper(b,"wordChars"),n=!0;!(c<0)||g(!n);n=!1){var o=j.text.charAt(b.ch)||"\n",p=v(o,m)?"w":l&&"\n"==o?"n":!l||/\s/.test(o)?null:"p";if(!l||n||p||(p="s"),k&&k!=p){c<0&&(c=1,g(),b.sticky="after");break}if(p&&(k=p),c>0&&!g(!n))break}var q=re(a,b,h,i,!0);return L(h,q)&&(q.hitSide=!0),q}function Lf(a,b,c,d){var e,f=a.doc,g=b.left;if("page"==d){var h=Math.min(a.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),i=Math.max(h-.5*rc(a.display),3);e=(c>0?b.bottom:b.top)+c*i}else"line"==d&&(e=c>0?b.bottom+3:b.top-3);for(var j;j=nc(a,g,e),j.outside;){if(c<0?e<=0:e>=f.height){j.hitSide=!0;break}e+=5*c}return j}function Mf(a,b){var c=Xb(a,b.line);if(!c||c.hidden)return null;var d=B(a.doc,b.line),e=Ub(c,d,b.line),f=xa(d,a.doc.direction),g="left";if(f){var h=wa(f,b.ch);g=h%2?"right":"left"}var i=$b(e.map,b.ch,g);return i.offset="right"==i.collapse?i.end:i.start,i}function Nf(a){for(var b=a;b;b=b.parentNode)if(/CodeMirror-gutter-wrapper/.test(b.className))return!0;return!1}function Of(a,b){return b&&(a.bad=!0),a}function Pf(a,b,c,d,e){function f(a){return function(b){return b.id==a}}function g(){k&&(j+=l,k=!1)}function h(a){a&&(g(),j+=a)}function i(b){if(1==b.nodeType){var c=b.getAttribute("cm-text");if(null!=c)return void h(c||b.textContent.replace(/\u200b/g,""));var j,m=b.getAttribute("cm-marker");if(m){var n=a.findMarks(J(d,0),J(e+1,0),f(+m));return void(n.length&&(j=n[0].find())&&h(C(a.doc,j.from,j.to).join(l)))}if("false"==b.getAttribute("contenteditable"))return;var o=/^(pre|div|p)$/i.test(b.nodeName);o&&g();for(var p=0;p<b.childNodes.length;p++)i(b.childNodes[p]);o&&(k=!0)}else 3==b.nodeType&&h(b.nodeValue)}for(var j="",k=!1,l=a.doc.lineSeparator();i(b),b!=c;)b=b.nextSibling;return j}function Qf(a,b,c){var d;if(b==a.display.lineDiv){if(d=a.display.lineDiv.childNodes[c],!d)return Of(a.clipPos(J(a.display.viewTo-1)),!0);b=null,c=0}else for(d=b;;d=d.parentNode){if(!d||d==a.display.lineDiv)return null;if(d.parentNode&&d.parentNode==a.display.lineDiv)break}for(var e=0;e<a.display.view.length;e++){var f=a.display.view[e];if(f.node==d)return Rf(f,b,c)}}function Rf(a,b,c){function d(b,c,d){for(var e=-1;e<(l?l.length:0);e++)for(var f=e<0?k.map:l[e],g=0;g<f.length;g+=3){var h=f[g+2];if(h==b||h==c){var i=F(e<0?a.line:a.rest[e]),j=f[g]+d;return(d<0||h!=b)&&(j=f[g+(d?1:0)]),J(i,j)}}}var e=a.text.firstChild,g=!1;if(!b||!f(e,b))return Of(J(F(a.line),0),!0);if(b==e&&(g=!0,b=e.childNodes[c],c=0,!b)){var h=a.rest?p(a.rest):a.line;return Of(J(F(h),h.text.length),g)}var i=3==b.nodeType?b:null,j=b;for(i||1!=b.childNodes.length||3!=b.firstChild.nodeType||(i=b.firstChild,c&&(c=i.nodeValue.length));j.parentNode!=e;)j=j.parentNode;var k=a.measure,l=k.maps,m=d(i,j,c);if(m)return Of(m,g);for(var n=j.nextSibling,o=i?i.nodeValue.length-c:0;n;n=n.nextSibling){if(m=d(n,n.firstChild,0))return Of(J(m.line,m.ch-o),g);o+=n.textContent.length}for(var q=j.previousSibling,r=c;q;q=q.previousSibling){if(m=d(q,q.firstChild,-1))return Of(J(m.line,m.ch+r),g);r+=q.textContent.length}}function Sf(a,b){function c(){a.value=i.getValue()}if(b=b?k(b):{},b.value=a.value,!b.tabindex&&a.tabIndex&&(b.tabindex=a.tabIndex),!b.placeholder&&a.placeholder&&(b.placeholder=a.placeholder),null==b.autofocus){var d=g();b.autofocus=d==a||null!=a.getAttribute("autofocus")&&d==document.body}var e;if(a.form&&(Jg(a.form,"submit",c),!b.leaveSubmitMethodAlone)){var f=a.form;e=f.submit;try{var h=f.submit=function(){c(),f.submit=e,f.submit(),f.submit=h}}catch(a){}}b.finishInit=function(b){b.save=c,b.getTextArea=function(){return a},b.toTextArea=function(){b.toTextArea=isNaN,c(),a.parentNode.removeChild(b.getWrapperElement()),a.style.display="",a.form&&(Da(a.form,"submit",c),"function"==typeof a.form.submit&&(a.form.submit=e))}},a.style.display="none";var i=Af((function(b){return a.parentNode.insertBefore(b,a.nextSibling)}),b);return i}function Tf(a){a.off=Da,a.on=Jg,a.wheelEventPixels=Qc,a.Doc=oh,a.splitLines=Lg,a.countColumn=l,a.findColumn=n,a.isWordChar=u,a.Pass=xg,a.signal=Ea,a.Line=Tg,a.changeEnd=Gd,a.scrollbarModel=ch,a.Pos=J,a.cmpPos=K,a.modes=Pg,a.mimeModes=Qg,a.resolveMode=Ua,a.getMode=Va,a.modeExtensions=Rg,a.extendMode=Wa,a.copyState=Xa,a.startState=Za,a.innerMode=Ya,a.commands=yh,a.keyMap=vh,a.keyName=Ze,a.isModifierKey=Ye,a.lookupKey=Xe,a.normalizeKeyMap=We,a.StringStream=Sg,a.SharedTextMarker=mh,a.TextMarker=lh,a.LineWidget=jh,a.e_preventDefault=Ja,a.e_stopPropagation=Ka,a.e_stop=Ma,a.addClass=h,a.contains=f,a.rmClass=rg,a.keyNames=rh}var Uf=navigator.userAgent,Vf=navigator.platform,Wf=/gecko\/\d/i.test(Uf),Xf=/MSIE \d/.test(Uf),Yf=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(Uf),Zf=/Edge\/(\d+)/.exec(Uf),$f=Xf||Yf||Zf,_f=$f&&(Xf?document.documentMode||6:+(Zf||Yf)[1]),ag=!Zf&&/WebKit\//.test(Uf),bg=ag&&/Qt\/\d+\.\d+/.test(Uf),cg=!Zf&&/Chrome\//.test(Uf),dg=/Opera\//.test(Uf),eg=/Apple Computer/.test(navigator.vendor),fg=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(Uf),gg=/PhantomJS/.test(Uf),hg=!Zf&&/AppleWebKit/.test(Uf)&&/Mobile\/\w+/.test(Uf),ig=/Android/.test(Uf),jg=hg||ig||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(Uf),kg=hg||/Mac/.test(Vf),lg=/\bCrOS\b/.test(Uf),mg=/win/i.test(Vf),ng=dg&&Uf.match(/Version\/(\d*\.\d*)/);ng&&(ng=Number(ng[1])),ng&&ng>=15&&(dg=!1,ag=!0);var og,pg=kg&&(bg||dg&&(null==ng||ng<12.11)),qg=Wf||$f&&_f>=9,rg=function(b,c){var d=b.className,e=a(c).exec(d);if(e){var f=d.slice(e.index+e[0].length);b.className=d.slice(0,e.index)+(f?e[1]+f:"")}};og=document.createRange?function(a,b,c,d){var e=document.createRange();return e.setEnd(d||a,c),e.setStart(a,b),e}:function(a,b,c){var d=document.body.createTextRange();try{d.moveToElementText(a.parentNode)}catch(a){return d}return d.collapse(!0),d.moveEnd("character",c),d.moveStart("character",b),d};var sg=function(a){a.select()};hg?sg=function(a){a.selectionStart=0,a.selectionEnd=a.value.length}:$f&&(sg=function(a){try{a.select()}catch(a){}});var tg=function(){this.id=null};tg.prototype.set=function(a,b){clearTimeout(this.id),this.id=setTimeout(b,a)};var ug,vg,wg=30,xg={toString:function(){return"CodeMirror.Pass"}},yg={scroll:!1},zg={origin:"*mouse"},Ag={origin:"+move"},Bg=[""],Cg=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,Dg=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/,Eg=!1,Fg=!1,Gg=null,Hg=(function(){function a(a){return a<=247?c.charAt(a):1424<=a&&a<=1524?"R":1536<=a&&a<=1785?d.charAt(a-1536):1774<=a&&a<=2220?"r":8192<=a&&a<=8203?"w":8204==a?"b":"L"}function b(a,b,c){this.level=a,this.from=b,this.to=c}var c="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",d="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111",e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,f=/[stwN]/,g=/[LRr]/,h=/[Lb1n]/,i=/[1n]/;return function(c,d){var j="ltr"==d?"L":"R";if(0==c.length||"ltr"==d&&!e.test(c))return!1;for(var k=c.length,l=[],m=0;m<k;++m)l.push(a(c.charCodeAt(m)));for(var n=0,o=j;n<k;++n){var q=l[n];"m"==q?l[n]=o:o=q}for(var r=0,s=j;r<k;++r){var t=l[r];"1"==t&&"r"==s?l[r]="n":g.test(t)&&(s=t,"r"==t&&(l[r]="R"))}for(var u=1,v=l[0];u<k-1;++u){var w=l[u];"+"==w&&"1"==v&&"1"==l[u+1]?l[u]="1":","!=w||v!=l[u+1]||"1"!=v&&"n"!=v||(l[u]=v),v=w}for(var x=0;x<k;++x){var y=l[x];if(","==y)l[x]="N";else if("%"==y){var z=void 0;for(z=x+1;z<k&&"%"==l[z];++z);for(var A=x&&"!"==l[x-1]||z<k&&"1"==l[z]?"1":"N",B=x;B<z;++B)l[B]=A;x=z-1}}for(var C=0,D=j;C<k;++C){var E=l[C];"L"==D&&"1"==E?l[C]="L":g.test(E)&&(D=E)}for(var F=0;F<k;++F)if(f.test(l[F])){var G=void 0;for(G=F+1;G<k&&f.test(l[G]);++G);for(var H="L"==(F?l[F-1]:j),I="L"==(G<k?l[G]:j),J=H==I?H?"L":"R":j,K=F;K<G;++K)l[K]=J;F=G-1}for(var L,M=[],N=0;N<k;)if(h.test(l[N])){var O=N;for(++N;N<k&&h.test(l[N]);++N);M.push(new b(0,O,N))}else{var P=N,Q=M.length;for(++N;N<k&&"L"!=l[N];++N);for(var R=P;R<N;)if(i.test(l[R])){P<R&&M.splice(Q,0,new b(1,P,R));var S=R;for(++R;R<N&&i.test(l[R]);++R);M.splice(Q,0,new b(2,S,R)),P=R}else++R;P<N&&M.splice(Q,0,new b(1,P,N))}return 1==M[0].level&&(L=c.match(/^\s+/))&&(M[0].from=L[0].length,M.unshift(new b(0,0,L[0].length))),1==p(M).level&&(L=c.match(/\s+$/))&&(p(M).to-=L[0].length,M.push(new b(0,k-L[0].length,k))),"rtl"==d?M.reverse():M}})(),Ig=[],Jg=function(a,b,c){if(a.addEventListener)a.addEventListener(b,c,!1);else if(a.attachEvent)a.attachEvent("on"+b,c);else{var d=a._handlers||(a._handlers={});d[b]=(d[b]||Ig).concat(c)}},Kg=(function(){if($f&&_f<9)return!1;var a=d("div");return"draggable"in a||"dragDrop"in a})(),Lg=3!="\n\nb".split(/\n/).length?function(a){for(var b=0,c=[],d=a.length;b<=d;){var e=a.indexOf("\n",b);e==-1&&(e=a.length);var f=a.slice(b,"\r"==a.charAt(e-1)?e-1:e),g=f.indexOf("\r");g!=-1?(c.push(f.slice(0,g)),b+=g+1):(c.push(f),b=e+1)}return c}:function(a){return a.split(/\r\n?|\n/)},Mg=window.getSelection?function(a){try{return a.selectionStart!=a.selectionEnd}catch(a){return!1}}:function(a){var b;try{b=a.ownerDocument.selection.createRange()}catch(a){}return!(!b||b.parentElement()!=a)&&0!=b.compareEndPoints("StartToEnd",b)},Ng=(function(){var a=d("div");return"oncopy"in a||(a.setAttribute("oncopy","return;"),"function"==typeof a.oncopy)})(),Og=null,Pg={},Qg={},Rg={},Sg=function(a,b){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0};Sg.prototype.eol=function(){return this.pos>=this.string.length},Sg.prototype.sol=function(){return this.pos==this.lineStart},Sg.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},Sg.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},Sg.prototype.eat=function(a){var b,c=this.string.charAt(this.pos);if(b="string"==typeof a?c==a:c&&(a.test?a.test(c):a(c)))return++this.pos,c},Sg.prototype.eatWhile=function(a){for(var b=this.pos;this.eat(a););return this.pos>b},Sg.prototype.eatSpace=function(){for(var a=this,b=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++a.pos;return this.pos>b},Sg.prototype.skipToEnd=function(){this.pos=this.string.length},Sg.prototype.skipTo=function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},Sg.prototype.backUp=function(a){this.pos-=a},Sg.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=l(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?l(this.string,this.lineStart,this.tabSize):0)},Sg.prototype.indentation=function(){return l(this.string,null,this.tabSize)-(this.lineStart?l(this.string,this.lineStart,this.tabSize):0)},Sg.prototype.match=function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},Sg.prototype.current=function(){return this.string.slice(this.start,this.pos)},Sg.prototype.hideFirstChars=function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}};var Tg=function(a,b,c){this.text=a,da(this,b),this.height=c?c(this):1};Tg.prototype.lineNo=function(){return F(this)},Ia(Tg);var Ug,Vg={},Wg={},Xg=null,Yg=null,Zg={left:0,right:0,top:0,bottom:0},$g=0,_g=null;$f?_g=-.53:Wf?_g=15:cg?_g=-.7:eg&&(_g=-1/3);var ah=function(a,b,c){this.cm=c;var e=this.vert=d("div",[d("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),f=this.horiz=d("div",[d("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");a(e),a(f),Jg(e,"scroll",(function(){e.clientHeight&&b(e.scrollTop,"vertical")})),Jg(f,"scroll",(function(){f.clientWidth&&b(f.scrollLeft,"horizontal")})),this.checkedZeroWidth=!1,$f&&_f<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};ah.prototype.update=function(a){var b=a.scrollWidth>a.clientWidth+1,c=a.scrollHeight>a.clientHeight+1,d=a.nativeBarWidth;if(c){this.vert.style.display="block",this.vert.style.bottom=b?d+"px":"0";var e=a.viewHeight-(b?d:0);this.vert.firstChild.style.height=Math.max(0,a.scrollHeight-a.clientHeight+e)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(b){this.horiz.style.display="block",this.horiz.style.right=c?d+"px":"0",this.horiz.style.left=a.barLeft+"px";var f=a.viewWidth-a.barLeft-(c?d:0);this.horiz.firstChild.style.width=Math.max(0,a.scrollWidth-a.clientWidth+f)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&a.clientHeight>0&&(0==d&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:c?d:0,bottom:b?d:0}},ah.prototype.setScrollLeft=function(a){this.horiz.scrollLeft!=a&&(this.horiz.scrollLeft=a),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},ah.prototype.setScrollTop=function(a){this.vert.scrollTop!=a&&(this.vert.scrollTop=a),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},ah.prototype.zeroWidthHack=function(){var a=kg&&!fg?"12px":"18px";this.horiz.style.height=this.vert.style.width=a,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new tg,this.disableVert=new tg},ah.prototype.enableZeroWidthBar=function(a,b,c){function d(){var e=a.getBoundingClientRect(),f="vert"==c?document.elementFromPoint(e.right-1,(e.top+e.bottom)/2):document.elementFromPoint((e.right+e.left)/2,e.bottom-1);f!=a?a.style.pointerEvents="none":b.set(1e3,d)}a.style.pointerEvents="auto",b.set(1e3,d)},ah.prototype.clear=function(){var a=this.horiz.parentNode;a.removeChild(this.horiz),a.removeChild(this.vert)};var bh=function(){};bh.prototype.update=function(){return{bottom:0,right:0}},bh.prototype.setScrollLeft=function(){},bh.prototype.setScrollTop=function(){},bh.prototype.clear=function(){};var ch={native:ah,null:bh},dh=0,eh=function(a,b,c){var d=a.display;this.viewport=b,this.visible=Mc(d,a.doc,b),this.editorIsHidden=!d.wrapper.offsetWidth,this.wrapperHeight=d.wrapper.clientHeight,this.wrapperWidth=d.wrapper.clientWidth,this.oldDisplayWidth=Rb(a),this.force=c,this.dims=tc(a),this.events=[]};eh.prototype.signal=function(a,b){Ha(a,b)&&this.events.push(arguments)},eh.prototype.finish=function(){for(var a=this,b=0;b<this.events.length;b++)Ea.apply(null,a.events[b])};var fh=function(a,b){this.ranges=a,this.primIndex=b};fh.prototype.primary=function(){return this.ranges[this.primIndex]},fh.prototype.equals=function(a){var b=this;if(a==this)return!0;if(a.primIndex!=this.primIndex||a.ranges.length!=this.ranges.length)return!1;for(var c=0;c<this.ranges.length;c++){var d=b.ranges[c],e=a.ranges[c];if(!L(d.anchor,e.anchor)||!L(d.head,e.head))return!1}return!0},fh.prototype.deepCopy=function(){for(var a=this,b=[],c=0;c<this.ranges.length;c++)b[c]=new gh(M(a.ranges[c].anchor),M(a.ranges[c].head));return new fh(b,this.primIndex)},fh.prototype.somethingSelected=function(){for(var a=this,b=0;b<this.ranges.length;b++)if(!a.ranges[b].empty())return!0;return!1},fh.prototype.contains=function(a,b){var c=this;b||(b=a);for(var d=0;d<this.ranges.length;d++){var e=c.ranges[d];if(K(b,e.from())>=0&&K(a,e.to())<=0)return d}return-1};var gh=function(a,b){this.anchor=a,this.head=b};gh.prototype.from=function(){return O(this.anchor,this.head)},gh.prototype.to=function(){return N(this.anchor,this.head)},gh.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch};var hh=function(a){var b=this;this.lines=a,this.parent=null;for(var c=0,d=0;d<a.length;++d)a[d].parent=b,c+=a[d].height;this.height=c};hh.prototype.chunkSize=function(){return this.lines.length},hh.prototype.removeInner=function(a,b){for(var c=this,d=a,e=a+b;d<e;++d){var f=c.lines[d];c.height-=f.height,jb(f),xb(f,"delete")}this.lines.splice(a,b)},hh.prototype.collapse=function(a){a.push.apply(a,this.lines)},hh.prototype.insertInner=function(a,b,c){var d=this;this.height+=c,this.lines=this.lines.slice(0,a).concat(b).concat(this.lines.slice(a));for(var e=0;e<b.length;++e)b[e].parent=d},hh.prototype.iterN=function(a,b,c){for(var d=this,e=a+b;a<e;++a)if(c(d.lines[a]))return!0};var ih=function(a){var b=this;this.children=a;for(var c=0,d=0,e=0;e<a.length;++e){var f=a[e];c+=f.chunkSize(),d+=f.height,f.parent=b}this.size=c,this.height=d,this.parent=null};ih.prototype.chunkSize=function(){return this.size},ih.prototype.removeInner=function(a,b){var c=this;this.size-=b;for(var d=0;d<this.children.length;++d){var e=c.children[d],f=e.chunkSize();if(a<f){var g=Math.min(b,f-a),h=e.height;if(e.removeInner(a,g),c.height-=h-e.height,f==g&&(c.children.splice(d--,1),e.parent=null),0==(b-=g))break;a=0}else a-=f}if(this.size-b<25&&(this.children.length>1||!(this.children[0]instanceof hh))){var i=[];this.collapse(i),this.children=[new hh(i)],this.children[0].parent=this}},ih.prototype.collapse=function(a){for(var b=this,c=0;c<this.children.length;++c)b.children[c].collapse(a)},ih.prototype.insertInner=function(a,b,c){var d=this;this.size+=b.length,this.height+=c;for(var e=0;e<this.children.length;++e){var f=d.children[e],g=f.chunkSize();if(a<=g){if(f.insertInner(a,b,c),f.lines&&f.lines.length>50){for(var h=f.lines.length%25+25,i=h;i<f.lines.length;){var j=new hh(f.lines.slice(i,i+=25));f.height-=j.height,d.children.splice(++e,0,j),j.parent=d}f.lines=f.lines.slice(0,h),d.maybeSpill()}break}a-=g}},ih.prototype.maybeSpill=function(){if(!(this.children.length<=10)){var a=this;do{var b=a.children.splice(a.children.length-5,5),c=new ih(b);if(a.parent){a.size-=c.size,a.height-=c.height;var d=m(a.parent.children,a);a.parent.children.splice(d+1,0,c)}else{var e=new ih(a.children);e.parent=a,a.children=[e,c],a=e}c.parent=a.parent}while(a.children.length>10);a.parent.maybeSpill()}},ih.prototype.iterN=function(a,b,c){for(var d=this,e=0;e<this.children.length;++e){var f=d.children[e],g=f.chunkSize();if(a<g){var h=Math.min(b,g-a);if(f.iterN(a,h,c))return!0;if(0==(b-=h))break;a=0}else a-=g}};var jh=function(a,b,c){var d=this;if(c)for(var e in c)c.hasOwnProperty(e)&&(d[e]=c[e]);this.doc=a,this.node=b};jh.prototype.clear=function(){var a=this,b=this.doc.cm,c=this.line.widgets,d=this.line,e=F(d);if(null!=e&&c){for(var f=0;f<c.length;++f)c[f]==a&&c.splice(f--,1);c.length||(d.widgets=null);var g=Lb(this);E(d,Math.max(0,d.height-g)),b&&(jd(b,(function(){Ge(b,d,-g),od(b,e,"widget")})),xb(b,"lineWidgetCleared",b,this,e))}},jh.prototype.changed=function(){var a=this,b=this.height,c=this.doc.cm,d=this.line;this.height=null;var e=Lb(this)-b;e&&(E(d,d.height+e),c&&jd(c,(function(){c.curOp.forceUpdate=!0,Ge(c,d,e),xb(c,"lineWidgetChanged",c,a,F(d))})))},Ia(jh);var kh=0,lh=function(a,b){this.lines=[],this.type=b,this.doc=a,this.id=++kh};lh.prototype.clear=function(){var a=this;if(!this.explicitlyCleared){var b=this.doc.cm,c=b&&!b.curOp;if(c&&bd(b),Ha(this,"clear")){var d=this.find();d&&xb(this,"clear",d.from,d.to)}for(var e=null,f=null,g=0;g<this.lines.length;++g){var h=a.lines[g],i=W(h.markedSpans,a);b&&!a.collapsed?od(b,F(h),"text"):b&&(null!=i.to&&(f=F(h)),null!=i.from&&(e=F(h))),h.markedSpans=X(h.markedSpans,i),null==i.from&&a.collapsed&&!qa(a.doc,h)&&b&&E(h,rc(b.display))}if(b&&this.collapsed&&!b.options.lineWrapping)for(var j=0;j<this.lines.length;++j){var k=la(a.lines[j]),l=ta(k);l>b.display.maxLineLength&&(b.display.maxLine=k,b.display.maxLineLength=l,b.display.maxLineChanged=!0)}null!=e&&b&&this.collapsed&&nd(b,e,f+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,b&&oe(b.doc)),b&&xb(b,"markerCleared",b,this,e,f),c&&cd(b),this.parent&&this.parent.clear()}},lh.prototype.find=function(a,b){var c=this;null==a&&"bookmark"==this.type&&(a=1);for(var d,e,f=0;f<this.lines.length;++f){var g=c.lines[f],h=W(g.markedSpans,c);if(null!=h.from&&(d=J(b?g:F(g),h.from),a==-1))return d;if(null!=h.to&&(e=J(b?g:F(g),h.to),1==a))return e}return d&&{from:d,to:e}},lh.prototype.changed=function(){var a=this,b=this.find(-1,!0),c=this,d=this.doc.cm;b&&d&&jd(d,(function(){var e=b.line,f=F(b.line),g=Xb(d,f);if(g&&(cc(g),d.curOp.selectionChanged=d.curOp.forceUpdate=!0),d.curOp.updateMaxLine=!0,!qa(c.doc,e)&&null!=c.height){var h=c.height;c.height=null;var i=Lb(c)-h;i&&E(e,e.height+i)}xb(d,"markerChanged",d,a)}))},lh.prototype.attachLine=function(a){if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;b.maybeHiddenMarkers&&m(b.maybeHiddenMarkers,this)!=-1||(b.maybeUnhiddenMarkers||(b.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(a)},lh.prototype.detachLine=function(a){if(this.lines.splice(m(this.lines,a),1),!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;(b.maybeHiddenMarkers||(b.maybeHiddenMarkers=[])).push(this)}},Ia(lh);var mh=function(a,b){var c=this;this.markers=a,this.primary=b;for(var d=0;d<a.length;++d)a[d].parent=c};mh.prototype.clear=function(){var a=this;if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var b=0;b<this.markers.length;++b)a.markers[b].clear();xb(this,"clear")}},mh.prototype.find=function(a,b){return this.primary.find(a,b)},Ia(mh);var nh=0,oh=function(a,b,c,d,e){if(!(this instanceof oh))return new oh(a,b,c,d,e);null==c&&(c=0),ih.call(this,[new hh([new Tg("",null)])]),this.first=c,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.frontier=c;var f=J(c,0);this.sel=Fd(f),this.history=new Td(null),this.id=++nh,this.modeOption=b,this.lineSep=d,this.direction="rtl"==e?"rtl":"ltr",this.extend=!1,"string"==typeof a&&(a=this.splitLines(a)),Od(this,{from:f,to:f,text:a}),le(this,Fd(f),yg)};oh.prototype=t(ih.prototype,{constructor:oh,iter:function(a,b,c){c?this.iterN(a-this.first,b-a,c):this.iterN(this.first,this.first+this.size,a)},insert:function(a,b){for(var c=0,d=0;d<b.length;++d)c+=b[d].height;this.insertInner(a-this.first,b,c)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(a){var b=D(this,this.first,this.first+this.size);return a===!1?b:b.join(a||this.lineSeparator())},setValue:md((function(a){var b=J(this.first,0),c=this.first+this.size-1;ve(this,{from:b,to:J(c,B(this,c).text.length),text:this.splitLines(a),origin:"setValue",full:!0},!0),this.cm&&this.cm.scrollTo(0,0),le(this,Fd(b),yg)})),replaceRange:function(a,b,c,d){b=Q(this,b),c=c?Q(this,c):b,Be(this,a,b,c,d)},getRange:function(a,b,c){var d=C(this,Q(this,a),Q(this,b));return c===!1?d:d.join(c||this.lineSeparator())},getLine:function(a){var b=this.getLineHandle(a);return b&&b.text},getLineHandle:function(a){if(H(this,a))return B(this,a)},getLineNumber:function(a){return F(a)},getLineHandleVisualStart:function(a){return"number"==typeof a&&(a=B(this,a)),la(a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return Q(this,a)},getCursor:function(a){var b,c=this.sel.primary();return b=null==a||"head"==a?c.head:"anchor"==a?c.anchor:"end"==a||"to"==a||a===!1?c.to():c.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:md((function(a,b,c){ie(this,Q(this,"number"==typeof a?J(a,b||0):a),null,c)})),setSelection:md((function(a,b,c){ie(this,Q(this,a),Q(this,b||a),c)})),extendSelection:md((function(a,b,c){fe(this,Q(this,a),b&&Q(this,b),c)})),extendSelections:md((function(a,b){ge(this,S(this,a),b)})),extendSelectionsBy:md((function(a,b){var c=q(this.sel.ranges,a);ge(this,S(this,c),b)})),setSelections:md((function(a,b,c){var d=this;if(a.length){for(var e=[],f=0;f<a.length;f++)e[f]=new gh(Q(d,a[f].anchor),Q(d,a[f].head));null==b&&(b=Math.min(a.length-1,this.sel.primIndex)),le(this,Ed(e,b),c)}})),addSelection:md((function(a,b,c){var d=this.sel.ranges.slice(0);d.push(new gh(Q(this,a),Q(this,b||a))),le(this,Ed(d,d.length-1),c)})),getSelection:function(a){for(var b,c=this,d=this.sel.ranges,e=0;e<d.length;e++){var f=C(c,d[e].from(),d[e].to());b=b?b.concat(f):f}return a===!1?b:b.join(a||this.lineSeparator())},getSelections:function(a){for(var b=this,c=[],d=this.sel.ranges,e=0;e<d.length;e++){var f=C(b,d[e].from(),d[e].to());a!==!1&&(f=f.join(a||b.lineSeparator())),c[e]=f}return c},replaceSelection:function(a,b,c){for(var d=[],e=0;e<this.sel.ranges.length;e++)d[e]=a;this.replaceSelections(d,b,c||"+input")},replaceSelections:md((function(a,b,c){for(var d=this,e=[],f=this.sel,g=0;g<f.ranges.length;g++){var h=f.ranges[g];e[g]={from:h.from(),to:h.to(),text:d.splitLines(a[g]),origin:c}}for(var i=b&&"end"!=b&&Kd(this,e,b),j=e.length-1;j>=0;j--)ve(d,e[j]);i?ke(this,i):this.cm&&_c(this.cm)})),undo:md((function(){xe(this,"undo")})),redo:md((function(){xe(this,"redo")})),undoSelection:md((function(){xe(this,"undo",!0)})),redoSelection:md((function(){xe(this,"redo",!0)})),setExtending:function(a){this.extend=a},getExtending:function(){return this.extend},historySize:function(){for(var a=this.history,b=0,c=0,d=0;d<a.done.length;d++)a.done[d].ranges||++b;for(var e=0;e<a.undone.length;e++)a.undone[e].ranges||++c;return{undo:b,redo:c}},clearHistory:function(){this.history=new Td(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(a){return a&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},getHistory:function(){return{done:de(this.history.done),undone:de(this.history.undone)}},setHistory:function(a){var b=this.history=new Td(this.history.maxGeneration);b.done=de(a.done.slice(0),null,!0),b.undone=de(a.undone.slice(0),null,!0)},setGutterMarker:md((function(a,b,c){return Fe(this,a,"gutter",(function(a){var d=a.gutterMarkers||(a.gutterMarkers={});return d[b]=c,!c&&w(d)&&(a.gutterMarkers=null),!0}))})),clearGutter:md((function(a){var b=this;this.iter((function(c){c.gutterMarkers&&c.gutterMarkers[a]&&Fe(b,c,"gutter",(function(){return c.gutterMarkers[a]=null,w(c.gutterMarkers)&&(c.gutterMarkers=null),!0}))}))})),lineInfo:function(a){var b;if("number"==typeof a){if(!H(this,a))return null;if(b=a,a=B(this,a),!a)return null}else if(b=F(a),null==b)return null;return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,
-wrapClass:a.wrapClass,widgets:a.widgets}},addLineClass:md((function(b,c,d){return Fe(this,b,"gutter"==c?"gutter":"class",(function(b){var e="text"==c?"textClass":"background"==c?"bgClass":"gutter"==c?"gutterClass":"wrapClass";if(b[e]){if(a(d).test(b[e]))return!1;b[e]+=" "+d}else b[e]=d;return!0}))})),removeLineClass:md((function(b,c,d){return Fe(this,b,"gutter"==c?"gutter":"class",(function(b){var e="text"==c?"textClass":"background"==c?"bgClass":"gutter"==c?"gutterClass":"wrapClass",f=b[e];if(!f)return!1;if(null==d)b[e]=null;else{var g=f.match(a(d));if(!g)return!1;var h=g.index+g[0].length;b[e]=f.slice(0,g.index)+(g.index&&h!=f.length?" ":"")+f.slice(h)||null}return!0}))})),addLineWidget:md((function(a,b,c){return He(this,a,b,c)})),removeLineWidget:function(a){a.clear()},markText:function(a,b,c){return Ie(this,Q(this,a),Q(this,b),c,c&&c.type||"range")},setBookmark:function(a,b){var c={replacedWith:b&&(null==b.nodeType?b.widget:b),insertLeft:b&&b.insertLeft,clearWhenEmpty:!1,shared:b&&b.shared,handleMouseEvents:b&&b.handleMouseEvents};return a=Q(this,a),Ie(this,a,a,c,"bookmark")},findMarksAt:function(a){a=Q(this,a);var b=[],c=B(this,a.line).markedSpans;if(c)for(var d=0;d<c.length;++d){var e=c[d];(null==e.from||e.from<=a.ch)&&(null==e.to||e.to>=a.ch)&&b.push(e.marker.parent||e.marker)}return b},findMarks:function(a,b,c){a=Q(this,a),b=Q(this,b);var d=[],e=a.line;return this.iter(a.line,b.line+1,(function(f){var g=f.markedSpans;if(g)for(var h=0;h<g.length;h++){var i=g[h];null!=i.to&&e==a.line&&a.ch>=i.to||null==i.from&&e!=a.line||null!=i.from&&e==b.line&&i.from>=b.ch||c&&!c(i.marker)||d.push(i.marker.parent||i.marker)}++e})),d},getAllMarks:function(){var a=[];return this.iter((function(b){var c=b.markedSpans;if(c)for(var d=0;d<c.length;++d)null!=c[d].from&&a.push(c[d].marker)})),a},posFromIndex:function(a){var b,c=this.first,d=this.lineSeparator().length;return this.iter((function(e){var f=e.text.length+d;return f>a?(b=a,!0):(a-=f,void++c)})),Q(this,J(c,b))},indexFromPos:function(a){a=Q(this,a);var b=a.ch;if(a.line<this.first||a.ch<0)return 0;var c=this.lineSeparator().length;return this.iter(this.first,a.line,(function(a){b+=a.text.length+c})),b},copy:function(a){var b=new oh(D(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return b.scrollTop=this.scrollTop,b.scrollLeft=this.scrollLeft,b.sel=this.sel,b.extend=!1,a&&(b.history.undoDepth=this.history.undoDepth,b.setHistory(this.getHistory())),b},linkedDoc:function(a){a||(a={});var b=this.first,c=this.first+this.size;null!=a.from&&a.from>b&&(b=a.from),null!=a.to&&a.to<c&&(c=a.to);var d=new oh(D(this,b,c),a.mode||this.modeOption,b,this.lineSep,this.direction);return a.sharedHist&&(d.history=this.history),(this.linked||(this.linked=[])).push({doc:d,sharedHist:a.sharedHist}),d.linked=[{doc:this,isParent:!0,sharedHist:a.sharedHist}],Le(d,Ke(this)),d},unlinkDoc:function(a){var b=this;if(a instanceof Af&&(a=a.doc),this.linked)for(var c=0;c<this.linked.length;++c){var d=b.linked[c];if(d.doc==a){b.linked.splice(c,1),a.unlinkDoc(b),Me(Ke(b));break}}if(a.history==this.history){var e=[a.id];Pd(a,(function(a){return e.push(a.id)}),!0),a.history=new Td(null),a.history.done=de(this.history.done,e),a.history.undone=de(this.history.undone,e)}},iterLinkedDocs:function(a){Pd(this,a)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(a){return this.lineSep?a.split(this.lineSep):Lg(a)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:md((function(a){"rtl"!=a&&(a="ltr"),a!=this.direction&&(this.direction=a,this.iter((function(a){return a.order=null})),this.cm&&Sd(this.cm))}))}),oh.prototype.eachLine=oh.prototype.iter;for(var ph=0,qh=!1,rh={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},sh=0;sh<10;sh++)rh[sh+48]=rh[sh+96]=String(sh);for(var th=65;th<=90;th++)rh[th]=String.fromCharCode(th);for(var uh=1;uh<=12;uh++)rh[uh+111]=rh[uh+63235]="F"+uh;var vh={};vh.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},vh.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},vh.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},vh.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},vh.default=kg?vh.macDefault:vh.pcDefault;var wh,xh,yh={selectAll:te,singleSelection:function(a){return a.setSelection(a.getCursor("anchor"),a.getCursor("head"),yg)},killLine:function(a){return _e(a,(function(b){if(b.empty()){var c=B(a.doc,b.head.line).text.length;return b.head.ch==c&&b.head.line<a.lastLine()?{from:b.head,to:J(b.head.line+1,0)}:{from:b.head,to:J(b.head.line,c)}}return{from:b.from(),to:b.to()}}))},deleteLine:function(a){return _e(a,(function(b){return{from:J(b.from().line,0),to:Q(a.doc,J(b.to().line+1,0))}}))},delLineLeft:function(a){return _e(a,(function(a){return{from:J(a.from().line,0),to:a.from()}}))},delWrappedLineLeft:function(a){return _e(a,(function(b){var c=a.charCoords(b.head,"div").top+5,d=a.coordsChar({left:0,top:c},"div");return{from:d,to:b.from()}}))},delWrappedLineRight:function(a){return _e(a,(function(b){var c=a.charCoords(b.head,"div").top+5,d=a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div");return{from:b.from(),to:d}}))},undo:function(a){return a.undo()},redo:function(a){return a.redo()},undoSelection:function(a){return a.undoSelection()},redoSelection:function(a){return a.redoSelection()},goDocStart:function(a){return a.extendSelection(J(a.firstLine(),0))},goDocEnd:function(a){return a.extendSelection(J(a.lastLine()))},goLineStart:function(a){return a.extendSelectionsBy((function(b){return af(a,b.head.line)}),{origin:"+move",bias:1})},goLineStartSmart:function(a){return a.extendSelectionsBy((function(b){return cf(a,b.head)}),{origin:"+move",bias:1})},goLineEnd:function(a){return a.extendSelectionsBy((function(b){return bf(a,b.head.line)}),{origin:"+move",bias:-1})},goLineRight:function(a){return a.extendSelectionsBy((function(b){var c=a.charCoords(b.head,"div").top+5;return a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div")}),Ag)},goLineLeft:function(a){return a.extendSelectionsBy((function(b){var c=a.charCoords(b.head,"div").top+5;return a.coordsChar({left:0,top:c},"div")}),Ag)},goLineLeftSmart:function(a){return a.extendSelectionsBy((function(b){var c=a.charCoords(b.head,"div").top+5,d=a.coordsChar({left:0,top:c},"div");return d.ch<a.getLine(d.line).search(/\S/)?cf(a,b.head):d}),Ag)},goLineUp:function(a){return a.moveV(-1,"line")},goLineDown:function(a){return a.moveV(1,"line")},goPageUp:function(a){return a.moveV(-1,"page")},goPageDown:function(a){return a.moveV(1,"page")},goCharLeft:function(a){return a.moveH(-1,"char")},goCharRight:function(a){return a.moveH(1,"char")},goColumnLeft:function(a){return a.moveH(-1,"column")},goColumnRight:function(a){return a.moveH(1,"column")},goWordLeft:function(a){return a.moveH(-1,"word")},goGroupRight:function(a){return a.moveH(1,"group")},goGroupLeft:function(a){return a.moveH(-1,"group")},goWordRight:function(a){return a.moveH(1,"word")},delCharBefore:function(a){return a.deleteH(-1,"char")},delCharAfter:function(a){return a.deleteH(1,"char")},delWordBefore:function(a){return a.deleteH(-1,"word")},delWordAfter:function(a){return a.deleteH(1,"word")},delGroupBefore:function(a){return a.deleteH(-1,"group")},delGroupAfter:function(a){return a.deleteH(1,"group")},indentAuto:function(a){return a.indentSelection("smart")},indentMore:function(a){return a.indentSelection("add")},indentLess:function(a){return a.indentSelection("subtract")},insertTab:function(a){return a.replaceSelection("\t")},insertSoftTab:function(a){for(var b=[],c=a.listSelections(),d=a.options.tabSize,e=0;e<c.length;e++){var f=c[e].from(),g=l(a.getLine(f.line),f.ch,d);b.push(o(d-g%d))}a.replaceSelections(b)},defaultTab:function(a){a.somethingSelected()?a.indentSelection("add"):a.execCommand("insertTab")},transposeChars:function(a){return jd(a,(function(){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++)if(b[d].empty()){var e=b[d].head,f=B(a.doc,e.line).text;if(f)if(e.ch==f.length&&(e=new J(e.line,e.ch-1)),e.ch>0)e=new J(e.line,e.ch+1),a.replaceRange(f.charAt(e.ch-1)+f.charAt(e.ch-2),J(e.line,e.ch-2),e,"+transpose");else if(e.line>a.doc.first){var g=B(a.doc,e.line-1).text;g&&(e=new J(e.line,1),a.replaceRange(f.charAt(0)+a.doc.lineSeparator()+g.charAt(g.length-1),J(e.line-1,g.length-1),e,"+transpose"))}c.push(new gh(e,e))}a.setSelections(c)}))},newlineAndIndent:function(a){return jd(a,(function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange(a.doc.lineSeparator(),b[c].anchor,b[c].head,"+input");b=a.listSelections();for(var d=0;d<b.length;d++)a.indentLine(b[d].from().line,null,!0);_c(a)}))},openLine:function(a){return a.replaceSelection("\n","start")},toggleOverwrite:function(a){return a.toggleOverwrite()}},zh=new tg,Ah=null,Bh={toString:function(){return"CodeMirror.Init"}},Ch={},Dh={};Af.defaults=Ch,Af.optionHandlers=Dh;var Eh=[];Af.defineInitHook=function(a){return Eh.push(a)};var Fh=null,Gh=function(a){var b=a.optionHandlers,c=a.helpers={};a.prototype={constructor:a,focus:function(){window.focus(),this.display.input.focus()},setOption:function(a,c){var d=this.options,e=d[a];d[a]==c&&"mode"!=a||(d[a]=c,b.hasOwnProperty(a)&&kd(this,b[a])(this,c,e),Ea(this,"optionChange",this,a))},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"]($e(a))},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c<b.length;++c)if(b[c]==a||b[c].name==a)return b.splice(c,1),!0},addOverlay:ld((function(b,c){var d=b.token?b:a.getMode(this.options,b);if(d.startState)throw new Error("Overlays may not be stateful.");r(this.state.overlays,{mode:d,modeSpec:b,opaque:c&&c.opaque,priority:c&&c.priority||0},(function(a){return a.priority})),this.state.modeGen++,nd(this)})),removeOverlay:ld((function(a){for(var b=this,c=this.state.overlays,d=0;d<c.length;++d){var e=c[d].modeSpec;if(e==a||"string"==typeof a&&e.name==a)return c.splice(d,1),b.state.modeGen++,void nd(b)}})),indentLine:ld((function(a,b,c){"string"!=typeof b&&"number"!=typeof b&&(b=null==b?this.options.smartIndent?"smart":"prev":b?"add":"subtract"),H(this.doc,a)&&Cf(this,a,b,c)})),indentSelection:ld((function(a){for(var b=this,c=this.doc.sel.ranges,d=-1,e=0;e<c.length;e++){var f=c[e];if(f.empty())f.head.line>d&&(Cf(b,f.head.line,a,!0),d=f.head.line,e==b.doc.sel.primIndex&&_c(b));else{var g=f.from(),h=f.to(),i=Math.max(d,g.line);d=Math.min(b.lastLine(),h.line-(h.ch?0:1))+1;for(var j=i;j<d;++j)Cf(b,j,a);var k=b.doc.sel.ranges;0==g.ch&&c.length==k.length&&k[e].from().ch>0&&he(b.doc,e,new gh(g,k[e].to()),yg)}}})),getTokenAt:function(a,b){return eb(this,a,b)},getLineTokens:function(a,b){return eb(this,J(a),b,!0)},getTokenTypeAt:function(a){a=Q(this.doc,a);var b,c=_a(this,B(this.doc,a.line)),d=0,e=(c.length-1)/2,f=a.ch;if(0==f)b=c[2];else for(;;){var g=d+e>>1;if((g?c[2*g-1]:0)>=f)e=g;else{if(!(c[2*g+1]<f)){b=c[2*g+2];break}d=g+1}}var h=b?b.indexOf("overlay "):-1;return h<0?b:0==h?null:b.slice(0,h-1)},getModeAt:function(b){var c=this.doc.mode;return c.innerMode?a.innerMode(c,this.getTokenAt(b).state).mode:c},getHelper:function(a,b){return this.getHelpers(a,b)[0]},getHelpers:function(a,b){var d=this,e=[];if(!c.hasOwnProperty(b))return e;var f=c[b],g=this.getModeAt(a);if("string"==typeof g[b])f[g[b]]&&e.push(f[g[b]]);else if(g[b])for(var h=0;h<g[b].length;h++){var i=f[g[b][h]];i&&e.push(i)}else g.helperType&&f[g.helperType]?e.push(f[g.helperType]):f[g.name]&&e.push(f[g.name]);for(var j=0;j<f._global.length;j++){var k=f._global[j];k.pred(g,d)&&m(e,k.val)==-1&&e.push(k.val)}return e},getStateAfter:function(a,b){var c=this.doc;return a=P(c,null==a?c.first+c.size-1:a),ab(this,a+1,b)},cursorCoords:function(a,b){var c,d=this.doc.sel.primary();return c=null==a?d.head:"object"==typeof a?Q(this.doc,a):a?d.from():d.to(),kc(this,c,b||"page")},charCoords:function(a,b){return jc(this,Q(this.doc,a),b||"page")},coordsChar:function(a,b){return a=ic(this,a,b||"page"),nc(this,a.left,a.top)},lineAtHeight:function(a,b){return a=ic(this,{top:a,left:0},b||"page").top,G(this.doc,a+this.display.viewOffset)},heightAtLine:function(a,b,c){var d,e=!1;if("number"==typeof a){var f=this.doc.first+this.doc.size-1;a<this.doc.first?a=this.doc.first:a>f&&(a=f,e=!0),d=B(this.doc,a)}else d=a;return hc(this,d,{top:0,left:0},b||"page",c||e).top+(e?this.doc.height-sa(d):0)},defaultTextHeight:function(){return rc(this.display)},defaultCharWidth:function(){return sc(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(a,b,c,d,e){var f=this.display;a=kc(this,Q(this.doc,a));var g=a.bottom,h=a.left;if(b.style.position="absolute",b.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(b),f.sizer.appendChild(b),"over"==d)g=a.top;else if("above"==d||"near"==d){var i=Math.max(f.wrapper.clientHeight,this.doc.height),j=Math.max(f.sizer.clientWidth,f.lineSpace.clientWidth);("above"==d||a.bottom+b.offsetHeight>i)&&a.top>b.offsetHeight?g=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=i&&(g=a.bottom),h+b.offsetWidth>j&&(h=j-b.offsetWidth)}b.style.top=g+"px",b.style.left=b.style.right="","right"==e?(h=f.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==e?h=0:"middle"==e&&(h=(f.sizer.clientWidth-b.offsetWidth)/2),b.style.left=h+"px"),c&&Yc(this,{left:h,top:g,right:h+b.offsetWidth,bottom:g+b.offsetHeight})},triggerOnKeyDown:ld(jf),triggerOnKeyPress:ld(mf),triggerOnKeyUp:lf,execCommand:function(a){if(yh.hasOwnProperty(a))return yh[a].call(null,this)},triggerElectric:ld((function(a){Gf(this,a)})),findPosH:function(a,b,c,d){var e=this,f=1;b<0&&(f=-1,b=-b);for(var g=Q(this.doc,a),h=0;h<b&&(g=Kf(e.doc,g,f,c,d),!g.hitSide);++h);return g},moveH:ld((function(a,b){var c=this;this.extendSelectionsBy((function(d){return c.display.shift||c.doc.extend||d.empty()?Kf(c.doc,d.head,a,b,c.options.rtlMoveVisually):a<0?d.from():d.to()}),Ag)})),deleteH:ld((function(a,b){var c=this.doc.sel,d=this.doc;c.somethingSelected()?d.replaceSelection("",null,"+delete"):_e(this,(function(c){var e=Kf(d,c.head,a,b,!1);return a<0?{from:e,to:c.head}:{from:c.head,to:e}}))})),findPosV:function(a,b,c,d){var e=this,f=1,g=d;b<0&&(f=-1,b=-b);for(var h=Q(this.doc,a),i=0;i<b;++i){var j=kc(e,h,"div");if(null==g?g=j.left:j.left=g,h=Lf(e,j,f,c),h.hitSide)break}return h},moveV:ld((function(a,b){var c=this,d=this.doc,e=[],f=!this.display.shift&&!d.extend&&d.sel.somethingSelected();if(d.extendSelectionsBy((function(g){if(f)return a<0?g.from():g.to();var h=kc(c,g.head,"div");null!=g.goalColumn&&(h.left=g.goalColumn),e.push(h.left);var i=Lf(c,h,a,b);return"page"==b&&g==d.sel.primary()&&$c(c,null,jc(c,i,"div").top-h.top),i}),Ag),e.length)for(var g=0;g<d.sel.ranges.length;g++)d.sel.ranges[g].goalColumn=e[g]})),findWordAt:function(a){var b=this.doc,c=B(b,a.line).text,d=a.ch,e=a.ch;if(c){var f=this.getHelper(a,"wordChars");"before"!=a.sticky&&e!=c.length||!d?++e:--d;for(var g=c.charAt(d),h=v(g,f)?function(a){return v(a,f)}:/\s/.test(g)?function(a){return/\s/.test(a)}:function(a){return!/\s/.test(a)&&!v(a)};d>0&&h(c.charAt(d-1));)--d;for(;e<c.length&&h(c.charAt(e));)++e}return new gh(J(a.line,d),J(a.line,e))},toggleOverwrite:function(a){null!=a&&a==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?h(this.display.cursorDiv,"CodeMirror-overwrite"):rg(this.display.cursorDiv,"CodeMirror-overwrite"),Ea(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==g()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:ld((function(a,b){null==a&&null==b||ad(this),null!=a&&(this.curOp.scrollLeft=a),null!=b&&(this.curOp.scrollTop=b)})),getScrollInfo:function(){var a=this.display.scroller;return{left:a.scrollLeft,top:a.scrollTop,height:a.scrollHeight-Qb(this)-this.display.barHeight,width:a.scrollWidth-Qb(this)-this.display.barWidth,clientHeight:Sb(this),clientWidth:Rb(this)}},scrollIntoView:ld((function(a,b){if(null==a?(a={from:this.doc.sel.primary().head,to:null},null==b&&(b=this.options.cursorScrollMargin)):"number"==typeof a?a={from:J(a,0),to:null}:null==a.from&&(a={from:a,to:null}),a.to||(a.to=a.from),a.margin=b||0,null!=a.from.line)ad(this),this.curOp.scrollToPos=a;else{var c=Zc(this,{left:Math.min(a.from.left,a.to.left),top:Math.min(a.from.top,a.to.top)-a.margin,right:Math.max(a.from.right,a.to.right),bottom:Math.max(a.from.bottom,a.to.bottom)+a.margin});this.scrollTo(c.scrollLeft,c.scrollTop)}})),setSize:ld((function(a,b){var c=this,d=function(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a};null!=a&&(this.display.wrapper.style.width=d(a)),null!=b&&(this.display.wrapper.style.height=d(b)),this.options.lineWrapping&&dc(this);var e=this.display.viewFrom;this.doc.iter(e,this.display.viewTo,(function(a){if(a.widgets)for(var b=0;b<a.widgets.length;b++)if(a.widgets[b].noHScroll){od(c,e,"widget");break}++e})),this.curOp.forceUpdate=!0,Ea(this,"refresh",this)})),operation:function(a){return jd(this,a)},refresh:ld((function(){var a=this.display.cachedTextHeight;nd(this),this.curOp.forceUpdate=!0,ec(this),this.scrollTo(this.doc.scrollLeft,this.doc.scrollTop),Ad(this),(null==a||Math.abs(a-rc(this.display))>.5)&&wc(this),Ea(this,"refresh",this)})),swapDoc:ld((function(a){var b=this.doc;return b.cm=null,Qd(this,a),ec(this),this.display.input.reset(),this.scrollTo(a.scrollLeft,a.scrollTop),this.curOp.forceScroll=!0,xb(this,"swapDoc",this,b),b})),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},Ia(a),a.registerHelper=function(b,d,e){c.hasOwnProperty(b)||(c[b]=a[b]={_global:[]}),c[b][d]=e},a.registerGlobalHelper=function(b,d,e,f){a.registerHelper(b,d,f),c[b]._global.push({pred:e,val:f})}},Hh=function(a){this.cm=a,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new tg,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};Hh.prototype.init=function(a){function b(a){if(!Fa(e,a)){if(e.somethingSelected())Df({lineWise:!1,text:e.getSelections()}),"cut"==a.type&&e.replaceSelection("",null,"cut");else{if(!e.options.lineWiseCopyCut)return;var b=Hf(e);Df({lineWise:!0,text:b.text}),"cut"==a.type&&e.operation((function(){e.setSelections(b.ranges,0,yg),e.replaceSelection("",null,"cut")}))}if(a.clipboardData){a.clipboardData.clearData();var c=Fh.text.join("\n");if(a.clipboardData.setData("Text",c),a.clipboardData.getData("Text")==c)return void a.preventDefault()}var g=Jf(),h=g.firstChild;e.display.lineSpace.insertBefore(g,e.display.lineSpace.firstChild),h.value=Fh.text.join("\n");var i=document.activeElement;sg(h),setTimeout((function(){e.display.lineSpace.removeChild(g),i.focus(),i==f&&d.showPrimarySelection()}),50)}}var c=this,d=this,e=d.cm,f=d.div=a.lineDiv;If(f,e.options.spellcheck),Jg(f,"paste",(function(a){Fa(e,a)||Ff(a,e)||_f<=11&&setTimeout(kd(e,(function(){return c.updateFromDOM()})),20)})),Jg(f,"compositionstart",(function(a){c.composing={data:a.data,done:!1}})),Jg(f,"compositionupdate",(function(a){c.composing||(c.composing={data:a.data,done:!1})})),Jg(f,"compositionend",(function(a){c.composing&&(a.data!=c.composing.data&&c.readFromDOMSoon(),c.composing.done=!0)})),Jg(f,"touchstart",(function(){return d.forceCompositionEnd()})),Jg(f,"input",(function(){c.composing||c.readFromDOMSoon()})),Jg(f,"copy",b),Jg(f,"cut",b)},Hh.prototype.prepareSelection=function(){var a=Ac(this.cm,!1);return a.focus=this.cm.state.focused,a},Hh.prototype.showSelection=function(a,b){a&&this.cm.display.view.length&&((a.focus||b)&&this.showPrimarySelection(),this.showMultipleSelections(a))},Hh.prototype.showPrimarySelection=function(){var a=window.getSelection(),b=this.cm,c=b.doc.sel.primary(),d=c.from(),e=c.to();if(b.display.viewTo==b.display.viewFrom||d.line>=b.display.viewTo||e.line<b.display.viewFrom)return void a.removeAllRanges();var f=Qf(b,a.anchorNode,a.anchorOffset),g=Qf(b,a.focusNode,a.focusOffset);if(!f||f.bad||!g||g.bad||0!=K(O(f,g),d)||0!=K(N(f,g),e)){var h=b.display.view,i=d.line>=b.display.viewFrom&&Mf(b,d)||{node:h[0].measure.map[2],offset:0},j=e.line<b.display.viewTo&&Mf(b,e);if(!j){var k=h[h.length-1].measure,l=k.maps?k.maps[k.maps.length-1]:k.map;j={node:l[l.length-1],offset:l[l.length-2]-l[l.length-3]}}if(!i||!j)return void a.removeAllRanges();var m,n=a.rangeCount&&a.getRangeAt(0);try{m=og(i.node,i.offset,j.offset,j.node)}catch(a){}m&&(!Wf&&b.state.focused?(a.collapse(i.node,i.offset),m.collapsed||(a.removeAllRanges(),a.addRange(m))):(a.removeAllRanges(),a.addRange(m)),n&&null==a.anchorNode?a.addRange(n):Wf&&this.startGracePeriod()),this.rememberSelection()}},Hh.prototype.startGracePeriod=function(){var a=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout((function(){a.gracePeriod=!1,a.selectionChanged()&&a.cm.operation((function(){return a.cm.curOp.selectionChanged=!0}))}),20)},Hh.prototype.showMultipleSelections=function(a){c(this.cm.display.cursorDiv,a.cursors),c(this.cm.display.selectionDiv,a.selection)},Hh.prototype.rememberSelection=function(){var a=window.getSelection();this.lastAnchorNode=a.anchorNode,this.lastAnchorOffset=a.anchorOffset,this.lastFocusNode=a.focusNode,this.lastFocusOffset=a.focusOffset},Hh.prototype.selectionInEditor=function(){var a=window.getSelection();if(!a.rangeCount)return!1;var b=a.getRangeAt(0).commonAncestorContainer;return f(this.div,b)},Hh.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()||this.showSelection(this.prepareSelection(),!0),this.div.focus())},Hh.prototype.blur=function(){this.div.blur()},Hh.prototype.getField=function(){return this.div},Hh.prototype.supportsTouch=function(){return!0},Hh.prototype.receivedFocus=function(){function a(){b.cm.state.focused&&(b.pollSelection(),b.polling.set(b.cm.options.pollInterval,a))}var b=this;this.selectionInEditor()?this.pollSelection():jd(this.cm,(function(){return b.cm.curOp.selectionChanged=!0})),this.polling.set(this.cm.options.pollInterval,a)},Hh.prototype.selectionChanged=function(){var a=window.getSelection();return a.anchorNode!=this.lastAnchorNode||a.anchorOffset!=this.lastAnchorOffset||a.focusNode!=this.lastFocusNode||a.focusOffset!=this.lastFocusOffset},Hh.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var a=window.getSelection(),b=this.cm;if(ig&&cg&&this.cm.options.gutters.length&&Nf(a.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var c=Qf(b,a.anchorNode,a.anchorOffset),d=Qf(b,a.focusNode,a.focusOffset);c&&d&&jd(b,(function(){le(b.doc,Fd(c,d),yg),(c.bad||d.bad)&&(b.curOp.selectionChanged=!0)}))}}},Hh.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var a=this.cm,b=a.display,c=a.doc.sel.primary(),d=c.from(),e=c.to();if(0==d.ch&&d.line>a.firstLine()&&(d=J(d.line-1,B(a.doc,d.line-1).length)),e.ch==B(a.doc,e.line).text.length&&e.line<a.lastLine()&&(e=J(e.line+1,0)),d.line<b.viewFrom||e.line>b.viewTo-1)return!1;var f,g,h;d.line==b.viewFrom||0==(f=yc(a,d.line))?(g=F(b.view[0].line),h=b.view[0].node):(g=F(b.view[f].line),h=b.view[f-1].node.nextSibling);var i,j,k=yc(a,e.line);if(k==b.view.length-1?(i=b.viewTo-1,j=b.lineDiv.lastChild):(i=F(b.view[k+1].line)-1,j=b.view[k+1].node.previousSibling),!h)return!1;for(var l=a.doc.splitLines(Pf(a,h,j,g,i)),m=C(a.doc,J(g,0),J(i,B(a.doc,i).text.length));l.length>1&&m.length>1;)if(p(l)==p(m))l.pop(),m.pop(),i--;else{if(l[0]!=m[0])break;l.shift(),m.shift(),g++}for(var n=0,o=0,q=l[0],r=m[0],s=Math.min(q.length,r.length);n<s&&q.charCodeAt(n)==r.charCodeAt(n);)++n;for(var t=p(l),u=p(m),v=Math.min(t.length-(1==l.length?n:0),u.length-(1==m.length?n:0));o<v&&t.charCodeAt(t.length-o-1)==u.charCodeAt(u.length-o-1);)++o;if(1==l.length&&1==m.length&&g==d.line)for(;n&&n>d.ch&&t.charCodeAt(t.length-o-1)==u.charCodeAt(u.length-o-1);)n--,o++;l[l.length-1]=t.slice(0,t.length-o).replace(/^\u200b+/,""),l[0]=l[0].slice(n).replace(/\u200b+$/,"");var w=J(g,n),x=J(i,m.length?p(m).length-o:0);return l.length>1||l[0]||K(w,x)?(Be(a.doc,l,w,x,"+input"),!0):void 0},Hh.prototype.ensurePolled=function(){this.forceCompositionEnd()},Hh.prototype.reset=function(){this.forceCompositionEnd()},Hh.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},Hh.prototype.readFromDOMSoon=function(){var a=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout((function(){if(a.readDOMTimeout=null,a.composing){if(!a.composing.done)return;a.composing=null}a.updateFromDOM()}),80))},Hh.prototype.updateFromDOM=function(){var a=this;!this.cm.isReadOnly()&&this.pollContent()||jd(this.cm,(function(){return nd(a.cm)}))},Hh.prototype.setUneditable=function(a){a.contentEditable="false"},Hh.prototype.onKeyPress=function(a){0!=a.charCode&&(a.preventDefault(),this.cm.isReadOnly()||kd(this.cm,Ef)(this.cm,String.fromCharCode(null==a.charCode?a.keyCode:a.charCode),0))},Hh.prototype.readOnlyChanged=function(a){this.div.contentEditable=String("nocursor"!=a)},Hh.prototype.onContextMenu=function(){},Hh.prototype.resetPosition=function(){},Hh.prototype.needsContentAttribute=!0;var Ih=function(a){this.cm=a,this.prevInput="",this.pollingFast=!1,this.polling=new tg,this.inaccurateSelection=!1,this.hasSelection=!1,this.composing=null};Ih.prototype.init=function(a){function b(a){if(!Fa(e,a)){if(e.somethingSelected())Df({lineWise:!1,text:e.getSelections()}),d.inaccurateSelection&&(d.prevInput="",d.inaccurateSelection=!1,g.value=Fh.text.join("\n"),sg(g));else{if(!e.options.lineWiseCopyCut)return;var b=Hf(e);Df({lineWise:!0,text:b.text}),"cut"==a.type?e.setSelections(b.ranges,null,yg):(d.prevInput="",g.value=b.text.join("\n"),sg(g))}"cut"==a.type&&(e.state.cutIncoming=!0)}}var c=this,d=this,e=this.cm,f=this.wrapper=Jf(),g=this.textarea=f.firstChild;a.wrapper.insertBefore(f,a.wrapper.firstChild),hg&&(g.style.width="0px"),Jg(g,"input",(function(){$f&&_f>=9&&c.hasSelection&&(c.hasSelection=null),d.poll()})),Jg(g,"paste",(function(a){Fa(e,a)||Ff(a,e)||(e.state.pasteIncoming=!0,d.fastPoll())})),Jg(g,"cut",b),Jg(g,"copy",b),Jg(a.scroller,"paste",(function(b){Mb(a,b)||Fa(e,b)||(e.state.pasteIncoming=!0,d.focus())})),Jg(a.lineSpace,"selectstart",(function(b){Mb(a,b)||Ja(b)})),Jg(g,"compositionstart",(function(){var a=e.getCursor("from");d.composing&&d.composing.range.clear(),d.composing={start:a,range:e.markText(a,e.getCursor("to"),{className:"CodeMirror-composing"})}})),Jg(g,"compositionend",(function(){d.composing&&(d.poll(),d.composing.range.clear(),d.composing=null)}))},Ih.prototype.prepareSelection=function(){var a=this.cm,b=a.display,c=a.doc,d=Ac(a);if(a.options.moveInputWithCursor){var e=kc(a,c.sel.primary().head,"div"),f=b.wrapper.getBoundingClientRect(),g=b.lineDiv.getBoundingClientRect();d.teTop=Math.max(0,Math.min(b.wrapper.clientHeight-10,e.top+g.top-f.top)),d.teLeft=Math.max(0,Math.min(b.wrapper.clientWidth-10,e.left+g.left-f.left))}return d},Ih.prototype.showSelection=function(a){var b=this.cm,d=b.display;c(d.cursorDiv,a.cursors),c(d.selectionDiv,a.selection),null!=a.teTop&&(this.wrapper.style.top=a.teTop+"px",this.wrapper.style.left=a.teLeft+"px")},Ih.prototype.reset=function(a){if(!this.contextMenuPending){var b,c,d=this.cm,e=d.doc;if(d.somethingSelected()){this.prevInput="";var f=e.sel.primary();b=Ng&&(f.to().line-f.from().line>100||(c=d.getSelection()).length>1e3);var g=b?"-":c||d.getSelection();this.textarea.value=g,d.state.focused&&sg(this.textarea),$f&&_f>=9&&(this.hasSelection=g)}else a||(this.prevInput=this.textarea.value="",$f&&_f>=9&&(this.hasSelection=null));this.inaccurateSelection=b}},Ih.prototype.getField=function(){return this.textarea},Ih.prototype.supportsTouch=function(){return!1},Ih.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!jg||g()!=this.textarea))try{this.textarea.focus()}catch(a){}},Ih.prototype.blur=function(){this.textarea.blur()},Ih.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Ih.prototype.receivedFocus=function(){this.slowPoll()},Ih.prototype.slowPoll=function(){var a=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,(function(){a.poll(),a.cm.state.focused&&a.slowPoll()}))},Ih.prototype.fastPoll=function(){function a(){var d=c.poll();d||b?(c.pollingFast=!1,c.slowPoll()):(b=!0,c.polling.set(60,a))}var b=!1,c=this;c.pollingFast=!0,c.polling.set(20,a)},Ih.prototype.poll=function(){var a=this,b=this.cm,c=this.textarea,d=this.prevInput;if(this.contextMenuPending||!b.state.focused||Mg(c)&&!d&&!this.composing||b.isReadOnly()||b.options.disableInput||b.state.keySeq)return!1;var e=c.value;if(e==d&&!b.somethingSelected())return!1;if($f&&_f>=9&&this.hasSelection===e||kg&&/[\uf700-\uf7ff]/.test(e))return b.display.input.reset(),!1;if(b.doc.sel==b.display.selForContextMenu){var f=e.charCodeAt(0);if(8203!=f||d||(d="​"),8666==f)return this.reset(),this.cm.execCommand("undo")}for(var g=0,h=Math.min(d.length,e.length);g<h&&d.charCodeAt(g)==e.charCodeAt(g);)++g;return jd(b,(function(){Ef(b,e.slice(g),d.length-g,null,a.composing?"*compose":null),e.length>1e3||e.indexOf("\n")>-1?c.value=a.prevInput="":a.prevInput=e,a.composing&&(a.composing.range.clear(),a.composing.range=b.markText(a.composing.start,b.getCursor("to"),{className:"CodeMirror-composing"}))})),!0},Ih.prototype.ensurePolled=function(){
-this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Ih.prototype.onKeyPress=function(){$f&&_f>=9&&(this.hasSelection=null),this.fastPoll()},Ih.prototype.onContextMenu=function(a){function b(){if(null!=g.selectionStart){var a=e.somethingSelected(),b="​"+(a?g.value:"");g.value="⇚",g.value=b,d.prevInput=a?"":"​",g.selectionStart=1,g.selectionEnd=b.length,f.selForContextMenu=e.doc.sel}}function c(){if(d.contextMenuPending=!1,d.wrapper.style.cssText=l,g.style.cssText=k,$f&&_f<9&&f.scrollbars.setScrollTop(f.scroller.scrollTop=i),null!=g.selectionStart){(!$f||$f&&_f<9)&&b();var a=0,c=function(){f.selForContextMenu==e.doc.sel&&0==g.selectionStart&&g.selectionEnd>0&&"​"==d.prevInput?kd(e,te)(e):a++<10?f.detectingSelectAll=setTimeout(c,500):(f.selForContextMenu=null,f.input.reset())};f.detectingSelectAll=setTimeout(c,200)}}var d=this,e=d.cm,f=e.display,g=d.textarea,h=xc(e,a),i=f.scroller.scrollTop;if(h&&!dg){var j=e.options.resetSelectionOnContextMenu;j&&e.doc.sel.contains(h)==-1&&kd(e,le)(e.doc,Fd(h),yg);var k=g.style.cssText,l=d.wrapper.style.cssText;d.wrapper.style.cssText="position: absolute";var m=d.wrapper.getBoundingClientRect();g.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(a.clientY-m.top-5)+"px; left: "+(a.clientX-m.left-5)+"px;\n      z-index: 1000; background: "+($f?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";var n;if(ag&&(n=window.scrollY),f.input.focus(),ag&&window.scrollTo(null,n),f.input.reset(),e.somethingSelected()||(g.value=d.prevInput=" "),d.contextMenuPending=!0,f.selForContextMenu=e.doc.sel,clearTimeout(f.detectingSelectAll),$f&&_f>=9&&b(),qg){Ma(a);var o=function(){Da(window,"mouseup",o),setTimeout(c,20)};Jg(window,"mouseup",o)}else setTimeout(c,50)}},Ih.prototype.readOnlyChanged=function(a){a||this.reset()},Ih.prototype.setUneditable=function(){},Ih.prototype.needsContentAttribute=!1,wf(Af),Gh(Af);var Jh="iter insert remove copy getEditor constructor".split(" ");for(var Kh in oh.prototype)oh.prototype.hasOwnProperty(Kh)&&m(Jh,Kh)<0&&(Af.prototype[Kh]=(function(a){return function(){return a.apply(this.doc,arguments)}})(oh.prototype[Kh]));return Ia(oh),Af.inputStyles={textarea:Ih,contenteditable:Hh},Af.defineMode=function(a){Af.defaults.mode||"null"==a||(Af.defaults.mode=a),Sa.apply(this,arguments)},Af.defineMIME=Ta,Af.defineMode("null",(function(){return{token:function(a){return a.skipToEnd()}}})),Af.defineMIME("text/plain","null"),Af.defineExtension=function(a,b){Af.prototype[a]=b},Af.defineDocExtension=function(a,b){oh.prototype[a]=b},Af.fromTextArea=Sf,Tf(Af),Af.version="5.25.2",Af}));
\ No newline at end of file
+!(function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.CodeMirror=b()})(this,(function(){"use strict";function a(a){return new RegExp("(^|\\s)"+a+"(?:$|\\s)\\s*")}function b(a){for(var b=a.childNodes.length;b>0;--b)a.removeChild(a.firstChild);return a}function c(a,c){return b(a).appendChild(c)}function d(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)e.appendChild(document.createTextNode(b));else if(b)for(var f=0;f<b.length;++f)e.appendChild(b[f]);return e}function e(a,b,c,e){var f=d(a,b,c,e);return f.setAttribute("role","presentation"),f}function f(a,b){if(3==b.nodeType&&(b=b.parentNode),a.contains)return a.contains(b);do if(11==b.nodeType&&(b=b.host),b==a)return!0;while(b=b.parentNode)}function g(){var a;try{a=document.activeElement}catch(b){a=document.body||null}for(;a&&a.shadowRoot&&a.shadowRoot.activeElement;)a=a.shadowRoot.activeElement;return a}function h(b,c){var d=b.className;a(c).test(d)||(b.className+=(d?" ":"")+c)}function i(b,c){for(var d=b.split(" "),e=0;e<d.length;e++)d[e]&&!a(d[e]).test(c)&&(c+=" "+d[e]);return c}function j(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function k(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||c===!1&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}function l(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),b==-1&&(b=a.length));for(var f=d||0,g=e||0;;){var h=a.indexOf("\t",f);if(h<0||h>=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}}function m(a,b){for(var c=0;c<a.length;++c)if(a[c]==b)return c;return-1}function n(a,b,c){for(var d=0,e=0;;){var f=a.indexOf("\t",d);f==-1&&(f=a.length);var g=f-d;if(f==a.length||e+g>=b)return d+Math.min(g,b-e);if(e+=f-d,e+=c-e%c,d=f+1,e>=b)return d}}function o(a){for(;Pg.length<=a;)Pg.push(p(Pg)+" ");return Pg[a]}function p(a){return a[a.length-1]}function q(a,b){for(var c=[],d=0;d<a.length;d++)c[d]=b(a[d],d);return c}function r(a,b,c){for(var d=0,e=c(b);d<a.length&&c(a[d])<=e;)d++;a.splice(d,0,b)}function s(){}function t(a,b){var c;return Object.create?c=Object.create(a):(s.prototype=a,c=new s),b&&k(b,c),c}function u(a){return/\w/.test(a)||a>"€"&&(a.toUpperCase()!=a.toLowerCase()||Qg.test(a))}function v(a,b){return b?!!(b.source.indexOf("\\w")>-1&&u(a))||b.test(a):u(a)}function w(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function x(a){return a.charCodeAt(0)>=768&&Rg.test(a)}function y(a,b,c){for(;(c<0?b>0:b<a.length)&&x(a.charAt(b));)b+=c;return b}function z(a,b,c){for(;;){if(Math.abs(b-c)<=1)return a(b)?b:c;var d=Math.floor((b+c)/2);a(d)?c=d:b=d}}function A(a,b,c){var f=this;this.input=c,f.scrollbarFiller=d("div",null,"CodeMirror-scrollbar-filler"),f.scrollbarFiller.setAttribute("cm-not-content","true"),f.gutterFiller=d("div",null,"CodeMirror-gutter-filler"),f.gutterFiller.setAttribute("cm-not-content","true"),f.lineDiv=e("div",null,"CodeMirror-code"),f.selectionDiv=d("div",null,null,"position: relative; z-index: 1"),f.cursorDiv=d("div",null,"CodeMirror-cursors"),f.measure=d("div",null,"CodeMirror-measure"),f.lineMeasure=d("div",null,"CodeMirror-measure"),f.lineSpace=e("div",[f.measure,f.lineMeasure,f.selectionDiv,f.cursorDiv,f.lineDiv],null,"position: relative; outline: none");var g=e("div",[f.lineSpace],"CodeMirror-lines");f.mover=d("div",[g],null,"position: relative"),f.sizer=d("div",[f.mover],"CodeMirror-sizer"),f.sizerWidth=null,f.heightForcer=d("div",null,null,"position: absolute; height: "+Kg+"px; width: 1px;"),f.gutters=d("div",null,"CodeMirror-gutters"),f.lineGutter=null,f.scroller=d("div",[f.sizer,f.heightForcer,f.gutters],"CodeMirror-scroll"),f.scroller.setAttribute("tabIndex","-1"),f.wrapper=d("div",[f.scrollbarFiller,f.gutterFiller,f.scroller],"CodeMirror"),mg&&ng<8&&(f.gutters.style.zIndex=-1,f.scroller.style.paddingRight=0),og||ig&&xg||(f.scroller.draggable=!0),a&&(a.appendChild?a.appendChild(f.wrapper):a(f.wrapper)),f.viewFrom=f.viewTo=b.first,f.reportedViewFrom=f.reportedViewTo=b.first,f.view=[],f.renderedView=null,f.externalMeasured=null,f.viewOffset=0,f.lastWrapHeight=f.lastWrapWidth=0,f.updateLineNumbers=null,f.nativeBarWidth=f.barHeight=f.barWidth=0,f.scrollbarsClipped=!1,f.lineNumWidth=f.lineNumInnerWidth=f.lineNumChars=null,f.alignWidgets=!1,f.cachedCharWidth=f.cachedTextHeight=f.cachedPaddingH=null,f.maxLine=null,f.maxLineLength=0,f.maxLineChanged=!1,f.wheelDX=f.wheelDY=f.wheelStartX=f.wheelStartY=null,f.shift=!1,f.selForContextMenu=null,f.activeTouch=null,c.init(f)}function B(a,b){if(b-=a.first,b<0||b>=a.size)throw new Error("There is no line "+(b+a.first)+" in the document.");for(var c=a;!c.lines;)for(var d=0;;++d){var e=c.children[d],f=e.chunkSize();if(b<f){c=e;break}b-=f}return c.lines[b]}function C(a,b,c){var d=[],e=b.line;return a.iter(b.line,c.line+1,(function(a){var f=a.text;e==c.line&&(f=f.slice(0,c.ch)),e==b.line&&(f=f.slice(b.ch)),d.push(f),++e})),d}function D(a,b,c){var d=[];return a.iter(b,c,(function(a){d.push(a.text)})),d}function E(a,b){var c=b-a.height;if(c)for(var d=a;d;d=d.parent)d.height+=c}function F(a){if(null==a.parent)return null;for(var b=a.parent,c=m(b.lines,a),d=b.parent;d;b=d,d=d.parent)for(var e=0;d.children[e]!=b;++e)c+=d.children[e].chunkSize();return c+b.first}function G(a,b){var c=a.first;a:do{for(var d=0;d<a.children.length;++d){var e=a.children[d],f=e.height;if(b<f){a=e;continue a}b-=f,c+=e.chunkSize()}return c}while(!a.lines);for(var g=0;g<a.lines.length;++g){var h=a.lines[g],i=h.height;if(b<i)break;b-=i}return c+g}function H(a,b){return b>=a.first&&b<a.first+a.size}function I(a,b){return String(a.lineNumberFormatter(b+a.firstLineNumber))}function J(a,b,c){return void 0===c&&(c=null),this instanceof J?(this.line=a,this.ch=b,void(this.sticky=c)):new J(a,b,c)}function K(a,b){return a.line-b.line||a.ch-b.ch}function L(a,b){return a.sticky==b.sticky&&0==K(a,b)}function M(a){return J(a.line,a.ch)}function N(a,b){return K(a,b)<0?b:a}function O(a,b){return K(a,b)<0?a:b}function P(a,b){return Math.max(a.first,Math.min(b,a.first+a.size-1))}function Q(a,b){if(b.line<a.first)return J(a.first,0);var c=a.first+a.size-1;return b.line>c?J(c,B(a,c).text.length):R(b,B(a,b.line).text.length)}function R(a,b){var c=a.ch;return null==c||c>b?J(a.line,b):c<0?J(a.line,0):a}function S(a,b){for(var c=[],d=0;d<b.length;d++)c[d]=Q(a,b[d]);return c}function T(){Sg=!0}function U(){Tg=!0}function V(a,b,c){this.marker=a,this.from=b,this.to=c}function W(a,b){if(a)for(var c=0;c<a.length;++c){var d=a[c];if(d.marker==b)return d}}function X(a,b){for(var c,d=0;d<a.length;++d)a[d]!=b&&(c||(c=[])).push(a[d]);return c}function Y(a,b){a.markedSpans=a.markedSpans?a.markedSpans.concat([b]):[b],b.marker.attachLine(a)}function Z(a,b,c){var d;if(a)for(var e=0;e<a.length;++e){var f=a[e],g=f.marker,h=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);if(h||f.from==b&&"bookmark"==g.type&&(!c||!f.marker.insertLeft)){var i=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);(d||(d=[])).push(new V(g,f.from,i?null:f.to))}}return d}function $(a,b,c){var d;if(a)for(var e=0;e<a.length;++e){var f=a[e],g=f.marker,h=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);if(h||f.from==b&&"bookmark"==g.type&&(!c||f.marker.insertLeft)){var i=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);(d||(d=[])).push(new V(g,i?null:f.from-b,null==f.to?null:f.to-b))}}return d}function _(a,b){if(b.full)return null;var c=H(a,b.from.line)&&B(a,b.from.line).markedSpans,d=H(a,b.to.line)&&B(a,b.to.line).markedSpans;if(!c&&!d)return null;var e=b.from.ch,f=b.to.ch,g=0==K(b.from,b.to),h=Z(c,e,g),i=$(d,f,g),j=1==b.text.length,k=p(b.text).length+(j?e:0);if(h)for(var l=0;l<h.length;++l){var m=h[l];if(null==m.to){var n=W(i,m.marker);n?j&&(m.to=null==n.to?null:n.to+k):m.to=e}}if(i)for(var o=0;o<i.length;++o){var q=i[o];if(null!=q.to&&(q.to+=k),null==q.from){var r=W(h,q.marker);r||(q.from=k,j&&(h||(h=[])).push(q))}else q.from+=k,j&&(h||(h=[])).push(q)}h&&(h=aa(h)),i&&i!=h&&(i=aa(i));var s=[h];if(!j){var t,u=b.text.length-2;if(u>0&&h)for(var v=0;v<h.length;++v)null==h[v].to&&(t||(t=[])).push(new V(h[v].marker,null,null));for(var w=0;w<u;++w)s.push(t);s.push(i)}return s}function aa(a){for(var b=0;b<a.length;++b){var c=a[b];null!=c.from&&c.from==c.to&&c.marker.clearWhenEmpty!==!1&&a.splice(b--,1)}return a.length?a:null}function ba(a,b,c){var d=null;if(a.iter(b.line,c.line+1,(function(a){if(a.markedSpans)for(var b=0;b<a.markedSpans.length;++b){var c=a.markedSpans[b].marker;!c.readOnly||d&&m(d,c)!=-1||(d||(d=[])).push(c)}})),!d)return null;for(var e=[{from:b,to:c}],f=0;f<d.length;++f)for(var g=d[f],h=g.find(0),i=0;i<e.length;++i){var j=e[i];if(!(K(j.to,h.from)<0||K(j.from,h.to)>0)){var k=[i,1],l=K(j.from,h.from),n=K(j.to,h.to);(l<0||!g.inclusiveLeft&&!l)&&k.push({from:j.from,to:h.from}),(n>0||!g.inclusiveRight&&!n)&&k.push({from:h.to,to:j.to}),e.splice.apply(e,k),i+=k.length-3}}return e}function ca(a){var b=a.markedSpans;if(b){for(var c=0;c<b.length;++c)b[c].marker.detachLine(a);a.markedSpans=null}}function da(a,b){if(b){for(var c=0;c<b.length;++c)b[c].marker.attachLine(a);a.markedSpans=b}}function ea(a){return a.inclusiveLeft?-1:0}function fa(a){return a.inclusiveRight?1:0}function ga(a,b){var c=a.lines.length-b.lines.length;if(0!=c)return c;var d=a.find(),e=b.find(),f=K(d.from,e.from)||ea(a)-ea(b);if(f)return-f;var g=K(d.to,e.to)||fa(a)-fa(b);return g?g:b.id-a.id}function ha(a,b){var c,d=Tg&&a.markedSpans;if(d)for(var e=void 0,f=0;f<d.length;++f)e=d[f],e.marker.collapsed&&null==(b?e.from:e.to)&&(!c||ga(c,e.marker)<0)&&(c=e.marker);return c}function ia(a){return ha(a,!0)}function ja(a){return ha(a,!1)}function ka(a,b,c,d,e){var f=B(a,b),g=Tg&&f.markedSpans;if(g)for(var h=0;h<g.length;++h){var i=g[h];if(i.marker.collapsed){var j=i.marker.find(0),k=K(j.from,c)||ea(i.marker)-ea(e),l=K(j.to,d)||fa(i.marker)-fa(e);if(!(k>=0&&l<=0||k<=0&&l>=0)&&(k<=0&&(i.marker.inclusiveRight&&e.inclusiveLeft?K(j.to,c)>=0:K(j.to,c)>0)||k>=0&&(i.marker.inclusiveRight&&e.inclusiveLeft?K(j.from,d)<=0:K(j.from,d)<0)))return!0}}}function la(a){for(var b;b=ia(a);)a=b.find(-1,!0).line;return a}function ma(a){for(var b;b=ja(a);)a=b.find(1,!0).line;return a}function na(a){for(var b,c;b=ja(a);)a=b.find(1,!0).line,(c||(c=[])).push(a);return c}function oa(a,b){var c=B(a,b),d=la(c);return c==d?b:F(d)}function pa(a,b){if(b>a.lastLine())return b;var c,d=B(a,b);if(!qa(a,d))return b;for(;c=ja(d);)d=c.find(1,!0).line;return F(d)+1}function qa(a,b){var c=Tg&&b.markedSpans;if(c)for(var d=void 0,e=0;e<c.length;++e)if(d=c[e],d.marker.collapsed){if(null==d.from)return!0;if(!d.marker.widgetNode&&0==d.from&&d.marker.inclusiveLeft&&ra(a,b,d))return!0}}function ra(a,b,c){if(null==c.to){var d=c.marker.find(1,!0);return ra(a,d.line,W(d.line.markedSpans,c.marker))}if(c.marker.inclusiveRight&&c.to==b.text.length)return!0;for(var e=void 0,f=0;f<b.markedSpans.length;++f)if(e=b.markedSpans[f],e.marker.collapsed&&!e.marker.widgetNode&&e.from==c.to&&(null==e.to||e.to!=c.from)&&(e.marker.inclusiveLeft||c.marker.inclusiveRight)&&ra(a,b,e))return!0}function sa(a){a=la(a);for(var b=0,c=a.parent,d=0;d<c.lines.length;++d){var e=c.lines[d];if(e==a)break;b+=e.height}for(var f=c.parent;f;c=f,f=c.parent)for(var g=0;g<f.children.length;++g){var h=f.children[g];if(h==c)break;b+=h.height}return b}function ta(a){if(0==a.height)return 0;for(var b,c=a.text.length,d=a;b=ia(d);){var e=b.find(0,!0);d=e.from.line,c+=e.from.ch-e.to.ch}for(d=a;b=ja(d);){var f=b.find(0,!0);c-=d.text.length-f.from.ch,d=f.to.line,c+=d.text.length-f.to.ch}return c}function ua(a){var b=a.display,c=a.doc;b.maxLine=B(c,c.first),b.maxLineLength=ta(b.maxLine),b.maxLineChanged=!0,c.iter((function(a){var c=ta(a);c>b.maxLineLength&&(b.maxLineLength=c,b.maxLine=a)}))}function va(a,b,c,d){if(!a)return d(b,c,"ltr");for(var e=!1,f=0;f<a.length;++f){var g=a[f];(g.from<c&&g.to>b||b==c&&g.to==b)&&(d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr"),e=!0)}e||d(b,c,"ltr")}function wa(a,b,c){var d;Ug=null;for(var e=0;e<a.length;++e){var f=a[e];if(f.from<b&&f.to>b)return e;f.to==b&&(f.from!=f.to&&"before"==c?d=e:Ug=e),f.from==b&&(f.from!=f.to&&"before"!=c?d=e:Ug=e)}return null!=d?d:Ug}function xa(a,b){var c=a.order;return null==c&&(c=a.order=Vg(a.text,b)),c}function ya(a,b,c){var d=y(a.text,b+c,c);return d<0||d>a.text.length?null:d}function za(a,b,c){var d=ya(a,b.ch,c);return null==d?null:new J(b.line,d,c<0?"after":"before")}function Aa(a,b,c,d,e){if(a){var f=xa(c,b.doc.direction);if(f){var g,h=e<0?p(f):f[0],i=e<0==(1==h.level),j=i?"after":"before";if(h.level>0){var k=Zb(b,c);g=e<0?c.text.length-1:0;var l=$b(b,k,g).top;g=z((function(a){return $b(b,k,a).top==l}),e<0==(1==h.level)?h.from:h.to-1,g),"before"==j&&(g=ya(c,g,1))}else g=e<0?h.to:h.from;return new J(d,g,j)}}return new J(d,e<0?c.text.length:0,e<0?"before":"after")}function Ba(a,b,c,d){var e=xa(b,a.doc.direction);if(!e)return za(b,c,d);c.ch>=b.text.length?(c.ch=b.text.length,c.sticky="before"):c.ch<=0&&(c.ch=0,c.sticky="after");var f=wa(e,c.ch,c.sticky),g=e[f];if("ltr"==a.doc.direction&&g.level%2==0&&(d>0?g.to>c.ch:g.from<c.ch))return za(b,c,d);var h,i=function(a,c){return ya(b,a instanceof J?a.ch:a,c)},j=function(c){return a.options.lineWrapping?(h=h||Zb(a,b),qc(a,b,h,c)):{begin:0,end:b.text.length}},k=j("before"==c.sticky?i(c,-1):c.ch);if("rtl"==a.doc.direction||1==g.level){var l=1==g.level==d<0,m=i(c,l?1:-1);if(null!=m&&(l?m<=g.to&&m<=k.end:m>=g.from&&m>=k.begin)){var n=l?"before":"after";return new J(c.line,m,n)}}var o=function(a,b,d){for(var f=function(a,b){return b?new J(c.line,i(a,1),"before"):new J(c.line,a,"after")};a>=0&&a<e.length;a+=b){var g=e[a],h=b>0==(1!=g.level),j=h?d.begin:i(d.end,-1);if(g.from<=j&&j<g.to)return f(j,h);if(j=h?g.from:i(g.to,-1),d.begin<=j&&j<d.end)return f(j,h)}},p=o(f+d,d,k);if(p)return p;var q=d>0?k.end:i(k.begin,-1);return null==q||d>0&&q==b.text.length||!(p=o(d>0?0:e.length-1,d,j(q)))?null:p}function Ca(a,b){return a._handlers&&a._handlers[b]||Wg}function Da(a,b,c){if(a.removeEventListener)a.removeEventListener(b,c,!1);else if(a.detachEvent)a.detachEvent("on"+b,c);else{var d=a._handlers,e=d&&d[b];if(e){var f=m(e,c);f>-1&&(d[b]=e.slice(0,f).concat(e.slice(f+1)))}}}function Ea(a,b){var c=Ca(a,b);if(c.length)for(var d=Array.prototype.slice.call(arguments,2),e=0;e<c.length;++e)c[e].apply(null,d)}function Fa(a,b,c){return"string"==typeof b&&(b={type:b,preventDefault:function(){this.defaultPrevented=!0}}),Ea(a,c||b.type,a,b),La(b)||b.codemirrorIgnore}function Ga(a){var b=a._handlers&&a._handlers.cursorActivity;if(b)for(var c=a.curOp.cursorActivityHandlers||(a.curOp.cursorActivityHandlers=[]),d=0;d<b.length;++d)m(c,b[d])==-1&&c.push(b[d])}function Ha(a,b){return Ca(a,b).length>0}function Ia(a){a.prototype.on=function(a,b){Xg(this,a,b)},a.prototype.off=function(a,b){Da(this,a,b)}}function Ja(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function Ka(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0}function La(a){return null!=a.defaultPrevented?a.defaultPrevented:0==a.returnValue}function Ma(a){Ja(a),Ka(a)}function Na(a){return a.target||a.srcElement}function Oa(a){var b=a.which;return null==b&&(1&a.button?b=1:2&a.button?b=3:4&a.button&&(b=2)),yg&&a.ctrlKey&&1==b&&(b=3),b}function Pa(a){if(null==Ig){var b=d("span","​");c(a,d("span",[b,document.createTextNode("x")])),0!=a.firstChild.offsetHeight&&(Ig=b.offsetWidth<=1&&b.offsetHeight>2&&!(mg&&ng<8))}var e=Ig?d("span","​"):d("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return e.setAttribute("cm-text",""),e}function Qa(a){if(null!=Jg)return Jg;var d=c(a,document.createTextNode("AخA")),e=Cg(d,0,1).getBoundingClientRect(),f=Cg(d,1,2).getBoundingClientRect();return b(a),!(!e||e.left==e.right)&&(Jg=f.right-e.right<3)}function Ra(a){if(null!=ah)return ah;var b=c(a,d("span","x")),e=b.getBoundingClientRect(),f=Cg(b,0,1).getBoundingClientRect();return ah=Math.abs(e.left-f.left)>1}function Sa(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),bh[a]=b}function Ta(a,b){ch[a]=b}function Ua(a){if("string"==typeof a&&ch.hasOwnProperty(a))a=ch[a];else if(a&&"string"==typeof a.name&&ch.hasOwnProperty(a.name)){var b=ch[a.name];"string"==typeof b&&(b={name:b}),a=t(b,a),a.name=b.name}else{if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+xml$/.test(a))return Ua("application/xml");if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+json$/.test(a))return Ua("application/json")}return"string"==typeof a?{name:a}:a||{name:"null"}}function Va(a,b){b=Ua(b);var c=bh[b.name];if(!c)return Va(a,"text/plain");var d=c(a,b);if(dh.hasOwnProperty(b.name)){var e=dh[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var g in b.modeProps)d[g]=b.modeProps[g];return d}function Wa(a,b){var c=dh.hasOwnProperty(a)?dh[a]:dh[a]={};k(b,c)}function Xa(a,b){if(b===!0)return b;if(a.copyState)return a.copyState(b);var c={};for(var d in b){var e=b[d];e instanceof Array&&(e=e.concat([])),c[d]=e}return c}function Ya(a,b){for(var c;a.innerMode&&(c=a.innerMode(b),c&&c.mode!=a);)b=c.state,a=c.mode;return c||{mode:a,state:b}}function Za(a,b,c){return!a.startState||a.startState(b,c)}function $a(a,b,c,d){var e=[a.state.modeGen],f={};gb(a,b.text,a.doc.mode,c,(function(a,b){return e.push(a,b)}),f,d);for(var g=c.state,h=function(d){var g=a.state.overlays[d],h=1,i=0;c.state=!0,gb(a,b.text,g.mode,c,(function(a,b){for(var c=h;i<a;){var d=e[h];d>a&&e.splice(h,1,a,e[h+1],d),h+=2,i=Math.min(a,d)}if(b)if(g.opaque)e.splice(c,h-c,a,"overlay "+b),h=c+2;else for(;c<h;c+=2){var f=e[c+1];e[c+1]=(f?f+" ":"")+"overlay "+b}}),f)},i=0;i<a.state.overlays.length;++i)h(i);return c.state=g,{styles:e,classes:f.bgClass||f.textClass?f:null}}function _a(a,b,c){if(!b.styles||b.styles[0]!=a.state.modeGen){var d=ab(a,F(b)),e=b.text.length>a.options.maxHighlightLength&&Xa(a.doc.mode,d.state),f=$a(a,b,d);e&&(d.state=e),b.stateAfter=d.save(!e),b.styles=f.styles,f.classes?b.styleClasses=f.classes:b.styleClasses&&(b.styleClasses=null),c===a.doc.highlightFrontier&&(a.doc.modeFrontier=Math.max(a.doc.modeFrontier,++a.doc.highlightFrontier))}return b.styles}function ab(a,b,c){var d=a.doc,e=a.display;if(!d.mode.startState)return new gh(d,!0,b);var f=hb(a,b,c),g=f>d.first&&B(d,f-1).stateAfter,h=g?gh.fromSaved(d,g,f):new gh(d,Za(d.mode),f);return d.iter(f,b,(function(c){bb(a,c.text,h);var d=h.line;c.stateAfter=d==b-1||d%5==0||d>=e.viewFrom&&d<e.viewTo?h.save():null,h.nextLine()})),c&&(d.modeFrontier=h.line),h}function bb(a,b,c,d){var e=a.doc.mode,f=new eh(b,a.options.tabSize,c);for(f.start=f.pos=d||0,""==b&&cb(e,c.state);!f.eol();)db(e,f,c.state),f.start=f.pos}function cb(a,b){if(a.blankLine)return a.blankLine(b);if(a.innerMode){var c=Ya(a,b);return c.mode.blankLine?c.mode.blankLine(c.state):void 0}}function db(a,b,c,d){for(var e=0;e<10;e++){d&&(d[0]=Ya(a,c).mode);var f=a.token(b,c);if(b.pos>b.start)return f}throw new Error("Mode "+a.name+" failed to advance stream.")}function eb(a,b,c,d){var e,f=a.doc,g=f.mode;b=Q(f,b);var h,i=B(f,b.line),j=ab(a,b.line,c),k=new eh(i.text,a.options.tabSize,j);for(d&&(h=[]);(d||k.pos<b.ch)&&!k.eol();)k.start=k.pos,e=db(g,k,j.state),d&&h.push(new hh(k,e,Xa(f.mode,j.state)));return d?h:new hh(k,e,j.state)}function fb(a,b){if(a)for(;;){var c=a.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!c)break;a=a.slice(0,c.index)+a.slice(c.index+c[0].length);var d=c[1]?"bgClass":"textClass";null==b[d]?b[d]=c[2]:new RegExp("(?:^|s)"+c[2]+"(?:$|s)").test(b[d])||(b[d]+=" "+c[2])}return a}function gb(a,b,c,d,e,f,g){var h=c.flattenSpans;null==h&&(h=a.options.flattenSpans);var i,j=0,k=null,l=new eh(b,a.options.tabSize,d),m=a.options.addModeClass&&[null];for(""==b&&fb(cb(c,d.state),f);!l.eol();){if(l.pos>a.options.maxHighlightLength?(h=!1,g&&bb(a,b,d,l.pos),l.pos=b.length,i=null):i=fb(db(c,l,d.state,m),f),m){var n=m[0].name;n&&(i="m-"+(i?n+" "+i:n))}if(!h||k!=i){for(;j<l.start;)j=Math.min(l.start,j+5e3),e(j,k);k=i}l.start=l.pos}for(;j<l.pos;){var o=Math.min(l.pos,j+5e3);e(o,k),j=o}}function hb(a,b,c){for(var d,e,f=a.doc,g=c?-1:b-(a.doc.mode.innerMode?1e3:100),h=b;h>g;--h){if(h<=f.first)return f.first;var i=B(f,h-1),j=i.stateAfter;if(j&&(!c||h+(j instanceof fh?j.lookAhead:0)<=f.modeFrontier))return h;var k=l(i.text,null,a.options.tabSize);(null==e||d>k)&&(e=h-1,d=k)}return e}function ib(a,b){if(a.modeFrontier=Math.min(a.modeFrontier,b),!(a.highlightFrontier<b-10)){for(var c=a.first,d=b-1;d>c;d--){var e=B(a,d).stateAfter;if(e&&(!(e instanceof fh)||d+e.lookAhead<b)){c=d+1;break}}a.highlightFrontier=Math.min(a.highlightFrontier,c)}}function jb(a,b,c,d){a.text=b,a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null),null!=a.order&&(a.order=null),ca(a),da(a,c);var e=d?d(a):1;e!=a.height&&E(a,e)}function kb(a){a.parent=null,ca(a)}function lb(a,b){if(!a||/^\s*$/.test(a))return null;var c=b.addModeClass?lh:kh;return c[a]||(c[a]=a.replace(/\S+/g,"cm-$&"))}function mb(a,b){var c=e("span",null,null,og?"padding-right: .1px":null),d={pre:e("pre",[c],"CodeMirror-line"),content:c,col:0,pos:0,cm:a,trailingSpace:!1,splitSpaces:(mg||og)&&a.getOption("lineWrapping")};b.measure={};for(var f=0;f<=(b.rest?b.rest.length:0);f++){var g=f?b.rest[f-1]:b.line,h=void 0;d.pos=0,d.addToken=ob,Qa(a.display.measure)&&(h=xa(g,a.doc.direction))&&(d.addToken=qb(d.addToken,h)),d.map=[];var j=b!=a.display.externalMeasured&&F(g);sb(g,d,_a(a,g,j)),g.styleClasses&&(g.styleClasses.bgClass&&(d.bgClass=i(g.styleClasses.bgClass,d.bgClass||"")),g.styleClasses.textClass&&(d.textClass=i(g.styleClasses.textClass,d.textClass||""))),0==d.map.length&&d.map.push(0,0,d.content.appendChild(Pa(a.display.measure))),0==f?(b.measure.map=d.map,b.measure.cache={}):((b.measure.maps||(b.measure.maps=[])).push(d.map),(b.measure.caches||(b.measure.caches=[])).push({}))}if(og){var k=d.content.lastChild;(/\bcm-tab\b/.test(k.className)||k.querySelector&&k.querySelector(".cm-tab"))&&(d.content.className="cm-tab-wrap-hack")}return Ea(a,"renderLine",a,b.line,d.pre),d.pre.className&&(d.textClass=i(d.pre.className,d.textClass||"")),d}function nb(a){var b=d("span","•","cm-invalidchar");return b.title="\\u"+a.charCodeAt(0).toString(16),b.setAttribute("aria-label",b.title),b}function ob(a,b,c,e,f,g,h){if(b){var i,j=a.splitSpaces?pb(b,a.trailingSpace):b,k=a.cm.state.specialChars,l=!1;if(k.test(b)){i=document.createDocumentFragment();for(var m=0;;){k.lastIndex=m;var n=k.exec(b),p=n?n.index-m:b.length-m;if(p){var q=document.createTextNode(j.slice(m,m+p));mg&&ng<9?i.appendChild(d("span",[q])):i.appendChild(q),a.map.push(a.pos,a.pos+p,q),a.col+=p,a.pos+=p}if(!n)break;m+=p+1;var r=void 0;if("\t"==n[0]){var s=a.cm.options.tabSize,t=s-a.col%s;r=i.appendChild(d("span",o(t),"cm-tab")),r.setAttribute("role","presentation"),r.setAttribute("cm-text","\t"),a.col+=t}else"\r"==n[0]||"\n"==n[0]?(r=i.appendChild(d("span","\r"==n[0]?"␍":"␤","cm-invalidchar")),r.setAttribute("cm-text",n[0]),a.col+=1):(r=a.cm.options.specialCharPlaceholder(n[0]),r.setAttribute("cm-text",n[0]),mg&&ng<9?i.appendChild(d("span",[r])):i.appendChild(r),a.col+=1);a.map.push(a.pos,a.pos+1,r),a.pos++}}else a.col+=b.length,i=document.createTextNode(j),a.map.push(a.pos,a.pos+b.length,i),mg&&ng<9&&(l=!0),a.pos+=b.length;if(a.trailingSpace=32==j.charCodeAt(b.length-1),c||e||f||l||h){var u=c||"";e&&(u+=e),f&&(u+=f);var v=d("span",[i],u,h);return g&&(v.title=g),a.content.appendChild(v)}a.content.appendChild(i)}}function pb(a,b){if(a.length>1&&!/  /.test(a))return a;for(var c=b,d="",e=0;e<a.length;e++){var f=a.charAt(e);" "!=f||!c||e!=a.length-1&&32!=a.charCodeAt(e+1)||(f=" "),d+=f,c=" "==f}return d}function qb(a,b){return function(c,d,e,f,g,h,i){e=e?e+" cm-force-border":"cm-force-border";for(var j=c.pos,k=j+d.length;;){for(var l=void 0,m=0;m<b.length&&(l=b[m],!(l.to>j&&l.from<=j));m++);if(l.to>=k)return a(c,d,e,f,g,h,i);a(c,d.slice(0,l.to-j),e,f,null,h,i),f=null,d=d.slice(l.to-j),j=l.to}}}function rb(a,b,c,d){var e=!d&&c.widgetNode;e&&a.map.push(a.pos,a.pos+b,e),!d&&a.cm.display.input.needsContentAttribute&&(e||(e=a.content.appendChild(document.createElement("span"))),e.setAttribute("cm-marker",c.id)),e&&(a.cm.display.input.setUneditable(e),a.content.appendChild(e)),a.pos+=b,a.trailingSpace=!1}function sb(a,b,c){var d=a.markedSpans,e=a.text,f=0;if(d)for(var g,h,i,j,k,l,m,n=e.length,o=0,p=1,q="",r=0;;){if(r==o){i=j=k=l=h="",m=null,r=1/0;for(var s=[],t=void 0,u=0;u<d.length;++u){var v=d[u],w=v.marker;"bookmark"==w.type&&v.from==o&&w.widgetNode?s.push(w):v.from<=o&&(null==v.to||v.to>o||w.collapsed&&v.to==o&&v.from==o)?(null!=v.to&&v.to!=o&&r>v.to&&(r=v.to,j=""),w.className&&(i+=" "+w.className),w.css&&(h=(h?h+";":"")+w.css),w.startStyle&&v.from==o&&(k+=" "+w.startStyle),w.endStyle&&v.to==r&&(t||(t=[])).push(w.endStyle,v.to),w.title&&!l&&(l=w.title),w.collapsed&&(!m||ga(m.marker,w)<0)&&(m=v)):v.from>o&&r>v.from&&(r=v.from)}if(t)for(var x=0;x<t.length;x+=2)t[x+1]==r&&(j+=" "+t[x]);if(!m||m.from==o)for(var y=0;y<s.length;++y)rb(b,0,s[y]);if(m&&(m.from||0)==o){if(rb(b,(null==m.to?n+1:m.to)-o,m.marker,null==m.from),null==m.to)return;m.to==o&&(m=!1)}}if(o>=n)break;for(var z=Math.min(n,r);;){if(q){var A=o+q.length;if(!m){var B=A>z?q.slice(0,z-o):q;b.addToken(b,B,g?g+i:i,k,o+B.length==r?j:"",l,h)}if(A>=z){q=q.slice(z-o),o=z;break}o=A,k=""}q=e.slice(f,f=c[p++]),g=lb(c[p++],b.cm.options)}}else for(var C=1;C<c.length;C+=2)b.addToken(b,e.slice(f,f=c[C]),lb(c[C+1],b.cm.options))}function tb(a,b,c){this.line=b,this.rest=na(b),this.size=this.rest?F(p(this.rest))-c+1:1,this.node=this.text=null,this.hidden=qa(a,b)}function ub(a,b,c){for(var d,e=[],f=b;f<c;f=d){var g=new tb(a.doc,B(a.doc,f),f);d=f+g.size,e.push(g)}return e}function vb(a){mh?mh.ops.push(a):a.ownsGroup=mh={ops:[a],delayedCallbacks:[]}}function wb(a){var b=a.delayedCallbacks,c=0;do{for(;c<b.length;c++)b[c].call(null);for(var d=0;d<a.ops.length;d++){var e=a.ops[d];if(e.cursorActivityHandlers)for(;e.cursorActivityCalled<e.cursorActivityHandlers.length;)e.cursorActivityHandlers[e.cursorActivityCalled++].call(null,e.cm)}}while(c<b.length)}function xb(a,b){var c=a.ownsGroup;if(c)try{wb(c)}finally{mh=null,b(c)}}function yb(a,b){var c=Ca(a,b);if(c.length){var d,e=Array.prototype.slice.call(arguments,2);mh?d=mh.delayedCallbacks:nh?d=nh:(d=nh=[],setTimeout(zb,0));for(var f=function(a){d.push((function(){return c[a].apply(null,e)}))},g=0;g<c.length;++g)f(g)}}function zb(){var a=nh;nh=null;for(var b=0;b<a.length;++b)a[b]()}function Ab(a,b,c,d){for(var e=0;e<b.changes.length;e++){var f=b.changes[e];"text"==f?Eb(a,b):"gutter"==f?Gb(a,b,c,d):"class"==f?Fb(a,b):"widget"==f&&Hb(a,b,d)}b.changes=null}function Bb(a){return a.node==a.text&&(a.node=d("div",null,null,"position: relative"),a.text.parentNode&&a.text.parentNode.replaceChild(a.node,a.text),a.node.appendChild(a.text),mg&&ng<8&&(a.node.style.zIndex=2)),a.node}function Cb(a,b){var c=b.bgClass?b.bgClass+" "+(b.line.bgClass||""):b.line.bgClass;if(c&&(c+=" CodeMirror-linebackground"),b.background)c?b.background.className=c:(b.background.parentNode.removeChild(b.background),b.background=null);else if(c){var e=Bb(b);b.background=e.insertBefore(d("div",null,c),e.firstChild),a.display.input.setUneditable(b.background)}}function Db(a,b){var c=a.display.externalMeasured;return c&&c.line==b.line?(a.display.externalMeasured=null,b.measure=c.measure,c.built):mb(a,b)}function Eb(a,b){var c=b.text.className,d=Db(a,b);b.text==b.node&&(b.node=d.pre),b.text.parentNode.replaceChild(d.pre,b.text),b.text=d.pre,d.bgClass!=b.bgClass||d.textClass!=b.textClass?(b.bgClass=d.bgClass,b.textClass=d.textClass,Fb(a,b)):c&&(b.text.className=c)}function Fb(a,b){Cb(a,b),b.line.wrapClass?Bb(b).className=b.line.wrapClass:b.node!=b.text&&(b.node.className="");var c=b.textClass?b.textClass+" "+(b.line.textClass||""):b.line.textClass;b.text.className=c||""}function Gb(a,b,c,e){if(b.gutter&&(b.node.removeChild(b.gutter),b.gutter=null),b.gutterBackground&&(b.node.removeChild(b.gutterBackground),b.gutterBackground=null),b.line.gutterClass){var f=Bb(b);b.gutterBackground=d("div",null,"CodeMirror-gutter-background "+b.line.gutterClass,"left: "+(a.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px; width: "+e.gutterTotalWidth+"px"),a.display.input.setUneditable(b.gutterBackground),f.insertBefore(b.gutterBackground,b.text)}var g=b.line.gutterMarkers;if(a.options.lineNumbers||g){var h=Bb(b),i=b.gutter=d("div",null,"CodeMirror-gutter-wrapper","left: "+(a.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px");if(a.display.input.setUneditable(i),h.insertBefore(i,b.text),b.line.gutterClass&&(i.className+=" "+b.line.gutterClass),!a.options.lineNumbers||g&&g["CodeMirror-linenumbers"]||(b.lineNumber=i.appendChild(d("div",I(a.options,c),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+e.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+a.display.lineNumInnerWidth+"px"))),g)for(var j=0;j<a.options.gutters.length;++j){var k=a.options.gutters[j],l=g.hasOwnProperty(k)&&g[k];l&&i.appendChild(d("div",[l],"CodeMirror-gutter-elt","left: "+e.gutterLeft[k]+"px; width: "+e.gutterWidth[k]+"px"))}}}function Hb(a,b,c){b.alignable&&(b.alignable=null);for(var d=b.node.firstChild,e=void 0;d;d=e)e=d.nextSibling,"CodeMirror-linewidget"==d.className&&b.node.removeChild(d);Jb(a,b,c)}function Ib(a,b,c,d){var e=Db(a,b);return b.text=b.node=e.pre,e.bgClass&&(b.bgClass=e.bgClass),e.textClass&&(b.textClass=e.textClass),Fb(a,b),Gb(a,b,c,d),Jb(a,b,d),b.node}function Jb(a,b,c){if(Kb(a,b.line,b,c,!0),b.rest)for(var d=0;d<b.rest.length;d++)Kb(a,b.rest[d],b,c,!1)}function Kb(a,b,c,e,f){if(b.widgets)for(var g=Bb(c),h=0,i=b.widgets;h<i.length;++h){var j=i[h],k=d("div",[j.node],"CodeMirror-linewidget");j.handleMouseEvents||k.setAttribute("cm-ignore-events","true"),Lb(j,k,c,e),a.display.input.setUneditable(k),f&&j.above?g.insertBefore(k,c.gutter||c.text):g.appendChild(k),yb(j,"redraw")}}function Lb(a,b,c,d){if(a.noHScroll){(c.alignable||(c.alignable=[])).push(b);var e=d.wrapperWidth;b.style.left=d.fixedPos+"px",a.coverGutter||(e-=d.gutterTotalWidth,b.style.paddingLeft=d.gutterTotalWidth+"px"),b.style.width=e+"px"}a.coverGutter&&(b.style.zIndex=5,b.style.position="relative",a.noHScroll||(b.style.marginLeft=-d.gutterTotalWidth+"px"))}function Mb(a){if(null!=a.height)return a.height;var b=a.doc.cm;if(!b)return 0;if(!f(document.body,a.node)){var e="position: relative;";a.coverGutter&&(e+="margin-left: -"+b.display.gutters.offsetWidth+"px;"),a.noHScroll&&(e+="width: "+b.display.wrapper.clientWidth+"px;"),c(b.display.measure,d("div",[a.node],null,e))}return a.height=a.node.parentNode.offsetHeight}function Nb(a,b){for(var c=Na(b);c!=a.wrapper;c=c.parentNode)if(!c||1==c.nodeType&&"true"==c.getAttribute("cm-ignore-events")||c.parentNode==a.sizer&&c!=a.mover)return!0}function Ob(a){return a.lineSpace.offsetTop}function Pb(a){return a.mover.offsetHeight-a.lineSpace.offsetHeight}function Qb(a){if(a.cachedPaddingH)return a.cachedPaddingH;var b=c(a.measure,d("pre","x")),e=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,f={left:parseInt(e.paddingLeft),right:parseInt(e.paddingRight)};return isNaN(f.left)||isNaN(f.right)||(a.cachedPaddingH=f),f}function Rb(a){return Kg-a.display.nativeBarWidth}function Sb(a){return a.display.scroller.clientWidth-Rb(a)-a.display.barWidth}function Tb(a){return a.display.scroller.clientHeight-Rb(a)-a.display.barHeight}function Ub(a,b,c){var d=a.options.lineWrapping,e=d&&Sb(a);if(!b.measure.heights||d&&b.measure.width!=e){var f=b.measure.heights=[];if(d){b.measure.width=e;for(var g=b.text.firstChild.getClientRects(),h=0;h<g.length-1;h++){var i=g[h],j=g[h+1];Math.abs(i.bottom-j.bottom)>2&&f.push((i.bottom+j.top)/2-c.top)}}f.push(c.bottom-c.top)}}function Vb(a,b,c){if(a.line==b)return{map:a.measure.map,cache:a.measure.cache};for(var d=0;d<a.rest.length;d++)if(a.rest[d]==b)return{map:a.measure.maps[d],cache:a.measure.caches[d]};for(var e=0;e<a.rest.length;e++)if(F(a.rest[e])>c)return{map:a.measure.maps[e],cache:a.measure.caches[e],before:!0}}function Wb(a,b){b=la(b);var d=F(b),e=a.display.externalMeasured=new tb(a.doc,b,d);e.lineN=d;var f=e.built=mb(a,e);
+return e.text=f.pre,c(a.display.lineMeasure,f.pre),e}function Xb(a,b,c,d){return $b(a,Zb(a,b),c,d)}function Yb(a,b){if(b>=a.display.viewFrom&&b<a.display.viewTo)return a.display.view[zc(a,b)];var c=a.display.externalMeasured;return c&&b>=c.lineN&&b<c.lineN+c.size?c:void 0}function Zb(a,b){var c=F(b),d=Yb(a,c);d&&!d.text?d=null:d&&d.changes&&(Ab(a,d,c,uc(a)),a.curOp.forceUpdate=!0),d||(d=Wb(a,b));var e=Vb(d,b,c);return{line:b,view:d,rect:null,map:e.map,cache:e.cache,before:e.before,hasHeights:!1}}function $b(a,b,c,d,e){b.before&&(c=-1);var f,g=c+(d||"");return b.cache.hasOwnProperty(g)?f=b.cache[g]:(b.rect||(b.rect=b.view.text.getBoundingClientRect()),b.hasHeights||(Ub(a,b.view,b.rect),b.hasHeights=!0),f=bc(a,b,c,d),f.bogus||(b.cache[g]=f)),{left:f.left,right:f.right,top:e?f.rtop:f.top,bottom:e?f.rbottom:f.bottom}}function _b(a,b,c){for(var d,e,f,g,h,i,j=0;j<a.length;j+=3)if(h=a[j],i=a[j+1],b<h?(e=0,f=1,g="left"):b<i?(e=b-h,f=e+1):(j==a.length-3||b==i&&a[j+3]>b)&&(f=i-h,e=f-1,b>=i&&(g="right")),null!=e){if(d=a[j+2],h==i&&c==(d.insertLeft?"left":"right")&&(g=c),"left"==c&&0==e)for(;j&&a[j-2]==a[j-3]&&a[j-1].insertLeft;)d=a[(j-=3)+2],g="left";if("right"==c&&e==i-h)for(;j<a.length-3&&a[j+3]==a[j+4]&&!a[j+5].insertLeft;)d=a[(j+=3)+2],g="right";break}return{node:d,start:e,end:f,collapse:g,coverStart:h,coverEnd:i}}function ac(a,b){var c=oh;if("left"==b)for(var d=0;d<a.length&&(c=a[d]).left==c.right;d++);else for(var e=a.length-1;e>=0&&(c=a[e]).left==c.right;e--);return c}function bc(a,b,c,d){var e,f=_b(b.map,c,d),g=f.node,h=f.start,i=f.end,j=f.collapse;if(3==g.nodeType){for(var k=0;k<4;k++){for(;h&&x(b.line.text.charAt(f.coverStart+h));)--h;for(;f.coverStart+i<f.coverEnd&&x(b.line.text.charAt(f.coverStart+i));)++i;if(e=mg&&ng<9&&0==h&&i==f.coverEnd-f.coverStart?g.parentNode.getBoundingClientRect():ac(Cg(g,h,i).getClientRects(),d),e.left||e.right||0==h)break;i=h,h-=1,j="right"}mg&&ng<11&&(e=cc(a.display.measure,e))}else{h>0&&(j=d="right");var l;e=a.options.lineWrapping&&(l=g.getClientRects()).length>1?l["right"==d?l.length-1:0]:g.getBoundingClientRect()}if(mg&&ng<9&&!h&&(!e||!e.left&&!e.right)){var m=g.parentNode.getClientRects()[0];e=m?{left:m.left,right:m.left+tc(a.display),top:m.top,bottom:m.bottom}:oh}for(var n=e.top-b.rect.top,o=e.bottom-b.rect.top,p=(n+o)/2,q=b.view.measure.heights,r=0;r<q.length-1&&!(p<q[r]);r++);var s=r?q[r-1]:0,t=q[r],u={left:("right"==j?e.right:e.left)-b.rect.left,right:("left"==j?e.left:e.right)-b.rect.left,top:s,bottom:t};return e.left||e.right||(u.bogus=!0),a.options.singleCursorHeightPerLine||(u.rtop=n,u.rbottom=o),u}function cc(a,b){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!Ra(a))return b;var c=screen.logicalXDPI/screen.deviceXDPI,d=screen.logicalYDPI/screen.deviceYDPI;return{left:b.left*c,right:b.right*c,top:b.top*d,bottom:b.bottom*d}}function dc(a){if(a.measure&&(a.measure.cache={},a.measure.heights=null,a.rest))for(var b=0;b<a.rest.length;b++)a.measure.caches[b]={}}function ec(a){a.display.externalMeasure=null,b(a.display.lineMeasure);for(var c=0;c<a.display.view.length;c++)dc(a.display.view[c])}function fc(a){ec(a),a.display.cachedCharWidth=a.display.cachedTextHeight=a.display.cachedPaddingH=null,a.options.lineWrapping||(a.display.maxLineChanged=!0),a.display.lineNumChars=null}function gc(){return qg&&wg?-(document.body.getBoundingClientRect().left-parseInt(getComputedStyle(document.body).marginLeft)):window.pageXOffset||(document.documentElement||document.body).scrollLeft}function hc(){return qg&&wg?-(document.body.getBoundingClientRect().top-parseInt(getComputedStyle(document.body).marginTop)):window.pageYOffset||(document.documentElement||document.body).scrollTop}function ic(a,b,c,d,e){if(!e&&b.widgets)for(var f=0;f<b.widgets.length;++f)if(b.widgets[f].above){var g=Mb(b.widgets[f]);c.top+=g,c.bottom+=g}if("line"==d)return c;d||(d="local");var h=sa(b);if("local"==d?h+=Ob(a.display):h-=a.display.viewOffset,"page"==d||"window"==d){var i=a.display.lineSpace.getBoundingClientRect();h+=i.top+("window"==d?0:hc());var j=i.left+("window"==d?0:gc());c.left+=j,c.right+=j}return c.top+=h,c.bottom+=h,c}function jc(a,b,c){if("div"==c)return b;var d=b.left,e=b.top;if("page"==c)d-=gc(),e-=hc();else if("local"==c||!c){var f=a.display.sizer.getBoundingClientRect();d+=f.left,e+=f.top}var g=a.display.lineSpace.getBoundingClientRect();return{left:d-g.left,top:e-g.top}}function kc(a,b,c,d,e){return d||(d=B(a.doc,b.line)),ic(a,d,Xb(a,d,b.ch,e),c)}function lc(a,b,c,d,e,f){function g(b,g){var h=$b(a,e,b,g?"right":"left",f);return g?h.left=h.right:h.right=h.left,ic(a,d,h,c)}function h(a,b,c){var d=i[b],e=d.level%2!=0;return g(c?a-1:a,e!=c)}d=d||B(a.doc,b.line),e||(e=Zb(a,d));var i=xa(d,a.doc.direction),j=b.ch,k=b.sticky;if(j>=d.text.length?(j=d.text.length,k="before"):j<=0&&(j=0,k="after"),!i)return g("before"==k?j-1:j,"before"==k);var l=wa(i,j,k),m=Ug,n=h(j,l,"before"==k);return null!=m&&(n.other=h(j,m,"before"!=k)),n}function mc(a,b){var c=0;b=Q(a.doc,b),a.options.lineWrapping||(c=tc(a.display)*b.ch);var d=B(a.doc,b.line),e=sa(d)+Ob(a.display);return{left:c,right:c,top:e,bottom:e+d.height}}function nc(a,b,c,d,e){var f=J(a,b,c);return f.xRel=e,d&&(f.outside=!0),f}function oc(a,b,c){var d=a.doc;if(c+=a.display.viewOffset,c<0)return nc(d.first,0,null,!0,-1);var e=G(d,c),f=d.first+d.size-1;if(e>f)return nc(d.first+d.size-1,B(d,f).text.length,null,!0,1);b<0&&(b=0);for(var g=B(d,e);;){var h=rc(a,g,e,b,c),i=ja(g),j=i&&i.find(0,!0);if(!i||!(h.ch>j.from.ch||h.ch==j.from.ch&&h.xRel>0))return h;e=F(g=j.to.line)}}function pc(a,b,c,d){var e=function(d){return ic(a,b,$b(a,c,d),"line")},f=b.text.length,g=z((function(a){return e(a-1).bottom<=d}),f,0);return f=z((function(a){return e(a).top>d}),g,f),{begin:g,end:f}}function qc(a,b,c,d){var e=ic(a,b,$b(a,c,d),"line").top;return pc(a,b,c,e)}function rc(a,b,c,d,e){e-=sa(b);var f,g=0,h=b.text.length,i=Zb(a,b),j=xa(b,a.doc.direction);if(j){if(a.options.lineWrapping){var k;k=pc(a,b,i,e),g=k.begin,h=k.end,k}f=new J(c,Math.floor(g+(h-g)/2));var l,m,n=lc(a,f,"line",b,i).left,o=n<d?1:-1,p=n-d,q=Math.ceil((h-g)/4);a:do{l=p,m=f;for(var r=0;r<q;++r){var s=f;if(f=Ba(a,b,f,o),null==f||f.ch<g||h<=("before"==f.sticky?f.ch-1:f.ch)){f=s;break a}}if(p=lc(a,f,"line",b,i).left-d,q>1){var t=Math.abs(p-l)/q;q=Math.min(q,Math.ceil(Math.abs(p)/t)),o=p<0?1:-1}}while(0!=p&&(q>1||o<0!=p<0&&Math.abs(p)<=Math.abs(l)));if(Math.abs(p)>Math.abs(l)){if(p<0==l<0)throw new Error("Broke out of infinite loop in coordsCharInner");f=m}}else{var u=z((function(c){var f=ic(a,b,$b(a,i,c),"line");return f.top>e?(h=Math.min(c,h),!0):!(f.bottom<=e)&&(f.left>d||!(f.right<d)&&d-f.left<f.right-d)}),g,h);u=y(b.text,u,1),f=new J(c,u,u==h?"before":"after")}var v=lc(a,f,"line",b,i);return(e<v.top||v.bottom<e)&&(f.outside=!0),f.xRel=d<v.left?-1:d>v.right?1:0,f}function sc(a){if(null!=a.cachedTextHeight)return a.cachedTextHeight;if(null==jh){jh=d("pre");for(var e=0;e<49;++e)jh.appendChild(document.createTextNode("x")),jh.appendChild(d("br"));jh.appendChild(document.createTextNode("x"))}c(a.measure,jh);var f=jh.offsetHeight/50;return f>3&&(a.cachedTextHeight=f),b(a.measure),f||1}function tc(a){if(null!=a.cachedCharWidth)return a.cachedCharWidth;var b=d("span","xxxxxxxxxx"),e=d("pre",[b]);c(a.measure,e);var f=b.getBoundingClientRect(),g=(f.right-f.left)/10;return g>2&&(a.cachedCharWidth=g),g||10}function uc(a){for(var b=a.display,c={},d={},e=b.gutters.clientLeft,f=b.gutters.firstChild,g=0;f;f=f.nextSibling,++g)c[a.options.gutters[g]]=f.offsetLeft+f.clientLeft+e,d[a.options.gutters[g]]=f.clientWidth;return{fixedPos:vc(b),gutterTotalWidth:b.gutters.offsetWidth,gutterLeft:c,gutterWidth:d,wrapperWidth:b.wrapper.clientWidth}}function vc(a){return a.scroller.getBoundingClientRect().left-a.sizer.getBoundingClientRect().left}function wc(a){var b=sc(a.display),c=a.options.lineWrapping,d=c&&Math.max(5,a.display.scroller.clientWidth/tc(a.display)-3);return function(e){if(qa(a.doc,e))return 0;var f=0;if(e.widgets)for(var g=0;g<e.widgets.length;g++)e.widgets[g].height&&(f+=e.widgets[g].height);return c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function xc(a){var b=a.doc,c=wc(a);b.iter((function(a){var b=c(a);b!=a.height&&E(a,b)}))}function yc(a,b,c,d){var e=a.display;if(!c&&"true"==Na(b).getAttribute("cm-not-content"))return null;var f,g,h=e.lineSpace.getBoundingClientRect();try{f=b.clientX-h.left,g=b.clientY-h.top}catch(a){return null}var i,j=oc(a,f,g);if(d&&1==j.xRel&&(i=B(a.doc,j.line).text).length==j.ch){var k=l(i,i.length,a.options.tabSize)-i.length;j=J(j.line,Math.max(0,Math.round((f-Qb(a.display).left)/tc(a.display))-k))}return j}function zc(a,b){if(b>=a.display.viewTo)return null;if(b-=a.display.viewFrom,b<0)return null;for(var c=a.display.view,d=0;d<c.length;d++)if(b-=c[d].size,b<0)return d}function Ac(a){a.display.input.showSelection(a.display.input.prepareSelection())}function Bc(a,b){for(var c=a.doc,d={},e=d.cursors=document.createDocumentFragment(),f=d.selection=document.createDocumentFragment(),g=0;g<c.sel.ranges.length;g++)if(b!==!1||g!=c.sel.primIndex){var h=c.sel.ranges[g];if(!(h.from().line>=a.display.viewTo||h.to().line<a.display.viewFrom)){var i=h.empty();(i||a.options.showCursorWhenSelecting)&&Cc(a,h.head,e),i||Dc(a,h,f)}}return d}function Cc(a,b,c){var e=lc(a,b,"div",null,null,!a.options.singleCursorHeightPerLine),f=c.appendChild(d("div"," ","CodeMirror-cursor"));if(f.style.left=e.left+"px",f.style.top=e.top+"px",f.style.height=Math.max(0,e.bottom-e.top)*a.options.cursorHeight+"px",e.other){var g=c.appendChild(d("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));g.style.display="",g.style.left=e.other.left+"px",g.style.top=e.other.top+"px",g.style.height=.85*(e.other.bottom-e.other.top)+"px"}}function Dc(a,b,c){function e(a,b,c,e){b<0&&(b=0),b=Math.round(b),e=Math.round(e),i.appendChild(d("div",null,"CodeMirror-selected","position: absolute; left: "+a+"px;\n                             top: "+b+"px; width: "+(null==c?l-a:c)+"px;\n                             height: "+(e-b)+"px"))}function f(b,c,d){function f(c,d){return kc(a,J(b,c),"div",j,d)}var g,i,j=B(h,b),m=j.text.length;return va(xa(j,h.direction),c||0,null==d?m:d,(function(a,b,h){var j,n,o,p=f(a,"left");if(a==b)j=p,n=o=p.left;else{if(j=f(b-1,"right"),"rtl"==h){var q=p;p=j,j=q}n=p.left,o=j.right}null==c&&0==a&&(n=k),j.top-p.top>3&&(e(n,p.top,null,p.bottom),n=k,p.bottom<j.top&&e(n,p.bottom,null,j.top)),null==d&&b==m&&(o=l),(!g||p.top<g.top||p.top==g.top&&p.left<g.left)&&(g=p),(!i||j.bottom>i.bottom||j.bottom==i.bottom&&j.right>i.right)&&(i=j),n<k+1&&(n=k),e(n,j.top,o-n,j.bottom)})),{start:g,end:i}}var g=a.display,h=a.doc,i=document.createDocumentFragment(),j=Qb(a.display),k=j.left,l=Math.max(g.sizerWidth,Sb(a)-g.sizer.offsetLeft)-j.right,m=b.from(),n=b.to();if(m.line==n.line)f(m.line,m.ch,n.ch);else{var o=B(h,m.line),p=B(h,n.line),q=la(o)==la(p),r=f(m.line,m.ch,q?o.text.length+1:null).end,s=f(n.line,q?0:null,n.ch).start;q&&(r.top<s.top-2?(e(r.right,r.top,null,r.bottom),e(k,s.top,s.left,s.bottom)):e(r.right,r.top,s.left-r.right,r.bottom)),r.bottom<s.top&&e(k,r.bottom,null,s.top)}c.appendChild(i)}function Ec(a){if(a.state.focused){var b=a.display;clearInterval(b.blinker);var c=!0;b.cursorDiv.style.visibility="",a.options.cursorBlinkRate>0?b.blinker=setInterval((function(){return b.cursorDiv.style.visibility=(c=!c)?"":"hidden"}),a.options.cursorBlinkRate):a.options.cursorBlinkRate<0&&(b.cursorDiv.style.visibility="hidden")}}function Fc(a){a.state.focused||(a.display.input.focus(),Hc(a))}function Gc(a){a.state.delayingBlurEvent=!0,setTimeout((function(){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1,Ic(a))}),100)}function Hc(a,b){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1),"nocursor"!=a.options.readOnly&&(a.state.focused||(Ea(a,"focus",a,b),a.state.focused=!0,h(a.display.wrapper,"CodeMirror-focused"),a.curOp||a.display.selForContextMenu==a.doc.sel||(a.display.input.reset(),og&&setTimeout((function(){return a.display.input.reset(!0)}),20)),a.display.input.receivedFocus()),Ec(a))}function Ic(a,b){a.state.delayingBlurEvent||(a.state.focused&&(Ea(a,"blur",a,b),a.state.focused=!1,Fg(a.display.wrapper,"CodeMirror-focused")),clearInterval(a.display.blinker),setTimeout((function(){a.state.focused||(a.display.shift=!1)}),150))}function Jc(a){for(var b=a.display,c=b.lineDiv.offsetTop,d=0;d<b.view.length;d++){var e=b.view[d],f=void 0;if(!e.hidden){if(mg&&ng<8){var g=e.node.offsetTop+e.node.offsetHeight;f=g-c,c=g}else{var h=e.node.getBoundingClientRect();f=h.bottom-h.top}var i=e.line.height-f;if(f<2&&(f=sc(b)),(i>.005||i<-.005)&&(E(e.line,f),Kc(e.line),e.rest))for(var j=0;j<e.rest.length;j++)Kc(e.rest[j])}}}function Kc(a){if(a.widgets)for(var b=0;b<a.widgets.length;++b)a.widgets[b].height=a.widgets[b].node.parentNode.offsetHeight}function Lc(a,b,c){var d=c&&null!=c.top?Math.max(0,c.top):a.scroller.scrollTop;d=Math.floor(d-Ob(a));var e=c&&null!=c.bottom?c.bottom:d+a.wrapper.clientHeight,f=G(b,d),g=G(b,e);if(c&&c.ensure){var h=c.ensure.from.line,i=c.ensure.to.line;h<f?(f=h,g=G(b,sa(B(b,h))+a.wrapper.clientHeight)):Math.min(i,b.lastLine())>=g&&(f=G(b,sa(B(b,i))-a.wrapper.clientHeight),g=i)}return{from:f,to:Math.max(g,f+1)}}function Mc(a){var b=a.display,c=b.view;if(b.alignWidgets||b.gutters.firstChild&&a.options.fixedGutter){for(var d=vc(b)-b.scroller.scrollLeft+a.doc.scrollLeft,e=b.gutters.offsetWidth,f=d+"px",g=0;g<c.length;g++)if(!c[g].hidden){a.options.fixedGutter&&(c[g].gutter&&(c[g].gutter.style.left=f),c[g].gutterBackground&&(c[g].gutterBackground.style.left=f));var h=c[g].alignable;if(h)for(var i=0;i<h.length;i++)h[i].style.left=f}a.options.fixedGutter&&(b.gutters.style.left=d+e+"px")}}function Nc(a){if(!a.options.lineNumbers)return!1;var b=a.doc,c=I(a.options,b.first+b.size-1),e=a.display;if(c.length!=e.lineNumChars){var f=e.measure.appendChild(d("div",[d("div",c)],"CodeMirror-linenumber CodeMirror-gutter-elt")),g=f.firstChild.offsetWidth,h=f.offsetWidth-g;return e.lineGutter.style.width="",e.lineNumInnerWidth=Math.max(g,e.lineGutter.offsetWidth-h)+1,e.lineNumWidth=e.lineNumInnerWidth+h,e.lineNumChars=e.lineNumInnerWidth?c.length:-1,e.lineGutter.style.width=e.lineNumWidth+"px",Ed(a),!0}return!1}function Oc(a,b){if(!Fa(a,"scrollCursorIntoView")){var c=a.display,e=c.sizer.getBoundingClientRect(),f=null;if(b.top+e.top<0?f=!0:b.bottom+e.top>(window.innerHeight||document.documentElement.clientHeight)&&(f=!1),null!=f&&!ug){var g=d("div","​",null,"position: absolute;\n                         top: "+(b.top-c.viewOffset-Ob(a.display))+"px;\n                         height: "+(b.bottom-b.top+Rb(a)+c.barHeight)+"px;\n                         left: "+b.left+"px; width: "+Math.max(2,b.right-b.left)+"px;");a.display.lineSpace.appendChild(g),g.scrollIntoView(f),a.display.lineSpace.removeChild(g)}}}function Pc(a,b,c,d){null==d&&(d=0);var e;a.options.lineWrapping||b!=c||(b=b.ch?J(b.line,"before"==b.sticky?b.ch-1:b.ch,"after"):b,c="before"==b.sticky?J(b.line,b.ch+1,"before"):b);for(var f=0;f<5;f++){var g=!1,h=lc(a,b),i=c&&c!=b?lc(a,c):h;e={left:Math.min(h.left,i.left),top:Math.min(h.top,i.top)-d,right:Math.max(h.left,i.left),bottom:Math.max(h.bottom,i.bottom)+d};var j=Rc(a,e),k=a.doc.scrollTop,l=a.doc.scrollLeft;if(null!=j.scrollTop&&(Yc(a,j.scrollTop),Math.abs(a.doc.scrollTop-k)>1&&(g=!0)),null!=j.scrollLeft&&($c(a,j.scrollLeft),Math.abs(a.doc.scrollLeft-l)>1&&(g=!0)),!g)break}return e}function Qc(a,b){var c=Rc(a,b);null!=c.scrollTop&&Yc(a,c.scrollTop),null!=c.scrollLeft&&$c(a,c.scrollLeft)}function Rc(a,b){var c=a.display,d=sc(a.display);b.top<0&&(b.top=0);var e=a.curOp&&null!=a.curOp.scrollTop?a.curOp.scrollTop:c.scroller.scrollTop,f=Tb(a),g={};b.bottom-b.top>f&&(b.bottom=b.top+f);var h=a.doc.height+Pb(c),i=b.top<d,j=b.bottom>h-d;if(b.top<e)g.scrollTop=i?0:b.top;else if(b.bottom>e+f){var k=Math.min(b.top,(j?h:b.bottom)-f);k!=e&&(g.scrollTop=k)}var l=a.curOp&&null!=a.curOp.scrollLeft?a.curOp.scrollLeft:c.scroller.scrollLeft,m=Sb(a)-(a.options.fixedGutter?c.gutters.offsetWidth:0),n=b.right-b.left>m;return n&&(b.right=b.left+m),b.left<10?g.scrollLeft=0:b.left<l?g.scrollLeft=Math.max(0,b.left-(n?0:10)):b.right>m+l-3&&(g.scrollLeft=b.right+(n?0:10)-m),g}function Sc(a,b){null!=b&&(Wc(a),a.curOp.scrollTop=(null==a.curOp.scrollTop?a.doc.scrollTop:a.curOp.scrollTop)+b)}function Tc(a){Wc(a);var b=a.getCursor();a.curOp.scrollToPos={from:b,to:b,margin:a.options.cursorScrollMargin}}function Uc(a,b,c){null==b&&null==c||Wc(a),null!=b&&(a.curOp.scrollLeft=b),null!=c&&(a.curOp.scrollTop=c)}function Vc(a,b){Wc(a),a.curOp.scrollToPos=b}function Wc(a){var b=a.curOp.scrollToPos;if(b){a.curOp.scrollToPos=null;var c=mc(a,b.from),d=mc(a,b.to);Xc(a,c,d,b.margin)}}function Xc(a,b,c,d){var e=Rc(a,{left:Math.min(b.left,c.left),top:Math.min(b.top,c.top)-d,right:Math.max(b.right,c.right),bottom:Math.max(b.bottom,c.bottom)+d});Uc(a,e.scrollLeft,e.scrollTop)}function Yc(a,b){Math.abs(a.doc.scrollTop-b)<2||(ig||Cd(a,{top:b}),Zc(a,b,!0),ig&&Cd(a),vd(a,100))}function Zc(a,b,c){b=Math.min(a.display.scroller.scrollHeight-a.display.scroller.clientHeight,b),(a.display.scroller.scrollTop!=b||c)&&(a.doc.scrollTop=b,a.display.scrollbars.setScrollTop(b),a.display.scroller.scrollTop!=b&&(a.display.scroller.scrollTop=b))}function $c(a,b,c,d){b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth),(c?b==a.doc.scrollLeft:Math.abs(a.doc.scrollLeft-b)<2)&&!d||(a.doc.scrollLeft=b,Mc(a),a.display.scroller.scrollLeft!=b&&(a.display.scroller.scrollLeft=b),a.display.scrollbars.setScrollLeft(b))}function _c(a){var b=a.display,c=b.gutters.offsetWidth,d=Math.round(a.doc.height+Pb(a.display));return{clientHeight:b.scroller.clientHeight,viewHeight:b.wrapper.clientHeight,scrollWidth:b.scroller.scrollWidth,clientWidth:b.scroller.clientWidth,viewWidth:b.wrapper.clientWidth,barLeft:a.options.fixedGutter?c:0,docHeight:d,scrollHeight:d+Rb(a)+b.barHeight,nativeBarWidth:b.nativeBarWidth,gutterWidth:c}}function ad(a,b){b||(b=_c(a));var c=a.display.barWidth,d=a.display.barHeight;bd(a,b);for(var e=0;e<4&&c!=a.display.barWidth||d!=a.display.barHeight;e++)c!=a.display.barWidth&&a.options.lineWrapping&&Jc(a),bd(a,_c(a)),c=a.display.barWidth,d=a.display.barHeight}function bd(a,b){var c=a.display,d=c.scrollbars.update(b);c.sizer.style.paddingRight=(c.barWidth=d.right)+"px",c.sizer.style.paddingBottom=(c.barHeight=d.bottom)+"px",c.heightForcer.style.borderBottom=d.bottom+"px solid transparent",d.right&&d.bottom?(c.scrollbarFiller.style.display="block",c.scrollbarFiller.style.height=d.bottom+"px",c.scrollbarFiller.style.width=d.right+"px"):c.scrollbarFiller.style.display="",d.bottom&&a.options.coverGutterNextToScrollbar&&a.options.fixedGutter?(c.gutterFiller.style.display="block",c.gutterFiller.style.height=d.bottom+"px",c.gutterFiller.style.width=b.gutterWidth+"px"):c.gutterFiller.style.display=""}function cd(a){a.display.scrollbars&&(a.display.scrollbars.clear(),a.display.scrollbars.addClass&&Fg(a.display.wrapper,a.display.scrollbars.addClass)),a.display.scrollbars=new rh[a.options.scrollbarStyle](function(b){a.display.wrapper.insertBefore(b,a.display.scrollbarFiller),Xg(b,"mousedown",(function(){a.state.focused&&setTimeout((function(){return a.display.input.focus()}),0)})),b.setAttribute("cm-not-content","true")},function(b,c){"horizontal"==c?$c(a,b):Yc(a,b)},a),a.display.scrollbars.addClass&&h(a.display.wrapper,a.display.scrollbars.addClass)}function dd(a){a.curOp={cm:a,viewChanged:!1,startHeight:a.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++sh},vb(a.curOp)}function ed(a){var b=a.curOp;xb(b,(function(a){for(var b=0;b<a.ops.length;b++)a.ops[b].cm.curOp=null;fd(a)}))}function fd(a){for(var b=a.ops,c=0;c<b.length;c++)gd(b[c]);for(var d=0;d<b.length;d++)hd(b[d]);for(var e=0;e<b.length;e++)id(b[e]);for(var f=0;f<b.length;f++)jd(b[f]);for(var g=0;g<b.length;g++)kd(b[g])}function gd(a){var b=a.cm,c=b.display;xd(b),a.updateMaxLine&&ua(b),a.mustUpdate=a.viewChanged||a.forceUpdate||null!=a.scrollTop||a.scrollToPos&&(a.scrollToPos.from.line<c.viewFrom||a.scrollToPos.to.line>=c.viewTo)||c.maxLineChanged&&b.options.lineWrapping,a.update=a.mustUpdate&&new th(b,a.mustUpdate&&{top:a.scrollTop,ensure:a.scrollToPos},a.forceUpdate)}function hd(a){a.updatedDisplay=a.mustUpdate&&Ad(a.cm,a.update)}function id(a){var b=a.cm,c=b.display;a.updatedDisplay&&Jc(b),a.barMeasure=_c(b),c.maxLineChanged&&!b.options.lineWrapping&&(a.adjustWidthTo=Xb(b,c.maxLine,c.maxLine.text.length).left+3,b.display.sizerWidth=a.adjustWidthTo,a.barMeasure.scrollWidth=Math.max(c.scroller.clientWidth,c.sizer.offsetLeft+a.adjustWidthTo+Rb(b)+b.display.barWidth),a.maxScrollLeft=Math.max(0,c.sizer.offsetLeft+a.adjustWidthTo-Sb(b))),(a.updatedDisplay||a.selectionChanged)&&(a.preparedSelection=c.input.prepareSelection(a.focus))}function jd(a){var b=a.cm;null!=a.adjustWidthTo&&(b.display.sizer.style.minWidth=a.adjustWidthTo+"px",a.maxScrollLeft<b.doc.scrollLeft&&$c(b,Math.min(b.display.scroller.scrollLeft,a.maxScrollLeft),!0),b.display.maxLineChanged=!1);var c=a.focus&&a.focus==g()&&(!document.hasFocus||document.hasFocus());a.preparedSelection&&b.display.input.showSelection(a.preparedSelection,c),(a.updatedDisplay||a.startHeight!=b.doc.height)&&ad(b,a.barMeasure),a.updatedDisplay&&Fd(b,a.barMeasure),a.selectionChanged&&Ec(b),b.state.focused&&a.updateInput&&b.display.input.reset(a.typing),c&&Fc(a.cm)}function kd(a){var b=a.cm,c=b.display,d=b.doc;if(a.updatedDisplay&&Bd(b,a.update),null==c.wheelStartX||null==a.scrollTop&&null==a.scrollLeft&&!a.scrollToPos||(c.wheelStartX=c.wheelStartY=null),null!=a.scrollTop&&Zc(b,a.scrollTop,a.forceScroll),null!=a.scrollLeft&&$c(b,a.scrollLeft,!0,!0),a.scrollToPos){var e=Pc(b,Q(d,a.scrollToPos.from),Q(d,a.scrollToPos.to),a.scrollToPos.margin);Oc(b,e)}var f=a.maybeHiddenMarkers,g=a.maybeUnhiddenMarkers;if(f)for(var h=0;h<f.length;++h)f[h].lines.length||Ea(f[h],"hide");if(g)for(var i=0;i<g.length;++i)g[i].lines.length&&Ea(g[i],"unhide");c.wrapper.offsetHeight&&(d.scrollTop=b.display.scroller.scrollTop),a.changeObjs&&Ea(b,"changes",b,a.changeObjs),a.update&&a.update.finish()}function ld(a,b){if(a.curOp)return b();dd(a);try{return b()}finally{ed(a)}}function md(a,b){return function(){if(a.curOp)return b.apply(a,arguments);dd(a);try{return b.apply(a,arguments)}finally{ed(a)}}}function nd(a){return function(){if(this.curOp)return a.apply(this,arguments);dd(this);try{return a.apply(this,arguments)}finally{ed(this)}}}function od(a){return function(){var b=this.cm;if(!b||b.curOp)return a.apply(this,arguments);dd(b);try{return a.apply(this,arguments)}finally{ed(b)}}}function pd(a,b,c,d){null==b&&(b=a.doc.first),null==c&&(c=a.doc.first+a.doc.size),d||(d=0);var e=a.display;if(d&&c<e.viewTo&&(null==e.updateLineNumbers||e.updateLineNumbers>b)&&(e.updateLineNumbers=b),a.curOp.viewChanged=!0,b>=e.viewTo)Tg&&oa(a.doc,b)<e.viewTo&&rd(a);else if(c<=e.viewFrom)Tg&&pa(a.doc,c+d)>e.viewFrom?rd(a):(e.viewFrom+=d,e.viewTo+=d);else if(b<=e.viewFrom&&c>=e.viewTo)rd(a);else if(b<=e.viewFrom){var f=sd(a,c,c+d,1);f?(e.view=e.view.slice(f.index),e.viewFrom=f.lineN,e.viewTo+=d):rd(a)}else if(c>=e.viewTo){var g=sd(a,b,b,-1);g?(e.view=e.view.slice(0,g.index),e.viewTo=g.lineN):rd(a)}else{var h=sd(a,b,b,-1),i=sd(a,c,c+d,1);h&&i?(e.view=e.view.slice(0,h.index).concat(ub(a,h.lineN,i.lineN)).concat(e.view.slice(i.index)),e.viewTo+=d):rd(a)}var j=e.externalMeasured;j&&(c<j.lineN?j.lineN+=d:b<j.lineN+j.size&&(e.externalMeasured=null))}function qd(a,b,c){a.curOp.viewChanged=!0;var d=a.display,e=a.display.externalMeasured;if(e&&b>=e.lineN&&b<e.lineN+e.size&&(d.externalMeasured=null),!(b<d.viewFrom||b>=d.viewTo)){var f=d.view[zc(a,b)];if(null!=f.node){var g=f.changes||(f.changes=[]);m(g,c)==-1&&g.push(c)}}}function rd(a){a.display.viewFrom=a.display.viewTo=a.doc.first,a.display.view=[],a.display.viewOffset=0}function sd(a,b,c,d){var e,f=zc(a,b),g=a.display.view;if(!Tg||c==a.doc.first+a.doc.size)return{index:f,lineN:c};for(var h=a.display.viewFrom,i=0;i<f;i++)h+=g[i].size;if(h!=b){if(d>0){if(f==g.length-1)return null;e=h+g[f].size-b,f++}else e=h-b;b+=e,c+=e}for(;oa(a.doc,c)!=c;){if(f==(d<0?0:g.length-1))return null;c+=d*g[f-(d<0?1:0)].size,f+=d}return{index:f,lineN:c}}function td(a,b,c){var d=a.display,e=d.view;0==e.length||b>=d.viewTo||c<=d.viewFrom?(d.view=ub(a,b,c),d.viewFrom=b):(d.viewFrom>b?d.view=ub(a,b,d.viewFrom).concat(d.view):d.viewFrom<b&&(d.view=d.view.slice(zc(a,b))),d.viewFrom=b,d.viewTo<c?d.view=d.view.concat(ub(a,d.viewTo,c)):d.viewTo>c&&(d.view=d.view.slice(0,zc(a,c)))),d.viewTo=c}function ud(a){for(var b=a.display.view,c=0,d=0;d<b.length;d++){var e=b[d];e.hidden||e.node&&!e.changes||++c}return c}function vd(a,b){a.doc.highlightFrontier<a.display.viewTo&&a.state.highlight.set(b,j(wd,a))}function wd(a){var b=a.doc;if(!(b.highlightFrontier>=a.display.viewTo)){var c=+new Date+a.options.workTime,d=ab(a,b.highlightFrontier),e=[];b.iter(d.line,Math.min(b.first+b.size,a.display.viewTo+500),(function(f){if(d.line>=a.display.viewFrom){var g=f.styles,h=f.text.length>a.options.maxHighlightLength?Xa(b.mode,d.state):null,i=$a(a,f,d,!0);h&&(d.state=h),f.styles=i.styles;var j=f.styleClasses,k=i.classes;k?f.styleClasses=k:j&&(f.styleClasses=null);for(var l=!g||g.length!=f.styles.length||j!=k&&(!j||!k||j.bgClass!=k.bgClass||j.textClass!=k.textClass),m=0;!l&&m<g.length;++m)l=g[m]!=f.styles[m];l&&e.push(d.line),f.stateAfter=d.save(),d.nextLine()}else f.text.length<=a.options.maxHighlightLength&&bb(a,f.text,d),f.stateAfter=d.line%5==0?d.save():null,d.nextLine();if(+new Date>c)return vd(a,a.options.workDelay),!0})),b.highlightFrontier=d.line,b.modeFrontier=Math.max(b.modeFrontier,d.line),e.length&&ld(a,(function(){for(var b=0;b<e.length;b++)qd(a,e[b],"text")}))}}function xd(a){var b=a.display;!b.scrollbarsClipped&&b.scroller.offsetWidth&&(b.nativeBarWidth=b.scroller.offsetWidth-b.scroller.clientWidth,b.heightForcer.style.height=Rb(a)+"px",b.sizer.style.marginBottom=-b.nativeBarWidth+"px",b.sizer.style.borderRightWidth=Rb(a)+"px",b.scrollbarsClipped=!0)}function yd(a){if(a.hasFocus())return null;var b=g();if(!b||!f(a.display.lineDiv,b))return null;var c={activeElt:b};if(window.getSelection){var d=window.getSelection();d.anchorNode&&d.extend&&f(a.display.lineDiv,d.anchorNode)&&(c.anchorNode=d.anchorNode,c.anchorOffset=d.anchorOffset,c.focusNode=d.focusNode,c.focusOffset=d.focusOffset)}return c}function zd(a){if(a&&a.activeElt&&a.activeElt!=g()&&(a.activeElt.focus(),a.anchorNode&&f(document.body,a.anchorNode)&&f(document.body,a.focusNode))){var b=window.getSelection(),c=document.createRange();c.setEnd(a.anchorNode,a.anchorOffset),c.collapse(!1),b.removeAllRanges(),b.addRange(c),b.extend(a.focusNode,a.focusOffset)}}function Ad(a,c){var d=a.display,e=a.doc;if(c.editorIsHidden)return rd(a),!1;if(!c.force&&c.visible.from>=d.viewFrom&&c.visible.to<=d.viewTo&&(null==d.updateLineNumbers||d.updateLineNumbers>=d.viewTo)&&d.renderedView==d.view&&0==ud(a))return!1;Nc(a)&&(rd(a),c.dims=uc(a));var f=e.first+e.size,g=Math.max(c.visible.from-a.options.viewportMargin,e.first),h=Math.min(f,c.visible.to+a.options.viewportMargin);d.viewFrom<g&&g-d.viewFrom<20&&(g=Math.max(e.first,d.viewFrom)),d.viewTo>h&&d.viewTo-h<20&&(h=Math.min(f,d.viewTo)),Tg&&(g=oa(a.doc,g),h=pa(a.doc,h));var i=g!=d.viewFrom||h!=d.viewTo||d.lastWrapHeight!=c.wrapperHeight||d.lastWrapWidth!=c.wrapperWidth;td(a,g,h),d.viewOffset=sa(B(a.doc,d.viewFrom)),a.display.mover.style.top=d.viewOffset+"px";var j=ud(a);if(!i&&0==j&&!c.force&&d.renderedView==d.view&&(null==d.updateLineNumbers||d.updateLineNumbers>=d.viewTo))return!1;var k=yd(a);return j>4&&(d.lineDiv.style.display="none"),Dd(a,d.updateLineNumbers,c.dims),j>4&&(d.lineDiv.style.display=""),d.renderedView=d.view,zd(k),b(d.cursorDiv),b(d.selectionDiv),d.gutters.style.height=d.sizer.style.minHeight=0,i&&(d.lastWrapHeight=c.wrapperHeight,d.lastWrapWidth=c.wrapperWidth,vd(a,400)),d.updateLineNumbers=null,!0}function Bd(a,b){for(var c=b.viewport,d=!0;(d&&a.options.lineWrapping&&b.oldDisplayWidth!=Sb(a)||(c&&null!=c.top&&(c={top:Math.min(a.doc.height+Pb(a.display)-Tb(a),c.top)}),b.visible=Lc(a.display,a.doc,c),!(b.visible.from>=a.display.viewFrom&&b.visible.to<=a.display.viewTo)))&&Ad(a,b);d=!1){Jc(a);var e=_c(a);Ac(a),ad(a,e),Fd(a,e),b.force=!1}b.signal(a,"update",a),a.display.viewFrom==a.display.reportedViewFrom&&a.display.viewTo==a.display.reportedViewTo||(b.signal(a,"viewportChange",a,a.display.viewFrom,a.display.viewTo),a.display.reportedViewFrom=a.display.viewFrom,a.display.reportedViewTo=a.display.viewTo)}function Cd(a,b){var c=new th(a,b);if(Ad(a,c)){Jc(a),Bd(a,c);var d=_c(a);Ac(a),ad(a,d),Fd(a,d),c.finish()}}function Dd(a,c,d){function e(b){var c=b.nextSibling;return og&&yg&&a.display.currentWheelTarget==b?b.style.display="none":b.parentNode.removeChild(b),c}for(var f=a.display,g=a.options.lineNumbers,h=f.lineDiv,i=h.firstChild,j=f.view,k=f.viewFrom,l=0;l<j.length;l++){var n=j[l];if(n.hidden);else if(n.node&&n.node.parentNode==h){for(;i!=n.node;)i=e(i);var o=g&&null!=c&&c<=k&&n.lineNumber;n.changes&&(m(n.changes,"gutter")>-1&&(o=!1),Ab(a,n,k,d)),o&&(b(n.lineNumber),n.lineNumber.appendChild(document.createTextNode(I(a.options,k)))),i=n.node.nextSibling}else{var p=Ib(a,n,k,d);h.insertBefore(p,i)}k+=n.size}for(;i;)i=e(i)}function Ed(a){var b=a.display.gutters.offsetWidth;a.display.sizer.style.marginLeft=b+"px"}function Fd(a,b){a.display.sizer.style.minHeight=b.docHeight+"px",a.display.heightForcer.style.top=b.docHeight+"px",a.display.gutters.style.height=b.docHeight+a.display.barHeight+Rb(a)+"px"}function Gd(a){var c=a.display.gutters,e=a.options.gutters;b(c);for(var f=0;f<e.length;++f){var g=e[f],h=c.appendChild(d("div",null,"CodeMirror-gutter "+g));"CodeMirror-linenumbers"==g&&(a.display.lineGutter=h,h.style.width=(a.display.lineNumWidth||1)+"px")}c.style.display=f?"":"none",Ed(a)}function Hd(a){var b=m(a.gutters,"CodeMirror-linenumbers");b==-1&&a.lineNumbers?a.gutters=a.gutters.concat(["CodeMirror-linenumbers"]):b>-1&&!a.lineNumbers&&(a.gutters=a.gutters.slice(0),a.gutters.splice(b,1))}function Id(a){var b=a.wheelDeltaX,c=a.wheelDeltaY;return null==b&&a.detail&&a.axis==a.HORIZONTAL_AXIS&&(b=a.detail),null==c&&a.detail&&a.axis==a.VERTICAL_AXIS?c=a.detail:null==c&&(c=a.wheelDelta),{x:b,y:c}}function Jd(a){var b=Id(a);return b.x*=vh,b.y*=vh,b}function Kd(a,b){var c=Id(b),d=c.x,e=c.y,f=a.display,g=f.scroller,h=g.scrollWidth>g.clientWidth,i=g.scrollHeight>g.clientHeight;if(d&&h||e&&i){if(e&&yg&&og)a:for(var j=b.target,k=f.view;j!=g;j=j.parentNode)for(var l=0;l<k.length;l++)if(k[l].node==j){a.display.currentWheelTarget=j;break a}if(d&&!ig&&!rg&&null!=vh)return e&&i&&Yc(a,Math.max(0,g.scrollTop+e*vh)),$c(a,Math.max(0,g.scrollLeft+d*vh)),(!e||e&&i)&&Ja(b),void(f.wheelStartX=null);if(e&&null!=vh){var m=e*vh,n=a.doc.scrollTop,o=n+f.wrapper.clientHeight;m<0?n=Math.max(0,n+m-50):o=Math.min(a.doc.height,o+m+50),Cd(a,{top:n,bottom:o})}uh<20&&(null==f.wheelStartX?(f.wheelStartX=g.scrollLeft,f.wheelStartY=g.scrollTop,f.wheelDX=d,f.wheelDY=e,setTimeout((function(){if(null!=f.wheelStartX){var a=g.scrollLeft-f.wheelStartX,b=g.scrollTop-f.wheelStartY,c=b&&f.wheelDY&&b/f.wheelDY||a&&f.wheelDX&&a/f.wheelDX;f.wheelStartX=f.wheelStartY=null,c&&(vh=(vh*uh+c)/(uh+1),++uh)}}),200)):(f.wheelDX+=d,f.wheelDY+=e))}}function Ld(a,b){var c=a[b];a.sort((function(a,b){return K(a.from(),b.from())})),b=m(a,c);for(var d=1;d<a.length;d++){var e=a[d],f=a[d-1];if(K(f.to(),e.from())>=0){var g=O(f.from(),e.from()),h=N(f.to(),e.to()),i=f.empty()?e.from()==e.head:f.from()==f.head;d<=b&&--b,a.splice(--d,2,new xh(i?h:g,i?g:h))}}return new wh(a,b)}function Md(a,b){return new wh([new xh(a,b||a)],0)}function Nd(a){return a.text?J(a.from.line+a.text.length-1,p(a.text).length+(1==a.text.length?a.from.ch:0)):a.to}function Od(a,b){if(K(a,b.from)<0)return a;if(K(a,b.to)<=0)return Nd(b);var c=a.line+b.text.length-(b.to.line-b.from.line)-1,d=a.ch;return a.line==b.to.line&&(d+=Nd(b).ch-b.to.ch),J(c,d)}function Pd(a,b){for(var c=[],d=0;d<a.sel.ranges.length;d++){
+var e=a.sel.ranges[d];c.push(new xh(Od(e.anchor,b),Od(e.head,b)))}return Ld(c,a.sel.primIndex)}function Qd(a,b,c){return a.line==b.line?J(c.line,a.ch-b.ch+c.ch):J(c.line+(a.line-b.line),a.ch)}function Rd(a,b,c){for(var d=[],e=J(a.first,0),f=e,g=0;g<b.length;g++){var h=b[g],i=Qd(h.from,e,f),j=Qd(Nd(h),e,f);if(e=h.to,f=j,"around"==c){var k=a.sel.ranges[g],l=K(k.head,k.anchor)<0;d[g]=new xh(l?j:i,l?i:j)}else d[g]=new xh(i,i)}return new wh(d,a.sel.primIndex)}function Sd(a){a.doc.mode=Va(a.options,a.doc.modeOption),Td(a)}function Td(a){a.doc.iter((function(a){a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null)})),a.doc.modeFrontier=a.doc.highlightFrontier=a.doc.first,vd(a,100),a.state.modeGen++,a.curOp&&pd(a)}function Ud(a,b){return 0==b.from.ch&&0==b.to.ch&&""==p(b.text)&&(!a.cm||a.cm.options.wholeLineUpdateBefore)}function Vd(a,b,c,d){function e(a){return c?c[a]:null}function f(a,c,e){jb(a,c,e,d),yb(a,"change",a,b)}function g(a,b){for(var c=[],f=a;f<b;++f)c.push(new ih(j[f],e(f),d));return c}var h=b.from,i=b.to,j=b.text,k=B(a,h.line),l=B(a,i.line),m=p(j),n=e(j.length-1),o=i.line-h.line;if(b.full)a.insert(0,g(0,j.length)),a.remove(j.length,a.size-j.length);else if(Ud(a,b)){var q=g(0,j.length-1);f(l,l.text,n),o&&a.remove(h.line,o),q.length&&a.insert(h.line,q)}else if(k==l)if(1==j.length)f(k,k.text.slice(0,h.ch)+m+k.text.slice(i.ch),n);else{var r=g(1,j.length-1);r.push(new ih(m+k.text.slice(i.ch),n,d)),f(k,k.text.slice(0,h.ch)+j[0],e(0)),a.insert(h.line+1,r)}else if(1==j.length)f(k,k.text.slice(0,h.ch)+j[0]+l.text.slice(i.ch),e(0)),a.remove(h.line+1,o);else{f(k,k.text.slice(0,h.ch)+j[0],e(0)),f(l,m+l.text.slice(i.ch),n);var s=g(1,j.length-1);o>1&&a.remove(h.line+1,o-1),a.insert(h.line+1,s)}yb(a,"change",a,b)}function Wd(a,b,c){function d(a,e,f){if(a.linked)for(var g=0;g<a.linked.length;++g){var h=a.linked[g];if(h.doc!=e){var i=f&&h.sharedHist;c&&!i||(b(h.doc,i),d(h.doc,a,i))}}}d(a,null,!0)}function Xd(a,b){if(b.cm)throw new Error("This document is already in use.");a.doc=b,b.cm=a,xc(a),Sd(a),Yd(a),a.options.lineWrapping||ua(a),a.options.mode=b.modeOption,pd(a)}function Yd(a){("rtl"==a.doc.direction?h:Fg)(a.display.lineDiv,"CodeMirror-rtl")}function Zd(a){ld(a,(function(){Yd(a),pd(a)}))}function $d(a){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=a||1}function _d(a,b){var c={from:M(b.from),to:Nd(b),text:C(a,b.from,b.to)};return ge(a,c,b.from.line,b.to.line+1),Wd(a,(function(a){return ge(a,c,b.from.line,b.to.line+1)}),!0),c}function ae(a){for(;a.length;){var b=p(a);if(!b.ranges)break;a.pop()}}function be(a,b){return b?(ae(a.done),p(a.done)):a.done.length&&!p(a.done).ranges?p(a.done):a.done.length>1&&!a.done[a.done.length-2].ranges?(a.done.pop(),p(a.done)):void 0}function ce(a,b,c,d){var e=a.history;e.undone.length=0;var f,g,h=+new Date;if((e.lastOp==d||e.lastOrigin==b.origin&&b.origin&&("+"==b.origin.charAt(0)&&a.cm&&e.lastModTime>h-a.cm.options.historyEventDelay||"*"==b.origin.charAt(0)))&&(f=be(e,e.lastOp==d)))g=p(f.changes),0==K(b.from,b.to)&&0==K(b.from,g.to)?g.to=Nd(b):f.changes.push(_d(a,b));else{var i=p(e.done);for(i&&i.ranges||fe(a.sel,e.done),f={changes:[_d(a,b)],generation:e.generation},e.done.push(f);e.done.length>e.undoDepth;)e.done.shift(),e.done[0].ranges||e.done.shift()}e.done.push(c),e.generation=++e.maxGeneration,e.lastModTime=e.lastSelTime=h,e.lastOp=e.lastSelOp=d,e.lastOrigin=e.lastSelOrigin=b.origin,g||Ea(a,"historyAdded")}function de(a,b,c,d){var e=b.charAt(0);return"*"==e||"+"==e&&c.ranges.length==d.ranges.length&&c.somethingSelected()==d.somethingSelected()&&new Date-a.history.lastSelTime<=(a.cm?a.cm.options.historyEventDelay:500)}function ee(a,b,c,d){var e=a.history,f=d&&d.origin;c==e.lastSelOp||f&&e.lastSelOrigin==f&&(e.lastModTime==e.lastSelTime&&e.lastOrigin==f||de(a,f,p(e.done),b))?e.done[e.done.length-1]=b:fe(b,e.done),e.lastSelTime=+new Date,e.lastSelOrigin=f,e.lastSelOp=c,d&&d.clearRedo!==!1&&ae(e.undone)}function fe(a,b){var c=p(b);c&&c.ranges&&c.equals(a)||b.push(a)}function ge(a,b,c,d){var e=b["spans_"+a.id],f=0;a.iter(Math.max(a.first,c),Math.min(a.first+a.size,d),(function(c){c.markedSpans&&((e||(e=b["spans_"+a.id]={}))[f]=c.markedSpans),++f}))}function he(a){if(!a)return null;for(var b,c=0;c<a.length;++c)a[c].marker.explicitlyCleared?b||(b=a.slice(0,c)):b&&b.push(a[c]);return b?b.length?b:null:a}function ie(a,b){var c=b["spans_"+a.id];if(!c)return null;for(var d=[],e=0;e<b.text.length;++e)d.push(he(c[e]));return d}function je(a,b){var c=ie(a,b),d=_(a,b);if(!c)return d;if(!d)return c;for(var e=0;e<c.length;++e){var f=c[e],g=d[e];if(f&&g)a:for(var h=0;h<g.length;++h){for(var i=g[h],j=0;j<f.length;++j)if(f[j].marker==i.marker)continue a;f.push(i)}else g&&(c[e]=g)}return c}function ke(a,b,c){for(var d=[],e=0;e<a.length;++e){var f=a[e];if(f.ranges)d.push(c?wh.prototype.deepCopy.call(f):f);else{var g=f.changes,h=[];d.push({changes:h});for(var i=0;i<g.length;++i){var j=g[i],k=void 0;if(h.push({from:j.from,to:j.to,text:j.text}),b)for(var l in j)(k=l.match(/^spans_(\d+)$/))&&m(b,Number(k[1]))>-1&&(p(h)[l]=j[l],delete j[l])}}}return d}function le(a,b,c,d){if(d){var e=a.anchor;if(c){var f=K(b,e)<0;f!=K(c,e)<0?(e=b,b=c):f!=K(b,c)<0&&(b=c)}return new xh(e,b)}return new xh(c||b,b)}function me(a,b,c,d,e){null==e&&(e=a.cm&&(a.cm.display.shift||a.extend)),se(a,new wh([le(a.sel.primary(),b,c,e)],0),d)}function ne(a,b,c){for(var d=[],e=a.cm&&(a.cm.display.shift||a.extend),f=0;f<a.sel.ranges.length;f++)d[f]=le(a.sel.ranges[f],b[f],null,e);var g=Ld(d,a.sel.primIndex);se(a,g,c)}function oe(a,b,c,d){var e=a.sel.ranges.slice(0);e[b]=c,se(a,Ld(e,a.sel.primIndex),d)}function pe(a,b,c,d){se(a,Md(b,c),d)}function qe(a,b,c){var d={ranges:b.ranges,update:function(b){var c=this;this.ranges=[];for(var d=0;d<b.length;d++)c.ranges[d]=new xh(Q(a,b[d].anchor),Q(a,b[d].head))},origin:c&&c.origin};return Ea(a,"beforeSelectionChange",a,d),a.cm&&Ea(a.cm,"beforeSelectionChange",a.cm,d),d.ranges!=b.ranges?Ld(d.ranges,d.ranges.length-1):b}function re(a,b,c){var d=a.history.done,e=p(d);e&&e.ranges?(d[d.length-1]=b,te(a,b,c)):se(a,b,c)}function se(a,b,c){te(a,b,c),ee(a,a.sel,a.cm?a.cm.curOp.id:NaN,c)}function te(a,b,c){(Ha(a,"beforeSelectionChange")||a.cm&&Ha(a.cm,"beforeSelectionChange"))&&(b=qe(a,b,c));var d=c&&c.bias||(K(b.primary().head,a.sel.primary().head)<0?-1:1);ue(a,we(a,b,d,!0)),c&&c.scroll===!1||!a.cm||Tc(a.cm)}function ue(a,b){b.equals(a.sel)||(a.sel=b,a.cm&&(a.cm.curOp.updateInput=a.cm.curOp.selectionChanged=!0,Ga(a.cm)),yb(a,"cursorActivity",a))}function ve(a){ue(a,we(a,a.sel,null,!1))}function we(a,b,c,d){for(var e,f=0;f<b.ranges.length;f++){var g=b.ranges[f],h=b.ranges.length==a.sel.ranges.length&&a.sel.ranges[f],i=ye(a,g.anchor,h&&h.anchor,c,d),j=ye(a,g.head,h&&h.head,c,d);(e||i!=g.anchor||j!=g.head)&&(e||(e=b.ranges.slice(0,f)),e[f]=new xh(i,j))}return e?Ld(e,b.primIndex):b}function xe(a,b,c,d,e){var f=B(a,b.line);if(f.markedSpans)for(var g=0;g<f.markedSpans.length;++g){var h=f.markedSpans[g],i=h.marker;if((null==h.from||(i.inclusiveLeft?h.from<=b.ch:h.from<b.ch))&&(null==h.to||(i.inclusiveRight?h.to>=b.ch:h.to>b.ch))){if(e&&(Ea(i,"beforeCursorEnter"),i.explicitlyCleared)){if(f.markedSpans){--g;continue}break}if(!i.atomic)continue;if(c){var j=i.find(d<0?1:-1),k=void 0;if((d<0?i.inclusiveRight:i.inclusiveLeft)&&(j=ze(a,j,-d,j&&j.line==b.line?f:null)),j&&j.line==b.line&&(k=K(j,c))&&(d<0?k<0:k>0))return xe(a,j,b,d,e)}var l=i.find(d<0?-1:1);return(d<0?i.inclusiveLeft:i.inclusiveRight)&&(l=ze(a,l,d,l.line==b.line?f:null)),l?xe(a,l,b,d,e):null}}return b}function ye(a,b,c,d,e){var f=d||1,g=xe(a,b,c,f,e)||!e&&xe(a,b,c,f,!0)||xe(a,b,c,-f,e)||!e&&xe(a,b,c,-f,!0);return g?g:(a.cantEdit=!0,J(a.first,0))}function ze(a,b,c,d){return c<0&&0==b.ch?b.line>a.first?Q(a,J(b.line-1)):null:c>0&&b.ch==(d||B(a,b.line)).text.length?b.line<a.first+a.size-1?J(b.line+1,0):null:new J(b.line,b.ch+c)}function Ae(a){a.setSelection(J(a.firstLine(),0),J(a.lastLine()),Mg)}function Be(a,b,c){var d={canceled:!1,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){return d.canceled=!0}};return c&&(d.update=function(b,c,e,f){b&&(d.from=Q(a,b)),c&&(d.to=Q(a,c)),e&&(d.text=e),void 0!==f&&(d.origin=f)}),Ea(a,"beforeChange",a,d),a.cm&&Ea(a.cm,"beforeChange",a.cm,d),d.canceled?null:{from:d.from,to:d.to,text:d.text,origin:d.origin}}function Ce(a,b,c){if(a.cm){if(!a.cm.curOp)return md(a.cm,Ce)(a,b,c);if(a.cm.state.suppressEdits)return}if(!(Ha(a,"beforeChange")||a.cm&&Ha(a.cm,"beforeChange"))||(b=Be(a,b,!0))){var d=Sg&&!c&&ba(a,b.from,b.to);if(d)for(var e=d.length-1;e>=0;--e)De(a,{from:d[e].from,to:d[e].to,text:e?[""]:b.text});else De(a,b)}}function De(a,b){if(1!=b.text.length||""!=b.text[0]||0!=K(b.from,b.to)){var c=Pd(a,b);ce(a,b,c,a.cm?a.cm.curOp.id:NaN),Ge(a,b,c,_(a,b));var d=[];Wd(a,(function(a,c){c||m(d,a.history)!=-1||(Le(a.history,b),d.push(a.history)),Ge(a,b,null,_(a,b))}))}}function Ee(a,b,c){if(!a.cm||!a.cm.state.suppressEdits||c){for(var d,e=a.history,f=a.sel,g="undo"==b?e.done:e.undone,h="undo"==b?e.undone:e.done,i=0;i<g.length&&(d=g[i],c?!d.ranges||d.equals(a.sel):d.ranges);i++);if(i!=g.length){for(e.lastOrigin=e.lastSelOrigin=null;d=g.pop(),d.ranges;){if(fe(d,h),c&&!d.equals(a.sel))return void se(a,d,{clearRedo:!1});f=d}var j=[];fe(f,h),h.push({changes:j,generation:e.generation}),e.generation=d.generation||++e.maxGeneration;for(var k=Ha(a,"beforeChange")||a.cm&&Ha(a.cm,"beforeChange"),l=function(c){var e=d.changes[c];if(e.origin=b,k&&!Be(a,e,!1))return g.length=0,{};j.push(_d(a,e));var f=c?Pd(a,e):p(g);Ge(a,e,f,je(a,e)),!c&&a.cm&&a.cm.scrollIntoView({from:e.from,to:Nd(e)});var h=[];Wd(a,(function(a,b){b||m(h,a.history)!=-1||(Le(a.history,e),h.push(a.history)),Ge(a,e,null,je(a,e))}))},n=d.changes.length-1;n>=0;--n){var o=l(n);if(o)return o.v}}}}function Fe(a,b){if(0!=b&&(a.first+=b,a.sel=new wh(q(a.sel.ranges,(function(a){return new xh(J(a.anchor.line+b,a.anchor.ch),J(a.head.line+b,a.head.ch))})),a.sel.primIndex),a.cm)){pd(a.cm,a.first,a.first-b,b);for(var c=a.cm.display,d=c.viewFrom;d<c.viewTo;d++)qd(a.cm,d,"gutter")}}function Ge(a,b,c,d){if(a.cm&&!a.cm.curOp)return md(a.cm,Ge)(a,b,c,d);if(b.to.line<a.first)return void Fe(a,b.text.length-1-(b.to.line-b.from.line));if(!(b.from.line>a.lastLine())){if(b.from.line<a.first){var e=b.text.length-1-(a.first-b.from.line);Fe(a,e),b={from:J(a.first,0),to:J(b.to.line+e,b.to.ch),text:[p(b.text)],origin:b.origin}}var f=a.lastLine();b.to.line>f&&(b={from:b.from,to:J(f,B(a,f).text.length),text:[b.text[0]],origin:b.origin}),b.removed=C(a,b.from,b.to),c||(c=Pd(a,b)),a.cm?He(a.cm,b,d):Vd(a,b,d),te(a,c,Mg)}}function He(a,b,c){var d=a.doc,e=a.display,f=b.from,g=b.to,h=!1,i=f.line;a.options.lineWrapping||(i=F(la(B(d,f.line))),d.iter(i,g.line+1,(function(a){if(a==e.maxLine)return h=!0,!0}))),d.sel.contains(b.from,b.to)>-1&&Ga(a),Vd(d,b,c,wc(a)),a.options.lineWrapping||(d.iter(i,f.line+b.text.length,(function(a){var b=ta(a);b>e.maxLineLength&&(e.maxLine=a,e.maxLineLength=b,e.maxLineChanged=!0,h=!1)})),h&&(a.curOp.updateMaxLine=!0)),ib(d,f.line),vd(a,400);var j=b.text.length-(g.line-f.line)-1;b.full?pd(a):f.line!=g.line||1!=b.text.length||Ud(a.doc,b)?pd(a,f.line,g.line+1,j):qd(a,f.line,"text");var k=Ha(a,"changes"),l=Ha(a,"change");if(l||k){var m={from:f,to:g,text:b.text,removed:b.removed,origin:b.origin};l&&yb(a,"change",a,m),k&&(a.curOp.changeObjs||(a.curOp.changeObjs=[])).push(m)}a.display.selForContextMenu=null}function Ie(a,b,c,d,e){if(d||(d=c),K(d,c)<0){var f=d;d=c,c=f}"string"==typeof b&&(b=a.splitLines(b)),Ce(a,{from:c,to:d,text:b,origin:e})}function Je(a,b,c,d){c<a.line?a.line+=d:b<a.line&&(a.line=b,a.ch=0)}function Ke(a,b,c,d){for(var e=0;e<a.length;++e){var f=a[e],g=!0;if(f.ranges){f.copied||(f=a[e]=f.deepCopy(),f.copied=!0);for(var h=0;h<f.ranges.length;h++)Je(f.ranges[h].anchor,b,c,d),Je(f.ranges[h].head,b,c,d)}else{for(var i=0;i<f.changes.length;++i){var j=f.changes[i];if(c<j.from.line)j.from=J(j.from.line+d,j.from.ch),j.to=J(j.to.line+d,j.to.ch);else if(b<=j.to.line){g=!1;break}}g||(a.splice(0,e+1),e=0)}}}function Le(a,b){var c=b.from.line,d=b.to.line,e=b.text.length-(d-c)-1;Ke(a.done,c,d,e),Ke(a.undone,c,d,e)}function Me(a,b,c,d){var e=b,f=b;return"number"==typeof b?f=B(a,P(a,b)):e=F(b),null==e?null:(d(f,e)&&a.cm&&qd(a.cm,e,c),f)}function Ne(a){var b=this;this.lines=a,this.parent=null;for(var c=0,d=0;d<a.length;++d)a[d].parent=b,c+=a[d].height;this.height=c}function Oe(a){var b=this;this.children=a;for(var c=0,d=0,e=0;e<a.length;++e){var f=a[e];c+=f.chunkSize(),d+=f.height,f.parent=b}this.size=c,this.height=d,this.parent=null}function Pe(a,b,c){sa(b)<(a.curOp&&a.curOp.scrollTop||a.doc.scrollTop)&&Sc(a,c)}function Qe(a,b,c,d){var e=new yh(a,c,d),f=a.cm;return f&&e.noHScroll&&(f.display.alignWidgets=!0),Me(a,b,"widget",(function(b){var c=b.widgets||(b.widgets=[]);if(null==e.insertAt?c.push(e):c.splice(Math.min(c.length-1,Math.max(0,e.insertAt)),0,e),e.line=b,f&&!qa(a,b)){var d=sa(b)<a.scrollTop;E(b,b.height+Mb(e)),d&&Sc(f,e.height),f.curOp.forceUpdate=!0}return!0})),yb(f,"lineWidgetAdded",f,e,"number"==typeof b?b:F(b)),e}function Re(a,b,c,d,f){if(d&&d.shared)return Se(a,b,c,d,f);if(a.cm&&!a.cm.curOp)return md(a.cm,Re)(a,b,c,d,f);var g=new Ah(a,f),h=K(b,c);if(d&&k(d,g,!1),h>0||0==h&&g.clearWhenEmpty!==!1)return g;if(g.replacedWith&&(g.collapsed=!0,g.widgetNode=e("span",[g.replacedWith],"CodeMirror-widget"),d.handleMouseEvents||g.widgetNode.setAttribute("cm-ignore-events","true"),d.insertLeft&&(g.widgetNode.insertLeft=!0)),g.collapsed){if(ka(a,b.line,b,c,g)||b.line!=c.line&&ka(a,c.line,b,c,g))throw new Error("Inserting collapsed marker partially overlapping an existing one");U()}g.addToHistory&&ce(a,{from:b,to:c,origin:"markText"},a.sel,NaN);var i,j=b.line,l=a.cm;if(a.iter(j,c.line+1,(function(a){l&&g.collapsed&&!l.options.lineWrapping&&la(a)==l.display.maxLine&&(i=!0),g.collapsed&&j!=b.line&&E(a,0),Y(a,new V(g,j==b.line?b.ch:null,j==c.line?c.ch:null)),++j})),g.collapsed&&a.iter(b.line,c.line+1,(function(b){qa(a,b)&&E(b,0)})),g.clearOnEnter&&Xg(g,"beforeCursorEnter",(function(){return g.clear()})),g.readOnly&&(T(),(a.history.done.length||a.history.undone.length)&&a.clearHistory()),g.collapsed&&(g.id=++zh,g.atomic=!0),l){if(i&&(l.curOp.updateMaxLine=!0),g.collapsed)pd(l,b.line,c.line+1);else if(g.className||g.title||g.startStyle||g.endStyle||g.css)for(var m=b.line;m<=c.line;m++)qd(l,m,"text");g.atomic&&ve(l.doc),yb(l,"markerAdded",l,g)}return g}function Se(a,b,c,d,e){d=k(d),d.shared=!1;var f=[Re(a,b,c,d,e)],g=f[0],h=d.widgetNode;return Wd(a,(function(a){h&&(d.widgetNode=h.cloneNode(!0)),f.push(Re(a,Q(a,b),Q(a,c),d,e));for(var i=0;i<a.linked.length;++i)if(a.linked[i].isParent)return;g=p(f)})),new Bh(f,g)}function Te(a){return a.findMarks(J(a.first,0),a.clipPos(J(a.lastLine())),(function(a){return a.parent}))}function Ue(a,b){for(var c=0;c<b.length;c++){var d=b[c],e=d.find(),f=a.clipPos(e.from),g=a.clipPos(e.to);if(K(f,g)){var h=Re(a,f,g,d.primary,d.primary.type);d.markers.push(h),h.parent=d}}}function Ve(a){for(var b=function(b){var c=a[b],d=[c.primary.doc];Wd(c.primary.doc,(function(a){return d.push(a)}));for(var e=0;e<c.markers.length;e++){var f=c.markers[e];m(d,f.doc)==-1&&(f.parent=null,c.markers.splice(e--,1))}},c=0;c<a.length;c++)b(c)}function We(a){var b=this;if(Ze(b),!Fa(b,a)&&!Nb(b.display,a)){Ja(a),mg&&(Eh=+new Date);var c=yc(b,a,!0),d=a.dataTransfer.files;if(c&&!b.isReadOnly())if(d&&d.length&&window.FileReader&&window.File)for(var e=d.length,f=Array(e),g=0,h=function(a,d){if(!b.options.allowDropFileTypes||m(b.options.allowDropFileTypes,a.type)!=-1){var h=new FileReader;h.onload=md(b,(function(){var a=h.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(a)&&(a=""),f[d]=a,++g==e){c=Q(b.doc,c);var i={from:c,to:c,text:b.doc.splitLines(f.join(b.doc.lineSeparator())),origin:"paste"};Ce(b.doc,i),re(b.doc,Md(c,Nd(i)))}})),h.readAsText(a)}},i=0;i<e;++i)h(d[i],i);else{if(b.state.draggingText&&b.doc.sel.contains(c)>-1)return b.state.draggingText(a),void setTimeout((function(){return b.display.input.focus()}),20);try{var j=a.dataTransfer.getData("Text");if(j){var k;if(b.state.draggingText&&!b.state.draggingText.copy&&(k=b.listSelections()),te(b.doc,Md(c,c)),k)for(var l=0;l<k.length;++l)Ie(b.doc,"",k[l].anchor,k[l].head,"drag");b.replaceSelection(j,"around","paste"),b.display.input.focus()}}catch(a){}}}}function Xe(a,b){if(mg&&(!a.state.draggingText||+new Date-Eh<100))return void Ma(b);if(!Fa(a,b)&&!Nb(a.display,b)&&(b.dataTransfer.setData("Text",a.getSelection()),b.dataTransfer.effectAllowed="copyMove",b.dataTransfer.setDragImage&&!sg)){var c=d("img",null,null,"position: fixed; left: 0; top: 0;");c.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",rg&&(c.width=c.height=1,a.display.wrapper.appendChild(c),c._top=c.offsetTop),b.dataTransfer.setDragImage(c,0,0),rg&&c.parentNode.removeChild(c)}}function Ye(a,b){var e=yc(a,b);if(e){var f=document.createDocumentFragment();Cc(a,e,f),a.display.dragCursor||(a.display.dragCursor=d("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),a.display.lineSpace.insertBefore(a.display.dragCursor,a.display.cursorDiv)),c(a.display.dragCursor,f)}}function Ze(a){a.display.dragCursor&&(a.display.lineSpace.removeChild(a.display.dragCursor),a.display.dragCursor=null)}function $e(a){if(document.getElementsByClassName)for(var b=document.getElementsByClassName("CodeMirror"),c=0;c<b.length;c++){var d=b[c].CodeMirror;d&&a(d)}}function _e(){Fh||(af(),Fh=!0)}function af(){var a;Xg(window,"resize",(function(){null==a&&(a=setTimeout((function(){a=null,$e(bf)}),100))})),Xg(window,"blur",(function(){return $e(Ic)}))}function bf(a){var b=a.display;b.lastWrapHeight==b.wrapper.clientHeight&&b.lastWrapWidth==b.wrapper.clientWidth||(b.cachedCharWidth=b.cachedTextHeight=b.cachedPaddingH=null,b.scrollbarsClipped=!1,a.setSize())}function cf(a){var b=a.split(/-(?!$)/);a=b[b.length-1];for(var c,d,e,f,g=0;g<b.length-1;g++){var h=b[g];if(/^(cmd|meta|m)$/i.test(h))f=!0;else if(/^a(lt)?$/i.test(h))c=!0;else if(/^(c|ctrl|control)$/i.test(h))d=!0;else{if(!/^s(hift)?$/i.test(h))throw new Error("Unrecognized modifier name: "+h);e=!0}}return c&&(a="Alt-"+a),d&&(a="Ctrl-"+a),f&&(a="Cmd-"+a),e&&(a="Shift-"+a),a}function df(a){var b={};for(var c in a)if(a.hasOwnProperty(c)){var d=a[c];if(/^(name|fallthrough|(de|at)tach)$/.test(c))continue;if("..."==d){delete a[c];continue}for(var e=q(c.split(" "),cf),f=0;f<e.length;f++){var g=void 0,h=void 0;f==e.length-1?(h=e.join(" "),g=d):(h=e.slice(0,f+1).join(" "),g="...");var i=b[h];if(i){if(i!=g)throw new Error("Inconsistent bindings for "+h)}else b[h]=g}delete a[c]}for(var j in b)a[j]=b[j];return a}function ef(a,b,c,d){b=jf(b);var e=b.call?b.call(a,d):b[a];if(e===!1)return"nothing";if("..."===e)return"multi";if(null!=e&&c(e))return"handled";if(b.fallthrough){if("[object Array]"!=Object.prototype.toString.call(b.fallthrough))return ef(a,b.fallthrough,c,d);for(var f=0;f<b.fallthrough.length;f++){var g=ef(a,b.fallthrough[f],c,d);if(g)return g}}}function ff(a){var b="string"==typeof a?a:Gh[a.keyCode];return"Ctrl"==b||"Alt"==b||"Shift"==b||"Mod"==b}function gf(a,b,c){var d=a;return b.altKey&&"Alt"!=d&&(a="Alt-"+a),(Dg?b.metaKey:b.ctrlKey)&&"Ctrl"!=d&&(a="Ctrl-"+a),(Dg?b.ctrlKey:b.metaKey)&&"Cmd"!=d&&(a="Cmd-"+a),!c&&b.shiftKey&&"Shift"!=d&&(a="Shift-"+a),a}function hf(a,b){if(rg&&34==a.keyCode&&a.char)return!1;var c=Gh[a.keyCode];return null!=c&&!a.altGraphKey&&gf(c,a,b)}function jf(a){return"string"==typeof a?Kh[a]:a}function kf(a,b){for(var c=a.doc.sel.ranges,d=[],e=0;e<c.length;e++){for(var f=b(c[e]);d.length&&K(f.from,p(d).to)<=0;){var g=d.pop();if(K(g.from,f.from)<0){f.from=g.from;break}}d.push(f)}ld(a,(function(){for(var b=d.length-1;b>=0;b--)Ie(a.doc,"",d[b].from,d[b].to,"+delete");Tc(a)}))}function lf(a,b){var c=B(a.doc,b),d=la(c);return d!=c&&(b=F(d)),Aa(!0,a,d,b,1)}function mf(a,b){var c=B(a.doc,b),d=ma(c);return d!=c&&(b=F(d)),Aa(!0,a,c,b,-1)}function nf(a,b){var c=lf(a,b.line),d=B(a.doc,c.line),e=xa(d,a.doc.direction);if(!e||0==e[0].level){var f=Math.max(0,d.text.search(/\S/)),g=b.line==c.line&&b.ch<=f&&b.ch;return J(c.line,g?0:f,c.sticky)}return c}function of(a,b,c){if("string"==typeof b&&(b=Lh[b],!b))return!1;a.display.input.ensurePolled();var d=a.display.shift,e=!1;try{a.isReadOnly()&&(a.state.suppressEdits=!0),c&&(a.display.shift=!1),e=b(a)!=Lg}finally{a.display.shift=d,a.state.suppressEdits=!1}return e}function pf(a,b,c){for(var d=0;d<a.state.keyMaps.length;d++){var e=ef(b,a.state.keyMaps[d],c,a);if(e)return e}return a.options.extraKeys&&ef(b,a.options.extraKeys,c,a)||ef(b,a.options.keyMap,c,a)}function qf(a,b,c,d){var e=a.state.keySeq;if(e){if(ff(b))return"handled";Mh.set(50,(function(){a.state.keySeq==e&&(a.state.keySeq=null,a.display.input.reset())})),b=e+" "+b}var f=pf(a,b,d);return"multi"==f&&(a.state.keySeq=b),"handled"==f&&yb(a,"keyHandled",a,b,c),"handled"!=f&&"multi"!=f||(Ja(c),Ec(a)),e&&!f&&/\'$/.test(b)?(Ja(c),!0):!!f}function rf(a,b){var c=hf(b,!0);return!!c&&(b.shiftKey&&!a.state.keySeq?qf(a,"Shift-"+c,b,(function(b){return of(a,b,!0)}))||qf(a,c,b,(function(b){if("string"==typeof b?/^go[A-Z]/.test(b):b.motion)return of(a,b)})):qf(a,c,b,(function(b){return of(a,b)})))}function sf(a,b,c){return qf(a,"'"+c+"'",b,(function(b){return of(a,b,!0)}))}function tf(a){var b=this;if(b.curOp.focus=g(),!Fa(b,a)){mg&&ng<11&&27==a.keyCode&&(a.returnValue=!1);var c=a.keyCode;b.display.shift=16==c||a.shiftKey;var d=rf(b,a);rg&&(Nh=d?c:null,!d&&88==c&&!_g&&(yg?a.metaKey:a.ctrlKey)&&b.replaceSelection("",null,"cut")),18!=c||/\bCodeMirror-crosshair\b/.test(b.display.lineDiv.className)||uf(b)}}function uf(a){function b(a){18!=a.keyCode&&a.altKey||(Fg(c,"CodeMirror-crosshair"),Da(document,"keyup",b),Da(document,"mouseover",b))}var c=a.display.lineDiv;h(c,"CodeMirror-crosshair"),Xg(document,"keyup",b),Xg(document,"mouseover",b)}function vf(a){16==a.keyCode&&(this.doc.sel.shift=!1),Fa(this,a)}function wf(a){var b=this;if(!(Nb(b.display,a)||Fa(b,a)||a.ctrlKey&&!a.altKey||yg&&a.metaKey)){var c=a.keyCode,d=a.charCode;if(rg&&c==Nh)return Nh=null,void Ja(a);if(!rg||a.which&&!(a.which<10)||!rf(b,a)){var e=String.fromCharCode(null==d?c:d);"\b"!=e&&(sf(b,a,e)||b.display.input.onKeyPress(a))}}}function xf(a,b){var c=+new Date;return Rh&&Rh.compare(c,a,b)?(Qh=Rh=null,"triple"):Qh&&Qh.compare(c,a,b)?(Rh=new Ph(c,a,b),Qh=null,"double"):(Qh=new Ph(c,a,b),Rh=null,"single")}function yf(a){var b=this,c=b.display;if(!(Fa(b,a)||c.activeTouch&&c.input.supportsTouch())){if(c.input.ensurePolled(),c.shift=a.shiftKey,Nb(c,a))return void(og||(c.scroller.draggable=!1,setTimeout((function(){return c.scroller.draggable=!0}),100)));if(!Gf(b,a)){var d=yc(b,a),e=Oa(a),f=d?xf(d,e):"single";window.focus(),1==e&&b.state.selectingText&&b.state.selectingText(a),d&&zf(b,e,d,f,a)||(1==e?d?Bf(b,d,f,a):Na(a)==c.scroller&&Ja(a):2==e?(d&&me(b.doc,d),setTimeout((function(){return c.input.focus()}),20)):3==e&&(Eg?Hf(b,a):Gc(b)))}}}function zf(a,b,c,d,e){var f="Click";return"double"==d?f="Double"+f:"triple"==d&&(f="Triple"+f),f=(1==b?"Left":2==b?"Middle":"Right")+f,qf(a,gf(f,e),e,(function(b){if("string"==typeof b&&(b=Lh[b]),!b)return!1;var d=!1;try{a.isReadOnly()&&(a.state.suppressEdits=!0),d=b(a,c)!=Lg}finally{a.state.suppressEdits=!1}return d}))}function Af(a,b,c){var d=a.getOption("configureMouse"),e=d?d(a,b,c):{};if(null==e.unit){var f=zg?c.shiftKey&&c.metaKey:c.altKey;e.unit=f?"rectangle":"single"==b?"char":"double"==b?"word":"line"}return(null==e.extend||a.doc.extend)&&(e.extend=a.doc.extend||c.shiftKey),null==e.addNew&&(e.addNew=yg?c.metaKey:c.ctrlKey),null==e.moveOnDrag&&(e.moveOnDrag=!(yg?c.altKey:c.ctrlKey)),e}function Bf(a,b,c,d){mg?setTimeout(j(Fc,a),0):a.curOp.focus=g();var e,f=Af(a,c,d),h=a.doc.sel;a.options.dragDrop&&Yg&&!a.isReadOnly()&&"single"==c&&(e=h.contains(b))>-1&&(K((e=h.ranges[e]).from(),b)<0||b.xRel>0)&&(K(e.to(),b)>0||b.xRel<0)?Cf(a,d,b,f):Ef(a,d,b,f)}function Cf(a,b,c,d){var e=a.display,f=!1,g=md(a,(function(b){og&&(e.scroller.draggable=!1),a.state.draggingText=!1,Da(document,"mouseup",g),Da(document,"mousemove",h),Da(e.scroller,"dragstart",i),Da(e.scroller,"drop",g),f||(Ja(b),d.addNew||me(a.doc,c,null,null,d.extend),og||mg&&9==ng?setTimeout((function(){document.body.focus(),e.input.focus()}),20):e.input.focus())})),h=function(a){f=f||Math.abs(b.clientX-a.clientX)+Math.abs(b.clientY-a.clientY)>=10},i=function(){return f=!0};og&&(e.scroller.draggable=!0),a.state.draggingText=g,g.copy=!d.moveOnDrag,e.scroller.dragDrop&&e.scroller.dragDrop(),Xg(document,"mouseup",g),Xg(document,"mousemove",h),Xg(e.scroller,"dragstart",i),Xg(e.scroller,"drop",g),Gc(a),setTimeout((function(){return e.input.focus()}),20)}function Df(a,b,c){if("char"==c)return new xh(b,b);if("word"==c)return a.findWordAt(b);if("line"==c)return new xh(J(b.line,0),Q(a.doc,J(b.line+1,0)));var d=c(a,b);return new xh(d.from,d.to)}function Ef(a,b,c,d){function e(b){if(0!=K(r,b))if(r=b,"rectangle"==d.unit){for(var e=[],f=a.options.tabSize,g=l(B(j,c.line).text,c.ch,f),h=l(B(j,b.line).text,b.ch,f),i=Math.min(g,h),p=Math.max(g,h),q=Math.min(c.line,b.line),s=Math.min(a.lastLine(),Math.max(c.line,b.line));q<=s;q++){var t=B(j,q).text,u=n(t,i,f);i==p?e.push(new xh(J(q,u),J(q,u))):t.length>u&&e.push(new xh(J(q,u),J(q,n(t,p,f))))}e.length||e.push(new xh(c,c)),se(j,Ld(o.ranges.slice(0,m).concat(e),m),{origin:"*mouse",scroll:!1}),a.scrollIntoView(b)}else{var v,w=k,x=Df(a,b,d.unit),y=w.anchor;K(x.anchor,y)>0?(v=x.head,y=O(w.from(),x.anchor)):(v=x.anchor,y=N(w.to(),x.head));var z=o.ranges.slice(0);z[m]=new xh(Q(j,y),v),se(j,Ld(z,m),Ng)}}function f(b){var c=++t,h=yc(a,b,!0,"rectangle"==d.unit);if(h)if(0!=K(h,r)){a.curOp.focus=g(),e(h);var k=Lc(i,j);(h.line>=k.to||h.line<k.from)&&setTimeout(md(a,(function(){t==c&&f(b)})),150)}else{var l=b.clientY<s.top?-20:b.clientY>s.bottom?20:0;l&&setTimeout(md(a,(function(){t==c&&(i.scroller.scrollTop+=l,f(b))})),50)}}function h(b){a.state.selectingText=!1,t=1/0,Ja(b),i.input.focus(),Da(document,"mousemove",u),Da(document,"mouseup",v),j.history.lastSelOrigin=null}var i=a.display,j=a.doc;Ja(b);var k,m,o=j.sel,p=o.ranges;if(d.addNew&&!d.extend?(m=j.sel.contains(c),k=m>-1?p[m]:new xh(c,c)):(k=j.sel.primary(),m=j.sel.primIndex),"rectangle"==d.unit)d.addNew||(k=new xh(c,c)),c=yc(a,b,!0,!0),m=-1;else{var q=Df(a,c,d.unit);k=d.extend?le(k,q.anchor,q.head,d.extend):q}d.addNew?m==-1?(m=p.length,se(j,Ld(p.concat([k]),m),{scroll:!1,origin:"*mouse"})):p.length>1&&p[m].empty()&&"char"==d.unit&&!d.extend?(se(j,Ld(p.slice(0,m).concat(p.slice(m+1)),0),{scroll:!1,origin:"*mouse"}),o=j.sel):oe(j,m,k,Ng):(m=0,se(j,new wh([k],0),Ng),o=j.sel);var r=c,s=i.wrapper.getBoundingClientRect(),t=0,u=md(a,(function(a){Oa(a)?f(a):h(a)})),v=md(a,h);a.state.selectingText=v,Xg(document,"mousemove",u),Xg(document,"mouseup",v)}function Ff(a,b,c,d){var e,f;try{e=b.clientX,f=b.clientY}catch(a){return!1}if(e>=Math.floor(a.display.gutters.getBoundingClientRect().right))return!1;d&&Ja(b);var g=a.display,h=g.lineDiv.getBoundingClientRect();if(f>h.bottom||!Ha(a,c))return La(b);f-=h.top-g.viewOffset;for(var i=0;i<a.options.gutters.length;++i){var j=g.gutters.childNodes[i];if(j&&j.getBoundingClientRect().right>=e){var k=G(a.doc,f),l=a.options.gutters[i];return Ea(a,c,a,k,l,b),La(b)}}}function Gf(a,b){return Ff(a,b,"gutterClick",!0)}function Hf(a,b){Nb(a.display,b)||If(a,b)||Fa(a,b,"contextmenu")||a.display.input.onContextMenu(b)}function If(a,b){return!!Ha(a,"gutterContextMenu")&&Ff(a,b,"gutterContextMenu",!1)}function Jf(a){a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+a.options.theme.replace(/(^|\s)\s*/g," cm-s-"),fc(a)}function Kf(a){function b(b,d,e,f){a.defaults[b]=d,e&&(c[b]=f?function(a,b,c){c!=Sh&&e(a,b,c)}:e)}var c=a.optionHandlers;a.defineOption=b,a.Init=Sh,b("value","",(function(a,b){return a.setValue(b)}),!0),b("mode",null,(function(a,b){a.doc.modeOption=b,Sd(a)}),!0),b("indentUnit",2,Sd,!0),b("indentWithTabs",!1),b("smartIndent",!0),b("tabSize",4,(function(a){Td(a),fc(a),pd(a)}),!0),b("lineSeparator",null,(function(a,b){if(a.doc.lineSep=b,b){var c=[],d=a.doc.first;a.doc.iter((function(a){for(var e=0;;){var f=a.text.indexOf(b,e);if(f==-1)break;e=f+b.length,c.push(J(d,f))}d++}));for(var e=c.length-1;e>=0;e--)Ie(a.doc,b,c[e],J(c[e].line,c[e].ch+b.length))}})),b("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g,(function(a,b,c){a.state.specialChars=new RegExp(b.source+(b.test("\t")?"":"|\t"),"g"),c!=Sh&&a.refresh()})),b("specialCharPlaceholder",nb,(function(a){return a.refresh()}),!0),b("electricChars",!0),b("inputStyle",xg?"contenteditable":"textarea",(function(){throw new Error("inputStyle can not (yet) be changed in a running editor")}),!0),b("spellcheck",!1,(function(a,b){return a.getInputField().spellcheck=b}),!0),b("rtlMoveVisually",!Ag),b("wholeLineUpdateBefore",!0),b("theme","default",(function(a){Jf(a),Lf(a)}),!0),b("keyMap","default",(function(a,b,c){var d=jf(b),e=c!=Sh&&jf(c);e&&e.detach&&e.detach(a,d),d.attach&&d.attach(a,e||null)})),b("extraKeys",null),b("configureMouse",null),b("lineWrapping",!1,Nf,!0),b("gutters",[],(function(a){Hd(a.options),Lf(a)}),!0),b("fixedGutter",!0,(function(a,b){a.display.gutters.style.left=b?vc(a.display)+"px":"0",a.refresh()}),!0),b("coverGutterNextToScrollbar",!1,(function(a){return ad(a)}),!0),b("scrollbarStyle","native",(function(a){cd(a),ad(a),a.display.scrollbars.setScrollTop(a.doc.scrollTop),a.display.scrollbars.setScrollLeft(a.doc.scrollLeft)}),!0),b("lineNumbers",!1,(function(a){Hd(a.options),Lf(a)}),!0),b("firstLineNumber",1,Lf,!0),b("lineNumberFormatter",(function(a){return a}),Lf,!0),b("showCursorWhenSelecting",!1,Ac,!0),b("resetSelectionOnContextMenu",!0),b("lineWiseCopyCut",!0),b("pasteLinesPerSelection",!0),b("readOnly",!1,(function(a,b){"nocursor"==b&&(Ic(a),a.display.input.blur()),a.display.input.readOnlyChanged(b)})),b("disableInput",!1,(function(a,b){b||a.display.input.reset()}),!0),b("dragDrop",!0,Mf),b("allowDropFileTypes",null),b("cursorBlinkRate",530),b("cursorScrollMargin",0),b("cursorHeight",1,Ac,!0),b("singleCursorHeightPerLine",!0,Ac,!0),b("workTime",100),b("workDelay",100),b("flattenSpans",!0,Td,!0),b("addModeClass",!1,Td,!0),b("pollInterval",100),b("undoDepth",200,(function(a,b){return a.doc.history.undoDepth=b})),b("historyEventDelay",1250),b("viewportMargin",10,(function(a){return a.refresh()}),!0),b("maxHighlightLength",1e4,Td,!0),b("moveInputWithCursor",!0,(function(a,b){b||a.display.input.resetPosition()})),b("tabindex",null,(function(a,b){return a.display.input.getField().tabIndex=b||""})),b("autofocus",null),b("direction","ltr",(function(a,b){return a.doc.setDirection(b)}),!0)}function Lf(a){Gd(a),pd(a),Mc(a)}function Mf(a,b,c){var d=c&&c!=Sh;if(!b!=!d){var e=a.display.dragFunctions,f=b?Xg:Da;f(a.display.scroller,"dragstart",e.start),f(a.display.scroller,"dragenter",e.enter),f(a.display.scroller,"dragover",e.over),f(a.display.scroller,"dragleave",e.leave),f(a.display.scroller,"drop",e.drop)}}function Nf(a){a.options.lineWrapping?(h(a.display.wrapper,"CodeMirror-wrap"),a.display.sizer.style.minWidth="",a.display.sizerWidth=null):(Fg(a.display.wrapper,"CodeMirror-wrap"),ua(a)),xc(a),pd(a),fc(a),setTimeout((function(){return ad(a)}),100)}function Of(a,b){var c=this;if(!(this instanceof Of))return new Of(a,b);this.options=b=b?k(b):{},k(Th,b,!1),Hd(b);var d=b.value;"string"==typeof d&&(d=new Dh(d,b.mode,null,b.lineSeparator,b.direction)),this.doc=d;var e=new Of.inputStyles[b.inputStyle](this),f=this.display=new A(a,d,e);f.wrapper.CodeMirror=this,Gd(this),Jf(this),b.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),cd(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new Hg,keySeq:null,specialChars:null},b.autofocus&&!xg&&f.input.focus(),mg&&ng<11&&setTimeout((function(){return c.display.input.reset(!0)}),20),Pf(this),_e(),dd(this),this.curOp.forceUpdate=!0,Xd(this,d),b.autofocus&&!xg||this.hasFocus()?setTimeout(j(Hc,this),20):Ic(this);for(var g in Uh)Uh.hasOwnProperty(g)&&Uh[g](c,b[g],Sh);
+Nc(this),b.finishInit&&b.finishInit(this);for(var h=0;h<Vh.length;++h)Vh[h](c);ed(this),og&&b.lineWrapping&&"optimizelegibility"==getComputedStyle(f.lineDiv).textRendering&&(f.lineDiv.style.textRendering="auto")}function Pf(a){function b(){e.activeTouch&&(f=setTimeout((function(){return e.activeTouch=null}),1e3),g=e.activeTouch,g.end=+new Date)}function c(a){if(1!=a.touches.length)return!1;var b=a.touches[0];return b.radiusX<=1&&b.radiusY<=1}function d(a,b){if(null==b.left)return!0;var c=b.left-a.left,d=b.top-a.top;return c*c+d*d>400}var e=a.display;Xg(e.scroller,"mousedown",md(a,yf)),mg&&ng<11?Xg(e.scroller,"dblclick",md(a,(function(b){if(!Fa(a,b)){var c=yc(a,b);if(c&&!Gf(a,b)&&!Nb(a.display,b)){Ja(b);var d=a.findWordAt(c);me(a.doc,d.anchor,d.head)}}}))):Xg(e.scroller,"dblclick",(function(b){return Fa(a,b)||Ja(b)})),Eg||Xg(e.scroller,"contextmenu",(function(b){return Hf(a,b)}));var f,g={end:0};Xg(e.scroller,"touchstart",(function(b){if(!Fa(a,b)&&!c(b)){e.input.ensurePolled(),clearTimeout(f);var d=+new Date;e.activeTouch={start:d,moved:!1,prev:d-g.end<=300?g:null},1==b.touches.length&&(e.activeTouch.left=b.touches[0].pageX,e.activeTouch.top=b.touches[0].pageY)}})),Xg(e.scroller,"touchmove",(function(){e.activeTouch&&(e.activeTouch.moved=!0)})),Xg(e.scroller,"touchend",(function(c){var f=e.activeTouch;if(f&&!Nb(e,c)&&null!=f.left&&!f.moved&&new Date-f.start<300){var g,h=a.coordsChar(e.activeTouch,"page");g=!f.prev||d(f,f.prev)?new xh(h,h):!f.prev.prev||d(f,f.prev.prev)?a.findWordAt(h):new xh(J(h.line,0),Q(a.doc,J(h.line+1,0))),a.setSelection(g.anchor,g.head),a.focus(),Ja(c)}b()})),Xg(e.scroller,"touchcancel",b),Xg(e.scroller,"scroll",(function(){e.scroller.clientHeight&&(Yc(a,e.scroller.scrollTop),$c(a,e.scroller.scrollLeft,!0),Ea(a,"scroll",a))})),Xg(e.scroller,"mousewheel",(function(b){return Kd(a,b)})),Xg(e.scroller,"DOMMouseScroll",(function(b){return Kd(a,b)})),Xg(e.wrapper,"scroll",(function(){return e.wrapper.scrollTop=e.wrapper.scrollLeft=0})),e.dragFunctions={enter:function(b){Fa(a,b)||Ma(b)},over:function(b){Fa(a,b)||(Ye(a,b),Ma(b))},start:function(b){return Xe(a,b)},drop:md(a,We),leave:function(b){Fa(a,b)||Ze(a)}};var h=e.input.getField();Xg(h,"keyup",(function(b){return vf.call(a,b)})),Xg(h,"keydown",md(a,tf)),Xg(h,"keypress",md(a,wf)),Xg(h,"focus",(function(b){return Hc(a,b)})),Xg(h,"blur",(function(b){return Ic(a,b)}))}function Qf(a,b,c,d){var e,f=a.doc;null==c&&(c="add"),"smart"==c&&(f.mode.indent?e=ab(a,b).state:c="prev");var g=a.options.tabSize,h=B(f,b),i=l(h.text,null,g);h.stateAfter&&(h.stateAfter=null);var j,k=h.text.match(/^\s*/)[0];if(d||/\S/.test(h.text)){if("smart"==c&&(j=f.mode.indent(e,h.text.slice(k.length),h.text),j==Lg||j>150)){if(!d)return;c="prev"}}else j=0,c="not";"prev"==c?j=b>f.first?l(B(f,b-1).text,null,g):0:"add"==c?j=i+a.options.indentUnit:"subtract"==c?j=i-a.options.indentUnit:"number"==typeof c&&(j=i+c),j=Math.max(0,j);var m="",n=0;if(a.options.indentWithTabs)for(var p=Math.floor(j/g);p;--p)n+=g,m+="\t";if(n<j&&(m+=o(j-n)),m!=k)return Ie(f,m,J(b,0),J(b,k.length),"+input"),h.stateAfter=null,!0;for(var q=0;q<f.sel.ranges.length;q++){var r=f.sel.ranges[q];if(r.head.line==b&&r.head.ch<k.length){var s=J(b,k.length);oe(f,q,new xh(s,s));break}}}function Rf(a){Wh=a}function Sf(a,b,c,d,e){var f=a.doc;a.display.shift=!1,d||(d=f.sel);var g=a.state.pasteIncoming||"paste"==e,h=Zg(b),i=null;if(g&&d.ranges.length>1)if(Wh&&Wh.text.join("\n")==b){if(d.ranges.length%Wh.text.length==0){i=[];for(var j=0;j<Wh.text.length;j++)i.push(f.splitLines(Wh.text[j]))}}else h.length==d.ranges.length&&a.options.pasteLinesPerSelection&&(i=q(h,(function(a){return[a]})));for(var k,l=d.ranges.length-1;l>=0;l--){var m=d.ranges[l],n=m.from(),o=m.to();m.empty()&&(c&&c>0?n=J(n.line,n.ch-c):a.state.overwrite&&!g?o=J(o.line,Math.min(B(f,o.line).text.length,o.ch+p(h).length)):Wh&&Wh.lineWise&&Wh.text.join("\n")==b&&(n=o=J(n.line,0))),k=a.curOp.updateInput;var r={from:n,to:o,text:i?i[l%i.length]:h,origin:e||(g?"paste":a.state.cutIncoming?"cut":"+input")};Ce(a.doc,r),yb(a,"inputRead",a,r)}b&&!g&&Uf(a,b),Tc(a),a.curOp.updateInput=k,a.curOp.typing=!0,a.state.pasteIncoming=a.state.cutIncoming=!1}function Tf(a,b){var c=a.clipboardData&&a.clipboardData.getData("Text");if(c)return a.preventDefault(),b.isReadOnly()||b.options.disableInput||ld(b,(function(){return Sf(b,c,0,null,"paste")})),!0}function Uf(a,b){if(a.options.electricChars&&a.options.smartIndent)for(var c=a.doc.sel,d=c.ranges.length-1;d>=0;d--){var e=c.ranges[d];if(!(e.head.ch>100||d&&c.ranges[d-1].head.line==e.head.line)){var f=a.getModeAt(e.head),g=!1;if(f.electricChars){for(var h=0;h<f.electricChars.length;h++)if(b.indexOf(f.electricChars.charAt(h))>-1){g=Qf(a,e.head.line,"smart");break}}else f.electricInput&&f.electricInput.test(B(a.doc,e.head.line).text.slice(0,e.head.ch))&&(g=Qf(a,e.head.line,"smart"));g&&yb(a,"electricInput",a,e.head.line)}}}function Vf(a){for(var b=[],c=[],d=0;d<a.doc.sel.ranges.length;d++){var e=a.doc.sel.ranges[d].head.line,f={anchor:J(e,0),head:J(e+1,0)};c.push(f),b.push(a.getRange(f.anchor,f.head))}return{text:b,ranges:c}}function Wf(a,b){a.setAttribute("autocorrect","off"),a.setAttribute("autocapitalize","off"),a.setAttribute("spellcheck",!!b)}function Xf(){var a=d("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),b=d("div",[a],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return og?a.style.width="1000px":a.setAttribute("wrap","off"),vg&&(a.style.border="1px solid black"),Wf(a),b}function Yf(a,b,c,d,e){function f(){var d=b.line+c;return!(d<a.first||d>=a.first+a.size)&&(b=new J(d,b.ch,b.sticky),j=B(a,d))}function g(d){var g;if(g=e?Ba(a.cm,j,b,c):za(j,b,c),null==g){if(d||!f())return!1;b=Aa(e,a.cm,j,b.line,c)}else b=g;return!0}var h=b,i=c,j=B(a,b.line);if("char"==d)g();else if("column"==d)g(!0);else if("word"==d||"group"==d)for(var k=null,l="group"==d,m=a.cm&&a.cm.getHelper(b,"wordChars"),n=!0;!(c<0)||g(!n);n=!1){var o=j.text.charAt(b.ch)||"\n",p=v(o,m)?"w":l&&"\n"==o?"n":!l||/\s/.test(o)?null:"p";if(!l||n||p||(p="s"),k&&k!=p){c<0&&(c=1,g(),b.sticky="after");break}if(p&&(k=p),c>0&&!g(!n))break}var q=ye(a,b,h,i,!0);return L(h,q)&&(q.hitSide=!0),q}function Zf(a,b,c,d){var e,f=a.doc,g=b.left;if("page"==d){var h=Math.min(a.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),i=Math.max(h-.5*sc(a.display),3);e=(c>0?b.bottom:b.top)+c*i}else"line"==d&&(e=c>0?b.bottom+3:b.top-3);for(var j;j=oc(a,g,e),j.outside;){if(c<0?e<=0:e>=f.height){j.hitSide=!0;break}e+=5*c}return j}function $f(a,b){var c=Yb(a,b.line);if(!c||c.hidden)return null;var d=B(a.doc,b.line),e=Vb(c,d,b.line),f=xa(d,a.doc.direction),g="left";if(f){var h=wa(f,b.ch);g=h%2?"right":"left"}var i=_b(e.map,b.ch,g);return i.offset="right"==i.collapse?i.end:i.start,i}function _f(a){for(var b=a;b;b=b.parentNode)if(/CodeMirror-gutter-wrapper/.test(b.className))return!0;return!1}function ag(a,b){return b&&(a.bad=!0),a}function bg(a,b,c,d,e){function f(a){return function(b){return b.id==a}}function g(){k&&(j+=l,k=!1)}function h(a){a&&(g(),j+=a)}function i(b){if(1==b.nodeType){var c=b.getAttribute("cm-text");if(null!=c)return void h(c||b.textContent.replace(/\u200b/g,""));var j,m=b.getAttribute("cm-marker");if(m){var n=a.findMarks(J(d,0),J(e+1,0),f(+m));return void(n.length&&(j=n[0].find())&&h(C(a.doc,j.from,j.to).join(l)))}if("false"==b.getAttribute("contenteditable"))return;var o=/^(pre|div|p)$/i.test(b.nodeName);o&&g();for(var p=0;p<b.childNodes.length;p++)i(b.childNodes[p]);o&&(k=!0)}else 3==b.nodeType&&h(b.nodeValue)}for(var j="",k=!1,l=a.doc.lineSeparator();i(b),b!=c;)b=b.nextSibling;return j}function cg(a,b,c){var d;if(b==a.display.lineDiv){if(d=a.display.lineDiv.childNodes[c],!d)return ag(a.clipPos(J(a.display.viewTo-1)),!0);b=null,c=0}else for(d=b;;d=d.parentNode){if(!d||d==a.display.lineDiv)return null;if(d.parentNode&&d.parentNode==a.display.lineDiv)break}for(var e=0;e<a.display.view.length;e++){var f=a.display.view[e];if(f.node==d)return dg(f,b,c)}}function dg(a,b,c){function d(b,c,d){for(var e=-1;e<(l?l.length:0);e++)for(var f=e<0?k.map:l[e],g=0;g<f.length;g+=3){var h=f[g+2];if(h==b||h==c){var i=F(e<0?a.line:a.rest[e]),j=f[g]+d;return(d<0||h!=b)&&(j=f[g+(d?1:0)]),J(i,j)}}}var e=a.text.firstChild,g=!1;if(!b||!f(e,b))return ag(J(F(a.line),0),!0);if(b==e&&(g=!0,b=e.childNodes[c],c=0,!b)){var h=a.rest?p(a.rest):a.line;return ag(J(F(h),h.text.length),g)}var i=3==b.nodeType?b:null,j=b;for(i||1!=b.childNodes.length||3!=b.firstChild.nodeType||(i=b.firstChild,c&&(c=i.nodeValue.length));j.parentNode!=e;)j=j.parentNode;var k=a.measure,l=k.maps,m=d(i,j,c);if(m)return ag(m,g);for(var n=j.nextSibling,o=i?i.nodeValue.length-c:0;n;n=n.nextSibling){if(m=d(n,n.firstChild,0))return ag(J(m.line,m.ch-o),g);o+=n.textContent.length}for(var q=j.previousSibling,r=c;q;q=q.previousSibling){if(m=d(q,q.firstChild,-1))return ag(J(m.line,m.ch+r),g);r+=q.textContent.length}}function eg(a,b){function c(){a.value=i.getValue()}if(b=b?k(b):{},b.value=a.value,!b.tabindex&&a.tabIndex&&(b.tabindex=a.tabIndex),!b.placeholder&&a.placeholder&&(b.placeholder=a.placeholder),null==b.autofocus){var d=g();b.autofocus=d==a||null!=a.getAttribute("autofocus")&&d==document.body}var e;if(a.form&&(Xg(a.form,"submit",c),!b.leaveSubmitMethodAlone)){var f=a.form;e=f.submit;try{var h=f.submit=function(){c(),f.submit=e,f.submit(),f.submit=h}}catch(a){}}b.finishInit=function(b){b.save=c,b.getTextArea=function(){return a},b.toTextArea=function(){b.toTextArea=isNaN,c(),a.parentNode.removeChild(b.getWrapperElement()),a.style.display="",a.form&&(Da(a.form,"submit",c),"function"==typeof a.form.submit&&(a.form.submit=e))}},a.style.display="none";var i=Of((function(b){return a.parentNode.insertBefore(b,a.nextSibling)}),b);return i}function fg(a){a.off=Da,a.on=Xg,a.wheelEventPixels=Jd,a.Doc=Dh,a.splitLines=Zg,a.countColumn=l,a.findColumn=n,a.isWordChar=u,a.Pass=Lg,a.signal=Ea,a.Line=ih,a.changeEnd=Nd,a.scrollbarModel=rh,a.Pos=J,a.cmpPos=K,a.modes=bh,a.mimeModes=ch,a.resolveMode=Ua,a.getMode=Va,a.modeExtensions=dh,a.extendMode=Wa,a.copyState=Xa,a.startState=Za,a.innerMode=Ya,a.commands=Lh,a.keyMap=Kh,a.keyName=hf,a.isModifierKey=ff,a.lookupKey=ef,a.normalizeKeyMap=df,a.StringStream=eh,a.SharedTextMarker=Bh,a.TextMarker=Ah,a.LineWidget=yh,a.e_preventDefault=Ja,a.e_stopPropagation=Ka,a.e_stop=Ma,a.addClass=h,a.contains=f,a.rmClass=Fg,a.keyNames=Gh}var gg=navigator.userAgent,hg=navigator.platform,ig=/gecko\/\d/i.test(gg),jg=/MSIE \d/.test(gg),kg=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(gg),lg=/Edge\/(\d+)/.exec(gg),mg=jg||kg||lg,ng=mg&&(jg?document.documentMode||6:+(lg||kg)[1]),og=!lg&&/WebKit\//.test(gg),pg=og&&/Qt\/\d+\.\d+/.test(gg),qg=!lg&&/Chrome\//.test(gg),rg=/Opera\//.test(gg),sg=/Apple Computer/.test(navigator.vendor),tg=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(gg),ug=/PhantomJS/.test(gg),vg=!lg&&/AppleWebKit/.test(gg)&&/Mobile\/\w+/.test(gg),wg=/Android/.test(gg),xg=vg||wg||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(gg),yg=vg||/Mac/.test(hg),zg=/\bCrOS\b/.test(gg),Ag=/win/i.test(hg),Bg=rg&&gg.match(/Version\/(\d*\.\d*)/);Bg&&(Bg=Number(Bg[1])),Bg&&Bg>=15&&(rg=!1,og=!0);var Cg,Dg=yg&&(pg||rg&&(null==Bg||Bg<12.11)),Eg=ig||mg&&ng>=9,Fg=function(b,c){var d=b.className,e=a(c).exec(d);if(e){var f=d.slice(e.index+e[0].length);b.className=d.slice(0,e.index)+(f?e[1]+f:"")}};Cg=document.createRange?function(a,b,c,d){var e=document.createRange();return e.setEnd(d||a,c),e.setStart(a,b),e}:function(a,b,c){var d=document.body.createTextRange();try{d.moveToElementText(a.parentNode)}catch(a){return d}return d.collapse(!0),d.moveEnd("character",c),d.moveStart("character",b),d};var Gg=function(a){a.select()};vg?Gg=function(a){a.selectionStart=0,a.selectionEnd=a.value.length}:mg&&(Gg=function(a){try{a.select()}catch(a){}});var Hg=function(){this.id=null};Hg.prototype.set=function(a,b){clearTimeout(this.id),this.id=setTimeout(b,a)};var Ig,Jg,Kg=30,Lg={toString:function(){return"CodeMirror.Pass"}},Mg={scroll:!1},Ng={origin:"*mouse"},Og={origin:"+move"},Pg=[""],Qg=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,Rg=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/,Sg=!1,Tg=!1,Ug=null,Vg=(function(){function a(a){return a<=247?c.charAt(a):1424<=a&&a<=1524?"R":1536<=a&&a<=1785?d.charAt(a-1536):1774<=a&&a<=2220?"r":8192<=a&&a<=8203?"w":8204==a?"b":"L"}function b(a,b,c){this.level=a,this.from=b,this.to=c}var c="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",d="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111",e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,f=/[stwN]/,g=/[LRr]/,h=/[Lb1n]/,i=/[1n]/;return function(c,d){var j="ltr"==d?"L":"R";if(0==c.length||"ltr"==d&&!e.test(c))return!1;for(var k=c.length,l=[],m=0;m<k;++m)l.push(a(c.charCodeAt(m)));for(var n=0,o=j;n<k;++n){var q=l[n];"m"==q?l[n]=o:o=q}for(var r=0,s=j;r<k;++r){var t=l[r];"1"==t&&"r"==s?l[r]="n":g.test(t)&&(s=t,"r"==t&&(l[r]="R"))}for(var u=1,v=l[0];u<k-1;++u){var w=l[u];"+"==w&&"1"==v&&"1"==l[u+1]?l[u]="1":","!=w||v!=l[u+1]||"1"!=v&&"n"!=v||(l[u]=v),v=w}for(var x=0;x<k;++x){var y=l[x];if(","==y)l[x]="N";else if("%"==y){var z=void 0;for(z=x+1;z<k&&"%"==l[z];++z);for(var A=x&&"!"==l[x-1]||z<k&&"1"==l[z]?"1":"N",B=x;B<z;++B)l[B]=A;x=z-1}}for(var C=0,D=j;C<k;++C){var E=l[C];"L"==D&&"1"==E?l[C]="L":g.test(E)&&(D=E)}for(var F=0;F<k;++F)if(f.test(l[F])){var G=void 0;for(G=F+1;G<k&&f.test(l[G]);++G);for(var H="L"==(F?l[F-1]:j),I="L"==(G<k?l[G]:j),J=H==I?H?"L":"R":j,K=F;K<G;++K)l[K]=J;F=G-1}for(var L,M=[],N=0;N<k;)if(h.test(l[N])){var O=N;for(++N;N<k&&h.test(l[N]);++N);M.push(new b(0,O,N))}else{var P=N,Q=M.length;for(++N;N<k&&"L"!=l[N];++N);for(var R=P;R<N;)if(i.test(l[R])){P<R&&M.splice(Q,0,new b(1,P,R));var S=R;for(++R;R<N&&i.test(l[R]);++R);M.splice(Q,0,new b(2,S,R)),P=R}else++R;P<N&&M.splice(Q,0,new b(1,P,N))}return 1==M[0].level&&(L=c.match(/^\s+/))&&(M[0].from=L[0].length,M.unshift(new b(0,0,L[0].length))),1==p(M).level&&(L=c.match(/\s+$/))&&(p(M).to-=L[0].length,M.push(new b(0,k-L[0].length,k))),"rtl"==d?M.reverse():M}})(),Wg=[],Xg=function(a,b,c){if(a.addEventListener)a.addEventListener(b,c,!1);else if(a.attachEvent)a.attachEvent("on"+b,c);else{var d=a._handlers||(a._handlers={});d[b]=(d[b]||Wg).concat(c)}},Yg=(function(){if(mg&&ng<9)return!1;var a=d("div");return"draggable"in a||"dragDrop"in a})(),Zg=3!="\n\nb".split(/\n/).length?function(a){for(var b=0,c=[],d=a.length;b<=d;){var e=a.indexOf("\n",b);e==-1&&(e=a.length);var f=a.slice(b,"\r"==a.charAt(e-1)?e-1:e),g=f.indexOf("\r");g!=-1?(c.push(f.slice(0,g)),b+=g+1):(c.push(f),b=e+1)}return c}:function(a){return a.split(/\r\n?|\n/)},$g=window.getSelection?function(a){try{return a.selectionStart!=a.selectionEnd}catch(a){return!1}}:function(a){var b;try{b=a.ownerDocument.selection.createRange()}catch(a){}return!(!b||b.parentElement()!=a)&&0!=b.compareEndPoints("StartToEnd",b)},_g=(function(){var a=d("div");return"oncopy"in a||(a.setAttribute("oncopy","return;"),"function"==typeof a.oncopy)})(),ah=null,bh={},ch={},dh={},eh=function(a,b,c){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.lineOracle=c};eh.prototype.eol=function(){return this.pos>=this.string.length},eh.prototype.sol=function(){return this.pos==this.lineStart},eh.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},eh.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eh.prototype.eat=function(a){var b,c=this.string.charAt(this.pos);if(b="string"==typeof a?c==a:c&&(a.test?a.test(c):a(c)))return++this.pos,c},eh.prototype.eatWhile=function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eh.prototype.eatSpace=function(){for(var a=this,b=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++a.pos;return this.pos>b},eh.prototype.skipToEnd=function(){this.pos=this.string.length},eh.prototype.skipTo=function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},eh.prototype.backUp=function(a){this.pos-=a},eh.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=l(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?l(this.string,this.lineStart,this.tabSize):0)},eh.prototype.indentation=function(){return l(this.string,null,this.tabSize)-(this.lineStart?l(this.string,this.lineStart,this.tabSize):0)},eh.prototype.match=function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},eh.prototype.current=function(){return this.string.slice(this.start,this.pos)},eh.prototype.hideFirstChars=function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}},eh.prototype.lookAhead=function(a){var b=this.lineOracle;return b&&b.lookAhead(a)};var fh=function(a,b){this.state=a,this.lookAhead=b},gh=function(a,b,c,d){this.state=b,this.doc=a,this.line=c,this.maxLookAhead=d||0};gh.prototype.lookAhead=function(a){var b=this.doc.getLine(this.line+a);return null!=b&&a>this.maxLookAhead&&(this.maxLookAhead=a),b},gh.prototype.nextLine=function(){this.line++,this.maxLookAhead>0&&this.maxLookAhead--},gh.fromSaved=function(a,b,c){return b instanceof fh?new gh(a,Xa(a.mode,b.state),c,b.lookAhead):new gh(a,Xa(a.mode,b),c)},gh.prototype.save=function(a){var b=a!==!1?Xa(this.doc.mode,this.state):this.state;return this.maxLookAhead>0?new fh(b,this.maxLookAhead):b};var hh=function(a,b,c){this.start=a.start,this.end=a.pos,this.string=a.current(),this.type=b||null,this.state=c},ih=function(a,b,c){this.text=a,da(this,b),this.height=c?c(this):1};ih.prototype.lineNo=function(){return F(this)},Ia(ih);var jh,kh={},lh={},mh=null,nh=null,oh={left:0,right:0,top:0,bottom:0},ph=function(a,b,c){this.cm=c;var e=this.vert=d("div",[d("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),f=this.horiz=d("div",[d("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");a(e),a(f),Xg(e,"scroll",(function(){e.clientHeight&&b(e.scrollTop,"vertical")})),Xg(f,"scroll",(function(){f.clientWidth&&b(f.scrollLeft,"horizontal")})),this.checkedZeroWidth=!1,mg&&ng<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};ph.prototype.update=function(a){var b=a.scrollWidth>a.clientWidth+1,c=a.scrollHeight>a.clientHeight+1,d=a.nativeBarWidth;if(c){this.vert.style.display="block",this.vert.style.bottom=b?d+"px":"0";var e=a.viewHeight-(b?d:0);this.vert.firstChild.style.height=Math.max(0,a.scrollHeight-a.clientHeight+e)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(b){this.horiz.style.display="block",this.horiz.style.right=c?d+"px":"0",this.horiz.style.left=a.barLeft+"px";var f=a.viewWidth-a.barLeft-(c?d:0);this.horiz.firstChild.style.width=Math.max(0,a.scrollWidth-a.clientWidth+f)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&a.clientHeight>0&&(0==d&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:c?d:0,bottom:b?d:0}},ph.prototype.setScrollLeft=function(a){this.horiz.scrollLeft!=a&&(this.horiz.scrollLeft=a),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},ph.prototype.setScrollTop=function(a){this.vert.scrollTop!=a&&(this.vert.scrollTop=a),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},ph.prototype.zeroWidthHack=function(){var a=yg&&!tg?"12px":"18px";this.horiz.style.height=this.vert.style.width=a,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new Hg,this.disableVert=new Hg},ph.prototype.enableZeroWidthBar=function(a,b,c){function d(){var e=a.getBoundingClientRect(),f="vert"==c?document.elementFromPoint(e.right-1,(e.top+e.bottom)/2):document.elementFromPoint((e.right+e.left)/2,e.bottom-1);f!=a?a.style.pointerEvents="none":b.set(1e3,d)}a.style.pointerEvents="auto",b.set(1e3,d)},ph.prototype.clear=function(){var a=this.horiz.parentNode;a.removeChild(this.horiz),a.removeChild(this.vert)};var qh=function(){};qh.prototype.update=function(){return{bottom:0,right:0}},qh.prototype.setScrollLeft=function(){},qh.prototype.setScrollTop=function(){},qh.prototype.clear=function(){};var rh={native:ph,null:qh},sh=0,th=function(a,b,c){var d=a.display;this.viewport=b,this.visible=Lc(d,a.doc,b),this.editorIsHidden=!d.wrapper.offsetWidth,this.wrapperHeight=d.wrapper.clientHeight,this.wrapperWidth=d.wrapper.clientWidth,this.oldDisplayWidth=Sb(a),this.force=c,this.dims=uc(a),this.events=[]};th.prototype.signal=function(a,b){Ha(a,b)&&this.events.push(arguments)},th.prototype.finish=function(){for(var a=this,b=0;b<this.events.length;b++)Ea.apply(null,a.events[b])};var uh=0,vh=null;mg?vh=-.53:ig?vh=15:qg?vh=-.7:sg&&(vh=-1/3);var wh=function(a,b){this.ranges=a,this.primIndex=b};wh.prototype.primary=function(){return this.ranges[this.primIndex]},wh.prototype.equals=function(a){var b=this;if(a==this)return!0;if(a.primIndex!=this.primIndex||a.ranges.length!=this.ranges.length)return!1;for(var c=0;c<this.ranges.length;c++){var d=b.ranges[c],e=a.ranges[c];if(!L(d.anchor,e.anchor)||!L(d.head,e.head))return!1}return!0},wh.prototype.deepCopy=function(){for(var a=this,b=[],c=0;c<this.ranges.length;c++)b[c]=new xh(M(a.ranges[c].anchor),M(a.ranges[c].head));return new wh(b,this.primIndex)},wh.prototype.somethingSelected=function(){for(var a=this,b=0;b<this.ranges.length;b++)if(!a.ranges[b].empty())return!0;return!1},wh.prototype.contains=function(a,b){var c=this;b||(b=a);for(var d=0;d<this.ranges.length;d++){var e=c.ranges[d];if(K(b,e.from())>=0&&K(a,e.to())<=0)return d}return-1};var xh=function(a,b){this.anchor=a,this.head=b};xh.prototype.from=function(){return O(this.anchor,this.head)},xh.prototype.to=function(){return N(this.anchor,this.head)},xh.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch},Ne.prototype={chunkSize:function(){return this.lines.length},removeInner:function(a,b){for(var c=this,d=a,e=a+b;d<e;++d){var f=c.lines[d];c.height-=f.height,kb(f),yb(f,"delete")}this.lines.splice(a,b)},collapse:function(a){a.push.apply(a,this.lines)},insertInner:function(a,b,c){var d=this;this.height+=c,this.lines=this.lines.slice(0,a).concat(b).concat(this.lines.slice(a));for(var e=0;e<b.length;++e)b[e].parent=d},iterN:function(a,b,c){for(var d=this,e=a+b;a<e;++a)if(c(d.lines[a]))return!0}},Oe.prototype={chunkSize:function(){return this.size},removeInner:function(a,b){var c=this;this.size-=b;for(var d=0;d<this.children.length;++d){var e=c.children[d],f=e.chunkSize();if(a<f){var g=Math.min(b,f-a),h=e.height;if(e.removeInner(a,g),c.height-=h-e.height,f==g&&(c.children.splice(d--,1),e.parent=null),0==(b-=g))break;a=0}else a-=f}if(this.size-b<25&&(this.children.length>1||!(this.children[0]instanceof Ne))){var i=[];this.collapse(i),this.children=[new Ne(i)],this.children[0].parent=this}},collapse:function(a){for(var b=this,c=0;c<this.children.length;++c)b.children[c].collapse(a)},insertInner:function(a,b,c){var d=this;this.size+=b.length,this.height+=c;for(var e=0;e<this.children.length;++e){var f=d.children[e],g=f.chunkSize();if(a<=g){if(f.insertInner(a,b,c),f.lines&&f.lines.length>50){for(var h=f.lines.length%25+25,i=h;i<f.lines.length;){var j=new Ne(f.lines.slice(i,i+=25));f.height-=j.height,d.children.splice(++e,0,j),j.parent=d}f.lines=f.lines.slice(0,h),d.maybeSpill()}break}a-=g}},maybeSpill:function(){if(!(this.children.length<=10)){var a=this;do{var b=a.children.splice(a.children.length-5,5),c=new Oe(b);if(a.parent){a.size-=c.size,a.height-=c.height;var d=m(a.parent.children,a);a.parent.children.splice(d+1,0,c)}else{var e=new Oe(a.children);e.parent=a,a.children=[e,c],a=e}c.parent=a.parent}while(a.children.length>10);a.parent.maybeSpill()}},iterN:function(a,b,c){for(var d=this,e=0;e<this.children.length;++e){var f=d.children[e],g=f.chunkSize();if(a<g){var h=Math.min(b,g-a);if(f.iterN(a,h,c))return!0;if(0==(b-=h))break;a=0}else a-=g}}};var yh=function(a,b,c){var d=this;if(c)for(var e in c)c.hasOwnProperty(e)&&(d[e]=c[e]);this.doc=a,this.node=b};yh.prototype.clear=function(){var a=this,b=this.doc.cm,c=this.line.widgets,d=this.line,e=F(d);if(null!=e&&c){for(var f=0;f<c.length;++f)c[f]==a&&c.splice(f--,1);c.length||(d.widgets=null);var g=Mb(this);E(d,Math.max(0,d.height-g)),b&&(ld(b,(function(){Pe(b,d,-g),qd(b,e,"widget")})),yb(b,"lineWidgetCleared",b,this,e))}},yh.prototype.changed=function(){var a=this,b=this.height,c=this.doc.cm,d=this.line;this.height=null;var e=Mb(this)-b;e&&(E(d,d.height+e),c&&ld(c,(function(){c.curOp.forceUpdate=!0,Pe(c,d,e),yb(c,"lineWidgetChanged",c,a,F(d))})))},Ia(yh);var zh=0,Ah=function(a,b){this.lines=[],this.type=b,this.doc=a,this.id=++zh};Ah.prototype.clear=function(){var a=this;if(!this.explicitlyCleared){var b=this.doc.cm,c=b&&!b.curOp;if(c&&dd(b),Ha(this,"clear")){var d=this.find();d&&yb(this,"clear",d.from,d.to)}for(var e=null,f=null,g=0;g<this.lines.length;++g){var h=a.lines[g],i=W(h.markedSpans,a);b&&!a.collapsed?qd(b,F(h),"text"):b&&(null!=i.to&&(f=F(h)),null!=i.from&&(e=F(h))),h.markedSpans=X(h.markedSpans,i),null==i.from&&a.collapsed&&!qa(a.doc,h)&&b&&E(h,sc(b.display))}if(b&&this.collapsed&&!b.options.lineWrapping)for(var j=0;j<this.lines.length;++j){var k=la(a.lines[j]),l=ta(k);l>b.display.maxLineLength&&(b.display.maxLine=k,b.display.maxLineLength=l,b.display.maxLineChanged=!0)}null!=e&&b&&this.collapsed&&pd(b,e,f+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,b&&ve(b.doc)),b&&yb(b,"markerCleared",b,this,e,f),c&&ed(b),this.parent&&this.parent.clear()}},Ah.prototype.find=function(a,b){var c=this;null==a&&"bookmark"==this.type&&(a=1);for(var d,e,f=0;f<this.lines.length;++f){var g=c.lines[f],h=W(g.markedSpans,c);if(null!=h.from&&(d=J(b?g:F(g),h.from),a==-1))return d;if(null!=h.to&&(e=J(b?g:F(g),h.to),1==a))return e}return d&&{from:d,to:e}},Ah.prototype.changed=function(){var a=this,b=this.find(-1,!0),c=this,d=this.doc.cm;b&&d&&ld(d,(function(){var e=b.line,f=F(b.line),g=Yb(d,f);if(g&&(dc(g),d.curOp.selectionChanged=d.curOp.forceUpdate=!0),d.curOp.updateMaxLine=!0,!qa(c.doc,e)&&null!=c.height){var h=c.height;c.height=null;var i=Mb(c)-h;i&&E(e,e.height+i)}yb(d,"markerChanged",d,a)}))},Ah.prototype.attachLine=function(a){if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;b.maybeHiddenMarkers&&m(b.maybeHiddenMarkers,this)!=-1||(b.maybeUnhiddenMarkers||(b.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(a)},Ah.prototype.detachLine=function(a){if(this.lines.splice(m(this.lines,a),1),!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;(b.maybeHiddenMarkers||(b.maybeHiddenMarkers=[])).push(this)}},Ia(Ah);var Bh=function(a,b){var c=this;this.markers=a,this.primary=b;for(var d=0;d<a.length;++d)a[d].parent=c};Bh.prototype.clear=function(){var a=this;if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var b=0;b<this.markers.length;++b)a.markers[b].clear();yb(this,"clear")}},Bh.prototype.find=function(a,b){return this.primary.find(a,b)},Ia(Bh);var Ch=0,Dh=function(a,b,c,d,e){if(!(this instanceof Dh))return new Dh(a,b,c,d,e);null==c&&(c=0),Oe.call(this,[new Ne([new ih("",null)])]),this.first=c,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.modeFrontier=this.highlightFrontier=c;var f=J(c,0);this.sel=Md(f),this.history=new $d(null),this.id=++Ch,this.modeOption=b,this.lineSep=d,this.direction="rtl"==e?"rtl":"ltr",this.extend=!1,"string"==typeof a&&(a=this.splitLines(a)),Vd(this,{from:f,to:f,text:a}),se(this,Md(f),Mg)};Dh.prototype=t(Oe.prototype,{constructor:Dh,iter:function(a,b,c){c?this.iterN(a-this.first,b-a,c):this.iterN(this.first,this.first+this.size,a)},insert:function(a,b){for(var c=0,d=0;d<b.length;++d)c+=b[d].height;this.insertInner(a-this.first,b,c)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(a){var b=D(this,this.first,this.first+this.size);return a===!1?b:b.join(a||this.lineSeparator())},setValue:od((function(a){var b=J(this.first,0),c=this.first+this.size-1;Ce(this,{from:b,to:J(c,B(this,c).text.length),text:this.splitLines(a),origin:"setValue",full:!0},!0),this.cm&&Uc(this.cm,0,0),se(this,Md(b),Mg)})),replaceRange:function(a,b,c,d){b=Q(this,b),c=c?Q(this,c):b,Ie(this,a,b,c,d)},getRange:function(a,b,c){var d=C(this,Q(this,a),Q(this,b));return c===!1?d:d.join(c||this.lineSeparator())},getLine:function(a){var b=this.getLineHandle(a);return b&&b.text},getLineHandle:function(a){if(H(this,a))return B(this,a)},getLineNumber:function(a){return F(a)},getLineHandleVisualStart:function(a){return"number"==typeof a&&(a=B(this,a)),la(a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return Q(this,a)},getCursor:function(a){var b,c=this.sel.primary();return b=null==a||"head"==a?c.head:"anchor"==a?c.anchor:"end"==a||"to"==a||a===!1?c.to():c.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:od((function(a,b,c){pe(this,Q(this,"number"==typeof a?J(a,b||0):a),null,c)})),setSelection:od((function(a,b,c){pe(this,Q(this,a),Q(this,b||a),c)})),extendSelection:od((function(a,b,c){me(this,Q(this,a),b&&Q(this,b),c)})),extendSelections:od((function(a,b){ne(this,S(this,a),b)})),extendSelectionsBy:od((function(a,b){var c=q(this.sel.ranges,a);ne(this,S(this,c),b)})),setSelections:od((function(a,b,c){var d=this;if(a.length){for(var e=[],f=0;f<a.length;f++)e[f]=new xh(Q(d,a[f].anchor),Q(d,a[f].head));null==b&&(b=Math.min(a.length-1,this.sel.primIndex)),
+se(this,Ld(e,b),c)}})),addSelection:od((function(a,b,c){var d=this.sel.ranges.slice(0);d.push(new xh(Q(this,a),Q(this,b||a))),se(this,Ld(d,d.length-1),c)})),getSelection:function(a){for(var b,c=this,d=this.sel.ranges,e=0;e<d.length;e++){var f=C(c,d[e].from(),d[e].to());b=b?b.concat(f):f}return a===!1?b:b.join(a||this.lineSeparator())},getSelections:function(a){for(var b=this,c=[],d=this.sel.ranges,e=0;e<d.length;e++){var f=C(b,d[e].from(),d[e].to());a!==!1&&(f=f.join(a||b.lineSeparator())),c[e]=f}return c},replaceSelection:function(a,b,c){for(var d=[],e=0;e<this.sel.ranges.length;e++)d[e]=a;this.replaceSelections(d,b,c||"+input")},replaceSelections:od((function(a,b,c){for(var d=this,e=[],f=this.sel,g=0;g<f.ranges.length;g++){var h=f.ranges[g];e[g]={from:h.from(),to:h.to(),text:d.splitLines(a[g]),origin:c}}for(var i=b&&"end"!=b&&Rd(this,e,b),j=e.length-1;j>=0;j--)Ce(d,e[j]);i?re(this,i):this.cm&&Tc(this.cm)})),undo:od((function(){Ee(this,"undo")})),redo:od((function(){Ee(this,"redo")})),undoSelection:od((function(){Ee(this,"undo",!0)})),redoSelection:od((function(){Ee(this,"redo",!0)})),setExtending:function(a){this.extend=a},getExtending:function(){return this.extend},historySize:function(){for(var a=this.history,b=0,c=0,d=0;d<a.done.length;d++)a.done[d].ranges||++b;for(var e=0;e<a.undone.length;e++)a.undone[e].ranges||++c;return{undo:b,redo:c}},clearHistory:function(){this.history=new $d(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(a){return a&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},getHistory:function(){return{done:ke(this.history.done),undone:ke(this.history.undone)}},setHistory:function(a){var b=this.history=new $d(this.history.maxGeneration);b.done=ke(a.done.slice(0),null,!0),b.undone=ke(a.undone.slice(0),null,!0)},setGutterMarker:od((function(a,b,c){return Me(this,a,"gutter",(function(a){var d=a.gutterMarkers||(a.gutterMarkers={});return d[b]=c,!c&&w(d)&&(a.gutterMarkers=null),!0}))})),clearGutter:od((function(a){var b=this;this.iter((function(c){c.gutterMarkers&&c.gutterMarkers[a]&&Me(b,c,"gutter",(function(){return c.gutterMarkers[a]=null,w(c.gutterMarkers)&&(c.gutterMarkers=null),!0}))}))})),lineInfo:function(a){var b;if("number"==typeof a){if(!H(this,a))return null;if(b=a,a=B(this,a),!a)return null}else if(b=F(a),null==b)return null;return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},addLineClass:od((function(b,c,d){return Me(this,b,"gutter"==c?"gutter":"class",(function(b){var e="text"==c?"textClass":"background"==c?"bgClass":"gutter"==c?"gutterClass":"wrapClass";if(b[e]){if(a(d).test(b[e]))return!1;b[e]+=" "+d}else b[e]=d;return!0}))})),removeLineClass:od((function(b,c,d){return Me(this,b,"gutter"==c?"gutter":"class",(function(b){var e="text"==c?"textClass":"background"==c?"bgClass":"gutter"==c?"gutterClass":"wrapClass",f=b[e];if(!f)return!1;if(null==d)b[e]=null;else{var g=f.match(a(d));if(!g)return!1;var h=g.index+g[0].length;b[e]=f.slice(0,g.index)+(g.index&&h!=f.length?" ":"")+f.slice(h)||null}return!0}))})),addLineWidget:od((function(a,b,c){return Qe(this,a,b,c)})),removeLineWidget:function(a){a.clear()},markText:function(a,b,c){return Re(this,Q(this,a),Q(this,b),c,c&&c.type||"range")},setBookmark:function(a,b){var c={replacedWith:b&&(null==b.nodeType?b.widget:b),insertLeft:b&&b.insertLeft,clearWhenEmpty:!1,shared:b&&b.shared,handleMouseEvents:b&&b.handleMouseEvents};return a=Q(this,a),Re(this,a,a,c,"bookmark")},findMarksAt:function(a){a=Q(this,a);var b=[],c=B(this,a.line).markedSpans;if(c)for(var d=0;d<c.length;++d){var e=c[d];(null==e.from||e.from<=a.ch)&&(null==e.to||e.to>=a.ch)&&b.push(e.marker.parent||e.marker)}return b},findMarks:function(a,b,c){a=Q(this,a),b=Q(this,b);var d=[],e=a.line;return this.iter(a.line,b.line+1,(function(f){var g=f.markedSpans;if(g)for(var h=0;h<g.length;h++){var i=g[h];null!=i.to&&e==a.line&&a.ch>=i.to||null==i.from&&e!=a.line||null!=i.from&&e==b.line&&i.from>=b.ch||c&&!c(i.marker)||d.push(i.marker.parent||i.marker)}++e})),d},getAllMarks:function(){var a=[];return this.iter((function(b){var c=b.markedSpans;if(c)for(var d=0;d<c.length;++d)null!=c[d].from&&a.push(c[d].marker)})),a},posFromIndex:function(a){var b,c=this.first,d=this.lineSeparator().length;return this.iter((function(e){var f=e.text.length+d;return f>a?(b=a,!0):(a-=f,void++c)})),Q(this,J(c,b))},indexFromPos:function(a){a=Q(this,a);var b=a.ch;if(a.line<this.first||a.ch<0)return 0;var c=this.lineSeparator().length;return this.iter(this.first,a.line,(function(a){b+=a.text.length+c})),b},copy:function(a){var b=new Dh(D(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return b.scrollTop=this.scrollTop,b.scrollLeft=this.scrollLeft,b.sel=this.sel,b.extend=!1,a&&(b.history.undoDepth=this.history.undoDepth,b.setHistory(this.getHistory())),b},linkedDoc:function(a){a||(a={});var b=this.first,c=this.first+this.size;null!=a.from&&a.from>b&&(b=a.from),null!=a.to&&a.to<c&&(c=a.to);var d=new Dh(D(this,b,c),a.mode||this.modeOption,b,this.lineSep,this.direction);return a.sharedHist&&(d.history=this.history),(this.linked||(this.linked=[])).push({doc:d,sharedHist:a.sharedHist}),d.linked=[{doc:this,isParent:!0,sharedHist:a.sharedHist}],Ue(d,Te(this)),d},unlinkDoc:function(a){var b=this;if(a instanceof Of&&(a=a.doc),this.linked)for(var c=0;c<this.linked.length;++c){var d=b.linked[c];if(d.doc==a){b.linked.splice(c,1),a.unlinkDoc(b),Ve(Te(b));break}}if(a.history==this.history){var e=[a.id];Wd(a,(function(a){return e.push(a.id)}),!0),a.history=new $d(null),a.history.done=ke(this.history.done,e),a.history.undone=ke(this.history.undone,e)}},iterLinkedDocs:function(a){Wd(this,a)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(a){return this.lineSep?a.split(this.lineSep):Zg(a)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:od((function(a){"rtl"!=a&&(a="ltr"),a!=this.direction&&(this.direction=a,this.iter((function(a){return a.order=null})),this.cm&&Zd(this.cm))}))}),Dh.prototype.eachLine=Dh.prototype.iter;for(var Eh=0,Fh=!1,Gh={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},Hh=0;Hh<10;Hh++)Gh[Hh+48]=Gh[Hh+96]=String(Hh);for(var Ih=65;Ih<=90;Ih++)Gh[Ih]=String.fromCharCode(Ih);for(var Jh=1;Jh<=12;Jh++)Gh[Jh+111]=Gh[Jh+63235]="F"+Jh;var Kh={};Kh.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},Kh.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},Kh.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},Kh.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},Kh.default=yg?Kh.macDefault:Kh.pcDefault;var Lh={selectAll:Ae,singleSelection:function(a){return a.setSelection(a.getCursor("anchor"),a.getCursor("head"),Mg)},killLine:function(a){return kf(a,(function(b){if(b.empty()){var c=B(a.doc,b.head.line).text.length;return b.head.ch==c&&b.head.line<a.lastLine()?{from:b.head,to:J(b.head.line+1,0)}:{from:b.head,to:J(b.head.line,c)}}return{from:b.from(),to:b.to()}}))},deleteLine:function(a){return kf(a,(function(b){return{from:J(b.from().line,0),to:Q(a.doc,J(b.to().line+1,0))}}))},delLineLeft:function(a){return kf(a,(function(a){return{from:J(a.from().line,0),to:a.from()}}))},delWrappedLineLeft:function(a){return kf(a,(function(b){var c=a.charCoords(b.head,"div").top+5,d=a.coordsChar({left:0,top:c},"div");return{from:d,to:b.from()}}))},delWrappedLineRight:function(a){return kf(a,(function(b){var c=a.charCoords(b.head,"div").top+5,d=a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div");return{from:b.from(),to:d}}))},undo:function(a){return a.undo()},redo:function(a){return a.redo()},undoSelection:function(a){return a.undoSelection()},redoSelection:function(a){return a.redoSelection()},goDocStart:function(a){return a.extendSelection(J(a.firstLine(),0))},goDocEnd:function(a){return a.extendSelection(J(a.lastLine()))},goLineStart:function(a){return a.extendSelectionsBy((function(b){return lf(a,b.head.line)}),{origin:"+move",bias:1})},goLineStartSmart:function(a){return a.extendSelectionsBy((function(b){return nf(a,b.head)}),{origin:"+move",bias:1})},goLineEnd:function(a){return a.extendSelectionsBy((function(b){return mf(a,b.head.line)}),{origin:"+move",bias:-1})},goLineRight:function(a){return a.extendSelectionsBy((function(b){var c=a.cursorCoords(b.head,"div").top+5;return a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div")}),Og)},goLineLeft:function(a){return a.extendSelectionsBy((function(b){var c=a.cursorCoords(b.head,"div").top+5;return a.coordsChar({left:0,top:c},"div")}),Og)},goLineLeftSmart:function(a){return a.extendSelectionsBy((function(b){var c=a.cursorCoords(b.head,"div").top+5,d=a.coordsChar({left:0,top:c},"div");return d.ch<a.getLine(d.line).search(/\S/)?nf(a,b.head):d}),Og)},goLineUp:function(a){return a.moveV(-1,"line")},goLineDown:function(a){return a.moveV(1,"line")},goPageUp:function(a){return a.moveV(-1,"page")},goPageDown:function(a){return a.moveV(1,"page")},goCharLeft:function(a){return a.moveH(-1,"char")},goCharRight:function(a){return a.moveH(1,"char")},goColumnLeft:function(a){return a.moveH(-1,"column")},goColumnRight:function(a){return a.moveH(1,"column")},goWordLeft:function(a){return a.moveH(-1,"word")},goGroupRight:function(a){return a.moveH(1,"group")},goGroupLeft:function(a){return a.moveH(-1,"group")},goWordRight:function(a){return a.moveH(1,"word")},delCharBefore:function(a){return a.deleteH(-1,"char")},delCharAfter:function(a){return a.deleteH(1,"char")},delWordBefore:function(a){return a.deleteH(-1,"word")},delWordAfter:function(a){return a.deleteH(1,"word")},delGroupBefore:function(a){return a.deleteH(-1,"group")},delGroupAfter:function(a){return a.deleteH(1,"group")},indentAuto:function(a){return a.indentSelection("smart")},indentMore:function(a){return a.indentSelection("add")},indentLess:function(a){return a.indentSelection("subtract")},insertTab:function(a){return a.replaceSelection("\t")},insertSoftTab:function(a){for(var b=[],c=a.listSelections(),d=a.options.tabSize,e=0;e<c.length;e++){var f=c[e].from(),g=l(a.getLine(f.line),f.ch,d);b.push(o(d-g%d))}a.replaceSelections(b)},defaultTab:function(a){a.somethingSelected()?a.indentSelection("add"):a.execCommand("insertTab")},transposeChars:function(a){return ld(a,(function(){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++)if(b[d].empty()){var e=b[d].head,f=B(a.doc,e.line).text;if(f)if(e.ch==f.length&&(e=new J(e.line,e.ch-1)),e.ch>0)e=new J(e.line,e.ch+1),a.replaceRange(f.charAt(e.ch-1)+f.charAt(e.ch-2),J(e.line,e.ch-2),e,"+transpose");else if(e.line>a.doc.first){var g=B(a.doc,e.line-1).text;g&&(e=new J(e.line,1),a.replaceRange(f.charAt(0)+a.doc.lineSeparator()+g.charAt(g.length-1),J(e.line-1,g.length-1),e,"+transpose"))}c.push(new xh(e,e))}a.setSelections(c)}))},newlineAndIndent:function(a){return ld(a,(function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange(a.doc.lineSeparator(),b[c].anchor,b[c].head,"+input");b=a.listSelections();for(var d=0;d<b.length;d++)a.indentLine(b[d].from().line,null,!0);Tc(a)}))},openLine:function(a){return a.replaceSelection("\n","start")},toggleOverwrite:function(a){return a.toggleOverwrite()}},Mh=new Hg,Nh=null,Oh=400,Ph=function(a,b,c){this.time=a,this.pos=b,this.button=c};Ph.prototype.compare=function(a,b,c){return this.time+Oh>a&&0==K(b,this.pos)&&c==this.button};var Qh,Rh,Sh={toString:function(){return"CodeMirror.Init"}},Th={},Uh={};Of.defaults=Th,Of.optionHandlers=Uh;var Vh=[];Of.defineInitHook=function(a){return Vh.push(a)};var Wh=null,Xh=function(a){var b=a.optionHandlers,c=a.helpers={};a.prototype={constructor:a,focus:function(){window.focus(),this.display.input.focus()},setOption:function(a,c){var d=this.options,e=d[a];d[a]==c&&"mode"!=a||(d[a]=c,b.hasOwnProperty(a)&&md(this,b[a])(this,c,e),Ea(this,"optionChange",this,a))},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"](jf(a))},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c<b.length;++c)if(b[c]==a||b[c].name==a)return b.splice(c,1),!0},addOverlay:nd((function(b,c){var d=b.token?b:a.getMode(this.options,b);if(d.startState)throw new Error("Overlays may not be stateful.");r(this.state.overlays,{mode:d,modeSpec:b,opaque:c&&c.opaque,priority:c&&c.priority||0},(function(a){return a.priority})),this.state.modeGen++,pd(this)})),removeOverlay:nd((function(a){for(var b=this,c=this.state.overlays,d=0;d<c.length;++d){var e=c[d].modeSpec;if(e==a||"string"==typeof a&&e.name==a)return c.splice(d,1),b.state.modeGen++,void pd(b)}})),indentLine:nd((function(a,b,c){"string"!=typeof b&&"number"!=typeof b&&(b=null==b?this.options.smartIndent?"smart":"prev":b?"add":"subtract"),H(this.doc,a)&&Qf(this,a,b,c)})),indentSelection:nd((function(a){for(var b=this,c=this.doc.sel.ranges,d=-1,e=0;e<c.length;e++){var f=c[e];if(f.empty())f.head.line>d&&(Qf(b,f.head.line,a,!0),d=f.head.line,e==b.doc.sel.primIndex&&Tc(b));else{var g=f.from(),h=f.to(),i=Math.max(d,g.line);d=Math.min(b.lastLine(),h.line-(h.ch?0:1))+1;for(var j=i;j<d;++j)Qf(b,j,a);var k=b.doc.sel.ranges;0==g.ch&&c.length==k.length&&k[e].from().ch>0&&oe(b.doc,e,new xh(g,k[e].to()),Mg)}}})),getTokenAt:function(a,b){return eb(this,a,b)},getLineTokens:function(a,b){return eb(this,J(a),b,!0)},getTokenTypeAt:function(a){a=Q(this.doc,a);var b,c=_a(this,B(this.doc,a.line)),d=0,e=(c.length-1)/2,f=a.ch;if(0==f)b=c[2];else for(;;){var g=d+e>>1;if((g?c[2*g-1]:0)>=f)e=g;else{if(!(c[2*g+1]<f)){b=c[2*g+2];break}d=g+1}}var h=b?b.indexOf("overlay "):-1;return h<0?b:0==h?null:b.slice(0,h-1)},getModeAt:function(b){var c=this.doc.mode;return c.innerMode?a.innerMode(c,this.getTokenAt(b).state).mode:c},getHelper:function(a,b){return this.getHelpers(a,b)[0]},getHelpers:function(a,b){var d=this,e=[];if(!c.hasOwnProperty(b))return e;var f=c[b],g=this.getModeAt(a);if("string"==typeof g[b])f[g[b]]&&e.push(f[g[b]]);else if(g[b])for(var h=0;h<g[b].length;h++){var i=f[g[b][h]];i&&e.push(i)}else g.helperType&&f[g.helperType]?e.push(f[g.helperType]):f[g.name]&&e.push(f[g.name]);for(var j=0;j<f._global.length;j++){var k=f._global[j];k.pred(g,d)&&m(e,k.val)==-1&&e.push(k.val)}return e},getStateAfter:function(a,b){var c=this.doc;return a=P(c,null==a?c.first+c.size-1:a),ab(this,a+1,b).state},cursorCoords:function(a,b){var c,d=this.doc.sel.primary();return c=null==a?d.head:"object"==typeof a?Q(this.doc,a):a?d.from():d.to(),lc(this,c,b||"page")},charCoords:function(a,b){return kc(this,Q(this.doc,a),b||"page")},coordsChar:function(a,b){return a=jc(this,a,b||"page"),oc(this,a.left,a.top)},lineAtHeight:function(a,b){return a=jc(this,{top:a,left:0},b||"page").top,G(this.doc,a+this.display.viewOffset)},heightAtLine:function(a,b,c){var d,e=!1;if("number"==typeof a){var f=this.doc.first+this.doc.size-1;a<this.doc.first?a=this.doc.first:a>f&&(a=f,e=!0),d=B(this.doc,a)}else d=a;return ic(this,d,{top:0,left:0},b||"page",c||e).top+(e?this.doc.height-sa(d):0)},defaultTextHeight:function(){return sc(this.display)},defaultCharWidth:function(){return tc(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(a,b,c,d,e){var f=this.display;a=lc(this,Q(this.doc,a));var g=a.bottom,h=a.left;if(b.style.position="absolute",b.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(b),f.sizer.appendChild(b),"over"==d)g=a.top;else if("above"==d||"near"==d){var i=Math.max(f.wrapper.clientHeight,this.doc.height),j=Math.max(f.sizer.clientWidth,f.lineSpace.clientWidth);("above"==d||a.bottom+b.offsetHeight>i)&&a.top>b.offsetHeight?g=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=i&&(g=a.bottom),h+b.offsetWidth>j&&(h=j-b.offsetWidth)}b.style.top=g+"px",b.style.left=b.style.right="","right"==e?(h=f.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==e?h=0:"middle"==e&&(h=(f.sizer.clientWidth-b.offsetWidth)/2),b.style.left=h+"px"),c&&Qc(this,{left:h,top:g,right:h+b.offsetWidth,bottom:g+b.offsetHeight})},triggerOnKeyDown:nd(tf),triggerOnKeyPress:nd(wf),triggerOnKeyUp:vf,triggerOnMouseDown:nd(yf),execCommand:function(a){if(Lh.hasOwnProperty(a))return Lh[a].call(null,this)},triggerElectric:nd((function(a){Uf(this,a)})),findPosH:function(a,b,c,d){var e=this,f=1;b<0&&(f=-1,b=-b);for(var g=Q(this.doc,a),h=0;h<b&&(g=Yf(e.doc,g,f,c,d),!g.hitSide);++h);return g},moveH:nd((function(a,b){var c=this;this.extendSelectionsBy((function(d){return c.display.shift||c.doc.extend||d.empty()?Yf(c.doc,d.head,a,b,c.options.rtlMoveVisually):a<0?d.from():d.to()}),Og)})),deleteH:nd((function(a,b){var c=this.doc.sel,d=this.doc;c.somethingSelected()?d.replaceSelection("",null,"+delete"):kf(this,(function(c){var e=Yf(d,c.head,a,b,!1);return a<0?{from:e,to:c.head}:{from:c.head,to:e}}))})),findPosV:function(a,b,c,d){var e=this,f=1,g=d;b<0&&(f=-1,b=-b);for(var h=Q(this.doc,a),i=0;i<b;++i){var j=lc(e,h,"div");if(null==g?g=j.left:j.left=g,h=Zf(e,j,f,c),h.hitSide)break}return h},moveV:nd((function(a,b){var c=this,d=this.doc,e=[],f=!this.display.shift&&!d.extend&&d.sel.somethingSelected();if(d.extendSelectionsBy((function(g){if(f)return a<0?g.from():g.to();var h=lc(c,g.head,"div");null!=g.goalColumn&&(h.left=g.goalColumn),e.push(h.left);var i=Zf(c,h,a,b);return"page"==b&&g==d.sel.primary()&&Sc(c,kc(c,i,"div").top-h.top),i}),Og),e.length)for(var g=0;g<d.sel.ranges.length;g++)d.sel.ranges[g].goalColumn=e[g]})),findWordAt:function(a){var b=this.doc,c=B(b,a.line).text,d=a.ch,e=a.ch;if(c){var f=this.getHelper(a,"wordChars");"before"!=a.sticky&&e!=c.length||!d?++e:--d;for(var g=c.charAt(d),h=v(g,f)?function(a){return v(a,f)}:/\s/.test(g)?function(a){return/\s/.test(a)}:function(a){return!/\s/.test(a)&&!v(a)};d>0&&h(c.charAt(d-1));)--d;for(;e<c.length&&h(c.charAt(e));)++e}return new xh(J(a.line,d),J(a.line,e))},toggleOverwrite:function(a){null!=a&&a==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?h(this.display.cursorDiv,"CodeMirror-overwrite"):Fg(this.display.cursorDiv,"CodeMirror-overwrite"),Ea(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==g()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:nd((function(a,b){Uc(this,a,b)})),getScrollInfo:function(){var a=this.display.scroller;return{left:a.scrollLeft,top:a.scrollTop,height:a.scrollHeight-Rb(this)-this.display.barHeight,width:a.scrollWidth-Rb(this)-this.display.barWidth,clientHeight:Tb(this),clientWidth:Sb(this)}},scrollIntoView:nd((function(a,b){null==a?(a={from:this.doc.sel.primary().head,to:null},null==b&&(b=this.options.cursorScrollMargin)):"number"==typeof a?a={from:J(a,0),to:null}:null==a.from&&(a={from:a,to:null}),a.to||(a.to=a.from),a.margin=b||0,null!=a.from.line?Vc(this,a):Xc(this,a.from,a.to,a.margin)})),setSize:nd((function(a,b){var c=this,d=function(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a};null!=a&&(this.display.wrapper.style.width=d(a)),null!=b&&(this.display.wrapper.style.height=d(b)),this.options.lineWrapping&&ec(this);var e=this.display.viewFrom;this.doc.iter(e,this.display.viewTo,(function(a){if(a.widgets)for(var b=0;b<a.widgets.length;b++)if(a.widgets[b].noHScroll){qd(c,e,"widget");break}++e})),this.curOp.forceUpdate=!0,Ea(this,"refresh",this)})),operation:function(a){return ld(this,a)},startOperation:function(){return dd(this)},endOperation:function(){return ed(this)},refresh:nd((function(){var a=this.display.cachedTextHeight;pd(this),this.curOp.forceUpdate=!0,fc(this),Uc(this,this.doc.scrollLeft,this.doc.scrollTop),Ed(this),(null==a||Math.abs(a-sc(this.display))>.5)&&xc(this),Ea(this,"refresh",this)})),swapDoc:nd((function(a){var b=this.doc;return b.cm=null,Xd(this,a),fc(this),this.display.input.reset(),Uc(this,a.scrollLeft,a.scrollTop),this.curOp.forceScroll=!0,yb(this,"swapDoc",this,b),b})),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},Ia(a),a.registerHelper=function(b,d,e){c.hasOwnProperty(b)||(c[b]=a[b]={_global:[]}),c[b][d]=e},a.registerGlobalHelper=function(b,d,e,f){a.registerHelper(b,d,f),c[b]._global.push({pred:e,val:f})}},Yh=function(a){this.cm=a,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new Hg,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};Yh.prototype.init=function(a){function b(a){if(!Fa(e,a)){if(e.somethingSelected())Rf({lineWise:!1,text:e.getSelections()}),"cut"==a.type&&e.replaceSelection("",null,"cut");else{if(!e.options.lineWiseCopyCut)return;var b=Vf(e);Rf({lineWise:!0,text:b.text}),"cut"==a.type&&e.operation((function(){e.setSelections(b.ranges,0,Mg),e.replaceSelection("",null,"cut")}))}if(a.clipboardData){a.clipboardData.clearData();var c=Wh.text.join("\n");if(a.clipboardData.setData("Text",c),a.clipboardData.getData("Text")==c)return void a.preventDefault()}var g=Xf(),h=g.firstChild;e.display.lineSpace.insertBefore(g,e.display.lineSpace.firstChild),h.value=Wh.text.join("\n");var i=document.activeElement;Gg(h),setTimeout((function(){e.display.lineSpace.removeChild(g),i.focus(),i==f&&d.showPrimarySelection()}),50)}}var c=this,d=this,e=d.cm,f=d.div=a.lineDiv;Wf(f,e.options.spellcheck),Xg(f,"paste",(function(a){Fa(e,a)||Tf(a,e)||ng<=11&&setTimeout(md(e,(function(){return c.updateFromDOM()})),20)})),Xg(f,"compositionstart",(function(a){c.composing={data:a.data,done:!1}})),Xg(f,"compositionupdate",(function(a){c.composing||(c.composing={data:a.data,done:!1})})),Xg(f,"compositionend",(function(a){c.composing&&(a.data!=c.composing.data&&c.readFromDOMSoon(),c.composing.done=!0)})),Xg(f,"touchstart",(function(){return d.forceCompositionEnd()})),Xg(f,"input",(function(){c.composing||c.readFromDOMSoon()})),Xg(f,"copy",b),Xg(f,"cut",b)},Yh.prototype.prepareSelection=function(){var a=Bc(this.cm,!1);return a.focus=this.cm.state.focused,a},Yh.prototype.showSelection=function(a,b){a&&this.cm.display.view.length&&((a.focus||b)&&this.showPrimarySelection(),this.showMultipleSelections(a))},Yh.prototype.showPrimarySelection=function(){var a=window.getSelection(),b=this.cm,c=b.doc.sel.primary(),d=c.from(),e=c.to();if(b.display.viewTo==b.display.viewFrom||d.line>=b.display.viewTo||e.line<b.display.viewFrom)return void a.removeAllRanges();var f=cg(b,a.anchorNode,a.anchorOffset),g=cg(b,a.focusNode,a.focusOffset);if(!f||f.bad||!g||g.bad||0!=K(O(f,g),d)||0!=K(N(f,g),e)){var h=b.display.view,i=d.line>=b.display.viewFrom&&$f(b,d)||{node:h[0].measure.map[2],offset:0},j=e.line<b.display.viewTo&&$f(b,e);if(!j){var k=h[h.length-1].measure,l=k.maps?k.maps[k.maps.length-1]:k.map;j={node:l[l.length-1],offset:l[l.length-2]-l[l.length-3]}}if(!i||!j)return void a.removeAllRanges();var m,n=a.rangeCount&&a.getRangeAt(0);try{m=Cg(i.node,i.offset,j.offset,j.node)}catch(a){}m&&(!ig&&b.state.focused?(a.collapse(i.node,i.offset),m.collapsed||(a.removeAllRanges(),a.addRange(m))):(a.removeAllRanges(),a.addRange(m)),n&&null==a.anchorNode?a.addRange(n):ig&&this.startGracePeriod()),this.rememberSelection()}},Yh.prototype.startGracePeriod=function(){var a=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout((function(){a.gracePeriod=!1,a.selectionChanged()&&a.cm.operation((function(){return a.cm.curOp.selectionChanged=!0}))}),20)},Yh.prototype.showMultipleSelections=function(a){c(this.cm.display.cursorDiv,a.cursors),c(this.cm.display.selectionDiv,a.selection)},Yh.prototype.rememberSelection=function(){var a=window.getSelection();this.lastAnchorNode=a.anchorNode,this.lastAnchorOffset=a.anchorOffset,this.lastFocusNode=a.focusNode,this.lastFocusOffset=a.focusOffset},Yh.prototype.selectionInEditor=function(){var a=window.getSelection();if(!a.rangeCount)return!1;var b=a.getRangeAt(0).commonAncestorContainer;return f(this.div,b)},Yh.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()||this.showSelection(this.prepareSelection(),!0),this.div.focus())},Yh.prototype.blur=function(){this.div.blur()},Yh.prototype.getField=function(){return this.div},Yh.prototype.supportsTouch=function(){return!0},Yh.prototype.receivedFocus=function(){function a(){b.cm.state.focused&&(b.pollSelection(),b.polling.set(b.cm.options.pollInterval,a))}var b=this;this.selectionInEditor()?this.pollSelection():ld(this.cm,(function(){return b.cm.curOp.selectionChanged=!0})),this.polling.set(this.cm.options.pollInterval,a)},Yh.prototype.selectionChanged=function(){var a=window.getSelection();return a.anchorNode!=this.lastAnchorNode||a.anchorOffset!=this.lastAnchorOffset||a.focusNode!=this.lastFocusNode||a.focusOffset!=this.lastFocusOffset},Yh.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var a=window.getSelection(),b=this.cm;if(wg&&qg&&this.cm.options.gutters.length&&_f(a.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var c=cg(b,a.anchorNode,a.anchorOffset),d=cg(b,a.focusNode,a.focusOffset);c&&d&&ld(b,(function(){se(b.doc,Md(c,d),Mg),(c.bad||d.bad)&&(b.curOp.selectionChanged=!0)}))}}},Yh.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var a=this.cm,b=a.display,c=a.doc.sel.primary(),d=c.from(),e=c.to();if(0==d.ch&&d.line>a.firstLine()&&(d=J(d.line-1,B(a.doc,d.line-1).length)),e.ch==B(a.doc,e.line).text.length&&e.line<a.lastLine()&&(e=J(e.line+1,0)),d.line<b.viewFrom||e.line>b.viewTo-1)return!1;var f,g,h;d.line==b.viewFrom||0==(f=zc(a,d.line))?(g=F(b.view[0].line),h=b.view[0].node):(g=F(b.view[f].line),h=b.view[f-1].node.nextSibling);var i,j,k=zc(a,e.line);if(k==b.view.length-1?(i=b.viewTo-1,j=b.lineDiv.lastChild):(i=F(b.view[k+1].line)-1,j=b.view[k+1].node.previousSibling),!h)return!1;for(var l=a.doc.splitLines(bg(a,h,j,g,i)),m=C(a.doc,J(g,0),J(i,B(a.doc,i).text.length));l.length>1&&m.length>1;)if(p(l)==p(m))l.pop(),m.pop(),i--;else{if(l[0]!=m[0])break;l.shift(),m.shift(),g++}for(var n=0,o=0,q=l[0],r=m[0],s=Math.min(q.length,r.length);n<s&&q.charCodeAt(n)==r.charCodeAt(n);)++n;for(var t=p(l),u=p(m),v=Math.min(t.length-(1==l.length?n:0),u.length-(1==m.length?n:0));o<v&&t.charCodeAt(t.length-o-1)==u.charCodeAt(u.length-o-1);)++o;if(1==l.length&&1==m.length&&g==d.line)for(;n&&n>d.ch&&t.charCodeAt(t.length-o-1)==u.charCodeAt(u.length-o-1);)n--,o++;l[l.length-1]=t.slice(0,t.length-o).replace(/^\u200b+/,""),l[0]=l[0].slice(n).replace(/\u200b+$/,"");var w=J(g,n),x=J(i,m.length?p(m).length-o:0);return l.length>1||l[0]||K(w,x)?(Ie(a.doc,l,w,x,"+input"),!0):void 0},Yh.prototype.ensurePolled=function(){this.forceCompositionEnd()},Yh.prototype.reset=function(){this.forceCompositionEnd()},Yh.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},Yh.prototype.readFromDOMSoon=function(){var a=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout((function(){if(a.readDOMTimeout=null,a.composing){if(!a.composing.done)return;a.composing=null}a.updateFromDOM()}),80))},Yh.prototype.updateFromDOM=function(){var a=this;!this.cm.isReadOnly()&&this.pollContent()||ld(this.cm,(function(){return pd(a.cm)}))},Yh.prototype.setUneditable=function(a){a.contentEditable="false"},Yh.prototype.onKeyPress=function(a){0!=a.charCode&&(a.preventDefault(),this.cm.isReadOnly()||md(this.cm,Sf)(this.cm,String.fromCharCode(null==a.charCode?a.keyCode:a.charCode),0))},Yh.prototype.readOnlyChanged=function(a){this.div.contentEditable=String("nocursor"!=a)},Yh.prototype.onContextMenu=function(){},Yh.prototype.resetPosition=function(){},Yh.prototype.needsContentAttribute=!0;var Zh=function(a){this.cm=a,this.prevInput="",this.pollingFast=!1,this.polling=new Hg,this.hasSelection=!1,this.composing=null};Zh.prototype.init=function(a){function b(a){if(!Fa(e,a)){if(e.somethingSelected())Rf({lineWise:!1,text:e.getSelections()});else{if(!e.options.lineWiseCopyCut)return;var b=Vf(e);Rf({lineWise:!0,text:b.text}),"cut"==a.type?e.setSelections(b.ranges,null,Mg):(d.prevInput="",g.value=b.text.join("\n"),Gg(g))}"cut"==a.type&&(e.state.cutIncoming=!0)}}var c=this,d=this,e=this.cm,f=this.wrapper=Xf(),g=this.textarea=f.firstChild;a.wrapper.insertBefore(f,a.wrapper.firstChild),vg&&(g.style.width="0px"),Xg(g,"input",(function(){mg&&ng>=9&&c.hasSelection&&(c.hasSelection=null),d.poll()})),Xg(g,"paste",(function(a){Fa(e,a)||Tf(a,e)||(e.state.pasteIncoming=!0,d.fastPoll())})),Xg(g,"cut",b),Xg(g,"copy",b),Xg(a.scroller,"paste",(function(b){Nb(a,b)||Fa(e,b)||(e.state.pasteIncoming=!0,d.focus())})),Xg(a.lineSpace,"selectstart",(function(b){Nb(a,b)||Ja(b)})),Xg(g,"compositionstart",(function(){var a=e.getCursor("from");d.composing&&d.composing.range.clear(),d.composing={start:a,range:e.markText(a,e.getCursor("to"),{className:"CodeMirror-composing"})}})),Xg(g,"compositionend",(function(){d.composing&&(d.poll(),d.composing.range.clear(),d.composing=null)}))},Zh.prototype.prepareSelection=function(){var a=this.cm,b=a.display,c=a.doc,d=Bc(a);if(a.options.moveInputWithCursor){var e=lc(a,c.sel.primary().head,"div"),f=b.wrapper.getBoundingClientRect(),g=b.lineDiv.getBoundingClientRect();d.teTop=Math.max(0,Math.min(b.wrapper.clientHeight-10,e.top+g.top-f.top)),d.teLeft=Math.max(0,Math.min(b.wrapper.clientWidth-10,e.left+g.left-f.left));
+}return d},Zh.prototype.showSelection=function(a){var b=this.cm,d=b.display;c(d.cursorDiv,a.cursors),c(d.selectionDiv,a.selection),null!=a.teTop&&(this.wrapper.style.top=a.teTop+"px",this.wrapper.style.left=a.teLeft+"px")},Zh.prototype.reset=function(a){if(!this.contextMenuPending&&!this.composing){var b=this.cm;if(b.somethingSelected()){this.prevInput="";var c=b.getSelection();this.textarea.value=c,b.state.focused&&Gg(this.textarea),mg&&ng>=9&&(this.hasSelection=c)}else a||(this.prevInput=this.textarea.value="",mg&&ng>=9&&(this.hasSelection=null))}},Zh.prototype.getField=function(){return this.textarea},Zh.prototype.supportsTouch=function(){return!1},Zh.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!xg||g()!=this.textarea))try{this.textarea.focus()}catch(a){}},Zh.prototype.blur=function(){this.textarea.blur()},Zh.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Zh.prototype.receivedFocus=function(){this.slowPoll()},Zh.prototype.slowPoll=function(){var a=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,(function(){a.poll(),a.cm.state.focused&&a.slowPoll()}))},Zh.prototype.fastPoll=function(){function a(){var d=c.poll();d||b?(c.pollingFast=!1,c.slowPoll()):(b=!0,c.polling.set(60,a))}var b=!1,c=this;c.pollingFast=!0,c.polling.set(20,a)},Zh.prototype.poll=function(){var a=this,b=this.cm,c=this.textarea,d=this.prevInput;if(this.contextMenuPending||!b.state.focused||$g(c)&&!d&&!this.composing||b.isReadOnly()||b.options.disableInput||b.state.keySeq)return!1;var e=c.value;if(e==d&&!b.somethingSelected())return!1;if(mg&&ng>=9&&this.hasSelection===e||yg&&/[\uf700-\uf7ff]/.test(e))return b.display.input.reset(),!1;if(b.doc.sel==b.display.selForContextMenu){var f=e.charCodeAt(0);if(8203!=f||d||(d="​"),8666==f)return this.reset(),this.cm.execCommand("undo")}for(var g=0,h=Math.min(d.length,e.length);g<h&&d.charCodeAt(g)==e.charCodeAt(g);)++g;return ld(b,(function(){Sf(b,e.slice(g),d.length-g,null,a.composing?"*compose":null),e.length>1e3||e.indexOf("\n")>-1?c.value=a.prevInput="":a.prevInput=e,a.composing&&(a.composing.range.clear(),a.composing.range=b.markText(a.composing.start,b.getCursor("to"),{className:"CodeMirror-composing"}))})),!0},Zh.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Zh.prototype.onKeyPress=function(){mg&&ng>=9&&(this.hasSelection=null),this.fastPoll()},Zh.prototype.onContextMenu=function(a){function b(){if(null!=g.selectionStart){var a=e.somethingSelected(),b="​"+(a?g.value:"");g.value="⇚",g.value=b,d.prevInput=a?"":"​",g.selectionStart=1,g.selectionEnd=b.length,f.selForContextMenu=e.doc.sel}}function c(){if(d.contextMenuPending=!1,d.wrapper.style.cssText=l,g.style.cssText=k,mg&&ng<9&&f.scrollbars.setScrollTop(f.scroller.scrollTop=i),null!=g.selectionStart){(!mg||mg&&ng<9)&&b();var a=0,c=function(){f.selForContextMenu==e.doc.sel&&0==g.selectionStart&&g.selectionEnd>0&&"​"==d.prevInput?md(e,Ae)(e):a++<10?f.detectingSelectAll=setTimeout(c,500):(f.selForContextMenu=null,f.input.reset())};f.detectingSelectAll=setTimeout(c,200)}}var d=this,e=d.cm,f=e.display,g=d.textarea,h=yc(e,a),i=f.scroller.scrollTop;if(h&&!rg){var j=e.options.resetSelectionOnContextMenu;j&&e.doc.sel.contains(h)==-1&&md(e,se)(e.doc,Md(h),Mg);var k=g.style.cssText,l=d.wrapper.style.cssText;d.wrapper.style.cssText="position: absolute";var m=d.wrapper.getBoundingClientRect();g.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(a.clientY-m.top-5)+"px; left: "+(a.clientX-m.left-5)+"px;\n      z-index: 1000; background: "+(mg?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";var n;if(og&&(n=window.scrollY),f.input.focus(),og&&window.scrollTo(null,n),f.input.reset(),e.somethingSelected()||(g.value=d.prevInput=" "),d.contextMenuPending=!0,f.selForContextMenu=e.doc.sel,clearTimeout(f.detectingSelectAll),mg&&ng>=9&&b(),Eg){Ma(a);var o=function(){Da(window,"mouseup",o),setTimeout(c,20)};Xg(window,"mouseup",o)}else setTimeout(c,50)}},Zh.prototype.readOnlyChanged=function(a){a||this.reset(),this.textarea.disabled="nocursor"==a},Zh.prototype.setUneditable=function(){},Zh.prototype.needsContentAttribute=!1,Kf(Of),Xh(Of);var $h="iter insert remove copy getEditor constructor".split(" ");for(var _h in Dh.prototype)Dh.prototype.hasOwnProperty(_h)&&m($h,_h)<0&&(Of.prototype[_h]=(function(a){return function(){return a.apply(this.doc,arguments)}})(Dh.prototype[_h]));return Ia(Dh),Of.inputStyles={textarea:Zh,contenteditable:Yh},Of.defineMode=function(a){Of.defaults.mode||"null"==a||(Of.defaults.mode=a),Sa.apply(this,arguments)},Of.defineMIME=Ta,Of.defineMode("null",(function(){return{token:function(a){return a.skipToEnd()}}})),Of.defineMIME("text/plain","null"),Of.defineExtension=function(a,b){Of.prototype[a]=b},Of.defineDocExtension=function(a,b){Dh.prototype[a]=b},Of.fromTextArea=eg,fg(Of),Of.version="5.28.0",Of}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/clike/clike.js b/media/editors/codemirror/mode/clike/clike.js
index 4c2acd6cf1584..ef5b16fc79a1f 100644
--- a/media/editors/codemirror/mode/clike/clike.js
+++ b/media/editors/codemirror/mode/clike/clike.js
@@ -33,7 +33,7 @@ function popContext(state) {
 }
 
 function typeBefore(stream, state, pos) {
-  if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
+  if (state.prevToken == "variable" || state.prevToken == "type") return true;
   if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, pos))) return true;
   if (state.typeAtEndOfLine && stream.column() == stream.indentation()) return true;
 }
@@ -112,7 +112,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (contains(defKeywords, cur)) isDefKeyword = true;
       return "keyword";
     }
-    if (contains(types, cur)) return "variable-3";
+    if (contains(types, cur)) return "type";
     if (contains(builtin, cur)) {
       if (contains(blockKeywords, cur)) curPunc = "newstatement";
       return "builtin";
@@ -281,7 +281,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   }
 
   function pointerHook(_stream, state) {
-    if (state.prevToken == "variable-3") return "variable-3";
+    if (state.prevToken == "type") return "type";
     return false;
   }
 
@@ -515,8 +515,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
     ),
     multiLineStrings: true,
-    blockKeywords: words("catch class do else finally for forSome if match switch try while"),
-    defKeywords: words("class def object package trait type val var"),
+    blockKeywords: words("catch class enum do else finally for forSome if match switch try while"),
+    defKeywords: words("class enum def object package trait type val var"),
     atoms: words("true false null"),
     indentStatements: false,
     indentSwitch: false,
@@ -774,7 +774,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         return "atom";
       },
       token: function(_stream, state, style) {
-          if ((style == "variable" || style == "variable-3") &&
+          if ((style == "variable" || style == "type") &&
               state.prevToken == ".") {
             return "variable-2";
           }
diff --git a/media/editors/codemirror/mode/clike/clike.min.js b/media/editors/codemirror/mode/clike/clike.min.js
index fc7d764b27b5e..61cbbf6c3b52f 100644
--- a/media/editors/codemirror/mode/clike/clike.min.js
+++ b/media/editors/codemirror/mode/clike/clike.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.info=d,this.align=e,this.prev=f}function c(a,c,d,e){var f=a.indented;return a.context&&"statement"==a.context.type&&"statement"!=d&&(f=a.context.indented),a.context=new b(f,c,d,e,null,a.context)}function d(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}function e(a,b,c){return"variable"==b.prevToken||"variable-3"==b.prevToken||(!!/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(a.string.slice(0,c))||(!(!b.typeAtEndOfLine||a.column()!=a.indentation())||void 0))}function f(a){for(;;){if(!a||"top"==a.type)return!0;if("}"==a.type&&"namespace"!=a.prev.info)return!1;a=a.prev}}function g(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function h(a,b){return"function"==typeof a?a(b):a.propertyIsEnumerable(b)}function i(a,b){if(!b.startOfLine)return!1;for(var c,d=null;c=a.peek();){if("\\"==c&&a.match(/^.$/)){d=i;break}if("/"==c&&a.match(/^\/[\/\*]/,!1))break;a.next()}return b.tokenize=d,"meta"}function j(a,b){return"variable-3"==b.prevToken&&"variable-3"}function k(a){return a.eatWhile(/[\w\.']/),"number"}function l(a,b){if(a.backUp(1),a.match(/(R|u8R|uR|UR|LR)/)){var c=a.match(/"([^\s\\()]{0,16})\(/);return!!c&&(b.cpp11RawStringDelim=c[1],b.tokenize=o,o(a,b))}return a.match(/(u8|u|U|L)/)?!!a.match(/["']/,!1)&&"string":(a.next(),!1)}function m(a){var b=/(\w+)::~?(\w+)$/.exec(a);return b&&b[1]==b[2]}function n(a,b){for(var c;null!=(c=a.next());)if('"'==c&&!a.eat('"')){b.tokenize=null;break}return"string"}function o(a,b){var c=b.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$&"),d=a.match(new RegExp(".*?\\)"+c+'"'));return d?b.tokenize=null:a.skipToEnd(),"string"}function p(b,c){function d(a){if(a)for(var b in a)a.hasOwnProperty(b)&&e.push(b)}"string"==typeof b&&(b=[b]);var e=[];d(c.keywords),d(c.types),d(c.builtin),d(c.atoms),e.length&&(c.helperType=b[0],a.registerHelper("hintWords",b[0],e));for(var f=0;f<b.length;++f)a.defineMIME(b[f],c)}function q(a,b){for(var c=!1;!a.eol();){if(!c&&a.match('"""')){b.tokenize=null;break}c="\\"==a.next()&&!c}return"string"}function r(a){return function(b,c){for(var d,e=!1,f=!1;!b.eol();){if(!a&&!e&&b.match('"')){f=!0;break}if(a&&b.match('"""')){f=!0;break}d=b.next(),!e&&"$"==d&&b.match("{")&&b.skipTo("}"),e=!e&&"\\"==d&&!a}return!f&&a||(c.tokenize=null),"string"}}function s(a){return function(b,c){for(var d,e=!1,f=!1;!b.eol();){if(!e&&b.match('"')&&("single"==a||b.match('""'))){f=!0;break}if(!e&&b.match("``")){v=s(a),f=!0;break}d=b.next(),e="single"==a&&!e&&"\\"==d}return f&&(c.tokenize=null),"string"}}a.defineMode("clike",(function(g,i){function j(a,b){var c=a.next();if(y[c]){var d=y[c](a,b);if(d!==!1)return d}if('"'==c||"'"==c)return b.tokenize=k(c),b.tokenize(a,b);if(D.test(c))return n=c,null;if(E.test(c)){if(a.backUp(1),a.match(F))return"number";a.next()}if("/"==c){if(a.eat("*"))return b.tokenize=l,l(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(G.test(c)){for(;!a.match(/^\/[\/*]/,!1)&&a.eat(G););return"operator"}if(a.eatWhile(H),C)for(;a.match(C);)a.eatWhile(H);var e=a.current();return h(s,e)?(h(v,e)&&(n="newstatement"),h(w,e)&&(o=!0),"keyword"):h(t,e)?"variable-3":h(u,e)?(h(v,e)&&(n="newstatement"),"builtin"):h(x,e)?"atom":"variable"}function k(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){f=!0;break}e=!e&&"\\"==d}return(f||!e&&!z)&&(c.tokenize=null),"string"}}function l(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=null;break}d="*"==c}return"comment"}function m(a,b){i.typeFirstDefinitions&&a.eol()&&f(b.context)&&(b.typeAtEndOfLine=e(a,b,a.pos))}var n,o,p=g.indentUnit,q=i.statementIndentUnit||p,r=i.dontAlignCalls,s=i.keywords||{},t=i.types||{},u=i.builtin||{},v=i.blockKeywords||{},w=i.defKeywords||{},x=i.atoms||{},y=i.hooks||{},z=i.multiLineStrings,A=i.indentStatements!==!1,B=i.indentSwitch!==!1,C=i.namespaceSeparator,D=i.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,E=i.numberStart||/[\d\.]/,F=i.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,G=i.isOperatorChar||/[+\-*&%=<>!?|\/]/,H=i.isIdentifierChar||/[\w\$_\xa1-\uffff]/;return{startState:function(a){return{tokenize:null,context:new b((a||0)-p,0,"top",null,!1),indented:0,startOfLine:!0,prevToken:null}},token:function(a,b){var g=b.context;if(a.sol()&&(null==g.align&&(g.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return m(a,b),null;n=o=null;var h=(b.tokenize||j)(a,b);if("comment"==h||"meta"==h)return h;if(null==g.align&&(g.align=!0),";"==n||":"==n||","==n&&a.match(/^\s*(?:\/\/.*)?$/,!1))for(;"statement"==b.context.type;)d(b);else if("{"==n)c(b,a.column(),"}");else if("["==n)c(b,a.column(),"]");else if("("==n)c(b,a.column(),")");else if("}"==n){for(;"statement"==g.type;)g=d(b);for("}"==g.type&&(g=d(b));"statement"==g.type;)g=d(b)}else n==g.type?d(b):A&&(("}"==g.type||"top"==g.type)&&";"!=n||"statement"==g.type&&"newstatement"==n)&&c(b,a.column(),"statement",a.current());if("variable"==h&&("def"==b.prevToken||i.typeFirstDefinitions&&e(a,b,a.start)&&f(b.context)&&a.match(/^\s*\(/,!1))&&(h="def"),y.token){var k=y.token(a,b,h);void 0!==k&&(h=k)}return"def"==h&&i.styleDefs===!1&&(h="variable"),b.startOfLine=!1,b.prevToken=o?"def":h||n,m(a,b),h},indent:function(b,c){if(b.tokenize!=j&&null!=b.tokenize||b.typeAtEndOfLine)return a.Pass;var d=b.context,e=c&&c.charAt(0);if("statement"==d.type&&"}"==e&&(d=d.prev),i.dontIndentStatements)for(;"statement"==d.type&&i.dontIndentStatements.test(d.info);)d=d.prev;if(y.indent){var f=y.indent(b,d,c);if("number"==typeof f)return f}var g=e==d.type,h=d.prev&&"switch"==d.prev.info;if(i.allmanIndentation&&/[{(]/.test(e)){for(;"top"!=d.type&&"}"!=d.type;)d=d.prev;return d.indented}return"statement"==d.type?d.indented+("{"==e?0:q):!d.align||r&&")"==d.type?")"!=d.type||g?d.indented+(g?0:p)+(g||!h||/^(?:case|default)\b/.test(c)?0:p):d.indented+q:d.column+(g?0:1)},electricInput:B?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}}));var t="auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile",u="int long char short double float unsigned signed void size_t ptrdiff_t";p(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:g(t),types:g(u+" bool _Complex _Bool float_t double_t intptr_t intmax_t int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),blockKeywords:g("case do else for if switch while struct"),defKeywords:g("struct"),typeFirstDefinitions:!0,atoms:g("null true false"),hooks:{"#":i,"*":j},modeProps:{fold:["brace","include"]}}),p(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:g(t+" asm dynamic_cast namespace reinterpret_cast try explicit new static_cast typeid catch operator template typename class friend private this using const_cast inline public throw virtual delete mutable protected alignas alignof constexpr decltype nullptr noexcept thread_local final static_assert override"),types:g(u+" bool wchar_t"),blockKeywords:g("catch class do else finally for if struct switch try while"),defKeywords:g("class namespace struct enum union"),typeFirstDefinitions:!0,atoms:g("true false null"),dontIndentStatements:/^template$/,isIdentifierChar:/[\w\$_~\xa1-\uffff]/,hooks:{"#":i,"*":j,u:l,U:l,L:l,R:l,0:k,1:k,2:k,3:k,4:k,5:k,6:k,7:k,8:k,9:k,token:function(a,b,c){if("variable"==c&&"("==a.peek()&&(";"==b.prevToken||null==b.prevToken||"}"==b.prevToken)&&m(a.current()))return"def"}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}}),p("text/x-java",{name:"clike",keywords:g("abstract assert break case catch class const continue default do else enum extends final finally float for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while @interface"),types:g("byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:g("catch class do else finally for if switch try while"),defKeywords:g("class interface package enum @interface"),typeFirstDefinitions:!0,atoms:g("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(a){return!a.match("interface",!1)&&(a.eatWhile(/[\w\$_]/),"meta")}},modeProps:{fold:["brace","import"]}}),p("text/x-csharp",{name:"clike",keywords:g("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),types:g("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:g("catch class do else finally for foreach if struct switch try while"),defKeywords:g("class interface namespace struct var"),typeFirstDefinitions:!0,atoms:g("true false null"),hooks:{"@":function(a,b){return a.eat('"')?(b.tokenize=n,n(a,b)):(a.eatWhile(/[\w\$_]/),"meta")}}}),p("text/x-scala",{name:"clike",keywords:g("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble"),types:g("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),multiLineStrings:!0,blockKeywords:g("catch class do else finally for forSome if match switch try while"),defKeywords:g("class def object package trait type val var"),atoms:g("true false null"),indentStatements:!1,indentSwitch:!1,isOperatorChar:/[+\-*&%=<>!?|\/#:@]/,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return!!a.match('""')&&(b.tokenize=q,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},"=":function(a,c){var d=c.context;return!("}"!=d.type||!d.align||!a.eat(">"))&&(c.context=new b(d.indented,d.column,d.type,d.info,null,d.prev),"operator")}},modeProps:{closeBrackets:{triples:'"'}}}),p("text/x-kotlin",{name:"clike",keywords:g("package as typealias class interface this super val var fun for is in This throw return break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix suspend"),types:g("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),intendSwitch:!1,indentStatements:!1,multiLineStrings:!0,number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,blockKeywords:g("catch class do else finally for if where try while enum"),defKeywords:g("class val var object package interface fun"),atoms:g("true false null this"),hooks:{'"':function(a,b){return b.tokenize=r(a.match('""')),b.tokenize(a,b)}},modeProps:{closeBrackets:{triples:'"'}}}),p(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:g("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:g("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),blockKeywords:g("for while do if else struct"),builtin:g("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),atoms:g("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),indentSwitch:!1,hooks:{"#":i},modeProps:{fold:["brace","include"]}}),p("text/x-nesc",{name:"clike",keywords:g(t+"as atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:g(u),blockKeywords:g("case do else for if switch while struct"),atoms:g("null true false"),hooks:{"#":i},modeProps:{fold:["brace","include"]}}),p("text/x-objectivec",{name:"clike",keywords:g(t+"inline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),types:g(u),atoms:g("YES NO NULL NILL ON OFF true false"),hooks:{"@":function(a){return a.eatWhile(/[\w\$]/),"keyword"},"#":i,indent:function(a,b,c){if("statement"==b.type&&/^@\w/.test(c))return b.indented}},modeProps:{fold:"brace"}}),p("text/x-squirrel",{name:"clike",keywords:g("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),types:g(u),blockKeywords:g("case catch class else for foreach if switch try while"),defKeywords:g("function local class"),typeFirstDefinitions:!0,atoms:g("true false null"),hooks:{"#":i},modeProps:{fold:["brace","include"]}});var v=null;p("text/x-ceylon",{name:"clike",keywords:g("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),types:function(a){var b=a.charAt(0);return b===b.toUpperCase()&&b!==b.toLowerCase()},blockKeywords:g("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:g("class dynamic function interface module object package value"),builtin:g("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:!0,typeFirstDefinitions:!0,atoms:g("true false null larger smaller equal empty finished"),indentSwitch:!1,styleDefs:!1,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return b.tokenize=s(a.match('""')?"triple":"single"),b.tokenize(a,b)},"`":function(a,b){return!(!v||!a.match("`"))&&(b.tokenize=v,v=null,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},token:function(a,b,c){if(("variable"==c||"variable-3"==c)&&"."==b.prevToken)return"variable-2"}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.info=d,this.align=e,this.prev=f}function c(a,c,d,e){var f=a.indented;return a.context&&"statement"==a.context.type&&"statement"!=d&&(f=a.context.indented),a.context=new b(f,c,d,e,null,a.context)}function d(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}function e(a,b,c){return"variable"==b.prevToken||"type"==b.prevToken||(!!/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(a.string.slice(0,c))||(!(!b.typeAtEndOfLine||a.column()!=a.indentation())||void 0))}function f(a){for(;;){if(!a||"top"==a.type)return!0;if("}"==a.type&&"namespace"!=a.prev.info)return!1;a=a.prev}}function g(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function h(a,b){return"function"==typeof a?a(b):a.propertyIsEnumerable(b)}function i(a,b){if(!b.startOfLine)return!1;for(var c,d=null;c=a.peek();){if("\\"==c&&a.match(/^.$/)){d=i;break}if("/"==c&&a.match(/^\/[\/\*]/,!1))break;a.next()}return b.tokenize=d,"meta"}function j(a,b){return"type"==b.prevToken&&"type"}function k(a){return a.eatWhile(/[\w\.']/),"number"}function l(a,b){if(a.backUp(1),a.match(/(R|u8R|uR|UR|LR)/)){var c=a.match(/"([^\s\\()]{0,16})\(/);return!!c&&(b.cpp11RawStringDelim=c[1],b.tokenize=o,o(a,b))}return a.match(/(u8|u|U|L)/)?!!a.match(/["']/,!1)&&"string":(a.next(),!1)}function m(a){var b=/(\w+)::~?(\w+)$/.exec(a);return b&&b[1]==b[2]}function n(a,b){for(var c;null!=(c=a.next());)if('"'==c&&!a.eat('"')){b.tokenize=null;break}return"string"}function o(a,b){var c=b.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$&"),d=a.match(new RegExp(".*?\\)"+c+'"'));return d?b.tokenize=null:a.skipToEnd(),"string"}function p(b,c){function d(a){if(a)for(var b in a)a.hasOwnProperty(b)&&e.push(b)}"string"==typeof b&&(b=[b]);var e=[];d(c.keywords),d(c.types),d(c.builtin),d(c.atoms),e.length&&(c.helperType=b[0],a.registerHelper("hintWords",b[0],e));for(var f=0;f<b.length;++f)a.defineMIME(b[f],c)}function q(a,b){for(var c=!1;!a.eol();){if(!c&&a.match('"""')){b.tokenize=null;break}c="\\"==a.next()&&!c}return"string"}function r(a){return function(b,c){for(var d,e=!1,f=!1;!b.eol();){if(!a&&!e&&b.match('"')){f=!0;break}if(a&&b.match('"""')){f=!0;break}d=b.next(),!e&&"$"==d&&b.match("{")&&b.skipTo("}"),e=!e&&"\\"==d&&!a}return!f&&a||(c.tokenize=null),"string"}}function s(a){return function(b,c){for(var d,e=!1,f=!1;!b.eol();){if(!e&&b.match('"')&&("single"==a||b.match('""'))){f=!0;break}if(!e&&b.match("``")){v=s(a),f=!0;break}d=b.next(),e="single"==a&&!e&&"\\"==d}return f&&(c.tokenize=null),"string"}}a.defineMode("clike",(function(g,i){function j(a,b){var c=a.next();if(y[c]){var d=y[c](a,b);if(d!==!1)return d}if('"'==c||"'"==c)return b.tokenize=k(c),b.tokenize(a,b);if(D.test(c))return n=c,null;if(E.test(c)){if(a.backUp(1),a.match(F))return"number";a.next()}if("/"==c){if(a.eat("*"))return b.tokenize=l,l(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(G.test(c)){for(;!a.match(/^\/[\/*]/,!1)&&a.eat(G););return"operator"}if(a.eatWhile(H),C)for(;a.match(C);)a.eatWhile(H);var e=a.current();return h(s,e)?(h(v,e)&&(n="newstatement"),h(w,e)&&(o=!0),"keyword"):h(t,e)?"type":h(u,e)?(h(v,e)&&(n="newstatement"),"builtin"):h(x,e)?"atom":"variable"}function k(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){f=!0;break}e=!e&&"\\"==d}return(f||!e&&!z)&&(c.tokenize=null),"string"}}function l(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=null;break}d="*"==c}return"comment"}function m(a,b){i.typeFirstDefinitions&&a.eol()&&f(b.context)&&(b.typeAtEndOfLine=e(a,b,a.pos))}var n,o,p=g.indentUnit,q=i.statementIndentUnit||p,r=i.dontAlignCalls,s=i.keywords||{},t=i.types||{},u=i.builtin||{},v=i.blockKeywords||{},w=i.defKeywords||{},x=i.atoms||{},y=i.hooks||{},z=i.multiLineStrings,A=i.indentStatements!==!1,B=i.indentSwitch!==!1,C=i.namespaceSeparator,D=i.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,E=i.numberStart||/[\d\.]/,F=i.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,G=i.isOperatorChar||/[+\-*&%=<>!?|\/]/,H=i.isIdentifierChar||/[\w\$_\xa1-\uffff]/;return{startState:function(a){return{tokenize:null,context:new b((a||0)-p,0,"top",null,!1),indented:0,startOfLine:!0,prevToken:null}},token:function(a,b){var g=b.context;if(a.sol()&&(null==g.align&&(g.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return m(a,b),null;n=o=null;var h=(b.tokenize||j)(a,b);if("comment"==h||"meta"==h)return h;if(null==g.align&&(g.align=!0),";"==n||":"==n||","==n&&a.match(/^\s*(?:\/\/.*)?$/,!1))for(;"statement"==b.context.type;)d(b);else if("{"==n)c(b,a.column(),"}");else if("["==n)c(b,a.column(),"]");else if("("==n)c(b,a.column(),")");else if("}"==n){for(;"statement"==g.type;)g=d(b);for("}"==g.type&&(g=d(b));"statement"==g.type;)g=d(b)}else n==g.type?d(b):A&&(("}"==g.type||"top"==g.type)&&";"!=n||"statement"==g.type&&"newstatement"==n)&&c(b,a.column(),"statement",a.current());if("variable"==h&&("def"==b.prevToken||i.typeFirstDefinitions&&e(a,b,a.start)&&f(b.context)&&a.match(/^\s*\(/,!1))&&(h="def"),y.token){var k=y.token(a,b,h);void 0!==k&&(h=k)}return"def"==h&&i.styleDefs===!1&&(h="variable"),b.startOfLine=!1,b.prevToken=o?"def":h||n,m(a,b),h},indent:function(b,c){if(b.tokenize!=j&&null!=b.tokenize||b.typeAtEndOfLine)return a.Pass;var d=b.context,e=c&&c.charAt(0);if("statement"==d.type&&"}"==e&&(d=d.prev),i.dontIndentStatements)for(;"statement"==d.type&&i.dontIndentStatements.test(d.info);)d=d.prev;if(y.indent){var f=y.indent(b,d,c);if("number"==typeof f)return f}var g=e==d.type,h=d.prev&&"switch"==d.prev.info;if(i.allmanIndentation&&/[{(]/.test(e)){for(;"top"!=d.type&&"}"!=d.type;)d=d.prev;return d.indented}return"statement"==d.type?d.indented+("{"==e?0:q):!d.align||r&&")"==d.type?")"!=d.type||g?d.indented+(g?0:p)+(g||!h||/^(?:case|default)\b/.test(c)?0:p):d.indented+q:d.column+(g?0:1)},electricInput:B?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}}));var t="auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile",u="int long char short double float unsigned signed void size_t ptrdiff_t";p(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:g(t),types:g(u+" bool _Complex _Bool float_t double_t intptr_t intmax_t int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),blockKeywords:g("case do else for if switch while struct"),defKeywords:g("struct"),typeFirstDefinitions:!0,atoms:g("null true false"),hooks:{"#":i,"*":j},modeProps:{fold:["brace","include"]}}),p(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:g(t+" asm dynamic_cast namespace reinterpret_cast try explicit new static_cast typeid catch operator template typename class friend private this using const_cast inline public throw virtual delete mutable protected alignas alignof constexpr decltype nullptr noexcept thread_local final static_assert override"),types:g(u+" bool wchar_t"),blockKeywords:g("catch class do else finally for if struct switch try while"),defKeywords:g("class namespace struct enum union"),typeFirstDefinitions:!0,atoms:g("true false null"),dontIndentStatements:/^template$/,isIdentifierChar:/[\w\$_~\xa1-\uffff]/,hooks:{"#":i,"*":j,u:l,U:l,L:l,R:l,0:k,1:k,2:k,3:k,4:k,5:k,6:k,7:k,8:k,9:k,token:function(a,b,c){if("variable"==c&&"("==a.peek()&&(";"==b.prevToken||null==b.prevToken||"}"==b.prevToken)&&m(a.current()))return"def"}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}}),p("text/x-java",{name:"clike",keywords:g("abstract assert break case catch class const continue default do else enum extends final finally float for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while @interface"),types:g("byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:g("catch class do else finally for if switch try while"),defKeywords:g("class interface package enum @interface"),typeFirstDefinitions:!0,atoms:g("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(a){return!a.match("interface",!1)&&(a.eatWhile(/[\w\$_]/),"meta")}},modeProps:{fold:["brace","import"]}}),p("text/x-csharp",{name:"clike",keywords:g("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),types:g("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:g("catch class do else finally for foreach if struct switch try while"),defKeywords:g("class interface namespace struct var"),typeFirstDefinitions:!0,atoms:g("true false null"),hooks:{"@":function(a,b){return a.eat('"')?(b.tokenize=n,n(a,b)):(a.eatWhile(/[\w\$_]/),"meta")}}}),p("text/x-scala",{name:"clike",keywords:g("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble"),types:g("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),multiLineStrings:!0,blockKeywords:g("catch class enum do else finally for forSome if match switch try while"),defKeywords:g("class enum def object package trait type val var"),atoms:g("true false null"),indentStatements:!1,indentSwitch:!1,isOperatorChar:/[+\-*&%=<>!?|\/#:@]/,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return!!a.match('""')&&(b.tokenize=q,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},"=":function(a,c){var d=c.context;return!("}"!=d.type||!d.align||!a.eat(">"))&&(c.context=new b(d.indented,d.column,d.type,d.info,null,d.prev),"operator")}},modeProps:{closeBrackets:{triples:'"'}}}),p("text/x-kotlin",{name:"clike",keywords:g("package as typealias class interface this super val var fun for is in This throw return break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix suspend"),types:g("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),intendSwitch:!1,indentStatements:!1,multiLineStrings:!0,number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,blockKeywords:g("catch class do else finally for if where try while enum"),defKeywords:g("class val var object package interface fun"),atoms:g("true false null this"),hooks:{'"':function(a,b){return b.tokenize=r(a.match('""')),b.tokenize(a,b)}},modeProps:{closeBrackets:{triples:'"'}}}),p(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:g("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:g("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),blockKeywords:g("for while do if else struct"),builtin:g("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),atoms:g("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),indentSwitch:!1,hooks:{"#":i},modeProps:{fold:["brace","include"]}}),p("text/x-nesc",{name:"clike",keywords:g(t+"as atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:g(u),blockKeywords:g("case do else for if switch while struct"),atoms:g("null true false"),hooks:{"#":i},modeProps:{fold:["brace","include"]}}),p("text/x-objectivec",{name:"clike",keywords:g(t+"inline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),types:g(u),atoms:g("YES NO NULL NILL ON OFF true false"),hooks:{"@":function(a){return a.eatWhile(/[\w\$]/),"keyword"},"#":i,indent:function(a,b,c){if("statement"==b.type&&/^@\w/.test(c))return b.indented}},modeProps:{fold:"brace"}}),p("text/x-squirrel",{name:"clike",keywords:g("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),types:g(u),blockKeywords:g("case catch class else for foreach if switch try while"),defKeywords:g("function local class"),typeFirstDefinitions:!0,atoms:g("true false null"),hooks:{"#":i},modeProps:{fold:["brace","include"]}});var v=null;p("text/x-ceylon",{name:"clike",keywords:g("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),types:function(a){var b=a.charAt(0);return b===b.toUpperCase()&&b!==b.toLowerCase()},blockKeywords:g("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:g("class dynamic function interface module object package value"),builtin:g("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:!0,typeFirstDefinitions:!0,atoms:g("true false null larger smaller equal empty finished"),indentSwitch:!1,styleDefs:!1,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return b.tokenize=s(a.match('""')?"triple":"single"),b.tokenize(a,b)},"`":function(a,b){return!(!v||!a.match("`"))&&(b.tokenize=v,v=null,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},token:function(a,b,c){if(("variable"==c||"type"==c)&&"."==b.prevToken)return"variable-2"}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/css/css.js b/media/editors/codemirror/mode/css/css.js
index 7f8c46ebb6c13..056c48e680948 100644
--- a/media/editors/codemirror/mode/css/css.js
+++ b/media/editors/codemirror/mode/css/css.js
@@ -401,7 +401,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
             ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
           // Dedent relative to current context.
           indent = Math.max(0, cx.indent - indentUnit);
-          cx = cx.prev;
         }
       }
       return indent;
@@ -472,7 +471,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "border-top-left-radius", "border-top-right-radius", "border-top-style",
     "border-top-width", "border-width", "bottom", "box-decoration-break",
     "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-    "caption-side", "clear", "clip", "color", "color-profile", "column-count",
+    "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
     "column-fill", "column-gap", "column-rule", "column-rule-color",
     "column-rule-style", "column-rule-width", "column-span", "column-width",
     "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
@@ -493,7 +492,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
     "grid-template-rows", "hanging-punctuation", "height", "hyphens",
     "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "left", "letter-spacing",
+    "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
     "line-break", "line-height", "line-stacking", "line-stacking-ruby",
     "line-stacking-shift", "line-stacking-strategy", "list-style",
     "list-style-image", "list-style-position", "list-style-type", "margin",
@@ -508,7 +507,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
     "page", "page-break-after", "page-break-before", "page-break-inside",
     "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
+    "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
     "presentation-level", "punctuation-trim", "quotes", "region-break-after",
     "region-break-before", "region-break-inside", "region-fragment",
     "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
@@ -659,13 +658,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
     "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
-    "searchfield-results-button", "searchfield-results-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
     "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
     "simp-chinese-formal", "simp-chinese-informal", "single",
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
     "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
diff --git a/media/editors/codemirror/mode/css/css.min.js b/media/editors/codemirror/mode/css/css.min.js
index 464c2cfc4a7c0..7c4f7131ed27f 100644
--- a/media/editors/codemirror/mode/css/css.min.js
+++ b/media/editors/codemirror/mode/css/css.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=0;c<a.length;++c)b[a[c].toLowerCase()]=!0;return b}function c(a,b){for(var c,d=!1;null!=(c=a.next());){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return["comment","comment"]}a.defineMode("css",(function(b,c){function d(a,b){return o=b,a}function e(a,b){var c=a.next();if(r[c]){var e=r[c](a,b);if(e!==!1)return e}return"@"==c?(a.eatWhile(/[\w\\\-]/),d("def",a.current())):"="==c||("~"==c||"|"==c)&&a.eat("=")?d(null,"compare"):'"'==c||"'"==c?(b.tokenize=f(c),b.tokenize(a,b)):"#"==c?(a.eatWhile(/[\w\\\-]/),d("atom","hash")):"!"==c?(a.match(/^\s*\w*/),d("keyword","important")):/\d/.test(c)||"."==c&&a.eat(/\d/)?(a.eatWhile(/[\w.%]/),d("number","unit")):"-"!==c?/[,+>*\/]/.test(c)?d(null,"select-op"):"."==c&&a.match(/^-?[_a-z][_a-z0-9-]*/i)?d("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(c)?d(null,c):"u"==c&&a.match(/rl(-prefix)?\(/)||"d"==c&&a.match("omain(")||"r"==c&&a.match("egexp(")?(a.backUp(1),b.tokenize=g,d("property","word")):/[\w\\\-]/.test(c)?(a.eatWhile(/[\w\\\-]/),d("property","word")):d(null,null):/[\d.]/.test(a.peek())?(a.eatWhile(/[\w.%]/),d("number","unit")):a.match(/^-[\w\\\-]+/)?(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?d("variable-2","variable-definition"):d("variable-2","variable")):a.match(/^\w+-/)?d("meta","meta"):void 0}function f(a){return function(b,c){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){")"==a&&b.backUp(1);break}f=!f&&"\\"==e}return(e==a||!f&&")"!=a)&&(c.tokenize=null),d("string","string")}}function g(a,b){return a.next(),a.match(/\s*[\"\')]/,!1)?b.tokenize=null:b.tokenize=f(")"),d(null,"(")}function h(a,b,c){this.type=a,this.indent=b,this.prev=c}function i(a,b,c,d){return a.context=new h(c,b.indentation()+(d===!1?0:q),a.context),c}function j(a){return a.context.prev&&(a.context=a.context.prev),a.context.type}function k(a,b,c){return F[c.context.type](a,b,c)}function l(a,b,c,d){for(var e=d||1;e>0;e--)c.context=c.context.prev;return k(a,b,c)}function m(a){var b=a.current().toLowerCase();p=B.hasOwnProperty(b)?"atom":A.hasOwnProperty(b)?"keyword":"variable"}var n=c.inline;c.propertyKeywords||(c=a.resolveMode("text/css"));var o,p,q=b.indentUnit,r=c.tokenHooks,s=c.documentTypes||{},t=c.mediaTypes||{},u=c.mediaFeatures||{},v=c.mediaValueKeywords||{},w=c.propertyKeywords||{},x=c.nonStandardPropertyKeywords||{},y=c.fontProperties||{},z=c.counterDescriptors||{},A=c.colorKeywords||{},B=c.valueKeywords||{},C=c.allowNested,D=c.lineComment,E=c.supportsAtComponent===!0,F={};return F.top=function(a,b,c){if("{"==a)return i(c,b,"block");if("}"==a&&c.context.prev)return j(c);if(E&&/@component/.test(a))return i(c,b,"atComponentBlock");if(/^@(-moz-)?document$/.test(a))return i(c,b,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/.test(a))return i(c,b,"atBlock");if(/^@(font-face|counter-style)/.test(a))return c.stateArg=a,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(a))return"keyframes";if(a&&"@"==a.charAt(0))return i(c,b,"at");if("hash"==a)p="builtin";else if("word"==a)p="tag";else{if("variable-definition"==a)return"maybeprop";if("interpolation"==a)return i(c,b,"interpolation");if(":"==a)return"pseudo";if(C&&"("==a)return i(c,b,"parens")}return c.context.type},F.block=function(a,b,c){if("word"==a){var d=b.current().toLowerCase();return w.hasOwnProperty(d)?(p="property","maybeprop"):x.hasOwnProperty(d)?(p="string-2","maybeprop"):C?(p=b.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):(p+=" error","maybeprop")}return"meta"==a?"block":C||"hash"!=a&&"qualifier"!=a?F.top(a,b,c):(p="error","block")},F.maybeprop=function(a,b,c){return":"==a?i(c,b,"prop"):k(a,b,c)},F.prop=function(a,b,c){if(";"==a)return j(c);if("{"==a&&C)return i(c,b,"propBlock");if("}"==a||"{"==a)return l(a,b,c);if("("==a)return i(c,b,"parens");if("hash"!=a||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(b.current())){if("word"==a)m(b);else if("interpolation"==a)return i(c,b,"interpolation")}else p+=" error";return"prop"},F.propBlock=function(a,b,c){return"}"==a?j(c):"word"==a?(p="property","maybeprop"):c.context.type},F.parens=function(a,b,c){return"{"==a||"}"==a?l(a,b,c):")"==a?j(c):"("==a?i(c,b,"parens"):"interpolation"==a?i(c,b,"interpolation"):("word"==a&&m(b),"parens")},F.pseudo=function(a,b,c){return"meta"==a?"pseudo":"word"==a?(p="variable-3",c.context.type):k(a,b,c)},F.documentTypes=function(a,b,c){return"word"==a&&s.hasOwnProperty(b.current())?(p="tag",c.context.type):F.atBlock(a,b,c)},F.atBlock=function(a,b,c){if("("==a)return i(c,b,"atBlock_parens");if("}"==a||";"==a)return l(a,b,c);if("{"==a)return j(c)&&i(c,b,C?"block":"top");if("interpolation"==a)return i(c,b,"interpolation");if("word"==a){var d=b.current().toLowerCase();p="only"==d||"not"==d||"and"==d||"or"==d?"keyword":t.hasOwnProperty(d)?"attribute":u.hasOwnProperty(d)?"property":v.hasOwnProperty(d)?"keyword":w.hasOwnProperty(d)?"property":x.hasOwnProperty(d)?"string-2":B.hasOwnProperty(d)?"atom":A.hasOwnProperty(d)?"keyword":"error"}return c.context.type},F.atComponentBlock=function(a,b,c){return"}"==a?l(a,b,c):"{"==a?j(c)&&i(c,b,C?"block":"top",!1):("word"==a&&(p="error"),c.context.type)},F.atBlock_parens=function(a,b,c){return")"==a?j(c):"{"==a||"}"==a?l(a,b,c,2):F.atBlock(a,b,c)},F.restricted_atBlock_before=function(a,b,c){return"{"==a?i(c,b,"restricted_atBlock"):"word"==a&&"@counter-style"==c.stateArg?(p="variable","restricted_atBlock_before"):k(a,b,c)},F.restricted_atBlock=function(a,b,c){return"}"==a?(c.stateArg=null,j(c)):"word"==a?(p="@font-face"==c.stateArg&&!y.hasOwnProperty(b.current().toLowerCase())||"@counter-style"==c.stateArg&&!z.hasOwnProperty(b.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},F.keyframes=function(a,b,c){return"word"==a?(p="variable","keyframes"):"{"==a?i(c,b,"top"):k(a,b,c)},F.at=function(a,b,c){return";"==a?j(c):"{"==a||"}"==a?l(a,b,c):("word"==a?p="tag":"hash"==a&&(p="builtin"),"at")},F.interpolation=function(a,b,c){return"}"==a?j(c):"{"==a||";"==a?l(a,b,c):("word"==a?p="variable":"variable"!=a&&"("!=a&&")"!=a&&(p="error"),"interpolation")},{startState:function(a){return{tokenize:null,state:n?"block":"top",stateArg:null,context:new h(n?"block":"top",a||0,null)}},token:function(a,b){if(!b.tokenize&&a.eatSpace())return null;var c=(b.tokenize||e)(a,b);return c&&"object"==typeof c&&(o=c[1],c=c[0]),p=c,b.state=F[b.state](o,a,b),p},indent:function(a,b){var c=a.context,d=b&&b.charAt(0),e=c.indent;return"prop"!=c.type||"}"!=d&&")"!=d||(c=c.prev),c.prev&&("}"!=d||"block"!=c.type&&"top"!=c.type&&"interpolation"!=c.type&&"restricted_atBlock"!=c.type?(")"!=d||"parens"!=c.type&&"atBlock_parens"!=c.type)&&("{"!=d||"at"!=c.type&&"atBlock"!=c.type)||(e=Math.max(0,c.indent-q),c=c.prev):(c=c.prev,e=c.indent)),e},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:D,fold:"brace"}}));var d=["domain","regexp","url","url-prefix"],e=b(d),f=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],g=b(f),h=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover"],i=b(h),j=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive"],k=b(j),l=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],m=b(l),n=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],o=b(n),p=["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],q=b(p),r=["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"],s=b(r),t=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],u=b(t),v=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","auto-flow","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","opacity","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","system-ui","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","transform","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","unset","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],w=b(v),x=d.concat(f).concat(h).concat(j).concat(l).concat(n).concat(t).concat(v);a.registerHelper("hintWords","css",x),a.defineMIME("text/css",{documentTypes:e,mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,fontProperties:q,counterDescriptors:s,colorKeywords:u,valueKeywords:w,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=c,c(a,b))}},name:"css"}),a.defineMIME("text/x-scss",{mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,colorKeywords:u,valueKeywords:w,fontProperties:q,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=c,c(a,b)):["operator","operator"]},":":function(a){return!!a.match(/\s*\{/,!1)&&[null,null]},$:function(a){return a.match(/^[\w-]+/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(a){return!!a.eat("{")&&[null,"interpolation"]}},name:"css",helperType:"scss"}),a.defineMIME("text/x-less",{mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,colorKeywords:u,valueKeywords:w,fontProperties:q,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=c,c(a,b)):["operator","operator"]},"@":function(a){return a.eat("{")?[null,"interpolation"]:!a.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/,!1)&&(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"}),a.defineMIME("text/x-gss",{documentTypes:e,mediaTypes:g,mediaFeatures:i,propertyKeywords:m,nonStandardPropertyKeywords:o,fontProperties:q,counterDescriptors:s,colorKeywords:u,valueKeywords:w,supportsAtComponent:!0,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=c,c(a,b))}},name:"css",helperType:"gss"})}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=0;c<a.length;++c)b[a[c].toLowerCase()]=!0;return b}function c(a,b){for(var c,d=!1;null!=(c=a.next());){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return["comment","comment"]}a.defineMode("css",(function(b,c){function d(a,b){return o=b,a}function e(a,b){var c=a.next();if(r[c]){var e=r[c](a,b);if(e!==!1)return e}return"@"==c?(a.eatWhile(/[\w\\\-]/),d("def",a.current())):"="==c||("~"==c||"|"==c)&&a.eat("=")?d(null,"compare"):'"'==c||"'"==c?(b.tokenize=f(c),b.tokenize(a,b)):"#"==c?(a.eatWhile(/[\w\\\-]/),d("atom","hash")):"!"==c?(a.match(/^\s*\w*/),d("keyword","important")):/\d/.test(c)||"."==c&&a.eat(/\d/)?(a.eatWhile(/[\w.%]/),d("number","unit")):"-"!==c?/[,+>*\/]/.test(c)?d(null,"select-op"):"."==c&&a.match(/^-?[_a-z][_a-z0-9-]*/i)?d("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(c)?d(null,c):"u"==c&&a.match(/rl(-prefix)?\(/)||"d"==c&&a.match("omain(")||"r"==c&&a.match("egexp(")?(a.backUp(1),b.tokenize=g,d("property","word")):/[\w\\\-]/.test(c)?(a.eatWhile(/[\w\\\-]/),d("property","word")):d(null,null):/[\d.]/.test(a.peek())?(a.eatWhile(/[\w.%]/),d("number","unit")):a.match(/^-[\w\\\-]+/)?(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?d("variable-2","variable-definition"):d("variable-2","variable")):a.match(/^\w+-/)?d("meta","meta"):void 0}function f(a){return function(b,c){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){")"==a&&b.backUp(1);break}f=!f&&"\\"==e}return(e==a||!f&&")"!=a)&&(c.tokenize=null),d("string","string")}}function g(a,b){return a.next(),a.match(/\s*[\"\')]/,!1)?b.tokenize=null:b.tokenize=f(")"),d(null,"(")}function h(a,b,c){this.type=a,this.indent=b,this.prev=c}function i(a,b,c,d){return a.context=new h(c,b.indentation()+(d===!1?0:q),a.context),c}function j(a){return a.context.prev&&(a.context=a.context.prev),a.context.type}function k(a,b,c){return F[c.context.type](a,b,c)}function l(a,b,c,d){for(var e=d||1;e>0;e--)c.context=c.context.prev;return k(a,b,c)}function m(a){var b=a.current().toLowerCase();p=B.hasOwnProperty(b)?"atom":A.hasOwnProperty(b)?"keyword":"variable"}var n=c.inline;c.propertyKeywords||(c=a.resolveMode("text/css"));var o,p,q=b.indentUnit,r=c.tokenHooks,s=c.documentTypes||{},t=c.mediaTypes||{},u=c.mediaFeatures||{},v=c.mediaValueKeywords||{},w=c.propertyKeywords||{},x=c.nonStandardPropertyKeywords||{},y=c.fontProperties||{},z=c.counterDescriptors||{},A=c.colorKeywords||{},B=c.valueKeywords||{},C=c.allowNested,D=c.lineComment,E=c.supportsAtComponent===!0,F={};return F.top=function(a,b,c){if("{"==a)return i(c,b,"block");if("}"==a&&c.context.prev)return j(c);if(E&&/@component/.test(a))return i(c,b,"atComponentBlock");if(/^@(-moz-)?document$/.test(a))return i(c,b,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/.test(a))return i(c,b,"atBlock");if(/^@(font-face|counter-style)/.test(a))return c.stateArg=a,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(a))return"keyframes";if(a&&"@"==a.charAt(0))return i(c,b,"at");if("hash"==a)p="builtin";else if("word"==a)p="tag";else{if("variable-definition"==a)return"maybeprop";if("interpolation"==a)return i(c,b,"interpolation");if(":"==a)return"pseudo";if(C&&"("==a)return i(c,b,"parens")}return c.context.type},F.block=function(a,b,c){if("word"==a){var d=b.current().toLowerCase();return w.hasOwnProperty(d)?(p="property","maybeprop"):x.hasOwnProperty(d)?(p="string-2","maybeprop"):C?(p=b.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):(p+=" error","maybeprop")}return"meta"==a?"block":C||"hash"!=a&&"qualifier"!=a?F.top(a,b,c):(p="error","block")},F.maybeprop=function(a,b,c){return":"==a?i(c,b,"prop"):k(a,b,c)},F.prop=function(a,b,c){if(";"==a)return j(c);if("{"==a&&C)return i(c,b,"propBlock");if("}"==a||"{"==a)return l(a,b,c);if("("==a)return i(c,b,"parens");if("hash"!=a||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(b.current())){if("word"==a)m(b);else if("interpolation"==a)return i(c,b,"interpolation")}else p+=" error";return"prop"},F.propBlock=function(a,b,c){return"}"==a?j(c):"word"==a?(p="property","maybeprop"):c.context.type},F.parens=function(a,b,c){return"{"==a||"}"==a?l(a,b,c):")"==a?j(c):"("==a?i(c,b,"parens"):"interpolation"==a?i(c,b,"interpolation"):("word"==a&&m(b),"parens")},F.pseudo=function(a,b,c){return"meta"==a?"pseudo":"word"==a?(p="variable-3",c.context.type):k(a,b,c)},F.documentTypes=function(a,b,c){return"word"==a&&s.hasOwnProperty(b.current())?(p="tag",c.context.type):F.atBlock(a,b,c)},F.atBlock=function(a,b,c){if("("==a)return i(c,b,"atBlock_parens");if("}"==a||";"==a)return l(a,b,c);if("{"==a)return j(c)&&i(c,b,C?"block":"top");if("interpolation"==a)return i(c,b,"interpolation");if("word"==a){var d=b.current().toLowerCase();p="only"==d||"not"==d||"and"==d||"or"==d?"keyword":t.hasOwnProperty(d)?"attribute":u.hasOwnProperty(d)?"property":v.hasOwnProperty(d)?"keyword":w.hasOwnProperty(d)?"property":x.hasOwnProperty(d)?"string-2":B.hasOwnProperty(d)?"atom":A.hasOwnProperty(d)?"keyword":"error"}return c.context.type},F.atComponentBlock=function(a,b,c){return"}"==a?l(a,b,c):"{"==a?j(c)&&i(c,b,C?"block":"top",!1):("word"==a&&(p="error"),c.context.type)},F.atBlock_parens=function(a,b,c){return")"==a?j(c):"{"==a||"}"==a?l(a,b,c,2):F.atBlock(a,b,c)},F.restricted_atBlock_before=function(a,b,c){return"{"==a?i(c,b,"restricted_atBlock"):"word"==a&&"@counter-style"==c.stateArg?(p="variable","restricted_atBlock_before"):k(a,b,c)},F.restricted_atBlock=function(a,b,c){return"}"==a?(c.stateArg=null,j(c)):"word"==a?(p="@font-face"==c.stateArg&&!y.hasOwnProperty(b.current().toLowerCase())||"@counter-style"==c.stateArg&&!z.hasOwnProperty(b.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},F.keyframes=function(a,b,c){return"word"==a?(p="variable","keyframes"):"{"==a?i(c,b,"top"):k(a,b,c)},F.at=function(a,b,c){return";"==a?j(c):"{"==a||"}"==a?l(a,b,c):("word"==a?p="tag":"hash"==a&&(p="builtin"),"at")},F.interpolation=function(a,b,c){return"}"==a?j(c):"{"==a||";"==a?l(a,b,c):("word"==a?p="variable":"variable"!=a&&"("!=a&&")"!=a&&(p="error"),"interpolation")},{startState:function(a){return{tokenize:null,state:n?"block":"top",stateArg:null,context:new h(n?"block":"top",a||0,null)}},token:function(a,b){if(!b.tokenize&&a.eatSpace())return null;var c=(b.tokenize||e)(a,b);return c&&"object"==typeof c&&(o=c[1],c=c[0]),p=c,b.state=F[b.state](o,a,b),p},indent:function(a,b){var c=a.context,d=b&&b.charAt(0),e=c.indent;return"prop"!=c.type||"}"!=d&&")"!=d||(c=c.prev),c.prev&&("}"!=d||"block"!=c.type&&"top"!=c.type&&"interpolation"!=c.type&&"restricted_atBlock"!=c.type?(")"!=d||"parens"!=c.type&&"atBlock_parens"!=c.type)&&("{"!=d||"at"!=c.type&&"atBlock"!=c.type)||(e=Math.max(0,c.indent-q)):(c=c.prev,e=c.indent)),e},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:D,fold:"brace"}}));var d=["domain","regexp","url","url-prefix"],e=b(d),f=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],g=b(f),h=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover"],i=b(h),j=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive"],k=b(j),l=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","justify-items","justify-self","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","place-content","place-items","place-self","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],m=b(l),n=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],o=b(n),p=["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],q=b(p),r=["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"],s=b(r),t=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],u=b(t),v=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","auto-flow","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","opacity","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","self-start","self-end","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","space-evenly","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","system-ui","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","transform","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","unset","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],w=b(v),x=d.concat(f).concat(h).concat(j).concat(l).concat(n).concat(t).concat(v);a.registerHelper("hintWords","css",x),a.defineMIME("text/css",{documentTypes:e,mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,fontProperties:q,counterDescriptors:s,colorKeywords:u,valueKeywords:w,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=c,c(a,b))}},name:"css"}),a.defineMIME("text/x-scss",{mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,colorKeywords:u,valueKeywords:w,fontProperties:q,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=c,c(a,b)):["operator","operator"]},":":function(a){return!!a.match(/\s*\{/,!1)&&[null,null]},$:function(a){return a.match(/^[\w-]+/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(a){return!!a.eat("{")&&[null,"interpolation"]}},name:"css",helperType:"scss"}),a.defineMIME("text/x-less",{mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,colorKeywords:u,valueKeywords:w,fontProperties:q,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=c,c(a,b)):["operator","operator"]},"@":function(a){return a.eat("{")?[null,"interpolation"]:!a.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/,!1)&&(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"}),a.defineMIME("text/x-gss",{documentTypes:e,mediaTypes:g,mediaFeatures:i,propertyKeywords:m,nonStandardPropertyKeywords:o,fontProperties:q,counterDescriptors:s,colorKeywords:u,valueKeywords:w,supportsAtComponent:!0,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=c,c(a,b))}},name:"css",helperType:"gss"})}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/dart/dart.js b/media/editors/codemirror/mode/dart/dart.js
index 8d383a95efb8b..398f5ef3b576f 100644
--- a/media/editors/codemirror/mode/dart/dart.js
+++ b/media/editors/codemirror/mode/dart/dart.js
@@ -13,7 +13,7 @@
 
   var keywords = ("this super static final const abstract class extends external factory " +
     "implements get native operator set typedef with enum throw rethrow " +
-    "assert break case continue default in return new deferred async await " +
+    "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
     "part of show hide is as").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
diff --git a/media/editors/codemirror/mode/dart/dart.min.js b/media/editors/codemirror/mode/dart/dart.min.js
index 08c0e8d9d5a70..b030bd0f0f9f4 100644
--- a/media/editors/codemirror/mode/dart/dart.min.js
+++ b/media/editors/codemirror/mode/dart/dart.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../clike/clike")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../clike/clike"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=0;c<a.length;++c)b[a[c]]=!0;return b}function c(a){(a.interpolationStack||(a.interpolationStack=[])).push(a.tokenize)}function d(a){return(a.interpolationStack||(a.interpolationStack=[])).pop()}function e(a){return a.interpolationStack?a.interpolationStack.length:0}function f(a,b,d,e){function f(b,d){for(var f=!1;!b.eol();){if(!e&&!f&&"$"==b.peek())return c(d),d.tokenize=g,"string";var i=b.next();if(i==a&&!f&&(!h||b.match(a+a))){d.tokenize=null;break}f=!e&&!f&&"\\"==i}return"string"}var h=!1;if(b.eat(a)){if(!b.eat(a))return"string";h=!0}return d.tokenize=f,f(b,d)}function g(a,b){return a.eat("$"),a.eat("{")?b.tokenize=null:b.tokenize=h,null}function h(a,b){return a.eatWhile(/[\w_]/),b.tokenize=d(b),"variable"}function i(a){return function(b,c){for(var d;d=b.next();){if("*"==d&&b.eat("/")){if(1==a){c.tokenize=null;break}return c.tokenize=i(a-1),c.tokenize(b,c)}if("/"==d&&b.eat("*"))return c.tokenize=i(a+1),c.tokenize(b,c)}return"comment"}}var j="this super static final const abstract class extends external factory implements get native operator set typedef with enum throw rethrow assert break case continue default in return new deferred async await try catch finally do else for if switch while import library export part of show hide is as".split(" "),k="try catch finally do else for if switch while".split(" "),l="true false null".split(" "),m="void bool num int double dynamic var String".split(" ");a.defineMIME("application/dart",{name:"clike",keywords:b(j),blockKeywords:b(k),builtin:b(m),atoms:b(l),hooks:{"@":function(a){return a.eatWhile(/[\w\$_\.]/),"meta"},"'":function(a,b){return f("'",a,b,!1)},'"':function(a,b){return f('"',a,b,!1)},r:function(a,b){var c=a.peek();return("'"==c||'"'==c)&&f(a.next(),a,b,!0)},"}":function(a,b){return e(b)>0&&(b.tokenize=d(b),null)},"/":function(a,b){return!!a.eat("*")&&(b.tokenize=i(1),b.tokenize(a,b))}}}),a.registerHelper("hintWords","application/dart",j.concat(l).concat(m)),a.defineMode("dart",(function(b){return a.getMode(b,"application/dart")}),"clike")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../clike/clike")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../clike/clike"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=0;c<a.length;++c)b[a[c]]=!0;return b}function c(a){(a.interpolationStack||(a.interpolationStack=[])).push(a.tokenize)}function d(a){return(a.interpolationStack||(a.interpolationStack=[])).pop()}function e(a){return a.interpolationStack?a.interpolationStack.length:0}function f(a,b,d,e){function f(b,d){for(var f=!1;!b.eol();){if(!e&&!f&&"$"==b.peek())return c(d),d.tokenize=g,"string";var i=b.next();if(i==a&&!f&&(!h||b.match(a+a))){d.tokenize=null;break}f=!e&&!f&&"\\"==i}return"string"}var h=!1;if(b.eat(a)){if(!b.eat(a))return"string";h=!0}return d.tokenize=f,f(b,d)}function g(a,b){return a.eat("$"),a.eat("{")?b.tokenize=null:b.tokenize=h,null}function h(a,b){return a.eatWhile(/[\w_]/),b.tokenize=d(b),"variable"}function i(a){return function(b,c){for(var d;d=b.next();){if("*"==d&&b.eat("/")){if(1==a){c.tokenize=null;break}return c.tokenize=i(a-1),c.tokenize(b,c)}if("/"==d&&b.eat("*"))return c.tokenize=i(a+1),c.tokenize(b,c)}return"comment"}}var j="this super static final const abstract class extends external factory implements get native operator set typedef with enum throw rethrow assert break case continue default in return new deferred async await covariant try catch finally do else for if switch while import library export part of show hide is as".split(" "),k="try catch finally do else for if switch while".split(" "),l="true false null".split(" "),m="void bool num int double dynamic var String".split(" ");a.defineMIME("application/dart",{name:"clike",keywords:b(j),blockKeywords:b(k),builtin:b(m),atoms:b(l),hooks:{"@":function(a){return a.eatWhile(/[\w\$_\.]/),"meta"},"'":function(a,b){return f("'",a,b,!1)},'"':function(a,b){return f('"',a,b,!1)},r:function(a,b){var c=a.peek();return("'"==c||'"'==c)&&f(a.next(),a,b,!0)},"}":function(a,b){return e(b)>0&&(b.tokenize=d(b),null)},"/":function(a,b){return!!a.eat("*")&&(b.tokenize=i(1),b.tokenize(a,b))}}}),a.registerHelper("hintWords","application/dart",j.concat(l).concat(m)),a.defineMode("dart",(function(b){return a.getMode(b,"application/dart")}),"clike")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/elm/elm.js b/media/editors/codemirror/mode/elm/elm.js
index b31e663757364..9fcfc883717ba 100644
--- a/media/editors/codemirror/mode/elm/elm.js
+++ b/media/editors/codemirror/mode/elm/elm.js
@@ -70,7 +70,7 @@
         if (smallRE.test(ch)) {
           var isDef = source.pos === 1;
           source.eatWhile(idRE);
-          return isDef ? "variable-3" : "variable";
+          return isDef ? "type" : "variable";
         }
 
         if (digitRE.test(ch)) {
diff --git a/media/editors/codemirror/mode/elm/elm.min.js b/media/editors/codemirror/mode/elm/elm.min.js
index 5f1e50d99fd60..2635adb836f50 100644
--- a/media/editors/codemirror/mode/elm/elm.min.js
+++ b/media/editors/codemirror/mode/elm/elm.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("elm",(function(){function a(a,b,c){return b(c),c(a,b)}function b(){return function(b,e){if(b.eatWhile(n))return null;var o=b.next();if(m.test(o)){if("{"==o&&b.eat("-")){var p="comment";return b.eat("#")&&(p="meta"),a(b,e,c(p,1))}return null}if("'"==o)return b.eat("\\")?b.next():b.next(),b.eat("'")?"string":"error";if('"'==o)return a(b,e,d);if(g.test(o))return b.eatWhile(k),b.eat(".")?"qualifier":"variable-2";if(f.test(o)){var q=1===b.pos;return b.eatWhile(k),q?"variable-3":"variable"}if(h.test(o)){if("0"==o){if(b.eat(/[xX]/))return b.eatWhile(i),"integer";if(b.eat(/[oO]/))return b.eatWhile(j),"number"}b.eatWhile(h);var p="number";return b.eat(".")&&(p="number",b.eatWhile(h)),b.eat(/[eE]/)&&(p="number",b.eat(/[-+]/),b.eatWhile(h)),p}return l.test(o)?"-"==o&&b.eat(/-/)&&(b.eatWhile(/-/),!b.eat(l))?(b.skipToEnd(),"comment"):(b.eatWhile(l),"builtin"):"error"}}function c(a,d){return 0==d?b():function(e,f){for(var g=d;!e.eol();){var h=e.next();if("{"==h&&e.eat("-"))++g;else if("-"==h&&e.eat("}")&&(--g,0==g))return f(b()),a}return f(c(a,g)),a}}function d(a,c){for(;!a.eol();){var d=a.next();if('"'==d)return c(b()),"string";if("\\"==d){if(a.eol()||a.eat(n))return c(e),"string";a.eat("&")||a.next()}}return c(b()),"error"}function e(c,e){return c.eat("\\")?a(c,e,d):(c.next(),e(b()),"error")}var f=/[a-z_]/,g=/[A-Z]/,h=/[0-9]/,i=/[0-9A-Fa-f]/,j=/[0-7]/,k=/[a-z_A-Z0-9\']/,l=/[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/,m=/[(),;[\]`{}]/,n=/[ \t\v\f]/,o=(function(){for(var a={},b=["case","of","as","if","then","else","let","in","infix","infixl","infixr","type","alias","input","output","foreign","loopback","module","where","import","exposing","_","..","|",":","=","\\",'"',"->","<-"],c=b.length;c--;)a[b[c]]="keyword";return a})();return{startState:function(){return{f:b()}},copyState:function(a){return{f:a.f}},token:function(a,b){var c=b.f(a,(function(a){b.f=a})),d=a.current();return o.hasOwnProperty(d)?o[d]:c}}})),a.defineMIME("text/x-elm","elm")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("elm",(function(){function a(a,b,c){return b(c),c(a,b)}function b(){return function(b,e){if(b.eatWhile(n))return null;var o=b.next();if(m.test(o)){if("{"==o&&b.eat("-")){var p="comment";return b.eat("#")&&(p="meta"),a(b,e,c(p,1))}return null}if("'"==o)return b.eat("\\")?b.next():b.next(),b.eat("'")?"string":"error";if('"'==o)return a(b,e,d);if(g.test(o))return b.eatWhile(k),b.eat(".")?"qualifier":"variable-2";if(f.test(o)){var q=1===b.pos;return b.eatWhile(k),q?"type":"variable"}if(h.test(o)){if("0"==o){if(b.eat(/[xX]/))return b.eatWhile(i),"integer";if(b.eat(/[oO]/))return b.eatWhile(j),"number"}b.eatWhile(h);var p="number";return b.eat(".")&&(p="number",b.eatWhile(h)),b.eat(/[eE]/)&&(p="number",b.eat(/[-+]/),b.eatWhile(h)),p}return l.test(o)?"-"==o&&b.eat(/-/)&&(b.eatWhile(/-/),!b.eat(l))?(b.skipToEnd(),"comment"):(b.eatWhile(l),"builtin"):"error"}}function c(a,d){return 0==d?b():function(e,f){for(var g=d;!e.eol();){var h=e.next();if("{"==h&&e.eat("-"))++g;else if("-"==h&&e.eat("}")&&(--g,0==g))return f(b()),a}return f(c(a,g)),a}}function d(a,c){for(;!a.eol();){var d=a.next();if('"'==d)return c(b()),"string";if("\\"==d){if(a.eol()||a.eat(n))return c(e),"string";a.eat("&")||a.next()}}return c(b()),"error"}function e(c,e){return c.eat("\\")?a(c,e,d):(c.next(),e(b()),"error")}var f=/[a-z_]/,g=/[A-Z]/,h=/[0-9]/,i=/[0-9A-Fa-f]/,j=/[0-7]/,k=/[a-z_A-Z0-9\']/,l=/[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/,m=/[(),;[\]`{}]/,n=/[ \t\v\f]/,o=(function(){for(var a={},b=["case","of","as","if","then","else","let","in","infix","infixl","infixr","type","alias","input","output","foreign","loopback","module","where","import","exposing","_","..","|",":","=","\\",'"',"->","<-"],c=b.length;c--;)a[b[c]]="keyword";return a})();return{startState:function(){return{f:b()}},copyState:function(a){return{f:a.f}},token:function(a,b){var c=b.f(a,(function(a){b.f=a})),d=a.current();return o.hasOwnProperty(d)?o[d]:c}}})),a.defineMIME("text/x-elm","elm")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/factor/factor.js b/media/editors/codemirror/mode/factor/factor.js
index 86d7adf627c5a..e238c5ea64ae0 100644
--- a/media/editors/codemirror/mode/factor/factor.js
+++ b/media/editors/codemirror/mode/factor/factor.js
@@ -22,52 +22,54 @@
       {regex: /#?!.*/, token: "comment"},
       // strings """, multiline --> state
       {regex: /"""/, token: "string", next: "string3"},
-      {regex: /"/, token: "string", next: "string"},
+      {regex: /(STRING:)(\s)/, token: ["keyword", null], next: "string2"},
+      {regex: /\S*?"/, token: "string", next: "string"},
       // numbers: dec, hex, unicode, bin, fractional, complex
-      {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+      {regex: /(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\-?\d+.?\d*)(?=\s)/, token: "number"},
       //{regex: /[+-]?/} //fractional
       // definition: defining word, defined word, etc
-      {regex: /(\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "keyword"], next: "stack"},
+      {regex: /((?:GENERIC)|\:?\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "bracket"], next: "stack"},
+      // method definition: defining word, type, defined word, etc
+      {regex: /(M\:)(\s+)(\S+)(\s+)(\S+)/, token: ["keyword", null, "def", null, "tag"]},
       // vocabulary using --> state
       {regex: /USING\:/, token: "keyword", next: "vocabulary"},
       // vocabulary definition/use
-      {regex: /(USE\:|IN\:)(\s+)(\S+)/, token: ["keyword", null, "variable-2"]},
-      // <constructors>
-      {regex: /<\S+>/, token: "builtin"},
+      {regex: /(USE\:|IN\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "tag"]},
+      // definition: a defining word, defined word
+      {regex: /(\S+\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "def"]},
       // "keywords", incl. ; t f . [ ] { } defining words
-      {regex: /;|t|f|if|\.|\[|\]|\{|\}|MAIN:/, token: "keyword"},
+      {regex: /(?:;|\\|t|f|if|loop|while|until|do|PRIVATE>|<PRIVATE|\.|\S*\[|\]|\S*\{|\})(?=\s|$)/, token: "keyword"},
+      // <constructors> and the like
+      {regex: /\S+[\)>\.\*\?]+(?=\s|$)/, token: "builtin"},
+      {regex: /[\)><]+\S+(?=\s|$)/, token: "builtin"},
+      // operators
+      {regex: /(?:[\+\-\=\/\*<>])(?=\s|$)/, token: "keyword"},
       // any id (?)
       {regex: /\S+/, token: "variable"},
-
-      {
-        regex: /./,
-        token: null
-      }
+      {regex: /\s+|./, token: null}
     ],
     vocabulary: [
       {regex: /;/, token: "keyword", next: "start"},
-      {regex: /\S+/, token: "variable-2"},
-      {
-        regex: /./,
-        token: null
-      }
+      {regex: /\S+/, token: "tag"},
+      {regex: /\s+|./, token: null}
     ],
     string: [
       {regex: /(?:[^\\]|\\.)*?"/, token: "string", next: "start"},
       {regex: /.*/, token: "string"}
     ],
+    string2: [
+      {regex: /^;/, token: "keyword", next: "start"},
+      {regex: /.*/, token: "string"}
+    ],
     string3: [
       {regex: /(?:[^\\]|\\.)*?"""/, token: "string", next: "start"},
       {regex: /.*/, token: "string"}
     ],
     stack: [
-      {regex: /\)/, token: "meta", next: "start"},
-      {regex: /--/, token: "meta"},
-      {regex: /\S+/, token: "variable-3"},
-      {
-        regex: /./,
-        token: null
-      }
+      {regex: /\)/, token: "bracket", next: "start"},
+      {regex: /--/, token: "bracket"},
+      {regex: /\S+/, token: "meta"},
+      {regex: /\s+|./, token: null}
     ],
     // The meta property contains global information about the mode. It
     // can contain properties like lineComment, which are supported by
diff --git a/media/editors/codemirror/mode/factor/factor.min.js b/media/editors/codemirror/mode/factor/factor.min.js
index 13b438885480d..9bfe380de5836 100644
--- a/media/editors/codemirror/mode/factor/factor.min.js
+++ b/media/editors/codemirror/mode/factor/factor.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("factor",{start:[{regex:/#?!.*/,token:"comment"},{regex:/"""/,token:"string",next:"string3"},{regex:/"/,token:"string",next:"string"},{regex:/(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/,token:"number"},{regex:/(\:)(\s+)(\S+)(\s+)(\()/,token:["keyword",null,"def",null,"keyword"],next:"stack"},{regex:/USING\:/,token:"keyword",next:"vocabulary"},{regex:/(USE\:|IN\:)(\s+)(\S+)/,token:["keyword",null,"variable-2"]},{regex:/<\S+>/,token:"builtin"},{regex:/;|t|f|if|\.|\[|\]|\{|\}|MAIN:/,token:"keyword"},{regex:/\S+/,token:"variable"},{regex:/./,token:null}],vocabulary:[{regex:/;/,token:"keyword",next:"start"},{regex:/\S+/,token:"variable-2"},{regex:/./,token:null}],string:[{regex:/(?:[^\\]|\\.)*?"/,token:"string",next:"start"},{regex:/.*/,token:"string"}],string3:[{regex:/(?:[^\\]|\\.)*?"""/,token:"string",next:"start"},{regex:/.*/,token:"string"}],stack:[{regex:/\)/,token:"meta",next:"start"},{regex:/--/,token:"meta"},{regex:/\S+/,token:"variable-3"},{regex:/./,token:null}],meta:{dontIndentStates:["start","vocabulary","string","string3","stack"],lineComment:["!","#!"]}}),a.defineMIME("text/x-factor","factor")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("factor",{start:[{regex:/#?!.*/,token:"comment"},{regex:/"""/,token:"string",next:"string3"},{regex:/(STRING:)(\s)/,token:["keyword",null],next:"string2"},{regex:/\S*?"/,token:"string",next:"string"},{regex:/(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\-?\d+.?\d*)(?=\s)/,token:"number"},{regex:/((?:GENERIC)|\:?\:)(\s+)(\S+)(\s+)(\()/,token:["keyword",null,"def",null,"bracket"],next:"stack"},{regex:/(M\:)(\s+)(\S+)(\s+)(\S+)/,token:["keyword",null,"def",null,"tag"]},{regex:/USING\:/,token:"keyword",next:"vocabulary"},{regex:/(USE\:|IN\:)(\s+)(\S+)(?=\s|$)/,token:["keyword",null,"tag"]},{regex:/(\S+\:)(\s+)(\S+)(?=\s|$)/,token:["keyword",null,"def"]},{regex:/(?:;|\\|t|f|if|loop|while|until|do|PRIVATE>|<PRIVATE|\.|\S*\[|\]|\S*\{|\})(?=\s|$)/,token:"keyword"},{regex:/\S+[\)>\.\*\?]+(?=\s|$)/,token:"builtin"},{regex:/[\)><]+\S+(?=\s|$)/,token:"builtin"},{regex:/(?:[\+\-\=\/\*<>])(?=\s|$)/,token:"keyword"},{regex:/\S+/,token:"variable"},{regex:/\s+|./,token:null}],vocabulary:[{regex:/;/,token:"keyword",next:"start"},{regex:/\S+/,token:"tag"},{regex:/\s+|./,token:null}],string:[{regex:/(?:[^\\]|\\.)*?"/,token:"string",next:"start"},{regex:/.*/,token:"string"}],string2:[{regex:/^;/,token:"keyword",next:"start"},{regex:/.*/,token:"string"}],string3:[{regex:/(?:[^\\]|\\.)*?"""/,token:"string",next:"start"},{regex:/.*/,token:"string"}],stack:[{regex:/\)/,token:"bracket",next:"start"},{regex:/--/,token:"bracket"},{regex:/\S+/,token:"meta"},{regex:/\s+|./,token:null}],meta:{dontIndentStates:["start","vocabulary","string","string3","stack"],lineComment:["!","#!"]}}),a.defineMIME("text/x-factor","factor")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/gfm/gfm.js b/media/editors/codemirror/mode/gfm/gfm.js
index 23126ff465429..aac04812d8422 100644
--- a/media/editors/codemirror/mode/gfm/gfm.js
+++ b/media/editors/codemirror/mode/gfm/gfm.js
@@ -115,7 +115,8 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var markdownConfig = {
     taskLists: true,
     fencedCodeBlocks: '```',
-    strikethrough: true
+    strikethrough: true,
+    emoji: true
   };
   for (var attr in modeConfig) {
     markdownConfig[attr] = modeConfig[attr];
diff --git a/media/editors/codemirror/mode/gfm/gfm.min.js b/media/editors/codemirror/mode/gfm/gfm.min.js
index 13348e48743cc..5a2ad6bd2ffa6 100644
--- a/media/editors/codemirror/mode/gfm/gfm.min.js
+++ b/media/editors/codemirror/mode/gfm/gfm.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../markdown/markdown"),require("../../addon/mode/overlay")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../markdown/markdown","../../addon/mode/overlay"],a):a(CodeMirror)})((function(a){"use strict";var b=/^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i;a.defineMode("gfm",(function(c,d){function e(a){return a.code=!1,null}var f=0,g={startState:function(){return{code:!1,codeBlock:!1,ateSpace:!1}},copyState:function(a){return{code:a.code,codeBlock:a.codeBlock,ateSpace:a.ateSpace}},token:function(a,c){if(c.combineTokens=null,c.codeBlock)return a.match(/^```+/)?(c.codeBlock=!1,null):(a.skipToEnd(),null);if(a.sol()&&(c.code=!1),a.sol()&&a.match(/^```+/))return a.skipToEnd(),c.codeBlock=!0,null;if("`"===a.peek()){a.next();var e=a.pos;a.eatWhile("`");var g=1+a.pos-e;return c.code?g===f&&(c.code=!1):(f=g,c.code=!0),null}if(c.code)return a.next(),null;if(a.eatSpace())return c.ateSpace=!0,null;if((a.sol()||c.ateSpace)&&(c.ateSpace=!1,d.gitHubSpice!==!1)){if(a.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/))return c.combineTokens=!0,"link";if(a.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/))return c.combineTokens=!0,"link"}return a.match(b)&&"]("!=a.string.slice(a.start-2,a.start)&&(0==a.start||/\W/.test(a.string.charAt(a.start-1)))?(c.combineTokens=!0,"link"):(a.next(),null)},blankLine:e},h={taskLists:!0,fencedCodeBlocks:"```",strikethrough:!0};for(var i in d)h[i]=d[i];return h.name="markdown",a.overlayMode(a.getMode(c,h),g)}),"markdown"),a.defineMIME("text/x-gfm","gfm")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../markdown/markdown"),require("../../addon/mode/overlay")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../markdown/markdown","../../addon/mode/overlay"],a):a(CodeMirror)})((function(a){"use strict";var b=/^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i;a.defineMode("gfm",(function(c,d){function e(a){return a.code=!1,null}var f=0,g={startState:function(){return{code:!1,codeBlock:!1,ateSpace:!1}},copyState:function(a){return{code:a.code,codeBlock:a.codeBlock,ateSpace:a.ateSpace}},token:function(a,c){if(c.combineTokens=null,c.codeBlock)return a.match(/^```+/)?(c.codeBlock=!1,null):(a.skipToEnd(),null);if(a.sol()&&(c.code=!1),a.sol()&&a.match(/^```+/))return a.skipToEnd(),c.codeBlock=!0,null;if("`"===a.peek()){a.next();var e=a.pos;a.eatWhile("`");var g=1+a.pos-e;return c.code?g===f&&(c.code=!1):(f=g,c.code=!0),null}if(c.code)return a.next(),null;if(a.eatSpace())return c.ateSpace=!0,null;if((a.sol()||c.ateSpace)&&(c.ateSpace=!1,d.gitHubSpice!==!1)){if(a.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/))return c.combineTokens=!0,"link";if(a.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/))return c.combineTokens=!0,"link"}return a.match(b)&&"]("!=a.string.slice(a.start-2,a.start)&&(0==a.start||/\W/.test(a.string.charAt(a.start-1)))?(c.combineTokens=!0,"link"):(a.next(),null)},blankLine:e},h={taskLists:!0,fencedCodeBlocks:"```",strikethrough:!0,emoji:!0};for(var i in d)h[i]=d[i];return h.name="markdown",a.overlayMode(a.getMode(c,h),g)}),"markdown"),a.defineMIME("text/x-gfm","gfm")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/go/go.js b/media/editors/codemirror/mode/go/go.js
index 8896b57fb99b4..36131f10fe91c 100644
--- a/media/editors/codemirror/mode/go/go.js
+++ b/media/editors/codemirror/mode/go/go.js
@@ -155,14 +155,14 @@ CodeMirror.defineMode("go", function(config) {
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
       else if (curPunc == "case") ctx.type = "case";
-      else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state);
+      else if (curPunc == "}" && ctx.type == "}") popContext(state);
       else if (curPunc == ctx.type) popContext(state);
       state.startOfLine = false;
       return style;
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
         state.context.type = "}";
diff --git a/media/editors/codemirror/mode/go/go.min.js b/media/editors/codemirror/mode/go/go.min.js
index a9e3ccec87d9e..0bf4182f24dc3 100644
--- a/media/editors/codemirror/mode/go/go.min.js
+++ b/media/editors/codemirror/mode/go/go.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("go",(function(a){function b(a,b){var e=a.next();if('"'==e||"'"==e||"`"==e)return b.tokenize=c(e),b.tokenize(a,b);if(/[\d\.]/.test(e))return"."==e?a.match(/^[0-9]+([eE][\-+]?[0-9]+)?/):"0"==e?a.match(/^[xX][0-9a-fA-F]+/)||a.match(/^0[0-7]+/):a.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/),"number";if(/[\[\]{}\(\),;\:\.]/.test(e))return h=e,null;if("/"==e){if(a.eat("*"))return b.tokenize=d,d(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(l.test(e))return a.eatWhile(l),"operator";a.eatWhile(/[\w\$_\xa1-\uffff]/);var f=a.current();return j.propertyIsEnumerable(f)?("case"!=f&&"default"!=f||(h="case"),"keyword"):k.propertyIsEnumerable(f)?"atom":"variable"}function c(a){return function(c,d){for(var e,f=!1,g=!1;null!=(e=c.next());){if(e==a&&!f){g=!0;break}f=!f&&"`"!=a&&"\\"==e}return(g||!f&&"`"!=a)&&(d.tokenize=b),"string"}}function d(a,c){for(var d,e=!1;d=a.next();){if("/"==d&&e){c.tokenize=b;break}e="*"==d}return"comment"}function e(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function f(a,b,c){return a.context=new e(a.indented,b,c,null,a.context)}function g(a){if(a.context.prev){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}}var h,i=a.indentUnit,j={break:!0,case:!0,chan:!0,const:!0,continue:!0,default:!0,defer:!0,else:!0,fallthrough:!0,for:!0,func:!0,go:!0,goto:!0,if:!0,import:!0,interface:!0,map:!0,package:!0,range:!0,return:!0,select:!0,struct:!0,switch:!0,type:!0,var:!0,bool:!0,byte:!0,complex64:!0,complex128:!0,float32:!0,float64:!0,int8:!0,int16:!0,int32:!0,int64:!0,string:!0,uint8:!0,uint16:!0,uint32:!0,uint64:!0,int:!0,uint:!0,uintptr:!0,error:!0,rune:!0},k={true:!0,false:!0,iota:!0,nil:!0,append:!0,cap:!0,close:!0,complex:!0,copy:!0,delete:!0,imag:!0,len:!0,make:!0,new:!0,panic:!0,print:!0,println:!0,real:!0,recover:!0},l=/[+\-*&^%:=<>!|\/]/;return{startState:function(a){return{tokenize:null,context:new e((a||0)-i,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,c){var d=c.context;if(a.sol()&&(null==d.align&&(d.align=!1),c.indented=a.indentation(),c.startOfLine=!0,"case"==d.type&&(d.type="}")),a.eatSpace())return null;h=null;var e=(c.tokenize||b)(a,c);return"comment"==e?e:(null==d.align&&(d.align=!0),"{"==h?f(c,a.column(),"}"):"["==h?f(c,a.column(),"]"):"("==h?f(c,a.column(),")"):"case"==h?d.type="case":"}"==h&&"}"==d.type?d=g(c):h==d.type&&g(c),c.startOfLine=!1,e)},indent:function(a,c){if(a.tokenize!=b&&null!=a.tokenize)return 0;var d=a.context,e=c&&c.charAt(0);if("case"==d.type&&/^(?:case|default)\b/.test(c))return a.context.type="}",d.indented;var f=e==d.type;return d.align?d.column+(f?0:1):d.indented+(f?0:i)},electricChars:"{}):",closeBrackets:"()[]{}''\"\"``",fold:"brace",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-go","go")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("go",(function(b){function c(a,b){var c=a.next();if('"'==c||"'"==c||"`"==c)return b.tokenize=d(c),b.tokenize(a,b);if(/[\d\.]/.test(c))return"."==c?a.match(/^[0-9]+([eE][\-+]?[0-9]+)?/):"0"==c?a.match(/^[xX][0-9a-fA-F]+/)||a.match(/^0[0-7]+/):a.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/),"number";if(/[\[\]{}\(\),;\:\.]/.test(c))return i=c,null;if("/"==c){if(a.eat("*"))return b.tokenize=e,e(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(m.test(c))return a.eatWhile(m),"operator";a.eatWhile(/[\w\$_\xa1-\uffff]/);var f=a.current();return k.propertyIsEnumerable(f)?("case"!=f&&"default"!=f||(i="case"),"keyword"):l.propertyIsEnumerable(f)?"atom":"variable"}function d(a){return function(b,d){for(var e,f=!1,g=!1;null!=(e=b.next());){if(e==a&&!f){g=!0;break}f=!f&&"`"!=a&&"\\"==e}return(g||!f&&"`"!=a)&&(d.tokenize=c),"string"}}function e(a,b){for(var d,e=!1;d=a.next();){if("/"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function f(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function g(a,b,c){return a.context=new f(a.indented,b,c,null,a.context)}function h(a){if(a.context.prev){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}}var i,j=b.indentUnit,k={break:!0,case:!0,chan:!0,const:!0,continue:!0,default:!0,defer:!0,else:!0,fallthrough:!0,for:!0,func:!0,go:!0,goto:!0,if:!0,import:!0,interface:!0,map:!0,package:!0,range:!0,return:!0,select:!0,struct:!0,switch:!0,type:!0,var:!0,bool:!0,byte:!0,complex64:!0,complex128:!0,float32:!0,float64:!0,int8:!0,int16:!0,int32:!0,int64:!0,string:!0,uint8:!0,uint16:!0,uint32:!0,uint64:!0,int:!0,uint:!0,uintptr:!0,error:!0,rune:!0},l={true:!0,false:!0,iota:!0,nil:!0,append:!0,cap:!0,close:!0,complex:!0,copy:!0,delete:!0,imag:!0,len:!0,make:!0,new:!0,panic:!0,print:!0,println:!0,real:!0,recover:!0},m=/[+\-*&^%:=<>!|\/]/;return{startState:function(a){return{tokenize:null,context:new f((a||0)-j,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var d=b.context;if(a.sol()&&(null==d.align&&(d.align=!1),b.indented=a.indentation(),b.startOfLine=!0,"case"==d.type&&(d.type="}")),a.eatSpace())return null;i=null;var e=(b.tokenize||c)(a,b);return"comment"==e?e:(null==d.align&&(d.align=!0),"{"==i?g(b,a.column(),"}"):"["==i?g(b,a.column(),"]"):"("==i?g(b,a.column(),")"):"case"==i?d.type="case":"}"==i&&"}"==d.type?h(b):i==d.type&&h(b),b.startOfLine=!1,e)},indent:function(b,d){if(b.tokenize!=c&&null!=b.tokenize)return a.Pass;var e=b.context,f=d&&d.charAt(0);if("case"==e.type&&/^(?:case|default)\b/.test(d))return b.context.type="}",e.indented;var g=f==e.type;return e.align?e.column+(g?0:1):e.indented+(g?0:j)},electricChars:"{}):",closeBrackets:"()[]{}''\"\"``",fold:"brace",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-go","go")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/groovy/groovy.js b/media/editors/codemirror/mode/groovy/groovy.js
index daa798722ea6d..0df97dd0b7f4b 100644
--- a/media/editors/codemirror/mode/groovy/groovy.js
+++ b/media/editors/codemirror/mode/groovy/groovy.js
@@ -21,9 +21,9 @@ CodeMirror.defineMode("groovy", function(config) {
     "abstract as assert boolean break byte case catch char class const continue def default " +
     "do double else enum extends final finally float for goto if implements import in " +
     "instanceof int interface long native new package private protected public return " +
-    "short static strictfp super switch synchronized threadsafe throw throws transient " +
+    "short static strictfp super switch synchronized threadsafe throw throws trait transient " +
     "try void volatile while");
-  var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
+  var blockKeywords = words("catch class def do else enum finally for if interface switch trait try while");
   var standaloneKeywords = words("return break continue");
   var atoms = words("null true false this");
 
diff --git a/media/editors/codemirror/mode/groovy/groovy.min.js b/media/editors/codemirror/mode/groovy/groovy.min.js
index 42752bbab987c..bb9abef51bc33 100644
--- a/media/editors/codemirror/mode/groovy/groovy.min.js
+++ b/media/editors/codemirror/mode/groovy/groovy.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("groovy",(function(b){function c(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function d(a,b){var c=a.next();if('"'==c||"'"==c)return e(c,a,b);if(/[\[\]{}\(\),;\:\.]/.test(c))return l=c,null;if(/\d/.test(c))return a.eatWhile(/[\w\.]/),a.eat(/eE/)&&(a.eat(/\+\-/),a.eatWhile(/\d/)),"number";if("/"==c){if(a.eat("*"))return b.tokenize.push(g),g(a,b);if(a.eat("/"))return a.skipToEnd(),"comment";if(h(b.lastToken,!1))return e(c,a,b)}if("-"==c&&a.eat(">"))return l="->",null;if(/[+\-*&%=<>!?|\/~]/.test(c))return a.eatWhile(/[+\-*&%=<>|~]/),"operator";if(a.eatWhile(/[\w\$_]/),"@"==c)return a.eatWhile(/[\w\$_\.]/),"meta";if("."==b.lastToken)return"property";if(a.eat(":"))return l="proplabel","property";var d=a.current();return p.propertyIsEnumerable(d)?"atom":m.propertyIsEnumerable(d)?(n.propertyIsEnumerable(d)?l="newstatement":o.propertyIsEnumerable(d)&&(l="standalone"),"keyword"):"variable"}function e(a,b,c){function d(b,c){for(var d,g=!1,h=!e;null!=(d=b.next());){if(d==a&&!g){if(!e)break;if(b.match(a+a)){h=!0;break}}if('"'==a&&"$"==d&&!g&&b.eat("{"))return c.tokenize.push(f()),"string";g=!g&&"\\"==d}return h&&c.tokenize.pop(),"string"}var e=!1;if("/"!=a&&b.eat(a)){if(!b.eat(a))return"string";e=!0}return c.tokenize.push(d),d(b,c)}function f(){function a(a,c){if("}"==a.peek()){if(b--,0==b)return c.tokenize.pop(),c.tokenize[c.tokenize.length-1](a,c)}else"{"==a.peek()&&b++;return d(a,c)}var b=1;return a.isBase=!0,a}function g(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize.pop();break}d="*"==c}return"comment"}function h(a,b){return!a||"operator"==a||"->"==a||/[\.\[\{\(,;:]/.test(a)||"newstatement"==a||"keyword"==a||"proplabel"==a||"standalone"==a&&!b}function i(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function j(a,b,c){return a.context=new i(a.indented,b,c,null,a.context)}function k(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var l,m=c("abstract as assert boolean break byte case catch char class const continue def default do double else enum extends final finally float for goto if implements import in instanceof int interface long native new package private protected public return short static strictfp super switch synchronized threadsafe throw throws transient try void volatile while"),n=c("catch class do else finally for if switch try while enum interface def"),o=c("return break continue"),p=c("null true false this");return d.isBase=!0,{startState:function(a){return{tokenize:[d],context:new i((a||0)-b.indentUnit,0,"top",!1),indented:0,startOfLine:!0,lastToken:null}},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0,"statement"!=c.type||h(b.lastToken,!0)||(k(b),c=b.context)),a.eatSpace())return null;l=null;var d=b.tokenize[b.tokenize.length-1](a,b);if("comment"==d)return d;if(null==c.align&&(c.align=!0),";"!=l&&":"!=l||"statement"!=c.type)if("->"==l&&"statement"==c.type&&"}"==c.prev.type)k(b),b.context.align=!1;else if("{"==l)j(b,a.column(),"}");else if("["==l)j(b,a.column(),"]");else if("("==l)j(b,a.column(),")");else if("}"==l){for(;"statement"==c.type;)c=k(b);for("}"==c.type&&(c=k(b));"statement"==c.type;)c=k(b)}else l==c.type?k(b):("}"==c.type||"top"==c.type||"statement"==c.type&&"newstatement"==l)&&j(b,a.column(),"statement");else k(b);return b.startOfLine=!1,b.lastToken=l||d,d},indent:function(c,d){if(!c.tokenize[c.tokenize.length-1].isBase)return a.Pass;var e=d&&d.charAt(0),f=c.context;"statement"!=f.type||h(c.lastToken,!0)||(f=f.prev);var g=e==f.type;return"statement"==f.type?f.indented+("{"==e?0:b.indentUnit):f.align?f.column+(g?0:1):f.indented+(g?0:b.indentUnit)},electricChars:"{}",closeBrackets:{triples:"'\""},fold:"brace"}})),a.defineMIME("text/x-groovy","groovy")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("groovy",(function(b){function c(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function d(a,b){var c=a.next();if('"'==c||"'"==c)return e(c,a,b);if(/[\[\]{}\(\),;\:\.]/.test(c))return l=c,null;if(/\d/.test(c))return a.eatWhile(/[\w\.]/),a.eat(/eE/)&&(a.eat(/\+\-/),a.eatWhile(/\d/)),"number";if("/"==c){if(a.eat("*"))return b.tokenize.push(g),g(a,b);if(a.eat("/"))return a.skipToEnd(),"comment";if(h(b.lastToken,!1))return e(c,a,b)}if("-"==c&&a.eat(">"))return l="->",null;if(/[+\-*&%=<>!?|\/~]/.test(c))return a.eatWhile(/[+\-*&%=<>|~]/),"operator";if(a.eatWhile(/[\w\$_]/),"@"==c)return a.eatWhile(/[\w\$_\.]/),"meta";if("."==b.lastToken)return"property";if(a.eat(":"))return l="proplabel","property";var d=a.current();return p.propertyIsEnumerable(d)?"atom":m.propertyIsEnumerable(d)?(n.propertyIsEnumerable(d)?l="newstatement":o.propertyIsEnumerable(d)&&(l="standalone"),"keyword"):"variable"}function e(a,b,c){function d(b,c){for(var d,g=!1,h=!e;null!=(d=b.next());){if(d==a&&!g){if(!e)break;if(b.match(a+a)){h=!0;break}}if('"'==a&&"$"==d&&!g&&b.eat("{"))return c.tokenize.push(f()),"string";g=!g&&"\\"==d}return h&&c.tokenize.pop(),"string"}var e=!1;if("/"!=a&&b.eat(a)){if(!b.eat(a))return"string";e=!0}return c.tokenize.push(d),d(b,c)}function f(){function a(a,c){if("}"==a.peek()){if(b--,0==b)return c.tokenize.pop(),c.tokenize[c.tokenize.length-1](a,c)}else"{"==a.peek()&&b++;return d(a,c)}var b=1;return a.isBase=!0,a}function g(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize.pop();break}d="*"==c}return"comment"}function h(a,b){return!a||"operator"==a||"->"==a||/[\.\[\{\(,;:]/.test(a)||"newstatement"==a||"keyword"==a||"proplabel"==a||"standalone"==a&&!b}function i(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function j(a,b,c){return a.context=new i(a.indented,b,c,null,a.context)}function k(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var l,m=c("abstract as assert boolean break byte case catch char class const continue def default do double else enum extends final finally float for goto if implements import in instanceof int interface long native new package private protected public return short static strictfp super switch synchronized threadsafe throw throws trait transient try void volatile while"),n=c("catch class def do else enum finally for if interface switch trait try while"),o=c("return break continue"),p=c("null true false this");return d.isBase=!0,{startState:function(a){return{tokenize:[d],context:new i((a||0)-b.indentUnit,0,"top",!1),indented:0,startOfLine:!0,lastToken:null}},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0,"statement"!=c.type||h(b.lastToken,!0)||(k(b),c=b.context)),a.eatSpace())return null;l=null;var d=b.tokenize[b.tokenize.length-1](a,b);if("comment"==d)return d;if(null==c.align&&(c.align=!0),";"!=l&&":"!=l||"statement"!=c.type)if("->"==l&&"statement"==c.type&&"}"==c.prev.type)k(b),b.context.align=!1;else if("{"==l)j(b,a.column(),"}");else if("["==l)j(b,a.column(),"]");else if("("==l)j(b,a.column(),")");else if("}"==l){for(;"statement"==c.type;)c=k(b);for("}"==c.type&&(c=k(b));"statement"==c.type;)c=k(b)}else l==c.type?k(b):("}"==c.type||"top"==c.type||"statement"==c.type&&"newstatement"==l)&&j(b,a.column(),"statement");else k(b);return b.startOfLine=!1,b.lastToken=l||d,d},indent:function(c,d){if(!c.tokenize[c.tokenize.length-1].isBase)return a.Pass;var e=d&&d.charAt(0),f=c.context;"statement"!=f.type||h(c.lastToken,!0)||(f=f.prev);var g=e==f.type;return"statement"==f.type?f.indented+("{"==e?0:b.indentUnit):f.align?f.column+(g?0:1):f.indented+(g?0:b.indentUnit)},electricChars:"{}",closeBrackets:{triples:"'\""},fold:"brace"}})),a.defineMIME("text/x-groovy","groovy")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/haxe/haxe.js b/media/editors/codemirror/mode/haxe/haxe.js
index a9573dd71b598..d159d082e96b8 100644
--- a/media/editors/codemirror/mode/haxe/haxe.js
+++ b/media/editors/codemirror/mode/haxe/haxe.js
@@ -485,7 +485,7 @@ CodeMirror.defineMode("hxml", function () {
 
       if (state.inString == false && ch == "'") {
         state.inString = true;
-        ch = stream.next();
+        stream.next();
       }
 
       if (state.inString == true) {
diff --git a/media/editors/codemirror/mode/haxe/haxe.min.js b/media/editors/codemirror/mode/haxe/haxe.min.js
index 5c6cd30a21731..edadfa62351a9 100644
--- a/media/editors/codemirror/mode/haxe/haxe.min.js
+++ b/media/editors/codemirror/mode/haxe/haxe.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("haxe",(function(a,b){function c(a){return{type:a,style:"keyword"}}function d(a,b,c){return b.tokenize=c,c(a,b)}function e(a,b){for(var c,d=!1;null!=(c=a.next());){if(c==b&&!d)return!0;d=!d&&"\\"==c}}function f(a,b,c){return U=a,V=c,b}function g(a,b){var c=a.next();if('"'==c||"'"==c)return d(a,b,h(c));if(/[\[\]{}\(\),;\:\.]/.test(c))return f(c);if("0"==c&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),f("number","number");if(/\d/.test(c)||"-"==c&&a.eat(/\d/))return a.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/),f("number","number");if(b.reAllowed&&"~"==c&&a.eat(/\//))return e(a,"/"),a.eatWhile(/[gimsu]/),f("regexp","string-2");if("/"==c)return a.eat("*")?d(a,b,i):a.eat("/")?(a.skipToEnd(),f("comment","comment")):(a.eatWhile(ca),f("operator",null,a.current()));if("#"==c)return a.skipToEnd(),f("conditional","meta");if("@"==c)return a.eat(/:/),a.eatWhile(/[\w_]/),f("metadata","meta");if(ca.test(c))return a.eatWhile(ca),f("operator",null,a.current());var g;if(/[A-Z]/.test(c))return a.eatWhile(/[\w_<>]/),g=a.current(),f("type","variable-3",g);a.eatWhile(/[\w_]/);var g=a.current(),j=ba.propertyIsEnumerable(g)&&ba[g];return j&&b.kwAllowed?f(j.type,j.style,g):f("variable","variable",g)}function h(a){return function(b,c){return e(b,a)&&(c.tokenize=g),f("string","string")}}function i(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=g;break}d="*"==c}return f("comment","comment")}function j(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.prev=e,this.info=f,null!=d&&(this.align=d)}function k(a,b){for(var c=a.localVars;c;c=c.next)if(c.name==b)return!0}function l(a,b,c,d,e){var f=a.cc;for(ea.state=a,ea.stream=e,ea.marked=null,ea.cc=f,a.lexical.hasOwnProperty("align")||(a.lexical.align=!0);;){var g=f.length?f.pop():x;if(g(c,d)){for(;f.length&&f[f.length-1].lex;)f.pop()();return ea.marked?ea.marked:"variable"==c&&k(a,d)?"variable-2":"variable"==c&&m(a,d)?"variable-3":b}}}function m(a,b){if(/[a-z]/.test(b.charAt(0)))return!1;for(var c=a.importedtypes.length,d=0;d<c;d++)if(a.importedtypes[d]==b)return!0}function n(a){for(var b=ea.state,c=b.importedtypes;c;c=c.next)if(c.name==a)return;b.importedtypes={name:a,next:b.importedtypes}}function o(){for(var a=arguments.length-1;a>=0;a--)ea.cc.push(arguments[a])}function p(){return o.apply(null,arguments),!0}function q(a,b){for(var c=b;c;c=c.next)if(c.name==a)return!0;return!1}function r(a){var b=ea.state;if(b.context){if(ea.marked="def",q(a,b.localVars))return;b.localVars={name:a,next:b.localVars}}else if(b.globalVars){if(q(a,b.globalVars))return;b.globalVars={name:a,next:b.globalVars}}}function s(){ea.state.context||(ea.state.localVars=fa),ea.state.context={prev:ea.state.context,vars:ea.state.localVars}}function t(){ea.state.localVars=ea.state.context.vars,ea.state.context=ea.state.context.prev}function u(a,b){var c=function(){var c=ea.state;c.lexical=new j(c.indented,ea.stream.column(),a,null,c.lexical,b)};return c.lex=!0,c}function v(){var a=ea.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function w(a){function b(c){return c==a?p():";"==a?o():p(b)}return b}function x(a){return"@"==a?p(C):"var"==a?p(u("vardef"),L,w(";"),v):"keyword a"==a?p(u("form"),y,x,v):"keyword b"==a?p(u("form"),x,v):"{"==a?p(u("}"),s,K,v,t):";"==a?p():"attribute"==a?p(B):"function"==a?p(P):"for"==a?p(u("form"),w("("),u(")"),N,w(")"),v,x,v):"variable"==a?p(u("stat"),G):"switch"==a?p(u("form"),y,u("}","switch"),w("{"),K,v,v):"case"==a?p(y,w(":")):"default"==a?p(w(":")):"catch"==a?p(u("form"),s,w("("),T,w(")"),x,v,t):"import"==a?p(E,w(";")):"typedef"==a?p(F):o(u("stat"),y,w(";"),v)}function y(a){return da.hasOwnProperty(a)?p(A):"type"==a?p(A):"function"==a?p(P):"keyword c"==a?p(z):"("==a?p(u(")"),z,w(")"),v,A):"operator"==a?p(y):"["==a?p(u("]"),J(z,"]"),v,A):"{"==a?p(u("}"),J(I,"}"),v,A):p()}function z(a){return a.match(/[;\}\)\],]/)?o():o(y)}function A(a,b){if("operator"==a&&/\+\+|--/.test(b))return p(A);if("operator"==a||":"==a)return p(y);if(";"!=a)return"("==a?p(u(")"),J(y,")"),v,A):"."==a?p(H,A):"["==a?p(u("]"),y,w("]"),v,A):void 0}function B(a){return"attribute"==a?p(B):"function"==a?p(P):"var"==a?p(L):void 0}function C(a){return":"==a?p(C):"variable"==a?p(C):"("==a?p(u(")"),J(D,")"),v,x):void 0}function D(a){if("variable"==a)return p()}function E(a,b){return"variable"==a&&/[A-Z]/.test(b.charAt(0))?(n(b),p()):"variable"==a||"property"==a||"."==a||"*"==b?p(E):void 0}function F(a,b){return"variable"==a&&/[A-Z]/.test(b.charAt(0))?(n(b),p()):"type"==a&&/[A-Z]/.test(b.charAt(0))?p():void 0}function G(a){return":"==a?p(v,x):o(A,w(";"),v)}function H(a){if("variable"==a)return ea.marked="property",p()}function I(a){if("variable"==a&&(ea.marked="property"),da.hasOwnProperty(a))return p(w(":"),y)}function J(a,b){function c(d){return","==d?p(a,c):d==b?p():p(w(b))}return function(d){return d==b?p():o(a,c)}}function K(a){return"}"==a?p():o(x,K)}function L(a,b){return"variable"==a?(r(b),p(Q,M)):p()}function M(a,b){return"="==b?p(y,M):","==a?p(L):void 0}function N(a,b){return"variable"==a?(r(b),p(O,y)):o()}function O(a,b){if("in"==b)return p()}function P(a,b){return"variable"==a||"type"==a?(r(b),p(P)):"new"==b?p(P):"("==a?p(u(")"),s,J(T,")"),v,Q,x,t):void 0}function Q(a){if(":"==a)return p(R)}function R(a){return"type"==a?p():"variable"==a?p():"{"==a?p(u("}"),J(S,"}"),v):void 0}function S(a){if("variable"==a)return p(Q)}function T(a,b){if("variable"==a)return r(b),p(Q)}var U,V,W=a.indentUnit,X=c("keyword a"),Y=c("keyword b"),Z=c("keyword c"),$=c("operator"),_={type:"atom",style:"atom"},aa={type:"attribute",style:"attribute"},U=c("typedef"),ba={if:X,while:X,else:Y,do:Y,try:Y,return:Z,break:Z,continue:Z,new:Z,throw:Z,var:c("var"),inline:aa,static:aa,using:c("import"),public:aa,private:aa,cast:c("cast"),import:c("import"),macro:c("macro"),function:c("function"),catch:c("catch"),untyped:c("untyped"),callback:c("cb"),for:c("for"),switch:c("switch"),case:c("case"),default:c("default"),in:$,never:c("property_access"),trace:c("trace"),class:U,abstract:U,enum:U,interface:U,typedef:U,extends:U,implements:U,dynamic:U,true:_,false:_,null:_},ca=/[+\-*&%=<>!?|]/,da={atom:!0,number:!0,variable:!0,string:!0,regexp:!0},ea={state:null,column:null,marked:null,cc:null},fa={name:"this",next:null};return t.lex=!0,v.lex=!0,{startState:function(a){var c=["Int","Float","String","Void","Std","Bool","Dynamic","Array"],d={tokenize:g,reAllowed:!0,kwAllowed:!0,cc:[],lexical:new j((a||0)-W,0,"block",!1),localVars:b.localVars,importedtypes:c,context:b.localVars&&{vars:b.localVars},indented:0};return b.globalVars&&"object"==typeof b.globalVars&&(d.globalVars=b.globalVars),d},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation()),a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"==U?c:(b.reAllowed=!("operator"!=U&&"keyword c"!=U&&!U.match(/^[\[{}\(,;:]$/)),b.kwAllowed="."!=U,l(b,c,U,V,a))},indent:function(a,b){if(a.tokenize!=g)return 0;var c=b&&b.charAt(0),d=a.lexical;"stat"==d.type&&"}"==c&&(d=d.prev);var e=d.type,f=c==e;return"vardef"==e?d.indented+4:"form"==e&&"{"==c?d.indented:"stat"==e||"form"==e?d.indented+W:"switch"!=d.info||f?d.align?d.column+(f?0:1):d.indented+(f?0:W):d.indented+(/^(?:case|default)\b/.test(b)?W:2*W)},electricChars:"{}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-haxe","haxe"),a.defineMode("hxml",(function(){return{startState:function(){return{define:!1,inString:!1}},token:function(a,b){var c=a.peek(),d=a.sol();if("#"==c)return a.skipToEnd(),"comment";if(d&&"-"==c){var e="variable-2";return a.eat(/-/),"-"==a.peek()&&(a.eat(/-/),e="keyword a"),"D"==a.peek()&&(a.eat(/[D]/),e="keyword c",b.define=!0),a.eatWhile(/[A-Z]/i),e}var c=a.peek();return 0==b.inString&&"'"==c&&(b.inString=!0,c=a.next()),1==b.inString?(a.skipTo("'")||a.skipToEnd(),"'"==a.peek()&&(a.next(),b.inString=!1),"string"):(a.next(),null)},lineComment:"#"}})),a.defineMIME("text/x-hxml","hxml")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("haxe",(function(a,b){function c(a){return{type:a,style:"keyword"}}function d(a,b,c){return b.tokenize=c,c(a,b)}function e(a,b){for(var c,d=!1;null!=(c=a.next());){if(c==b&&!d)return!0;d=!d&&"\\"==c}}function f(a,b,c){return U=a,V=c,b}function g(a,b){var c=a.next();if('"'==c||"'"==c)return d(a,b,h(c));if(/[\[\]{}\(\),;\:\.]/.test(c))return f(c);if("0"==c&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),f("number","number");if(/\d/.test(c)||"-"==c&&a.eat(/\d/))return a.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/),f("number","number");if(b.reAllowed&&"~"==c&&a.eat(/\//))return e(a,"/"),a.eatWhile(/[gimsu]/),f("regexp","string-2");if("/"==c)return a.eat("*")?d(a,b,i):a.eat("/")?(a.skipToEnd(),f("comment","comment")):(a.eatWhile(ca),f("operator",null,a.current()));if("#"==c)return a.skipToEnd(),f("conditional","meta");if("@"==c)return a.eat(/:/),a.eatWhile(/[\w_]/),f("metadata","meta");if(ca.test(c))return a.eatWhile(ca),f("operator",null,a.current());var g;if(/[A-Z]/.test(c))return a.eatWhile(/[\w_<>]/),g=a.current(),f("type","variable-3",g);a.eatWhile(/[\w_]/);var g=a.current(),j=ba.propertyIsEnumerable(g)&&ba[g];return j&&b.kwAllowed?f(j.type,j.style,g):f("variable","variable",g)}function h(a){return function(b,c){return e(b,a)&&(c.tokenize=g),f("string","string")}}function i(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=g;break}d="*"==c}return f("comment","comment")}function j(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.prev=e,this.info=f,null!=d&&(this.align=d)}function k(a,b){for(var c=a.localVars;c;c=c.next)if(c.name==b)return!0}function l(a,b,c,d,e){var f=a.cc;for(ea.state=a,ea.stream=e,ea.marked=null,ea.cc=f,a.lexical.hasOwnProperty("align")||(a.lexical.align=!0);;){var g=f.length?f.pop():x;if(g(c,d)){for(;f.length&&f[f.length-1].lex;)f.pop()();return ea.marked?ea.marked:"variable"==c&&k(a,d)?"variable-2":"variable"==c&&m(a,d)?"variable-3":b}}}function m(a,b){if(/[a-z]/.test(b.charAt(0)))return!1;for(var c=a.importedtypes.length,d=0;d<c;d++)if(a.importedtypes[d]==b)return!0}function n(a){for(var b=ea.state,c=b.importedtypes;c;c=c.next)if(c.name==a)return;b.importedtypes={name:a,next:b.importedtypes}}function o(){for(var a=arguments.length-1;a>=0;a--)ea.cc.push(arguments[a])}function p(){return o.apply(null,arguments),!0}function q(a,b){for(var c=b;c;c=c.next)if(c.name==a)return!0;return!1}function r(a){var b=ea.state;if(b.context){if(ea.marked="def",q(a,b.localVars))return;b.localVars={name:a,next:b.localVars}}else if(b.globalVars){if(q(a,b.globalVars))return;b.globalVars={name:a,next:b.globalVars}}}function s(){ea.state.context||(ea.state.localVars=fa),ea.state.context={prev:ea.state.context,vars:ea.state.localVars}}function t(){ea.state.localVars=ea.state.context.vars,ea.state.context=ea.state.context.prev}function u(a,b){var c=function(){var c=ea.state;c.lexical=new j(c.indented,ea.stream.column(),a,null,c.lexical,b)};return c.lex=!0,c}function v(){var a=ea.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function w(a){function b(c){return c==a?p():";"==a?o():p(b)}return b}function x(a){return"@"==a?p(C):"var"==a?p(u("vardef"),L,w(";"),v):"keyword a"==a?p(u("form"),y,x,v):"keyword b"==a?p(u("form"),x,v):"{"==a?p(u("}"),s,K,v,t):";"==a?p():"attribute"==a?p(B):"function"==a?p(P):"for"==a?p(u("form"),w("("),u(")"),N,w(")"),v,x,v):"variable"==a?p(u("stat"),G):"switch"==a?p(u("form"),y,u("}","switch"),w("{"),K,v,v):"case"==a?p(y,w(":")):"default"==a?p(w(":")):"catch"==a?p(u("form"),s,w("("),T,w(")"),x,v,t):"import"==a?p(E,w(";")):"typedef"==a?p(F):o(u("stat"),y,w(";"),v)}function y(a){return da.hasOwnProperty(a)?p(A):"type"==a?p(A):"function"==a?p(P):"keyword c"==a?p(z):"("==a?p(u(")"),z,w(")"),v,A):"operator"==a?p(y):"["==a?p(u("]"),J(z,"]"),v,A):"{"==a?p(u("}"),J(I,"}"),v,A):p()}function z(a){return a.match(/[;\}\)\],]/)?o():o(y)}function A(a,b){if("operator"==a&&/\+\+|--/.test(b))return p(A);if("operator"==a||":"==a)return p(y);if(";"!=a)return"("==a?p(u(")"),J(y,")"),v,A):"."==a?p(H,A):"["==a?p(u("]"),y,w("]"),v,A):void 0}function B(a){return"attribute"==a?p(B):"function"==a?p(P):"var"==a?p(L):void 0}function C(a){return":"==a?p(C):"variable"==a?p(C):"("==a?p(u(")"),J(D,")"),v,x):void 0}function D(a){if("variable"==a)return p()}function E(a,b){return"variable"==a&&/[A-Z]/.test(b.charAt(0))?(n(b),p()):"variable"==a||"property"==a||"."==a||"*"==b?p(E):void 0}function F(a,b){return"variable"==a&&/[A-Z]/.test(b.charAt(0))?(n(b),p()):"type"==a&&/[A-Z]/.test(b.charAt(0))?p():void 0}function G(a){return":"==a?p(v,x):o(A,w(";"),v)}function H(a){if("variable"==a)return ea.marked="property",p()}function I(a){if("variable"==a&&(ea.marked="property"),da.hasOwnProperty(a))return p(w(":"),y)}function J(a,b){function c(d){return","==d?p(a,c):d==b?p():p(w(b))}return function(d){return d==b?p():o(a,c)}}function K(a){return"}"==a?p():o(x,K)}function L(a,b){return"variable"==a?(r(b),p(Q,M)):p()}function M(a,b){return"="==b?p(y,M):","==a?p(L):void 0}function N(a,b){return"variable"==a?(r(b),p(O,y)):o()}function O(a,b){if("in"==b)return p()}function P(a,b){return"variable"==a||"type"==a?(r(b),p(P)):"new"==b?p(P):"("==a?p(u(")"),s,J(T,")"),v,Q,x,t):void 0}function Q(a){if(":"==a)return p(R)}function R(a){return"type"==a?p():"variable"==a?p():"{"==a?p(u("}"),J(S,"}"),v):void 0}function S(a){if("variable"==a)return p(Q)}function T(a,b){if("variable"==a)return r(b),p(Q)}var U,V,W=a.indentUnit,X=c("keyword a"),Y=c("keyword b"),Z=c("keyword c"),$=c("operator"),_={type:"atom",style:"atom"},aa={type:"attribute",style:"attribute"},U=c("typedef"),ba={if:X,while:X,else:Y,do:Y,try:Y,return:Z,break:Z,continue:Z,new:Z,throw:Z,var:c("var"),inline:aa,static:aa,using:c("import"),public:aa,private:aa,cast:c("cast"),import:c("import"),macro:c("macro"),function:c("function"),catch:c("catch"),untyped:c("untyped"),callback:c("cb"),for:c("for"),switch:c("switch"),case:c("case"),default:c("default"),in:$,never:c("property_access"),trace:c("trace"),class:U,abstract:U,enum:U,interface:U,typedef:U,extends:U,implements:U,dynamic:U,true:_,false:_,null:_},ca=/[+\-*&%=<>!?|]/,da={atom:!0,number:!0,variable:!0,string:!0,regexp:!0},ea={state:null,column:null,marked:null,cc:null},fa={name:"this",next:null};return t.lex=!0,v.lex=!0,{startState:function(a){var c=["Int","Float","String","Void","Std","Bool","Dynamic","Array"],d={tokenize:g,reAllowed:!0,kwAllowed:!0,cc:[],lexical:new j((a||0)-W,0,"block",!1),localVars:b.localVars,importedtypes:c,context:b.localVars&&{vars:b.localVars},indented:0};return b.globalVars&&"object"==typeof b.globalVars&&(d.globalVars=b.globalVars),d},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation()),a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"==U?c:(b.reAllowed=!("operator"!=U&&"keyword c"!=U&&!U.match(/^[\[{}\(,;:]$/)),b.kwAllowed="."!=U,l(b,c,U,V,a))},indent:function(a,b){if(a.tokenize!=g)return 0;var c=b&&b.charAt(0),d=a.lexical;"stat"==d.type&&"}"==c&&(d=d.prev);var e=d.type,f=c==e;return"vardef"==e?d.indented+4:"form"==e&&"{"==c?d.indented:"stat"==e||"form"==e?d.indented+W:"switch"!=d.info||f?d.align?d.column+(f?0:1):d.indented+(f?0:W):d.indented+(/^(?:case|default)\b/.test(b)?W:2*W)},electricChars:"{}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-haxe","haxe"),a.defineMode("hxml",(function(){return{startState:function(){return{define:!1,inString:!1}},token:function(a,b){var c=a.peek(),d=a.sol();if("#"==c)return a.skipToEnd(),"comment";if(d&&"-"==c){var e="variable-2";return a.eat(/-/),"-"==a.peek()&&(a.eat(/-/),e="keyword a"),"D"==a.peek()&&(a.eat(/[D]/),e="keyword c",b.define=!0),a.eatWhile(/[A-Z]/i),e}var c=a.peek();return 0==b.inString&&"'"==c&&(b.inString=!0,a.next()),1==b.inString?(a.skipTo("'")||a.skipToEnd(),"'"==a.peek()&&(a.next(),b.inString=!1),"string"):(a.next(),null)},lineComment:"#"}})),a.defineMIME("text/x-hxml","hxml")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/htmlmixed/htmlmixed.js b/media/editors/codemirror/mode/htmlmixed/htmlmixed.js
index 16b4f139fd400..33398ec5c0bb1 100644
--- a/media/editors/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/media/editors/codemirror/mode/htmlmixed/htmlmixed.js
@@ -133,11 +133,11 @@
         return state.token(stream, state);
       },
 
-      indent: function (state, textAfter) {
+      indent: function (state, textAfter, line) {
         if (!state.localMode || /^\s*<\//.test(textAfter))
           return htmlMode.indent(state.htmlState, textAfter);
         else if (state.localMode.indent)
-          return state.localMode.indent(state.localState, textAfter);
+          return state.localMode.indent(state.localState, textAfter, line);
         else
           return CodeMirror.Pass;
       },
diff --git a/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js b/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js
index 1daff40242964..a30b454e8163e 100644
--- a/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js
+++ b/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=a.current(),e=d.search(b);return e>-1?a.backUp(d.length-e):d.match(/<\/?$/)&&(a.backUp(d.length),a.match(b,!1)||a.match(d)),c}function c(a){var b=i[a];return b?b:i[a]=new RegExp("\\s+"+a+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*")}function d(a,b){var d=a.match(c(b));return d?/^\s*(.*?)\s*$/.exec(d[2])[1]:""}function e(a,b){return new RegExp((b?"^":"")+"</s*"+a+"s*>","i")}function f(a,b){for(var c in a)for(var d=b[c]||(b[c]=[]),e=a[c],f=e.length-1;f>=0;f--)d.unshift(e[f])}function g(a,b){for(var c=0;c<a.length;c++){var e=a[c];if(!e[0]||e[1].test(d(b,e[0])))return e[2]}}var h={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]},i={};a.defineMode("htmlmixed",(function(c,d){function i(d,f){var h,l=j.token(d,f.htmlState),m=/\btag\b/.test(l);if(m&&!/[<>\s\/]/.test(d.current())&&(h=f.htmlState.tagName&&f.htmlState.tagName.toLowerCase())&&k.hasOwnProperty(h))f.inTag=h+" ";else if(f.inTag&&m&&/>$/.test(d.current())){var n=/^([\S]+) (.*)/.exec(f.inTag);f.inTag=null;var o=">"==d.current()&&g(k[n[1]],n[2]),p=a.getMode(c,o),q=e(n[1],!0),r=e(n[1],!1);f.token=function(a,c){return a.match(q,!1)?(c.token=i,c.localState=c.localMode=null,null):b(a,r,c.localMode.token(a,c.localState))},f.localMode=p,f.localState=a.startState(p,j.indent(f.htmlState,""))}else f.inTag&&(f.inTag+=d.current(),d.eol()&&(f.inTag+=" "));return l}var j=a.getMode(c,{name:"xml",htmlMode:!0,multilineTagIndentFactor:d.multilineTagIndentFactor,multilineTagIndentPastTag:d.multilineTagIndentPastTag}),k={},l=d&&d.tags,m=d&&d.scriptTypes;if(f(h,k),l&&f(l,k),m)for(var n=m.length-1;n>=0;n--)k.script.unshift(["type",m[n].matches,m[n].mode]);return{startState:function(){var b=a.startState(j);return{token:i,inTag:null,localMode:null,localState:null,htmlState:b}},copyState:function(b){var c;return b.localState&&(c=a.copyState(b.localMode,b.localState)),{token:b.token,inTag:b.inTag,localMode:b.localMode,localState:c,htmlState:a.copyState(j,b.htmlState)}},token:function(a,b){return b.token(a,b)},indent:function(b,c){return!b.localMode||/^\s*<\//.test(c)?j.indent(b.htmlState,c):b.localMode.indent?b.localMode.indent(b.localState,c):a.Pass},innerMode:function(a){return{state:a.localState||a.htmlState,mode:a.localMode||j}}}}),"xml","javascript","css"),a.defineMIME("text/html","htmlmixed")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=a.current(),e=d.search(b);return e>-1?a.backUp(d.length-e):d.match(/<\/?$/)&&(a.backUp(d.length),a.match(b,!1)||a.match(d)),c}function c(a){var b=i[a];return b?b:i[a]=new RegExp("\\s+"+a+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*")}function d(a,b){var d=a.match(c(b));return d?/^\s*(.*?)\s*$/.exec(d[2])[1]:""}function e(a,b){return new RegExp((b?"^":"")+"</s*"+a+"s*>","i")}function f(a,b){for(var c in a)for(var d=b[c]||(b[c]=[]),e=a[c],f=e.length-1;f>=0;f--)d.unshift(e[f])}function g(a,b){for(var c=0;c<a.length;c++){var e=a[c];if(!e[0]||e[1].test(d(b,e[0])))return e[2]}}var h={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]},i={};a.defineMode("htmlmixed",(function(c,d){function i(d,f){var h,l=j.token(d,f.htmlState),m=/\btag\b/.test(l);if(m&&!/[<>\s\/]/.test(d.current())&&(h=f.htmlState.tagName&&f.htmlState.tagName.toLowerCase())&&k.hasOwnProperty(h))f.inTag=h+" ";else if(f.inTag&&m&&/>$/.test(d.current())){var n=/^([\S]+) (.*)/.exec(f.inTag);f.inTag=null;var o=">"==d.current()&&g(k[n[1]],n[2]),p=a.getMode(c,o),q=e(n[1],!0),r=e(n[1],!1);f.token=function(a,c){return a.match(q,!1)?(c.token=i,c.localState=c.localMode=null,null):b(a,r,c.localMode.token(a,c.localState))},f.localMode=p,f.localState=a.startState(p,j.indent(f.htmlState,""))}else f.inTag&&(f.inTag+=d.current(),d.eol()&&(f.inTag+=" "));return l}var j=a.getMode(c,{name:"xml",htmlMode:!0,multilineTagIndentFactor:d.multilineTagIndentFactor,multilineTagIndentPastTag:d.multilineTagIndentPastTag}),k={},l=d&&d.tags,m=d&&d.scriptTypes;if(f(h,k),l&&f(l,k),m)for(var n=m.length-1;n>=0;n--)k.script.unshift(["type",m[n].matches,m[n].mode]);return{startState:function(){var b=a.startState(j);return{token:i,inTag:null,localMode:null,localState:null,htmlState:b}},copyState:function(b){var c;return b.localState&&(c=a.copyState(b.localMode,b.localState)),{token:b.token,inTag:b.inTag,localMode:b.localMode,localState:c,htmlState:a.copyState(j,b.htmlState)}},token:function(a,b){return b.token(a,b)},indent:function(b,c,d){return!b.localMode||/^\s*<\//.test(c)?j.indent(b.htmlState,c):b.localMode.indent?b.localMode.indent(b.localState,c,d):a.Pass},innerMode:function(a){return{state:a.localState||a.htmlState,mode:a.localMode||j}}}}),"xml","javascript","css"),a.defineMIME("text/html","htmlmixed")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/javascript/javascript.js b/media/editors/codemirror/mode/javascript/javascript.js
index 7c09476b3dead..692ffc61d87c4 100644
--- a/media/editors/codemirror/mode/javascript/javascript.js
+++ b/media/editors/codemirror/mode/javascript/javascript.js
@@ -41,12 +41,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this"), "class": kw("class"), "super": kw("atom"),
       "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
-      "await": C, "async": kw("async")
+      "await": C
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
     if (isTS) {
-      var type = {type: "variable", style: "variable-3"};
+      var type = {type: "variable", style: "type"};
       var tsKeywords = {
         // object-like things
         "interface": kw("class"),
@@ -54,7 +54,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "namespace": C,
         "module": kw("module"),
         "enum": kw("module"),
-        "type": kw("type"),
 
         // scope modifiers
         "public": kw("modifier"),
@@ -62,9 +61,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "protected": kw("modifier"),
         "abstract": kw("modifier"),
 
-        // operators
-        "as": operator,
-
         // types
         "string": type, "number": type, "boolean": type, "any": type
       };
@@ -151,9 +147,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return ret("operator", "operator", stream.current());
     } else if (wordRE.test(ch)) {
       stream.eatWhile(wordRE);
-      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-      return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
-                     ret("variable", "variable", word);
+      var word = stream.current()
+      if (state.lastType != ".") {
+        if (keywords.propertyIsEnumerable(word)) {
+          var kw = keywords[word]
+          return ret(kw.type, kw.style, word)
+        }
+        if (word == "async" && stream.match(/^\s*[\(\w]/, false))
+          return ret("async", "keyword", word)
+      }
+      return ret("variable", "variable", word)
     }
   }
 
@@ -361,8 +364,15 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), parenExpr, pushlex("}", "switch"), expect("{"),
+    if (type == "variable") {
+      if (isTS && value == "type") {
+        cx.marked = "keyword"
+        return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+      } else {
+        return cont(pushlex("stat"), maybelabel);
+      }
+    }
+    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"),
                                       block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
@@ -371,8 +381,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
-    if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
-    if (type == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+    if (type == "module") return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
     if (type == "async") return cont(statement)
     if (value == "@") return cont(expression, statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
@@ -434,6 +443,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
+    if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
   }
   function quasi(type, value) {
     if (type != "quasi") return pass();
@@ -492,7 +502,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
     } else if (type == "spread") {
-      return cont(expression);
+      return cont(expression, afterprop);
     } else if (type == ":") {
       return pass(afterprop)
     }
@@ -540,9 +550,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
   function typeexpr(type) {
-    if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
+    if (type == "variable") {cx.marked = "type"; return cont(afterType);}
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
-    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex)
+    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
   }
   function maybeReturnType(type) {
@@ -556,6 +566,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(typeprop)
     } else if (type == ":") {
       return cont(typeexpr)
+    } else if (type == "[") {
+      return cont(expression, maybetype, expect("]"), typeprop)
     }
   }
   function typearg(type) {
@@ -566,6 +578,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
     if (value == "|" || type == ".") return cont(typeexpr)
     if (type == "[") return cont(expect("]"), afterType)
+    if (value == "extends") return cont(typeexpr)
   }
   function vardef() {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
diff --git a/media/editors/codemirror/mode/javascript/javascript.min.js b/media/editors/codemirror/mode/javascript/javascript.min.js
index 37ea64cf6e6d1..ac28b92ade13a 100644
--- a/media/editors/codemirror/mode/javascript/javascript.min.js
+++ b/media/editors/codemirror/mode/javascript/javascript.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){return/^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(b.lastType)||"quasi"==b.lastType&&/\{\s*$/.test(a.string.slice(0,a.pos-(c||0)))}a.defineMode("javascript",(function(c,d){function e(a){for(var b,c=!1,d=!1;null!=(b=a.next());){if(!c){if("/"==b&&!d)return;"["==b?d=!0:d&&"]"==b&&(d=!1)}c=!c&&"\\"==b}}function f(a,b,c){return za=a,Aa=c,b}function g(a,c){var d=a.next();if('"'==d||"'"==d)return c.tokenize=h(d),c.tokenize(a,c);if("."==d&&a.match(/^\d+(?:[eE][+\-]?\d+)?/))return f("number","number");if("."==d&&a.match(".."))return f("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(d))return f(d);if("="==d&&a.eat(">"))return f("=>","operator");if("0"==d&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),f("number","number");if("0"==d&&a.eat(/o/i))return a.eatWhile(/[0-7]/i),f("number","number");if("0"==d&&a.eat(/b/i))return a.eatWhile(/[01]/i),f("number","number");if(/\d/.test(d))return a.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),f("number","number");if("/"==d)return a.eat("*")?(c.tokenize=i,i(a,c)):a.eat("/")?(a.skipToEnd(),f("comment","comment")):b(a,c,1)?(e(a),a.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),f("regexp","string-2")):(a.eatWhile(Ia),f("operator","operator",a.current()));if("`"==d)return c.tokenize=j,j(a,c);if("#"==d)return a.skipToEnd(),f("error","error");if(Ia.test(d))return">"==d&&c.lexical&&">"==c.lexical.type||a.eatWhile(Ia),f("operator","operator",a.current());if(Ga.test(d)){a.eatWhile(Ga);var g=a.current(),k=Ha.propertyIsEnumerable(g)&&Ha[g];return k&&"."!=c.lastType?f(k.type,k.style,g):f("variable","variable",g)}}function h(a){return function(b,c){var d,e=!1;if(Da&&"@"==b.peek()&&b.match(Ja))return c.tokenize=g,f("jsonld-keyword","meta");for(;null!=(d=b.next())&&(d!=a||e);)e=!e&&"\\"==d;return e||(c.tokenize=g),f("string","string")}}function i(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=g;break}d="*"==c}return f("comment","comment")}function j(a,b){for(var c,d=!1;null!=(c=a.next());){if(!d&&("`"==c||"$"==c&&a.eat("{"))){b.tokenize=g;break}d=!d&&"\\"==c}return f("quasi","string-2",a.current())}function k(a,b){b.fatArrowAt&&(b.fatArrowAt=null);var c=a.string.indexOf("=>",a.start);if(!(c<0)){if(Fa){var d=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(a.string.slice(a.start,c));d&&(c=d.index)}for(var e=0,f=!1,g=c-1;g>=0;--g){var h=a.string.charAt(g),i=Ka.indexOf(h);if(i>=0&&i<3){if(!e){++g;break}if(0==--e){"("==h&&(f=!0);break}}else if(i>=3&&i<6)++e;else if(Ga.test(h))f=!0;else{if(/["'\/]/.test(h))return;if(f&&!e){++g;break}}}f&&!e&&(b.fatArrowAt=g)}}function l(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.prev=e,this.info=f,null!=d&&(this.align=d)}function m(a,b){for(var c=a.localVars;c;c=c.next)if(c.name==b)return!0;for(var d=a.context;d;d=d.prev)for(var c=d.vars;c;c=c.next)if(c.name==b)return!0}function n(a,b,c,d,e){var f=a.cc;for(Ma.state=a,Ma.stream=e,Ma.marked=null,Ma.cc=f,Ma.style=b,a.lexical.hasOwnProperty("align")||(a.lexical.align=!0);;){var g=f.length?f.pop():Ea?x:w;if(g(c,d)){for(;f.length&&f[f.length-1].lex;)f.pop()();return Ma.marked?Ma.marked:"variable"==c&&m(a,d)?"variable-2":b}}}function o(){for(var a=arguments.length-1;a>=0;a--)Ma.cc.push(arguments[a])}function p(){return o.apply(null,arguments),!0}function q(a){function b(b){for(var c=b;c;c=c.next)if(c.name==a)return!0;return!1}var c=Ma.state;if(Ma.marked="def",c.context){if(b(c.localVars))return;c.localVars={name:a,next:c.localVars}}else{if(b(c.globalVars))return;d.globalVars&&(c.globalVars={name:a,next:c.globalVars})}}function r(){Ma.state.context={prev:Ma.state.context,vars:Ma.state.localVars},Ma.state.localVars=Na}function s(){Ma.state.localVars=Ma.state.context.vars,Ma.state.context=Ma.state.context.prev}function t(a,b){var c=function(){var c=Ma.state,d=c.indented;if("stat"==c.lexical.type)d=c.lexical.indented;else for(var e=c.lexical;e&&")"==e.type&&e.align;e=e.prev)d=e.indented;c.lexical=new l(d,Ma.stream.column(),a,null,c.lexical,b)};return c.lex=!0,c}function u(){var a=Ma.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function v(a){function b(c){return c==a?p():";"==a?o():p(b)}return b}function w(a,b){return"var"==a?p(t("vardef",b.length),$,v(";"),u):"keyword a"==a?p(t("form"),z,w,u):"keyword b"==a?p(t("form"),w,u):"{"==a?p(t("}"),T,u):";"==a?p():"if"==a?("else"==Ma.state.lexical.info&&Ma.state.cc[Ma.state.cc.length-1]==u&&Ma.state.cc.pop()(),p(t("form"),z,w,u,da)):"function"==a?p(ja):"for"==a?p(t("form"),ea,w,u):"variable"==a?p(t("stat"),M):"switch"==a?p(t("form"),z,t("}","switch"),v("{"),T,u,u):"case"==a?p(x,v(":")):"default"==a?p(v(":")):"catch"==a?p(t("form"),r,v("("),ka,v(")"),w,u,s):"class"==a?p(t("form"),ma,u):"export"==a?p(t("stat"),qa,u):"import"==a?p(t("stat"),sa,u):"module"==a?p(t("form"),_,t("}"),v("{"),T,u,u):"type"==a?p(V,v("operator"),V,v(";")):"async"==a?p(w):"@"==b?p(x,w):o(t("stat"),x,v(";"),u)}function x(a){return A(a,!1)}function y(a){return A(a,!0)}function z(a){return"("!=a?o():p(t(")"),x,v(")"),u)}function A(a,b){if(Ma.state.fatArrowAt==Ma.stream.start){var c=b?I:H;if("("==a)return p(r,t(")"),R(_,")"),u,v("=>"),c,s);if("variable"==a)return o(r,_,v("=>"),c,s)}var d=b?E:D;return La.hasOwnProperty(a)?p(d):"function"==a?p(ja,d):"class"==a?p(t("form"),la,u):"keyword c"==a||"async"==a?p(b?C:B):"("==a?p(t(")"),B,v(")"),u,d):"operator"==a||"spread"==a?p(b?y:x):"["==a?p(t("]"),xa,u,d):"{"==a?S(O,"}",null,d):"quasi"==a?o(F,d):"new"==a?p(J(b)):p()}function B(a){return a.match(/[;\}\)\],]/)?o():o(x)}function C(a){return a.match(/[;\}\)\],]/)?o():o(y)}function D(a,b){return","==a?p(x):E(a,b,!1)}function E(a,b,c){var d=0==c?D:E,e=0==c?x:y;return"=>"==a?p(r,c?I:H,s):"operator"==a?/\+\+|--/.test(b)?p(d):"?"==b?p(x,v(":"),e):p(e):"quasi"==a?o(F,d):";"!=a?"("==a?S(y,")","call",d):"."==a?p(N,d):"["==a?p(t("]"),B,v("]"),u,d):void 0:void 0}function F(a,b){return"quasi"!=a?o():"${"!=b.slice(b.length-2)?p(F):p(x,G)}function G(a){if("}"==a)return Ma.marked="string-2",Ma.state.tokenize=j,p(F)}function H(a){return k(Ma.stream,Ma.state),o("{"==a?w:x)}function I(a){return k(Ma.stream,Ma.state),o("{"==a?w:y)}function J(a){return function(b){return"."==b?p(a?L:K):o(a?y:x)}}function K(a,b){if("target"==b)return Ma.marked="keyword",p(D)}function L(a,b){if("target"==b)return Ma.marked="keyword",p(E)}function M(a){return":"==a?p(u,w):o(D,v(";"),u)}function N(a){if("variable"==a)return Ma.marked="property",p()}function O(a,b){return"async"==a?(Ma.marked="property",p(O)):"variable"==a||"keyword"==Ma.style?(Ma.marked="property",p("get"==b||"set"==b?P:Q)):"number"==a||"string"==a?(Ma.marked=Da?"property":Ma.style+" property",p(Q)):"jsonld-keyword"==a?p(Q):"modifier"==a?p(O):"["==a?p(x,v("]"),Q):"spread"==a?p(x):":"==a?o(Q):void 0}function P(a){return"variable"!=a?o(Q):(Ma.marked="property",p(ja))}function Q(a){return":"==a?p(y):"("==a?o(ja):void 0}function R(a,b,c){function d(e,f){if(c?c.indexOf(e)>-1:","==e){var g=Ma.state.lexical;return"call"==g.info&&(g.pos=(g.pos||0)+1),p((function(c,d){return c==b||d==b?o():o(a)}),d)}return e==b||f==b?p():p(v(b))}return function(c,e){return c==b||e==b?p():o(a,d)}}function S(a,b,c){for(var d=3;d<arguments.length;d++)Ma.cc.push(arguments[d]);return p(t(b,c),R(a,b),u)}function T(a){return"}"==a?p():o(w,T)}function U(a,b){if(Fa){if(":"==a)return p(V);if("?"==b)return p(U)}}function V(a){return"variable"==a?(Ma.marked="variable-3",p(Z)):"string"==a||"number"==a||"atom"==a?p(Z):"{"==a?p(t("}"),R(X,"}",",;"),u):"("==a?p(R(Y,")"),W):void 0}function W(a){if("=>"==a)return p(V)}function X(a,b){return"variable"==a||"keyword"==Ma.style?(Ma.marked="property",p(X)):"?"==b?p(X):":"==a?p(V):void 0}function Y(a){return"variable"==a?p(Y):":"==a?p(V):void 0}function Z(a,b){return"<"==b?p(t(">"),R(V,">"),u,Z):"|"==b||"."==a?p(V):"["==a?p(v("]"),Z):void 0}function $(){return o(_,U,ba,ca)}function _(a,b){return"modifier"==a?p(_):"variable"==a?(q(b),p()):"spread"==a?p(_):"["==a?S(_,"]"):"{"==a?S(aa,"}"):void 0}function aa(a,b){return"variable"!=a||Ma.stream.match(/^\s*:/,!1)?("variable"==a&&(Ma.marked="property"),"spread"==a?p(_):"}"==a?o():p(v(":"),_,ba)):(q(b),p(ba))}function ba(a,b){if("="==b)return p(y)}function ca(a){if(","==a)return p($)}function da(a,b){if("keyword b"==a&&"else"==b)return p(t("form","else"),w,u)}function ea(a){if("("==a)return p(t(")"),fa,v(")"),u)}function fa(a){return"var"==a?p($,v(";"),ha):";"==a?p(ha):"variable"==a?p(ga):o(x,v(";"),ha)}function ga(a,b){return"in"==b||"of"==b?(Ma.marked="keyword",p(x)):p(D,ha)}function ha(a,b){return";"==a?p(ia):"in"==b||"of"==b?(Ma.marked="keyword",p(x)):o(x,v(";"),ia)}function ia(a){")"!=a&&p(x)}function ja(a,b){return"*"==b?(Ma.marked="keyword",p(ja)):"variable"==a?(q(b),p(ja)):"("==a?p(r,t(")"),R(ka,")"),u,U,w,s):Fa&&"<"==b?p(t(">"),R(V,">"),u,ja):void 0}function ka(a){return"spread"==a?p(ka):o(_,U,ba)}function la(a,b){return"variable"==a?ma(a,b):na(a,b)}function ma(a,b){if("variable"==a)return q(b),p(na)}function na(a,b){return"<"==b?p(t(">"),R(V,">"),u,na):"extends"==b||"implements"==b||Fa&&","==a?p(Fa?V:x,na):"{"==a?p(t("}"),oa,u):void 0}function oa(a,b){return"variable"==a||"keyword"==Ma.style?("async"==b||"static"==b||"get"==b||"set"==b||Fa&&("public"==b||"private"==b||"protected"==b||"readonly"==b||"abstract"==b))&&Ma.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(Ma.marked="keyword",p(oa)):(Ma.marked="property",p(Fa?pa:ja,oa)):"["==a?p(x,v("]"),Fa?pa:ja,oa):"*"==b?(Ma.marked="keyword",p(oa)):";"==a?p(oa):"}"==a?p():"@"==b?p(x,oa):void 0}function pa(a,b){return"?"==b?p(pa):":"==a?p(V,ba):"="==b?p(y):o(ja)}function qa(a,b){return"*"==b?(Ma.marked="keyword",p(wa,v(";"))):"default"==b?(Ma.marked="keyword",p(x,v(";"))):"{"==a?p(R(ra,"}"),wa,v(";")):o(w)}function ra(a,b){return"as"==b?(Ma.marked="keyword",p(v("variable"))):"variable"==a?o(y,ra):void 0}function sa(a){return"string"==a?p():o(ta,ua,wa)}function ta(a,b){return"{"==a?S(ta,"}"):("variable"==a&&q(b),"*"==b&&(Ma.marked="keyword"),p(va))}function ua(a){if(","==a)return p(ta,ua)}function va(a,b){if("as"==b)return Ma.marked="keyword",p(ta)}function wa(a,b){if("from"==b)return Ma.marked="keyword",p(x)}function xa(a){return"]"==a?p():o(R(y,"]"))}function ya(a,b){return"operator"==a.lastType||","==a.lastType||Ia.test(b.charAt(0))||/[,.]/.test(b.charAt(0))}var za,Aa,Ba=c.indentUnit,Ca=d.statementIndent,Da=d.jsonld,Ea=d.json||Da,Fa=d.typescript,Ga=d.wordCharacters||/[\w$\xa1-\uffff]/,Ha=(function(){function a(a){return{type:a,style:"keyword"}}var b=a("keyword a"),c=a("keyword b"),d=a("keyword c"),e=a("operator"),f={type:"atom",style:"atom"},g={if:a("if"),while:b,with:b,else:c,do:c,try:c,finally:c,return:d,break:d,continue:d,new:a("new"),delete:d,throw:d,debugger:d,var:a("var"),const:a("var"),let:a("var"),function:a("function"),catch:a("catch"),for:a("for"),switch:a("switch"),case:a("case"),default:a("default"),in:e,typeof:e,instanceof:e,true:f,false:f,null:f,undefined:f,NaN:f,Infinity:f,this:a("this"),class:a("class"),super:a("atom"),yield:d,export:a("export"),import:a("import"),extends:d,await:d,async:a("async")};if(Fa){var h={type:"variable",style:"variable-3"},i={interface:a("class"),implements:d,namespace:d,module:a("module"),enum:a("module"),type:a("type"),public:a("modifier"),private:a("modifier"),protected:a("modifier"),abstract:a("modifier"),as:e,string:h,number:h,boolean:h,any:h};for(var j in i)g[j]=i[j]}return g})(),Ia=/[+\-*&%=<>!?|~^@]/,Ja=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,Ka="([{}])",La={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0},Ma={state:null,column:null,marked:null,cc:null},Na={name:"this",next:{name:"arguments"}};return u.lex=!0,{startState:function(a){var b={tokenize:g,lastType:"sof",cc:[],lexical:new l((a||0)-Ba,0,"block",!1),localVars:d.localVars,context:d.localVars&&{vars:d.localVars},indented:a||0};return d.globalVars&&"object"==typeof d.globalVars&&(b.globalVars=d.globalVars),b},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation(),k(a,b)),b.tokenize!=i&&a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"==za?c:(b.lastType="operator"!=za||"++"!=Aa&&"--"!=Aa?za:"incdec",n(b,c,za,Aa,a))},indent:function(b,c){if(b.tokenize==i)return a.Pass;if(b.tokenize!=g)return 0;var e,f=c&&c.charAt(0),h=b.lexical;if(!/^\s*else\b/.test(c))for(var j=b.cc.length-1;j>=0;--j){var k=b.cc[j];if(k==u)h=h.prev;else if(k!=da)break}for(;("stat"==h.type||"form"==h.type)&&("}"==f||(e=b.cc[b.cc.length-1])&&(e==D||e==E)&&!/^[,\.=+\-*:?[\(]/.test(c));)h=h.prev;Ca&&")"==h.type&&"stat"==h.prev.type&&(h=h.prev);var l=h.type,m=f==l;return"vardef"==l?h.indented+("operator"==b.lastType||","==b.lastType?h.info+1:0):"form"==l&&"{"==f?h.indented:"form"==l?h.indented+Ba:"stat"==l?h.indented+(ya(b,c)?Ca||Ba:0):"switch"!=h.info||m||0==d.doubleIndentSwitch?h.align?h.column+(m?0:1):h.indented+(m?0:Ba):h.indented+(/^(?:case|default)\b/.test(c)?Ba:2*Ba)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:Ea?null:"/*",blockCommentEnd:Ea?null:"*/",lineComment:Ea?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:Ea?"json":"javascript",jsonldMode:Da,jsonMode:Ea,expressionAllowed:b,skipExpression:function(a){var b=a.cc[a.cc.length-1];b!=x&&b!=y||a.cc.pop()}}})),a.registerHelper("wordChars","javascript",/[\w$]/),a.defineMIME("text/javascript","javascript"),a.defineMIME("text/ecmascript","javascript"),a.defineMIME("application/javascript","javascript"),a.defineMIME("application/x-javascript","javascript"),a.defineMIME("application/ecmascript","javascript"),a.defineMIME("application/json",{name:"javascript",json:!0}),a.defineMIME("application/x-json",{name:"javascript",json:!0}),a.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),a.defineMIME("text/typescript",{name:"javascript",typescript:!0}),a.defineMIME("application/typescript",{name:"javascript",typescript:!0})}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){return/^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(b.lastType)||"quasi"==b.lastType&&/\{\s*$/.test(a.string.slice(0,a.pos-(c||0)))}a.defineMode("javascript",(function(c,d){function e(a){for(var b,c=!1,d=!1;null!=(b=a.next());){if(!c){if("/"==b&&!d)return;"["==b?d=!0:d&&"]"==b&&(d=!1)}c=!c&&"\\"==b}}function f(a,b,c){return za=a,Aa=c,b}function g(a,c){var d=a.next();if('"'==d||"'"==d)return c.tokenize=h(d),c.tokenize(a,c);if("."==d&&a.match(/^\d+(?:[eE][+\-]?\d+)?/))return f("number","number");if("."==d&&a.match(".."))return f("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(d))return f(d);if("="==d&&a.eat(">"))return f("=>","operator");if("0"==d&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),f("number","number");if("0"==d&&a.eat(/o/i))return a.eatWhile(/[0-7]/i),f("number","number");if("0"==d&&a.eat(/b/i))return a.eatWhile(/[01]/i),f("number","number");if(/\d/.test(d))return a.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),f("number","number");if("/"==d)return a.eat("*")?(c.tokenize=i,i(a,c)):a.eat("/")?(a.skipToEnd(),f("comment","comment")):b(a,c,1)?(e(a),a.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),f("regexp","string-2")):(a.eatWhile(Ia),f("operator","operator",a.current()));if("`"==d)return c.tokenize=j,j(a,c);if("#"==d)return a.skipToEnd(),f("error","error");if(Ia.test(d))return">"==d&&c.lexical&&">"==c.lexical.type||a.eatWhile(Ia),f("operator","operator",a.current());if(Ga.test(d)){a.eatWhile(Ga);var g=a.current();if("."!=c.lastType){if(Ha.propertyIsEnumerable(g)){var k=Ha[g];return f(k.type,k.style,g)}if("async"==g&&a.match(/^\s*[\(\w]/,!1))return f("async","keyword",g)}return f("variable","variable",g)}}function h(a){return function(b,c){var d,e=!1;if(Da&&"@"==b.peek()&&b.match(Ja))return c.tokenize=g,f("jsonld-keyword","meta");for(;null!=(d=b.next())&&(d!=a||e);)e=!e&&"\\"==d;return e||(c.tokenize=g),f("string","string")}}function i(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=g;break}d="*"==c}return f("comment","comment")}function j(a,b){for(var c,d=!1;null!=(c=a.next());){if(!d&&("`"==c||"$"==c&&a.eat("{"))){b.tokenize=g;break}d=!d&&"\\"==c}return f("quasi","string-2",a.current())}function k(a,b){b.fatArrowAt&&(b.fatArrowAt=null);var c=a.string.indexOf("=>",a.start);if(!(c<0)){if(Fa){var d=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(a.string.slice(a.start,c));d&&(c=d.index)}for(var e=0,f=!1,g=c-1;g>=0;--g){var h=a.string.charAt(g),i=Ka.indexOf(h);if(i>=0&&i<3){if(!e){++g;break}if(0==--e){"("==h&&(f=!0);break}}else if(i>=3&&i<6)++e;else if(Ga.test(h))f=!0;else{if(/["'\/]/.test(h))return;if(f&&!e){++g;break}}}f&&!e&&(b.fatArrowAt=g)}}function l(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.prev=e,this.info=f,null!=d&&(this.align=d)}function m(a,b){for(var c=a.localVars;c;c=c.next)if(c.name==b)return!0;for(var d=a.context;d;d=d.prev)for(var c=d.vars;c;c=c.next)if(c.name==b)return!0}function n(a,b,c,d,e){var f=a.cc;for(Ma.state=a,Ma.stream=e,Ma.marked=null,Ma.cc=f,Ma.style=b,a.lexical.hasOwnProperty("align")||(a.lexical.align=!0);;){var g=f.length?f.pop():Ea?x:w;if(g(c,d)){for(;f.length&&f[f.length-1].lex;)f.pop()();return Ma.marked?Ma.marked:"variable"==c&&m(a,d)?"variable-2":b}}}function o(){for(var a=arguments.length-1;a>=0;a--)Ma.cc.push(arguments[a])}function p(){return o.apply(null,arguments),!0}function q(a){function b(b){for(var c=b;c;c=c.next)if(c.name==a)return!0;return!1}var c=Ma.state;if(Ma.marked="def",c.context){if(b(c.localVars))return;c.localVars={name:a,next:c.localVars}}else{if(b(c.globalVars))return;d.globalVars&&(c.globalVars={name:a,next:c.globalVars})}}function r(){Ma.state.context={prev:Ma.state.context,vars:Ma.state.localVars},Ma.state.localVars=Na}function s(){Ma.state.localVars=Ma.state.context.vars,Ma.state.context=Ma.state.context.prev}function t(a,b){var c=function(){var c=Ma.state,d=c.indented;if("stat"==c.lexical.type)d=c.lexical.indented;else for(var e=c.lexical;e&&")"==e.type&&e.align;e=e.prev)d=e.indented;c.lexical=new l(d,Ma.stream.column(),a,null,c.lexical,b)};return c.lex=!0,c}function u(){var a=Ma.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function v(a){function b(c){return c==a?p():";"==a?o():p(b)}return b}function w(a,b){return"var"==a?p(t("vardef",b.length),$,v(";"),u):"keyword a"==a?p(t("form"),z,w,u):"keyword b"==a?p(t("form"),w,u):"{"==a?p(t("}"),T,u):";"==a?p():"if"==a?("else"==Ma.state.lexical.info&&Ma.state.cc[Ma.state.cc.length-1]==u&&Ma.state.cc.pop()(),p(t("form"),z,w,u,da)):"function"==a?p(ja):"for"==a?p(t("form"),ea,w,u):"variable"==a?Fa&&"type"==b?(Ma.marked="keyword",p(V,v("operator"),V,v(";"))):p(t("stat"),M):"switch"==a?p(t("form"),z,v("{"),t("}","switch"),T,u,u):"case"==a?p(x,v(":")):"default"==a?p(v(":")):"catch"==a?p(t("form"),r,v("("),ka,v(")"),w,u,s):"class"==a?p(t("form"),ma,u):"export"==a?p(t("stat"),qa,u):"import"==a?p(t("stat"),sa,u):"module"==a?p(t("form"),_,v("{"),t("}"),T,u,u):"async"==a?p(w):"@"==b?p(x,w):o(t("stat"),x,v(";"),u)}function x(a){return A(a,!1)}function y(a){return A(a,!0)}function z(a){return"("!=a?o():p(t(")"),x,v(")"),u)}function A(a,b){if(Ma.state.fatArrowAt==Ma.stream.start){var c=b?I:H;if("("==a)return p(r,t(")"),R(_,")"),u,v("=>"),c,s);if("variable"==a)return o(r,_,v("=>"),c,s)}var d=b?E:D;return La.hasOwnProperty(a)?p(d):"function"==a?p(ja,d):"class"==a?p(t("form"),la,u):"keyword c"==a||"async"==a?p(b?C:B):"("==a?p(t(")"),B,v(")"),u,d):"operator"==a||"spread"==a?p(b?y:x):"["==a?p(t("]"),xa,u,d):"{"==a?S(O,"}",null,d):"quasi"==a?o(F,d):"new"==a?p(J(b)):p()}function B(a){return a.match(/[;\}\)\],]/)?o():o(x)}function C(a){return a.match(/[;\}\)\],]/)?o():o(y)}function D(a,b){return","==a?p(x):E(a,b,!1)}function E(a,b,c){var d=0==c?D:E,e=0==c?x:y;return"=>"==a?p(r,c?I:H,s):"operator"==a?/\+\+|--/.test(b)?p(d):"?"==b?p(x,v(":"),e):p(e):"quasi"==a?o(F,d):";"!=a?"("==a?S(y,")","call",d):"."==a?p(N,d):"["==a?p(t("]"),B,v("]"),u,d):Fa&&"as"==b?(Ma.marked="keyword",p(V,d)):void 0:void 0}function F(a,b){return"quasi"!=a?o():"${"!=b.slice(b.length-2)?p(F):p(x,G)}function G(a){if("}"==a)return Ma.marked="string-2",Ma.state.tokenize=j,p(F)}function H(a){return k(Ma.stream,Ma.state),o("{"==a?w:x)}function I(a){return k(Ma.stream,Ma.state),o("{"==a?w:y)}function J(a){return function(b){return"."==b?p(a?L:K):o(a?y:x)}}function K(a,b){if("target"==b)return Ma.marked="keyword",p(D)}function L(a,b){if("target"==b)return Ma.marked="keyword",p(E)}function M(a){return":"==a?p(u,w):o(D,v(";"),u)}function N(a){if("variable"==a)return Ma.marked="property",p()}function O(a,b){return"async"==a?(Ma.marked="property",p(O)):"variable"==a||"keyword"==Ma.style?(Ma.marked="property",p("get"==b||"set"==b?P:Q)):"number"==a||"string"==a?(Ma.marked=Da?"property":Ma.style+" property",p(Q)):"jsonld-keyword"==a?p(Q):"modifier"==a?p(O):"["==a?p(x,v("]"),Q):"spread"==a?p(x,Q):":"==a?o(Q):void 0}function P(a){return"variable"!=a?o(Q):(Ma.marked="property",p(ja))}function Q(a){return":"==a?p(y):"("==a?o(ja):void 0}function R(a,b,c){function d(e,f){if(c?c.indexOf(e)>-1:","==e){var g=Ma.state.lexical;return"call"==g.info&&(g.pos=(g.pos||0)+1),p((function(c,d){return c==b||d==b?o():o(a)}),d)}return e==b||f==b?p():p(v(b))}return function(c,e){return c==b||e==b?p():o(a,d)}}function S(a,b,c){for(var d=3;d<arguments.length;d++)Ma.cc.push(arguments[d]);return p(t(b,c),R(a,b),u)}function T(a){return"}"==a?p():o(w,T)}function U(a,b){if(Fa){if(":"==a)return p(V);if("?"==b)return p(U)}}function V(a){return"variable"==a?(Ma.marked="type",p(Z)):"string"==a||"number"==a||"atom"==a?p(Z):"{"==a?p(t("}"),R(X,"}",",;"),u,Z):"("==a?p(R(Y,")"),W):void 0}function W(a){if("=>"==a)return p(V)}function X(a,b){return"variable"==a||"keyword"==Ma.style?(Ma.marked="property",p(X)):"?"==b?p(X):":"==a?p(V):"["==a?p(x,U,v("]"),X):void 0}function Y(a){return"variable"==a?p(Y):":"==a?p(V):void 0}function Z(a,b){return"<"==b?p(t(">"),R(V,">"),u,Z):"|"==b||"."==a?p(V):"["==a?p(v("]"),Z):"extends"==b?p(V):void 0}function $(){return o(_,U,ba,ca)}function _(a,b){return"modifier"==a?p(_):"variable"==a?(q(b),p()):"spread"==a?p(_):"["==a?S(_,"]"):"{"==a?S(aa,"}"):void 0}function aa(a,b){return"variable"!=a||Ma.stream.match(/^\s*:/,!1)?("variable"==a&&(Ma.marked="property"),"spread"==a?p(_):"}"==a?o():p(v(":"),_,ba)):(q(b),p(ba))}function ba(a,b){if("="==b)return p(y)}function ca(a){if(","==a)return p($)}function da(a,b){if("keyword b"==a&&"else"==b)return p(t("form","else"),w,u)}function ea(a){if("("==a)return p(t(")"),fa,v(")"),u)}function fa(a){return"var"==a?p($,v(";"),ha):";"==a?p(ha):"variable"==a?p(ga):o(x,v(";"),ha)}function ga(a,b){return"in"==b||"of"==b?(Ma.marked="keyword",p(x)):p(D,ha)}function ha(a,b){return";"==a?p(ia):"in"==b||"of"==b?(Ma.marked="keyword",p(x)):o(x,v(";"),ia)}function ia(a){")"!=a&&p(x)}function ja(a,b){return"*"==b?(Ma.marked="keyword",p(ja)):"variable"==a?(q(b),p(ja)):"("==a?p(r,t(")"),R(ka,")"),u,U,w,s):Fa&&"<"==b?p(t(">"),R(V,">"),u,ja):void 0}function ka(a){return"spread"==a?p(ka):o(_,U,ba)}function la(a,b){return"variable"==a?ma(a,b):na(a,b)}function ma(a,b){if("variable"==a)return q(b),p(na)}function na(a,b){return"<"==b?p(t(">"),R(V,">"),u,na):"extends"==b||"implements"==b||Fa&&","==a?p(Fa?V:x,na):"{"==a?p(t("}"),oa,u):void 0}function oa(a,b){return"variable"==a||"keyword"==Ma.style?("async"==b||"static"==b||"get"==b||"set"==b||Fa&&("public"==b||"private"==b||"protected"==b||"readonly"==b||"abstract"==b))&&Ma.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(Ma.marked="keyword",p(oa)):(Ma.marked="property",p(Fa?pa:ja,oa)):"["==a?p(x,v("]"),Fa?pa:ja,oa):"*"==b?(Ma.marked="keyword",p(oa)):";"==a?p(oa):"}"==a?p():"@"==b?p(x,oa):void 0}function pa(a,b){return"?"==b?p(pa):":"==a?p(V,ba):"="==b?p(y):o(ja)}function qa(a,b){return"*"==b?(Ma.marked="keyword",p(wa,v(";"))):"default"==b?(Ma.marked="keyword",p(x,v(";"))):"{"==a?p(R(ra,"}"),wa,v(";")):o(w)}function ra(a,b){return"as"==b?(Ma.marked="keyword",p(v("variable"))):"variable"==a?o(y,ra):void 0}function sa(a){return"string"==a?p():o(ta,ua,wa)}function ta(a,b){return"{"==a?S(ta,"}"):("variable"==a&&q(b),"*"==b&&(Ma.marked="keyword"),p(va))}function ua(a){if(","==a)return p(ta,ua)}function va(a,b){if("as"==b)return Ma.marked="keyword",p(ta)}function wa(a,b){if("from"==b)return Ma.marked="keyword",p(x)}function xa(a){return"]"==a?p():o(R(y,"]"))}function ya(a,b){return"operator"==a.lastType||","==a.lastType||Ia.test(b.charAt(0))||/[,.]/.test(b.charAt(0))}var za,Aa,Ba=c.indentUnit,Ca=d.statementIndent,Da=d.jsonld,Ea=d.json||Da,Fa=d.typescript,Ga=d.wordCharacters||/[\w$\xa1-\uffff]/,Ha=(function(){function a(a){return{type:a,style:"keyword"}}var b=a("keyword a"),c=a("keyword b"),d=a("keyword c"),e=a("operator"),f={type:"atom",style:"atom"},g={if:a("if"),while:b,with:b,else:c,do:c,try:c,finally:c,return:d,break:d,continue:d,new:a("new"),delete:d,throw:d,debugger:d,var:a("var"),const:a("var"),let:a("var"),function:a("function"),catch:a("catch"),for:a("for"),switch:a("switch"),case:a("case"),default:a("default"),in:e,typeof:e,instanceof:e,true:f,false:f,null:f,undefined:f,NaN:f,Infinity:f,this:a("this"),class:a("class"),super:a("atom"),yield:d,export:a("export"),import:a("import"),extends:d,await:d};if(Fa){var h={type:"variable",style:"type"},i={interface:a("class"),implements:d,namespace:d,module:a("module"),enum:a("module"),public:a("modifier"),private:a("modifier"),protected:a("modifier"),abstract:a("modifier"),string:h,number:h,boolean:h,any:h};for(var j in i)g[j]=i[j]}return g})(),Ia=/[+\-*&%=<>!?|~^@]/,Ja=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,Ka="([{}])",La={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0},Ma={state:null,column:null,marked:null,cc:null},Na={name:"this",next:{name:"arguments"}};return u.lex=!0,{startState:function(a){var b={tokenize:g,lastType:"sof",cc:[],lexical:new l((a||0)-Ba,0,"block",!1),localVars:d.localVars,context:d.localVars&&{vars:d.localVars},indented:a||0};return d.globalVars&&"object"==typeof d.globalVars&&(b.globalVars=d.globalVars),b},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation(),k(a,b)),b.tokenize!=i&&a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"==za?c:(b.lastType="operator"!=za||"++"!=Aa&&"--"!=Aa?za:"incdec",n(b,c,za,Aa,a))},indent:function(b,c){if(b.tokenize==i)return a.Pass;if(b.tokenize!=g)return 0;var e,f=c&&c.charAt(0),h=b.lexical;if(!/^\s*else\b/.test(c))for(var j=b.cc.length-1;j>=0;--j){var k=b.cc[j];if(k==u)h=h.prev;else if(k!=da)break}for(;("stat"==h.type||"form"==h.type)&&("}"==f||(e=b.cc[b.cc.length-1])&&(e==D||e==E)&&!/^[,\.=+\-*:?[\(]/.test(c));)h=h.prev;Ca&&")"==h.type&&"stat"==h.prev.type&&(h=h.prev);var l=h.type,m=f==l;return"vardef"==l?h.indented+("operator"==b.lastType||","==b.lastType?h.info+1:0):"form"==l&&"{"==f?h.indented:"form"==l?h.indented+Ba:"stat"==l?h.indented+(ya(b,c)?Ca||Ba:0):"switch"!=h.info||m||0==d.doubleIndentSwitch?h.align?h.column+(m?0:1):h.indented+(m?0:Ba):h.indented+(/^(?:case|default)\b/.test(c)?Ba:2*Ba)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:Ea?null:"/*",blockCommentEnd:Ea?null:"*/",lineComment:Ea?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:Ea?"json":"javascript",jsonldMode:Da,jsonMode:Ea,expressionAllowed:b,skipExpression:function(a){var b=a.cc[a.cc.length-1];b!=x&&b!=y||a.cc.pop()}}})),a.registerHelper("wordChars","javascript",/[\w$]/),a.defineMIME("text/javascript","javascript"),a.defineMIME("text/ecmascript","javascript"),a.defineMIME("application/javascript","javascript"),a.defineMIME("application/x-javascript","javascript"),a.defineMIME("application/ecmascript","javascript"),a.defineMIME("application/json",{name:"javascript",json:!0}),a.defineMIME("application/x-json",{name:"javascript",json:!0}),a.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),a.defineMIME("text/typescript",{name:"javascript",typescript:!0}),a.defineMIME("application/typescript",{name:"javascript",typescript:!0})}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/jinja2/jinja2.js b/media/editors/codemirror/mode/jinja2/jinja2.js
index ed195581cfb3d..5d57d134488f7 100644
--- a/media/editors/codemirror/mode/jinja2/jinja2.js
+++ b/media/editors/codemirror/mode/jinja2/jinja2.js
@@ -107,7 +107,7 @@
         }
         return "variable";
       } else if (stream.eat("{")) {
-        if (ch = stream.eat("#")) {
+        if (stream.eat("#")) {
           state.incomment = true;
           if(!stream.skipTo("#}")) {
             stream.skipToEnd();
diff --git a/media/editors/codemirror/mode/jinja2/jinja2.min.js b/media/editors/codemirror/mode/jinja2/jinja2.min.js
index 1ee47056f02c4..d30b0ca9941cd 100644
--- a/media/editors/codemirror/mode/jinja2/jinja2.min.js
+++ b/media/editors/codemirror/mode/jinja2/jinja2.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("jinja2",(function(){function a(a,g){var h=a.peek();if(g.incomment)return a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(g.intag){if(g.operator){if(g.operator=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.sign){if(g.sign=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.instring)return h==g.instring&&(g.instring=!1),a.next(),"string";if("'"==h||'"'==h)return g.instring=h,a.next(),"string";if(a.match(g.intag+"}")||a.eat("-")&&a.match(g.intag+"}"))return g.intag=!1,"tag";if(a.match(c))return g.operator=!0,"operator";if(a.match(d))g.sign=!0;else if(a.eat(" ")||a.sol()){if(a.match(b))return"keyword";if(a.match(e))return"atom";if(a.match(f))return"number";a.sol()&&a.next()}else a.next();return"variable"}if(a.eat("{")){if(h=a.eat("#"))return g.incomment=!0,a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(h=a.eat(/\{|%/))return g.intag=h,"{"==h&&(g.intag="}"),a.eat("-"),"tag"}a.next()}var b=["and","as","block","endblock","by","cycle","debug","else","elif","extends","filter","endfilter","firstof","for","endfor","if","endif","ifchanged","endifchanged","ifequal","endifequal","ifnotequal","endifnotequal","in","include","load","not","now","or","parsed","regroup","reversed","spaceless","endspaceless","ssi","templatetag","openblock","closeblock","openvariable","closevariable","openbrace","closebrace","opencomment","closecomment","widthratio","url","with","endwith","get_current_language","trans","endtrans","noop","blocktrans","endblocktrans","get_available_languages","get_current_language_bidi","plural"],c=/^[+\-*&%=<>!?|~^]/,d=/^[:\[\(\{]/,e=["true","false"],f=/^(\d[+\-\*\/])?\d+(\.\d+)?/;return b=new RegExp("(("+b.join(")|(")+"))\\b"),e=new RegExp("(("+e.join(")|(")+"))\\b"),{startState:function(){return{tokenize:a}},token:function(a,b){return b.tokenize(a,b)}}}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("jinja2",(function(){function a(a,g){var h=a.peek();if(g.incomment)return a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(g.intag){if(g.operator){if(g.operator=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.sign){if(g.sign=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.instring)return h==g.instring&&(g.instring=!1),a.next(),"string";if("'"==h||'"'==h)return g.instring=h,a.next(),"string";if(a.match(g.intag+"}")||a.eat("-")&&a.match(g.intag+"}"))return g.intag=!1,"tag";if(a.match(c))return g.operator=!0,"operator";if(a.match(d))g.sign=!0;else if(a.eat(" ")||a.sol()){if(a.match(b))return"keyword";if(a.match(e))return"atom";if(a.match(f))return"number";a.sol()&&a.next()}else a.next();return"variable"}if(a.eat("{")){if(a.eat("#"))return g.incomment=!0,a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(h=a.eat(/\{|%/))return g.intag=h,"{"==h&&(g.intag="}"),a.eat("-"),"tag"}a.next()}var b=["and","as","block","endblock","by","cycle","debug","else","elif","extends","filter","endfilter","firstof","for","endfor","if","endif","ifchanged","endifchanged","ifequal","endifequal","ifnotequal","endifnotequal","in","include","load","not","now","or","parsed","regroup","reversed","spaceless","endspaceless","ssi","templatetag","openblock","closeblock","openvariable","closevariable","openbrace","closebrace","opencomment","closecomment","widthratio","url","with","endwith","get_current_language","trans","endtrans","noop","blocktrans","endblocktrans","get_available_languages","get_current_language_bidi","plural"],c=/^[+\-*&%=<>!?|~^]/,d=/^[:\[\(\{]/,e=["true","false"],f=/^(\d[+\-\*\/])?\d+(\.\d+)?/;return b=new RegExp("(("+b.join(")|(")+"))\\b"),e=new RegExp("(("+e.join(")|(")+"))\\b"),{startState:function(){return{tokenize:a}},token:function(a,b){return b.tokenize(a,b)}}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/julia/julia.js b/media/editors/codemirror/mode/julia/julia.js
index ad11d6b945702..9a36fd05a04f5 100644
--- a/media/editors/codemirror/mode/julia/julia.js
+++ b/media/editors/codemirror/mode/julia/julia.js
@@ -23,24 +23,27 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
 
   var operators = parserConf.operators || wordRegexp([
-      "\\.?[\\\\%*+\\-<>!=\\/^]=?", "\\.?[|&\\u00F7\\u2260\\u2264\\u2265]",
-      "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2229",
-      "\\u222A", "\\u2286", "\\u2288", "\\u228A", "\\u22c5", "\\?", "~", ":",
-      "\\$", "\\.[<>]", "<<=?", ">>>?=?", "\\.[<>=]=", "->?", "\\/\\/", "=>",
-      "<:", "\\bin\\b(?!\\()"], "");
+      "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "->", "\\/\\/",
+      "[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
+      "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
+      "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",
+      "\\u2265", "\\u2286", "\\u2288", "\\u228A", "\\u22C5",
+      "\\b(in|isa)\\b(?!\.?\\()"], "");
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
+  var identifiers = parserConf.identifiers ||
+      /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
 
   var chars = wordRegexp([octChar, hexChar, sChar, uChar], "'");
-  var openers = wordRegexp(["begin", "function", "type", "immutable", "let",
-      "macro", "for", "while", "quote", "if", "else", "elseif", "try",
+  var openers = wordRegexp(["begin", "function", "type", "struct", "immutable",
+      "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try",
       "finally", "catch", "do"]);
   var closers = wordRegexp(["end", "else", "elseif", "catch", "finally"]);
   var keywords = wordRegexp(["if", "else", "elseif", "while", "for", "begin",
       "let", "end", "do", "try", "catch", "finally", "return", "break",
       "continue", "global", "local", "const", "export", "import", "importall",
-      "using", "function", "macro", "module", "baremodule", "type",
-      "immutable", "quote", "typealias", "abstract", "bitstype"]);
+      "using", "function", "where", "macro", "module", "baremodule", "struct",
+      "type", "mutable", "immutable", "quote", "typealias", "abstract",
+      "primitive", "bitstype"]);
   var builtins = wordRegexp(["true", "false", "nothing", "NaN", "Inf"]);
 
   var macro = /^@[_A-Za-z][\w]*/;
@@ -90,7 +93,9 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       }
     }
 
-    if (stream.match(/^\.{2,3}/)) {
+    if (stream.match(/\.{4,}/)) {
+      return "error";
+    } else if (stream.match(/\.{1,3}/)) {
       return "operator";
     }
 
@@ -128,15 +133,6 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       state.leavingExpr = true;
     }
 
-    var match;
-    if (match = stream.match(openers, false)) {
-      state.scopes.push(match[0]);
-    }
-
-    if (stream.match(closers, false)) {
-      state.scopes.pop();
-    }
-
     if (inArray(state)) {
       if (state.lastToken == "end" && stream.match(/^:/)) {
         return "operator";
@@ -146,6 +142,15 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       }
     }
 
+    var match;
+    if (match = stream.match(openers, false)) {
+      state.scopes.push(match[0]);
+    }
+
+    if (stream.match(closers, false)) {
+      state.scopes.pop();
+    }
+
     // Handle type annotations
     if (stream.match(/^::(?![:\$])/)) {
       state.tokenize = tokenAnnotation;
@@ -153,14 +158,15 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     // Handle symbols
-    if (!leavingExpr && stream.match(symbol) || stream.match(/:\./)) {
+    if (!leavingExpr && stream.match(symbol) ||
+        stream.match(/:([<>]:|<<=?|>>>?=?|->|\/\/|\.{2,3}|[\.\\%*+\-<>!\/^|&]=?|[~\?\$])/)) {
       return "builtin";
     }
 
     // Handle parametric types
-    if (stream.match(/^{[^}]*}(?=\()/)) {
-      return "builtin";
-    }
+    //if (stream.match(/^{[^}]*}(?=\()/)) {
+    //  return "builtin";
+    //}
 
     // Handle operators and Delimiters
     if (stream.match(operators)) {
@@ -168,7 +174,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     // Handle Number Literals
-    if (stream.match(/^[0-9\.]/, false)) {
+    if (stream.match(/^\.?\d/, false)) {
       var imMatcher = RegExp(/^im\b/);
       var numberLiteral = false;
       // Floats
@@ -221,7 +227,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
 
     var isDefinition = state.isDefinition || state.lastToken == "function" ||
                        state.lastToken == "macro" || state.lastToken == "type" ||
-                       state.lastToken == "immutable";
+                       state.lastToken == "struct" || state.lastToken == "immutable";
 
     if (stream.match(identifiers)) {
       if (isDefinition) {
@@ -233,7 +239,8 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         return "def";
       }
       if (stream.match(/^({[^}]*})*\(/, false)) {
-        return callOrDef(stream, state);
+        state.tokenize = tokenCallOrDef;
+        return state.tokenize(stream, state);
       }
       state.leavingExpr = true;
       return "variable";
@@ -244,7 +251,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     return "error";
   }
 
-  function callOrDef(stream, state) {
+  function tokenCallOrDef(stream, state) {
     var match = stream.match(/^(\(\s*)/);
     if (match) {
       if (state.firstParenPos < 0)
@@ -256,10 +263,11 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       state.scopes.pop();
       state.charsAdvanced += 1;
       if (state.scopes.length <= state.firstParenPos) {
-        var isDefinition = stream.match(/^\s*?=(?!=)/, false);
+        var isDefinition = stream.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/, false);
         stream.backUp(state.charsAdvanced);
         state.firstParenPos = -1;
         state.charsAdvanced = 0;
+        state.tokenize = tokenBase;
         if (isDefinition)
           return "def";
         return "builtin";
@@ -274,10 +282,11 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         state.scopes.pop();
       state.firstParenPos = -1;
       state.charsAdvanced = 0;
+      state.tokenize = tokenBase;
       return "builtin";
     }
     state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
-    return callOrDef(stream, state);
+    return state.tokenize(stream, state);
   }
 
   function tokenAnnotation(stream, state) {
@@ -288,7 +297,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       state.nestedLevels--;
     }
     if (state.nestedLevels > 0) {
-      stream.match(/.*?(?={|})/);
+      stream.match(/.*?(?={|})/) || stream.next();
     } else if (state.nestedLevels == 0) {
       state.tokenize = tokenBase;
     }
@@ -381,11 +390,6 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         state.lastToken = current;
       }
 
-      // Handle '.' connected identifiers
-      if (current === '.') {
-        style = stream.match(identifiers, false) || stream.match(macro, false) ||
-                stream.match(/\(/, false) ? "operator" : "error";
-      }
       return style;
     },
 
diff --git a/media/editors/codemirror/mode/julia/julia.min.js b/media/editors/codemirror/mode/julia/julia.min.js
index eba9a3831922d..40ddf6a8f73ce 100644
--- a/media/editors/codemirror/mode/julia/julia.min.js
+++ b/media/editors/codemirror/mode/julia/julia.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("julia",(function(a,b){function c(a,b){return"undefined"==typeof b&&(b="\\b"),new RegExp("^(("+a.join(")|(")+"))"+b)}function d(a){return e(a,"[")}function e(a,b){var c=f(a),d=f(a,1);return"undefined"==typeof b&&(b="("),c===b||d===b&&"for"===c}function f(a,b){return"undefined"==typeof b&&(b=0),a.scopes.length<=b?null:a.scopes[a.scopes.length-(b+1)]}function g(a,b){if(a.match(/^#=/,!1))return b.tokenize=j,b.tokenize(a,b);var c=b.leavingExpr;if(a.sol()&&(c=!1),b.leavingExpr=!1,c&&a.match(/^'+/))return"operator";if(a.match(/^\.{2,3}/))return"operator";if(a.eatSpace())return null;var g=a.peek();if("#"===g)return a.skipToEnd(),"comment";"["===g&&b.scopes.push("["),"("===g&&b.scopes.push("(");var m=f(b);d(b)&&"]"===g&&("for"===m&&b.scopes.pop(),b.scopes.pop(),b.leavingExpr=!0),e(b)&&")"===g&&("for"===m&&b.scopes.pop(),b.scopes.pop(),b.leavingExpr=!0);var n;if((n=a.match(u,!1))&&b.scopes.push(n[0]),a.match(v,!1)&&b.scopes.pop(),d(b)){if("end"==b.lastToken&&a.match(/^:/))return"operator";if(a.match(/^end/))return"number"}if(a.match(/^::(?![:\$])/))return b.tokenize=i,b.tokenize(a,b);if(!c&&a.match(z)||a.match(/:\./))return"builtin";if(a.match(/^{[^}]*}(?=\()/))return"builtin";if(a.match(q))return"operator";if(a.match(/^[0-9\.]/,!1)){var o=RegExp(/^im\b/),p=!1;if(a.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)&&(p=!0),a.match(/^\d+\.(?!\.)\d*/)&&(p=!0),a.match(/^\.\d+/)&&(p=!0),a.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)&&(p=!0),a.match(/^0x[0-9a-f]+/i)&&(p=!0),a.match(/^0b[01]+/i)&&(p=!0),a.match(/^0o[0-7]+/i)&&(p=!0),a.match(/^[1-9]\d*(e[\+\-]?\d+)?/)&&(p=!0),a.match(/^0(?![\dx])/i)&&(p=!0),p)return a.match(o),b.leavingExpr=!0,"number"}if(a.match(/^'/))return b.tokenize=k,b.tokenize(a,b);if(a.match(A))return b.tokenize=l(a.current()),b.tokenize(a,b);if(a.match(y))return"meta";if(a.match(r))return null;if(a.match(w))return"keyword";if(a.match(x))return"builtin";var t=b.isDefinition||"function"==b.lastToken||"macro"==b.lastToken||"type"==b.lastToken||"immutable"==b.lastToken;return a.match(s)?t?"."===a.peek()?(b.isDefinition=!0,"variable"):(b.isDefinition=!1,"def"):a.match(/^({[^}]*})*\(/,!1)?h(a,b):(b.leavingExpr=!0,"variable"):(a.next(),"error")}function h(a,b){var c=a.match(/^(\(\s*)/);if(c&&(b.firstParenPos<0&&(b.firstParenPos=b.scopes.length),b.scopes.push("("),b.charsAdvanced+=c[1].length),"("==f(b)&&a.match(/^\)/)&&(b.scopes.pop(),b.charsAdvanced+=1,b.scopes.length<=b.firstParenPos)){var d=a.match(/^\s*?=(?!=)/,!1);return a.backUp(b.charsAdvanced),b.firstParenPos=-1,b.charsAdvanced=0,d?"def":"builtin"}if(a.match(/^$/g,!1)){for(a.backUp(b.charsAdvanced);b.scopes.length>b.firstParenPos;)b.scopes.pop();return b.firstParenPos=-1,b.charsAdvanced=0,"builtin"}return b.charsAdvanced+=a.match(/^([^()]*)/)[1].length,h(a,b)}function i(a,b){return a.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/),a.match(/^{/)?b.nestedLevels++:a.match(/^}/)&&b.nestedLevels--,b.nestedLevels>0?a.match(/.*?(?={|})/):0==b.nestedLevels&&(b.tokenize=g),"builtin"}function j(a,b){return a.match(/^#=/)&&b.nestedLevels++,a.match(/.*?(?=(#=|=#))/)||a.skipToEnd(),a.match(/^=#/)&&(b.nestedLevels--,0==b.nestedLevels&&(b.tokenize=g)),"comment"}function k(a,b){var c,d=!1;if(a.match(t))d=!0;else if(c=a.match(/\\u([a-f0-9]{1,4})(?=')/i)){var e=parseInt(c[1],16);(e<=55295||e>=57344)&&(d=!0,a.next())}else if(c=a.match(/\\U([A-Fa-f0-9]{5,8})(?=')/)){var e=parseInt(c[1],16);e<=1114111&&(d=!0,a.next())}return d?(b.leavingExpr=!0,b.tokenize=g,"string"):(a.match(/^[^']+(?=')/)||a.skipToEnd(),a.match(/^'/)&&(b.tokenize=g),"error")}function l(a){function b(b,c){if(b.eat("\\"))b.next();else{if(b.match(a))return c.tokenize=g,c.leavingExpr=!0,"string";b.eat(/[`"]/)}return b.eatWhile(/[^\\`"]/),"string"}return'"""'===a.substr(-3)?a='"""':'"'===a.substr(-1)&&(a='"'),b}var m="\\\\[0-7]{1,3}",n="\\\\x[A-Fa-f0-9]{1,2}",o="\\\\[abefnrtv0%?'\"\\\\]",p="([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])",q=b.operators||c(["\\.?[\\\\%*+\\-<>!=\\/^]=?","\\.?[|&\\u00F7\\u2260\\u2264\\u2265]","\\u00D7","\\u2208","\\u2209","\\u220B","\\u220C","\\u2229","\\u222A","\\u2286","\\u2288","\\u228A","\\u22c5","\\?","~",":","\\$","\\.[<>]","<<=?",">>>?=?","\\.[<>=]=","->?","\\/\\/","=>","<:","\\bin\\b(?!\\()"],""),r=b.delimiters||/^[;,()[\]{}]/,s=b.identifiers||/^[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/,t=c([m,n,o,p],"'"),u=c(["begin","function","type","immutable","let","macro","for","while","quote","if","else","elseif","try","finally","catch","do"]),v=c(["end","else","elseif","catch","finally"]),w=c(["if","else","elseif","while","for","begin","let","end","do","try","catch","finally","return","break","continue","global","local","const","export","import","importall","using","function","macro","module","baremodule","type","immutable","quote","typealias","abstract","bitstype"]),x=c(["true","false","nothing","NaN","Inf"]),y=/^@[_A-Za-z][\w]*/,z=/^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/,A=/^(`|([_A-Za-z\u00A1-\uFFFF]*"("")?))/,B={startState:function(){return{tokenize:g,scopes:[],lastToken:null,leavingExpr:!1,isDefinition:!1,nestedLevels:0,charsAdvanced:0,firstParenPos:-1}},token:function(a,b){var c=b.tokenize(a,b),d=a.current();return d&&c&&(b.lastToken=d),"."===d&&(c=a.match(s,!1)||a.match(y,!1)||a.match(/\(/,!1)?"operator":"error"),c},indent:function(b,c){var d=0;return"]"!==c&&")"!==c&&"end"!==c&&"else"!==c&&"catch"!==c&&"elseif"!==c&&"finally"!==c||(d=-1),(b.scopes.length+d)*a.indentUnit},electricInput:/\b(end|else|catch|finally)\b/,blockCommentStart:"#=",blockCommentEnd:"=#",lineComment:"#",fold:"indent"};return B})),a.defineMIME("text/x-julia","julia")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("julia",(function(a,b){function c(a,b){return"undefined"==typeof b&&(b="\\b"),new RegExp("^(("+a.join(")|(")+"))"+b)}function d(a){return e(a,"[")}function e(a,b){var c=f(a),d=f(a,1);return"undefined"==typeof b&&(b="("),c===b||d===b&&"for"===c}function f(a,b){return"undefined"==typeof b&&(b=0),a.scopes.length<=b?null:a.scopes[a.scopes.length-(b+1)]}function g(a,b){if(a.match(/^#=/,!1))return b.tokenize=j,b.tokenize(a,b);var c=b.leavingExpr;if(a.sol()&&(c=!1),b.leavingExpr=!1,c&&a.match(/^'+/))return"operator";if(a.match(/\.{4,}/))return"error";if(a.match(/\.{1,3}/))return"operator";if(a.eatSpace())return null;var g=a.peek();if("#"===g)return a.skipToEnd(),"comment";"["===g&&b.scopes.push("["),"("===g&&b.scopes.push("(");var m=f(b);if(d(b)&&"]"===g&&("for"===m&&b.scopes.pop(),b.scopes.pop(),b.leavingExpr=!0),e(b)&&")"===g&&("for"===m&&b.scopes.pop(),b.scopes.pop(),b.leavingExpr=!0),d(b)){if("end"==b.lastToken&&a.match(/^:/))return"operator";if(a.match(/^end/))return"number"}var n;if((n=a.match(u,!1))&&b.scopes.push(n[0]),a.match(v,!1)&&b.scopes.pop(),a.match(/^::(?![:\$])/))return b.tokenize=i,b.tokenize(a,b);if(!c&&a.match(z)||a.match(/:([<>]:|<<=?|>>>?=?|->|\/\/|\.{2,3}|[\.\\%*+\-<>!\/^|&]=?|[~\?\$])/))return"builtin";if(a.match(q))return"operator";if(a.match(/^\.?\d/,!1)){var o=RegExp(/^im\b/),p=!1;if(a.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)&&(p=!0),a.match(/^\d+\.(?!\.)\d*/)&&(p=!0),a.match(/^\.\d+/)&&(p=!0),a.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)&&(p=!0),a.match(/^0x[0-9a-f]+/i)&&(p=!0),a.match(/^0b[01]+/i)&&(p=!0),a.match(/^0o[0-7]+/i)&&(p=!0),a.match(/^[1-9]\d*(e[\+\-]?\d+)?/)&&(p=!0),a.match(/^0(?![\dx])/i)&&(p=!0),p)return a.match(o),b.leavingExpr=!0,"number"}if(a.match(/^'/))return b.tokenize=k,b.tokenize(a,b);if(a.match(A))return b.tokenize=l(a.current()),b.tokenize(a,b);if(a.match(y))return"meta";if(a.match(r))return null;if(a.match(w))return"keyword";if(a.match(x))return"builtin";var t=b.isDefinition||"function"==b.lastToken||"macro"==b.lastToken||"type"==b.lastToken||"struct"==b.lastToken||"immutable"==b.lastToken;return a.match(s)?t?"."===a.peek()?(b.isDefinition=!0,"variable"):(b.isDefinition=!1,"def"):a.match(/^({[^}]*})*\(/,!1)?(b.tokenize=h,b.tokenize(a,b)):(b.leavingExpr=!0,"variable"):(a.next(),"error")}function h(a,b){var c=a.match(/^(\(\s*)/);if(c&&(b.firstParenPos<0&&(b.firstParenPos=b.scopes.length),b.scopes.push("("),b.charsAdvanced+=c[1].length),"("==f(b)&&a.match(/^\)/)&&(b.scopes.pop(),b.charsAdvanced+=1,b.scopes.length<=b.firstParenPos)){var d=a.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/,!1);return a.backUp(b.charsAdvanced),b.firstParenPos=-1,b.charsAdvanced=0,b.tokenize=g,d?"def":"builtin"}if(a.match(/^$/g,!1)){for(a.backUp(b.charsAdvanced);b.scopes.length>b.firstParenPos;)b.scopes.pop();return b.firstParenPos=-1,b.charsAdvanced=0,b.tokenize=g,"builtin"}return b.charsAdvanced+=a.match(/^([^()]*)/)[1].length,b.tokenize(a,b)}function i(a,b){return a.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/),a.match(/^{/)?b.nestedLevels++:a.match(/^}/)&&b.nestedLevels--,b.nestedLevels>0?a.match(/.*?(?={|})/)||a.next():0==b.nestedLevels&&(b.tokenize=g),"builtin"}function j(a,b){return a.match(/^#=/)&&b.nestedLevels++,a.match(/.*?(?=(#=|=#))/)||a.skipToEnd(),a.match(/^=#/)&&(b.nestedLevels--,0==b.nestedLevels&&(b.tokenize=g)),"comment"}function k(a,b){var c,d=!1;if(a.match(t))d=!0;else if(c=a.match(/\\u([a-f0-9]{1,4})(?=')/i)){var e=parseInt(c[1],16);(e<=55295||e>=57344)&&(d=!0,a.next())}else if(c=a.match(/\\U([A-Fa-f0-9]{5,8})(?=')/)){var e=parseInt(c[1],16);e<=1114111&&(d=!0,a.next())}return d?(b.leavingExpr=!0,b.tokenize=g,"string"):(a.match(/^[^']+(?=')/)||a.skipToEnd(),a.match(/^'/)&&(b.tokenize=g),"error")}function l(a){function b(b,c){if(b.eat("\\"))b.next();else{if(b.match(a))return c.tokenize=g,c.leavingExpr=!0,"string";b.eat(/[`"]/)}return b.eatWhile(/[^\\`"]/),"string"}return'"""'===a.substr(-3)?a='"""':'"'===a.substr(-1)&&(a='"'),b}var m="\\\\[0-7]{1,3}",n="\\\\x[A-Fa-f0-9]{1,2}",o="\\\\[abefnrtv0%?'\"\\\\]",p="([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])",q=b.operators||c(["[<>]:","[<>=]=","<<=?",">>>?=?","=>","->","\\/\\/","[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?","\\?","\\$","~",":","\\u00D7","\\u2208","\\u2209","\\u220B","\\u220C","\\u2218","\\u221A","\\u221B","\\u2229","\\u222A","\\u2260","\\u2264","\\u2265","\\u2286","\\u2288","\\u228A","\\u22C5","\\b(in|isa)\\b(?!.?\\()"],""),r=b.delimiters||/^[;,()[\]{}]/,s=b.identifiers||/^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/,t=c([m,n,o,p],"'"),u=c(["begin","function","type","struct","immutable","let","macro","for","while","quote","if","else","elseif","try","finally","catch","do"]),v=c(["end","else","elseif","catch","finally"]),w=c(["if","else","elseif","while","for","begin","let","end","do","try","catch","finally","return","break","continue","global","local","const","export","import","importall","using","function","where","macro","module","baremodule","struct","type","mutable","immutable","quote","typealias","abstract","primitive","bitstype"]),x=c(["true","false","nothing","NaN","Inf"]),y=/^@[_A-Za-z][\w]*/,z=/^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/,A=/^(`|([_A-Za-z\u00A1-\uFFFF]*"("")?))/,B={startState:function(){return{tokenize:g,scopes:[],lastToken:null,leavingExpr:!1,isDefinition:!1,nestedLevels:0,charsAdvanced:0,firstParenPos:-1}},token:function(a,b){var c=b.tokenize(a,b),d=a.current();return d&&c&&(b.lastToken=d),c},indent:function(b,c){var d=0;return"]"!==c&&")"!==c&&"end"!==c&&"else"!==c&&"catch"!==c&&"elseif"!==c&&"finally"!==c||(d=-1),(b.scopes.length+d)*a.indentUnit},electricInput:/\b(end|else|catch|finally)\b/,blockCommentStart:"#=",blockCommentEnd:"=#",lineComment:"#",fold:"indent"};return B})),a.defineMIME("text/x-julia","julia")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/markdown/markdown.js b/media/editors/codemirror/mode/markdown/markdown.js
index 6060ae371697f..db8359e9b986a 100644
--- a/media/editors/codemirror/mode/markdown/markdown.js
+++ b/media/editors/codemirror/mode/markdown/markdown.js
@@ -47,6 +47,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.strikethrough === undefined)
     modeCfg.strikethrough = false;
 
+  if (modeCfg.emoji === undefined)
+    modeCfg.emoji = false;
+
   // Allow token types to be overridden by user-provided token types.
   if (modeCfg.tokenTypeOverrides === undefined)
     modeCfg.tokenTypeOverrides = {};
@@ -69,7 +72,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     linkHref: "string",
     em: "em",
     strong: "strong",
-    strikethrough: "strikethrough"
+    strikethrough: "strikethrough",
+    emoji: "builtin"
   };
 
   for (var tokenType in tokenTypes) {
@@ -83,10 +87,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow listRE
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
-  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
   ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
                                 ")[ \\t]*([\\w+#\-]*)")
   ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
+  ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -131,7 +136,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function blockNormal(stream, state) {
-
     var sol = stream.sol();
 
     var prevLineIsList = state.list !== false,
@@ -139,29 +143,36 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     state.indentedCode = false;
 
-    if (prevLineIsList) {
-      if (state.indentationDiff >= 0) { // Continued list
-        if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
-          state.indentation -= state.indentationDiff;
-        }
+    var lineIndentation;
+    // compute once per line (on first token)
+    if (state.indentationDiff === null) {
+      lineIndentation = state.indentation;
+      state.indentationDiff = state.indentation;
+      if (prevLineIsList) {
         state.list = null;
-      } else if (state.indentation > 0) {
-        state.list = null;
-      } else { // No longer a list
-        state.list = false;
+        // While this list item's marker's indentation is less than the deepest
+        //  list item's content's indentation,pop the deepest list item
+        //  indentation off the stack, and update block indentation state
+        while (lineIndentation < state.listStack[state.listStack.length - 1]) {
+          state.listStack.pop();
+          if (state.listStack.length) {
+            state.indentation = state.listStack[state.listStack.length - 1];
+          // less than the first list's indent -> the line is no longer a list
+          } else {
+            state.list = false;
+          }
+        }
+        if (state.list !== false) {
+          state.indentationDiff = lineIndentation - state.listStack[state.listStack.length - 1]
+        }
       }
     }
 
     var match = null;
-    if (state.indentationDiff >= 4) {
+    if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || lineIsEmpty(state.prevLine))) {
       stream.skipToEnd();
-      if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
-        state.indentation -= 4;
-        state.indentedCode = true;
-        return tokenTypes.code;
-      } else {
-        return null;
-      }
+      state.indentedCode = true;
+      return tokenTypes.code;
     } else if (stream.eatSpace()) {
       return null;
     } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
@@ -187,15 +198,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return tokenTypes.hr;
     } else if (match = stream.match(listRE)) {
       var listType = match[1] ? "ol" : "ul";
-      state.indentation = stream.column() + stream.current().length;
-      state.list = true;
 
-      // While this list item's marker's indentation
-      // is less than the deepest list item's content's indentation,
-      // pop the deepest list item indentation off the stack.
-      while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
-        state.listStack.pop();
-      }
+      state.indentation = lineIndentation + stream.current().length;
+      state.list = true;
 
       // Add this list item's content's indentation to the stack
       state.listStack.push(state.indentation);
@@ -298,6 +303,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (state.strong) { styles.push(tokenTypes.strong); }
       if (state.em) { styles.push(tokenTypes.em); }
       if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+      if (state.emoji) { styles.push(tokenTypes.emoji); }
       if (state.linkText) { styles.push(tokenTypes.linkText); }
       if (state.code) { styles.push(tokenTypes.code); }
       if (state.image) { styles.push(tokenTypes.image); }
@@ -441,17 +447,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type;
     }
 
-    if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && !state.image) {
+    if (ch === '[' && !state.image) {
       state.linkText = true;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       return getType(state);
     }
 
-    if (ch === ']' && state.linkText && stream.match(/\(.*?\)| ?\[.*?\]/, false)) {
+    if (ch === ']' && state.linkText) {
       if (modeCfg.highlightFormatting) state.formatting = "link";
       var type = getType(state);
       state.linkText = false;
-      state.inline = state.f = linkHref;
+      state.inline = state.f = stream.match(/\(.*?\)| ?\[.*?\]/, false) ? linkHref : inlineNormal
       return type;
     }
 
@@ -555,6 +561,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    if (modeCfg.emoji && ch === ":" && stream.match(/^[a-z_\d+-]+:/)) {
+      state.emoji = true;
+      if (modeCfg.highlightFormatting) state.formatting = "emoji";
+      var retType = getType(state);
+      state.emoji = false;
+      return retType;
+    }
+
     if (ch === ' ') {
       if (stream.match(/ +$/, false)) {
         state.trailingSpace++;
@@ -593,7 +607,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
     var ch = stream.next();
     if (ch === '(' || ch === '[') {
-      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]", 0);
+      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
       if (modeCfg.highlightFormatting) state.formatting = "link-string";
       state.linkHref = true;
       return getType(state);
@@ -603,7 +617,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var linkRE = {
     ")": /^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,
-    "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\\]]|\\.)*\])*?(?=\])/
+    "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/
   }
 
   function getLinkHrefInside(endChar) {
@@ -697,6 +711,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         trailingSpace: 0,
         trailingSpaceNewLine: false,
         strikethrough: false,
+        emoji: false,
         fencedChars: null
       };
     },
@@ -718,11 +733,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         inline: s.inline,
         text: s.text,
         formatting: false,
+        linkText: s.linkText,
         linkTitle: s.linkTitle,
         code: s.code,
         em: s.em,
         strong: s.strong,
         strikethrough: s.strikethrough,
+        emoji: s.emoji,
         header: s.header,
         hr: s.hr,
         taskList: s.taskList,
@@ -743,16 +760,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream != state.thisLine) {
-        var forceBlankLine = state.header || state.hr;
-
         // Reset state.header and state.hr
         state.header = 0;
         state.hr = false;
 
-        if (stream.match(/^\s*$/, true) || forceBlankLine) {
+        if (stream.match(/^\s*$/, true)) {
           blankLine(state);
-          if (!forceBlankLine) return null
-          state.prevLine = null
+          return null;
         }
 
         state.prevLine = state.thisLine
@@ -766,10 +780,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.trailingSpaceNewLine = false;
 
         state.f = state.block;
-        var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-        state.indentationDiff = Math.min(indentation - state.indentation, 4);
-        state.indentation = state.indentation + state.indentationDiff;
-        if (indentation > 0) return null;
+        if (state.f != htmlBlock) {
+          var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, expandedTab).length;
+          state.indentation = indentation;
+          state.indentationDiff = null;
+          if (indentation > 0) return null;
+        }
       }
       return state.f(stream, state);
     },
@@ -780,6 +796,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return {state: state, mode: mode};
     },
 
+    indent: function(state, textAfter, line) {
+      if (state.block == htmlBlock) return htmlMode.indent(state.htmlState, textAfter, line)
+      if (state.localState) return state.localMode.indent(state.localState, textAfter, line)
+      return CodeMirror.Pass
+    },
+
     blankLine: blankLine,
 
     getType: getType,
diff --git a/media/editors/codemirror/mode/markdown/markdown.min.js b/media/editors/codemirror/mode/markdown/markdown.min.js
index eb8531106422b..33fc0a7d8247b 100644
--- a/media/editors/codemirror/mode/markdown/markdown.min.js
+++ b/media/editors/codemirror/mode/markdown/markdown.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../xml/xml"),require("../meta")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../meta"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("markdown",(function(b,c){function d(c){if(a.findModeByName){var d=a.findModeByName(c);d&&(c=d.mime||d.mimes[0])}var e=a.getMode(b,c);return"null"==e.name?null:e}function e(a,b,c){return b.f=b.inline=c,c(a,b)}function f(a,b,c){return b.f=b.block=c,c(a,b)}function g(a){return!a||!/\S/.test(a.string)}function h(a){return a.linkTitle=!1,a.em=!1,a.strong=!1,a.strikethrough=!1,a.quote=0,a.indentedCode=!1,a.f==j&&(a.f=n,a.block=i),a.trailingSpace=0,a.trailingSpaceNewLine=!1,a.prevLine=a.thisLine,a.thisLine=null,null}function i(b,f){var h=b.sol(),i=f.list!==!1,j=f.indentedCode;f.indentedCode=!1,i&&(f.indentationDiff>=0?(f.indentationDiff<4&&(f.indentation-=f.indentationDiff),f.list=null):f.indentation>0?f.list=null:f.list=!1);var m=null;if(f.indentationDiff>=4)return b.skipToEnd(),j||g(f.prevLine)?(f.indentation-=4,f.indentedCode=!0,w.code):null;if(b.eatSpace())return null;if((m=b.match(B))&&m[1].length<=6)return f.header=m[1].length,c.highlightFormatting&&(f.formatting="header"),f.f=f.inline,l(f);if(!(g(f.prevLine)||f.quote||i||j)&&(m=b.match(C)))return f.header="="==m[0].charAt(0)?1:2,c.highlightFormatting&&(f.formatting="header"),f.f=f.inline,l(f);if(b.eat(">"))return f.quote=h?1:f.quote+1,c.highlightFormatting&&(f.formatting="quote"),b.eatSpace(),l(f);if("["===b.peek())return e(b,f,r);if(b.match(y,!0))return f.hr=!0,w.hr;if(m=b.match(z)){var n=m[1]?"ol":"ul";for(f.indentation=b.column()+b.current().length,f.list=!0;f.listStack&&b.column()<f.listStack[f.listStack.length-1];)f.listStack.pop();return f.listStack.push(f.indentation),c.taskLists&&b.match(A,!1)&&(f.taskList=!0),f.f=f.inline,c.highlightFormatting&&(f.formatting=["list","list-"+n]),l(f)}return c.fencedCodeBlocks&&(m=b.match(E,!0))?(f.fencedChars=m[1],f.localMode=d(m[2]),f.localMode&&(f.localState=a.startState(f.localMode)),f.f=f.block=k,c.highlightFormatting&&(f.formatting="code-block"),f.code=-1,l(f)):e(b,f,f.inline)}function j(b,c){var d=u.token(b,c.htmlState);if(!v){var e=a.innerMode(u,c.htmlState);("xml"==e.mode.name&&null===e.state.tagStart&&!e.state.context&&e.state.tokenize.isInText||c.md_inside&&b.current().indexOf(">")>-1)&&(c.f=n,c.block=i,c.htmlState=null)}return d}function k(a,b){if(b.fencedChars&&a.match(b.fencedChars)){c.highlightFormatting&&(b.formatting="code-block");var d=l(b);return b.localMode=b.localState=null,b.block=i,b.f=n,b.fencedChars=null,b.code=0,d}return b.fencedChars&&a.skipTo(b.fencedChars)?"comment":b.localMode?b.localMode.token(a,b.localState):(a.skipToEnd(),w.code)}function l(a){var b=[];if(a.formatting){b.push(w.formatting),"string"==typeof a.formatting&&(a.formatting=[a.formatting]);for(var d=0;d<a.formatting.length;d++)b.push(w.formatting+"-"+a.formatting[d]),"header"===a.formatting[d]&&b.push(w.formatting+"-"+a.formatting[d]+"-"+a.header),"quote"===a.formatting[d]&&(!c.maxBlockquoteDepth||c.maxBlockquoteDepth>=a.quote?b.push(w.formatting+"-"+a.formatting[d]+"-"+a.quote):b.push("error"))}if(a.taskOpen)return b.push("meta"),b.length?b.join(" "):null;if(a.taskClosed)return b.push("property"),b.length?b.join(" "):null;if(a.linkHref?b.push(w.linkHref,"url"):(a.strong&&b.push(w.strong),a.em&&b.push(w.em),a.strikethrough&&b.push(w.strikethrough),a.linkText&&b.push(w.linkText),a.code&&b.push(w.code),a.image&&b.push(w.image),a.imageAltText&&b.push(w.imageAltText,"link"),a.imageMarker&&b.push(w.imageMarker)),a.header&&b.push(w.header,w.header+"-"+a.header),a.quote&&(b.push(w.quote),!c.maxBlockquoteDepth||c.maxBlockquoteDepth>=a.quote?b.push(w.quote+"-"+a.quote):b.push(w.quote+"-"+c.maxBlockquoteDepth)),a.list!==!1){var e=(a.listStack.length-1)%3;e?1===e?b.push(w.list2):b.push(w.list3):b.push(w.list1)}return a.trailingSpaceNewLine?b.push("trailing-space-new-line"):a.trailingSpace&&b.push("trailing-space-"+(a.trailingSpace%2?"a":"b")),b.length?b.join(" "):null}function m(a,b){if(a.match(D,!0))return l(b)}function n(b,d){var e=d.text(b,d);if("undefined"!=typeof e)return e;if(d.list)return d.list=null,l(d);if(d.taskList){var g="x"!==b.match(A,!0)[1];return g?d.taskOpen=!0:d.taskClosed=!0,c.highlightFormatting&&(d.formatting="task"),d.taskList=!1,l(d)}if(d.taskOpen=!1,d.taskClosed=!1,d.header&&b.match(/^#+$/,!0))return c.highlightFormatting&&(d.formatting="header"),l(d);var h=b.next();if(d.linkTitle){d.linkTitle=!1;var i=h;"("===h&&(i=")"),i=(i+"").replace(/([.?*+^\[\]\\(){}|-])/g,"\\$1");var k="^\\s*(?:[^"+i+"\\\\]+|\\\\\\\\|\\\\.)"+i;if(b.match(new RegExp(k),!0))return w.linkHref}if("`"===h){var m=d.formatting;c.highlightFormatting&&(d.formatting="code"),b.eatWhile("`");var n=b.current().length;if(0==d.code)return d.code=n,l(d);if(n==d.code){var q=l(d);return d.code=0,q}return d.formatting=m,l(d)}if(d.code)return l(d);if("\\"===h&&(b.next(),c.highlightFormatting)){var r=l(d),s=w.formatting+"-escape";return r?r+" "+s:s}if("!"===h&&b.match(/\[[^\]]*\] ?(?:\(|\[)/,!1))return d.imageMarker=!0,d.image=!0,c.highlightFormatting&&(d.formatting="image"),l(d);if("["===h&&d.imageMarker&&b.match(/[^\]]*\](\(.*?\)| ?\[.*?\])/,!1))return d.imageMarker=!1,d.imageAltText=!0,c.highlightFormatting&&(d.formatting="image"),l(d);if("]"===h&&d.imageAltText){c.highlightFormatting&&(d.formatting="image");var r=l(d);return d.imageAltText=!1,d.image=!1,d.inline=d.f=p,r}if("["===h&&b.match(/[^\]]*\](\(.*\)| ?\[.*?\])/,!1)&&!d.image)return d.linkText=!0,c.highlightFormatting&&(d.formatting="link"),l(d);if("]"===h&&d.linkText&&b.match(/\(.*?\)| ?\[.*?\]/,!1)){c.highlightFormatting&&(d.formatting="link");var r=l(d);return d.linkText=!1,d.inline=d.f=p,r}if("<"===h&&b.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/,!1)){d.f=d.inline=o,c.highlightFormatting&&(d.formatting="link");var r=l(d);return r?r+=" ":r="",r+w.linkInline}if("<"===h&&b.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/,!1)){d.f=d.inline=o,c.highlightFormatting&&(d.formatting="link");var r=l(d);return r?r+=" ":r="",r+w.linkEmail}if("<"===h&&b.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^ >]+)?)*\s*>)/i,!1)){var t=b.string.indexOf(">",b.pos);if(t!=-1){var v=b.string.substring(b.start,t);/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(v)&&(d.md_inside=!0)}return b.backUp(1),d.htmlState=a.startState(u),f(b,d,j)}if("<"===h&&b.match(/^\/\w*?>/))return d.md_inside=!1,"tag";if("*"===h||"_"===h){for(var x=1,y=1==b.pos?" ":b.string.charAt(b.pos-2);x<3&&b.eat(h);)x++;var z=b.peek()||" ",B=!/\s/.test(z)&&(!F.test(z)||/\s/.test(y)||F.test(y)),C=!/\s/.test(y)&&(!F.test(y)||/\s/.test(z)||F.test(z)),D=null,E=null;if(x%2&&(d.em||!B||"*"!==h&&C&&!F.test(y)?d.em!=h||!C||"*"!==h&&B&&!F.test(z)||(D=!1):D=!0),x>1&&(d.strong||!B||"*"!==h&&C&&!F.test(y)?d.strong!=h||!C||"*"!==h&&B&&!F.test(z)||(E=!1):E=!0),null!=E||null!=D){c.highlightFormatting&&(d.formatting=null==D?"strong":null==E?"em":"strong em"),D===!0&&(d.em=h),E===!0&&(d.strong=h);var q=l(d);return D===!1&&(d.em=!1),E===!1&&(d.strong=!1),q}}else if(" "===h&&(b.eat("*")||b.eat("_"))){if(" "===b.peek())return l(d);b.backUp(1)}if(c.strikethrough)if("~"===h&&b.eatWhile(h)){if(d.strikethrough){c.highlightFormatting&&(d.formatting="strikethrough");var q=l(d);return d.strikethrough=!1,q}if(b.match(/^[^\s]/,!1))return d.strikethrough=!0,c.highlightFormatting&&(d.formatting="strikethrough"),l(d)}else if(" "===h&&b.match(/^~~/,!0)){if(" "===b.peek())return l(d);b.backUp(2)}return" "===h&&(b.match(/ +$/,!1)?d.trailingSpace++:d.trailingSpace&&(d.trailingSpaceNewLine=!0)),l(d)}function o(a,b){var d=a.next();if(">"===d){b.f=b.inline=n,c.highlightFormatting&&(b.formatting="link");var e=l(b);return e?e+=" ":e="",e+w.linkInline}return a.match(/^[^>]+/,!0),w.linkInline}function p(a,b){if(a.eatSpace())return null;var d=a.next();return"("===d||"["===d?(b.f=b.inline=q("("===d?")":"]",0),c.highlightFormatting&&(b.formatting="link-string"),b.linkHref=!0,l(b)):"error"}function q(a){return function(b,d){var e=b.next();if(e===a){d.f=d.inline=n,c.highlightFormatting&&(d.formatting="link-string");var f=l(d);return d.linkHref=!1,f}return b.match(G[a]),d.linkHref=!0,l(d)}}function r(a,b){return a.match(/^([^\]\\]|\\.)*\]:/,!1)?(b.f=s,a.next(),c.highlightFormatting&&(b.formatting="link"),b.linkText=!0,l(b)):e(a,b,n)}function s(a,b){if(a.match(/^\]:/,!0)){b.f=b.inline=t,c.highlightFormatting&&(b.formatting="link");var d=l(b);return b.linkText=!1,d}return a.match(/^([^\]\\]|\\.)+/,!0),w.linkText}function t(a,b){return a.eatSpace()?null:(a.match(/^[^\s]+/,!0),void 0===a.peek()?b.linkTitle=!0:a.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/,!0),b.f=b.inline=n,w.linkHref+" url")}var u=a.getMode(b,"text/html"),v="null"==u.name;void 0===c.highlightFormatting&&(c.highlightFormatting=!1),void 0===c.maxBlockquoteDepth&&(c.maxBlockquoteDepth=0),void 0===c.taskLists&&(c.taskLists=!1),void 0===c.strikethrough&&(c.strikethrough=!1),void 0===c.tokenTypeOverrides&&(c.tokenTypeOverrides={});var w={header:"header",code:"comment",quote:"quote",list1:"variable-2",list2:"variable-3",list3:"keyword",hr:"hr",image:"image",imageAltText:"image-alt-text",imageMarker:"image-marker",formatting:"formatting",linkInline:"link",linkEmail:"link",linkText:"link",linkHref:"string",em:"em",strong:"strong",strikethrough:"strikethrough"};for(var x in w)w.hasOwnProperty(x)&&c.tokenTypeOverrides[x]&&(w[x]=c.tokenTypeOverrides[x]);var y=/^([*\-_])(?:\s*\1){2,}\s*$/,z=/^(?:[*\-+]|^[0-9]+([.)]))\s+/,A=/^\[(x| )\](?=\s)/,B=c.allowAtxHeaderWithoutSpace?/^(#+)/:/^(#+)(?: |$)/,C=/^ *(?:\={1,}|-{1,})\s*$/,D=/^[^#!\[\]*_\\<>` "'(~]+/,E=new RegExp("^("+(c.fencedCodeBlocks===!0?"~~~+|```+":c.fencedCodeBlocks)+")[ \\t]*([\\w+#-]*)"),F=/[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/,G={")":/^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,"]":/^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\\]]|\\.)*\])*?(?=\])/},H={startState:function(){return{f:i,prevLine:null,thisLine:null,block:i,htmlState:null,indentation:0,inline:n,text:m,formatting:!1,linkText:!1,linkHref:!1,linkTitle:!1,code:0,em:!1,strong:!1,header:0,hr:!1,taskList:!1,list:!1,listStack:[],quote:0,trailingSpace:0,trailingSpaceNewLine:!1,strikethrough:!1,fencedChars:null}},copyState:function(b){return{f:b.f,prevLine:b.prevLine,thisLine:b.thisLine,block:b.block,htmlState:b.htmlState&&a.copyState(u,b.htmlState),indentation:b.indentation,localMode:b.localMode,localState:b.localMode?a.copyState(b.localMode,b.localState):null,inline:b.inline,text:b.text,formatting:!1,linkTitle:b.linkTitle,code:b.code,em:b.em,strong:b.strong,strikethrough:b.strikethrough,header:b.header,hr:b.hr,taskList:b.taskList,list:b.list,listStack:b.listStack.slice(0),quote:b.quote,indentedCode:b.indentedCode,trailingSpace:b.trailingSpace,trailingSpaceNewLine:b.trailingSpaceNewLine,md_inside:b.md_inside,fencedChars:b.fencedChars}},token:function(a,b){if(b.formatting=!1,a!=b.thisLine){var c=b.header||b.hr;if(b.header=0,b.hr=!1,a.match(/^\s*$/,!0)||c){if(h(b),!c)return null;b.prevLine=null}b.prevLine=b.thisLine,b.thisLine=a,b.taskList=!1,b.trailingSpace=0,b.trailingSpaceNewLine=!1,b.f=b.block;var d=a.match(/^\s*/,!0)[0].replace(/\t/g,"    ").length;if(b.indentationDiff=Math.min(d-b.indentation,4),b.indentation=b.indentation+b.indentationDiff,d>0)return null}return b.f(a,b)},innerMode:function(a){return a.block==j?{state:a.htmlState,mode:u}:a.localState?{state:a.localState,mode:a.localMode}:{state:a,mode:H}},blankLine:h,getType:l,closeBrackets:"()[]{}''\"\"``",fold:"markdown"};return H}),"xml"),a.defineMIME("text/x-markdown","markdown")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../xml/xml"),require("../meta")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../meta"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("markdown",(function(b,c){function d(c){if(a.findModeByName){var d=a.findModeByName(c);d&&(c=d.mime||d.mimes[0])}var e=a.getMode(b,c);return"null"==e.name?null:e}function e(a,b,c){return b.f=b.inline=c,c(a,b)}function f(a,b,c){return b.f=b.block=c,c(a,b)}function g(a){return!a||!/\S/.test(a.string)}function h(a){return a.linkTitle=!1,a.em=!1,a.strong=!1,a.strikethrough=!1,a.quote=0,a.indentedCode=!1,a.f==j&&(a.f=n,a.block=i),a.trailingSpace=0,a.trailingSpaceNewLine=!1,a.prevLine=a.thisLine,a.thisLine=null,null}function i(b,f){var h=b.sol(),i=f.list!==!1,j=f.indentedCode;f.indentedCode=!1;var m;if(null===f.indentationDiff&&(m=f.indentation,f.indentationDiff=f.indentation,i)){for(f.list=null;m<f.listStack[f.listStack.length-1];)f.listStack.pop(),f.listStack.length?f.indentation=f.listStack[f.listStack.length-1]:f.list=!1;f.list!==!1&&(f.indentationDiff=m-f.listStack[f.listStack.length-1])}var n=null;if(f.indentationDiff>=4&&(j||g(f.prevLine)))return b.skipToEnd(),f.indentedCode=!0,w.code;if(b.eatSpace())return null;if((n=b.match(B))&&n[1].length<=6)return f.header=n[1].length,c.highlightFormatting&&(f.formatting="header"),f.f=f.inline,l(f);if(!(g(f.prevLine)||f.quote||i||j)&&(n=b.match(C)))return f.header="="==n[0].charAt(0)?1:2,c.highlightFormatting&&(f.formatting="header"),f.f=f.inline,l(f);if(b.eat(">"))return f.quote=h?1:f.quote+1,c.highlightFormatting&&(f.formatting="quote"),b.eatSpace(),l(f);if("["===b.peek())return e(b,f,r);if(b.match(y,!0))return f.hr=!0,w.hr;if(n=b.match(z)){var o=n[1]?"ol":"ul";return f.indentation=m+b.current().length,f.list=!0,f.listStack.push(f.indentation),c.taskLists&&b.match(A,!1)&&(f.taskList=!0),f.f=f.inline,c.highlightFormatting&&(f.formatting=["list","list-"+o]),l(f)}return c.fencedCodeBlocks&&(n=b.match(E,!0))?(f.fencedChars=n[1],f.localMode=d(n[2]),f.localMode&&(f.localState=a.startState(f.localMode)),f.f=f.block=k,c.highlightFormatting&&(f.formatting="code-block"),f.code=-1,l(f)):e(b,f,f.inline)}function j(b,c){var d=u.token(b,c.htmlState);if(!v){var e=a.innerMode(u,c.htmlState);("xml"==e.mode.name&&null===e.state.tagStart&&!e.state.context&&e.state.tokenize.isInText||c.md_inside&&b.current().indexOf(">")>-1)&&(c.f=n,c.block=i,c.htmlState=null)}return d}function k(a,b){if(b.fencedChars&&a.match(b.fencedChars)){c.highlightFormatting&&(b.formatting="code-block");var d=l(b);return b.localMode=b.localState=null,b.block=i,b.f=n,b.fencedChars=null,b.code=0,d}return b.fencedChars&&a.skipTo(b.fencedChars)?"comment":b.localMode?b.localMode.token(a,b.localState):(a.skipToEnd(),w.code)}function l(a){var b=[];if(a.formatting){b.push(w.formatting),"string"==typeof a.formatting&&(a.formatting=[a.formatting]);for(var d=0;d<a.formatting.length;d++)b.push(w.formatting+"-"+a.formatting[d]),"header"===a.formatting[d]&&b.push(w.formatting+"-"+a.formatting[d]+"-"+a.header),"quote"===a.formatting[d]&&(!c.maxBlockquoteDepth||c.maxBlockquoteDepth>=a.quote?b.push(w.formatting+"-"+a.formatting[d]+"-"+a.quote):b.push("error"))}if(a.taskOpen)return b.push("meta"),b.length?b.join(" "):null;if(a.taskClosed)return b.push("property"),b.length?b.join(" "):null;if(a.linkHref?b.push(w.linkHref,"url"):(a.strong&&b.push(w.strong),a.em&&b.push(w.em),a.strikethrough&&b.push(w.strikethrough),a.emoji&&b.push(w.emoji),a.linkText&&b.push(w.linkText),a.code&&b.push(w.code),a.image&&b.push(w.image),a.imageAltText&&b.push(w.imageAltText,"link"),a.imageMarker&&b.push(w.imageMarker)),a.header&&b.push(w.header,w.header+"-"+a.header),a.quote&&(b.push(w.quote),!c.maxBlockquoteDepth||c.maxBlockquoteDepth>=a.quote?b.push(w.quote+"-"+a.quote):b.push(w.quote+"-"+c.maxBlockquoteDepth)),a.list!==!1){var e=(a.listStack.length-1)%3;e?1===e?b.push(w.list2):b.push(w.list3):b.push(w.list1)}return a.trailingSpaceNewLine?b.push("trailing-space-new-line"):a.trailingSpace&&b.push("trailing-space-"+(a.trailingSpace%2?"a":"b")),b.length?b.join(" "):null}function m(a,b){if(a.match(D,!0))return l(b)}function n(b,d){var e=d.text(b,d);if("undefined"!=typeof e)return e;if(d.list)return d.list=null,l(d);if(d.taskList){var g="x"!==b.match(A,!0)[1];return g?d.taskOpen=!0:d.taskClosed=!0,c.highlightFormatting&&(d.formatting="task"),d.taskList=!1,l(d)}if(d.taskOpen=!1,d.taskClosed=!1,d.header&&b.match(/^#+$/,!0))return c.highlightFormatting&&(d.formatting="header"),l(d);var h=b.next();if(d.linkTitle){d.linkTitle=!1;var i=h;"("===h&&(i=")"),i=(i+"").replace(/([.?*+^\[\]\\(){}|-])/g,"\\$1");var k="^\\s*(?:[^"+i+"\\\\]+|\\\\\\\\|\\\\.)"+i;if(b.match(new RegExp(k),!0))return w.linkHref}if("`"===h){var m=d.formatting;c.highlightFormatting&&(d.formatting="code"),b.eatWhile("`");var q=b.current().length;if(0==d.code)return d.code=q,l(d);if(q==d.code){var r=l(d);return d.code=0,r}return d.formatting=m,l(d)}if(d.code)return l(d);if("\\"===h&&(b.next(),c.highlightFormatting)){var s=l(d),t=w.formatting+"-escape";return s?s+" "+t:t}if("!"===h&&b.match(/\[[^\]]*\] ?(?:\(|\[)/,!1))return d.imageMarker=!0,d.image=!0,c.highlightFormatting&&(d.formatting="image"),l(d);if("["===h&&d.imageMarker&&b.match(/[^\]]*\](\(.*?\)| ?\[.*?\])/,!1))return d.imageMarker=!1,d.imageAltText=!0,c.highlightFormatting&&(d.formatting="image"),l(d);if("]"===h&&d.imageAltText){c.highlightFormatting&&(d.formatting="image");var s=l(d);return d.imageAltText=!1,d.image=!1,d.inline=d.f=p,s}if("["===h&&!d.image)return d.linkText=!0,c.highlightFormatting&&(d.formatting="link"),l(d);if("]"===h&&d.linkText){c.highlightFormatting&&(d.formatting="link");var s=l(d);return d.linkText=!1,d.inline=d.f=b.match(/\(.*?\)| ?\[.*?\]/,!1)?p:n,s}if("<"===h&&b.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/,!1)){d.f=d.inline=o,c.highlightFormatting&&(d.formatting="link");var s=l(d);return s?s+=" ":s="",s+w.linkInline}if("<"===h&&b.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/,!1)){d.f=d.inline=o,c.highlightFormatting&&(d.formatting="link");var s=l(d);return s?s+=" ":s="",s+w.linkEmail}if("<"===h&&b.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^ >]+)?)*\s*>)/i,!1)){var v=b.string.indexOf(">",b.pos);if(v!=-1){var x=b.string.substring(b.start,v);/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(x)&&(d.md_inside=!0)}return b.backUp(1),d.htmlState=a.startState(u),f(b,d,j)}if("<"===h&&b.match(/^\/\w*?>/))return d.md_inside=!1,"tag";if("*"===h||"_"===h){for(var y=1,z=1==b.pos?" ":b.string.charAt(b.pos-2);y<3&&b.eat(h);)y++;var B=b.peek()||" ",C=!/\s/.test(B)&&(!F.test(B)||/\s/.test(z)||F.test(z)),D=!/\s/.test(z)&&(!F.test(z)||/\s/.test(B)||F.test(B)),E=null,G=null;if(y%2&&(d.em||!C||"*"!==h&&D&&!F.test(z)?d.em!=h||!D||"*"!==h&&C&&!F.test(B)||(E=!1):E=!0),y>1&&(d.strong||!C||"*"!==h&&D&&!F.test(z)?d.strong!=h||!D||"*"!==h&&C&&!F.test(B)||(G=!1):G=!0),null!=G||null!=E){c.highlightFormatting&&(d.formatting=null==E?"strong":null==G?"em":"strong em"),E===!0&&(d.em=h),G===!0&&(d.strong=h);var r=l(d);return E===!1&&(d.em=!1),G===!1&&(d.strong=!1),r}}else if(" "===h&&(b.eat("*")||b.eat("_"))){if(" "===b.peek())return l(d);b.backUp(1)}if(c.strikethrough)if("~"===h&&b.eatWhile(h)){if(d.strikethrough){c.highlightFormatting&&(d.formatting="strikethrough");var r=l(d);return d.strikethrough=!1,r}if(b.match(/^[^\s]/,!1))return d.strikethrough=!0,c.highlightFormatting&&(d.formatting="strikethrough"),l(d)}else if(" "===h&&b.match(/^~~/,!0)){if(" "===b.peek())return l(d);b.backUp(2)}if(c.emoji&&":"===h&&b.match(/^[a-z_\d+-]+:/)){d.emoji=!0,c.highlightFormatting&&(d.formatting="emoji");var H=l(d);return d.emoji=!1,H}return" "===h&&(b.match(/ +$/,!1)?d.trailingSpace++:d.trailingSpace&&(d.trailingSpaceNewLine=!0)),l(d)}function o(a,b){var d=a.next();if(">"===d){b.f=b.inline=n,c.highlightFormatting&&(b.formatting="link");var e=l(b);return e?e+=" ":e="",e+w.linkInline}return a.match(/^[^>]+/,!0),w.linkInline}function p(a,b){if(a.eatSpace())return null;var d=a.next();return"("===d||"["===d?(b.f=b.inline=q("("===d?")":"]"),c.highlightFormatting&&(b.formatting="link-string"),b.linkHref=!0,l(b)):"error"}function q(a){return function(b,d){var e=b.next();if(e===a){d.f=d.inline=n,c.highlightFormatting&&(d.formatting="link-string");var f=l(d);return d.linkHref=!1,f}return b.match(H[a]),d.linkHref=!0,l(d)}}function r(a,b){return a.match(/^([^\]\\]|\\.)*\]:/,!1)?(b.f=s,a.next(),c.highlightFormatting&&(b.formatting="link"),b.linkText=!0,l(b)):e(a,b,n)}function s(a,b){if(a.match(/^\]:/,!0)){b.f=b.inline=t,c.highlightFormatting&&(b.formatting="link");var d=l(b);return b.linkText=!1,d}return a.match(/^([^\]\\]|\\.)+/,!0),w.linkText}function t(a,b){return a.eatSpace()?null:(a.match(/^[^\s]+/,!0),void 0===a.peek()?b.linkTitle=!0:a.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/,!0),b.f=b.inline=n,w.linkHref+" url")}var u=a.getMode(b,"text/html"),v="null"==u.name;void 0===c.highlightFormatting&&(c.highlightFormatting=!1),void 0===c.maxBlockquoteDepth&&(c.maxBlockquoteDepth=0),void 0===c.taskLists&&(c.taskLists=!1),void 0===c.strikethrough&&(c.strikethrough=!1),void 0===c.emoji&&(c.emoji=!1),void 0===c.tokenTypeOverrides&&(c.tokenTypeOverrides={});var w={header:"header",code:"comment",quote:"quote",list1:"variable-2",list2:"variable-3",list3:"keyword",hr:"hr",image:"image",imageAltText:"image-alt-text",imageMarker:"image-marker",formatting:"formatting",linkInline:"link",linkEmail:"link",linkText:"link",linkHref:"string",em:"em",strong:"strong",strikethrough:"strikethrough",emoji:"builtin"};for(var x in w)w.hasOwnProperty(x)&&c.tokenTypeOverrides[x]&&(w[x]=c.tokenTypeOverrides[x]);var y=/^([*\-_])(?:\s*\1){2,}\s*$/,z=/^(?:[*\-+]|^[0-9]+([.)]))\s+/,A=/^\[(x| )\](?=\s)/,B=c.allowAtxHeaderWithoutSpace?/^(#+)/:/^(#+)(?: |$)/,C=/^ *(?:\={1,}|-{1,})\s*$/,D=/^[^#!\[\]*_\\<>` "'(~:]+/,E=new RegExp("^("+(c.fencedCodeBlocks===!0?"~~~+|```+":c.fencedCodeBlocks)+")[ \\t]*([\\w+#-]*)"),F=/[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/,G="    ",H={")":/^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,"]":/^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/},I={startState:function(){return{f:i,prevLine:null,thisLine:null,block:i,htmlState:null,indentation:0,inline:n,text:m,formatting:!1,linkText:!1,linkHref:!1,linkTitle:!1,code:0,em:!1,strong:!1,header:0,hr:!1,taskList:!1,list:!1,listStack:[],quote:0,trailingSpace:0,trailingSpaceNewLine:!1,strikethrough:!1,emoji:!1,fencedChars:null}},copyState:function(b){return{f:b.f,prevLine:b.prevLine,thisLine:b.thisLine,block:b.block,htmlState:b.htmlState&&a.copyState(u,b.htmlState),indentation:b.indentation,localMode:b.localMode,localState:b.localMode?a.copyState(b.localMode,b.localState):null,inline:b.inline,text:b.text,formatting:!1,linkText:b.linkText,linkTitle:b.linkTitle,code:b.code,em:b.em,strong:b.strong,strikethrough:b.strikethrough,emoji:b.emoji,header:b.header,hr:b.hr,taskList:b.taskList,list:b.list,listStack:b.listStack.slice(0),quote:b.quote,indentedCode:b.indentedCode,trailingSpace:b.trailingSpace,trailingSpaceNewLine:b.trailingSpaceNewLine,md_inside:b.md_inside,fencedChars:b.fencedChars}},token:function(a,b){if(b.formatting=!1,a!=b.thisLine){if(b.header=0,b.hr=!1,a.match(/^\s*$/,!0))return h(b),null;if(b.prevLine=b.thisLine,b.thisLine=a,b.taskList=!1,b.trailingSpace=0,b.trailingSpaceNewLine=!1,b.f=b.block,b.f!=j){var c=a.match(/^\s*/,!0)[0].replace(/\t/g,G).length;if(b.indentation=c,b.indentationDiff=null,c>0)return null}}return b.f(a,b)},innerMode:function(a){return a.block==j?{state:a.htmlState,mode:u}:a.localState?{state:a.localState,mode:a.localMode}:{state:a,mode:I}},indent:function(b,c,d){return b.block==j?u.indent(b.htmlState,c,d):b.localState?b.localMode.indent(b.localState,c,d):a.Pass},blankLine:h,getType:l,closeBrackets:"()[]{}''\"\"``",fold:"markdown"};return I}),"xml"),a.defineMIME("text/x-markdown","markdown")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/meta.js b/media/editors/codemirror/mode/meta.js
index 0a3dd2ca97259..edaae033eb3c2 100644
--- a/media/editors/codemirror/mode/meta.js
+++ b/media/editors/codemirror/mode/meta.js
@@ -91,7 +91,8 @@
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
     {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
-    {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
+    {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
+     mode: "ntriples", ext: ["nt", "nq"]},
     {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
@@ -99,7 +100,7 @@
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
     {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
     {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
-    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
     {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
diff --git a/media/editors/codemirror/mode/meta.min.js b/media/editors/codemirror/mode/meta.min.js
index 1ea8fbe710016..fee3ae084b4d5 100644
--- a/media/editors/codemirror/mode/meta.min.js
+++ b/media/editors/codemirror/mode/meta.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.modeInfo=[{name:"APL",mime:"text/apl",mode:"apl",ext:["dyalog","apl"]},{name:"PGP",mimes:["application/pgp","application/pgp-keys","application/pgp-signature"],mode:"asciiarmor",ext:["pgp"]},{name:"ASN.1",mime:"text/x-ttcn-asn",mode:"asn.1",ext:["asn","asn1"]},{name:"Asterisk",mime:"text/x-asterisk",mode:"asterisk",file:/^extensions\.conf$/i},{name:"Brainfuck",mime:"text/x-brainfuck",mode:"brainfuck",ext:["b","bf"]},{name:"C",mime:"text/x-csrc",mode:"clike",ext:["c","h"]},{name:"C++",mime:"text/x-c++src",mode:"clike",ext:["cpp","c++","cc","cxx","hpp","h++","hh","hxx"],alias:["cpp"]},{name:"Cobol",mime:"text/x-cobol",mode:"cobol",ext:["cob","cpy"]},{name:"C#",mime:"text/x-csharp",mode:"clike",ext:["cs"],alias:["csharp"]},{name:"Clojure",mime:"text/x-clojure",mode:"clojure",ext:["clj","cljc","cljx"]},{name:"ClojureScript",mime:"text/x-clojurescript",mode:"clojure",ext:["cljs"]},{name:"Closure Stylesheets (GSS)",mime:"text/x-gss",mode:"css",ext:["gss"]},{name:"CMake",mime:"text/x-cmake",mode:"cmake",ext:["cmake","cmake.in"],file:/^CMakeLists.txt$/},{name:"CoffeeScript",mime:"text/x-coffeescript",mode:"coffeescript",ext:["coffee"],alias:["coffee","coffee-script"]},{name:"Common Lisp",mime:"text/x-common-lisp",mode:"commonlisp",ext:["cl","lisp","el"],alias:["lisp"]},{name:"Cypher",mime:"application/x-cypher-query",mode:"cypher",ext:["cyp","cypher"]},{name:"Cython",mime:"text/x-cython",mode:"python",ext:["pyx","pxd","pxi"]},{name:"Crystal",mime:"text/x-crystal",mode:"crystal",ext:["cr"]},{name:"CSS",mime:"text/css",mode:"css",ext:["css"]},{name:"CQL",mime:"text/x-cassandra",mode:"sql",ext:["cql"]},{name:"D",mime:"text/x-d",mode:"d",ext:["d"]},{name:"Dart",mimes:["application/dart","text/x-dart"],mode:"dart",ext:["dart"]},{name:"diff",mime:"text/x-diff",mode:"diff",ext:["diff","patch"]},{name:"Django",mime:"text/x-django",mode:"django"},{name:"Dockerfile",mime:"text/x-dockerfile",mode:"dockerfile",file:/^Dockerfile$/},{name:"DTD",mime:"application/xml-dtd",mode:"dtd",ext:["dtd"]},{name:"Dylan",mime:"text/x-dylan",mode:"dylan",ext:["dylan","dyl","intr"]},{name:"EBNF",mime:"text/x-ebnf",mode:"ebnf"},{name:"ECL",mime:"text/x-ecl",mode:"ecl",ext:["ecl"]},{name:"edn",mime:"application/edn",mode:"clojure",ext:["edn"]},{name:"Eiffel",mime:"text/x-eiffel",mode:"eiffel",ext:["e"]},{name:"Elm",mime:"text/x-elm",mode:"elm",ext:["elm"]},{name:"Embedded Javascript",mime:"application/x-ejs",mode:"htmlembedded",ext:["ejs"]},{name:"Embedded Ruby",mime:"application/x-erb",mode:"htmlembedded",ext:["erb"]},{name:"Erlang",mime:"text/x-erlang",mode:"erlang",ext:["erl"]},{name:"Factor",mime:"text/x-factor",mode:"factor",ext:["factor"]},{name:"FCL",mime:"text/x-fcl",mode:"fcl"},{name:"Forth",mime:"text/x-forth",mode:"forth",ext:["forth","fth","4th"]},{name:"Fortran",mime:"text/x-fortran",mode:"fortran",ext:["f","for","f77","f90"]},{name:"F#",mime:"text/x-fsharp",mode:"mllike",ext:["fs"],alias:["fsharp"]},{name:"Gas",mime:"text/x-gas",mode:"gas",ext:["s"]},{name:"Gherkin",mime:"text/x-feature",mode:"gherkin",ext:["feature"]},{name:"GitHub Flavored Markdown",mime:"text/x-gfm",mode:"gfm",file:/^(readme|contributing|history).md$/i},{name:"Go",mime:"text/x-go",mode:"go",ext:["go"]},{name:"Groovy",mime:"text/x-groovy",mode:"groovy",ext:["groovy","gradle"],file:/^Jenkinsfile$/},{name:"HAML",mime:"text/x-haml",mode:"haml",ext:["haml"]},{name:"Haskell",mime:"text/x-haskell",mode:"haskell",ext:["hs"]},{name:"Haskell (Literate)",mime:"text/x-literate-haskell",mode:"haskell-literate",ext:["lhs"]},{name:"Haxe",mime:"text/x-haxe",mode:"haxe",ext:["hx"]},{name:"HXML",mime:"text/x-hxml",mode:"haxe",ext:["hxml"]},{name:"ASP.NET",mime:"application/x-aspx",mode:"htmlembedded",ext:["aspx"],alias:["asp","aspx"]},{name:"HTML",mime:"text/html",mode:"htmlmixed",ext:["html","htm"],alias:["xhtml"]},{name:"HTTP",mime:"message/http",mode:"http"},{name:"IDL",mime:"text/x-idl",mode:"idl",ext:["pro"]},{name:"Pug",mime:"text/x-pug",mode:"pug",ext:["jade","pug"],alias:["jade"]},{name:"Java",mime:"text/x-java",mode:"clike",ext:["java"]},{name:"Java Server Pages",mime:"application/x-jsp",mode:"htmlembedded",ext:["jsp"],alias:["jsp"]},{name:"JavaScript",mimes:["text/javascript","text/ecmascript","application/javascript","application/x-javascript","application/ecmascript"],mode:"javascript",ext:["js"],alias:["ecmascript","js","node"]},{name:"JSON",mimes:["application/json","application/x-json"],mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"JSON-LD",mime:"application/ld+json",mode:"javascript",ext:["jsonld"],alias:["jsonld"]},{name:"JSX",mime:"text/jsx",mode:"jsx",ext:["jsx"]},{name:"Jinja2",mime:"null",mode:"jinja2"},{name:"Julia",mime:"text/x-julia",mode:"julia",ext:["jl"]},{name:"Kotlin",mime:"text/x-kotlin",mode:"clike",ext:["kt"]},{name:"LESS",mime:"text/x-less",mode:"css",ext:["less"]},{name:"LiveScript",mime:"text/x-livescript",mode:"livescript",ext:["ls"],alias:["ls"]},{name:"Lua",mime:"text/x-lua",mode:"lua",ext:["lua"]},{name:"Markdown",mime:"text/x-markdown",mode:"markdown",ext:["markdown","md","mkd"]},{name:"mIRC",mime:"text/mirc",mode:"mirc"},{name:"MariaDB SQL",mime:"text/x-mariadb",mode:"sql"},{name:"Mathematica",mime:"text/x-mathematica",mode:"mathematica",ext:["m","nb"]},{name:"Modelica",mime:"text/x-modelica",mode:"modelica",ext:["mo"]},{name:"MUMPS",mime:"text/x-mumps",mode:"mumps",ext:["mps"]},{name:"MS SQL",mime:"text/x-mssql",mode:"sql"},{name:"mbox",mime:"application/mbox",mode:"mbox",ext:["mbox"]},{name:"MySQL",mime:"text/x-mysql",mode:"sql"},{name:"Nginx",mime:"text/x-nginx-conf",mode:"nginx",file:/nginx.*\.conf$/i},{name:"NSIS",mime:"text/x-nsis",mode:"nsis",ext:["nsh","nsi"]},{name:"NTriples",mime:"text/n-triples",mode:"ntriples",ext:["nt"]},{name:"Objective C",mime:"text/x-objectivec",mode:"clike",ext:["m","mm"],alias:["objective-c","objc"]},{name:"OCaml",mime:"text/x-ocaml",mode:"mllike",ext:["ml","mli","mll","mly"]},{name:"Octave",mime:"text/x-octave",mode:"octave",ext:["m"]},{name:"Oz",mime:"text/x-oz",mode:"oz",ext:["oz"]},{name:"Pascal",mime:"text/x-pascal",mode:"pascal",ext:["p","pas"]},{name:"PEG.js",mime:"null",mode:"pegjs",ext:["jsonld"]},{name:"Perl",mime:"text/x-perl",mode:"perl",ext:["pl","pm"]},{name:"PHP",mime:"application/x-httpd-php",mode:"php",ext:["php","php3","php4","php5","phtml"]},{name:"Pig",mime:"text/x-pig",mode:"pig",ext:["pig"]},{name:"Plain Text",mime:"text/plain",mode:"null",ext:["txt","text","conf","def","list","log"]},{name:"PLSQL",mime:"text/x-plsql",mode:"sql",ext:["pls"]},{name:"PowerShell",mime:"application/x-powershell",mode:"powershell",ext:["ps1","psd1","psm1"]},{name:"Properties files",mime:"text/x-properties",mode:"properties",ext:["properties","ini","in"],alias:["ini","properties"]},{name:"ProtoBuf",mime:"text/x-protobuf",mode:"protobuf",ext:["proto"]},{name:"Python",mime:"text/x-python",mode:"python",ext:["BUILD","bzl","py","pyw"],file:/^(BUCK|BUILD)$/},{name:"Puppet",mime:"text/x-puppet",mode:"puppet",ext:["pp"]},{name:"Q",mime:"text/x-q",mode:"q",ext:["q"]},{name:"R",mime:"text/x-rsrc",mode:"r",ext:["r","R"],alias:["rscript"]},{name:"reStructuredText",mime:"text/x-rst",mode:"rst",ext:["rst"],alias:["rst"]},{name:"RPM Changes",mime:"text/x-rpm-changes",mode:"rpm"},{name:"RPM Spec",mime:"text/x-rpm-spec",mode:"rpm",ext:["spec"]},{name:"Ruby",mime:"text/x-ruby",mode:"ruby",ext:["rb"],alias:["jruby","macruby","rake","rb","rbx"]},{name:"Rust",mime:"text/x-rustsrc",mode:"rust",ext:["rs"]},{name:"SAS",mime:"text/x-sas",mode:"sas",ext:["sas"]},{name:"Sass",mime:"text/x-sass",mode:"sass",ext:["sass"]},{name:"Scala",mime:"text/x-scala",mode:"clike",ext:["scala"]},{name:"Scheme",mime:"text/x-scheme",mode:"scheme",ext:["scm","ss"]},{name:"SCSS",mime:"text/x-scss",mode:"css",ext:["scss"]},{name:"Shell",mime:"text/x-sh",mode:"shell",ext:["sh","ksh","bash"],alias:["bash","sh","zsh"],file:/^PKGBUILD$/},{name:"Sieve",mime:"application/sieve",mode:"sieve",ext:["siv","sieve"]},{name:"Slim",mimes:["text/x-slim","application/x-slim"],mode:"slim",ext:["slim"]},{name:"Smalltalk",mime:"text/x-stsrc",mode:"smalltalk",ext:["st"]},{name:"Smarty",mime:"text/x-smarty",mode:"smarty",ext:["tpl"]},{name:"Solr",mime:"text/x-solr",mode:"solr"},{name:"Soy",mime:"text/x-soy",mode:"soy",ext:["soy"],alias:["closure template"]},{name:"SPARQL",mime:"application/sparql-query",mode:"sparql",ext:["rq","sparql"],alias:["sparul"]},{name:"Spreadsheet",mime:"text/x-spreadsheet",mode:"spreadsheet",alias:["excel","formula"]},{name:"SQL",mime:"text/x-sql",mode:"sql",ext:["sql"]},{name:"SQLite",mime:"text/x-sqlite",mode:"sql"},{name:"Squirrel",mime:"text/x-squirrel",mode:"clike",ext:["nut"]},{name:"Stylus",mime:"text/x-styl",mode:"stylus",ext:["styl"]},{name:"Swift",mime:"text/x-swift",mode:"swift",ext:["swift"]},{name:"sTeX",mime:"text/x-stex",mode:"stex"},{name:"LaTeX",mime:"text/x-latex",mode:"stex",ext:["text","ltx"],alias:["tex"]},{name:"SystemVerilog",mime:"text/x-systemverilog",mode:"verilog",ext:["v"]},{name:"Tcl",mime:"text/x-tcl",mode:"tcl",ext:["tcl"]},{name:"Textile",mime:"text/x-textile",mode:"textile",ext:["textile"]},{name:"TiddlyWiki ",mime:"text/x-tiddlywiki",mode:"tiddlywiki"},{name:"Tiki wiki",mime:"text/tiki",mode:"tiki"},{name:"TOML",mime:"text/x-toml",mode:"toml",ext:["toml"]},{name:"Tornado",mime:"text/x-tornado",mode:"tornado"},{name:"troff",mime:"text/troff",mode:"troff",ext:["1","2","3","4","5","6","7","8","9"]},{name:"TTCN",mime:"text/x-ttcn",mode:"ttcn",ext:["ttcn","ttcn3","ttcnpp"]},{name:"TTCN_CFG",mime:"text/x-ttcn-cfg",mode:"ttcn-cfg",ext:["cfg"]},{name:"Turtle",mime:"text/turtle",mode:"turtle",ext:["ttl"]},{name:"TypeScript",mime:"application/typescript",mode:"javascript",ext:["ts"],alias:["ts"]},{name:"TypeScript-JSX",mime:"text/typescript-jsx",mode:"jsx",ext:["tsx"],alias:["tsx"]},{name:"Twig",mime:"text/x-twig",mode:"twig"},{name:"Web IDL",mime:"text/x-webidl",mode:"webidl",ext:["webidl"]},{name:"VB.NET",mime:"text/x-vb",mode:"vb",ext:["vb"]},{name:"VBScript",mime:"text/vbscript",mode:"vbscript",ext:["vbs"]},{name:"Velocity",mime:"text/velocity",mode:"velocity",ext:["vtl"]},{name:"Verilog",mime:"text/x-verilog",mode:"verilog",ext:["v"]},{name:"VHDL",mime:"text/x-vhdl",mode:"vhdl",ext:["vhd","vhdl"]},{name:"Vue.js Component",mimes:["script/x-vue","text/x-vue"],mode:"vue",ext:["vue"]},{name:"XML",mimes:["application/xml","text/xml"],mode:"xml",ext:["xml","xsl","xsd","svg"],alias:["rss","wsdl","xsd"]},{name:"XQuery",mime:"application/xquery",mode:"xquery",ext:["xy","xquery"]},{name:"Yacas",mime:"text/x-yacas",mode:"yacas",ext:["ys"]},{name:"YAML",mimes:["text/x-yaml","text/yaml"],mode:"yaml",ext:["yaml","yml"],alias:["yml"]},{name:"Z80",mime:"text/x-z80",mode:"z80",ext:["z80"]},{name:"mscgen",mime:"text/x-mscgen",mode:"mscgen",ext:["mscgen","mscin","msc"]},{name:"xu",mime:"text/x-xu",mode:"mscgen",ext:["xu"]},{name:"msgenny",mime:"text/x-msgenny",mode:"mscgen",ext:["msgenny"]}];for(var b=0;b<a.modeInfo.length;b++){var c=a.modeInfo[b];c.mimes&&(c.mime=c.mimes[0])}a.findModeByMIME=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.mime==b)return d;if(d.mimes)for(var e=0;e<d.mimes.length;e++)if(d.mimes[e]==b)return d}return/\+xml$/.test(b)?a.findModeByMIME("application/xml"):/\+json$/.test(b)?a.findModeByMIME("application/json"):void 0},a.findModeByExtension=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.ext)for(var e=0;e<d.ext.length;e++)if(d.ext[e]==b)return d}},a.findModeByFileName=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.file&&d.file.test(b))return d}var e=b.lastIndexOf("."),f=e>-1&&b.substring(e+1,b.length);if(f)return a.findModeByExtension(f)},a.findModeByName=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.name.toLowerCase()==b)return d;if(d.alias)for(var e=0;e<d.alias.length;e++)if(d.alias[e].toLowerCase()==b)return d}}}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.modeInfo=[{name:"APL",mime:"text/apl",mode:"apl",ext:["dyalog","apl"]},{name:"PGP",mimes:["application/pgp","application/pgp-keys","application/pgp-signature"],mode:"asciiarmor",ext:["pgp"]},{name:"ASN.1",mime:"text/x-ttcn-asn",mode:"asn.1",ext:["asn","asn1"]},{name:"Asterisk",mime:"text/x-asterisk",mode:"asterisk",file:/^extensions\.conf$/i},{name:"Brainfuck",mime:"text/x-brainfuck",mode:"brainfuck",ext:["b","bf"]},{name:"C",mime:"text/x-csrc",mode:"clike",ext:["c","h"]},{name:"C++",mime:"text/x-c++src",mode:"clike",ext:["cpp","c++","cc","cxx","hpp","h++","hh","hxx"],alias:["cpp"]},{name:"Cobol",mime:"text/x-cobol",mode:"cobol",ext:["cob","cpy"]},{name:"C#",mime:"text/x-csharp",mode:"clike",ext:["cs"],alias:["csharp"]},{name:"Clojure",mime:"text/x-clojure",mode:"clojure",ext:["clj","cljc","cljx"]},{name:"ClojureScript",mime:"text/x-clojurescript",mode:"clojure",ext:["cljs"]},{name:"Closure Stylesheets (GSS)",mime:"text/x-gss",mode:"css",ext:["gss"]},{name:"CMake",mime:"text/x-cmake",mode:"cmake",ext:["cmake","cmake.in"],file:/^CMakeLists.txt$/},{name:"CoffeeScript",mime:"text/x-coffeescript",mode:"coffeescript",ext:["coffee"],alias:["coffee","coffee-script"]},{name:"Common Lisp",mime:"text/x-common-lisp",mode:"commonlisp",ext:["cl","lisp","el"],alias:["lisp"]},{name:"Cypher",mime:"application/x-cypher-query",mode:"cypher",ext:["cyp","cypher"]},{name:"Cython",mime:"text/x-cython",mode:"python",ext:["pyx","pxd","pxi"]},{name:"Crystal",mime:"text/x-crystal",mode:"crystal",ext:["cr"]},{name:"CSS",mime:"text/css",mode:"css",ext:["css"]},{name:"CQL",mime:"text/x-cassandra",mode:"sql",ext:["cql"]},{name:"D",mime:"text/x-d",mode:"d",ext:["d"]},{name:"Dart",mimes:["application/dart","text/x-dart"],mode:"dart",ext:["dart"]},{name:"diff",mime:"text/x-diff",mode:"diff",ext:["diff","patch"]},{name:"Django",mime:"text/x-django",mode:"django"},{name:"Dockerfile",mime:"text/x-dockerfile",mode:"dockerfile",file:/^Dockerfile$/},{name:"DTD",mime:"application/xml-dtd",mode:"dtd",ext:["dtd"]},{name:"Dylan",mime:"text/x-dylan",mode:"dylan",ext:["dylan","dyl","intr"]},{name:"EBNF",mime:"text/x-ebnf",mode:"ebnf"},{name:"ECL",mime:"text/x-ecl",mode:"ecl",ext:["ecl"]},{name:"edn",mime:"application/edn",mode:"clojure",ext:["edn"]},{name:"Eiffel",mime:"text/x-eiffel",mode:"eiffel",ext:["e"]},{name:"Elm",mime:"text/x-elm",mode:"elm",ext:["elm"]},{name:"Embedded Javascript",mime:"application/x-ejs",mode:"htmlembedded",ext:["ejs"]},{name:"Embedded Ruby",mime:"application/x-erb",mode:"htmlembedded",ext:["erb"]},{name:"Erlang",mime:"text/x-erlang",mode:"erlang",ext:["erl"]},{name:"Factor",mime:"text/x-factor",mode:"factor",ext:["factor"]},{name:"FCL",mime:"text/x-fcl",mode:"fcl"},{name:"Forth",mime:"text/x-forth",mode:"forth",ext:["forth","fth","4th"]},{name:"Fortran",mime:"text/x-fortran",mode:"fortran",ext:["f","for","f77","f90"]},{name:"F#",mime:"text/x-fsharp",mode:"mllike",ext:["fs"],alias:["fsharp"]},{name:"Gas",mime:"text/x-gas",mode:"gas",ext:["s"]},{name:"Gherkin",mime:"text/x-feature",mode:"gherkin",ext:["feature"]},{name:"GitHub Flavored Markdown",mime:"text/x-gfm",mode:"gfm",file:/^(readme|contributing|history).md$/i},{name:"Go",mime:"text/x-go",mode:"go",ext:["go"]},{name:"Groovy",mime:"text/x-groovy",mode:"groovy",ext:["groovy","gradle"],file:/^Jenkinsfile$/},{name:"HAML",mime:"text/x-haml",mode:"haml",ext:["haml"]},{name:"Haskell",mime:"text/x-haskell",mode:"haskell",ext:["hs"]},{name:"Haskell (Literate)",mime:"text/x-literate-haskell",mode:"haskell-literate",ext:["lhs"]},{name:"Haxe",mime:"text/x-haxe",mode:"haxe",ext:["hx"]},{name:"HXML",mime:"text/x-hxml",mode:"haxe",ext:["hxml"]},{name:"ASP.NET",mime:"application/x-aspx",mode:"htmlembedded",ext:["aspx"],alias:["asp","aspx"]},{name:"HTML",mime:"text/html",mode:"htmlmixed",ext:["html","htm"],alias:["xhtml"]},{name:"HTTP",mime:"message/http",mode:"http"},{name:"IDL",mime:"text/x-idl",mode:"idl",ext:["pro"]},{name:"Pug",mime:"text/x-pug",mode:"pug",ext:["jade","pug"],alias:["jade"]},{name:"Java",mime:"text/x-java",mode:"clike",ext:["java"]},{name:"Java Server Pages",mime:"application/x-jsp",mode:"htmlembedded",ext:["jsp"],alias:["jsp"]},{name:"JavaScript",mimes:["text/javascript","text/ecmascript","application/javascript","application/x-javascript","application/ecmascript"],mode:"javascript",ext:["js"],alias:["ecmascript","js","node"]},{name:"JSON",mimes:["application/json","application/x-json"],mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"JSON-LD",mime:"application/ld+json",mode:"javascript",ext:["jsonld"],alias:["jsonld"]},{name:"JSX",mime:"text/jsx",mode:"jsx",ext:["jsx"]},{name:"Jinja2",mime:"null",mode:"jinja2"},{name:"Julia",mime:"text/x-julia",mode:"julia",ext:["jl"]},{name:"Kotlin",mime:"text/x-kotlin",mode:"clike",ext:["kt"]},{name:"LESS",mime:"text/x-less",mode:"css",ext:["less"]},{name:"LiveScript",mime:"text/x-livescript",mode:"livescript",ext:["ls"],alias:["ls"]},{name:"Lua",mime:"text/x-lua",mode:"lua",ext:["lua"]},{name:"Markdown",mime:"text/x-markdown",mode:"markdown",ext:["markdown","md","mkd"]},{name:"mIRC",mime:"text/mirc",mode:"mirc"},{name:"MariaDB SQL",mime:"text/x-mariadb",mode:"sql"},{name:"Mathematica",mime:"text/x-mathematica",mode:"mathematica",ext:["m","nb"]},{name:"Modelica",mime:"text/x-modelica",mode:"modelica",ext:["mo"]},{name:"MUMPS",mime:"text/x-mumps",mode:"mumps",ext:["mps"]},{name:"MS SQL",mime:"text/x-mssql",mode:"sql"},{name:"mbox",mime:"application/mbox",mode:"mbox",ext:["mbox"]},{name:"MySQL",mime:"text/x-mysql",mode:"sql"},{name:"Nginx",mime:"text/x-nginx-conf",mode:"nginx",file:/nginx.*\.conf$/i},{name:"NSIS",mime:"text/x-nsis",mode:"nsis",ext:["nsh","nsi"]},{name:"NTriples",mimes:["application/n-triples","application/n-quads","text/n-triples"],mode:"ntriples",ext:["nt","nq"]},{name:"Objective C",mime:"text/x-objectivec",mode:"clike",ext:["m","mm"],alias:["objective-c","objc"]},{name:"OCaml",mime:"text/x-ocaml",mode:"mllike",ext:["ml","mli","mll","mly"]},{name:"Octave",mime:"text/x-octave",mode:"octave",ext:["m"]},{name:"Oz",mime:"text/x-oz",mode:"oz",ext:["oz"]},{name:"Pascal",mime:"text/x-pascal",mode:"pascal",ext:["p","pas"]},{name:"PEG.js",mime:"null",mode:"pegjs",ext:["jsonld"]},{name:"Perl",mime:"text/x-perl",mode:"perl",ext:["pl","pm"]},{name:"PHP",mime:"application/x-httpd-php",mode:"php",ext:["php","php3","php4","php5","php7","phtml"]},{name:"Pig",mime:"text/x-pig",mode:"pig",ext:["pig"]},{name:"Plain Text",mime:"text/plain",mode:"null",ext:["txt","text","conf","def","list","log"]},{name:"PLSQL",mime:"text/x-plsql",mode:"sql",ext:["pls"]},{name:"PowerShell",mime:"application/x-powershell",mode:"powershell",ext:["ps1","psd1","psm1"]},{name:"Properties files",mime:"text/x-properties",mode:"properties",ext:["properties","ini","in"],alias:["ini","properties"]},{name:"ProtoBuf",mime:"text/x-protobuf",mode:"protobuf",ext:["proto"]},{name:"Python",mime:"text/x-python",mode:"python",ext:["BUILD","bzl","py","pyw"],file:/^(BUCK|BUILD)$/},{name:"Puppet",mime:"text/x-puppet",mode:"puppet",ext:["pp"]},{name:"Q",mime:"text/x-q",mode:"q",ext:["q"]},{name:"R",mime:"text/x-rsrc",mode:"r",ext:["r","R"],alias:["rscript"]},{name:"reStructuredText",mime:"text/x-rst",mode:"rst",ext:["rst"],alias:["rst"]},{name:"RPM Changes",mime:"text/x-rpm-changes",mode:"rpm"},{name:"RPM Spec",mime:"text/x-rpm-spec",mode:"rpm",ext:["spec"]},{name:"Ruby",mime:"text/x-ruby",mode:"ruby",ext:["rb"],alias:["jruby","macruby","rake","rb","rbx"]},{name:"Rust",mime:"text/x-rustsrc",mode:"rust",ext:["rs"]},{name:"SAS",mime:"text/x-sas",mode:"sas",ext:["sas"]},{name:"Sass",mime:"text/x-sass",mode:"sass",ext:["sass"]},{name:"Scala",mime:"text/x-scala",mode:"clike",ext:["scala"]},{name:"Scheme",mime:"text/x-scheme",mode:"scheme",ext:["scm","ss"]},{name:"SCSS",mime:"text/x-scss",mode:"css",ext:["scss"]},{name:"Shell",mime:"text/x-sh",mode:"shell",ext:["sh","ksh","bash"],alias:["bash","sh","zsh"],file:/^PKGBUILD$/},{name:"Sieve",mime:"application/sieve",mode:"sieve",ext:["siv","sieve"]},{name:"Slim",mimes:["text/x-slim","application/x-slim"],mode:"slim",ext:["slim"]},{name:"Smalltalk",mime:"text/x-stsrc",mode:"smalltalk",ext:["st"]},{name:"Smarty",mime:"text/x-smarty",mode:"smarty",ext:["tpl"]},{name:"Solr",mime:"text/x-solr",mode:"solr"},{name:"Soy",mime:"text/x-soy",mode:"soy",ext:["soy"],alias:["closure template"]},{name:"SPARQL",mime:"application/sparql-query",mode:"sparql",ext:["rq","sparql"],alias:["sparul"]},{name:"Spreadsheet",mime:"text/x-spreadsheet",mode:"spreadsheet",alias:["excel","formula"]},{name:"SQL",mime:"text/x-sql",mode:"sql",ext:["sql"]},{name:"SQLite",mime:"text/x-sqlite",mode:"sql"},{name:"Squirrel",mime:"text/x-squirrel",mode:"clike",ext:["nut"]},{name:"Stylus",mime:"text/x-styl",mode:"stylus",ext:["styl"]},{name:"Swift",mime:"text/x-swift",mode:"swift",ext:["swift"]},{name:"sTeX",mime:"text/x-stex",mode:"stex"},{name:"LaTeX",mime:"text/x-latex",mode:"stex",ext:["text","ltx"],alias:["tex"]},{name:"SystemVerilog",mime:"text/x-systemverilog",mode:"verilog",ext:["v"]},{name:"Tcl",mime:"text/x-tcl",mode:"tcl",ext:["tcl"]},{name:"Textile",mime:"text/x-textile",mode:"textile",ext:["textile"]},{name:"TiddlyWiki ",mime:"text/x-tiddlywiki",mode:"tiddlywiki"},{name:"Tiki wiki",mime:"text/tiki",mode:"tiki"},{name:"TOML",mime:"text/x-toml",mode:"toml",ext:["toml"]},{name:"Tornado",mime:"text/x-tornado",mode:"tornado"},{name:"troff",mime:"text/troff",mode:"troff",ext:["1","2","3","4","5","6","7","8","9"]},{name:"TTCN",mime:"text/x-ttcn",mode:"ttcn",ext:["ttcn","ttcn3","ttcnpp"]},{name:"TTCN_CFG",mime:"text/x-ttcn-cfg",mode:"ttcn-cfg",ext:["cfg"]},{name:"Turtle",mime:"text/turtle",mode:"turtle",ext:["ttl"]},{name:"TypeScript",mime:"application/typescript",mode:"javascript",ext:["ts"],alias:["ts"]},{name:"TypeScript-JSX",mime:"text/typescript-jsx",mode:"jsx",ext:["tsx"],alias:["tsx"]},{name:"Twig",mime:"text/x-twig",mode:"twig"},{name:"Web IDL",mime:"text/x-webidl",mode:"webidl",ext:["webidl"]},{name:"VB.NET",mime:"text/x-vb",mode:"vb",ext:["vb"]},{name:"VBScript",mime:"text/vbscript",mode:"vbscript",ext:["vbs"]},{name:"Velocity",mime:"text/velocity",mode:"velocity",ext:["vtl"]},{name:"Verilog",mime:"text/x-verilog",mode:"verilog",ext:["v"]},{name:"VHDL",mime:"text/x-vhdl",mode:"vhdl",ext:["vhd","vhdl"]},{name:"Vue.js Component",mimes:["script/x-vue","text/x-vue"],mode:"vue",ext:["vue"]},{name:"XML",mimes:["application/xml","text/xml"],mode:"xml",ext:["xml","xsl","xsd","svg"],alias:["rss","wsdl","xsd"]},{name:"XQuery",mime:"application/xquery",mode:"xquery",ext:["xy","xquery"]},{name:"Yacas",mime:"text/x-yacas",mode:"yacas",ext:["ys"]},{name:"YAML",mimes:["text/x-yaml","text/yaml"],mode:"yaml",ext:["yaml","yml"],alias:["yml"]},{name:"Z80",mime:"text/x-z80",mode:"z80",ext:["z80"]},{name:"mscgen",mime:"text/x-mscgen",mode:"mscgen",ext:["mscgen","mscin","msc"]},{name:"xu",mime:"text/x-xu",mode:"mscgen",ext:["xu"]},{name:"msgenny",mime:"text/x-msgenny",mode:"mscgen",ext:["msgenny"]}];for(var b=0;b<a.modeInfo.length;b++){var c=a.modeInfo[b];c.mimes&&(c.mime=c.mimes[0])}a.findModeByMIME=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.mime==b)return d;if(d.mimes)for(var e=0;e<d.mimes.length;e++)if(d.mimes[e]==b)return d}return/\+xml$/.test(b)?a.findModeByMIME("application/xml"):/\+json$/.test(b)?a.findModeByMIME("application/json"):void 0},a.findModeByExtension=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.ext)for(var e=0;e<d.ext.length;e++)if(d.ext[e]==b)return d}},a.findModeByFileName=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.file&&d.file.test(b))return d}var e=b.lastIndexOf("."),f=e>-1&&b.substring(e+1,b.length);if(f)return a.findModeByExtension(f)},a.findModeByName=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.name.toLowerCase()==b)return d;if(d.alias)for(var e=0;e<d.alias.length;e++)if(d.alias[e].toLowerCase()==b)return d}}}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/mirc/mirc.js b/media/editors/codemirror/mode/mirc/mirc.js
index f0d5c6ad50e08..71ac4ddfd4356 100644
--- a/media/editors/codemirror/mode/mirc/mirc.js
+++ b/media/editors/codemirror/mode/mirc/mirc.js
@@ -130,7 +130,7 @@ CodeMirror.defineMode("mirc", function() {
       }
     }
     else if (ch == "%") {
-      stream.eatWhile(/[^,^\s^\(^\)]/);
+      stream.eatWhile(/[^,\s()]/);
       state.beforeParams = true;
       return "string";
     }
diff --git a/media/editors/codemirror/mode/mirc/mirc.min.js b/media/editors/codemirror/mode/mirc/mirc.min.js
index e0afb11e54934..5985d05ae9e4c 100644
--- a/media/editors/codemirror/mode/mirc/mirc.min.js
+++ b/media/editors/codemirror/mode/mirc/mirc.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMIME("text/mirc","mirc"),a.defineMode("mirc",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){return b.tokenize=c,c(a,b)}function c(a,c){var j=c.beforeParams;c.beforeParams=!1;var k=a.next();if(/[\[\]{}\(\),\.]/.test(k))return"("==k&&j?c.inParams=!0:")"==k&&(c.inParams=!1),null;if(/\d/.test(k))return a.eatWhile(/[\w\.]/),"number";if("\\"==k)return a.eat("\\"),a.eat(/./),"number";if("/"==k&&a.eat("*"))return b(a,c,d);if(";"==k&&a.match(/ *\( *\(/))return b(a,c,e);if(";"!=k||c.inParams){if('"'==k)return a.eat(/"/),"keyword";if("$"==k)return a.eatWhile(/[$_a-z0-9A-Z\.:]/),f&&f.propertyIsEnumerable(a.current().toLowerCase())?"keyword":(c.beforeParams=!0,"builtin");if("%"==k)return a.eatWhile(/[^,^\s^\(^\)]/),c.beforeParams=!0,"string";if(i.test(k))return a.eatWhile(i),"operator";a.eatWhile(/[\w\$_{}]/);var l=a.current().toLowerCase();return g&&g.propertyIsEnumerable(l)?"keyword":h&&h.propertyIsEnumerable(l)?(c.beforeParams=!0,"keyword"):null}return a.skipToEnd(),"comment"}function d(a,b){for(var d,e=!1;d=a.next();){if("/"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function e(a,b){for(var d,e=0;d=a.next();){if(";"==d&&2==e){b.tokenize=c;break}")"==d?e++:" "!=d&&(e=0)}return"meta"}var f=a("$! $$ $& $? $+ $abook $abs $active $activecid $activewid $address $addtok $agent $agentname $agentstat $agentver $alias $and $anick $ansi2mirc $aop $appactive $appstate $asc $asctime $asin $atan $avoice $away $awaymsg $awaytime $banmask $base $bfind $binoff $biton $bnick $bvar $bytes $calc $cb $cd $ceil $chan $chanmodes $chantypes $chat $chr $cid $clevel $click $cmdbox $cmdline $cnick $color $com $comcall $comchan $comerr $compact $compress $comval $cos $count $cr $crc $creq $crlf $ctime $ctimer $ctrlenter $date $day $daylight $dbuh $dbuw $dccignore $dccport $dde $ddename $debug $decode $decompress $deltok $devent $dialog $did $didreg $didtok $didwm $disk $dlevel $dll $dllcall $dname $dns $duration $ebeeps $editbox $emailaddr $encode $error $eval $event $exist $feof $ferr $fgetc $file $filename $filtered $finddir $finddirn $findfile $findfilen $findtok $fline $floor $fopen $fread $fserve $fulladdress $fulldate $fullname $fullscreen $get $getdir $getdot $gettok $gmt $group $halted $hash $height $hfind $hget $highlight $hnick $hotline $hotlinepos $ial $ialchan $ibl $idle $iel $ifmatch $ignore $iif $iil $inelipse $ini $inmidi $inpaste $inpoly $input $inrect $inroundrect $insong $instok $int $inwave $ip $isalias $isbit $isdde $isdir $isfile $isid $islower $istok $isupper $keychar $keyrpt $keyval $knick $lactive $lactivecid $lactivewid $left $len $level $lf $line $lines $link $lock $lock $locked $log $logstamp $logstampfmt $longfn $longip $lower $ltimer $maddress $mask $matchkey $matchtok $md5 $me $menu $menubar $menucontext $menutype $mid $middir $mircdir $mircexe $mircini $mklogfn $mnick $mode $modefirst $modelast $modespl $mouse $msfile $network $newnick $nick $nofile $nopath $noqt $not $notags $notify $null $numeric $numok $oline $onpoly $opnick $or $ord $os $passivedcc $pic $play $pnick $port $portable $portfree $pos $prefix $prop $protect $puttok $qt $query $rand $r $rawmsg $read $readomo $readn $regex $regml $regsub $regsubex $remove $remtok $replace $replacex $reptok $result $rgb $right $round $scid $scon $script $scriptdir $scriptline $sdir $send $server $serverip $sfile $sha1 $shortfn $show $signal $sin $site $sline $snick $snicks $snotify $sock $sockbr $sockerr $sockname $sorttok $sound $sqrt $ssl $sreq $sslready $status $strip $str $stripped $syle $submenu $switchbar $tan $target $ticks $time $timer $timestamp $timestampfmt $timezone $tip $titlebar $toolbar $treebar $trust $ulevel $ulist $upper $uptime $url $usermode $v1 $v2 $var $vcmd $vcmdstat $vcmdver $version $vnick $vol $wid $width $wildsite $wildtok $window $wrap $xor"),g=a("abook ajinvite alias aline ame amsg anick aop auser autojoin avoice away background ban bcopy beep bread break breplace bset btrunc bunset bwrite channel clear clearall cline clipboard close cnick color comclose comopen comreg continue copy creq ctcpreply ctcps dcc dccserver dde ddeserver debug dec describe dialog did didtok disable disconnect dlevel dline dll dns dqwindow drawcopy drawdot drawfill drawline drawpic drawrect drawreplace drawrot drawsave drawscroll drawtext ebeeps echo editbox emailaddr enable events exit fclose filter findtext finger firewall flash flist flood flush flushini font fopen fseek fsend fserve fullname fwrite ghide gload gmove gopts goto gplay gpoint gqreq groups gshow gsize gstop gtalk gunload hadd halt haltdef hdec hdel help hfree hinc hload hmake hop hsave ial ialclear ialmark identd if ignore iline inc invite iuser join kick linesep links list load loadbuf localinfo log mdi me menubar mkdir mnick mode msg nick noop notice notify omsg onotice part partall pdcc perform play playctrl pop protect pvoice qme qmsg query queryn quit raw reload remini remote remove rename renwin reseterror resetidle return rlevel rline rmdir run ruser save savebuf saveini say scid scon server set showmirc signam sline sockaccept sockclose socklist socklisten sockmark sockopen sockpause sockread sockrename sockudp sockwrite sound speak splay sreq strip switchbar timer timestamp titlebar tnick tokenize toolbar topic tray treebar ulist unload unset unsetall updatenl url uwho var vcadd vcmd vcrem vol while whois window winhelp write writeint if isalnum isalpha isaop isavoice isban ischan ishop isignore isin isincs isletter islower isnotify isnum ison isop isprotect isreg isupper isvoice iswm iswmcs elseif else goto menu nicklist status title icon size option text edit button check radio box scroll list combo link tab item"),h=a("if elseif else and not or eq ne in ni for foreach while switch"),i=/[+\-*&%=<>!?^\/\|]/;return{startState:function(){return{tokenize:c,beforeParams:!1,inParams:!1}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)}}}))}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMIME("text/mirc","mirc"),a.defineMode("mirc",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){return b.tokenize=c,c(a,b)}function c(a,c){var j=c.beforeParams;c.beforeParams=!1;var k=a.next();if(/[\[\]{}\(\),\.]/.test(k))return"("==k&&j?c.inParams=!0:")"==k&&(c.inParams=!1),null;if(/\d/.test(k))return a.eatWhile(/[\w\.]/),"number";if("\\"==k)return a.eat("\\"),a.eat(/./),"number";if("/"==k&&a.eat("*"))return b(a,c,d);if(";"==k&&a.match(/ *\( *\(/))return b(a,c,e);if(";"!=k||c.inParams){if('"'==k)return a.eat(/"/),"keyword";if("$"==k)return a.eatWhile(/[$_a-z0-9A-Z\.:]/),f&&f.propertyIsEnumerable(a.current().toLowerCase())?"keyword":(c.beforeParams=!0,"builtin");if("%"==k)return a.eatWhile(/[^,\s()]/),c.beforeParams=!0,"string";if(i.test(k))return a.eatWhile(i),"operator";a.eatWhile(/[\w\$_{}]/);var l=a.current().toLowerCase();return g&&g.propertyIsEnumerable(l)?"keyword":h&&h.propertyIsEnumerable(l)?(c.beforeParams=!0,"keyword"):null}return a.skipToEnd(),"comment"}function d(a,b){for(var d,e=!1;d=a.next();){if("/"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function e(a,b){for(var d,e=0;d=a.next();){if(";"==d&&2==e){b.tokenize=c;break}")"==d?e++:" "!=d&&(e=0)}return"meta"}var f=a("$! $$ $& $? $+ $abook $abs $active $activecid $activewid $address $addtok $agent $agentname $agentstat $agentver $alias $and $anick $ansi2mirc $aop $appactive $appstate $asc $asctime $asin $atan $avoice $away $awaymsg $awaytime $banmask $base $bfind $binoff $biton $bnick $bvar $bytes $calc $cb $cd $ceil $chan $chanmodes $chantypes $chat $chr $cid $clevel $click $cmdbox $cmdline $cnick $color $com $comcall $comchan $comerr $compact $compress $comval $cos $count $cr $crc $creq $crlf $ctime $ctimer $ctrlenter $date $day $daylight $dbuh $dbuw $dccignore $dccport $dde $ddename $debug $decode $decompress $deltok $devent $dialog $did $didreg $didtok $didwm $disk $dlevel $dll $dllcall $dname $dns $duration $ebeeps $editbox $emailaddr $encode $error $eval $event $exist $feof $ferr $fgetc $file $filename $filtered $finddir $finddirn $findfile $findfilen $findtok $fline $floor $fopen $fread $fserve $fulladdress $fulldate $fullname $fullscreen $get $getdir $getdot $gettok $gmt $group $halted $hash $height $hfind $hget $highlight $hnick $hotline $hotlinepos $ial $ialchan $ibl $idle $iel $ifmatch $ignore $iif $iil $inelipse $ini $inmidi $inpaste $inpoly $input $inrect $inroundrect $insong $instok $int $inwave $ip $isalias $isbit $isdde $isdir $isfile $isid $islower $istok $isupper $keychar $keyrpt $keyval $knick $lactive $lactivecid $lactivewid $left $len $level $lf $line $lines $link $lock $lock $locked $log $logstamp $logstampfmt $longfn $longip $lower $ltimer $maddress $mask $matchkey $matchtok $md5 $me $menu $menubar $menucontext $menutype $mid $middir $mircdir $mircexe $mircini $mklogfn $mnick $mode $modefirst $modelast $modespl $mouse $msfile $network $newnick $nick $nofile $nopath $noqt $not $notags $notify $null $numeric $numok $oline $onpoly $opnick $or $ord $os $passivedcc $pic $play $pnick $port $portable $portfree $pos $prefix $prop $protect $puttok $qt $query $rand $r $rawmsg $read $readomo $readn $regex $regml $regsub $regsubex $remove $remtok $replace $replacex $reptok $result $rgb $right $round $scid $scon $script $scriptdir $scriptline $sdir $send $server $serverip $sfile $sha1 $shortfn $show $signal $sin $site $sline $snick $snicks $snotify $sock $sockbr $sockerr $sockname $sorttok $sound $sqrt $ssl $sreq $sslready $status $strip $str $stripped $syle $submenu $switchbar $tan $target $ticks $time $timer $timestamp $timestampfmt $timezone $tip $titlebar $toolbar $treebar $trust $ulevel $ulist $upper $uptime $url $usermode $v1 $v2 $var $vcmd $vcmdstat $vcmdver $version $vnick $vol $wid $width $wildsite $wildtok $window $wrap $xor"),g=a("abook ajinvite alias aline ame amsg anick aop auser autojoin avoice away background ban bcopy beep bread break breplace bset btrunc bunset bwrite channel clear clearall cline clipboard close cnick color comclose comopen comreg continue copy creq ctcpreply ctcps dcc dccserver dde ddeserver debug dec describe dialog did didtok disable disconnect dlevel dline dll dns dqwindow drawcopy drawdot drawfill drawline drawpic drawrect drawreplace drawrot drawsave drawscroll drawtext ebeeps echo editbox emailaddr enable events exit fclose filter findtext finger firewall flash flist flood flush flushini font fopen fseek fsend fserve fullname fwrite ghide gload gmove gopts goto gplay gpoint gqreq groups gshow gsize gstop gtalk gunload hadd halt haltdef hdec hdel help hfree hinc hload hmake hop hsave ial ialclear ialmark identd if ignore iline inc invite iuser join kick linesep links list load loadbuf localinfo log mdi me menubar mkdir mnick mode msg nick noop notice notify omsg onotice part partall pdcc perform play playctrl pop protect pvoice qme qmsg query queryn quit raw reload remini remote remove rename renwin reseterror resetidle return rlevel rline rmdir run ruser save savebuf saveini say scid scon server set showmirc signam sline sockaccept sockclose socklist socklisten sockmark sockopen sockpause sockread sockrename sockudp sockwrite sound speak splay sreq strip switchbar timer timestamp titlebar tnick tokenize toolbar topic tray treebar ulist unload unset unsetall updatenl url uwho var vcadd vcmd vcrem vol while whois window winhelp write writeint if isalnum isalpha isaop isavoice isban ischan ishop isignore isin isincs isletter islower isnotify isnum ison isop isprotect isreg isupper isvoice iswm iswmcs elseif else goto menu nicklist status title icon size option text edit button check radio box scroll list combo link tab item"),h=a("if elseif else and not or eq ne in ni for foreach while switch"),i=/[+\-*&%=<>!?^\/\|]/;return{startState:function(){return{tokenize:c,beforeParams:!1,inParams:!1}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)}}}))}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/ntriples/ntriples.js b/media/editors/codemirror/mode/ntriples/ntriples.js
index 0524b1e8ab653..148272e1fd25a 100644
--- a/media/editors/codemirror/mode/ntriples/ntriples.js
+++ b/media/editors/codemirror/mode/ntriples/ntriples.js
@@ -3,9 +3,9 @@
 
 /**********************************************************
 * This script provides syntax highlighting support for
-* the Ntriples format.
-* Ntriples format specification:
-*     http://www.w3.org/TR/rdf-testcases/#ntriples
+* the N-Triples format.
+* N-Triples format specification:
+*     https://www.w3.org/TR/n-triples/
 ***********************************************************/
 
 /*
@@ -181,6 +181,15 @@ CodeMirror.defineMode("ntriples", function() {
   };
 });
 
+// define the registered Media Type for n-triples:
+// https://www.w3.org/TR/n-triples/#n-triples-mediatype
+CodeMirror.defineMIME("application/n-triples", "ntriples");
+
+// N-Quads is based on the N-Triples format (so same highlighting works)
+// https://www.w3.org/TR/n-quads/
+CodeMirror.defineMIME("application/n-quads", "ntriples");
+
+// previously used, though technically incorrect media type for n-triples
 CodeMirror.defineMIME("text/n-triples", "ntriples");
 
 });
diff --git a/media/editors/codemirror/mode/ntriples/ntriples.min.js b/media/editors/codemirror/mode/ntriples/ntriples.min.js
index 5f28cfd5acd83..5362d5da7a8d3 100644
--- a/media/editors/codemirror/mode/ntriples/ntriples.min.js
+++ b/media/editors/codemirror/mode/ntriples/ntriples.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("ntriples",(function(){function a(a,c){var d,e=a.location;d=e==b.PRE_SUBJECT&&"<"==c?b.WRITING_SUB_URI:e==b.PRE_SUBJECT&&"_"==c?b.WRITING_BNODE_URI:e==b.PRE_PRED&&"<"==c?b.WRITING_PRED_URI:e==b.PRE_OBJ&&"<"==c?b.WRITING_OBJ_URI:e==b.PRE_OBJ&&"_"==c?b.WRITING_OBJ_BNODE:e==b.PRE_OBJ&&'"'==c?b.WRITING_OBJ_LITERAL:e==b.WRITING_SUB_URI&&">"==c?b.PRE_PRED:e==b.WRITING_BNODE_URI&&" "==c?b.PRE_PRED:e==b.WRITING_PRED_URI&&">"==c?b.PRE_OBJ:e==b.WRITING_OBJ_URI&&">"==c?b.POST_OBJ:e==b.WRITING_OBJ_BNODE&&" "==c?b.POST_OBJ:e==b.WRITING_OBJ_LITERAL&&'"'==c?b.POST_OBJ:e==b.WRITING_LIT_LANG&&" "==c?b.POST_OBJ:e==b.WRITING_LIT_TYPE&&">"==c?b.POST_OBJ:e==b.WRITING_OBJ_LITERAL&&"@"==c?b.WRITING_LIT_LANG:e==b.WRITING_OBJ_LITERAL&&"^"==c?b.WRITING_LIT_TYPE:" "!=c||e!=b.PRE_SUBJECT&&e!=b.PRE_PRED&&e!=b.PRE_OBJ&&e!=b.POST_OBJ?e==b.POST_OBJ&&"."==c?b.PRE_SUBJECT:b.ERROR:e,a.location=d}var b={PRE_SUBJECT:0,WRITING_SUB_URI:1,WRITING_BNODE_URI:2,PRE_PRED:3,WRITING_PRED_URI:4,PRE_OBJ:5,WRITING_OBJ_URI:6,WRITING_OBJ_BNODE:7,WRITING_OBJ_LITERAL:8,WRITING_LIT_LANG:9,WRITING_LIT_TYPE:10,POST_OBJ:11,ERROR:12};return{startState:function(){return{location:b.PRE_SUBJECT,uris:[],anchors:[],bnodes:[],langs:[],types:[]}},token:function(b,c){var d=b.next();if("<"==d){a(c,d);var e="";return b.eatWhile((function(a){return"#"!=a&&">"!=a&&(e+=a,!0)})),c.uris.push(e),b.match("#",!1)?"variable":(b.next(),a(c,">"),"variable")}if("#"==d){var f="";return b.eatWhile((function(a){return">"!=a&&" "!=a&&(f+=a,!0)})),c.anchors.push(f),"variable-2"}if(">"==d)return a(c,">"),"variable";if("_"==d){a(c,d);var g="";return b.eatWhile((function(a){return" "!=a&&(g+=a,!0)})),c.bnodes.push(g),b.next(),a(c," "),"builtin"}if('"'==d)return a(c,d),b.eatWhile((function(a){return'"'!=a})),b.next(),"@"!=b.peek()&&"^"!=b.peek()&&a(c,'"'),"string";if("@"==d){a(c,"@");var h="";return b.eatWhile((function(a){return" "!=a&&(h+=a,!0)})),c.langs.push(h),b.next(),a(c," "),"string-2"}if("^"==d){b.next(),a(c,"^");var i="";return b.eatWhile((function(a){return">"!=a&&(i+=a,!0)})),c.types.push(i),b.next(),a(c,">"),"variable"}" "==d&&a(c,d),"."==d&&a(c,d)}}})),a.defineMIME("text/n-triples","ntriples")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("ntriples",(function(){function a(a,c){var d,e=a.location;d=e==b.PRE_SUBJECT&&"<"==c?b.WRITING_SUB_URI:e==b.PRE_SUBJECT&&"_"==c?b.WRITING_BNODE_URI:e==b.PRE_PRED&&"<"==c?b.WRITING_PRED_URI:e==b.PRE_OBJ&&"<"==c?b.WRITING_OBJ_URI:e==b.PRE_OBJ&&"_"==c?b.WRITING_OBJ_BNODE:e==b.PRE_OBJ&&'"'==c?b.WRITING_OBJ_LITERAL:e==b.WRITING_SUB_URI&&">"==c?b.PRE_PRED:e==b.WRITING_BNODE_URI&&" "==c?b.PRE_PRED:e==b.WRITING_PRED_URI&&">"==c?b.PRE_OBJ:e==b.WRITING_OBJ_URI&&">"==c?b.POST_OBJ:e==b.WRITING_OBJ_BNODE&&" "==c?b.POST_OBJ:e==b.WRITING_OBJ_LITERAL&&'"'==c?b.POST_OBJ:e==b.WRITING_LIT_LANG&&" "==c?b.POST_OBJ:e==b.WRITING_LIT_TYPE&&">"==c?b.POST_OBJ:e==b.WRITING_OBJ_LITERAL&&"@"==c?b.WRITING_LIT_LANG:e==b.WRITING_OBJ_LITERAL&&"^"==c?b.WRITING_LIT_TYPE:" "!=c||e!=b.PRE_SUBJECT&&e!=b.PRE_PRED&&e!=b.PRE_OBJ&&e!=b.POST_OBJ?e==b.POST_OBJ&&"."==c?b.PRE_SUBJECT:b.ERROR:e,a.location=d}var b={PRE_SUBJECT:0,WRITING_SUB_URI:1,WRITING_BNODE_URI:2,PRE_PRED:3,WRITING_PRED_URI:4,PRE_OBJ:5,WRITING_OBJ_URI:6,WRITING_OBJ_BNODE:7,WRITING_OBJ_LITERAL:8,WRITING_LIT_LANG:9,WRITING_LIT_TYPE:10,POST_OBJ:11,ERROR:12};return{startState:function(){return{location:b.PRE_SUBJECT,uris:[],anchors:[],bnodes:[],langs:[],types:[]}},token:function(b,c){var d=b.next();if("<"==d){a(c,d);var e="";return b.eatWhile((function(a){return"#"!=a&&">"!=a&&(e+=a,!0)})),c.uris.push(e),b.match("#",!1)?"variable":(b.next(),a(c,">"),"variable")}if("#"==d){var f="";return b.eatWhile((function(a){return">"!=a&&" "!=a&&(f+=a,!0)})),c.anchors.push(f),"variable-2"}if(">"==d)return a(c,">"),"variable";if("_"==d){a(c,d);var g="";return b.eatWhile((function(a){return" "!=a&&(g+=a,!0)})),c.bnodes.push(g),b.next(),a(c," "),"builtin"}if('"'==d)return a(c,d),b.eatWhile((function(a){return'"'!=a})),b.next(),"@"!=b.peek()&&"^"!=b.peek()&&a(c,'"'),"string";if("@"==d){a(c,"@");var h="";return b.eatWhile((function(a){return" "!=a&&(h+=a,!0)})),c.langs.push(h),b.next(),a(c," "),"string-2"}if("^"==d){b.next(),a(c,"^");var i="";return b.eatWhile((function(a){return">"!=a&&(i+=a,!0)})),c.types.push(i),b.next(),a(c,">"),"variable"}" "==d&&a(c,d),"."==d&&a(c,d)}}})),a.defineMIME("application/n-triples","ntriples"),a.defineMIME("application/n-quads","ntriples"),a.defineMIME("text/n-triples","ntriples")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/powershell/powershell.js b/media/editors/codemirror/mode/powershell/powershell.js
index 5eae979488b5b..2728ef9d9d1aa 100644
--- a/media/editors/codemirror/mode/powershell/powershell.js
+++ b/media/editors/codemirror/mode/powershell/powershell.js
@@ -4,9 +4,9 @@
 (function(mod) {
   'use strict';
   if (typeof exports == 'object' && typeof module == 'object') // CommonJS
-    mod(require('codemirror'));
+    mod(require('../../lib/codemirror'));
   else if (typeof define == 'function' && define.amd) // AMD
-    define(['codemirror'], mod);
+    define(['../../lib/codemirror'], mod);
   else // Plain browser env
     mod(window.CodeMirror);
 })(function(CodeMirror) {
diff --git a/media/editors/codemirror/mode/powershell/powershell.min.js b/media/editors/codemirror/mode/powershell/powershell.min.js
index 617d3df047b1a..2a6a708ded050 100644
--- a/media/editors/codemirror/mode/powershell/powershell.min.js
+++ b/media/editors/codemirror/mode/powershell/powershell.min.js
@@ -1 +1 @@
-!(function(a){"use strict";"object"==typeof exports&&"object"==typeof module?a(require("codemirror")):"function"==typeof define&&define.amd?define(["codemirror"],a):a(window.CodeMirror)})((function(a){"use strict";a.defineMode("powershell",(function(){function a(a,b){b=b||{};for(var c=void 0!==b.prefix?b.prefix:"^",d=void 0!==b.suffix?b.suffix:"\\b",e=0;e<a.length;e++)a[e]instanceof RegExp?a[e]=a[e].source:a[e]=a[e].replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");return new RegExp(c+"("+a.join("|")+")"+d,"i")}function b(a,b){var e=b.returnStack[b.returnStack.length-1];if(e&&e.shouldReturnFrom(b))return b.tokenize=e.tokenize,b.returnStack.pop(),b.tokenize(a,b);if(a.eatSpace())return null;if(a.eat("("))return b.bracketNesting+=1,"punctuation";if(a.eat(")"))return b.bracketNesting-=1,"punctuation";for(var f in z)if(a.match(z[f]))return f;var g=a.next();if("'"===g)return c(a,b);if("$"===g)return j(a,b);if('"'===g)return d(a,b);if("<"===g&&a.eat("#"))return b.tokenize=i,i(a,b);if("#"===g)return a.skipToEnd(),"comment";if("@"===g){var h=a.eat(/["']/);if(h&&a.eol())return b.tokenize=l,b.startQuote=h[0],l(a,b);if(a.eol())return"error";if(a.peek().match(/[({]/))return"punctuation";if(a.peek().match(n))return j(a,b)}return"error"}function c(a,c){for(var d;null!=(d=a.peek());)if(a.next(),"'"===d&&!a.eat("'"))return c.tokenize=b,"string";return"error"}function d(a,c){for(var d;null!=(d=a.peek());){if("$"===d)return c.tokenize=e,"string";if(a.next(),"`"!==d){if('"'===d&&!a.eat('"'))return c.tokenize=b,"string"}else a.next()}return"error"}function e(a,b){return h(a,b,d)}function f(a,b){return b.tokenize=l,b.startQuote='"',l(a,b)}function g(a,b){return h(a,b,f)}function h(a,c,d){if(a.match("$(")){var e=c.bracketNesting;return c.returnStack.push({shouldReturnFrom:function(a){return a.bracketNesting===e},tokenize:d}),c.tokenize=b,c.bracketNesting+=1,"punctuation"}return a.next(),c.returnStack.push({shouldReturnFrom:function(){return!0},tokenize:d}),c.tokenize=j,c.tokenize(a,c)}function i(a,c){for(var d,e=!1;null!=(d=a.next());){if(e&&">"==d){c.tokenize=b;break}e="#"===d}return"comment"}function j(a,c){var d=a.peek();return a.eat("{")?(c.tokenize=k,k(a,c)):void 0!=d&&d.match(n)?(a.eatWhile(n),c.tokenize=b,"variable-2"):(c.tokenize=b,"error")}function k(a,c){for(var d;null!=(d=a.next());)if("}"===d){c.tokenize=b;break}return"variable-2"}function l(a,c){var d=c.startQuote;if(a.sol()&&a.match(new RegExp(d+"@")))c.tokenize=b;else if('"'===d)for(;!a.eol();){var e=a.peek();if("$"===e)return c.tokenize=g,"string";a.next(),"`"===e&&a.next()}else a.skipToEnd();return"string"}var m="(?=[^A-Za-z\\d\\-_]|$)",n=/[\w\-:]/,o=a([/begin|break|catch|continue|data|default|do|dynamicparam/,/else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,/param|process|return|switch|throw|trap|try|until|where|while/],{suffix:m}),p=/[\[\]{},;`\.]|@[({]/,q=a(["f",/b?not/,/[ic]?split/,"join",/is(not)?/,"as",/[ic]?(eq|ne|[gl][te])/,/[ic]?(not)?(like|match|contains)/,/[ic]?replace/,/b?(and|or|xor)/],{prefix:"-"}),r=/[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=!|\/]|<(?!#)|(?!#)>/,s=a([q,r],{suffix:""}),t=/^((0x[\da-f]+)|((\d+\.\d+|\d\.|\.\d+|\d+)(e[\+\-]?\d+)?))[ld]?([kmgtp]b)?/i,u=/^[A-Za-z\_][A-Za-z\-\_\d]*\b/,v=/[A-Z]:|%|\?/i,w=a([/Add-(Computer|Content|History|Member|PSSnapin|Type)/,/Checkpoint-Computer/,/Clear-(Content|EventLog|History|Host|Item(Property)?|Variable)/,/Compare-Object/,/Complete-Transaction/,/Connect-PSSession/,/ConvertFrom-(Csv|Json|SecureString|StringData)/,/Convert-Path/,/ConvertTo-(Csv|Html|Json|SecureString|Xml)/,/Copy-Item(Property)?/,/Debug-Process/,/Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,/Disconnect-PSSession/,/Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,/(Enter|Exit)-PSSession/,/Export-(Alias|Clixml|Console|Counter|Csv|FormatData|ModuleMember|PSSession)/,/ForEach-Object/,/Format-(Custom|List|Table|Wide)/,new RegExp("Get-(Acl|Alias|AuthenticodeSignature|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Counter|Credential|Culture|Date|Event|EventLog|EventSubscriber|ExecutionPolicy|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|PfxCertificate|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|Verb|WinEvent|WmiObject)"),/Group-Object/,/Import-(Alias|Clixml|Counter|Csv|LocalizedData|Module|PSSession)/,/ImportSystemModules/,/Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)/,/Join-Path/,/Limit-EventLog/,/Measure-(Command|Object)/,/Move-Item(Property)?/,new RegExp("New-(Alias|Event|EventLog|Item(Property)?|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy|WinEvent)"),/Out-(Default|File|GridView|Host|Null|Printer|String)/,/Pause/,/(Pop|Push)-Location/,/Read-Host/,/Receive-(Job|PSSession)/,/Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)/,/Remove-(Computer|Event|EventLog|Item(Property)?|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)/,/Rename-(Computer|Item(Property)?)/,/Reset-ComputerMachinePassword/,/Resolve-Path/,/Restart-(Computer|Service)/,/Restore-Computer/,/Resume-(Job|Service)/,/Save-Help/,/Select-(Object|String|Xml)/,/Send-MailMessage/,new RegExp("Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)"),/Show-(Command|ControlPanelItem|EventLog)/,/Sort-Object/,/Split-Path/,/Start-(Job|Process|Service|Sleep|Transaction|Transcript)/,/Stop-(Computer|Job|Process|Service|Transcript)/,/Suspend-(Job|Service)/,/TabExpansion2/,/Tee-Object/,/Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)/,/Trace-Command/,/Unblock-File/,/Undo-Transaction/,/Unregister-(Event|PSSessionConfiguration)/,/Update-(FormatData|Help|List|TypeData)/,/Use-Transaction/,/Wait-(Event|Job|Process)/,/Where-Object/,/Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)/,/cd|help|mkdir|more|oss|prompt/,/ac|asnp|cat|cd|chdir|clc|clear|clhy|cli|clp|cls|clv|cnsn|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|dnsn|ebp/,/echo|epal|epcsv|epsn|erase|etsn|exsn|fc|fl|foreach|ft|fw|gal|gbp|gc|gci|gcm|gcs|gdr|ghy|gi|gjb|gl|gm|gmo|gp|gps/,/group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,/measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,/rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,/sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/],{prefix:"",suffix:""}),x=a([/[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,/FormatEnumerationLimit|Home|Host|Input|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount/,/MaximumHistoryCount|MaximumVariableCount|MyInvocation|NestedPromptLevel|OutputEncoding|Pid|Profile|ProgressPreference/,/PSBoundParameters|PSCommandPath|PSCulture|PSDefaultParameterValues|PSEmailServer|PSHome|PSScriptRoot|PSSessionApplicationName/,/PSSessionConfigurationName|PSSessionOption|PSUICulture|PSVersionTable|Pwd|ShellId|StackTrace|VerbosePreference/,/WarningPreference|WhatIfPreference/,/Event|EventArgs|EventSubscriber|Sender/,/Matches|Ofs|ForEach|LastExitCode|PSCmdlet|PSItem|PSSenderInfo|This/,/true|false|null/],{prefix:"\\$",suffix:""}),y=a([v,w,x],{suffix:m}),z={keyword:o,number:t,operator:s,builtin:y,punctuation:p,identifier:u},A={startState:function(){return{returnStack:[],bracketNesting:0,tokenize:b}},token:function(a,b){return b.tokenize(a,b)},blockCommentStart:"<#",blockCommentEnd:"#>",lineComment:"#",fold:"brace"};return A})),a.defineMIME("application/x-powershell","powershell")}));
\ No newline at end of file
+!(function(a){"use strict";"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(window.CodeMirror)})((function(a){"use strict";a.defineMode("powershell",(function(){function a(a,b){b=b||{};for(var c=void 0!==b.prefix?b.prefix:"^",d=void 0!==b.suffix?b.suffix:"\\b",e=0;e<a.length;e++)a[e]instanceof RegExp?a[e]=a[e].source:a[e]=a[e].replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");return new RegExp(c+"("+a.join("|")+")"+d,"i")}function b(a,b){var e=b.returnStack[b.returnStack.length-1];if(e&&e.shouldReturnFrom(b))return b.tokenize=e.tokenize,b.returnStack.pop(),b.tokenize(a,b);if(a.eatSpace())return null;if(a.eat("("))return b.bracketNesting+=1,"punctuation";if(a.eat(")"))return b.bracketNesting-=1,"punctuation";for(var f in z)if(a.match(z[f]))return f;var g=a.next();if("'"===g)return c(a,b);if("$"===g)return j(a,b);if('"'===g)return d(a,b);if("<"===g&&a.eat("#"))return b.tokenize=i,i(a,b);if("#"===g)return a.skipToEnd(),"comment";if("@"===g){var h=a.eat(/["']/);if(h&&a.eol())return b.tokenize=l,b.startQuote=h[0],l(a,b);if(a.eol())return"error";if(a.peek().match(/[({]/))return"punctuation";if(a.peek().match(n))return j(a,b)}return"error"}function c(a,c){for(var d;null!=(d=a.peek());)if(a.next(),"'"===d&&!a.eat("'"))return c.tokenize=b,"string";return"error"}function d(a,c){for(var d;null!=(d=a.peek());){if("$"===d)return c.tokenize=e,"string";if(a.next(),"`"!==d){if('"'===d&&!a.eat('"'))return c.tokenize=b,"string"}else a.next()}return"error"}function e(a,b){return h(a,b,d)}function f(a,b){return b.tokenize=l,b.startQuote='"',l(a,b)}function g(a,b){return h(a,b,f)}function h(a,c,d){if(a.match("$(")){var e=c.bracketNesting;return c.returnStack.push({shouldReturnFrom:function(a){return a.bracketNesting===e},tokenize:d}),c.tokenize=b,c.bracketNesting+=1,"punctuation"}return a.next(),c.returnStack.push({shouldReturnFrom:function(){return!0},tokenize:d}),c.tokenize=j,c.tokenize(a,c)}function i(a,c){for(var d,e=!1;null!=(d=a.next());){if(e&&">"==d){c.tokenize=b;break}e="#"===d}return"comment"}function j(a,c){var d=a.peek();return a.eat("{")?(c.tokenize=k,k(a,c)):void 0!=d&&d.match(n)?(a.eatWhile(n),c.tokenize=b,"variable-2"):(c.tokenize=b,"error")}function k(a,c){for(var d;null!=(d=a.next());)if("}"===d){c.tokenize=b;break}return"variable-2"}function l(a,c){var d=c.startQuote;if(a.sol()&&a.match(new RegExp(d+"@")))c.tokenize=b;else if('"'===d)for(;!a.eol();){var e=a.peek();if("$"===e)return c.tokenize=g,"string";a.next(),"`"===e&&a.next()}else a.skipToEnd();return"string"}var m="(?=[^A-Za-z\\d\\-_]|$)",n=/[\w\-:]/,o=a([/begin|break|catch|continue|data|default|do|dynamicparam/,/else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,/param|process|return|switch|throw|trap|try|until|where|while/],{suffix:m}),p=/[\[\]{},;`\.]|@[({]/,q=a(["f",/b?not/,/[ic]?split/,"join",/is(not)?/,"as",/[ic]?(eq|ne|[gl][te])/,/[ic]?(not)?(like|match|contains)/,/[ic]?replace/,/b?(and|or|xor)/],{prefix:"-"}),r=/[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=!|\/]|<(?!#)|(?!#)>/,s=a([q,r],{suffix:""}),t=/^((0x[\da-f]+)|((\d+\.\d+|\d\.|\.\d+|\d+)(e[\+\-]?\d+)?))[ld]?([kmgtp]b)?/i,u=/^[A-Za-z\_][A-Za-z\-\_\d]*\b/,v=/[A-Z]:|%|\?/i,w=a([/Add-(Computer|Content|History|Member|PSSnapin|Type)/,/Checkpoint-Computer/,/Clear-(Content|EventLog|History|Host|Item(Property)?|Variable)/,/Compare-Object/,/Complete-Transaction/,/Connect-PSSession/,/ConvertFrom-(Csv|Json|SecureString|StringData)/,/Convert-Path/,/ConvertTo-(Csv|Html|Json|SecureString|Xml)/,/Copy-Item(Property)?/,/Debug-Process/,/Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,/Disconnect-PSSession/,/Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,/(Enter|Exit)-PSSession/,/Export-(Alias|Clixml|Console|Counter|Csv|FormatData|ModuleMember|PSSession)/,/ForEach-Object/,/Format-(Custom|List|Table|Wide)/,new RegExp("Get-(Acl|Alias|AuthenticodeSignature|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Counter|Credential|Culture|Date|Event|EventLog|EventSubscriber|ExecutionPolicy|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|PfxCertificate|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|Verb|WinEvent|WmiObject)"),/Group-Object/,/Import-(Alias|Clixml|Counter|Csv|LocalizedData|Module|PSSession)/,/ImportSystemModules/,/Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)/,/Join-Path/,/Limit-EventLog/,/Measure-(Command|Object)/,/Move-Item(Property)?/,new RegExp("New-(Alias|Event|EventLog|Item(Property)?|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy|WinEvent)"),/Out-(Default|File|GridView|Host|Null|Printer|String)/,/Pause/,/(Pop|Push)-Location/,/Read-Host/,/Receive-(Job|PSSession)/,/Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)/,/Remove-(Computer|Event|EventLog|Item(Property)?|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)/,/Rename-(Computer|Item(Property)?)/,/Reset-ComputerMachinePassword/,/Resolve-Path/,/Restart-(Computer|Service)/,/Restore-Computer/,/Resume-(Job|Service)/,/Save-Help/,/Select-(Object|String|Xml)/,/Send-MailMessage/,new RegExp("Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)"),/Show-(Command|ControlPanelItem|EventLog)/,/Sort-Object/,/Split-Path/,/Start-(Job|Process|Service|Sleep|Transaction|Transcript)/,/Stop-(Computer|Job|Process|Service|Transcript)/,/Suspend-(Job|Service)/,/TabExpansion2/,/Tee-Object/,/Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)/,/Trace-Command/,/Unblock-File/,/Undo-Transaction/,/Unregister-(Event|PSSessionConfiguration)/,/Update-(FormatData|Help|List|TypeData)/,/Use-Transaction/,/Wait-(Event|Job|Process)/,/Where-Object/,/Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)/,/cd|help|mkdir|more|oss|prompt/,/ac|asnp|cat|cd|chdir|clc|clear|clhy|cli|clp|cls|clv|cnsn|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|dnsn|ebp/,/echo|epal|epcsv|epsn|erase|etsn|exsn|fc|fl|foreach|ft|fw|gal|gbp|gc|gci|gcm|gcs|gdr|ghy|gi|gjb|gl|gm|gmo|gp|gps/,/group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,/measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,/rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,/sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/],{prefix:"",suffix:""}),x=a([/[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,/FormatEnumerationLimit|Home|Host|Input|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount/,/MaximumHistoryCount|MaximumVariableCount|MyInvocation|NestedPromptLevel|OutputEncoding|Pid|Profile|ProgressPreference/,/PSBoundParameters|PSCommandPath|PSCulture|PSDefaultParameterValues|PSEmailServer|PSHome|PSScriptRoot|PSSessionApplicationName/,/PSSessionConfigurationName|PSSessionOption|PSUICulture|PSVersionTable|Pwd|ShellId|StackTrace|VerbosePreference/,/WarningPreference|WhatIfPreference/,/Event|EventArgs|EventSubscriber|Sender/,/Matches|Ofs|ForEach|LastExitCode|PSCmdlet|PSItem|PSSenderInfo|This/,/true|false|null/],{prefix:"\\$",suffix:""}),y=a([v,w,x],{suffix:m}),z={keyword:o,number:t,operator:s,builtin:y,punctuation:p,identifier:u},A={startState:function(){return{returnStack:[],bracketNesting:0,tokenize:b}},token:function(a,b){return b.tokenize(a,b)},blockCommentStart:"<#",blockCommentEnd:"#>",lineComment:"#",fold:"brace"};return A})),a.defineMIME("application/x-powershell","powershell")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/python/python.js b/media/editors/codemirror/mode/python/python.js
index b539d84aa6a92..2d2b08c810f83 100644
--- a/media/editors/codemirror/mode/python/python.js
+++ b/media/editors/codemirror/mode/python/python.js
@@ -332,8 +332,8 @@
 
   CodeMirror.defineMIME("text/x-cython", {
     name: "python",
-    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                          "extern gil include nogil property public"+
+    extra_keywords: words("by cdef cimport cpdef ctypedef enum except "+
+                          "extern gil include nogil property public "+
                           "readonly struct union DEF IF ELIF ELSE")
   });
 
diff --git a/media/editors/codemirror/mode/python/python.min.js b/media/editors/codemirror/mode/python/python.min.js
index 86987e828be32..2cd66b227e738 100644
--- a/media/editors/codemirror/mode/python/python.min.js
+++ b/media/editors/codemirror/mode/python/python.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a){return a.scopes[a.scopes.length-1]}var d=b(["and","or","not","is"]),e=["as","assert","break","class","continue","def","del","elif","else","except","finally","for","from","global","if","import","lambda","pass","raise","return","try","while","with","yield","in"],f=["abs","all","any","bin","bool","bytearray","callable","chr","classmethod","compile","complex","delattr","dict","dir","divmod","enumerate","eval","filter","float","format","frozenset","getattr","globals","hasattr","hash","help","hex","id","input","int","isinstance","issubclass","iter","len","list","locals","map","max","memoryview","min","next","object","oct","open","ord","pow","property","range","repr","reversed","round","set","setattr","slice","sorted","staticmethod","str","sum","super","tuple","type","vars","zip","__import__","NotImplemented","Ellipsis","__debug__"];a.registerHelper("hintWords","python",e.concat(f)),a.defineMode("python",(function(g,h){function i(a,b){if(a.sol()&&(b.indent=a.indentation()),a.sol()&&"py"==c(b).type){var d=c(b).offset;if(a.eatSpace()){var e=a.indentation();return e>d?l(b):e<d&&n(a,b)&&"#"!=a.peek()&&(b.errorToken=!0),null}var f=j(a,b);return d>0&&n(a,b)&&(f+=" "+p),f}return j(a,b)}function j(a,b){if(a.eatSpace())return null;var c=a.peek();if("#"==c)return a.skipToEnd(),"comment";if(a.match(/^[0-9\.]/,!1)){var e=!1;if(a.match(/^[\d_]*\.\d+(e[\+\-]?\d+)?/i)&&(e=!0),a.match(/^[\d_]+\.\d*/)&&(e=!0),a.match(/^\.\d+/)&&(e=!0),e)return a.eat(/J/i),"number";var f=!1;if(a.match(/^0x[0-9a-f_]+/i)&&(f=!0),a.match(/^0b[01_]+/i)&&(f=!0),a.match(/^0o[0-7_]+/i)&&(f=!0),a.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)&&(a.eat(/J/i),f=!0),a.match(/^0(?![\dx])/i)&&(f=!0),f)return a.eat(/L/i),"number"}return a.match(A)?(b.tokenize=k(a.current()),b.tokenize(a,b)):a.match(t)||a.match(s)?"punctuation":a.match(r)||a.match(y)?"operator":a.match(q)?"punctuation":"."==b.lastToken&&a.match(z)?"property":a.match(B)||a.match(d)?"keyword":a.match(C)?"builtin":a.match(/^(self|cls)\b/)?"variable-2":a.match(z)?"def"==b.lastToken||"class"==b.lastToken?"def":"variable":(a.next(),p)}function k(a){function b(b,e){for(;!b.eol();)if(b.eatWhile(/[^'"\\]/),b.eat("\\")){if(b.next(),c&&b.eol())return d}else{if(b.match(a))return e.tokenize=i,d;b.eat(/['"]/)}if(c){if(h.singleLineStringErrors)return p;e.tokenize=i}return d}for(;"rubf".indexOf(a.charAt(0).toLowerCase())>=0;)a=a.substr(1);var c=1==a.length,d="string";return b.isString=!0,b}function l(a){for(;"py"!=c(a).type;)a.scopes.pop();a.scopes.push({offset:c(a).offset+g.indentUnit,type:"py",align:null})}function m(a,b,c){var d=a.match(/^([\s\[\{\(]|#.*)*$/,!1)?null:a.column()+1;b.scopes.push({offset:b.indent+u,type:c,align:d})}function n(a,b){for(var d=a.indentation();b.scopes.length>1&&c(b).offset>d;){if("py"!=c(b).type)return!0;b.scopes.pop()}return c(b).offset!=d}function o(a,b){a.sol()&&(b.beginningOfLine=!0);var d=b.tokenize(a,b),e=a.current();if(b.beginningOfLine&&"@"==e)return a.match(z,!1)?"meta":x?"operator":p;/\S/.test(e)&&(b.beginningOfLine=!1),"variable"!=d&&"builtin"!=d||"meta"!=b.lastToken||(d="meta"),"pass"!=e&&"return"!=e||(b.dedent+=1),"lambda"==e&&(b.lambda=!0),":"!=e||b.lambda||"py"!=c(b).type||l(b);var f=1==e.length?"[({".indexOf(e):-1;if(f!=-1&&m(a,b,"])}".slice(f,f+1)),f="])}".indexOf(e),f!=-1){if(c(b).type!=e)return p;b.indent=b.scopes.pop().offset-u}return b.dedent>0&&a.eol()&&"py"==c(b).type&&(b.scopes.length>1&&b.scopes.pop(),b.dedent-=1),d}var p="error",q=h.singleDelimiters||/^[\(\)\[\]\{\}@,:`=;\.]/,r=h.doubleOperators||/^([!<>]==|<>|<<|>>|\/\/|\*\*)/,s=h.doubleDelimiters||/^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/,t=h.tripleDelimiters||/^(\/\/=|>>=|<<=|\*\*=)/,u=h.hangingIndent||g.indentUnit,v=e,w=f;void 0!=h.extra_keywords&&(v=v.concat(h.extra_keywords)),void 0!=h.extra_builtins&&(w=w.concat(h.extra_builtins));var x=!(h.version&&Number(h.version)<3);if(x){var y=h.singleOperators||/^[\+\-\*\/%&|\^~<>!@]/,z=h.identifiers||/^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;v=v.concat(["nonlocal","False","True","None","async","await"]),w=w.concat(["ascii","bytes","exec","print"]);var A=new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))","i")}else{var y=h.singleOperators||/^[\+\-\*\/%&|\^~<>!]/,z=h.identifiers||/^[_A-Za-z][_A-Za-z0-9]*/;v=v.concat(["exec","print"]),w=w.concat(["apply","basestring","buffer","cmp","coerce","execfile","file","intern","long","raw_input","reduce","reload","unichr","unicode","xrange","False","True","None"]);var A=new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))","i")}var B=b(v),C=b(w),D={startState:function(a){return{tokenize:i,scopes:[{offset:a||0,type:"py",align:null}],indent:a||0,lastToken:null,lambda:!1,dedent:0}},token:function(a,b){var c=b.errorToken;c&&(b.errorToken=!1);var d=o(a,b);return d&&"comment"!=d&&(b.lastToken="keyword"==d||"punctuation"==d?a.current():d),"punctuation"==d&&(d=null),a.eol()&&b.lambda&&(b.lambda=!1),c?d+" "+p:d},indent:function(b,d){if(b.tokenize!=i)return b.tokenize.isString?a.Pass:0;var e=c(b),f=e.type==d.charAt(0);return null!=e.align?e.align-(f?1:0):e.offset-(f?u:0)},electricInput:/^\s*[\}\]\)]$/,closeBrackets:{triples:"'\""},lineComment:"#",fold:"indent"};return D})),a.defineMIME("text/x-python","python");var g=function(a){return a.split(" ")};a.defineMIME("text/x-cython",{name:"python",extra_keywords:g("by cdef cimport cpdef ctypedef enum exceptextern gil include nogil property publicreadonly struct union DEF IF ELIF ELSE")})}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a){return a.scopes[a.scopes.length-1]}var d=b(["and","or","not","is"]),e=["as","assert","break","class","continue","def","del","elif","else","except","finally","for","from","global","if","import","lambda","pass","raise","return","try","while","with","yield","in"],f=["abs","all","any","bin","bool","bytearray","callable","chr","classmethod","compile","complex","delattr","dict","dir","divmod","enumerate","eval","filter","float","format","frozenset","getattr","globals","hasattr","hash","help","hex","id","input","int","isinstance","issubclass","iter","len","list","locals","map","max","memoryview","min","next","object","oct","open","ord","pow","property","range","repr","reversed","round","set","setattr","slice","sorted","staticmethod","str","sum","super","tuple","type","vars","zip","__import__","NotImplemented","Ellipsis","__debug__"];a.registerHelper("hintWords","python",e.concat(f)),a.defineMode("python",(function(g,h){function i(a,b){if(a.sol()&&(b.indent=a.indentation()),a.sol()&&"py"==c(b).type){var d=c(b).offset;if(a.eatSpace()){var e=a.indentation();return e>d?l(b):e<d&&n(a,b)&&"#"!=a.peek()&&(b.errorToken=!0),null}var f=j(a,b);return d>0&&n(a,b)&&(f+=" "+p),f}return j(a,b)}function j(a,b){if(a.eatSpace())return null;var c=a.peek();if("#"==c)return a.skipToEnd(),"comment";if(a.match(/^[0-9\.]/,!1)){var e=!1;if(a.match(/^[\d_]*\.\d+(e[\+\-]?\d+)?/i)&&(e=!0),a.match(/^[\d_]+\.\d*/)&&(e=!0),a.match(/^\.\d+/)&&(e=!0),e)return a.eat(/J/i),"number";var f=!1;if(a.match(/^0x[0-9a-f_]+/i)&&(f=!0),a.match(/^0b[01_]+/i)&&(f=!0),a.match(/^0o[0-7_]+/i)&&(f=!0),a.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)&&(a.eat(/J/i),f=!0),a.match(/^0(?![\dx])/i)&&(f=!0),f)return a.eat(/L/i),"number"}return a.match(A)?(b.tokenize=k(a.current()),b.tokenize(a,b)):a.match(t)||a.match(s)?"punctuation":a.match(r)||a.match(y)?"operator":a.match(q)?"punctuation":"."==b.lastToken&&a.match(z)?"property":a.match(B)||a.match(d)?"keyword":a.match(C)?"builtin":a.match(/^(self|cls)\b/)?"variable-2":a.match(z)?"def"==b.lastToken||"class"==b.lastToken?"def":"variable":(a.next(),p)}function k(a){function b(b,e){for(;!b.eol();)if(b.eatWhile(/[^'"\\]/),b.eat("\\")){if(b.next(),c&&b.eol())return d}else{if(b.match(a))return e.tokenize=i,d;b.eat(/['"]/)}if(c){if(h.singleLineStringErrors)return p;e.tokenize=i}return d}for(;"rubf".indexOf(a.charAt(0).toLowerCase())>=0;)a=a.substr(1);var c=1==a.length,d="string";return b.isString=!0,b}function l(a){for(;"py"!=c(a).type;)a.scopes.pop();a.scopes.push({offset:c(a).offset+g.indentUnit,type:"py",align:null})}function m(a,b,c){var d=a.match(/^([\s\[\{\(]|#.*)*$/,!1)?null:a.column()+1;b.scopes.push({offset:b.indent+u,type:c,align:d})}function n(a,b){for(var d=a.indentation();b.scopes.length>1&&c(b).offset>d;){if("py"!=c(b).type)return!0;b.scopes.pop()}return c(b).offset!=d}function o(a,b){a.sol()&&(b.beginningOfLine=!0);var d=b.tokenize(a,b),e=a.current();if(b.beginningOfLine&&"@"==e)return a.match(z,!1)?"meta":x?"operator":p;/\S/.test(e)&&(b.beginningOfLine=!1),"variable"!=d&&"builtin"!=d||"meta"!=b.lastToken||(d="meta"),"pass"!=e&&"return"!=e||(b.dedent+=1),"lambda"==e&&(b.lambda=!0),":"!=e||b.lambda||"py"!=c(b).type||l(b);var f=1==e.length?"[({".indexOf(e):-1;if(f!=-1&&m(a,b,"])}".slice(f,f+1)),f="])}".indexOf(e),f!=-1){if(c(b).type!=e)return p;b.indent=b.scopes.pop().offset-u}return b.dedent>0&&a.eol()&&"py"==c(b).type&&(b.scopes.length>1&&b.scopes.pop(),b.dedent-=1),d}var p="error",q=h.singleDelimiters||/^[\(\)\[\]\{\}@,:`=;\.]/,r=h.doubleOperators||/^([!<>]==|<>|<<|>>|\/\/|\*\*)/,s=h.doubleDelimiters||/^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/,t=h.tripleDelimiters||/^(\/\/=|>>=|<<=|\*\*=)/,u=h.hangingIndent||g.indentUnit,v=e,w=f;void 0!=h.extra_keywords&&(v=v.concat(h.extra_keywords)),void 0!=h.extra_builtins&&(w=w.concat(h.extra_builtins));var x=!(h.version&&Number(h.version)<3);if(x){var y=h.singleOperators||/^[\+\-\*\/%&|\^~<>!@]/,z=h.identifiers||/^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;v=v.concat(["nonlocal","False","True","None","async","await"]),w=w.concat(["ascii","bytes","exec","print"]);var A=new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))","i")}else{var y=h.singleOperators||/^[\+\-\*\/%&|\^~<>!]/,z=h.identifiers||/^[_A-Za-z][_A-Za-z0-9]*/;v=v.concat(["exec","print"]),w=w.concat(["apply","basestring","buffer","cmp","coerce","execfile","file","intern","long","raw_input","reduce","reload","unichr","unicode","xrange","False","True","None"]);var A=new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))","i")}var B=b(v),C=b(w),D={startState:function(a){return{tokenize:i,scopes:[{offset:a||0,type:"py",align:null}],indent:a||0,lastToken:null,lambda:!1,dedent:0}},token:function(a,b){var c=b.errorToken;c&&(b.errorToken=!1);var d=o(a,b);return d&&"comment"!=d&&(b.lastToken="keyword"==d||"punctuation"==d?a.current():d),"punctuation"==d&&(d=null),a.eol()&&b.lambda&&(b.lambda=!1),c?d+" "+p:d},indent:function(b,d){if(b.tokenize!=i)return b.tokenize.isString?a.Pass:0;var e=c(b),f=e.type==d.charAt(0);return null!=e.align?e.align-(f?1:0):e.offset-(f?u:0)},electricInput:/^\s*[\}\]\)]$/,closeBrackets:{triples:"'\""},lineComment:"#",fold:"indent"};return D})),a.defineMIME("text/x-python","python");var g=function(a){return a.split(" ")};a.defineMIME("text/x-cython",{name:"python",extra_keywords:g("by cdef cimport cpdef ctypedef enum except extern gil include nogil property public readonly struct union DEF IF ELIF ELSE")})}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/q/q.js b/media/editors/codemirror/mode/q/q.js
index a4af9383e7b3b..9aee18ab1e912 100644
--- a/media/editors/codemirror/mode/q/q.js
+++ b/media/editors/codemirror/mode/q/q.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("q",function(config){
         return(state.tokenize=tokenLineComment)(stream,state);
       else if(c=="\\"){
         if(stream.eol()||/\s/.test(stream.peek()))
-          return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream, state):state.tokenize=tokenBase,"comment";
+          return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream):state.tokenize=tokenBase,"comment";
         else
           return state.tokenize=tokenBase,"builtin";
       }
@@ -34,25 +34,25 @@ CodeMirror.defineMode("q",function(config){
     if(c=='"')
       return(state.tokenize=tokenString)(stream,state);
     if(c=='`')
-      return stream.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol";
+      return stream.eatWhile(/[A-Za-z\d_:\/.]/),"symbol";
     if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){
       var t=null;
       stream.backUp(1);
-      if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
+      if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([DT](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
       || stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)
       || stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)
       || stream.match(/^\d+[ptuv]{1}/))
         t="temporal";
       else if(stream.match(/^0[NwW]{1}/)
-      || stream.match(/^0x[\d|a-f|A-F]*/)
-      || stream.match(/^[0|1]+[b]{1}/)
+      || stream.match(/^0x[\da-fA-F]*/)
+      || stream.match(/^[01]+[b]{1}/)
       || stream.match(/^\d+[chijn]{1}/)
       || stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))
         t="number";
       return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error");
     }
-    if(/[A-Z|a-z]|\./.test(c))
-      return stream.eatWhile(/[A-Z|a-z|\.|_|\d]/),keywords.test(stream.current())?"keyword":"variable";
+    if(/[A-Za-z]|\./.test(c))
+      return stream.eatWhile(/[A-Za-z._\d]/),keywords.test(stream.current())?"keyword":"variable";
     if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c))
       return null;
     if(/[{}\(\[\]\)]/.test(c))
diff --git a/media/editors/codemirror/mode/q/q.min.js b/media/editors/codemirror/mode/q/q.min.js
index fc32b5f885580..01f3e7e959dbc 100644
--- a/media/editors/codemirror/mode/q/q.min.js
+++ b/media/editors/codemirror/mode/q/q.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("q",(function(a){function b(a){return new RegExp("^("+a.join("|")+")$")}function c(a,b){var e=a.sol(),h=a.next();if(j=null,e){if("/"==h)return(b.tokenize=d)(a,b);if("\\"==h)return a.eol()||/\s/.test(a.peek())?(a.skipToEnd(),/^\\\s*$/.test(a.current())?(b.tokenize=f)(a,b):b.tokenize=c,"comment"):(b.tokenize=c,"builtin")}if(/\s/.test(h))return"/"==a.peek()?(a.skipToEnd(),"comment"):"whitespace";if('"'==h)return(b.tokenize=g)(a,b);if("`"==h)return a.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol";if("."==h&&/\d/.test(a.peek())||/\d/.test(h)){var i=null;return a.backUp(1),a.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)||a.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)||a.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)||a.match(/^\d+[ptuv]{1}/)?i="temporal":(a.match(/^0[NwW]{1}/)||a.match(/^0x[\d|a-f|A-F]*/)||a.match(/^[0|1]+[b]{1}/)||a.match(/^\d+[chijn]{1}/)||a.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))&&(i="number"),!i||(h=a.peek())&&!m.test(h)?(a.next(),"error"):i}return/[A-Z|a-z]|\./.test(h)?(a.eatWhile(/[A-Z|a-z|\.|_|\d]/),l.test(a.current())?"keyword":"variable"):/[|\/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(h)?null:/[{}\(\[\]\)]/.test(h)?null:"error"}function d(a,b){return a.skipToEnd(),/\/\s*$/.test(a.current())?(b.tokenize=e)(a,b):b.tokenize=c,"comment"}function e(a,b){var d=a.sol()&&"\\"==a.peek();return a.skipToEnd(),d&&/^\\\s*$/.test(a.current())&&(b.tokenize=c),"comment"}function f(a){return a.skipToEnd(),"comment"}function g(a,b){for(var d,e=!1,f=!1;d=a.next();){if('"'==d&&!e){f=!0;break}e=!e&&"\\"==d}return f&&(b.tokenize=c),"string"}function h(a,b,c){a.context={prev:a.context,indent:a.indent,col:c,type:b}}function i(a){a.indent=a.context.indent,a.context=a.context.prev}var j,k=a.indentUnit,l=b(["abs","acos","aj","aj0","all","and","any","asc","asin","asof","atan","attr","avg","avgs","bin","by","ceiling","cols","cor","cos","count","cov","cross","csv","cut","delete","deltas","desc","dev","differ","distinct","div","do","each","ej","enlist","eval","except","exec","exit","exp","fby","fills","first","fkeys","flip","floor","from","get","getenv","group","gtime","hclose","hcount","hdel","hopen","hsym","iasc","idesc","if","ij","in","insert","inter","inv","key","keys","last","like","list","lj","load","log","lower","lsq","ltime","ltrim","mavg","max","maxs","mcount","md5","mdev","med","meta","min","mins","mmax","mmin","mmu","mod","msum","neg","next","not","null","or","over","parse","peach","pj","plist","prd","prds","prev","prior","rand","rank","ratios","raze","read0","read1","reciprocal","reverse","rload","rotate","rsave","rtrim","save","scan","select","set","setenv","show","signum","sin","sqrt","ss","ssr","string","sublist","sum","sums","sv","system","tables","tan","til","trim","txf","type","uj","ungroup","union","update","upper","upsert","value","var","view","views","vs","wavg","where","where","while","within","wj","wj1","wsum","xasc","xbar","xcol","xcols","xdesc","xexp","xgroup","xkey","xlog","xprev","xrank"]),m=/[|\/&^!+:\\\-*%$=~#;@><,?_\'\"\[\(\]\)\s{}]/;return{startState:function(){return{tokenize:c,context:null,indent:0,col:0}},token:function(a,b){a.sol()&&(b.context&&null==b.context.align&&(b.context.align=!1),b.indent=a.indentation());var c=b.tokenize(a,b);if("comment"!=c&&b.context&&null==b.context.align&&"pattern"!=b.context.type&&(b.context.align=!0),"("==j)h(b,")",a.column());else if("["==j)h(b,"]",a.column());else if("{"==j)h(b,"}",a.column());else if(/[\]\}\)]/.test(j)){for(;b.context&&"pattern"==b.context.type;)i(b);b.context&&j==b.context.type&&i(b)}else"."==j&&b.context&&"pattern"==b.context.type?i(b):/atom|string|variable/.test(c)&&b.context&&(/[\}\]]/.test(b.context.type)?h(b,"pattern",a.column()):"pattern"!=b.context.type||b.context.align||(b.context.align=!0,b.context.col=a.column()));return c},indent:function(a,b){var c=b&&b.charAt(0),d=a.context;if(/[\]\}]/.test(c))for(;d&&"pattern"==d.type;)d=d.prev;var e=d&&c==d.type;return d?"pattern"==d.type?d.col:d.align?d.col+(e?0:1):d.indent+(e?0:k):0}}})),a.defineMIME("text/x-q","q")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("q",(function(a){function b(a){return new RegExp("^("+a.join("|")+")$")}function c(a,b){var e=a.sol(),h=a.next();if(j=null,e){if("/"==h)return(b.tokenize=d)(a,b);if("\\"==h)return a.eol()||/\s/.test(a.peek())?(a.skipToEnd(),/^\\\s*$/.test(a.current())?(b.tokenize=f)(a):b.tokenize=c,"comment"):(b.tokenize=c,"builtin")}if(/\s/.test(h))return"/"==a.peek()?(a.skipToEnd(),"comment"):"whitespace";if('"'==h)return(b.tokenize=g)(a,b);if("`"==h)return a.eatWhile(/[A-Za-z\d_:\/.]/),"symbol";if("."==h&&/\d/.test(a.peek())||/\d/.test(h)){var i=null;return a.backUp(1),a.match(/^\d{4}\.\d{2}(m|\.\d{2}([DT](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)||a.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)||a.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)||a.match(/^\d+[ptuv]{1}/)?i="temporal":(a.match(/^0[NwW]{1}/)||a.match(/^0x[\da-fA-F]*/)||a.match(/^[01]+[b]{1}/)||a.match(/^\d+[chijn]{1}/)||a.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))&&(i="number"),!i||(h=a.peek())&&!m.test(h)?(a.next(),"error"):i}return/[A-Za-z]|\./.test(h)?(a.eatWhile(/[A-Za-z._\d]/),l.test(a.current())?"keyword":"variable"):/[|\/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(h)?null:/[{}\(\[\]\)]/.test(h)?null:"error"}function d(a,b){return a.skipToEnd(),/\/\s*$/.test(a.current())?(b.tokenize=e)(a,b):b.tokenize=c,"comment"}function e(a,b){var d=a.sol()&&"\\"==a.peek();return a.skipToEnd(),d&&/^\\\s*$/.test(a.current())&&(b.tokenize=c),"comment"}function f(a){return a.skipToEnd(),"comment"}function g(a,b){for(var d,e=!1,f=!1;d=a.next();){if('"'==d&&!e){f=!0;break}e=!e&&"\\"==d}return f&&(b.tokenize=c),"string"}function h(a,b,c){a.context={prev:a.context,indent:a.indent,col:c,type:b}}function i(a){a.indent=a.context.indent,a.context=a.context.prev}var j,k=a.indentUnit,l=b(["abs","acos","aj","aj0","all","and","any","asc","asin","asof","atan","attr","avg","avgs","bin","by","ceiling","cols","cor","cos","count","cov","cross","csv","cut","delete","deltas","desc","dev","differ","distinct","div","do","each","ej","enlist","eval","except","exec","exit","exp","fby","fills","first","fkeys","flip","floor","from","get","getenv","group","gtime","hclose","hcount","hdel","hopen","hsym","iasc","idesc","if","ij","in","insert","inter","inv","key","keys","last","like","list","lj","load","log","lower","lsq","ltime","ltrim","mavg","max","maxs","mcount","md5","mdev","med","meta","min","mins","mmax","mmin","mmu","mod","msum","neg","next","not","null","or","over","parse","peach","pj","plist","prd","prds","prev","prior","rand","rank","ratios","raze","read0","read1","reciprocal","reverse","rload","rotate","rsave","rtrim","save","scan","select","set","setenv","show","signum","sin","sqrt","ss","ssr","string","sublist","sum","sums","sv","system","tables","tan","til","trim","txf","type","uj","ungroup","union","update","upper","upsert","value","var","view","views","vs","wavg","where","where","while","within","wj","wj1","wsum","xasc","xbar","xcol","xcols","xdesc","xexp","xgroup","xkey","xlog","xprev","xrank"]),m=/[|\/&^!+:\\\-*%$=~#;@><,?_\'\"\[\(\]\)\s{}]/;return{startState:function(){return{tokenize:c,context:null,indent:0,col:0}},token:function(a,b){a.sol()&&(b.context&&null==b.context.align&&(b.context.align=!1),b.indent=a.indentation());var c=b.tokenize(a,b);if("comment"!=c&&b.context&&null==b.context.align&&"pattern"!=b.context.type&&(b.context.align=!0),"("==j)h(b,")",a.column());else if("["==j)h(b,"]",a.column());else if("{"==j)h(b,"}",a.column());else if(/[\]\}\)]/.test(j)){for(;b.context&&"pattern"==b.context.type;)i(b);b.context&&j==b.context.type&&i(b)}else"."==j&&b.context&&"pattern"==b.context.type?i(b):/atom|string|variable/.test(c)&&b.context&&(/[\}\]]/.test(b.context.type)?h(b,"pattern",a.column()):"pattern"!=b.context.type||b.context.align||(b.context.align=!0,b.context.col=a.column()));return c},indent:function(a,b){var c=b&&b.charAt(0),d=a.context;if(/[\]\}]/.test(c))for(;d&&"pattern"==d.type;)d=d.prev;var e=d&&c==d.type;return d?"pattern"==d.type?d.col:d.align?d.col+(e?0:1):d.indent+(e?0:k):0}}})),a.defineMIME("text/x-q","q")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/rust/rust.js b/media/editors/codemirror/mode/rust/rust.js
index 8558b53fe4c66..b635563ae64fa 100644
--- a/media/editors/codemirror/mode/rust/rust.js
+++ b/media/editors/codemirror/mode/rust/rust.js
@@ -68,4 +68,5 @@ CodeMirror.defineSimpleMode("rust",{
 
 
 CodeMirror.defineMIME("text/x-rustsrc", "rust");
+CodeMirror.defineMIME("text/rust", "rust");
 });
diff --git a/media/editors/codemirror/mode/rust/rust.min.js b/media/editors/codemirror/mode/rust/rust.min.js
index a51fdc737dffb..06bbcc7b967ae 100644
--- a/media/editors/codemirror/mode/rust/rust.min.js
+++ b/media/editors/codemirror/mode/rust/rust.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("rust",{start:[{regex:/b?"/,token:"string",next:"string"},{regex:/b?r"/,token:"string",next:"string_raw"},{regex:/b?r#+"/,token:"string",next:"string_raw_hash"},{regex:/'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/,token:"string-2"},{regex:/b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/,token:"string-2"},{regex:/(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,token:"number"},{regex:/(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,token:"keyword"},{regex:/\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/,token:"atom"},{regex:/\b(?:true|false|Some|None|Ok|Err)\b/,token:"builtin"},{regex:/\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/#!?\[.*\]/,token:"meta"},{regex:/\/\/.*/,token:"comment"},{regex:/\/\*/,token:"comment",next:"comment"},{regex:/[-+\/*=<>!]+/,token:"operator"},{regex:/[a-zA-Z_]\w*!/,token:"variable-3"},{regex:/[a-zA-Z_]\w*/,token:"variable"},{regex:/[\{\[\(]/,indent:!0},{regex:/[\}\]\)]/,dedent:!0}],string:[{regex:/"/,token:"string",next:"start"},{regex:/(?:[^\\"]|\\(?:.|$))*/,token:"string"}],string_raw:[{regex:/"/,token:"string",next:"start"},{regex:/[^"]*/,token:"string"}],string_raw_hash:[{regex:/"#+/,token:"string",next:"start"},{regex:/(?:[^"]|"(?!#))*/,token:"string"}],comment:[{regex:/.*?\*\//,token:"comment",next:"start"},{regex:/.*/,token:"comment"}],meta:{dontIndentStates:["comment"],electricInput:/^\s*\}$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}}),a.defineMIME("text/x-rustsrc","rust")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("rust",{start:[{regex:/b?"/,token:"string",next:"string"},{regex:/b?r"/,token:"string",next:"string_raw"},{regex:/b?r#+"/,token:"string",next:"string_raw_hash"},{regex:/'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/,token:"string-2"},{regex:/b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/,token:"string-2"},{regex:/(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,token:"number"},{regex:/(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,token:"keyword"},{regex:/\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/,token:"atom"},{regex:/\b(?:true|false|Some|None|Ok|Err)\b/,token:"builtin"},{regex:/\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/#!?\[.*\]/,token:"meta"},{regex:/\/\/.*/,token:"comment"},{regex:/\/\*/,token:"comment",next:"comment"},{regex:/[-+\/*=<>!]+/,token:"operator"},{regex:/[a-zA-Z_]\w*!/,token:"variable-3"},{regex:/[a-zA-Z_]\w*/,token:"variable"},{regex:/[\{\[\(]/,indent:!0},{regex:/[\}\]\)]/,dedent:!0}],string:[{regex:/"/,token:"string",next:"start"},{regex:/(?:[^\\"]|\\(?:.|$))*/,token:"string"}],string_raw:[{regex:/"/,token:"string",next:"start"},{regex:/[^"]*/,token:"string"}],string_raw_hash:[{regex:/"#+/,token:"string",next:"start"},{regex:/(?:[^"]|"(?!#))*/,token:"string"}],comment:[{regex:/.*?\*\//,token:"comment",next:"start"},{regex:/.*/,token:"comment"}],meta:{dontIndentStates:["comment"],electricInput:/^\s*\}$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}}),a.defineMIME("text/x-rustsrc","rust"),a.defineMIME("text/rust","rust")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/sass/sass.js b/media/editors/codemirror/mode/sass/sass.js
index ba0e05626c90f..7d8135bfe5195 100644
--- a/media/editors/codemirror/mode/sass/sass.js
+++ b/media/editors/codemirror/mode/sass/sass.js
@@ -447,7 +447,7 @@ CodeMirror.defineMode("sass", function(config) {
       return state.scopes[0].offset;
     }
   };
-});
+}, "css");
 
 CodeMirror.defineMIME("text/x-sass", "sass");
 
diff --git a/media/editors/codemirror/mode/sass/sass.min.js b/media/editors/codemirror/mode/sass/sass.min.js
index 086be3078d6aa..06072b7e2bd2b 100644
--- a/media/editors/codemirror/mode/sass/sass.min.js
+++ b/media/editors/codemirror/mode/sass/sass.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../css/css"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sass",(function(b){function c(a){return new RegExp("^"+a.join("|"))}function d(a){return!a.peek()||a.match(/\s+$/,!1)}function e(a,b){var c=a.peek();return")"===c?(a.next(),b.tokenizer=k,"operator"):"("===c?(a.next(),a.eatSpace(),"operator"):"'"===c||'"'===c?(b.tokenizer=g(a.next()),"string"):(b.tokenizer=g(")",!1),"string")}function f(a,b){return function(c,d){return c.sol()&&c.indentation()<=a?(d.tokenizer=k,k(c,d)):(b&&c.skipTo("*/")?(c.next(),c.next(),d.tokenizer=k):c.skipToEnd(),"comment")}}function g(a,b){function c(e,f){var g=e.next(),i=e.peek(),j=e.string.charAt(e.pos-2),l="\\"!==g&&i===a||g===a&&"\\"!==j;return l?(g!==a&&b&&e.next(),d(e)&&(f.cursorHalf=0),f.tokenizer=k,"string"):"#"===g&&"{"===i?(f.tokenizer=h(c),e.next(),"operator"):"string"}return null==b&&(b=!0),c}function h(a){return function(b,c){return"}"===b.peek()?(b.next(),c.tokenizer=a,"operator"):k(b,c)}}function i(a){if(0==a.indentCount){a.indentCount++;var c=a.scopes[0].offset,d=c+b.indentUnit;a.scopes.unshift({offset:d})}}function j(a){1!=a.scopes.length&&a.scopes.shift()}function k(a,b){var c=a.peek();if(a.match("/*"))return b.tokenizer=f(a.indentation(),!0),b.tokenizer(a,b);if(a.match("//"))return b.tokenizer=f(a.indentation(),!1),b.tokenizer(a,b);if(a.match("#{"))return b.tokenizer=h(k),"operator";if('"'===c||"'"===c)return a.next(),b.tokenizer=g(c),"string";if(b.cursorHalf){if("#"===c&&(a.next(),a.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)))return d(a)&&(b.cursorHalf=0),"number";if(a.match(/^-?[0-9\.]+/))return d(a)&&(b.cursorHalf=0),"number";if(a.match(/^(px|em|in)\b/))return d(a)&&(b.cursorHalf=0),"unit";if(a.match(t))return d(a)&&(b.cursorHalf=0),"keyword";if(a.match(/^url/)&&"("===a.peek())return b.tokenizer=e,d(a)&&(b.cursorHalf=0),"atom";if("$"===c)return a.next(),a.eatWhile(/[\w-]/),d(a)&&(b.cursorHalf=0),"variable-2";if("!"===c)return a.next(),b.cursorHalf=0,a.match(/^[\w]+/)?"keyword":"operator";if(a.match(v))return d(a)&&(b.cursorHalf=0),"operator";if(a.eatWhile(/[\w-]/))return d(a)&&(b.cursorHalf=0),m=a.current().toLowerCase(),q.hasOwnProperty(m)?"atom":p.hasOwnProperty(m)?"keyword":o.hasOwnProperty(m)?(b.prevProp=a.current().toLowerCase(),"property"):"tag";if(d(a))return b.cursorHalf=0,null}else{if("-"===c&&a.match(/^-\w+-/))return"meta";if("."===c){if(a.next(),a.match(/^[\w-]+/))return i(b),"qualifier";if("#"===a.peek())return i(b),"tag"}if("#"===c){if(a.next(),a.match(/^[\w-]+/))return i(b),"builtin";if("#"===a.peek())return i(b),"tag"}if("$"===c)return a.next(),a.eatWhile(/[\w-]/),"variable-2";if(a.match(/^-?[0-9\.]+/))return"number";if(a.match(/^(px|em|in)\b/))return"unit";if(a.match(t))return"keyword";if(a.match(/^url/)&&"("===a.peek())return b.tokenizer=e,"atom";if("="===c&&a.match(/^=[\w-]+/))return i(b),"meta";if("+"===c&&a.match(/^\+[\w-]+/))return"variable-3";if("@"===c&&a.match(/@extend/)&&(a.match(/\s*[\w]/)||j(b)),a.match(/^@(else if|if|media|else|for|each|while|mixin|function)/))return i(b),"def";if("@"===c)return a.next(),a.eatWhile(/[\w-]/),"def";if(a.eatWhile(/[\w-]/)){if(a.match(/ *: *[\w-\+\$#!\("']/,!1)){m=a.current().toLowerCase();var l=b.prevProp+"-"+m;return o.hasOwnProperty(l)?"property":o.hasOwnProperty(m)?(b.prevProp=m,"property"):r.hasOwnProperty(m)?"property":"tag"}return a.match(/ *:/,!1)?(i(b),b.cursorHalf=1,b.prevProp=a.current().toLowerCase(),"property"):a.match(/ *,/,!1)?"tag":(i(b),"tag")}if(":"===c)return a.match(w)?"variable-3":(a.next(),b.cursorHalf=1,"operator")}return a.match(v)?"operator":(a.next(),null)}function l(a,c){a.sol()&&(c.indentCount=0);var d=c.tokenizer(a,c),e=a.current();if("@return"!==e&&"}"!==e||j(c),null!==d){for(var f=a.pos-e.length,g=f+b.indentUnit*c.indentCount,h=[],i=0;i<c.scopes.length;i++){var k=c.scopes[i];k.offset<=g&&h.push(k)}c.scopes=h}return d}var m,n=a.mimeModes["text/css"],o=n.propertyKeywords||{},p=n.colorKeywords||{},q=n.valueKeywords||{},r=n.fontProperties||{},s=["true","false","null","auto"],t=new RegExp("^"+s.join("|")),u=["\\(","\\)","=",">","<","==",">=","<=","\\+","-","\\!=","/","\\*","%","and","or","not",";","\\{","\\}",":"],v=c(u),w=/^::?[a-zA-Z_][\w\-]*/;return{startState:function(){return{tokenizer:k,scopes:[{offset:0,type:"sass"}],indentCount:0,cursorHalf:0,definedVars:[],definedMixins:[]}},token:function(a,b){var c=l(a,b);return b.lastToken={style:c,content:a.current()},c},indent:function(a){return a.scopes[0].offset}}})),a.defineMIME("text/x-sass","sass")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../css/css"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sass",(function(b){function c(a){return new RegExp("^"+a.join("|"))}function d(a){return!a.peek()||a.match(/\s+$/,!1)}function e(a,b){var c=a.peek();return")"===c?(a.next(),b.tokenizer=k,"operator"):"("===c?(a.next(),a.eatSpace(),"operator"):"'"===c||'"'===c?(b.tokenizer=g(a.next()),"string"):(b.tokenizer=g(")",!1),"string")}function f(a,b){return function(c,d){return c.sol()&&c.indentation()<=a?(d.tokenizer=k,k(c,d)):(b&&c.skipTo("*/")?(c.next(),c.next(),d.tokenizer=k):c.skipToEnd(),"comment")}}function g(a,b){function c(e,f){var g=e.next(),i=e.peek(),j=e.string.charAt(e.pos-2),l="\\"!==g&&i===a||g===a&&"\\"!==j;return l?(g!==a&&b&&e.next(),d(e)&&(f.cursorHalf=0),f.tokenizer=k,"string"):"#"===g&&"{"===i?(f.tokenizer=h(c),e.next(),"operator"):"string"}return null==b&&(b=!0),c}function h(a){return function(b,c){return"}"===b.peek()?(b.next(),c.tokenizer=a,"operator"):k(b,c)}}function i(a){if(0==a.indentCount){a.indentCount++;var c=a.scopes[0].offset,d=c+b.indentUnit;a.scopes.unshift({offset:d})}}function j(a){1!=a.scopes.length&&a.scopes.shift()}function k(a,b){var c=a.peek();if(a.match("/*"))return b.tokenizer=f(a.indentation(),!0),b.tokenizer(a,b);if(a.match("//"))return b.tokenizer=f(a.indentation(),!1),b.tokenizer(a,b);if(a.match("#{"))return b.tokenizer=h(k),"operator";if('"'===c||"'"===c)return a.next(),b.tokenizer=g(c),"string";if(b.cursorHalf){if("#"===c&&(a.next(),a.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)))return d(a)&&(b.cursorHalf=0),"number";if(a.match(/^-?[0-9\.]+/))return d(a)&&(b.cursorHalf=0),"number";if(a.match(/^(px|em|in)\b/))return d(a)&&(b.cursorHalf=0),"unit";if(a.match(t))return d(a)&&(b.cursorHalf=0),"keyword";if(a.match(/^url/)&&"("===a.peek())return b.tokenizer=e,d(a)&&(b.cursorHalf=0),"atom";if("$"===c)return a.next(),a.eatWhile(/[\w-]/),d(a)&&(b.cursorHalf=0),"variable-2";if("!"===c)return a.next(),b.cursorHalf=0,a.match(/^[\w]+/)?"keyword":"operator";if(a.match(v))return d(a)&&(b.cursorHalf=0),"operator";if(a.eatWhile(/[\w-]/))return d(a)&&(b.cursorHalf=0),m=a.current().toLowerCase(),q.hasOwnProperty(m)?"atom":p.hasOwnProperty(m)?"keyword":o.hasOwnProperty(m)?(b.prevProp=a.current().toLowerCase(),"property"):"tag";if(d(a))return b.cursorHalf=0,null}else{if("-"===c&&a.match(/^-\w+-/))return"meta";if("."===c){if(a.next(),a.match(/^[\w-]+/))return i(b),"qualifier";if("#"===a.peek())return i(b),"tag"}if("#"===c){if(a.next(),a.match(/^[\w-]+/))return i(b),"builtin";if("#"===a.peek())return i(b),"tag"}if("$"===c)return a.next(),a.eatWhile(/[\w-]/),"variable-2";if(a.match(/^-?[0-9\.]+/))return"number";if(a.match(/^(px|em|in)\b/))return"unit";if(a.match(t))return"keyword";if(a.match(/^url/)&&"("===a.peek())return b.tokenizer=e,"atom";if("="===c&&a.match(/^=[\w-]+/))return i(b),"meta";if("+"===c&&a.match(/^\+[\w-]+/))return"variable-3";if("@"===c&&a.match(/@extend/)&&(a.match(/\s*[\w]/)||j(b)),a.match(/^@(else if|if|media|else|for|each|while|mixin|function)/))return i(b),"def";if("@"===c)return a.next(),a.eatWhile(/[\w-]/),"def";if(a.eatWhile(/[\w-]/)){if(a.match(/ *: *[\w-\+\$#!\("']/,!1)){m=a.current().toLowerCase();var l=b.prevProp+"-"+m;return o.hasOwnProperty(l)?"property":o.hasOwnProperty(m)?(b.prevProp=m,"property"):r.hasOwnProperty(m)?"property":"tag"}return a.match(/ *:/,!1)?(i(b),b.cursorHalf=1,b.prevProp=a.current().toLowerCase(),"property"):a.match(/ *,/,!1)?"tag":(i(b),"tag")}if(":"===c)return a.match(w)?"variable-3":(a.next(),b.cursorHalf=1,"operator")}return a.match(v)?"operator":(a.next(),null)}function l(a,c){a.sol()&&(c.indentCount=0);var d=c.tokenizer(a,c),e=a.current();if("@return"!==e&&"}"!==e||j(c),null!==d){for(var f=a.pos-e.length,g=f+b.indentUnit*c.indentCount,h=[],i=0;i<c.scopes.length;i++){var k=c.scopes[i];k.offset<=g&&h.push(k)}c.scopes=h}return d}var m,n=a.mimeModes["text/css"],o=n.propertyKeywords||{},p=n.colorKeywords||{},q=n.valueKeywords||{},r=n.fontProperties||{},s=["true","false","null","auto"],t=new RegExp("^"+s.join("|")),u=["\\(","\\)","=",">","<","==",">=","<=","\\+","-","\\!=","/","\\*","%","and","or","not",";","\\{","\\}",":"],v=c(u),w=/^::?[a-zA-Z_][\w\-]*/;return{startState:function(){return{tokenizer:k,scopes:[{offset:0,type:"sass"}],indentCount:0,cursorHalf:0,definedVars:[],definedMixins:[]}},token:function(a,b){var c=l(a,b);return b.lastToken={style:c,content:a.current()},c},indent:function(a){return a.scopes[0].offset}}}),"css"),a.defineMIME("text/x-sass","sass")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/scheme/scheme.js b/media/editors/codemirror/mode/scheme/scheme.js
index 22346459115d0..1d8f7d17f0b89 100644
--- a/media/editors/codemirror/mode/scheme/scheme.js
+++ b/media/editors/codemirror/mode/scheme/scheme.js
@@ -224,7 +224,7 @@ CodeMirror.defineMode("scheme", function () {
                             }
                         }
                     } else {
-                        stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/);
+                        stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/);
 
                         if (keywords && keywords.propertyIsEnumerable(stream.current())) {
                             returnType = BUILTIN;
diff --git a/media/editors/codemirror/mode/scheme/scheme.min.js b/media/editors/codemirror/mode/scheme/scheme.min.js
index 4eb010084f881..82fdeff5ed189 100644
--- a/media/editors/codemirror/mode/scheme/scheme.min.js
+++ b/media/editors/codemirror/mode/scheme/scheme.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("scheme",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){this.indent=a,this.type=b,this.prev=c}function c(a,c,d){a.indentStack=new b(c,d,a.indentStack)}function d(a){a.indentStack=a.indentStack.prev}function e(a){return a.match(r)}function f(a){return a.match(s)}function g(a,b){return b===!0&&a.backUp(1),a.match(u)}function h(a){return a.match(t)}var i="builtin",j="comment",k="string",l="atom",m="number",n="bracket",o=2,p=a("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"),q=a("define let letrec let* lambda"),r=new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i),s=new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i),t=new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i),u=new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);return{startState:function(){return{indentStack:null,indentation:0,mode:!1,sExprComment:!1}},token:function(a,b){if(null==b.indentStack&&a.sol()&&(b.indentation=a.indentation()),a.eatSpace())return null;var r=null;switch(b.mode){case"string":for(var s,t=!1;null!=(s=a.next());){if('"'==s&&!t){b.mode=!1;break}t=!t&&"\\"==s}r=k;break;case"comment":for(var s,u=!1;null!=(s=a.next());){if("#"==s&&u){b.mode=!1;break}u="|"==s}r=j;break;case"s-expr-comment":if(b.mode=!1,"("!=a.peek()&&"["!=a.peek()){a.eatWhile(/[^\/s]/),r=j;break}b.sExprComment=0;default:var v=a.next();if('"'==v)b.mode="string",r=k;else if("'"==v)r=l;else if("#"==v)if(a.eat("|"))b.mode="comment",r=j;else if(a.eat(/[tf]/i))r=l;else if(a.eat(";"))b.mode="s-expr-comment",r=j;else{var w=null,x=!1,y=!0;a.eat(/[ei]/i)?x=!0:a.backUp(1),a.match(/^#b/i)?w=e:a.match(/^#o/i)?w=f:a.match(/^#x/i)?w=h:a.match(/^#d/i)?w=g:a.match(/^[-+0-9.]/,!1)?(y=!1,w=g):x||a.eat("#"),null!=w&&(y&&!x&&a.match(/^#[ei]/i),w(a)&&(r=m))}else if(/^[-+0-9.]/.test(v)&&g(a,!0))r=m;else if(";"==v)a.skipToEnd(),r=j;else if("("==v||"["==v){for(var z,A="",B=a.column();null!=(z=a.eat(/[^\s\(\[\;\)\]]/));)A+=z;A.length>0&&q.propertyIsEnumerable(A)?c(b,B+o,v):(a.eatSpace(),a.eol()||";"==a.peek()?c(b,B+1,v):c(b,B+a.current().length,v)),a.backUp(a.current().length-1),"number"==typeof b.sExprComment&&b.sExprComment++,r=n}else")"==v||"]"==v?(r=n,null!=b.indentStack&&b.indentStack.type==(")"==v?"(":"[")&&(d(b),"number"==typeof b.sExprComment&&0==--b.sExprComment&&(r=j,b.sExprComment=!1))):(a.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/),r=p&&p.propertyIsEnumerable(a.current())?i:"variable")}return"number"==typeof b.sExprComment?j:r},indent:function(a){return null==a.indentStack?a.indentation:a.indentStack.indent},closeBrackets:{pairs:'()[]{}""'},lineComment:";;"}})),a.defineMIME("text/x-scheme","scheme")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("scheme",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){this.indent=a,this.type=b,this.prev=c}function c(a,c,d){a.indentStack=new b(c,d,a.indentStack)}function d(a){a.indentStack=a.indentStack.prev}function e(a){return a.match(r)}function f(a){return a.match(s)}function g(a,b){return b===!0&&a.backUp(1),a.match(u)}function h(a){return a.match(t)}var i="builtin",j="comment",k="string",l="atom",m="number",n="bracket",o=2,p=a("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"),q=a("define let letrec let* lambda"),r=new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i),s=new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i),t=new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i),u=new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);return{startState:function(){return{indentStack:null,indentation:0,mode:!1,sExprComment:!1}},token:function(a,b){if(null==b.indentStack&&a.sol()&&(b.indentation=a.indentation()),a.eatSpace())return null;var r=null;switch(b.mode){case"string":for(var s,t=!1;null!=(s=a.next());){if('"'==s&&!t){b.mode=!1;break}t=!t&&"\\"==s}r=k;break;case"comment":for(var s,u=!1;null!=(s=a.next());){if("#"==s&&u){b.mode=!1;break}u="|"==s}r=j;break;case"s-expr-comment":if(b.mode=!1,"("!=a.peek()&&"["!=a.peek()){a.eatWhile(/[^\/s]/),r=j;break}b.sExprComment=0;default:var v=a.next();if('"'==v)b.mode="string",r=k;else if("'"==v)r=l;else if("#"==v)if(a.eat("|"))b.mode="comment",r=j;else if(a.eat(/[tf]/i))r=l;else if(a.eat(";"))b.mode="s-expr-comment",r=j;else{var w=null,x=!1,y=!0;a.eat(/[ei]/i)?x=!0:a.backUp(1),a.match(/^#b/i)?w=e:a.match(/^#o/i)?w=f:a.match(/^#x/i)?w=h:a.match(/^#d/i)?w=g:a.match(/^[-+0-9.]/,!1)?(y=!1,w=g):x||a.eat("#"),null!=w&&(y&&!x&&a.match(/^#[ei]/i),w(a)&&(r=m))}else if(/^[-+0-9.]/.test(v)&&g(a,!0))r=m;else if(";"==v)a.skipToEnd(),r=j;else if("("==v||"["==v){for(var z,A="",B=a.column();null!=(z=a.eat(/[^\s\(\[\;\)\]]/));)A+=z;A.length>0&&q.propertyIsEnumerable(A)?c(b,B+o,v):(a.eatSpace(),a.eol()||";"==a.peek()?c(b,B+1,v):c(b,B+a.current().length,v)),a.backUp(a.current().length-1),"number"==typeof b.sExprComment&&b.sExprComment++,r=n}else")"==v||"]"==v?(r=n,null!=b.indentStack&&b.indentStack.type==(")"==v?"(":"[")&&(d(b),"number"==typeof b.sExprComment&&0==--b.sExprComment&&(r=j,b.sExprComment=!1))):(a.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/),r=p&&p.propertyIsEnumerable(a.current())?i:"variable")}return"number"==typeof b.sExprComment?j:r},indent:function(a){return null==a.indentStack?a.indentation:a.indentStack.indent},closeBrackets:{pairs:'()[]{}""'},lineComment:";;"}})),a.defineMIME("text/x-scheme","scheme")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/shell/shell.js b/media/editors/codemirror/mode/shell/shell.js
index 09d9487240b0a..6af814c43e536 100644
--- a/media/editors/codemirror/mode/shell/shell.js
+++ b/media/editors/codemirror/mode/shell/shell.js
@@ -30,9 +30,9 @@ CodeMirror.defineMode('shell', function() {
 
   // Commands
   define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
-    'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
+    'curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make ' +
     'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
-    'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
+    'shopt shred source sort sleep ssh start stop su sudo svn tee telnet top ' +
     'touch vi vim wall wc wget who write yes zsh');
 
   function tokenBase(stream, state) {
diff --git a/media/editors/codemirror/mode/shell/shell.min.js b/media/editors/codemirror/mode/shell/shell.min.js
index acb6ebecae67c..53114567900b5 100644
--- a/media/editors/codemirror/mode/shell/shell.min.js
+++ b/media/editors/codemirror/mode/shell/shell.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("shell",(function(){function a(a,b){for(var c=b.split(" "),d=0;d<c.length;d++)e[c[d]]=a}function b(a,b){if(a.eatSpace())return null;var g=a.sol(),h=a.next();if("\\"===h)return a.next(),null;if("'"===h||'"'===h||"`"===h)return b.tokens.unshift(c(h,"`"===h?"quote":"string")),d(a,b);if("#"===h)return g&&a.eat("!")?(a.skipToEnd(),"meta"):(a.skipToEnd(),"comment");if("$"===h)return b.tokens.unshift(f),d(a,b);if("+"===h||"="===h)return"operator";if("-"===h)return a.eat("-"),a.eatWhile(/\w/),"attribute";if(/\d/.test(h)&&(a.eatWhile(/\d/),a.eol()||!/\w/.test(a.peek())))return"number";a.eatWhile(/[\w-]/);var i=a.current();return"="===a.peek()&&/\w+/.test(i)?"def":e.hasOwnProperty(i)?e[i]:null}function c(a,b){var e="("==a?")":"{"==a?"}":a;return function(g,h){for(var i,j=!1,k=!1;null!=(i=g.next());){if(i===e&&!k){j=!0;break}if("$"===i&&!k&&"'"!==a){k=!0,g.backUp(1),h.tokens.unshift(f);break}if(!k&&i===a&&a!==e)return h.tokens.unshift(c(a,b)),d(g,h);k=!k&&"\\"===i}return!j&&k||h.tokens.shift(),b}}function d(a,c){return(c.tokens[0]||b)(a,c)}var e={};a("atom","true false"),a("keyword","if then do else elif while until for in esac fi fin fil done exit set unset export function"),a("builtin","ab awk bash beep cat cc cd chown chmod chroot clear cp curl cut diff echo find gawk gcc get git grep kill killall ln ls make mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh shopt shred source sort sleep ssh start stop su sudo tee telnet top touch vi vim wall wc wget who write yes zsh");var f=function(a,b){b.tokens.length>1&&a.eat("$");var e=a.next();return/['"({]/.test(e)?(b.tokens[0]=c(e,"("==e?"quote":"{"==e?"def":"string"),d(a,b)):(/\d/.test(e)||a.eatWhile(/\w/),b.tokens.shift(),"def")};return{startState:function(){return{tokens:[]}},token:function(a,b){return d(a,b)},closeBrackets:"()[]{}''\"\"``",lineComment:"#",fold:"brace"}})),a.defineMIME("text/x-sh","shell")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("shell",(function(){function a(a,b){for(var c=b.split(" "),d=0;d<c.length;d++)e[c[d]]=a}function b(a,b){if(a.eatSpace())return null;var g=a.sol(),h=a.next();if("\\"===h)return a.next(),null;if("'"===h||'"'===h||"`"===h)return b.tokens.unshift(c(h,"`"===h?"quote":"string")),d(a,b);if("#"===h)return g&&a.eat("!")?(a.skipToEnd(),"meta"):(a.skipToEnd(),"comment");if("$"===h)return b.tokens.unshift(f),d(a,b);if("+"===h||"="===h)return"operator";if("-"===h)return a.eat("-"),a.eatWhile(/\w/),"attribute";if(/\d/.test(h)&&(a.eatWhile(/\d/),a.eol()||!/\w/.test(a.peek())))return"number";a.eatWhile(/[\w-]/);var i=a.current();return"="===a.peek()&&/\w+/.test(i)?"def":e.hasOwnProperty(i)?e[i]:null}function c(a,b){var e="("==a?")":"{"==a?"}":a;return function(g,h){for(var i,j=!1,k=!1;null!=(i=g.next());){if(i===e&&!k){j=!0;break}if("$"===i&&!k&&"'"!==a){k=!0,g.backUp(1),h.tokens.unshift(f);break}if(!k&&i===a&&a!==e)return h.tokens.unshift(c(a,b)),d(g,h);k=!k&&"\\"===i}return!j&&k||h.tokens.shift(),b}}function d(a,c){return(c.tokens[0]||b)(a,c)}var e={};a("atom","true false"),a("keyword","if then do else elif while until for in esac fi fin fil done exit set unset export function"),a("builtin","ab awk bash beep cat cc cd chown chmod chroot clear cp curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh shopt shred source sort sleep ssh start stop su sudo svn tee telnet top touch vi vim wall wc wget who write yes zsh");var f=function(a,b){b.tokens.length>1&&a.eat("$");var e=a.next();return/['"({]/.test(e)?(b.tokens[0]=c(e,"("==e?"quote":"{"==e?"def":"string"),d(a,b)):(/\d/.test(e)||a.eatWhile(/\w/),b.tokens.shift(),"def")};return{startState:function(){return{tokens:[]}},token:function(a,b){return d(a,b)},closeBrackets:"()[]{}''\"\"``",lineComment:"#",fold:"brace"}})),a.defineMIME("text/x-sh","shell")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/sieve/sieve.js b/media/editors/codemirror/mode/sieve/sieve.js
index f67db2f5531b0..0920d0bab323b 100644
--- a/media/editors/codemirror/mode/sieve/sieve.js
+++ b/media/editors/codemirror/mode/sieve/sieve.js
@@ -170,7 +170,7 @@ CodeMirror.defineMode("sieve", function(config) {
       if (stream.eatSpace())
         return null;
 
-      return (state.tokenize || tokenBase)(stream, state);;
+      return (state.tokenize || tokenBase)(stream, state);
     },
 
     indent: function(state, _textAfter) {
diff --git a/media/editors/codemirror/mode/solr/solr.js b/media/editors/codemirror/mode/solr/solr.js
index f7f7087891694..dc8b82501e8bd 100644
--- a/media/editors/codemirror/mode/solr/solr.js
+++ b/media/editors/codemirror/mode/solr/solr.js
@@ -14,12 +14,12 @@
 CodeMirror.defineMode("solr", function() {
   "use strict";
 
-  var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\^\"\\]/;
+  var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\"\\]/;
   var isOperatorChar = /[\|\!\+\-\*\?\~\^\&]/;
   var isOperatorString = /^(OR|AND|NOT|TO)$/i;
 
   function isNumber(word) {
-    return parseFloat(word, 10).toString() === word;
+    return parseFloat(word).toString() === word;
   }
 
   function tokenString(quote) {
diff --git a/media/editors/codemirror/mode/solr/solr.min.js b/media/editors/codemirror/mode/solr/solr.min.js
index a30206e571c0f..7c503d03cf4df 100644
--- a/media/editors/codemirror/mode/solr/solr.min.js
+++ b/media/editors/codemirror/mode/solr/solr.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("solr",(function(){function a(a){return parseFloat(a,10).toString()===a}function b(a){return function(b,c){for(var d,f=!1;null!=(d=b.next())&&(d!=a||f);)f=!f&&"\\"==d;return f||(c.tokenize=e),"string"}}function c(a){return function(b,c){var d="operator";return"+"==a?d+=" positive":"-"==a?d+=" negative":"|"==a?b.eat(/\|/):"&"==a?b.eat(/\&/):"^"==a&&(d+=" boost"),c.tokenize=e,d}}function d(b){return function(c,d){for(var g=b;(b=c.peek())&&null!=b.match(f);)g+=c.next();return d.tokenize=e,h.test(g)?"operator":a(g)?"number":":"==c.peek()?"field":"string"}}function e(a,h){var i=a.next();return'"'==i?h.tokenize=b(i):g.test(i)?h.tokenize=c(i):f.test(i)&&(h.tokenize=d(i)),h.tokenize!=e?h.tokenize(a,h):null}var f=/[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\^\"\\]/,g=/[\|\!\+\-\*\?\~\^\&]/,h=/^(OR|AND|NOT|TO)$/i;return{startState:function(){return{tokenize:e}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)}}})),a.defineMIME("text/x-solr","solr")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("solr",(function(){function a(a){return parseFloat(a).toString()===a}function b(a){return function(b,c){for(var d,f=!1;null!=(d=b.next())&&(d!=a||f);)f=!f&&"\\"==d;return f||(c.tokenize=e),"string"}}function c(a){return function(b,c){var d="operator";return"+"==a?d+=" positive":"-"==a?d+=" negative":"|"==a?b.eat(/\|/):"&"==a?b.eat(/\&/):"^"==a&&(d+=" boost"),c.tokenize=e,d}}function d(b){return function(c,d){for(var g=b;(b=c.peek())&&null!=b.match(f);)g+=c.next();return d.tokenize=e,h.test(g)?"operator":a(g)?"number":":"==c.peek()?"field":"string"}}function e(a,h){var i=a.next();return'"'==i?h.tokenize=b(i):g.test(i)?h.tokenize=c(i):f.test(i)&&(h.tokenize=d(i)),h.tokenize!=e?h.tokenize(a,h):null}var f=/[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\"\\]/,g=/[\|\!\+\-\*\?\~\^\&]/,h=/^(OR|AND|NOT|TO)$/i;return{startState:function(){return{tokenize:e}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)}}})),a.defineMIME("text/x-solr","solr")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/soy/soy.js b/media/editors/codemirror/mode/soy/soy.js
index c0198609e7373..ba16363638d37 100644
--- a/media/editors/codemirror/mode/soy/soy.js
+++ b/media/editors/codemirror/mode/soy/soy.js
@@ -90,6 +90,7 @@
           variables: null,
           scopes: null,
           indent: 0,
+          quoteKind: null,
           localStates: [{
             mode: modes.html,
             state: CodeMirror.startState(modes.html)
@@ -107,6 +108,7 @@
           variables: state.variables,
           scopes: state.scopes,
           indent: state.indent, // Indentation of the following line.
+          quoteKind: state.quoteKind,
           localStates: state.localStates.map(function(localState) {
             return {
               mode: localState.mode,
@@ -211,8 +213,9 @@
                 });
               }
               return "attribute";
-            } else if (stream.match(/^"/)) {
+            } else if (match = stream.match(/^["']/)) {
               state.soyState.push("string");
+              state.quoteKind = match;
               return "string";
             }
             if (match = stream.match(/^\$([\w]+)/)) {
@@ -233,10 +236,11 @@
             return tokenUntil(stream, state, /\{\/literal}/);
 
           case "string":
-            var match = stream.match(/^.*?("|\\[\s\S])/);
+            var match = stream.match(/^.*?(["']|\\[\s\S])/);
             if (!match) {
               stream.skipToEnd();
-            } else if (match[1] == "\"") {
+            } else if (match[1] == state.quoteKind) {
+              state.quoteKind = null;
               state.soyState.pop();
             }
             return "string";
@@ -251,7 +255,9 @@
           state.indent += config.indentUnit;
           state.soyState.push("literal");
           return "keyword";
-        } else if (match = stream.match(/^\{([\/@\\]?[\w?]*)/)) {
+
+        // A tag-keyword must be followed by whitespace or a closing tag.
+        } else if (match = stream.match(/^\{([\/@\\]?\w+\??)(?=[\s\}])/)) {
           if (match[1] != "/switch")
             state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];
@@ -283,6 +289,13 @@
             state.soyState.push("param-def");
           }
           return "keyword";
+
+        // Not a tag-keyword; it's an implicit print tag.
+        } else if (stream.eat('{')) {
+          state.tag = "print";
+          state.indent += 2 * config.indentUnit;
+          state.soyState.push("tag");
+          return "keyword";
         }
 
         return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
diff --git a/media/editors/codemirror/mode/soy/soy.min.js b/media/editors/codemirror/mode/soy/soy.min.js
index b70d76580cd70..da90f072e7f80 100644
--- a/media/editors/codemirror/mode/soy/soy.min.js
+++ b/media/editors/codemirror/mode/soy/soy.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed"],a):a(CodeMirror)})((function(a){"use strict";var b=["template","literal","msg","fallbackmsg","let","if","elseif","else","switch","case","default","foreach","ifempty","for","call","param","deltemplate","delcall","log"];a.defineMode("soy",(function(c){function d(a){return a[a.length-1]}function e(a,b,c){if(a.sol()){for(var e=0;e<b.indent&&a.eat(/\s/);e++);if(e)return null}var f=a.string,g=c.exec(f.substr(a.pos));g&&(a.string=f.substr(0,a.pos+g.index));var h=a.hideFirstChars(b.indent,(function(){var c=d(b.localStates);return c.mode.token(a,c.state)}));return a.string=f,h}function f(a,b){for(;a;){if(a.element===b)return!0;a=a.next}return!1}function g(a,b){return{element:b,next:a}}function h(a,b,c){return f(a,b)?"variable-2":c?"variable":"variable-2 error"}function i(a){a.scopes&&(a.variables=a.scopes.element,a.scopes=a.scopes.next)}var j=a.getMode(c,"text/plain"),k={html:a.getMode(c,{name:"text/html",multilineTagIndentFactor:2,multilineTagIndentPastTag:!1}),attributes:j,text:j,uri:j,css:a.getMode(c,"text/css"),js:a.getMode(c,{name:"text/javascript",statementIndent:2*c.indentUnit})};return{startState:function(){return{kind:[],kindTag:[],soyState:[],templates:null,variables:null,scopes:null,indent:0,localStates:[{mode:k.html,state:a.startState(k.html)}]}},copyState:function(b){return{tag:b.tag,kind:b.kind.concat([]),kindTag:b.kindTag.concat([]),soyState:b.soyState.concat([]),templates:b.templates,variables:b.variables,scopes:b.scopes,indent:b.indent,localStates:b.localStates.map((function(b){return{mode:b.mode,state:a.copyState(b.mode,b.state)}}))}},token:function(f,j){var l;switch(d(j.soyState)){case"comment":return f.match(/^.*?\*\//)?j.soyState.pop():f.skipToEnd(),"comment";case"templ-def":return(l=f.match(/^\.?([\w]+(?!\.[\w]+)*)/))?(j.templates=g(j.templates,l[1]),j.scopes=g(j.scopes,j.variables),j.soyState.pop(),"def"):(f.next(),null);case"templ-ref":return(l=f.match(/^\.?([\w]+)/))?(j.soyState.pop(),"."==l[0][0]?h(j.templates,l[1],!0):"variable"):(f.next(),null);case"param-def":return(l=f.match(/^\w+/))?(j.variables=g(j.variables,l[0]),j.soyState.pop(),j.soyState.push("param-type"),"def"):(f.next(),null);case"param-type":return"}"==f.peek()?(j.soyState.pop(),null):f.eatWhile(/^[\w]+/)?"variable-3":(f.next(),null);case"var-def":return(l=f.match(/^\$([\w]+)/))?(j.variables=g(j.variables,l[1]),j.soyState.pop(),"def"):(f.next(),null);case"tag":if(f.match(/^\/?}/))return"/template"==j.tag||"/deltemplate"==j.tag?(i(j),j.indent=0):("/for"!=j.tag&&"/foreach"!=j.tag||i(j),j.indent-=c.indentUnit*("/}"==f.current()||b.indexOf(j.tag)==-1?2:1)),j.soyState.pop(),"keyword";if(f.match(/^([\w?]+)(?==)/)){if("kind"==f.current()&&(l=f.match(/^="([^"]+)/,!1))){var m=l[1];j.kind.push(m),j.kindTag.push(j.tag);var n=k[m]||k.html,o=d(j.localStates);o.mode.indent&&(j.indent+=o.mode.indent(o.state,"")),j.localStates.push({mode:n,state:a.startState(n)})}return"attribute"}return f.match(/^"/)?(j.soyState.push("string"),"string"):(l=f.match(/^\$([\w]+)/))?h(j.variables,l[1]):(l=f.match(/^\w+/))?/^(?:as|and|or|not|in)$/.test(l[0])?"keyword":null:(f.next(),null);case"literal":return f.match(/^(?=\{\/literal})/)?(j.indent-=c.indentUnit,j.soyState.pop(),this.token(f,j)):e(f,j,/\{\/literal}/);case"string":var l=f.match(/^.*?("|\\[\s\S])/);return l?'"'==l[1]&&j.soyState.pop():f.skipToEnd(),"string"}if(f.match(/^\/\*/))return j.soyState.push("comment"),"comment";if(f.match(f.sol()?/^\s*\/\/.*/:/^\s+\/\/.*/))return"comment";if(f.match(/^\{literal}/))return j.indent+=c.indentUnit,j.soyState.push("literal"),"keyword";if(l=f.match(/^\{([\/@\\]?[\w?]*)/)){if("/switch"!=l[1]&&(j.indent+=(/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(l[1])&&"switch"!=j.tag?1:2)*c.indentUnit),j.tag=l[1],j.tag=="/"+d(j.kindTag)){j.kind.pop(),j.kindTag.pop(),j.localStates.pop();var o=d(j.localStates);o.mode.indent&&(j.indent-=o.mode.indent(o.state,""))}return j.soyState.push("tag"),"template"!=j.tag&&"deltemplate"!=j.tag||j.soyState.push("templ-def"),"call"!=j.tag&&"delcall"!=j.tag||j.soyState.push("templ-ref"),"let"==j.tag&&j.soyState.push("var-def"),"for"!=j.tag&&"foreach"!=j.tag||(j.scopes=g(j.scopes,j.variables),j.soyState.push("var-def")),j.tag.match(/^@(?:param\??|inject)/)&&j.soyState.push("param-def"),"keyword"}return e(f,j,/\{|\s+\/\/|\/\*/)},indent:function(b,e){var f=b.indent,g=d(b.soyState);if("comment"==g)return a.Pass;if("literal"==g)/^\{\/literal}/.test(e)&&(f-=c.indentUnit);else{if(/^\s*\{\/(template|deltemplate)\b/.test(e))return 0;/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(e)&&(f-=c.indentUnit),"switch"!=b.tag&&/^\{(case|default)\b/.test(e)&&(f-=c.indentUnit),/^\{\/switch\b/.test(e)&&(f-=c.indentUnit)}var h=d(b.localStates);return f&&h.mode.indent&&(f+=h.mode.indent(h.state,e)),f},innerMode:function(a){return a.soyState.length&&"literal"!=d(a.soyState)?null:d(a.localStates)},electricInput:/^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,lineComment:"//",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",useInnerComments:!1,fold:"indent"}}),"htmlmixed"),a.registerHelper("hintWords","soy",b.concat(["delpackage","namespace","alias","print","css","debugger"])),a.defineMIME("text/x-soy","soy")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed"],a):a(CodeMirror)})((function(a){"use strict";var b=["template","literal","msg","fallbackmsg","let","if","elseif","else","switch","case","default","foreach","ifempty","for","call","param","deltemplate","delcall","log"];a.defineMode("soy",(function(c){function d(a){return a[a.length-1]}function e(a,b,c){if(a.sol()){for(var e=0;e<b.indent&&a.eat(/\s/);e++);if(e)return null}var f=a.string,g=c.exec(f.substr(a.pos));g&&(a.string=f.substr(0,a.pos+g.index));var h=a.hideFirstChars(b.indent,(function(){var c=d(b.localStates);return c.mode.token(a,c.state)}));return a.string=f,h}function f(a,b){for(;a;){if(a.element===b)return!0;a=a.next}return!1}function g(a,b){return{element:b,next:a}}function h(a,b,c){return f(a,b)?"variable-2":c?"variable":"variable-2 error"}function i(a){a.scopes&&(a.variables=a.scopes.element,a.scopes=a.scopes.next)}var j=a.getMode(c,"text/plain"),k={html:a.getMode(c,{name:"text/html",multilineTagIndentFactor:2,multilineTagIndentPastTag:!1}),attributes:j,text:j,uri:j,css:a.getMode(c,"text/css"),js:a.getMode(c,{name:"text/javascript",statementIndent:2*c.indentUnit})};return{startState:function(){return{kind:[],kindTag:[],soyState:[],templates:null,variables:null,scopes:null,indent:0,quoteKind:null,localStates:[{mode:k.html,state:a.startState(k.html)}]}},copyState:function(b){return{tag:b.tag,kind:b.kind.concat([]),kindTag:b.kindTag.concat([]),soyState:b.soyState.concat([]),templates:b.templates,variables:b.variables,scopes:b.scopes,indent:b.indent,quoteKind:b.quoteKind,localStates:b.localStates.map((function(b){return{mode:b.mode,state:a.copyState(b.mode,b.state)}}))}},token:function(f,j){var l;switch(d(j.soyState)){case"comment":return f.match(/^.*?\*\//)?j.soyState.pop():f.skipToEnd(),"comment";case"templ-def":return(l=f.match(/^\.?([\w]+(?!\.[\w]+)*)/))?(j.templates=g(j.templates,l[1]),j.scopes=g(j.scopes,j.variables),j.soyState.pop(),"def"):(f.next(),null);case"templ-ref":return(l=f.match(/^\.?([\w]+)/))?(j.soyState.pop(),"."==l[0][0]?h(j.templates,l[1],!0):"variable"):(f.next(),null);case"param-def":return(l=f.match(/^\w+/))?(j.variables=g(j.variables,l[0]),j.soyState.pop(),j.soyState.push("param-type"),"def"):(f.next(),null);case"param-type":return"}"==f.peek()?(j.soyState.pop(),null):f.eatWhile(/^[\w]+/)?"variable-3":(f.next(),null);case"var-def":return(l=f.match(/^\$([\w]+)/))?(j.variables=g(j.variables,l[1]),j.soyState.pop(),"def"):(f.next(),null);case"tag":if(f.match(/^\/?}/))return"/template"==j.tag||"/deltemplate"==j.tag?(i(j),j.indent=0):("/for"!=j.tag&&"/foreach"!=j.tag||i(j),j.indent-=c.indentUnit*("/}"==f.current()||b.indexOf(j.tag)==-1?2:1)),j.soyState.pop(),"keyword";if(f.match(/^([\w?]+)(?==)/)){if("kind"==f.current()&&(l=f.match(/^="([^"]+)/,!1))){var m=l[1];j.kind.push(m),j.kindTag.push(j.tag);var n=k[m]||k.html,o=d(j.localStates);o.mode.indent&&(j.indent+=o.mode.indent(o.state,"")),j.localStates.push({mode:n,state:a.startState(n)})}return"attribute"}return(l=f.match(/^["']/))?(j.soyState.push("string"),j.quoteKind=l,"string"):(l=f.match(/^\$([\w]+)/))?h(j.variables,l[1]):(l=f.match(/^\w+/))?/^(?:as|and|or|not|in)$/.test(l[0])?"keyword":null:(f.next(),null);case"literal":return f.match(/^(?=\{\/literal})/)?(j.indent-=c.indentUnit,j.soyState.pop(),this.token(f,j)):e(f,j,/\{\/literal}/);case"string":var l=f.match(/^.*?(["']|\\[\s\S])/);return l?l[1]==j.quoteKind&&(j.quoteKind=null,j.soyState.pop()):f.skipToEnd(),"string"}if(f.match(/^\/\*/))return j.soyState.push("comment"),"comment";if(f.match(f.sol()?/^\s*\/\/.*/:/^\s+\/\/.*/))return"comment";if(f.match(/^\{literal}/))return j.indent+=c.indentUnit,j.soyState.push("literal"),"keyword";if(l=f.match(/^\{([\/@\\]?\w+\??)(?=[\s\}])/)){if("/switch"!=l[1]&&(j.indent+=(/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(l[1])&&"switch"!=j.tag?1:2)*c.indentUnit),j.tag=l[1],j.tag=="/"+d(j.kindTag)){j.kind.pop(),j.kindTag.pop(),j.localStates.pop();var o=d(j.localStates);o.mode.indent&&(j.indent-=o.mode.indent(o.state,""))}return j.soyState.push("tag"),"template"!=j.tag&&"deltemplate"!=j.tag||j.soyState.push("templ-def"),"call"!=j.tag&&"delcall"!=j.tag||j.soyState.push("templ-ref"),"let"==j.tag&&j.soyState.push("var-def"),"for"!=j.tag&&"foreach"!=j.tag||(j.scopes=g(j.scopes,j.variables),j.soyState.push("var-def")),j.tag.match(/^@(?:param\??|inject)/)&&j.soyState.push("param-def"),"keyword"}return f.eat("{")?(j.tag="print",j.indent+=2*c.indentUnit,j.soyState.push("tag"),"keyword"):e(f,j,/\{|\s+\/\/|\/\*/)},indent:function(b,e){var f=b.indent,g=d(b.soyState);if("comment"==g)return a.Pass;if("literal"==g)/^\{\/literal}/.test(e)&&(f-=c.indentUnit);else{if(/^\s*\{\/(template|deltemplate)\b/.test(e))return 0;/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(e)&&(f-=c.indentUnit),"switch"!=b.tag&&/^\{(case|default)\b/.test(e)&&(f-=c.indentUnit),/^\{\/switch\b/.test(e)&&(f-=c.indentUnit)}var h=d(b.localStates);return f&&h.mode.indent&&(f+=h.mode.indent(h.state,e)),f},innerMode:function(a){return a.soyState.length&&"literal"!=d(a.soyState)?null:d(a.localStates)},electricInput:/^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,lineComment:"//",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",useInnerComments:!1,fold:"indent"}}),"htmlmixed"),a.registerHelper("hintWords","soy",b.concat(["delpackage","namespace","alias","print","css","debugger"])),a.defineMIME("text/x-soy","soy")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/sql/sql.js b/media/editors/codemirror/mode/sql/sql.js
index 5734afa9f231c..c98d9f686b58f 100644
--- a/media/editors/codemirror/mode/sql/sql.js
+++ b/media/editors/codemirror/mode/sql/sql.js
@@ -47,8 +47,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
       // numbers
       // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
-          stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
-      support.decimallessFloat && stream.eat('.');
+      stream.match(/^[0-9]*(\.[0-9]+)?([eE][-+]?[0-9]+)?/);
+      support.decimallessFloat && stream.match(/^\.(?!\.)/);
       return "number";
     } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
       // placeholders
@@ -80,18 +80,18 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch == "/" && stream.eat("*")) {
       // multi-line comments
       // ref: https://kb.askmonty.org/en/comment-syntax/
-      state.tokenize = tokenComment;
+      state.tokenize = tokenComment(1);
       return state.tokenize(stream, state);
     } else if (ch == ".") {
       // .1 for 0.1
-      if (support.zerolessFloat && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
+      if (support.zerolessFloat && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i))
         return "number";
-      }
+      if (stream.match(/^\.+/))
+        return null
       // .table_name (ODBC)
       // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable && stream.match(/^[a-zA-Z_]+/)) {
+      if (support.ODBCdotTable && stream.match(/^[\w\d_]+/))
         return "variable-2";
-      }
     } else if (operatorChars.test(ch)) {
       // operators
       stream.eatWhile(operatorChars);
@@ -130,20 +130,15 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return "string";
     };
   }
-  function tokenComment(stream, state) {
-    while (true) {
-      if (stream.skipTo("*")) {
-        stream.next();
-        if (stream.eat("/")) {
-          state.tokenize = tokenBase;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        break;
-      }
+  function tokenComment(depth) {
+    return function(stream, state) {
+      var m = stream.match(/^.*?(\/\*|\*\/)/)
+      if (!m) stream.skipToEnd()
+      else if (m[1] == "/*") state.tokenize = tokenComment(depth + 1)
+      else if (depth > 1) state.tokenize = tokenComment(depth - 1)
+      else state.tokenize = tokenBase
+      return "comment"
     }
-    return "comment";
   }
 
   function pushContext(stream, state, type) {
@@ -170,7 +165,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
         if (state.context && state.context.align == null)
           state.context.align = false;
       }
-      if (stream.eatSpace()) return null;
+      if (state.tokenize == tokenBase && stream.eatSpace()) return null;
 
       var style = state.tokenize(stream, state);
       if (style == "comment") return style;
@@ -198,7 +193,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
-    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : null
+    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : "--"
   };
 });
 
@@ -404,10 +399,10 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-pgsql", {
     name: "sql",
     client: set("source"),
-    // http://www.postgresql.org/docs/9.5/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat"),
-    // http://www.postgresql.org/docs/9.5/static/datatype.html
-    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
+    // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    // https://www.postgresql.org/docs/10/static/datatype.html
+    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
     dateSQL: set("date time timestamp"),
diff --git a/media/editors/codemirror/mode/sql/sql.min.js b/media/editors/codemirror/mode/sql/sql.min.js
index a68986914ae1b..5e5ed7b139985 100644
--- a/media/editors/codemirror/mode/sql/sql.min.js
+++ b/media/editors/codemirror/mode/sql/sql.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sql",(function(b,c){function d(a,b){var c=a.next();if(o[c]){var d=o[c](a,b);if(d!==!1)return d}if(n.hexNumber&&("0"==c&&a.match(/^[xX][0-9a-fA-F]+/)||("x"==c||"X"==c)&&a.match(/^'[0-9a-fA-F]+'/)))return"number";if(n.binaryNumber&&(("b"==c||"B"==c)&&a.match(/^'[01]+'/)||"0"==c&&a.match(/^b[01]+/)))return"number";if(c.charCodeAt(0)>47&&c.charCodeAt(0)<58)return a.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/),n.decimallessFloat&&a.eat("."),"number";if("?"==c&&(a.eatSpace()||a.eol()||a.eat(";")))return"variable-3";if("'"==c||'"'==c&&n.doubleQuote)return b.tokenize=e(c),b.tokenize(a,b);if((n.nCharCast&&("n"==c||"N"==c)||n.charsetCast&&"_"==c&&a.match(/[a-z][a-z0-9]*/i))&&("'"==a.peek()||'"'==a.peek()))return"keyword";if(/^[\(\),\;\[\]]/.test(c))return null;if(n.commentSlashSlash&&"/"==c&&a.eat("/"))return a.skipToEnd(),"comment";if(n.commentHash&&"#"==c||"-"==c&&a.eat("-")&&(!n.commentSpaceRequired||a.eat(" ")))return a.skipToEnd(),"comment";if("/"==c&&a.eat("*"))return b.tokenize=f,b.tokenize(a,b);if("."!=c){if(m.test(c))return a.eatWhile(m),null;if("{"==c&&(a.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/)||a.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/)))return"number";a.eatWhile(/^[_\w\d]/);var g=a.current().toLowerCase();return p.hasOwnProperty(g)&&(a.match(/^( )+'[^']*'/)||a.match(/^( )+"[^"]*"/))?"number":j.hasOwnProperty(g)?"atom":k.hasOwnProperty(g)?"builtin":l.hasOwnProperty(g)?"keyword":i.hasOwnProperty(g)?"string-2":null}return n.zerolessFloat&&a.match(/^(?:\d+(?:e[+-]?\d+)?)/i)?"number":n.ODBCdotTable&&a.match(/^[a-zA-Z_]+/)?"variable-2":void 0}function e(a){return function(b,c){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){c.tokenize=d;break}f=!f&&"\\"==e}return"string"}}function f(a,b){for(;;){if(!a.skipTo("*")){a.skipToEnd();break}if(a.next(),a.eat("/")){b.tokenize=d;break}}return"comment"}function g(a,b,c){b.context={prev:b.context,indent:a.indentation(),col:a.column(),type:c}}function h(a){a.indent=a.context.indent,a.context=a.context.prev}var i=c.client||{},j=c.atoms||{false:!0,true:!0,null:!0},k=c.builtin||{},l=c.keywords||{},m=c.operatorChars||/^[*+\-%<>!=&|~^]/,n=c.support||{},o=c.hooks||{},p=c.dateSQL||{date:!0,time:!0,timestamp:!0};return{startState:function(){return{tokenize:d,context:null}},token:function(a,b){if(a.sol()&&b.context&&null==b.context.align&&(b.context.align=!1),a.eatSpace())return null;var c=b.tokenize(a,b);if("comment"==c)return c;b.context&&null==b.context.align&&(b.context.align=!0);var d=a.current();return"("==d?g(a,b,")"):"["==d?g(a,b,"]"):b.context&&b.context.type==d&&h(b),c},indent:function(c,d){var e=c.context;if(!e)return a.Pass;var f=d.charAt(0)==e.type;return e.align?e.col+(f?0:1):e.indent+(f?0:b.indentUnit)},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:n.commentSlashSlash?"//":n.commentHash?"#":null}})),(function(){function b(a){for(var b;null!=(b=a.next());)if("`"==b&&!a.eat("`"))return"variable-2";return a.backUp(a.current().length-1),a.eatWhile(/\w/)?"variable-2":null}function c(a){for(var b;null!=(b=a.next());)if('"'==b&&!a.eat('"'))return"variable-2";return a.backUp(a.current().length-1),a.eatWhile(/\w/)?"variable-2":null}function d(a){return a.eat("@")&&(a.match(/^session\./),a.match(/^local\./),a.match(/^global\./)),a.eat("'")?(a.match(/^.*'/),"variable-2"):a.eat('"')?(a.match(/^.*"/),"variable-2"):a.eat("`")?(a.match(/^.*`/),"variable-2"):a.match(/^[0-9a-zA-Z$\.\_]+/)?"variable-2":null}function e(a){return a.eat("N")?"atom":a.match(/^[a-zA-Z.#!?]/)?"variable-2":null}function f(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}var g="alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit ";a.defineMIME("text/x-sql",{name:"sql",keywords:f(g+"begin"),builtin:f("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable doubleQuote binaryNumber hexNumber")}),a.defineMIME("text/x-mssql",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare exec"),builtin:f("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date datetimeoffset datetime2 smalldatetime datetime time"),hooks:{"@":d}}),a.defineMIME("text/x-mysql",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":d,"`":b,"\\":e}}),a.defineMIME("text/x-mariadb",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":d,"`":b,"\\":e}}),a.defineMIME("text/x-sqlite",{name:"sql",client:f("auth backup bail binary changes check clone databases dbinfo dump echo eqp exit explain fullschema headers help import imposter indexes iotrace limit lint load log mode nullvalue once open output print prompt quit read restore save scanstats schema separator session shell show stats system tables testcase timeout timer trace vfsinfo vfslist vfsname width"),keywords:f(g+"abort action add after all analyze attach autoincrement before begin cascade case cast check collate column commit conflict constraint cross current_date current_time current_timestamp database default deferrable deferred detach each else end escape except exclusive exists explain fail for foreign full glob if ignore immediate index indexed initially inner instead intersect isnull key left limit match natural no notnull null of offset outer plan pragma primary query raise recursive references regexp reindex release rename replace restrict right rollback row savepoint temp temporary then to transaction trigger unique using vacuum view virtual when with without"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text clob bigint int int2 int8 integer float double char varchar date datetime year unsigned signed numeric real"),atoms:f("null current_date current_time current_timestamp"),operatorChars:/^[*+\-%<>!=&|\/~]/,dateSQL:f("date time timestamp datetime"),support:f("decimallessFloat zerolessFloat"),identifierQuote:'"',hooks:{"@":d,":":d,"?":d,$:d,'"':c,"`":b}}),a.defineMIME("text/x-cassandra",{name:"sql",client:{},keywords:f("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),builtin:f("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),atoms:f("false true infinity NaN"),operatorChars:/^[<>=]/,dateSQL:{},support:f("commentSlashSlash decimallessFloat"),hooks:{}}),a.defineMIME("text/x-plsql",{name:"sql",client:f("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),keywords:f("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),builtin:f("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),operatorChars:/^[*+\-%<>!=~]/,dateSQL:f("date time timestamp"),support:f("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")}),a.defineMIME("text/x-hive",{name:"sql",keywords:f("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),builtin:f("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date timestamp"),support:f("ODBCdotTable doubleQuote binaryNumber hexNumber")}),a.defineMIME("text/x-pgsql",{name:"sql",client:f("source"),keywords:f(g+"a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat"),builtin:f("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^\/#@?~]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")}),a.defineMIME("text/x-gql",{name:"sql",keywords:f("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"),atoms:f("false true"),builtin:f("blob datetime first key __key__ string integer double boolean null"),operatorChars:/^[*+\-%<>!=]/})})()}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sql",(function(b,c){function d(a,b){var c=a.next();if(o[c]){var d=o[c](a,b);if(d!==!1)return d}if(n.hexNumber&&("0"==c&&a.match(/^[xX][0-9a-fA-F]+/)||("x"==c||"X"==c)&&a.match(/^'[0-9a-fA-F]+'/)))return"number";if(n.binaryNumber&&(("b"==c||"B"==c)&&a.match(/^'[01]+'/)||"0"==c&&a.match(/^b[01]+/)))return"number";if(c.charCodeAt(0)>47&&c.charCodeAt(0)<58)return a.match(/^[0-9]*(\.[0-9]+)?([eE][-+]?[0-9]+)?/),n.decimallessFloat&&a.match(/^\.(?!\.)/),"number";if("?"==c&&(a.eatSpace()||a.eol()||a.eat(";")))return"variable-3";if("'"==c||'"'==c&&n.doubleQuote)return b.tokenize=e(c),b.tokenize(a,b);if((n.nCharCast&&("n"==c||"N"==c)||n.charsetCast&&"_"==c&&a.match(/[a-z][a-z0-9]*/i))&&("'"==a.peek()||'"'==a.peek()))return"keyword";if(/^[\(\),\;\[\]]/.test(c))return null;if(n.commentSlashSlash&&"/"==c&&a.eat("/"))return a.skipToEnd(),"comment";if(n.commentHash&&"#"==c||"-"==c&&a.eat("-")&&(!n.commentSpaceRequired||a.eat(" ")))return a.skipToEnd(),"comment";if("/"==c&&a.eat("*"))return b.tokenize=f(1),b.tokenize(a,b);if("."!=c){if(m.test(c))return a.eatWhile(m),null;if("{"==c&&(a.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/)||a.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/)))return"number";a.eatWhile(/^[_\w\d]/);var g=a.current().toLowerCase();return p.hasOwnProperty(g)&&(a.match(/^( )+'[^']*'/)||a.match(/^( )+"[^"]*"/))?"number":j.hasOwnProperty(g)?"atom":k.hasOwnProperty(g)?"builtin":l.hasOwnProperty(g)?"keyword":i.hasOwnProperty(g)?"string-2":null}return n.zerolessFloat&&a.match(/^(?:\d+(?:e[+-]?\d+)?)/i)?"number":a.match(/^\.+/)?null:n.ODBCdotTable&&a.match(/^[\w\d_]+/)?"variable-2":void 0}function e(a){return function(b,c){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){c.tokenize=d;break}f=!f&&"\\"==e}return"string"}}function f(a){return function(b,c){var e=b.match(/^.*?(\/\*|\*\/)/);return e?"/*"==e[1]?c.tokenize=f(a+1):a>1?c.tokenize=f(a-1):c.tokenize=d:b.skipToEnd(),"comment"}}function g(a,b,c){b.context={prev:b.context,indent:a.indentation(),col:a.column(),type:c}}function h(a){a.indent=a.context.indent,a.context=a.context.prev}var i=c.client||{},j=c.atoms||{false:!0,true:!0,null:!0},k=c.builtin||{},l=c.keywords||{},m=c.operatorChars||/^[*+\-%<>!=&|~^]/,n=c.support||{},o=c.hooks||{},p=c.dateSQL||{date:!0,time:!0,timestamp:!0};return{startState:function(){return{tokenize:d,context:null}},token:function(a,b){if(a.sol()&&b.context&&null==b.context.align&&(b.context.align=!1),b.tokenize==d&&a.eatSpace())return null;var c=b.tokenize(a,b);if("comment"==c)return c;b.context&&null==b.context.align&&(b.context.align=!0);var e=a.current();return"("==e?g(a,b,")"):"["==e?g(a,b,"]"):b.context&&b.context.type==e&&h(b),c},indent:function(c,d){var e=c.context;if(!e)return a.Pass;var f=d.charAt(0)==e.type;return e.align?e.col+(f?0:1):e.indent+(f?0:b.indentUnit)},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:n.commentSlashSlash?"//":n.commentHash?"#":"--"}})),(function(){function b(a){for(var b;null!=(b=a.next());)if("`"==b&&!a.eat("`"))return"variable-2";return a.backUp(a.current().length-1),a.eatWhile(/\w/)?"variable-2":null}function c(a){for(var b;null!=(b=a.next());)if('"'==b&&!a.eat('"'))return"variable-2";return a.backUp(a.current().length-1),a.eatWhile(/\w/)?"variable-2":null}function d(a){return a.eat("@")&&(a.match(/^session\./),a.match(/^local\./),a.match(/^global\./)),a.eat("'")?(a.match(/^.*'/),"variable-2"):a.eat('"')?(a.match(/^.*"/),"variable-2"):a.eat("`")?(a.match(/^.*`/),"variable-2"):a.match(/^[0-9a-zA-Z$\.\_]+/)?"variable-2":null}function e(a){return a.eat("N")?"atom":a.match(/^[a-zA-Z.#!?]/)?"variable-2":null}function f(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}var g="alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit ";a.defineMIME("text/x-sql",{name:"sql",keywords:f(g+"begin"),builtin:f("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable doubleQuote binaryNumber hexNumber")}),a.defineMIME("text/x-mssql",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare exec"),builtin:f("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date datetimeoffset datetime2 smalldatetime datetime time"),hooks:{"@":d}}),a.defineMIME("text/x-mysql",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":d,"`":b,"\\":e}}),a.defineMIME("text/x-mariadb",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":d,"`":b,"\\":e}}),a.defineMIME("text/x-sqlite",{name:"sql",client:f("auth backup bail binary changes check clone databases dbinfo dump echo eqp exit explain fullschema headers help import imposter indexes iotrace limit lint load log mode nullvalue once open output print prompt quit read restore save scanstats schema separator session shell show stats system tables testcase timeout timer trace vfsinfo vfslist vfsname width"),keywords:f(g+"abort action add after all analyze attach autoincrement before begin cascade case cast check collate column commit conflict constraint cross current_date current_time current_timestamp database default deferrable deferred detach each else end escape except exclusive exists explain fail for foreign full glob if ignore immediate index indexed initially inner instead intersect isnull key left limit match natural no notnull null of offset outer plan pragma primary query raise recursive references regexp reindex release rename replace restrict right rollback row savepoint temp temporary then to transaction trigger unique using vacuum view virtual when with without"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text clob bigint int int2 int8 integer float double char varchar date datetime year unsigned signed numeric real"),atoms:f("null current_date current_time current_timestamp"),operatorChars:/^[*+\-%<>!=&|\/~]/,dateSQL:f("date time timestamp datetime"),support:f("decimallessFloat zerolessFloat"),identifierQuote:'"',hooks:{"@":d,":":d,"?":d,$:d,'"':c,"`":b}}),a.defineMIME("text/x-cassandra",{name:"sql",client:{},keywords:f("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),builtin:f("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),atoms:f("false true infinity NaN"),operatorChars:/^[<>=]/,dateSQL:{},support:f("commentSlashSlash decimallessFloat"),hooks:{}}),a.defineMIME("text/x-plsql",{name:"sql",client:f("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),keywords:f("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),builtin:f("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),operatorChars:/^[*+\-%<>!=~]/,dateSQL:f("date time timestamp"),support:f("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")}),a.defineMIME("text/x-hive",{name:"sql",keywords:f("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),builtin:f("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date timestamp"),support:f("ODBCdotTable doubleQuote binaryNumber hexNumber")}),a.defineMIME("text/x-pgsql",{name:"sql",client:f("source"),keywords:f(g+"a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),builtin:f("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^\/#@?~]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")}),a.defineMIME("text/x-gql",{name:"sql",keywords:f("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"),atoms:f("false true"),builtin:f("blob datetime first key __key__ string integer double boolean null"),operatorChars:/^[*+\-%<>!=]/})})()}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/stylus/stylus.js b/media/editors/codemirror/mode/stylus/stylus.js
index 8d83a0180702c..b83be16f42b61 100644
--- a/media/editors/codemirror/mode/stylus/stylus.js
+++ b/media/editors/codemirror/mode/stylus/stylus.js
@@ -15,6 +15,7 @@
 
   CodeMirror.defineMode("stylus", function(config) {
     var indentUnit = config.indentUnit,
+        indentUnitString = '',
         tagKeywords = keySet(tagKeywords_),
         tagVariablesRegexp = /^(a|b|i|s|col|em)$/i,
         propertyKeywords = keySet(propertyKeywords_),
@@ -38,6 +39,8 @@
         type,
         override;
 
+    while (indentUnitString.length < indentUnit) indentUnitString += ' ';
+
     /**
      * Tokenizers
      */
@@ -313,7 +316,7 @@
           return pushContext(state, stream, "block", 0);
         }
       }
-      if (typeIsBlock(type, stream, state)) {
+      if (typeIsBlock(type, stream)) {
         return pushContext(state, stream, "block");
       }
       if (type == "}" && endOfLine(stream)) {
@@ -513,7 +516,7 @@
      */
     states.atBlock = function(type, stream, state) {
       if (type == "(") return pushContext(state, stream, "atBlock_parens");
-      if (typeIsBlock(type, stream, state)) {
+      if (typeIsBlock(type, stream)) {
         return pushContext(state, stream, "block");
       }
       if (typeIsInterpolation(type, stream)) {
@@ -672,7 +675,7 @@
             ch = textAfter && textAfter.charAt(0),
             indent = cx.indent,
             lineFirstWord = firstWordOfLine(textAfter),
-            lineIndent = line.length - line.replace(/^\s*/, "").length,
+            lineIndent = line.match(/^\s*/)[0].replace(/\t/g, indentUnitString).length,
             prevLineFirstWord = state.context.prev ? state.context.prev.line.firstWord : "",
             prevLineIndent = state.context.prev ? state.context.prev.line.indent : lineIndent;
 
@@ -681,7 +684,6 @@
              ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
              ch == "{" && (cx.type == "at"))) {
           indent = cx.indent - indentUnit;
-          cx = cx.prev;
         } else if (!(/(\})/.test(ch))) {
           if (/@|\$|\d/.test(ch) ||
               /^\{/.test(textAfter) ||
diff --git a/media/editors/codemirror/mode/stylus/stylus.min.js b/media/editors/codemirror/mode/stylus/stylus.min.js
index 9db1ffd0605e9..86904d39b8631 100644
--- a/media/editors/codemirror/mode/stylus/stylus.min.js
+++ b/media/editors/codemirror/mode/stylus/stylus.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return a=a.sort((function(a,b){return b>a})),new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a){for(var b={},c=0;c<a.length;++c)b[a[c]]=!0;return b}function d(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}a.defineMode("stylus",(function(a){function q(a,b){if(da=a.string.match(/(^[\w-]+\s*=\s*$)|(^\s*[\w-]+\s*=\s*[\w-])|(^\s*(\.|#|@|\$|\&|\[|\d|\+|::?|\{|\>|~|\/)?\s*[\w-]*([a-z0-9-]|\*|\/\*)(\(|,)?)/),b.context.line.firstWord=da?da[0].replace(/^\s*/,""):"",b.context.line.indent=a.indentation(),K=a.peek(),a.match("//"))return a.skipToEnd(),["comment","comment"];if(a.match("/*"))return b.tokenize=r,r(a,b);if('"'==K||"'"==K)return a.next(),b.tokenize=s(K),b.tokenize(a,b);if("@"==K)return a.next(),a.eatWhile(/[\w\\-]/),["def",a.current()];if("#"==K){if(a.next(),a.match(/^[0-9a-f]{6}|[0-9a-f]{3}/i))return["atom","atom"];if(a.match(/^[a-z][\w-]*/i))return["builtin","hash"]}return a.match(ba)?["meta","vendor-prefixes"]:a.match(/^-?[0-9]?\.?[0-9]/)?(a.eatWhile(/[a-z%]/i),["number","unit"]):"!"==K?(a.next(),[a.match(/^(important|optional)/i)?"keyword":"operator","important"]):"."==K&&a.match(/^\.[a-z][\w-]*/i)?["qualifier","qualifier"]:a.match(W)?("("==a.peek()&&(b.tokenize=t),["property","word"]):a.match(/^[a-z][\w-]*\(/i)?(a.backUp(1),["keyword","mixin"]):a.match(/^(\+|-)[a-z][\w-]*\(/i)?(a.backUp(1),["keyword","block-mixin"]):a.string.match(/^\s*&/)&&a.match(/^[-_]+[a-z][\w-]*/)?["qualifier","qualifier"]:a.match(/^(\/|&)(-|_|:|\.|#|[a-z])/)?(a.backUp(1),["variable-3","reference"]):a.match(/^&{1}\s*$/)?["variable-3","reference"]:a.match(_)?["operator","operator"]:a.match(/^\$?[-_]*[a-z0-9]+[\w-]*/i)?a.match(/^(\.|\[)[\w-\'\"\]]+/i,!1)&&!z(a.current())?(a.match(/\./),["variable-2","variable-name"]):["variable-2","word"]:a.match($)?["operator",a.current()]:/[:;,{}\[\]\(\)]/.test(K)?(a.next(),[null,K]):(a.next(),[null,null])}function r(a,b){for(var c,d=!1;null!=(c=a.next());){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return["comment","comment"]}function s(a){return function(b,c){for(var d,e=!1;null!=(d=b.next());){if(d==a&&!e){")"==a&&b.backUp(1);break}e=!e&&"\\"==d}return(d==a||!e&&")"!=a)&&(c.tokenize=null),["string","string"]}}function t(a,b){return a.next(),a.match(/\s*[\"\')]/,!1)?b.tokenize=null:b.tokenize=s(")"),[null,"("]}function u(a,b,c,d){this.type=a,this.indent=b,this.prev=c,this.line=d||{firstWord:"",indent:0}}function v(a,b,c,d){return d=d>=0?d:O,a.context=new u(c,b.indentation()+d,a.context),c}function w(a,b){var c=a.context.indent-O;return b=b||!1,a.context=a.context.prev,b&&(a.context.indent=c),a.context.type}function x(a,b,c){return ea[c.context.type](a,b,c)}function y(a,b,c,d){for(var e=d||1;e>0;e--)c.context=c.context.prev;return x(a,b,c)}function z(a){return a.toLowerCase()in P}function A(a){return a=a.toLowerCase(),a in R||a in Z}function B(a){return a.toLowerCase()in aa}function C(a){return a.toLowerCase().match(ba)}function D(a){var b=a.toLowerCase(),c="variable-2";return z(a)?c="tag":B(a)?c="block-keyword":A(a)?c="property":b in T||b in ca?c="atom":"return"==b||b in U?c="keyword":a.match(/^[A-Z]/)&&(c="string"),c}function E(a,b){return I(b)&&("{"==a||"]"==a||"hash"==a||"qualifier"==a)||"block-mixin"==a}function F(a,b){return"{"==a&&b.match(/^\s*\$?[\w-]+/i,!1)}function G(a,b){return":"==a&&b.match(/^[a-z-]+/,!1)}function H(a){return a.sol()||a.string.match(new RegExp("^\\s*"+d(a.current())))}function I(a){return a.eol()||a.match(/^\s*$/,!1)}function J(a){var b=/^\s*[-_]*[a-z0-9]+[\w-]*/i,c="string"==typeof a?a.match(b):a.string.match(b);return c?c[0].replace(/^\s*/,""):""}var K,L,M,N,O=a.indentUnit,P=c(e),Q=/^(a|b|i|s|col|em)$/i,R=c(i),S=c(j),T=c(m),U=c(l),V=c(f),W=b(f),X=c(h),Y=c(g),Z=c(k),$=/^\s*([.]{2,3}|&&|\|\||\*\*|[?!=:]?=|[-+*\/%<>]=?|\?:|\~)/,_=b(n),aa=c(o),ba=new RegExp(/^\-(moz|ms|o|webkit)-/i),ca=c(p),da="",ea={};return ea.block=function(a,b,c){if("comment"==a&&H(b)||","==a&&I(b)||"mixin"==a)return v(c,b,"block",0);if(F(a,b))return v(c,b,"interpolation");if(I(b)&&"]"==a&&!/^\s*(\.|#|:|\[|\*|&)/.test(b.string)&&!z(J(b)))return v(c,b,"block",0);if(E(a,b,c))return v(c,b,"block");if("}"==a&&I(b))return v(c,b,"block",0);if("variable-name"==a)return b.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/)||B(J(b))?v(c,b,"variableName"):v(c,b,"variableName",0);if("="==a)return I(b)||B(J(b))?v(c,b,"block"):v(c,b,"block",0);if("*"==a&&(I(b)||b.match(/\s*(,|\.|#|\[|:|{)/,!1)))return N="tag",v(c,b,"block");if(G(a,b))return v(c,b,"pseudo");if(/@(font-face|media|supports|(-moz-)?document)/.test(a))return v(c,b,I(b)?"block":"atBlock");if(/@(-(moz|ms|o|webkit)-)?keyframes$/.test(a))return v(c,b,"keyframes");if(/@extends?/.test(a))return v(c,b,"extend",0);if(a&&"@"==a.charAt(0))return b.indentation()>0&&A(b.current().slice(1))?(N="variable-2","block"):/(@import|@require|@charset)/.test(a)?v(c,b,"block",0):v(c,b,"block");if("reference"==a&&I(b))return v(c,b,"block");if("("==a)return v(c,b,"parens");if("vendor-prefixes"==a)return v(c,b,"vendorPrefixes");if("word"==a){var d=b.current();if(N=D(d),"property"==N)return H(b)?v(c,b,"block",0):(N="atom","block");if("tag"==N){if(/embed|menu|pre|progress|sub|table/.test(d)&&A(J(b)))return N="atom","block";if(b.string.match(new RegExp("\\[\\s*"+d+"|"+d+"\\s*\\]")))return N="atom","block";if(Q.test(d)&&(H(b)&&b.string.match(/=/)||!H(b)&&!b.string.match(/^(\s*\.|#|\&|\[|\/|>|\*)/)&&!z(J(b))))return N="variable-2",B(J(b))?"block":v(c,b,"block",0);if(I(b))return v(c,b,"block")}if("block-keyword"==N)return N="keyword",b.current(/(if|unless)/)&&!H(b)?"block":v(c,b,"block");if("return"==d)return v(c,b,"block",0);if("variable-2"==N&&b.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/))return v(c,b,"block")}return c.context.type},ea.parens=function(a,b,c){if("("==a)return v(c,b,"parens");if(")"==a)return"parens"==c.context.prev.type?w(c):b.string.match(/^[a-z][\w-]*\(/i)&&I(b)||B(J(b))||/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(J(b))||!b.string.match(/^-?[a-z][\w-\.\[\]\'\"]*\s*=/)&&z(J(b))?v(c,b,"block"):b.string.match(/^[\$-]?[a-z][\w-\.\[\]\'\"]*\s*=/)||b.string.match(/^\s*(\(|\)|[0-9])/)||b.string.match(/^\s+[a-z][\w-]*\(/i)||b.string.match(/^\s+[\$-]?[a-z]/i)?v(c,b,"block",0):I(b)?v(c,b,"block"):v(c,b,"block",0);if(a&&"@"==a.charAt(0)&&A(b.current().slice(1))&&(N="variable-2"),"word"==a){var d=b.current();N=D(d),"tag"==N&&Q.test(d)&&(N="variable-2"),"property"!=N&&"to"!=d||(N="atom")}return"variable-name"==a?v(c,b,"variableName"):G(a,b)?v(c,b,"pseudo"):c.context.type},ea.vendorPrefixes=function(a,b,c){return"word"==a?(N="property",v(c,b,"block",0)):w(c)},ea.pseudo=function(a,b,c){return A(J(b.string))?y(a,b,c):(b.match(/^[a-z-]+/),N="variable-3",I(b)?v(c,b,"block"):w(c))},ea.atBlock=function(a,b,c){if("("==a)return v(c,b,"atBlock_parens");if(E(a,b,c))return v(c,b,"block");if(F(a,b))return v(c,b,"interpolation");if("word"==a){var d=b.current().toLowerCase();if(N=/^(only|not|and|or)$/.test(d)?"keyword":V.hasOwnProperty(d)?"tag":Y.hasOwnProperty(d)?"attribute":X.hasOwnProperty(d)?"property":S.hasOwnProperty(d)?"string-2":D(b.current()),"tag"==N&&I(b))return v(c,b,"block")}return"operator"==a&&/^(not|and|or)$/.test(b.current())&&(N="keyword"),c.context.type},ea.atBlock_parens=function(a,b,c){if("{"==a||"}"==a)return c.context.type;if(")"==a)return I(b)?v(c,b,"block"):v(c,b,"atBlock");if("word"==a){var d=b.current().toLowerCase();return N=D(d),/^(max|min)/.test(d)&&(N="property"),"tag"==N&&(N=Q.test(d)?"variable-2":"atom"),c.context.type}return ea.atBlock(a,b,c)},ea.keyframes=function(a,b,c){return"0"==b.indentation()&&("}"==a&&H(b)||"]"==a||"hash"==a||"qualifier"==a||z(b.current()))?y(a,b,c):"{"==a?v(c,b,"keyframes"):"}"==a?H(b)?w(c,!0):v(c,b,"keyframes"):"unit"==a&&/^[0-9]+\%$/.test(b.current())?v(c,b,"keyframes"):"word"==a&&(N=D(b.current()),"block-keyword"==N)?(N="keyword",v(c,b,"keyframes")):/@(font-face|media|supports|(-moz-)?document)/.test(a)?v(c,b,I(b)?"block":"atBlock"):"mixin"==a?v(c,b,"block",0):c.context.type},ea.interpolation=function(a,b,c){return"{"==a&&w(c)&&v(c,b,"block"),"}"==a?b.string.match(/^\s*(\.|#|:|\[|\*|&|>|~|\+|\/)/i)||b.string.match(/^\s*[a-z]/i)&&z(J(b))?v(c,b,"block"):!b.string.match(/^(\{|\s*\&)/)||b.match(/\s*[\w-]/,!1)?v(c,b,"block",0):v(c,b,"block"):"variable-name"==a?v(c,b,"variableName",0):("word"==a&&(N=D(b.current()),"tag"==N&&(N="atom")),c.context.type)},ea.extend=function(a,b,c){return"["==a||"="==a?"extend":"]"==a?w(c):"word"==a?(N=D(b.current()),"extend"):w(c)},ea.variableName=function(a,b,c){return"string"==a||"["==a||"]"==a||b.current().match(/^(\.|\$)/)?(b.current().match(/^\.[\w-]+/i)&&(N="variable-2"),"variableName"):y(a,b,c)},{startState:function(a){return{tokenize:null,state:"block",context:new u("block",a||0,null)}},token:function(a,b){return!b.tokenize&&a.eatSpace()?null:(L=(b.tokenize||q)(a,b),L&&"object"==typeof L&&(M=L[1],L=L[0]),N=L,b.state=ea[b.state](M,a,b),N)},indent:function(a,b,c){var d=a.context,e=b&&b.charAt(0),f=d.indent,g=J(b),h=c.length-c.replace(/^\s*/,"").length,i=a.context.prev?a.context.prev.line.firstWord:"",j=a.context.prev?a.context.prev.line.indent:h;return d.prev&&("}"==e&&("block"==d.type||"atBlock"==d.type||"keyframes"==d.type)||")"==e&&("parens"==d.type||"atBlock_parens"==d.type)||"{"==e&&"at"==d.type)?(f=d.indent-O,d=d.prev):/(\})/.test(e)||(/@|\$|\d/.test(e)||/^\{/.test(b)||/^\s*\/(\/|\*)/.test(b)||/^\s*\/\*/.test(i)||/^\s*[\w-\.\[\]\'\"]+\s*(\?|:|\+)?=/i.test(b)||/^(\+|-)?[a-z][\w-]*\(/i.test(b)||/^return/.test(b)||B(g)?f=h:/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(e)||z(g)?f=/\,\s*$/.test(i)?j:/^\s+/.test(c)&&(/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(i)||z(i))?h<=j?j:j+O:h:/,\s*$/.test(c)||!C(g)&&!A(g)||(f=B(i)?h<=j?j:j+O:/^\{/.test(i)?h<=j?h:j+O:C(i)||A(i)?h>=j?j:h:/^(\.|#|:|\[|\*|&|@|\+|\-|>|~|\/)/.test(i)||/=\s*$/.test(i)||z(i)||/^\$[\w-\.\[\]\'\"]/.test(i)?j+O:h)),f},electricChars:"}",lineComment:"//",fold:"indent"}}));var e=["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","bgsound","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes","noscript","object","ol","optgroup","option","output","p","param","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","track","u","ul","var","video"],f=["domain","regexp","url","url-prefix"],g=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],h=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"],i=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"],j=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],k=["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],l=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],m=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around","unset"],n=["in","and","or","not","is not","is a","is","isnt","defined","if unless"],o=["for","if","else","unless","from","to"],p=["null","true","false","href","title","type","not-allowed","readonly","disabled"],q=["@font-face","@keyframes","@media","@viewport","@page","@host","@supports","@block","@css"],r=e.concat(f,g,h,i,j,l,m,k,n,o,p,q);a.registerHelper("hintWords","stylus",r),a.defineMIME("text/x-styl","stylus")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return a=a.sort((function(a,b){return b>a})),new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a){for(var b={},c=0;c<a.length;++c)b[a[c]]=!0;return b}function d(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}a.defineMode("stylus",(function(a){function q(a,b){if(ea=a.string.match(/(^[\w-]+\s*=\s*$)|(^\s*[\w-]+\s*=\s*[\w-])|(^\s*(\.|#|@|\$|\&|\[|\d|\+|::?|\{|\>|~|\/)?\s*[\w-]*([a-z0-9-]|\*|\/\*)(\(|,)?)/),b.context.line.firstWord=ea?ea[0].replace(/^\s*/,""):"",b.context.line.indent=a.indentation(),K=a.peek(),a.match("//"))return a.skipToEnd(),["comment","comment"];if(a.match("/*"))return b.tokenize=r,r(a,b);if('"'==K||"'"==K)return a.next(),b.tokenize=s(K),b.tokenize(a,b);if("@"==K)return a.next(),a.eatWhile(/[\w\\-]/),["def",a.current()];if("#"==K){if(a.next(),a.match(/^[0-9a-f]{6}|[0-9a-f]{3}/i))return["atom","atom"];if(a.match(/^[a-z][\w-]*/i))return["builtin","hash"]}return a.match(ca)?["meta","vendor-prefixes"]:a.match(/^-?[0-9]?\.?[0-9]/)?(a.eatWhile(/[a-z%]/i),["number","unit"]):"!"==K?(a.next(),[a.match(/^(important|optional)/i)?"keyword":"operator","important"]):"."==K&&a.match(/^\.[a-z][\w-]*/i)?["qualifier","qualifier"]:a.match(X)?("("==a.peek()&&(b.tokenize=t),["property","word"]):a.match(/^[a-z][\w-]*\(/i)?(a.backUp(1),["keyword","mixin"]):a.match(/^(\+|-)[a-z][\w-]*\(/i)?(a.backUp(1),["keyword","block-mixin"]):a.string.match(/^\s*&/)&&a.match(/^[-_]+[a-z][\w-]*/)?["qualifier","qualifier"]:a.match(/^(\/|&)(-|_|:|\.|#|[a-z])/)?(a.backUp(1),["variable-3","reference"]):a.match(/^&{1}\s*$/)?["variable-3","reference"]:a.match(aa)?["operator","operator"]:a.match(/^\$?[-_]*[a-z0-9]+[\w-]*/i)?a.match(/^(\.|\[)[\w-\'\"\]]+/i,!1)&&!z(a.current())?(a.match(/\./),["variable-2","variable-name"]):["variable-2","word"]:a.match(_)?["operator",a.current()]:/[:;,{}\[\]\(\)]/.test(K)?(a.next(),[null,K]):(a.next(),[null,null])}function r(a,b){for(var c,d=!1;null!=(c=a.next());){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return["comment","comment"]}function s(a){return function(b,c){for(var d,e=!1;null!=(d=b.next());){if(d==a&&!e){")"==a&&b.backUp(1);break}e=!e&&"\\"==d}return(d==a||!e&&")"!=a)&&(c.tokenize=null),["string","string"]}}function t(a,b){return a.next(),a.match(/\s*[\"\')]/,!1)?b.tokenize=null:b.tokenize=s(")"),[null,"("]}function u(a,b,c,d){this.type=a,this.indent=b,this.prev=c,this.line=d||{firstWord:"",indent:0}}function v(a,b,c,d){return d=d>=0?d:O,a.context=new u(c,b.indentation()+d,a.context),c}function w(a,b){var c=a.context.indent-O;return b=b||!1,a.context=a.context.prev,b&&(a.context.indent=c),a.context.type}function x(a,b,c){return fa[c.context.type](a,b,c)}function y(a,b,c,d){for(var e=d||1;e>0;e--)c.context=c.context.prev;return x(a,b,c)}function z(a){return a.toLowerCase()in Q}function A(a){return a=a.toLowerCase(),a in S||a in $}function B(a){return a.toLowerCase()in ba}function C(a){return a.toLowerCase().match(ca)}function D(a){var b=a.toLowerCase(),c="variable-2";return z(a)?c="tag":B(a)?c="block-keyword":A(a)?c="property":b in U||b in da?c="atom":"return"==b||b in V?c="keyword":a.match(/^[A-Z]/)&&(c="string"),c}function E(a,b){return I(b)&&("{"==a||"]"==a||"hash"==a||"qualifier"==a)||"block-mixin"==a}function F(a,b){return"{"==a&&b.match(/^\s*\$?[\w-]+/i,!1)}function G(a,b){return":"==a&&b.match(/^[a-z-]+/,!1)}function H(a){return a.sol()||a.string.match(new RegExp("^\\s*"+d(a.current())))}function I(a){return a.eol()||a.match(/^\s*$/,!1)}function J(a){var b=/^\s*[-_]*[a-z0-9]+[\w-]*/i,c="string"==typeof a?a.match(b):a.string.match(b);return c?c[0].replace(/^\s*/,""):""}for(var K,L,M,N,O=a.indentUnit,P="",Q=c(e),R=/^(a|b|i|s|col|em)$/i,S=c(i),T=c(j),U=c(m),V=c(l),W=c(f),X=b(f),Y=c(h),Z=c(g),$=c(k),_=/^\s*([.]{2,3}|&&|\|\||\*\*|[?!=:]?=|[-+*\/%<>]=?|\?:|\~)/,aa=b(n),ba=c(o),ca=new RegExp(/^\-(moz|ms|o|webkit)-/i),da=c(p),ea="",fa={};P.length<O;)P+=" ";return fa.block=function(a,b,c){if("comment"==a&&H(b)||","==a&&I(b)||"mixin"==a)return v(c,b,"block",0);if(F(a,b))return v(c,b,"interpolation");if(I(b)&&"]"==a&&!/^\s*(\.|#|:|\[|\*|&)/.test(b.string)&&!z(J(b)))return v(c,b,"block",0);if(E(a,b))return v(c,b,"block");if("}"==a&&I(b))return v(c,b,"block",0);if("variable-name"==a)return b.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/)||B(J(b))?v(c,b,"variableName"):v(c,b,"variableName",0);if("="==a)return I(b)||B(J(b))?v(c,b,"block"):v(c,b,"block",0);if("*"==a&&(I(b)||b.match(/\s*(,|\.|#|\[|:|{)/,!1)))return N="tag",v(c,b,"block");if(G(a,b))return v(c,b,"pseudo");if(/@(font-face|media|supports|(-moz-)?document)/.test(a))return v(c,b,I(b)?"block":"atBlock");if(/@(-(moz|ms|o|webkit)-)?keyframes$/.test(a))return v(c,b,"keyframes");if(/@extends?/.test(a))return v(c,b,"extend",0);if(a&&"@"==a.charAt(0))return b.indentation()>0&&A(b.current().slice(1))?(N="variable-2","block"):/(@import|@require|@charset)/.test(a)?v(c,b,"block",0):v(c,b,"block");if("reference"==a&&I(b))return v(c,b,"block");if("("==a)return v(c,b,"parens");if("vendor-prefixes"==a)return v(c,b,"vendorPrefixes");if("word"==a){var d=b.current();if(N=D(d),"property"==N)return H(b)?v(c,b,"block",0):(N="atom","block");if("tag"==N){if(/embed|menu|pre|progress|sub|table/.test(d)&&A(J(b)))return N="atom","block";if(b.string.match(new RegExp("\\[\\s*"+d+"|"+d+"\\s*\\]")))return N="atom","block";if(R.test(d)&&(H(b)&&b.string.match(/=/)||!H(b)&&!b.string.match(/^(\s*\.|#|\&|\[|\/|>|\*)/)&&!z(J(b))))return N="variable-2",B(J(b))?"block":v(c,b,"block",0);if(I(b))return v(c,b,"block")}if("block-keyword"==N)return N="keyword",b.current(/(if|unless)/)&&!H(b)?"block":v(c,b,"block");if("return"==d)return v(c,b,"block",0);if("variable-2"==N&&b.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/))return v(c,b,"block")}return c.context.type},fa.parens=function(a,b,c){if("("==a)return v(c,b,"parens");if(")"==a)return"parens"==c.context.prev.type?w(c):b.string.match(/^[a-z][\w-]*\(/i)&&I(b)||B(J(b))||/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(J(b))||!b.string.match(/^-?[a-z][\w-\.\[\]\'\"]*\s*=/)&&z(J(b))?v(c,b,"block"):b.string.match(/^[\$-]?[a-z][\w-\.\[\]\'\"]*\s*=/)||b.string.match(/^\s*(\(|\)|[0-9])/)||b.string.match(/^\s+[a-z][\w-]*\(/i)||b.string.match(/^\s+[\$-]?[a-z]/i)?v(c,b,"block",0):I(b)?v(c,b,"block"):v(c,b,"block",0);if(a&&"@"==a.charAt(0)&&A(b.current().slice(1))&&(N="variable-2"),"word"==a){var d=b.current();N=D(d),"tag"==N&&R.test(d)&&(N="variable-2"),"property"!=N&&"to"!=d||(N="atom")}return"variable-name"==a?v(c,b,"variableName"):G(a,b)?v(c,b,"pseudo"):c.context.type},fa.vendorPrefixes=function(a,b,c){return"word"==a?(N="property",v(c,b,"block",0)):w(c)},fa.pseudo=function(a,b,c){return A(J(b.string))?y(a,b,c):(b.match(/^[a-z-]+/),N="variable-3",I(b)?v(c,b,"block"):w(c))},fa.atBlock=function(a,b,c){if("("==a)return v(c,b,"atBlock_parens");if(E(a,b))return v(c,b,"block");if(F(a,b))return v(c,b,"interpolation");if("word"==a){var d=b.current().toLowerCase();if(N=/^(only|not|and|or)$/.test(d)?"keyword":W.hasOwnProperty(d)?"tag":Z.hasOwnProperty(d)?"attribute":Y.hasOwnProperty(d)?"property":T.hasOwnProperty(d)?"string-2":D(b.current()),"tag"==N&&I(b))return v(c,b,"block")}return"operator"==a&&/^(not|and|or)$/.test(b.current())&&(N="keyword"),c.context.type},fa.atBlock_parens=function(a,b,c){if("{"==a||"}"==a)return c.context.type;if(")"==a)return I(b)?v(c,b,"block"):v(c,b,"atBlock");if("word"==a){var d=b.current().toLowerCase();return N=D(d),/^(max|min)/.test(d)&&(N="property"),"tag"==N&&(N=R.test(d)?"variable-2":"atom"),c.context.type}return fa.atBlock(a,b,c)},fa.keyframes=function(a,b,c){return"0"==b.indentation()&&("}"==a&&H(b)||"]"==a||"hash"==a||"qualifier"==a||z(b.current()))?y(a,b,c):"{"==a?v(c,b,"keyframes"):"}"==a?H(b)?w(c,!0):v(c,b,"keyframes"):"unit"==a&&/^[0-9]+\%$/.test(b.current())?v(c,b,"keyframes"):"word"==a&&(N=D(b.current()),"block-keyword"==N)?(N="keyword",v(c,b,"keyframes")):/@(font-face|media|supports|(-moz-)?document)/.test(a)?v(c,b,I(b)?"block":"atBlock"):"mixin"==a?v(c,b,"block",0):c.context.type},fa.interpolation=function(a,b,c){return"{"==a&&w(c)&&v(c,b,"block"),"}"==a?b.string.match(/^\s*(\.|#|:|\[|\*|&|>|~|\+|\/)/i)||b.string.match(/^\s*[a-z]/i)&&z(J(b))?v(c,b,"block"):!b.string.match(/^(\{|\s*\&)/)||b.match(/\s*[\w-]/,!1)?v(c,b,"block",0):v(c,b,"block"):"variable-name"==a?v(c,b,"variableName",0):("word"==a&&(N=D(b.current()),"tag"==N&&(N="atom")),c.context.type)},fa.extend=function(a,b,c){return"["==a||"="==a?"extend":"]"==a?w(c):"word"==a?(N=D(b.current()),"extend"):w(c)},fa.variableName=function(a,b,c){return"string"==a||"["==a||"]"==a||b.current().match(/^(\.|\$)/)?(b.current().match(/^\.[\w-]+/i)&&(N="variable-2"),"variableName"):y(a,b,c)},{startState:function(a){return{tokenize:null,state:"block",context:new u("block",a||0,null)}},token:function(a,b){return!b.tokenize&&a.eatSpace()?null:(L=(b.tokenize||q)(a,b),L&&"object"==typeof L&&(M=L[1],L=L[0]),N=L,b.state=fa[b.state](M,a,b),N)},indent:function(a,b,c){var d=a.context,e=b&&b.charAt(0),f=d.indent,g=J(b),h=c.match(/^\s*/)[0].replace(/\t/g,P).length,i=a.context.prev?a.context.prev.line.firstWord:"",j=a.context.prev?a.context.prev.line.indent:h;return d.prev&&("}"==e&&("block"==d.type||"atBlock"==d.type||"keyframes"==d.type)||")"==e&&("parens"==d.type||"atBlock_parens"==d.type)||"{"==e&&"at"==d.type)?f=d.indent-O:/(\})/.test(e)||(/@|\$|\d/.test(e)||/^\{/.test(b)||/^\s*\/(\/|\*)/.test(b)||/^\s*\/\*/.test(i)||/^\s*[\w-\.\[\]\'\"]+\s*(\?|:|\+)?=/i.test(b)||/^(\+|-)?[a-z][\w-]*\(/i.test(b)||/^return/.test(b)||B(g)?f=h:/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(e)||z(g)?f=/\,\s*$/.test(i)?j:/^\s+/.test(c)&&(/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(i)||z(i))?h<=j?j:j+O:h:/,\s*$/.test(c)||!C(g)&&!A(g)||(f=B(i)?h<=j?j:j+O:/^\{/.test(i)?h<=j?h:j+O:C(i)||A(i)?h>=j?j:h:/^(\.|#|:|\[|\*|&|@|\+|\-|>|~|\/)/.test(i)||/=\s*$/.test(i)||z(i)||/^\$[\w-\.\[\]\'\"]/.test(i)?j+O:h)),f},electricChars:"}",lineComment:"//",fold:"indent"}}));var e=["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","bgsound","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes","noscript","object","ol","optgroup","option","output","p","param","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","track","u","ul","var","video"],f=["domain","regexp","url","url-prefix"],g=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],h=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"],i=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"],j=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],k=["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],l=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],m=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around","unset"],n=["in","and","or","not","is not","is a","is","isnt","defined","if unless"],o=["for","if","else","unless","from","to"],p=["null","true","false","href","title","type","not-allowed","readonly","disabled"],q=["@font-face","@keyframes","@media","@viewport","@page","@host","@supports","@block","@css"],r=e.concat(f,g,h,i,j,l,m,k,n,o,p,q);a.registerHelper("hintWords","stylus",r),a.defineMIME("text/x-styl","stylus")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/textile/textile.js b/media/editors/codemirror/mode/textile/textile.js
index a6f7576582e8c..bc5a2f3692f36 100644
--- a/media/editors/codemirror/mode/textile/textile.js
+++ b/media/editors/codemirror/mode/textile/textile.js
@@ -203,7 +203,7 @@
     single: {
       bc: "bc",
       bq: "bq",
-      definitionList: /- [^(?::=)]+:=+/,
+      definitionList: /- .*?:=+/,
       definitionListEnd: /.*=:\s*$/,
       div: "div",
       drawTable: /\|.*\|/,
diff --git a/media/editors/codemirror/mode/textile/textile.min.js b/media/editors/codemirror/mode/textile/textile.min.js
index 5ca9a7d69cdf5..974cb5360f482 100644
--- a/media/editors/codemirror/mode/textile/textile.min.js
+++ b/media/editors/codemirror/mode/textile/textile.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){b.mode=m.newLayout,b.tableHeading=!1,"definitionList"===b.layoutType&&b.spanningLayout&&a.match(j("definitionListEnd"),!1)&&(b.spanningLayout=!1)}function c(a,b,c){if("_"===c)return a.eat("_")?d(a,b,"italic",/__/,2):d(a,b,"em",/_/,1);if("*"===c)return a.eat("*")?d(a,b,"bold",/\*\*/,2):d(a,b,"strong",/\*/,1);if("["===c)return a.match(/\d+\]/)&&(b.footCite=!0),e(b);if("("===c){var f=a.match(/^(r|tm|c)\)/);if(f)return g(b,k.specialChar)}if("<"===c&&a.match(/(\w+)[^>]+>[^<]+<\/\1>/))return g(b,k.html);if("?"===c&&a.eat("?"))return d(a,b,"cite",/\?\?/,2);if("="===c&&a.eat("="))return d(a,b,"notextile",/==/,2);if("-"===c&&!a.eat("-"))return d(a,b,"deletion",/-/,1);if("+"===c)return d(a,b,"addition",/\+/,1);if("~"===c)return d(a,b,"sub",/~/,1);if("^"===c)return d(a,b,"sup",/\^/,1);if("%"===c)return d(a,b,"span",/%/,1);if("@"===c)return d(a,b,"code",/@/,1);if("!"===c){var h=d(a,b,"image",/(?:\([^\)]+\))?!/,1);return a.match(/^:\S+/),h}return e(b)}function d(a,b,c,d,f){var g=a.pos>f?a.string.charAt(a.pos-f-1):null,h=a.peek();if(b[c]){if((!h||/\W/.test(h))&&g&&/\S/.test(g)){var i=e(b);return b[c]=!1,i}}else(!g||/\W/.test(g))&&h&&/\S/.test(h)&&a.match(new RegExp("^.*\\S"+d.source+"(?:\\W|$)"),!1)&&(b[c]=!0,b.mode=m.attributes);return e(b)}function e(a){var b=f(a);if(b)return b;var c=[];return a.layoutType&&c.push(k[a.layoutType]),c=c.concat(h(a,"addition","bold","cite","code","deletion","em","footCite","image","italic","link","span","strong","sub","sup","table","tableHeading")),"header"===a.layoutType&&c.push(k.header+"-"+a.header),c.length?c.join(" "):null}function f(a){var b=a.layoutType;switch(b){case"notextile":case"code":case"pre":return k[b];default:return a.notextile?k.notextile+(b?" "+k[b]:""):null}}function g(a,b){var c=f(a);if(c)return c;var d=e(a);return b?d?d+" "+b:b:d}function h(a){for(var b=[],c=1;c<arguments.length;++c)a[arguments[c]]&&b.push(k[arguments[c]]);return b}function i(a){var b=a.spanningLayout,c=a.layoutType;for(var d in a)a.hasOwnProperty(d)&&delete a[d];a.mode=m.newLayout,b&&(a.layoutType=c,a.spanningLayout=!0)}function j(a){return l.cache[a]||(l.cache[a]=l.createRe(a))}var k={addition:"positive",attributes:"attribute",bold:"strong",cite:"keyword",code:"atom",definitionList:"number",deletion:"negative",div:"punctuation",em:"em",footnote:"variable",footCite:"qualifier",header:"header",html:"comment",image:"string",italic:"em",link:"link",linkDefinition:"link",list1:"variable-2",list2:"variable-3",list3:"keyword",notextile:"string-2",pre:"operator",p:"property",quote:"bracket",span:"quote",specialChar:"tag",strong:"strong",sub:"builtin",sup:"builtin",table:"variable-3",tableHeading:"operator"},l={cache:{},single:{bc:"bc",bq:"bq",definitionList:/- [^(?::=)]+:=+/,definitionListEnd:/.*=:\s*$/,div:"div",drawTable:/\|.*\|/,foot:/fn\d+/,header:/h[1-6]/,html:/\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,link:/[^"]+":\S/,linkDefinition:/\[[^\s\]]+\]\S+/,list:/(?:#+|\*+)/,notextile:"notextile",para:"p",pre:"pre",table:"table",tableCellAttributes:/[\/\\]\d+/,tableHeading:/\|_\./,tableText:/[^"_\*\[\(\?\+~\^%@|-]+/,text:/[^!"_=\*\[\(<\?\+~\^%@-]+/},attributes:{align:/(?:<>|<|>|=)/,selector:/\([^\(][^\)]+\)/,lang:/\[[^\[\]]+\]/,pad:/(?:\(+|\)+){1,2}/,css:/\{[^\}]+\}/},createRe:function(a){switch(a){case"drawTable":return l.makeRe("^",l.single.drawTable,"$");case"html":return l.makeRe("^",l.single.html,"(?:",l.single.html,")*","$");case"linkDefinition":return l.makeRe("^",l.single.linkDefinition,"$");case"listLayout":return l.makeRe("^",l.single.list,j("allAttributes"),"*\\s+");case"tableCellAttributes":return l.makeRe("^",l.choiceRe(l.single.tableCellAttributes,j("allAttributes")),"+\\.");case"type":return l.makeRe("^",j("allTypes"));case"typeLayout":return l.makeRe("^",j("allTypes"),j("allAttributes"),"*\\.\\.?","(\\s+|$)");case"attributes":return l.makeRe("^",j("allAttributes"),"+");case"allTypes":return l.choiceRe(l.single.div,l.single.foot,l.single.header,l.single.bc,l.single.bq,l.single.notextile,l.single.pre,l.single.table,l.single.para);case"allAttributes":return l.choiceRe(l.attributes.selector,l.attributes.css,l.attributes.lang,l.attributes.align,l.attributes.pad);default:return l.makeRe("^",l.single[a])}},makeRe:function(){for(var a="",b=0;b<arguments.length;++b){var c=arguments[b];a+="string"==typeof c?c:c.source}return new RegExp(a)},choiceRe:function(){for(var a=[arguments[0]],b=1;b<arguments.length;++b)a[2*b-1]="|",a[2*b]=arguments[b];return a.unshift("(?:"),a.push(")"),l.makeRe.apply(null,a)}},m={newLayout:function(a,b){if(a.match(j("typeLayout"),!1))return b.spanningLayout=!1,(b.mode=m.blockType)(a,b);var c;return f(b)||(a.match(j("listLayout"),!1)?c=m.list:a.match(j("drawTable"),!1)?c=m.table:a.match(j("linkDefinition"),!1)?c=m.linkDefinition:a.match(j("definitionList"))?c=m.definitionList:a.match(j("html"),!1)&&(c=m.html)),(b.mode=c||m.text)(a,b)},blockType:function(a,b){var c,d;return b.layoutType=null,(c=a.match(j("type")))?(d=c[0],(c=d.match(j("header")))?(b.layoutType="header",b.header=parseInt(c[0][1])):d.match(j("bq"))?b.layoutType="quote":d.match(j("bc"))?b.layoutType="code":d.match(j("foot"))?b.layoutType="footnote":d.match(j("notextile"))?b.layoutType="notextile":d.match(j("pre"))?b.layoutType="pre":d.match(j("div"))?b.layoutType="div":d.match(j("table"))&&(b.layoutType="table"),b.mode=m.attributes,e(b)):(b.mode=m.text)(a,b)},text:function(a,b){if(a.match(j("text")))return e(b);var d=a.next();return'"'===d?(b.mode=m.link)(a,b):c(a,b,d)},attributes:function(a,b){return b.mode=m.layoutLength,a.match(j("attributes"))?g(b,k.attributes):e(b)},layoutLength:function(a,b){return a.eat(".")&&a.eat(".")&&(b.spanningLayout=!0),b.mode=m.text,e(b)},list:function(a,b){var c=a.match(j("list"));b.listDepth=c[0].length;var d=(b.listDepth-1)%3;return d?1===d?b.layoutType="list2":b.layoutType="list3":b.layoutType="list1",b.mode=m.attributes,e(b)},link:function(a,b){return b.mode=m.text,a.match(j("link"))?(a.match(/\S+/),g(b,k.link)):e(b)},linkDefinition:function(a,b){return a.skipToEnd(),g(b,k.linkDefinition)},definitionList:function(a,b){return a.match(j("definitionList")),b.layoutType="definitionList",a.match(/\s*$/)?b.spanningLayout=!0:b.mode=m.attributes,e(b)},html:function(a,b){return a.skipToEnd(),g(b,k.html)},table:function(a,b){return b.layoutType="table",(b.mode=m.tableCell)(a,b)},tableCell:function(a,b){return a.match(j("tableHeading"))?b.tableHeading=!0:a.eat("|"),b.mode=m.tableCellAttributes,e(b)},tableCellAttributes:function(a,b){return b.mode=m.tableText,a.match(j("tableCellAttributes"))?g(b,k.attributes):e(b)},tableText:function(a,b){return a.match(j("tableText"))?e(b):"|"===a.peek()?(b.mode=m.tableCell,e(b)):c(a,b,a.next())}};a.defineMode("textile",(function(){return{startState:function(){return{mode:m.newLayout}},token:function(a,c){return a.sol()&&b(a,c),c.mode(a,c)},blankLine:i}})),a.defineMIME("text/x-textile","textile")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){b.mode=m.newLayout,b.tableHeading=!1,"definitionList"===b.layoutType&&b.spanningLayout&&a.match(j("definitionListEnd"),!1)&&(b.spanningLayout=!1)}function c(a,b,c){if("_"===c)return a.eat("_")?d(a,b,"italic",/__/,2):d(a,b,"em",/_/,1);if("*"===c)return a.eat("*")?d(a,b,"bold",/\*\*/,2):d(a,b,"strong",/\*/,1);if("["===c)return a.match(/\d+\]/)&&(b.footCite=!0),e(b);if("("===c){var f=a.match(/^(r|tm|c)\)/);if(f)return g(b,k.specialChar)}if("<"===c&&a.match(/(\w+)[^>]+>[^<]+<\/\1>/))return g(b,k.html);if("?"===c&&a.eat("?"))return d(a,b,"cite",/\?\?/,2);if("="===c&&a.eat("="))return d(a,b,"notextile",/==/,2);if("-"===c&&!a.eat("-"))return d(a,b,"deletion",/-/,1);if("+"===c)return d(a,b,"addition",/\+/,1);if("~"===c)return d(a,b,"sub",/~/,1);if("^"===c)return d(a,b,"sup",/\^/,1);if("%"===c)return d(a,b,"span",/%/,1);if("@"===c)return d(a,b,"code",/@/,1);if("!"===c){var h=d(a,b,"image",/(?:\([^\)]+\))?!/,1);return a.match(/^:\S+/),h}return e(b)}function d(a,b,c,d,f){var g=a.pos>f?a.string.charAt(a.pos-f-1):null,h=a.peek();if(b[c]){if((!h||/\W/.test(h))&&g&&/\S/.test(g)){var i=e(b);return b[c]=!1,i}}else(!g||/\W/.test(g))&&h&&/\S/.test(h)&&a.match(new RegExp("^.*\\S"+d.source+"(?:\\W|$)"),!1)&&(b[c]=!0,b.mode=m.attributes);return e(b)}function e(a){var b=f(a);if(b)return b;var c=[];return a.layoutType&&c.push(k[a.layoutType]),c=c.concat(h(a,"addition","bold","cite","code","deletion","em","footCite","image","italic","link","span","strong","sub","sup","table","tableHeading")),"header"===a.layoutType&&c.push(k.header+"-"+a.header),c.length?c.join(" "):null}function f(a){var b=a.layoutType;switch(b){case"notextile":case"code":case"pre":return k[b];default:return a.notextile?k.notextile+(b?" "+k[b]:""):null}}function g(a,b){var c=f(a);if(c)return c;var d=e(a);return b?d?d+" "+b:b:d}function h(a){for(var b=[],c=1;c<arguments.length;++c)a[arguments[c]]&&b.push(k[arguments[c]]);return b}function i(a){var b=a.spanningLayout,c=a.layoutType;for(var d in a)a.hasOwnProperty(d)&&delete a[d];a.mode=m.newLayout,b&&(a.layoutType=c,a.spanningLayout=!0)}function j(a){return l.cache[a]||(l.cache[a]=l.createRe(a))}var k={addition:"positive",attributes:"attribute",bold:"strong",cite:"keyword",code:"atom",definitionList:"number",deletion:"negative",div:"punctuation",em:"em",footnote:"variable",footCite:"qualifier",header:"header",html:"comment",image:"string",italic:"em",link:"link",linkDefinition:"link",list1:"variable-2",list2:"variable-3",list3:"keyword",notextile:"string-2",pre:"operator",p:"property",quote:"bracket",span:"quote",specialChar:"tag",strong:"strong",sub:"builtin",sup:"builtin",table:"variable-3",tableHeading:"operator"},l={cache:{},single:{bc:"bc",bq:"bq",definitionList:/- .*?:=+/,definitionListEnd:/.*=:\s*$/,div:"div",drawTable:/\|.*\|/,foot:/fn\d+/,header:/h[1-6]/,html:/\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,link:/[^"]+":\S/,linkDefinition:/\[[^\s\]]+\]\S+/,list:/(?:#+|\*+)/,notextile:"notextile",para:"p",pre:"pre",table:"table",tableCellAttributes:/[\/\\]\d+/,tableHeading:/\|_\./,tableText:/[^"_\*\[\(\?\+~\^%@|-]+/,text:/[^!"_=\*\[\(<\?\+~\^%@-]+/},attributes:{align:/(?:<>|<|>|=)/,selector:/\([^\(][^\)]+\)/,lang:/\[[^\[\]]+\]/,pad:/(?:\(+|\)+){1,2}/,css:/\{[^\}]+\}/},createRe:function(a){switch(a){case"drawTable":return l.makeRe("^",l.single.drawTable,"$");case"html":return l.makeRe("^",l.single.html,"(?:",l.single.html,")*","$");case"linkDefinition":return l.makeRe("^",l.single.linkDefinition,"$");case"listLayout":return l.makeRe("^",l.single.list,j("allAttributes"),"*\\s+");case"tableCellAttributes":return l.makeRe("^",l.choiceRe(l.single.tableCellAttributes,j("allAttributes")),"+\\.");case"type":return l.makeRe("^",j("allTypes"));case"typeLayout":return l.makeRe("^",j("allTypes"),j("allAttributes"),"*\\.\\.?","(\\s+|$)");case"attributes":return l.makeRe("^",j("allAttributes"),"+");case"allTypes":return l.choiceRe(l.single.div,l.single.foot,l.single.header,l.single.bc,l.single.bq,l.single.notextile,l.single.pre,l.single.table,l.single.para);case"allAttributes":return l.choiceRe(l.attributes.selector,l.attributes.css,l.attributes.lang,l.attributes.align,l.attributes.pad);default:return l.makeRe("^",l.single[a])}},makeRe:function(){for(var a="",b=0;b<arguments.length;++b){var c=arguments[b];a+="string"==typeof c?c:c.source}return new RegExp(a)},choiceRe:function(){for(var a=[arguments[0]],b=1;b<arguments.length;++b)a[2*b-1]="|",a[2*b]=arguments[b];return a.unshift("(?:"),a.push(")"),l.makeRe.apply(null,a)}},m={newLayout:function(a,b){if(a.match(j("typeLayout"),!1))return b.spanningLayout=!1,(b.mode=m.blockType)(a,b);var c;return f(b)||(a.match(j("listLayout"),!1)?c=m.list:a.match(j("drawTable"),!1)?c=m.table:a.match(j("linkDefinition"),!1)?c=m.linkDefinition:a.match(j("definitionList"))?c=m.definitionList:a.match(j("html"),!1)&&(c=m.html)),(b.mode=c||m.text)(a,b)},blockType:function(a,b){var c,d;return b.layoutType=null,(c=a.match(j("type")))?(d=c[0],(c=d.match(j("header")))?(b.layoutType="header",b.header=parseInt(c[0][1])):d.match(j("bq"))?b.layoutType="quote":d.match(j("bc"))?b.layoutType="code":d.match(j("foot"))?b.layoutType="footnote":d.match(j("notextile"))?b.layoutType="notextile":d.match(j("pre"))?b.layoutType="pre":d.match(j("div"))?b.layoutType="div":d.match(j("table"))&&(b.layoutType="table"),b.mode=m.attributes,e(b)):(b.mode=m.text)(a,b)},text:function(a,b){if(a.match(j("text")))return e(b);var d=a.next();return'"'===d?(b.mode=m.link)(a,b):c(a,b,d)},attributes:function(a,b){return b.mode=m.layoutLength,a.match(j("attributes"))?g(b,k.attributes):e(b)},layoutLength:function(a,b){return a.eat(".")&&a.eat(".")&&(b.spanningLayout=!0),b.mode=m.text,e(b)},list:function(a,b){var c=a.match(j("list"));b.listDepth=c[0].length;var d=(b.listDepth-1)%3;return d?1===d?b.layoutType="list2":b.layoutType="list3":b.layoutType="list1",b.mode=m.attributes,e(b)},link:function(a,b){return b.mode=m.text,a.match(j("link"))?(a.match(/\S+/),g(b,k.link)):e(b)},linkDefinition:function(a,b){return a.skipToEnd(),g(b,k.linkDefinition)},definitionList:function(a,b){return a.match(j("definitionList")),b.layoutType="definitionList",a.match(/\s*$/)?b.spanningLayout=!0:b.mode=m.attributes,e(b)},html:function(a,b){return a.skipToEnd(),g(b,k.html)},table:function(a,b){return b.layoutType="table",(b.mode=m.tableCell)(a,b)},tableCell:function(a,b){return a.match(j("tableHeading"))?b.tableHeading=!0:a.eat("|"),b.mode=m.tableCellAttributes,e(b)},tableCellAttributes:function(a,b){return b.mode=m.tableText,a.match(j("tableCellAttributes"))?g(b,k.attributes):e(b)},tableText:function(a,b){return a.match(j("tableText"))?e(b):"|"===a.peek()?(b.mode=m.tableCell,e(b)):c(a,b,a.next())}};a.defineMode("textile",(function(){return{startState:function(){return{mode:m.newLayout}},token:function(a,c){return a.sol()&&b(a,c),c.mode(a,c)},blankLine:i}})),a.defineMIME("text/x-textile","textile")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/tiki/tiki.js b/media/editors/codemirror/mode/tiki/tiki.js
index 5e05b1ff0149b..b4794e4334ee6 100644
--- a/media/editors/codemirror/mode/tiki/tiki.js
+++ b/media/editors/codemirror/mode/tiki/tiki.js
@@ -144,7 +144,7 @@ CodeMirror.defineMode('tiki', function(config) {
       type = "equals";
 
       if (peek == ">") {
-        ch = stream.next();
+        stream.next();
         peek = stream.peek();
       }
 
@@ -298,13 +298,13 @@ return {
     if (context && context.noIndent) return 0;
     if (context && /^{\//.test(textAfter))
         context = context.prev;
-        while (context && !context.startOfLine)
-          context = context.prev;
-        if (context) return context.indent + indentUnit;
-        else return 0;
-       },
-    electricChars: "/"
-  };
+    while (context && !context.startOfLine)
+        context = context.prev;
+    if (context) return context.indent + indentUnit;
+    else return 0;
+  },
+  electricChars: "/"
+};
 });
 
 CodeMirror.defineMIME("text/tiki", "tiki");
diff --git a/media/editors/codemirror/mode/tiki/tiki.min.js b/media/editors/codemirror/mode/tiki/tiki.min.js
index 695fb369b2fb2..c613d529ab397 100644
--- a/media/editors/codemirror/mode/tiki/tiki.min.js
+++ b/media/editors/codemirror/mode/tiki/tiki.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("tiki",(function(a){function b(a,b,c){return function(e,f){for(;!e.eol();){if(e.match(b)){f.tokenize=d;break}e.next()}return c&&(f.tokenize=c),a}}function c(a){return function(b,c){for(;!b.eol();)b.next();return c.tokenize=d,a}}function d(a,f){function g(b){return f.tokenize=b,b(a,f)}var h=a.sol(),i=a.next();switch(i){case"{":return a.eat("/"),a.eatSpace(),a.eatWhile(/[^\s\u00a0=\"\'\/?(}]/),f.tokenize=e,"tag";case"_":if(a.eat("_"))return g(b("strong","__",d));break;case"'":if(a.eat("'"))return g(b("em","''",d));break;case"(":if(a.eat("("))return g(b("variable-2","))",d));break;case"[":return g(b("variable-3","]",d));case"|":if(a.eat("|"))return g(b("comment","||"));break;case"-":if(a.eat("="))return g(b("header string","=-",d));if(a.eat("-"))return g(b("error tw-deleted","--",d));break;case"=":if(a.match("=="))return g(b("tw-underline","===",d));break;case":":if(a.eat(":"))return g(b("comment","::"));break;case"^":return g(b("tw-box","^"));case"~":if(a.match("np~"))return g(b("meta","~/np~"))}if(h)switch(i){case"!":return g(a.match("!!!!!")?c("header string"):a.match("!!!!")?c("header string"):a.match("!!!")?c("header string"):a.match("!!")?c("header string"):c("header string"));case"*":case"#":case"+":return g(c("tw-listitem bracket"))}return null}function e(a,b){var c=a.next(),e=a.peek();return"}"==c?(b.tokenize=d,"tag"):"("==c||")"==c?"bracket":"="==c?(s="equals",">"==e&&(c=a.next(),e=a.peek()),/[\'\"]/.test(e)||(b.tokenize=g()),"operator"):/[\'\"]/.test(c)?(b.tokenize=f(c),b.tokenize(a,b)):(a.eatWhile(/[^\s\u00a0=\"\'\/?]/),"keyword")}function f(a){return function(b,c){for(;!b.eol();)if(b.next()==a){c.tokenize=e;break}return"string"}}function g(){return function(a,b){for(;!a.eol();){var c=a.next(),d=a.peek();if(" "==c||","==c||/[ )}]/.test(d)){b.tokenize=e;break}}return"string"}}function h(){for(var a=arguments.length-1;a>=0;a--)t.cc.push(arguments[a])}function i(){return h.apply(null,arguments),!0}function j(a,b){var c=t.context&&t.context.noIndent;t.context={prev:t.context,pluginName:a,indent:t.indented,startOfLine:b,noIndent:c}}function k(){t.context&&(t.context=t.context.prev)}function l(a){if("openPlugin"==a)return t.pluginName=r,i(o,m(t.startOfLine));if("closePlugin"==a){var b=!1;return t.context?(b=t.context.pluginName!=r,k()):b=!0,b&&(u="error"),i(n(b))}return"string"==a?(t.context&&"!cdata"==t.context.name||j("!cdata"),t.tokenize==d&&k(),i()):i()}function m(a){return function(b){return"selfclosePlugin"==b||"endPlugin"==b?i():"endPlugin"==b?(j(t.pluginName,a),i()):i()}}function n(a){return function(b){return a&&(u="error"),"endPlugin"==b?i():h()}}function o(a){return"keyword"==a?(u="attribute",i(o)):"equals"==a?i(p,o):h()}function p(a){return"keyword"==a?(u="string",i()):"string"==a?i(q):h()}function q(a){return"string"==a?i(q):h()}var r,s,t,u,v=a.indentUnit;return{startState:function(){return{tokenize:d,cc:[],indented:0,startOfLine:!0,pluginName:null,context:null}},token:function(a,b){if(a.sol()&&(b.startOfLine=!0,b.indented=a.indentation()),a.eatSpace())return null;u=s=r=null;var c=b.tokenize(a,b);if((c||s)&&"comment"!=c)for(t=b;;){var d=b.cc.pop()||l;if(d(s||c))break}return b.startOfLine=!1,u||c},indent:function(a,b){var c=a.context;if(c&&c.noIndent)return 0;for(c&&/^{\//.test(b)&&(c=c.prev);c&&!c.startOfLine;)c=c.prev;return c?c.indent+v:0},electricChars:"/"}})),a.defineMIME("text/tiki","tiki")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("tiki",(function(a){function b(a,b,c){return function(e,f){for(;!e.eol();){if(e.match(b)){f.tokenize=d;break}e.next()}return c&&(f.tokenize=c),a}}function c(a){return function(b,c){for(;!b.eol();)b.next();return c.tokenize=d,a}}function d(a,f){function g(b){return f.tokenize=b,b(a,f)}var h=a.sol(),i=a.next();switch(i){case"{":return a.eat("/"),a.eatSpace(),a.eatWhile(/[^\s\u00a0=\"\'\/?(}]/),f.tokenize=e,"tag";case"_":if(a.eat("_"))return g(b("strong","__",d));break;case"'":if(a.eat("'"))return g(b("em","''",d));break;case"(":if(a.eat("("))return g(b("variable-2","))",d));break;case"[":return g(b("variable-3","]",d));case"|":if(a.eat("|"))return g(b("comment","||"));break;case"-":if(a.eat("="))return g(b("header string","=-",d));if(a.eat("-"))return g(b("error tw-deleted","--",d));break;case"=":if(a.match("=="))return g(b("tw-underline","===",d));break;case":":if(a.eat(":"))return g(b("comment","::"));break;case"^":return g(b("tw-box","^"));case"~":if(a.match("np~"))return g(b("meta","~/np~"))}if(h)switch(i){case"!":return g(a.match("!!!!!")?c("header string"):a.match("!!!!")?c("header string"):a.match("!!!")?c("header string"):a.match("!!")?c("header string"):c("header string"));case"*":case"#":case"+":return g(c("tw-listitem bracket"))}return null}function e(a,b){var c=a.next(),e=a.peek();return"}"==c?(b.tokenize=d,"tag"):"("==c||")"==c?"bracket":"="==c?(s="equals",">"==e&&(a.next(),e=a.peek()),/[\'\"]/.test(e)||(b.tokenize=g()),"operator"):/[\'\"]/.test(c)?(b.tokenize=f(c),b.tokenize(a,b)):(a.eatWhile(/[^\s\u00a0=\"\'\/?]/),"keyword")}function f(a){return function(b,c){for(;!b.eol();)if(b.next()==a){c.tokenize=e;break}return"string"}}function g(){return function(a,b){for(;!a.eol();){var c=a.next(),d=a.peek();if(" "==c||","==c||/[ )}]/.test(d)){b.tokenize=e;break}}return"string"}}function h(){for(var a=arguments.length-1;a>=0;a--)t.cc.push(arguments[a])}function i(){return h.apply(null,arguments),!0}function j(a,b){var c=t.context&&t.context.noIndent;t.context={prev:t.context,pluginName:a,indent:t.indented,startOfLine:b,noIndent:c}}function k(){t.context&&(t.context=t.context.prev)}function l(a){if("openPlugin"==a)return t.pluginName=r,i(o,m(t.startOfLine));if("closePlugin"==a){var b=!1;return t.context?(b=t.context.pluginName!=r,k()):b=!0,b&&(u="error"),i(n(b))}return"string"==a?(t.context&&"!cdata"==t.context.name||j("!cdata"),t.tokenize==d&&k(),i()):i()}function m(a){return function(b){return"selfclosePlugin"==b||"endPlugin"==b?i():"endPlugin"==b?(j(t.pluginName,a),i()):i()}}function n(a){return function(b){return a&&(u="error"),"endPlugin"==b?i():h()}}function o(a){return"keyword"==a?(u="attribute",i(o)):"equals"==a?i(p,o):h()}function p(a){return"keyword"==a?(u="string",i()):"string"==a?i(q):h()}function q(a){return"string"==a?i(q):h()}var r,s,t,u,v=a.indentUnit;return{startState:function(){return{tokenize:d,cc:[],indented:0,startOfLine:!0,pluginName:null,context:null}},token:function(a,b){if(a.sol()&&(b.startOfLine=!0,b.indented=a.indentation()),a.eatSpace())return null;u=s=r=null;var c=b.tokenize(a,b);if((c||s)&&"comment"!=c)for(t=b;;){var d=b.cc.pop()||l;if(d(s||c))break}return b.startOfLine=!1,u||c},indent:function(a,b){var c=a.context;if(c&&c.noIndent)return 0;for(c&&/^{\//.test(b)&&(c=c.prev);c&&!c.startOfLine;)c=c.prev;return c?c.indent+v:0},electricChars:"/"}})),a.defineMIME("text/tiki","tiki")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/twig/twig.js b/media/editors/codemirror/mode/twig/twig.js
index 1f2854bef21a2..b4e98972bcf67 100644
--- a/media/editors/codemirror/mode/twig/twig.js
+++ b/media/editors/codemirror/mode/twig/twig.js
@@ -95,7 +95,7 @@
         }
         return "variable";
       } else if (stream.eat("{")) {
-        if (ch = stream.eat("#")) {
+        if (stream.eat("#")) {
           state.incomment = true;
           if (!stream.skipTo("#}")) {
             stream.skipToEnd();
diff --git a/media/editors/codemirror/mode/twig/twig.min.js b/media/editors/codemirror/mode/twig/twig.min.js
index 9d5c76bbb51a8..27146cdebed1a 100644
--- a/media/editors/codemirror/mode/twig/twig.min.js
+++ b/media/editors/codemirror/mode/twig/twig.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/multiplex"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("twig:inner",(function(){function a(a,g){var h=a.peek();if(g.incomment)return a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(g.intag){if(g.operator){if(g.operator=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.sign){if(g.sign=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.instring)return h==g.instring&&(g.instring=!1),a.next(),"string";if("'"==h||'"'==h)return g.instring=h,a.next(),"string";if(a.match(g.intag+"}")||a.eat("-")&&a.match(g.intag+"}"))return g.intag=!1,"tag";if(a.match(c))return g.operator=!0,"operator";if(a.match(d))g.sign=!0;else if(a.eat(" ")||a.sol()){if(a.match(b))return"keyword";if(a.match(e))return"atom";if(a.match(f))return"number";a.sol()&&a.next()}else a.next();return"variable"}if(a.eat("{")){if(h=a.eat("#"))return g.incomment=!0,a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(h=a.eat(/\{|%/))return g.intag=h,"{"==h&&(g.intag="}"),a.eat("-"),"tag"}a.next()}var b=["and","as","autoescape","endautoescape","block","do","endblock","else","elseif","extends","for","endfor","embed","endembed","filter","endfilter","flush","from","if","endif","in","is","include","import","not","or","set","spaceless","endspaceless","with","endwith","trans","endtrans","blocktrans","endblocktrans","macro","endmacro","use","verbatim","endverbatim"],c=/^[+\-*&%=<>!?|~^]/,d=/^[:\[\(\{]/,e=["true","false","null","empty","defined","divisibleby","divisible by","even","odd","iterable","sameas","same as"],f=/^(\d[+\-\*\/])?\d+(\.\d+)?/;return b=new RegExp("(("+b.join(")|(")+"))\\b"),e=new RegExp("(("+e.join(")|(")+"))\\b"),{startState:function(){return{}},token:function(b,c){return a(b,c)}}})),a.defineMode("twig",(function(b,c){var d=a.getMode(b,"twig:inner");return c&&c.base?a.multiplexingMode(a.getMode(b,c.base),{open:/\{[{#%]/,close:/[}#%]\}/,mode:d,parseDelimiters:!0}):d})),a.defineMIME("text/x-twig","twig")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/multiplex"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("twig:inner",(function(){function a(a,g){var h=a.peek();if(g.incomment)return a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(g.intag){if(g.operator){if(g.operator=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.sign){if(g.sign=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.instring)return h==g.instring&&(g.instring=!1),a.next(),"string";if("'"==h||'"'==h)return g.instring=h,a.next(),"string";if(a.match(g.intag+"}")||a.eat("-")&&a.match(g.intag+"}"))return g.intag=!1,"tag";if(a.match(c))return g.operator=!0,"operator";if(a.match(d))g.sign=!0;else if(a.eat(" ")||a.sol()){if(a.match(b))return"keyword";if(a.match(e))return"atom";if(a.match(f))return"number";a.sol()&&a.next()}else a.next();return"variable"}if(a.eat("{")){if(a.eat("#"))return g.incomment=!0,a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(h=a.eat(/\{|%/))return g.intag=h,"{"==h&&(g.intag="}"),a.eat("-"),"tag"}a.next()}var b=["and","as","autoescape","endautoescape","block","do","endblock","else","elseif","extends","for","endfor","embed","endembed","filter","endfilter","flush","from","if","endif","in","is","include","import","not","or","set","spaceless","endspaceless","with","endwith","trans","endtrans","blocktrans","endblocktrans","macro","endmacro","use","verbatim","endverbatim"],c=/^[+\-*&%=<>!?|~^]/,d=/^[:\[\(\{]/,e=["true","false","null","empty","defined","divisibleby","divisible by","even","odd","iterable","sameas","same as"],f=/^(\d[+\-\*\/])?\d+(\.\d+)?/;return b=new RegExp("(("+b.join(")|(")+"))\\b"),e=new RegExp("(("+e.join(")|(")+"))\\b"),{startState:function(){return{}},token:function(b,c){return a(b,c)}}})),a.defineMode("twig",(function(b,c){var d=a.getMode(b,"twig:inner");return c&&c.base?a.multiplexingMode(a.getMode(b,c.base),{open:/\{[{#%]/,close:/[}#%]\}/,mode:d,parseDelimiters:!0}):d})),a.defineMIME("text/x-twig","twig")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/vb/vb.js b/media/editors/codemirror/mode/vb/vb.js
index d78f91f701c7b..735eb7f7e8142 100644
--- a/media/editors/codemirror/mode/vb/vb.js
+++ b/media/editors/codemirror/mode/vb/vb.js
@@ -202,7 +202,6 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
         // Handle '.' connected identifiers
         if (current === '.') {
             style = state.tokenize(stream, state);
-            current = stream.current();
             if (style === 'variable') {
                 return 'variable';
             } else {
diff --git a/media/editors/codemirror/mode/vb/vb.min.js b/media/editors/codemirror/mode/vb/vb.min.js
index 0055dfbb6e9e2..4104aef4106a2 100644
--- a/media/editors/codemirror/mode/vb/vb.min.js
+++ b/media/editors/codemirror/mode/vb/vb.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("vb",(function(b,c){function d(a){return new RegExp("^(("+a.join(")|(")+"))\\b","i")}function e(a,b){b.currentIndent++}function f(a,b){b.currentIndent--}function g(a,b){if(a.eatSpace())return null;var c=a.peek();if("'"===c)return a.skipToEnd(),"comment";if(a.match(/^((&H)|(&O))?[0-9\.a-f]/i,!1)){var d=!1;if(a.match(/^\d*\.\d+F?/i)?d=!0:a.match(/^\d+\.\d*F?/)?d=!0:a.match(/^\.\d+F?/)&&(d=!0),d)return a.eat(/J/i),"number";var g=!1;if(a.match(/^&H[0-9a-f]+/i)?g=!0:a.match(/^&O[0-7]+/i)?g=!0:a.match(/^[1-9]\d*F?/)?(a.eat(/J/i),g=!0):a.match(/^0(?![\dx])/i)&&(g=!0),g)return a.eat(/L/i),"number"}return a.match(z)?(b.tokenize=h(a.current()),b.tokenize(a,b)):a.match(o)||a.match(n)?null:a.match(m)||a.match(k)||a.match(u)?"operator":a.match(l)?null:a.match(E)?(e(a,b),b.doInCurrentLine=!0,"keyword"):a.match(A)?(b.doInCurrentLine?b.doInCurrentLine=!1:e(a,b),"keyword"):a.match(B)?"keyword":a.match(D)?(f(a,b),f(a,b),"keyword"):a.match(C)?(f(a,b),"keyword"):a.match(y)?"keyword":a.match(x)?"keyword":a.match(p)?"variable":(a.next(),j)}function h(a){var b=1==a.length,d="string";return function(e,f){for(;!e.eol();){if(e.eatWhile(/[^'"]/),e.match(a))return f.tokenize=g,d;e.eat(/['"]/)}if(b){if(c.singleLineStringErrors)return j;f.tokenize=g}return d}}function i(a,b){var c=b.tokenize(a,b),d=a.current();if("."===d)return c=b.tokenize(a,b),d=a.current(),"variable"===c?"variable":j;var g="[({".indexOf(d);return g!==-1&&e(a,b),"dedent"===F&&f(a,b)?j:(g="])}".indexOf(d),g!==-1&&f(a,b)?j:c)}var j="error",k=new RegExp("^[\\+\\-\\*/%&\\\\|\\^~<>!]"),l=new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]"),m=new RegExp("^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"),n=new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"),o=new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))"),p=new RegExp("^[_A-Za-z][_A-Za-z0-9]*"),q=["class","module","sub","enum","select","while","if","function","get","set","property","try"],r=["else","elseif","case","catch"],s=["next","loop"],t=["and","or","not","xor","in"],u=d(t),v=["as","dim","break","continue","optional","then","until","goto","byval","byref","new","handles","property","return","const","private","protected","friend","public","shared","static","true","false"],w=["integer","string","double","decimal","boolean","short","char","float","single"],x=d(v),y=d(w),z='"',A=d(q),B=d(r),C=d(s),D=d(["end"]),E=d(["do"]),F=null;a.registerHelper("hintWords","vb",q.concat(r).concat(s).concat(t).concat(v).concat(w));var G={electricChars:"dDpPtTfFeE ",startState:function(){return{tokenize:g,lastToken:null,currentIndent:0,nextLineIndent:0,doInCurrentLine:!1}},token:function(a,b){a.sol()&&(b.currentIndent+=b.nextLineIndent,b.nextLineIndent=0,b.doInCurrentLine=0);var c=i(a,b);return b.lastToken={style:c,content:a.current()},c},indent:function(a,c){var d=c.replace(/^\s+|\s+$/g,"");return d.match(C)||d.match(D)||d.match(B)?b.indentUnit*(a.currentIndent-1):a.currentIndent<0?0:a.currentIndent*b.indentUnit},lineComment:"'"};return G})),a.defineMIME("text/x-vb","vb")}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("vb",(function(b,c){function d(a){return new RegExp("^(("+a.join(")|(")+"))\\b","i")}function e(a,b){b.currentIndent++}function f(a,b){b.currentIndent--}function g(a,b){if(a.eatSpace())return null;var c=a.peek();if("'"===c)return a.skipToEnd(),"comment";if(a.match(/^((&H)|(&O))?[0-9\.a-f]/i,!1)){var d=!1;if(a.match(/^\d*\.\d+F?/i)?d=!0:a.match(/^\d+\.\d*F?/)?d=!0:a.match(/^\.\d+F?/)&&(d=!0),d)return a.eat(/J/i),"number";var g=!1;if(a.match(/^&H[0-9a-f]+/i)?g=!0:a.match(/^&O[0-7]+/i)?g=!0:a.match(/^[1-9]\d*F?/)?(a.eat(/J/i),g=!0):a.match(/^0(?![\dx])/i)&&(g=!0),g)return a.eat(/L/i),"number"}return a.match(z)?(b.tokenize=h(a.current()),b.tokenize(a,b)):a.match(o)||a.match(n)?null:a.match(m)||a.match(k)||a.match(u)?"operator":a.match(l)?null:a.match(E)?(e(a,b),b.doInCurrentLine=!0,"keyword"):a.match(A)?(b.doInCurrentLine?b.doInCurrentLine=!1:e(a,b),"keyword"):a.match(B)?"keyword":a.match(D)?(f(a,b),f(a,b),"keyword"):a.match(C)?(f(a,b),"keyword"):a.match(y)?"keyword":a.match(x)?"keyword":a.match(p)?"variable":(a.next(),j)}function h(a){var b=1==a.length,d="string";return function(e,f){for(;!e.eol();){if(e.eatWhile(/[^'"]/),e.match(a))return f.tokenize=g,d;e.eat(/['"]/)}if(b){if(c.singleLineStringErrors)return j;f.tokenize=g}return d}}function i(a,b){var c=b.tokenize(a,b),d=a.current();if("."===d)return c=b.tokenize(a,b),"variable"===c?"variable":j;var g="[({".indexOf(d);return g!==-1&&e(a,b),"dedent"===F&&f(a,b)?j:(g="])}".indexOf(d),g!==-1&&f(a,b)?j:c)}var j="error",k=new RegExp("^[\\+\\-\\*/%&\\\\|\\^~<>!]"),l=new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]"),m=new RegExp("^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"),n=new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"),o=new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))"),p=new RegExp("^[_A-Za-z][_A-Za-z0-9]*"),q=["class","module","sub","enum","select","while","if","function","get","set","property","try"],r=["else","elseif","case","catch"],s=["next","loop"],t=["and","or","not","xor","in"],u=d(t),v=["as","dim","break","continue","optional","then","until","goto","byval","byref","new","handles","property","return","const","private","protected","friend","public","shared","static","true","false"],w=["integer","string","double","decimal","boolean","short","char","float","single"],x=d(v),y=d(w),z='"',A=d(q),B=d(r),C=d(s),D=d(["end"]),E=d(["do"]),F=null;a.registerHelper("hintWords","vb",q.concat(r).concat(s).concat(t).concat(v).concat(w));var G={electricChars:"dDpPtTfFeE ",startState:function(){return{tokenize:g,lastToken:null,currentIndent:0,nextLineIndent:0,doInCurrentLine:!1}},token:function(a,b){a.sol()&&(b.currentIndent+=b.nextLineIndent,b.nextLineIndent=0,b.doInCurrentLine=0);var c=i(a,b);return b.lastToken={style:c,content:a.current()},c},indent:function(a,c){var d=c.replace(/^\s+|\s+$/g,"");return d.match(C)||d.match(D)||d.match(B)?b.indentUnit*(a.currentIndent-1):a.currentIndent<0?0:a.currentIndent*b.indentUnit},lineComment:"'"};return G})),a.defineMIME("text/x-vb","vb")}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/verilog/verilog.js b/media/editors/codemirror/mode/verilog/verilog.js
index 460cdb3b1c36a..3404686097f1f 100644
--- a/media/editors/codemirror/mode/verilog/verilog.js
+++ b/media/editors/codemirror/mode/verilog/verilog.js
@@ -81,7 +81,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
   // E.g. "task" => "endtask"
   var blockKeywords = words(
-    "case checker class clocking config function generate interface module package" +
+    "case checker class clocking config function generate interface module package " +
     "primitive program property specify sequence table task"
   );
 
@@ -602,7 +602,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
             var prefix = match[1];
             var mnemonic = match[2];
             if (// is identifier prefix
-                (prefix in tlvIdentifierStyle) &&
+                tlvIdentifierStyle.hasOwnProperty(prefix) &&
                 // has mnemonic or we're at the end of the line (maybe it hasn't been typed yet)
                 (mnemonic.length > 0 || stream.eol())) {
               style = tlvIdentifierStyle[prefix];
diff --git a/media/editors/codemirror/mode/verilog/verilog.min.js b/media/editors/codemirror/mode/verilog/verilog.min.js
index 912976eb5eb2c..35367f675c3af 100644
--- a/media/editors/codemirror/mode/verilog/verilog.min.js
+++ b/media/editors/codemirror/mode/verilog/verilog.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=b/f;return"tlv-"+a.tlvIndentationStyle[d]+"-"+c}function c(a){var b;return(b=a.match(h,!1))&&b[2].length>0}a.defineMode("verilog",(function(b,c){function d(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function e(a,b){var c,d=a.peek();if(t[d]&&0!=(c=t[d](a,b)))return c;if(t.tokenBase&&0!=(c=t.tokenBase(a,b)))return c;if(/[,;:\.]/.test(d))return m=a.next(),null;if(w.test(d))return m=a.next(),"bracket";if("`"==d)return a.next(),a.eatWhile(/[\w\$_]/)?"def":null;if("$"==d)return a.next(),a.eatWhile(/[\w\$_]/)?"meta":null;if("#"==d)return a.next(),a.eatWhile(/[\d_.]/),"def";if('"'==d)return a.next(),b.tokenize=f(d),b.tokenize(a,b);if("/"==d){if(a.next(),a.eat("*"))return b.tokenize=g,g(a,b);if(a.eat("/"))return a.skipToEnd(),"comment";a.backUp(1)}if(a.match(C)||a.match(y)||a.match(z)||a.match(A)||a.match(B)||a.match(x)||a.match(C))return"number";if(a.eatWhile(v))return"meta";if(a.eatWhile(/[\w\$_]/)){var e=a.current();return u[e]?(G[e]&&(m="newblock"),J[e]&&(m="newstatement"),n=e,"keyword"):"variable"}return a.next(),null}function f(a){return function(b,c){for(var d,f=!1,g=!1;null!=(d=b.next());){if(d==a&&!f){g=!0;break}f=!f&&"\\"==d}return(g||!f&&!s)&&(c.tokenize=e),"string"}}function g(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=e;break}d="*"==c}return"comment"}function h(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function i(a,b,c){var d=a.indented,e=new h(d,b,c,null,a.context);return a.context=e}function j(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}function k(a,b){if(a==b)return!0;var c=b.split(";");for(var d in c)if(a==c[d])return!0;return!1}function l(){var a=[];for(var b in G)if(G[b]){var c=G[b].split(";");for(var d in c)a.push(c[d])}var e=new RegExp("[{}()\\[\\]]|("+a.join("|")+")$");return e}var m,n,o=b.indentUnit,p=c.statementIndentUnit||o,q=c.dontAlignCalls,r=c.noIndentKeywords||[],s=c.multiLineStrings,t=c.hooks||{},u=d("accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor"),v=/[\+\-\*\/!~&|^%=?:]/,w=/[\[\]{}()]/,x=/\d[0-9_]*/,y=/\d*\s*'s?d\s*\d[0-9_]*/i,z=/\d*\s*'s?b\s*[xz01][xz01_]*/i,A=/\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i,B=/\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i,C=/(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i,D=/^((\w+)|[)}\]])/,E=/[)}\]]/,F=d("case checker class clocking config function generate interface module packageprimitive program property specify sequence table task"),G={};for(var H in F)G[H]="end"+H;G.begin="end",G.casex="endcase",G.casez="endcase",G.do="while",G.fork="join;join_any;join_none",G.covergroup="endgroup";for(var I in r){var H=r[I];G[H]&&(G[H]=void 0)}var J=d("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");return{electricInput:l(),startState:function(a){var b={tokenize:null,context:new h((a||0)-o,0,"top",!1),indented:0,startOfLine:!0};return t.startState&&t.startState(b),b},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0),t.token){var d=t.token(a,b);if(void 0!==d)return d}if(a.eatSpace())return null;m=null,n=null;var d=(b.tokenize||e)(a,b);if("comment"==d||"meta"==d||"variable"==d)return d;if(null==c.align&&(c.align=!0),m==c.type)j(b);else if(";"==m&&"statement"==c.type||c.type&&k(n,c.type))for(c=j(b);c&&"statement"==c.type;)c=j(b);else if("{"==m)i(b,a.column(),"}");else if("["==m)i(b,a.column(),"]");else if("("==m)i(b,a.column(),")");else if(c&&"endcase"==c.type&&":"==m)i(b,a.column(),"statement");else if("newstatement"==m)i(b,a.column(),"statement");else if("newblock"==m)if("function"!=n||!c||"statement"!=c.type&&"endgroup"!=c.type)if("task"==n&&c&&"statement"==c.type);else{var f=G[n];i(b,a.column(),f)}else;return b.startOfLine=!1,d},indent:function(b,c){if(b.tokenize!=e&&null!=b.tokenize)return a.Pass;if(t.indent){var d=t.indent(b);if(d>=0)return d}var f=b.context,g=c&&c.charAt(0);"statement"==f.type&&"}"==g&&(f=f.prev);var h=!1,i=c.match(D);return i&&(h=k(i[0],f.type)),"statement"==f.type?f.indented+("{"==g?0:p):E.test(f.type)&&f.align&&!q?f.column+(h?0:1):")"!=f.type||h?f.indented+(h?0:o):f.indented+p},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-verilog",{name:"verilog"}),a.defineMIME("text/x-systemverilog",{name:"verilog"});var d={"|":"link",">":"property",$:"variable",$$:"variable","?$":"qualifier","?*":"qualifier","-":"hr","/":"property","/-":"property","@":"variable-3","@-":"variable-3","@++":"variable-3","@+=":"variable-3","@+=-":"variable-3","@--":"variable-3","@-=":"variable-3","%+":"tag","%-":"tag","%":"tag",">>":"tag","<<":"tag","<>":"tag","#":"tag","^":"attribute","^^":"attribute","^!":"attribute","*":"variable-2","**":"variable-2","\\":"keyword",'"':"comment"},e={"/":"beh-hier",">":"beh-hier","-":"phys-hier","|":"pipe","?":"when","@":"stage","\\":"keyword"},f=3,g=!1,h=/^([~!@#\$%\^&\*-\+=\?\/\\\|'"<>]+)([\d\w_]*)/,i=/^[! ]  /,j=/^[! ] */,k=/^\/[\/\*]/;a.defineMIME("text/x-tlv",{name:"verilog",hooks:{electricInput:!1,token:function(a,l){var m,n=void 0;if(a.sol()&&!l.tlvInBlockComment){"\\"==a.peek()&&(n="def",a.skipToEnd(),a.string.match(/\\SV/)?l.tlvCodeActive=!1:a.string.match(/\\TLV/)&&(l.tlvCodeActive=!0)),l.tlvCodeActive&&0==a.pos&&0==l.indented&&(m=a.match(j,!1))&&(l.indented=m[0].length);var o=l.indented,p=o/f;if(p<=l.tlvIndentationStyle.length){var q=a.string.length==o,r=p*f;if(r<a.string.length){var s=a.string.slice(r),t=s[0];e[t]&&(m=s.match(h))&&d[m[1]]&&(o+=f,"\\"==t&&r>0||(l.tlvIndentationStyle[p]=e[t],g&&(l.statementComment=!1),p++))}if(!q)for(;l.tlvIndentationStyle.length>p;)l.tlvIndentationStyle.pop()}l.tlvNextIndent=o}if(l.tlvCodeActive){var u=!1;g&&(u=" "!=a.peek()&&void 0===n&&!l.tlvInBlockComment&&a.column()==l.tlvIndentationStyle.length*f,u&&(l.statementComment&&(u=!1),l.statementComment=a.match(k,!1)));var m;if(void 0!==n)n+=" "+b(l,0,"scope-ident");else if(a.pos/f<l.tlvIndentationStyle.length&&(m=a.match(a.sol()?i:/^   /)))n="tlv-indent-"+(a.pos%2==0?"even":"odd")+" "+b(l,a.pos-f,"indent"),"!"==m[0].charAt(0)&&(n+=" tlv-alert-line-prefix"),c(a)&&(n+=" "+b(l,a.pos,"before-scope-ident"));else if(l.tlvInBlockComment)a.match(/^.*?\*\//)?(l.tlvInBlockComment=!1,g&&!a.eol()&&(l.statementComment=!1)):a.skipToEnd(),n="comment";else if((m=a.match(k))&&!l.tlvInBlockComment)"//"==m[0]?a.skipToEnd():l.tlvInBlockComment=!0,n="comment";else if(m=a.match(h)){var v=m[1],w=m[2];v in d&&(w.length>0||a.eol())?(n=d[v],a.column()==l.indented&&(n+=" "+b(l,a.column(),"scope-ident"))):(a.backUp(a.current().length-1),n="tlv-default")}else a.match(/^\t+/)?n="tlv-tab":a.match(/^[\[\]{}\(\);\:]+/)?n="meta":(m=a.match(/^[mM]4([\+_])?[\w\d_]*/))?n="+"==m[1]?"tlv-m4-plus":"tlv-m4":a.match(/^ +/)?n=a.eol()?"error":"tlv-default":a.match(/^[\w\d_]+/)?n="number":(a.next(),n="tlv-default");u&&(n+=" tlv-statement")}else a.match(/^[mM]4([\w\d_]*)/)&&(n="tlv-m4");return n},indent:function(a){return 1==a.tlvCodeActive?a.tlvNextIndent:-1},startState:function(a){a.tlvIndentationStyle=[],a.tlvCodeActive=!0,a.tlvNextIndent=-1,a.tlvInBlockComment=!1,g&&(a.statementComment=!1)}}})}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=b/f;return"tlv-"+a.tlvIndentationStyle[d]+"-"+c}function c(a){var b;return(b=a.match(h,!1))&&b[2].length>0}a.defineMode("verilog",(function(b,c){function d(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function e(a,b){var c,d=a.peek();if(t[d]&&0!=(c=t[d](a,b)))return c;if(t.tokenBase&&0!=(c=t.tokenBase(a,b)))return c;if(/[,;:\.]/.test(d))return m=a.next(),null;if(w.test(d))return m=a.next(),"bracket";if("`"==d)return a.next(),a.eatWhile(/[\w\$_]/)?"def":null;if("$"==d)return a.next(),a.eatWhile(/[\w\$_]/)?"meta":null;if("#"==d)return a.next(),a.eatWhile(/[\d_.]/),"def";if('"'==d)return a.next(),b.tokenize=f(d),b.tokenize(a,b);if("/"==d){if(a.next(),a.eat("*"))return b.tokenize=g,g(a,b);if(a.eat("/"))return a.skipToEnd(),"comment";a.backUp(1)}if(a.match(C)||a.match(y)||a.match(z)||a.match(A)||a.match(B)||a.match(x)||a.match(C))return"number";if(a.eatWhile(v))return"meta";if(a.eatWhile(/[\w\$_]/)){var e=a.current();return u[e]?(G[e]&&(m="newblock"),J[e]&&(m="newstatement"),n=e,"keyword"):"variable"}return a.next(),null}function f(a){return function(b,c){for(var d,f=!1,g=!1;null!=(d=b.next());){if(d==a&&!f){g=!0;break}f=!f&&"\\"==d}return(g||!f&&!s)&&(c.tokenize=e),"string"}}function g(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=e;break}d="*"==c}return"comment"}function h(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function i(a,b,c){var d=a.indented,e=new h(d,b,c,null,a.context);return a.context=e}function j(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}function k(a,b){if(a==b)return!0;var c=b.split(";");for(var d in c)if(a==c[d])return!0;return!1}function l(){var a=[];for(var b in G)if(G[b]){var c=G[b].split(";");for(var d in c)a.push(c[d])}var e=new RegExp("[{}()\\[\\]]|("+a.join("|")+")$");return e}var m,n,o=b.indentUnit,p=c.statementIndentUnit||o,q=c.dontAlignCalls,r=c.noIndentKeywords||[],s=c.multiLineStrings,t=c.hooks||{},u=d("accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor"),v=/[\+\-\*\/!~&|^%=?:]/,w=/[\[\]{}()]/,x=/\d[0-9_]*/,y=/\d*\s*'s?d\s*\d[0-9_]*/i,z=/\d*\s*'s?b\s*[xz01][xz01_]*/i,A=/\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i,B=/\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i,C=/(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i,D=/^((\w+)|[)}\]])/,E=/[)}\]]/,F=d("case checker class clocking config function generate interface module package primitive program property specify sequence table task"),G={};for(var H in F)G[H]="end"+H;G.begin="end",G.casex="endcase",G.casez="endcase",G.do="while",G.fork="join;join_any;join_none",G.covergroup="endgroup";for(var I in r){var H=r[I];G[H]&&(G[H]=void 0)}var J=d("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");return{electricInput:l(),startState:function(a){var b={tokenize:null,context:new h((a||0)-o,0,"top",!1),indented:0,startOfLine:!0};return t.startState&&t.startState(b),b},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0),t.token){var d=t.token(a,b);if(void 0!==d)return d}if(a.eatSpace())return null;m=null,n=null;var d=(b.tokenize||e)(a,b);if("comment"==d||"meta"==d||"variable"==d)return d;if(null==c.align&&(c.align=!0),m==c.type)j(b);else if(";"==m&&"statement"==c.type||c.type&&k(n,c.type))for(c=j(b);c&&"statement"==c.type;)c=j(b);else if("{"==m)i(b,a.column(),"}");else if("["==m)i(b,a.column(),"]");else if("("==m)i(b,a.column(),")");else if(c&&"endcase"==c.type&&":"==m)i(b,a.column(),"statement");else if("newstatement"==m)i(b,a.column(),"statement");else if("newblock"==m)if("function"!=n||!c||"statement"!=c.type&&"endgroup"!=c.type)if("task"==n&&c&&"statement"==c.type);else{var f=G[n];i(b,a.column(),f)}else;return b.startOfLine=!1,d},indent:function(b,c){if(b.tokenize!=e&&null!=b.tokenize)return a.Pass;if(t.indent){var d=t.indent(b);if(d>=0)return d}var f=b.context,g=c&&c.charAt(0);"statement"==f.type&&"}"==g&&(f=f.prev);var h=!1,i=c.match(D);return i&&(h=k(i[0],f.type)),"statement"==f.type?f.indented+("{"==g?0:p):E.test(f.type)&&f.align&&!q?f.column+(h?0:1):")"!=f.type||h?f.indented+(h?0:o):f.indented+p},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-verilog",{name:"verilog"}),a.defineMIME("text/x-systemverilog",{name:"verilog"});var d={"|":"link",">":"property",$:"variable",$$:"variable","?$":"qualifier","?*":"qualifier","-":"hr","/":"property","/-":"property","@":"variable-3","@-":"variable-3","@++":"variable-3","@+=":"variable-3","@+=-":"variable-3","@--":"variable-3","@-=":"variable-3","%+":"tag","%-":"tag","%":"tag",">>":"tag","<<":"tag","<>":"tag","#":"tag","^":"attribute","^^":"attribute","^!":"attribute","*":"variable-2","**":"variable-2","\\":"keyword",'"':"comment"},e={"/":"beh-hier",">":"beh-hier","-":"phys-hier","|":"pipe","?":"when","@":"stage","\\":"keyword"},f=3,g=!1,h=/^([~!@#\$%\^&\*-\+=\?\/\\\|'"<>]+)([\d\w_]*)/,i=/^[! ]  /,j=/^[! ] */,k=/^\/[\/\*]/;a.defineMIME("text/x-tlv",{name:"verilog",hooks:{electricInput:!1,token:function(a,l){var m,n=void 0;if(a.sol()&&!l.tlvInBlockComment){"\\"==a.peek()&&(n="def",a.skipToEnd(),a.string.match(/\\SV/)?l.tlvCodeActive=!1:a.string.match(/\\TLV/)&&(l.tlvCodeActive=!0)),l.tlvCodeActive&&0==a.pos&&0==l.indented&&(m=a.match(j,!1))&&(l.indented=m[0].length);var o=l.indented,p=o/f;if(p<=l.tlvIndentationStyle.length){var q=a.string.length==o,r=p*f;if(r<a.string.length){var s=a.string.slice(r),t=s[0];e[t]&&(m=s.match(h))&&d[m[1]]&&(o+=f,"\\"==t&&r>0||(l.tlvIndentationStyle[p]=e[t],g&&(l.statementComment=!1),p++))}if(!q)for(;l.tlvIndentationStyle.length>p;)l.tlvIndentationStyle.pop()}l.tlvNextIndent=o}if(l.tlvCodeActive){var u=!1;g&&(u=" "!=a.peek()&&void 0===n&&!l.tlvInBlockComment&&a.column()==l.tlvIndentationStyle.length*f,u&&(l.statementComment&&(u=!1),l.statementComment=a.match(k,!1)));var m;if(void 0!==n)n+=" "+b(l,0,"scope-ident");else if(a.pos/f<l.tlvIndentationStyle.length&&(m=a.match(a.sol()?i:/^   /)))n="tlv-indent-"+(a.pos%2==0?"even":"odd")+" "+b(l,a.pos-f,"indent"),"!"==m[0].charAt(0)&&(n+=" tlv-alert-line-prefix"),c(a)&&(n+=" "+b(l,a.pos,"before-scope-ident"));else if(l.tlvInBlockComment)a.match(/^.*?\*\//)?(l.tlvInBlockComment=!1,g&&!a.eol()&&(l.statementComment=!1)):a.skipToEnd(),n="comment";else if((m=a.match(k))&&!l.tlvInBlockComment)"//"==m[0]?a.skipToEnd():l.tlvInBlockComment=!0,n="comment";else if(m=a.match(h)){var v=m[1],w=m[2];d.hasOwnProperty(v)&&(w.length>0||a.eol())?(n=d[v],a.column()==l.indented&&(n+=" "+b(l,a.column(),"scope-ident"))):(a.backUp(a.current().length-1),n="tlv-default")}else a.match(/^\t+/)?n="tlv-tab":a.match(/^[\[\]{}\(\);\:]+/)?n="meta":(m=a.match(/^[mM]4([\+_])?[\w\d_]*/))?n="+"==m[1]?"tlv-m4-plus":"tlv-m4":a.match(/^ +/)?n=a.eol()?"error":"tlv-default":a.match(/^[\w\d_]+/)?n="number":(a.next(),n="tlv-default");u&&(n+=" tlv-statement")}else a.match(/^[mM]4([\w\d_]*)/)&&(n="tlv-m4");return n},indent:function(a){return 1==a.tlvCodeActive?a.tlvNextIndent:-1},startState:function(a){a.tlvIndentationStyle=[],a.tlvCodeActive=!0,a.tlvNextIndent=-1,a.tlvInBlockComment=!1,g&&(a.statementComment=!1)}}})}));
\ No newline at end of file
diff --git a/media/editors/codemirror/mode/yacas/yacas.js b/media/editors/codemirror/mode/yacas/yacas.js
index 30bd60b2ffadf..34c84fbd08b93 100644
--- a/media/editors/codemirror/mode/yacas/yacas.js
+++ b/media/editors/codemirror/mode/yacas/yacas.js
@@ -125,7 +125,7 @@ CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
     }
 
     // operators; note that operators like @@ or /; are matched separately for each symbol.
-    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/, true, false)) {
+    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%|#)/, true, false)) {
       return 'operator';
     }
 
diff --git a/media/editors/codemirror/mode/yacas/yacas.min.js b/media/editors/codemirror/mode/yacas/yacas.min.js
index a2297f65b7427..3cc2f7245f204 100644
--- a/media/editors/codemirror/mode/yacas/yacas.min.js
+++ b/media/editors/codemirror/mode/yacas/yacas.min.js
@@ -1 +1 @@
-!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("yacas",(function(b,c){function d(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function e(a,b){var c;if(c=a.next(),'"'===c)return b.tokenize=f,b.tokenize(a,b);if("/"===c){if(a.eat("*"))return b.tokenize=g,b.tokenize(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}a.backUp(1);var d=a.match(/^(\w+)\s*\(/,!1);null!==d&&i.hasOwnProperty(d[1])&&b.scopes.push("bodied");var e=h(b);if("bodied"===e&&"["===c&&b.scopes.pop(),"["!==c&&"{"!==c&&"("!==c||b.scopes.push(c),e=h(b),("["===e&&"]"===c||"{"===e&&"}"===c||"("===e&&")"===c)&&b.scopes.pop(),";"===c)for(;"bodied"===e;)b.scopes.pop(),e=h(b);return a.match(/\d+ *#/,!0,!1)?"qualifier":a.match(l,!0,!1)?"number":a.match(n,!0,!1)?"variable-3":a.match(/(?:\[|\]|{|}|\(|\))/,!0,!1)?"bracket":a.match(o,!0,!1)?(a.backUp(1),"variable"):a.match(m,!0,!1)?"variable-2":a.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/,!0,!1)?"operator":"error"}function f(a,b){for(var c,d=!1,f=!1;null!=(c=a.next());){if('"'===c&&!f){d=!0;break}f=!f&&"\\"===c}return d&&!f&&(b.tokenize=e),"string"}function g(a,b){for(var c,d;null!=(d=a.next());){if("*"===c&&"/"===d){b.tokenize=e;break}c=d}return"comment"}function h(a){var b=null;return a.scopes.length>0&&(b=a.scopes[a.scopes.length-1]),b}var i=d("Assert BackQuote D Defun Deriv For ForEach FromFile FromString Function Integrate InverseTaylor Limit LocalSymbols Macro MacroRule MacroRulePattern NIntegrate Rule RulePattern Subst TD TExplicitSum TSum Taylor Taylor1 Taylor2 Taylor3 ToFile ToStdout ToString TraceRule Until While"),j="(?:(?:\\.\\d+|\\d+\\.\\d*|\\d+)(?:[eE][+-]?\\d+)?)",k="(?:[a-zA-Z\\$'][a-zA-Z0-9\\$']*)",l=new RegExp(j),m=new RegExp(k),n=new RegExp(k+"?_"+k),o=new RegExp(k+"\\s*\\(");return{startState:function(){return{tokenize:e,scopes:[]}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)},indent:function(c,d){if(c.tokenize!==e&&null!==c.tokenize)return a.Pass;var f=0;return"]"!==d&&"];"!==d&&"}"!==d&&"};"!==d&&");"!==d||(f=-1),(c.scopes.length+f)*b.indentUnit},electricChars:"{}[]();",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-yacas",{name:"yacas"})}));
\ No newline at end of file
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("yacas",(function(b,c){function d(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function e(a,b){var c;if(c=a.next(),'"'===c)return b.tokenize=f,b.tokenize(a,b);if("/"===c){if(a.eat("*"))return b.tokenize=g,b.tokenize(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}a.backUp(1);var d=a.match(/^(\w+)\s*\(/,!1);null!==d&&i.hasOwnProperty(d[1])&&b.scopes.push("bodied");var e=h(b);if("bodied"===e&&"["===c&&b.scopes.pop(),"["!==c&&"{"!==c&&"("!==c||b.scopes.push(c),e=h(b),("["===e&&"]"===c||"{"===e&&"}"===c||"("===e&&")"===c)&&b.scopes.pop(),";"===c)for(;"bodied"===e;)b.scopes.pop(),e=h(b);return a.match(/\d+ *#/,!0,!1)?"qualifier":a.match(l,!0,!1)?"number":a.match(n,!0,!1)?"variable-3":a.match(/(?:\[|\]|{|}|\(|\))/,!0,!1)?"bracket":a.match(o,!0,!1)?(a.backUp(1),"variable"):a.match(m,!0,!1)?"variable-2":a.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%|#)/,!0,!1)?"operator":"error"}function f(a,b){for(var c,d=!1,f=!1;null!=(c=a.next());){if('"'===c&&!f){d=!0;break}f=!f&&"\\"===c}return d&&!f&&(b.tokenize=e),"string"}function g(a,b){for(var c,d;null!=(d=a.next());){if("*"===c&&"/"===d){b.tokenize=e;break}c=d}return"comment"}function h(a){var b=null;return a.scopes.length>0&&(b=a.scopes[a.scopes.length-1]),b}var i=d("Assert BackQuote D Defun Deriv For ForEach FromFile FromString Function Integrate InverseTaylor Limit LocalSymbols Macro MacroRule MacroRulePattern NIntegrate Rule RulePattern Subst TD TExplicitSum TSum Taylor Taylor1 Taylor2 Taylor3 ToFile ToStdout ToString TraceRule Until While"),j="(?:(?:\\.\\d+|\\d+\\.\\d*|\\d+)(?:[eE][+-]?\\d+)?)",k="(?:[a-zA-Z\\$'][a-zA-Z0-9\\$']*)",l=new RegExp(j),m=new RegExp(k),n=new RegExp(k+"?_"+k),o=new RegExp(k+"\\s*\\(");return{startState:function(){return{tokenize:e,scopes:[]}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)},indent:function(c,d){if(c.tokenize!==e&&null!==c.tokenize)return a.Pass;var f=0;return"]"!==d&&"];"!==d&&"}"!==d&&"};"!==d&&");"!==d||(f=-1),(c.scopes.length+f)*b.indentUnit},electricChars:"{}[]();",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-yacas",{name:"yacas"})}));
\ No newline at end of file
diff --git a/media/editors/codemirror/theme/abcdef.css b/media/editors/codemirror/theme/abcdef.css
index 7f9d788704efb..cf93530946b49 100644
--- a/media/editors/codemirror/theme/abcdef.css
+++ b/media/editors/codemirror/theme/abcdef.css
@@ -14,7 +14,7 @@
 .cm-s-abcdef span.cm-def { color: #fffabc; }
 .cm-s-abcdef span.cm-variable { color: #abcdef; }
 .cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3 { color: #def; }
+.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
 .cm-s-abcdef span.cm-property { color: #fedcba; }
 .cm-s-abcdef span.cm-operator { color: #ff0; }
 .cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
diff --git a/media/editors/codemirror/theme/ambiance.css b/media/editors/codemirror/theme/ambiance.css
index bce3446494552..782fca43f5275 100644
--- a/media/editors/codemirror/theme/ambiance.css
+++ b/media/editors/codemirror/theme/ambiance.css
@@ -11,7 +11,7 @@
 .cm-s-ambiance .cm-def { color: #aac6e3; }
 .cm-s-ambiance .cm-variable { color: #ffb795; }
 .cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3 { color: #faded3; }
+.cm-s-ambiance .cm-variable-3, .cm-s-ambiance .cm-type { color: #faded3; }
 .cm-s-ambiance .cm-property { color: #eed1b3; }
 .cm-s-ambiance .cm-operator { color: #fa8d6a; }
 .cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
diff --git a/media/editors/codemirror/theme/cobalt.css b/media/editors/codemirror/theme/cobalt.css
index d88223ed8007a..bbbda3b54382a 100644
--- a/media/editors/codemirror/theme/cobalt.css
+++ b/media/editors/codemirror/theme/cobalt.css
@@ -15,7 +15,7 @@
 .cm-s-cobalt span.cm-string { color: #3ad900; }
 .cm-s-cobalt span.cm-meta { color: #ff9d00; }
 .cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def, .cm-s-cobalt .cm-type { color: white; }
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
 .cm-s-cobalt span.cm-link { color: #845dc4; }
diff --git a/media/editors/codemirror/theme/colorforth.css b/media/editors/codemirror/theme/colorforth.css
index 606899f309726..19095e41d98cc 100644
--- a/media/editors/codemirror/theme/colorforth.css
+++ b/media/editors/codemirror/theme/colorforth.css
@@ -15,7 +15,7 @@
 .cm-s-colorforth span.cm-atom        { color: #606060; }
 
 .cm-s-colorforth span.cm-variable-2  { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
+.cm-s-colorforth span.cm-variable-3, .cm-s-colorforth span.cm-type { color: #DDD; }
 .cm-s-colorforth span.cm-property    {}
 .cm-s-colorforth span.cm-operator    {}
 
diff --git a/media/editors/codemirror/theme/dracula.css b/media/editors/codemirror/theme/dracula.css
index 53a660b5219b9..253133efe7929 100644
--- a/media/editors/codemirror/theme/dracula.css
+++ b/media/editors/codemirror/theme/dracula.css
@@ -34,7 +34,7 @@
 .cm-s-dracula span.cm-qualifier { color: #50fa7b; }
 .cm-s-dracula span.cm-property { color: #66d9ef; }
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #ffb86c; }
+.cm-s-dracula span.cm-variable-3, .cm-s-dracula span.cm-type { color: #ffb86c; }
 
 .cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
 .cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/media/editors/codemirror/theme/duotone-dark.css b/media/editors/codemirror/theme/duotone-dark.css
index b09a585c97867..88fdc76c8ea8e 100644
--- a/media/editors/codemirror/theme/duotone-dark.css
+++ b/media/editors/codemirror/theme/duotone-dark.css
@@ -24,7 +24,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 .cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
 .cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
 
-.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
+.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
 .cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
 .cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
 
diff --git a/media/editors/codemirror/theme/duotone-light.css b/media/editors/codemirror/theme/duotone-light.css
index 80203d15d9a6f..d99480f7c429e 100644
--- a/media/editors/codemirror/theme/duotone-light.css
+++ b/media/editors/codemirror/theme/duotone-light.css
@@ -23,7 +23,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 .cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
 .cm-s-duotone-light span.cm-positive { color: #896724; }
 
-.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
+.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
 .cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
 .cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
 
diff --git a/media/editors/codemirror/theme/eclipse.css b/media/editors/codemirror/theme/eclipse.css
index 1bde460e90c73..800d603f6d4fc 100644
--- a/media/editors/codemirror/theme/eclipse.css
+++ b/media/editors/codemirror/theme/eclipse.css
@@ -5,7 +5,7 @@
 .cm-s-eclipse span.cm-def { color: #00f; }
 .cm-s-eclipse span.cm-variable { color: black; }
 .cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3, .cm-s-eclipse span.cm-type { color: #0000C0; }
 .cm-s-eclipse span.cm-property { color: black; }
 .cm-s-eclipse span.cm-operator { color: black; }
 .cm-s-eclipse span.cm-comment { color: #3F7F5F; }
diff --git a/media/editors/codemirror/theme/erlang-dark.css b/media/editors/codemirror/theme/erlang-dark.css
index 65fe4814c15d5..8c8a4171a6079 100644
--- a/media/editors/codemirror/theme/erlang-dark.css
+++ b/media/editors/codemirror/theme/erlang-dark.css
@@ -27,7 +27,7 @@
 .cm-s-erlang-dark span.cm-tag        { color: #9effff; }
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
+.cm-s-erlang-dark span.cm-variable-3, .cm-s-erlang-dark span.cm-type { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
 .cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
diff --git a/media/editors/codemirror/theme/icecoder.css b/media/editors/codemirror/theme/icecoder.css
index ffebaf2f0b951..5440fbe27c85c 100644
--- a/media/editors/codemirror/theme/icecoder.css
+++ b/media/editors/codemirror/theme/icecoder.css
@@ -11,7 +11,7 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 
 .cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
 .cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
+.cm-s-icecoder span.cm-variable-3, .cm-s-icecoder span.cm-type { color: #f9602c; } /* orange */
 
 .cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
 .cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
diff --git a/media/editors/codemirror/theme/lesser-dark.css b/media/editors/codemirror/theme/lesser-dark.css
index 690c183d7b445..b2ec418fdbc4c 100644
--- a/media/editors/codemirror/theme/lesser-dark.css
+++ b/media/editors/codemirror/theme/lesser-dark.css
@@ -27,7 +27,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-def { color: white; }
 .cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
 .cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
+.cm-s-lesser-dark span.cm-variable-3, .cm-s-lesser-dark span.cm-type { color: white; }
 .cm-s-lesser-dark span.cm-property { color: #92A75C; }
 .cm-s-lesser-dark span.cm-operator { color: #92A75C; }
 .cm-s-lesser-dark span.cm-comment { color: #666; }
diff --git a/media/editors/codemirror/theme/liquibyte.css b/media/editors/codemirror/theme/liquibyte.css
index 9db8bde739e16..393825e0296a3 100644
--- a/media/editors/codemirror/theme/liquibyte.css
+++ b/media/editors/codemirror/theme/liquibyte.css
@@ -36,7 +36,7 @@
 .cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
 
 .cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3, .cm-s-liquibyte span.cm-type { color: #c080ff; font-weight: bold; }
 .cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
 .cm-s-liquibyte span.cm-operator    { color: #fff; }
 
@@ -59,10 +59,10 @@
 .CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
 /* Scrollbars */
 /* Simple */
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div:hover {
 	background-color: rgba(80, 80, 80, .7);
 }
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
 	background-color: rgba(80, 80, 80, .3);
 	border: 1px solid #404040;
 	border-radius: 5px;
diff --git a/media/editors/codemirror/theme/material.css b/media/editors/codemirror/theme/material.css
index 01d867932a137..84962a244b71f 100644
--- a/media/editors/codemirror/theme/material.css
+++ b/media/editors/codemirror/theme/material.css
@@ -27,7 +27,7 @@
 .cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
 .cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
 .cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3 { color: #82B1FF; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; }
 .cm-s-material .cm-builtin { color: #DECB6B; }
 .cm-s-material .cm-atom { color: #F77669; }
 .cm-s-material .cm-number { color: #F77669; }
@@ -41,7 +41,7 @@
 .cm-s-material .cm-attribute { color: #FFCB6B; }
 .cm-s-material .cm-property { color: #80CBAE; }
 .cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3 { color: #DECB6B; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; }
 .cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
 .cm-s-material .cm-error {
   color: rgba(255, 255, 255, 1.0);
diff --git a/media/editors/codemirror/theme/mdn-like.css b/media/editors/codemirror/theme/mdn-like.css
index f325d45005a99..622ed3efb74f1 100644
--- a/media/editors/codemirror/theme/mdn-like.css
+++ b/media/editors/codemirror/theme/mdn-like.css
@@ -21,7 +21,7 @@
 .cm-s-mdn-like .cm-number { color:  #ca7841; }
 .cm-s-mdn-like .cm-def { color: #8DA6CE; }
 .cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type { color: #07a; }
 
 .cm-s-mdn-like .cm-variable { color: #07a; }
 .cm-s-mdn-like .cm-property { color: #905; }
diff --git a/media/editors/codemirror/theme/midnight.css b/media/editors/codemirror/theme/midnight.css
index e41f10560fe69..17ed39c8bc6fe 100644
--- a/media/editors/codemirror/theme/midnight.css
+++ b/media/editors/codemirror/theme/midnight.css
@@ -12,8 +12,6 @@
     color: #D1EDFF;
 }
 
-.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
-
 .cm-s-midnight div.CodeMirror-selected { background: #314D67; }
 .cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
 .cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
diff --git a/media/editors/codemirror/theme/monokai.css b/media/editors/codemirror/theme/monokai.css
index 7c8a4c5d00116..b5edd13fe68af 100644
--- a/media/editors/codemirror/theme/monokai.css
+++ b/media/editors/codemirror/theme/monokai.css
@@ -21,7 +21,7 @@
 
 .cm-s-monokai span.cm-variable { color: #f8f8f2; }
 .cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
+.cm-s-monokai span.cm-variable-3, .cm-s-monokai span.cm-type { color: #66d9ef; }
 .cm-s-monokai span.cm-def { color: #fd971f; }
 .cm-s-monokai span.cm-bracket { color: #f8f8f2; }
 .cm-s-monokai span.cm-tag { color: #f92672; }
diff --git a/media/editors/codemirror/theme/night.css b/media/editors/codemirror/theme/night.css
index fd4e5619337e5..f631bf42c748d 100644
--- a/media/editors/codemirror/theme/night.css
+++ b/media/editors/codemirror/theme/night.css
@@ -17,7 +17,7 @@
 .cm-s-night span.cm-string { color: #37f14a; }
 .cm-s-night span.cm-meta { color: #7678e2; }
 .cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def, .cm-s-night span.cm-type { color: white; }
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
 .cm-s-night span.cm-link { color: #845dc4; }
diff --git a/media/editors/codemirror/theme/panda-syntax.css b/media/editors/codemirror/theme/panda-syntax.css
index c93b2ea03a76e..6de58b56f46cf 100644
--- a/media/editors/codemirror/theme/panda-syntax.css
+++ b/media/editors/codemirror/theme/panda-syntax.css
@@ -52,7 +52,7 @@
 .cm-s-panda-syntax .cm-variable-2 {
 	color: #ff9ac1;
 }
-.cm-s-panda-syntax .cm-variable-3 {
+.cm-s-panda-syntax .cm-variable-3, .cm-s-panda-syntax .cm-type {
 	color: #ff9ac1;
 }
 
diff --git a/media/editors/codemirror/theme/pastel-on-dark.css b/media/editors/codemirror/theme/pastel-on-dark.css
index 2603d36205a2f..60435dd15e635 100644
--- a/media/editors/codemirror/theme/pastel-on-dark.css
+++ b/media/editors/codemirror/theme/pastel-on-dark.css
@@ -34,7 +34,7 @@
 .cm-s-pastel-on-dark span.cm-string { color: #66A968; }
 .cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
 .cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-variable-3, .cm-s-pastel-on-dark span.cm-type { color: #DE8E30; }
 .cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
 .cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
 .cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
diff --git a/media/editors/codemirror/theme/rubyblue.css b/media/editors/codemirror/theme/rubyblue.css
index 76d33e7798fe7..1f181b06ec271 100644
--- a/media/editors/codemirror/theme/rubyblue.css
+++ b/media/editors/codemirror/theme/rubyblue.css
@@ -15,7 +15,7 @@
 .cm-s-rubyblue span.cm-string { color: #F08047; }
 .cm-s-rubyblue span.cm-meta { color: #F0F; }
 .cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
+.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def, .cm-s-rubyblue span.cm-type { color: white; }
 .cm-s-rubyblue span.cm-bracket { color: #F0F; }
 .cm-s-rubyblue span.cm-link { color: #F4C20B; }
 .cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
diff --git a/media/editors/codemirror/theme/seti.css b/media/editors/codemirror/theme/seti.css
index 6632d3fc7fc48..814f76f7dece8 100644
--- a/media/editors/codemirror/theme/seti.css
+++ b/media/editors/codemirror/theme/seti.css
@@ -38,7 +38,7 @@
 .cm-s-seti span.cm-attribute { color: #9fca56; }
 .cm-s-seti span.cm-qualifier { color: #9fca56; }
 .cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3 { color: #9fca56; }
+.cm-s-seti span.cm-variable-3, .cm-s-seti span.cm-type { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
 .cm-s-seti .CodeMirror-activeline-background { background: #101213; }
 .cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/media/editors/codemirror/theme/solarized.css b/media/editors/codemirror/theme/solarized.css
index 1f39c7edb21fd..d95f6c1b27519 100644
--- a/media/editors/codemirror/theme/solarized.css
+++ b/media/editors/codemirror/theme/solarized.css
@@ -57,7 +57,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized .cm-variable { color: #839496; }
 .cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
+.cm-s-solarized .cm-variable-3, .cm-s-solarized .cm-type { color: #6c71c4; }
 
 .cm-s-solarized .cm-property { color: #2aa198; }
 .cm-s-solarized .cm-operator { color: #6c71c4; }
diff --git a/media/editors/codemirror/theme/the-matrix.css b/media/editors/codemirror/theme/the-matrix.css
index 3912a8dbd85ad..c4c93c11eafdb 100644
--- a/media/editors/codemirror/theme/the-matrix.css
+++ b/media/editors/codemirror/theme/the-matrix.css
@@ -14,7 +14,7 @@
 .cm-s-the-matrix span.cm-def { color: #99C; }
 .cm-s-the-matrix span.cm-variable { color: #F6C; }
 .cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
+.cm-s-the-matrix span.cm-variable-3, .cm-s-the-matrix span.cm-type { color: #96F; }
 .cm-s-the-matrix span.cm-property { color: #62FFA0; }
 .cm-s-the-matrix span.cm-operator { color: #999; }
 .cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
diff --git a/media/editors/codemirror/theme/ttcn.css b/media/editors/codemirror/theme/ttcn.css
index b3d465645bd5d..0b14ac35d64f4 100644
--- a/media/editors/codemirror/theme/ttcn.css
+++ b/media/editors/codemirror/theme/ttcn.css
@@ -29,7 +29,7 @@
 .cm-s-ttcn .cm-tag { color: #170; }
 .cm-s-ttcn .cm-variable { color: #8B2252; }
 .cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3 { color: #085; }
+.cm-s-ttcn .cm-variable-3, .cm-s-ttcn .cm-type { color: #085; }
 
 .cm-s-ttcn .cm-invalidchar { color: #f00; }
 
diff --git a/media/editors/codemirror/theme/twilight.css b/media/editors/codemirror/theme/twilight.css
index d342b899f6ee0..b2b1b2aa93e02 100644
--- a/media/editors/codemirror/theme/twilight.css
+++ b/media/editors/codemirror/theme/twilight.css
@@ -14,7 +14,7 @@
 .cm-s-twilight .cm-number { color:  #ca7841; } /**/
 .cm-s-twilight .cm-def { color: #8DA6CE; }
 .cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def, .cm-s-twilight span.cm-type { color: #607392; } /**/
 .cm-s-twilight .cm-operator { color: #cda869; } /**/
 .cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
 .cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
diff --git a/media/editors/codemirror/theme/vibrant-ink.css b/media/editors/codemirror/theme/vibrant-ink.css
index ac4ec6d87af28..b13ecf2164bda 100644
--- a/media/editors/codemirror/theme/vibrant-ink.css
+++ b/media/editors/codemirror/theme/vibrant-ink.css
@@ -16,7 +16,7 @@
 .cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
 .cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
 .cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def, .cm-s-vibrant span.cm-type { color: #FFC66D; }
 .cm-s-vibrant-ink .cm-operator { color: #888; }
 .cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
 .cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
diff --git a/media/editors/codemirror/theme/xq-dark.css b/media/editors/codemirror/theme/xq-dark.css
index e3bd960bbb72f..7da1a0f7053a1 100644
--- a/media/editors/codemirror/theme/xq-dark.css
+++ b/media/editors/codemirror/theme/xq-dark.css
@@ -36,7 +36,7 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
 .cm-s-xq-dark span.cm-variable { color: #FFF; }
 .cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
+.cm-s-xq-dark span.cm-variable-3, .cm-s-xq-dark span.cm-type { color: #DDD; }
 .cm-s-xq-dark span.cm-property {}
 .cm-s-xq-dark span.cm-operator {}
 .cm-s-xq-dark span.cm-comment { color: gray; }
diff --git a/media/editors/codemirror/theme/xq-light.css b/media/editors/codemirror/theme/xq-light.css
index 8d2fcb667b69a..7b182ea99756b 100644
--- a/media/editors/codemirror/theme/xq-light.css
+++ b/media/editors/codemirror/theme/xq-light.css
@@ -26,7 +26,7 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-def { text-decoration:underline; }
 .cm-s-xq-light span.cm-variable { color: black; }
 .cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3 { color: black; }
+.cm-s-xq-light span.cm-variable-3, .cm-s-xq-light span.cm-type { color: black; }
 .cm-s-xq-light span.cm-property {}
 .cm-s-xq-light span.cm-operator {}
 .cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
diff --git a/media/editors/codemirror/theme/yeti.css b/media/editors/codemirror/theme/yeti.css
index c70d4d214e300..d085f72497156 100644
--- a/media/editors/codemirror/theme/yeti.css
+++ b/media/editors/codemirror/theme/yeti.css
@@ -39,6 +39,6 @@
 .cm-s-yeti span.cm-qualifier { color: #96c0d8; }
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
+.cm-s-yeti span.cm-variable-3, .cm-s-yeti span.cm-type { color: #96c0d8; }
 .cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml
index 3ff3abcbf18f9..052224f20d064 100644
--- a/plugins/editors/codemirror/codemirror.xml
+++ b/plugins/editors/codemirror/codemirror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.2" type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_codemirror</name>
-	<version>5.25.2</version>
+	<version>5.28</version>
 	<creationDate>28 March 2011</creationDate>
 	<author>Marijn Haverbeke</author>
 	<authorEmail>marijnh@gmail.com</authorEmail>

From 4a7fc4436b7e35d9930605e22684911fc685da70 Mon Sep 17 00:00:00 2001
From: Weeblr <weeblr@users.noreply.github.com>
Date: Thu, 3 Aug 2017 18:48:42 +0200
Subject: [PATCH 120/148] Added comment: title should not be escaped (#17401)

As per issue #17324: https://github.com/joomla/joomla-cms/issues/17324
---
 .../com_search/views/search/tmpl/default_results.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/com_search/views/search/tmpl/default_results.php b/components/com_search/views/search/tmpl/default_results.php
index 000dca69b83e4..a8e999421aa35 100644
--- a/components/com_search/views/search/tmpl/default_results.php
+++ b/components/com_search/views/search/tmpl/default_results.php
@@ -16,10 +16,18 @@
 		<?php echo $this->pagination->limitstart + $result->count . '. '; ?>
 		<?php if ($result->href) : ?>
 			<a href="<?php echo JRoute::_($result->href); ?>"<?php if ($result->browsernav == 1) : ?> target="_blank"<?php endif; ?>>
-				<?php echo $result->title; ?>
+				<?php 
+				// $result->title should not be escaped in this case, as it may
+				// contain span HTML tags wrapping the searched terms, if present
+				// in the title.
+				echo $result->title; 
+				?>
 			</a>
 		<?php else : ?>
-			<?php echo $result->title; ?>
+			<?php
+		        // see above comment: do not escape $result->title
+		        echo $result->title;
+		        ?>
 		<?php endif; ?>
 	</dt>
 	<?php if ($result->section) : ?>

From 5f8aa23a9ce2baa87efa1318f82a7c16ec4c1896 Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Thu, 3 Aug 2017 17:49:44 +0100
Subject: [PATCH 121/148] Removed timezone setter - We want to use Global as
 default, not set for every user. (#17388)

---
 libraries/joomla/form/fields/timezone.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libraries/joomla/form/fields/timezone.php b/libraries/joomla/form/fields/timezone.php
index 4912665d8b6c6..2dee4c397d318 100644
--- a/libraries/joomla/form/fields/timezone.php
+++ b/libraries/joomla/form/fields/timezone.php
@@ -122,15 +122,6 @@ protected function getGroups()
 	{
 		$groups = array();
 
-		$keyField = !empty($this->keyField) ? $this->keyField : 'id';
-		$keyValue = $this->form->getValue($keyField);
-
-		// If the timezone is not set use the server setting.
-		if (strlen($this->value) == 0 && empty($keyValue))
-		{
-			$this->value = JFactory::getConfig()->get('offset');
-		}
-
 		// Get the list of time zones from the server.
 		$zones = DateTimeZone::listIdentifiers();
 

From 717f513d7746827d0408a98d078f2d8eb35b546c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 3 Aug 2017 17:51:27 +0100
Subject: [PATCH 122/148] Category select list indent (#17383)

* Category select list indent

* Category select list indent (reverted from commit 4af9648382ecd921db451687d35ecdde66554188)

* Make the change in the category select instead of the filter

* Remove line
---
 .../components/com_categories/models/fields/categoryedit.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/administrator/components/com_categories/models/fields/categoryedit.php b/administrator/components/com_categories/models/fields/categoryedit.php
index 503540fc90456..e530a36ff878d 100644
--- a/administrator/components/com_categories/models/fields/categoryedit.php
+++ b/administrator/components/com_categories/models/fields/categoryedit.php
@@ -242,6 +242,11 @@ protected function getOptions()
 			$db->setQuery($query);
 			$language = $db->loadResult();
 
+			if ($options[$i]->level != 0)
+			{
+				$options[$i]->level = $options[$i]->level -1;
+			}
+
 			if ($options[$i]->published == 1)
 			{
 				$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->text;

From 9405334e2bdbd8f146d6b530cfc3430c1de8ff04 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 3 Aug 2017 17:52:04 +0100
Subject: [PATCH 123/148] URLS Position Content global options (#17371)

This is a currently a list but as there are only two options it should be a radio btn-group
---
 administrator/components/com_content/config.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index dee54ce659224..33cebad36ce8d 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -364,9 +364,10 @@
 
 		<field
 			name="urls_position"
-			type="list"
+			type="radio"
 			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
 			description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
 			>
 			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>

From 9854582f17db7c38ec83c0dbed8dfd6075e1d345 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Fri, 4 Aug 2017 13:38:46 +0300
Subject: [PATCH 124/148] [Plugins/system/cache] Some improvements and cleanups
 in plugins/system/cache (#16673)

* Some improvements and cleanups in plugins/system/cache
- Make use of $this->app instead of JFactory::getApplication();
- Added missing docblocks
- Type-safety
- replace unnecessary strlen() call with simple check

* Changes based on reviewer's comment
---
 plugins/system/cache/cache.php | 38 ++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/plugins/system/cache/cache.php b/plugins/system/cache/cache.php
index bbaf24e557ae4..0b975c524c4cb 100644
--- a/plugins/system/cache/cache.php
+++ b/plugins/system/cache/cache.php
@@ -16,9 +16,29 @@
  */
 class PlgSystemCache extends JPlugin
 {
-	var $_cache = null;
+	/**
+	 * Cache instance.
+	 *
+	 * @var    JCache
+	 * @since  1.5
+	 */
+	public $_cache;
 
-	var $_cache_key = null;
+	/**
+	 * Cache key
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	public $_cache_key;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $app;
 
 	/**
 	 * Constructor.
@@ -39,6 +59,12 @@ public function __construct(& $subject, $config)
 			'caching'      => false,
 		);
 
+		// Get the application if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
+		if (!$this->app)
+		{
+			$this->app = JFactory::getApplication();
+		}
+
 		$this->_cache     = JCache::getInstance('page', $options);
 		$this->_cache_key = JUri::getInstance()->toString();
 	}
@@ -52,7 +78,7 @@ public function __construct(& $subject, $config)
 	 */
 	public function onAfterInitialise()
 	{
-		$app  = JFactory::getApplication();
+		$app  = $this->app;
 		$user = JFactory::getUser();
 
 		if ($app->isClient('administrator'))
@@ -97,7 +123,7 @@ public function onAfterInitialise()
 	 */
 	public function onAfterRespond()
 	{
-		$app = JFactory::getApplication();
+		$app = $this->app;
 
 		if ($app->isClient('administrator'))
 		{
@@ -131,9 +157,9 @@ protected function isExcluded()
 		if ($exclusions = $this->params->get('exclude_menu_items', array()))
 		{
 			// Get the current menu item
-			$active = JFactory::getApplication()->getMenu()->getActive();
+			$active = $this->app->getMenu()->getActive();
 
-			if ($active && $active->id && in_array($active->id, (array) $exclusions))
+			if ($active && $active->id && in_array($active->id, (array) $exclusions, true))
 			{
 				return true;
 			}

From 4bb2a1fc024298c689d0ddaebfb4b2335508bbed Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Fri, 4 Aug 2017 12:29:00 +0100
Subject: [PATCH 125/148] Changed Update Notification Version compare (#17387)

* Changed Update Notification Version compare to use le = Less than or Equal to. In some cases the users have updated the site before they have been notified within Joomla! i.e. a 3rd part component. Then the localised Joomla! install is stuck in the past and given it no longer equals to it informs the users constantly.

* Updated note about compare
---
 plugins/system/updatenotification/updatenotification.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/system/updatenotification/updatenotification.php b/plugins/system/updatenotification/updatenotification.php
index 24b3501673df7..e1cdbf94b2b41 100644
--- a/plugins/system/updatenotification/updatenotification.php
+++ b/plugins/system/updatenotification/updatenotification.php
@@ -145,8 +145,8 @@ public function onAfterRender()
 		// Get the available update
 		$update = array_pop($updates);
 
-		// Check the available version. If it's the same as the installed version we have no updates to notify about.
-		if (version_compare($update->version, JVERSION, 'eq'))
+		// Check the available version. If it's the same or less than the installed version we have no updates to notify about.
+		if (version_compare($update->version, JVERSION, 'le'))
 		{
 			return;
 		}

From 3effc458e3517ec1ce1354237e33b3540ffa71b3 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Fri, 4 Aug 2017 14:18:00 +0200
Subject: [PATCH 126/148] add flip ordering batch process to category manager
 (#11529)

* add flip ordering batch process to category manager

* better wording

thanks @brianteeman
---
 .../com_categories/models/category.php        | 53 +++++++++++++++++++
 .../categories/tmpl/default_batch_body.php    | 13 ++++-
 .../language/en-GB/en-GB.lib_joomla.ini       |  1 +
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php
index 13b223191dbae..46fcb4ca7ebee 100644
--- a/administrator/components/com_categories/models/category.php
+++ b/administrator/components/com_categories/models/category.php
@@ -57,6 +57,9 @@ public function __construct($config = array())
 		parent::__construct($config);
 		$extension = JFactory::getApplication()->input->get('extension', 'com_content');
 		$this->typeAlias = $extension . '.category';
+
+		// Add a new batch command
+		$this->batch_commands['flip_ordering'] = 'batchFlipordering';
 	}
 
 	/**
@@ -819,6 +822,56 @@ protected function batchTag($value, $pks, $contexts)
 		return true;
 	}
 
+	/**
+	 * Batch flip category ordering.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed    An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   3.6.3
+	 */
+	protected function batchFlipordering($value, $pks, $contexts)
+	{
+		$successful = array();
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		/**
+		 * For each category get the max ordering value
+		 * Re-order with max - ordering
+		 */
+		foreach ($pks as $id)
+		{
+			$query->select('MAX(ordering)')
+				->from('#__content')
+				->where($db->qn('catid') . ' = ' . $db->q($id));
+
+			$db->setQuery($query);
+
+			$max = (int) $db->loadresult();
+			$max++;
+
+			$query->clear();
+
+			$query->update('#__content')
+				->set($db->qn('ordering') . ' = ' . $max . ' - ' . $db->qn('ordering'))
+				->where($db->qn('catid') . ' = ' . $db->q($id));
+
+			$db->setQuery($query);
+
+			if ($db->execute())
+			{
+				$successful[] = $id;
+			}
+		}
+
+		return empty($successful) ? false : $successful;
+	}
+
 	/**
 	 * Batch copy categories to a new category.
 	 *
diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php
index 4110990f81b7b..45daf66e3cb33 100644
--- a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php
+++ b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php
@@ -38,7 +38,7 @@
 					</label>
 					<div id="batch-choose-action" class="combo controls">
 						<select name="batch[category_id]" id="batch-category-id">
-							<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
+							<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY') ?></option>
 							<?php echo JHtml::_('select.options', JHtml::_('category.categories', $extension, array('filter.published' => $published))); ?>
 						</select>
 					</div>
@@ -55,4 +55,15 @@
 			</div>
 		</div>
 	</div>
+	<div class="row-fluid">
+		<div class="span6">
+			<div class="control-group">
+				<label id="flip-ordering-id-lbl" for="flip-ordering-id" class="control-label">
+					<?php echo JText::_('JLIB_HTML_BATCH_FLIPORDERING_LABEL'); ?>
+				</label>
+				<?php echo JHtml::_('select.booleanlist', 'batch[flip_ordering]', array(), 0, 'JYES', 'JNO', 'flip-ordering-id'); ?>
+			</div>
+		</div>
+	</div>
 </div>
+
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 7ed279b570715..e6bc338892b0e 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -359,6 +359,7 @@ JLIB_HTML_ADD_TO_THIS_MENU="Add to this menu."
 JLIB_HTML_BATCH_ACCESS_LABEL="Set Access Level"
 JLIB_HTML_BATCH_ACCESS_LABEL_DESC="Not making a selection will keep the original access levels when processing."
 JLIB_HTML_BATCH_COPY="Copy"
+JLIB_HTML_BATCH_FLIPORDERING_LABEL="Reverse the ordering of all articles in the selected categories"
 JLIB_HTML_BATCH_LANGUAGE_LABEL="Set Language"
 JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC="Not making a selection will keep the original language when processing."
 JLIB_HTML_BATCH_LANGUAGE_NOCHANGE="- Keep original Language -"

From 5454e87fddc32af2829f495053c0cfe79ffda57d Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Fri, 4 Aug 2017 17:49:35 +0530
Subject: [PATCH 127/148] Build query only if 'select' and 'from' attributes
 are set and don't execute blank query (#10087)

* Build query only if 'select' and 'from' are set

Build query only if 'select' and 'from' attributes are set. Minor code cleanup.

* Don't execute blank query
---
 libraries/joomla/form/fields/sql.php | 88 ++++++++++++++--------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/libraries/joomla/form/fields/sql.php b/libraries/joomla/form/fields/sql.php
index 4500f0a479740..118c184c873cb 100644
--- a/libraries/joomla/form/fields/sql.php
+++ b/libraries/joomla/form/fields/sql.php
@@ -133,47 +133,48 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 			if (empty($this->query))
 			{
 				// Get the query from the form
-				$query = array();
+				$query    = array();
 				$defaults = array();
 
-				$query['select'] = (string) $this->element['sql_select'];
+				$sql_select = (string) $this->element['sql_select'];
+				$sql_from   = (string) $this->element['sql_from'];
 
-				$query['from'] = (string) $this->element['sql_from'];
-
-				$query['join'] = isset($this->element['sql_join']) ? (string) $this->element['sql_join'] : '';
-
-				$query['where'] = isset($this->element['sql_where']) ? (string) $this->element['sql_where'] : '';
-
-				$query['group'] = isset($this->element['sql_group']) ? (string) $this->element['sql_group'] : '';
-
-				$query['order'] = (string) $this->element['sql_order'];
-
-				// Get the filters
-				$filters = isset($this->element['sql_filter']) ? explode(',', $this->element['sql_filter']) : '';
-
-				// Get the default value for query if empty
-				if (is_array($filters))
+				if ($sql_select && $sql_from)
 				{
-					foreach ($filters as $key => $val)
+					$query['select'] = $sql_select;
+					$query['from']   = $sql_from;
+					$query['join']   = (string) $this->element['sql_join'];
+					$query['where']  = (string) $this->element['sql_where'];
+					$query['group']  = (string) $this->element['sql_group'];
+					$query['order']  = (string) $this->element['sql_order'];
+
+					// Get the filters
+					$filters = isset($this->element['sql_filter']) ? explode(',', $this->element['sql_filter']) : '';
+
+					// Get the default value for query if empty
+					if (is_array($filters))
 					{
-						$name = "sql_default_{$val}";
-						$attrib = (string) $this->element[$name];
-
-						if (!empty($attrib))
+						foreach ($filters as $filter)
 						{
-							$defaults[$val] = $attrib;
+							$name   = "sql_default_{$filter}";
+							$attrib = (string) $this->element[$name];
+
+							if (!empty($attrib))
+							{
+								$defaults[$filter] = $attrib;
+							}
 						}
 					}
-				}
 
-				// Process the query
-				$this->query = $this->processQuery($query, $filters, $defaults);
+					// Process the query
+					$this->query = $this->processQuery($query, $filters, $defaults);
+				}
 			}
 
-			$this->keyField   = isset($this->element['key_field']) ? (string) $this->element['key_field'] : 'value';
-			$this->valueField = isset($this->element['value_field']) ? (string) $this->element['value_field'] : (string) $this->element['name'];
-			$this->translate  = isset($this->element['translate']) ? (string) $this->element['translate'] : false;
-			$this->header     = $this->element['header'] ? (string) $this->element['header'] : false;
+			$this->keyField   = (string) $this->element['key_field'] ?: 'value';
+			$this->valueField = (string) $this->element['value_field'] ?: (string) $this->element['name'];
+			$this->translate  = (string) $this->element['translate'] ?: false;
+			$this->header     = (string) $this->element['header'] ?: false;
 		}
 
 		return $return;
@@ -270,21 +271,22 @@ protected function getOptions()
 		$value = $this->valueField;
 		$header = $this->header;
 
-		// Get the database object.
-		$db = JFactory::getDbo();
-
-		// Set the query and get the result list.
-		$db->setQuery($this->query);
+		if ($this->query)
+		{
+			// Get the database object.
+			$db = JFactory::getDbo();
 
-		$items = array();
+			// Set the query and get the result list.
+			$db->setQuery($this->query);
 
-		try
-		{
-			$items = $db->loadObjectlist();
-		}
-		catch (JDatabaseExceptionExecuting $e)
-		{
-			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			try
+			{
+				$items = $db->loadObjectlist();
+			}
+			catch (JDatabaseExceptionExecuting $e)
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			}
 		}
 
 		// Add header.

From 471a38f0ce440bb68442e1267b12a13f1f2e448b Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Fri, 4 Aug 2017 23:09:04 +0200
Subject: [PATCH 128/148] Fix codestyle for the not reviewed merge of #17401

---
 .../views/search/tmpl/default_results.php        | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/components/com_search/views/search/tmpl/default_results.php b/components/com_search/views/search/tmpl/default_results.php
index a8e999421aa35..0adbb0f28824d 100644
--- a/components/com_search/views/search/tmpl/default_results.php
+++ b/components/com_search/views/search/tmpl/default_results.php
@@ -16,18 +16,14 @@
 		<?php echo $this->pagination->limitstart + $result->count . '. '; ?>
 		<?php if ($result->href) : ?>
 			<a href="<?php echo JRoute::_($result->href); ?>"<?php if ($result->browsernav == 1) : ?> target="_blank"<?php endif; ?>>
-				<?php 
-				// $result->title should not be escaped in this case, as it may
-				// contain span HTML tags wrapping the searched terms, if present
-				// in the title.
-				echo $result->title; 
-				?>
+				<?php // $result->title should not be escaped in this case, as it may ?>
+				<?php // contain span HTML tags wrapping the searched terms, if present ?>
+				<?php // in the title. ?>
+				<?php echo $result->title; ?>
 			</a>
 		<?php else : ?>
-			<?php
-		        // see above comment: do not escape $result->title
-		        echo $result->title;
-		        ?>
+		       <?php // see above comment: do not escape $result->title ?>
+		       <?php echo $result->title; ?>
 		<?php endif; ?>
 	</dt>
 	<?php if ($result->section) : ?>

From f7f0e40149b6a4d8eaafbec92613647c33a5c4e6 Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Sat, 5 Aug 2017 16:00:23 +0100
Subject: [PATCH 129/148] Rename Page to Menu Item (#17409)

* Removed timezone setter - We want to use Global as default, not set for every user.

* Changed - Select Page - to - Select Menu Item - given 'Page' is not a term used in Joomla! Natively.

* Alpha ordering adjusting for super bot @Quy pleasing.

* Added old language strings and put deprecated notice

* Merge remote-tracking branch 'origin/page-naming-fix' into staging-user-time-zone-fix

# Conflicts:
#	administrator/language/en-GB/en-GB.com_modules.ini
#	administrator/language/en-GB/en-GB.com_templates.ini
---
 .../components/com_modules/models/forms/filter_modules.xml    | 4 ++--
 .../components/com_templates/models/forms/filter_styles.xml   | 4 ++--
 administrator/language/en-GB/en-GB.com_modules.ini            | 2 ++
 administrator/language/en-GB/en-GB.com_templates.ini          | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/administrator/components/com_modules/models/forms/filter_modules.xml b/administrator/components/com_modules/models/forms/filter_modules.xml
index 0d49bfff5cb26..4728b3d43b34e 100644
--- a/administrator/components/com_modules/models/forms/filter_modules.xml
+++ b/administrator/components/com_modules/models/forms/filter_modules.xml
@@ -50,11 +50,11 @@
 		<field
 			name="menuitem"
 			type="menuitem"
-			label="COM_MODULES_OPTION_SELECT_PAGE"
+			label="COM_MODULES_OPTION_SELECT_MENU_ITEM"
 			disable="separator,alias,heading,url"
 			onchange="this.form.submit();"
 			>
-			<option	value="">COM_MODULES_OPTION_SELECT_PAGE</option>
+			<option	value="">COM_MODULES_OPTION_SELECT_MENU_ITEM</option>
 			<option	value="-1">COM_MODULES_NONE</option>
 		</field>
 		<field
diff --git a/administrator/components/com_templates/models/forms/filter_styles.xml b/administrator/components/com_templates/models/forms/filter_styles.xml
index fd4636873c500..1578ff8020dc2 100644
--- a/administrator/components/com_templates/models/forms/filter_styles.xml
+++ b/administrator/components/com_templates/models/forms/filter_styles.xml
@@ -22,12 +22,12 @@
 		<field
 			name="menuitem"
 			type="menuitem"
-			label="COM_TEMPLATES_OPTION_SELECT_PAGE"
+			label="COM_TEMPLATES_OPTION_SELECT_MENU_ITEM"
 			disable="separator,alias,heading,url"
 			showon="client_id:0"
 			onchange="this.form.submit();"
 			>
-			<option	value="">COM_TEMPLATES_OPTION_SELECT_PAGE</option>
+			<option	value="">COM_TEMPLATES_OPTION_SELECT_MENU_ITEM</option>
 			<option	value="-1">COM_TEMPLATES_OPTION_NONE</option>
 		</field>
 		<field
diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
index e0d430dfe5fec..f9bee33b6c9f2 100644
--- a/administrator/language/en-GB/en-GB.com_modules.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -133,7 +133,9 @@ COM_MODULES_OPTION_ORDER_POSITION="%d. %s"
 COM_MODULES_OPTION_POSITION_TEMPLATE_DEFINED="Template"
 COM_MODULES_OPTION_POSITION_USER_DEFINED="User"
 COM_MODULES_OPTION_SELECT_CLIENT="- Select Type -"
+COM_MODULES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
 COM_MODULES_OPTION_SELECT_MODULE="- Select Type -"
+; Deprecated 4.0
 COM_MODULES_OPTION_SELECT_PAGE="- Select Page -"
 COM_MODULES_OPTION_SELECT_POSITION="- Select Position -"
 COM_MODULES_OPTION_SELECT_TYPE="- Select type -"
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index fd44af05cb76f..ffe2da2941052 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -184,8 +184,10 @@ COM_TEMPLATES_NEW_FILE_NAME="New File Name"
 COM_TEMPLATES_NEW_FILE_SELECT="Select a file type"
 COM_TEMPLATES_NEW_FILE_TYPE="File Type"
 COM_TEMPLATES_NO_TEMPLATE_SELECTED="No template selected."
-COM_TEMPLATES_OPTION_SELECT_PAGE="- Select Page -"
 COM_TEMPLATES_OPTION_NONE=":: None ::"
+; Deprecated 4.0
+COM_TEMPLATES_OPTION_SELECT_PAGE="- Select Page -"
+COM_TEMPLATES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
 COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
 COM_TEMPLATES_OVERRIDE_EXISTS="Override already exists."
 COM_TEMPLATES_OVERRIDE_FAILED="Failed to create override."

From 81e9e9ee4a31066b798488c7069023972d306042 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Sat, 5 Aug 2017 17:10:40 +0200
Subject: [PATCH 130/148] [RFC] Mod sample data (#7680)

* [imp] Adding SampleData Module with SampleData Plugins.

* Improvements on JavaScript side by Fedik. Closes https://github.com/Bakual/joomla-cms/pull/5

* Adding some language strings

* Blog sampledata

* Removing plugin files which are not yet ready.

* Updating SQL installation files for all DBs

* Fixing missing language string

* Fixing "The request gave an invalid response." when the menutype was duplicated.

* Adjusting the menutype titles so they don't clash between different sampledata sets

* Fixing blog sampledata.

* Fixing some errors in strict mode.

* Adjusted title of "Home" menuitem to avoid alias clashing.

* Fix for mssql database, add missing defaults, catch exceptions

* Fixing two small issues in testing sample data

* Changing fatal error message in sampledata JS

* Fixing typo

* SampleData -> Sample Data

* proper @since tags

* Use JLoader and don't pass undefined $params

* template_style -> template_style_id and browsernav -> browserNav

* Fix #__asset nesting (lft and rgt)

* It's "sample data"

* Alphaorder strings and remove duplicate one.

* Fixing assets lft and rgt

* Changing Sample Module viewlevel to "Super User"

* Fixing root level rgt value for other databases

* Adjusting access level for other databases.

* Adding update SQL files to install the module and plugins unpublished.
---
 .../sql/updates/mysql/3.8.0-2017-07-31.sql    |    6 +
 .../updates/postgresql/3.8.0-2017-07-31.sql   |    6 +
 .../sql/updates/sqlazure/3.8.0-2017-07-31.sql |    5 +
 .../language/en-GB/en-GB.mod_sampledata.ini   |   10 +
 .../en-GB/en-GB.mod_sampledata.sys.ini        |    7 +
 .../en-GB/en-GB.plg_sampledata_blog.ini       |   64 +
 .../en-GB/en-GB.plg_sampledata_blog.sys.ini   |    7 +
 .../en-GB/en-GB.plg_sampledata_testing.ini    |  536 ++
 .../en-GB.plg_sampledata_testing.sys.ini      |    7 +
 .../modules/mod_sampledata/helper.php         |   34 +
 .../modules/mod_sampledata/mod_sampledata.php |   16 +
 .../modules/mod_sampledata/mod_sampledata.xml |   37 +
 .../modules/mod_sampledata/tmpl/default.php   |   57 +
 installation/sql/mysql/joomla.sql             |   46 +-
 installation/sql/postgresql/joomla.sql        |   50 +-
 installation/sql/sqlazure/joomla.sql          |   48 +-
 media/mod_sampledata/js/sampledata-process.js |   96 +
 plugins/sampledata/blog/blog.php              | 1003 ++++
 plugins/sampledata/blog/blog.xml              |   23 +
 plugins/sampledata/testing/testing.php        | 4748 +++++++++++++++++
 plugins/sampledata/testing/testing.xml        |   23 +
 21 files changed, 6766 insertions(+), 63 deletions(-)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql
 create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql
 create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql
 create mode 100644 administrator/language/en-GB/en-GB.mod_sampledata.ini
 create mode 100644 administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
 create mode 100644 administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
 create mode 100644 administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
 create mode 100644 administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
 create mode 100644 administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini
 create mode 100644 administrator/modules/mod_sampledata/helper.php
 create mode 100644 administrator/modules/mod_sampledata/mod_sampledata.php
 create mode 100644 administrator/modules/mod_sampledata/mod_sampledata.xml
 create mode 100644 administrator/modules/mod_sampledata/tmpl/default.php
 create mode 100644 media/mod_sampledata/js/sampledata-process.js
 create mode 100644 plugins/sampledata/blog/blog.php
 create mode 100644 plugins/sampledata/blog/blog.xml
 create mode 100644 plugins/sampledata/testing/testing.php
 create mode 100644 plugins/sampledata/testing/testing.xml

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql b/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql
new file mode 100644
index 0000000000000..8be562570a95c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql
@@ -0,0 +1,6 @@
+INSERT INTO `#__extensions`
+(`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`)
+VALUES
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+  (480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql b/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql
new file mode 100644
index 0000000000000..e662ec4146016
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql
@@ -0,0 +1,6 @@
+INSERT INTO "#__extensions"
+("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state")
+VALUES
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+  (480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql
new file mode 100644
index 0000000000000..3f13bd860b812
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql
@@ -0,0 +1,5 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state")
+VALUES
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+  (480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
diff --git a/administrator/language/en-GB/en-GB.mod_sampledata.ini b/administrator/language/en-GB/en-GB.mod_sampledata.ini
new file mode 100644
index 0000000000000..d73b9c33313bd
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.mod_sampledata.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SAMPLEDATA="Sample Data"
+MOD_SAMPLEDATA_CONFIRM_START="Proceeding will install a sample data set into your Joomla. This process can't be reverted once done."
+MOD_SAMPLEDATA_INVALID_RESPONSE="There is an error in the sample data plugins. Response is invalid."
+MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED="This sample data set is already installed."
+MOD_SAMPLEDATA_XML_DESCRIPTION="This Module allows to install sample data."
diff --git a/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini b/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
new file mode 100644
index 0000000000000..3f8bc0d7fb2c6
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SAMPLEDATA="Sample Data"
+MOD_SAMPLEDATA_XML_DESCRIPTION="This Module allows to install sample data."
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini b/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
new file mode 100644
index 0000000000000..89a36e9476f50
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
@@ -0,0 +1,64 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SAMPLEDATA_BLOG="Sample Data - Blog"
+PLG_SAMPLEDATA_BLOG_OVERVIEW_DESC="Sample data which will set up a blog site."
+PLG_SAMPLEDATA_BLOG_OVERVIEW_TITLE="Blog Sample data"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_INTROTEXT="<p>This tells you a bit about this blog and the person who writes it. </p><p>When you are logged in you will be able to edit this page by clicking on the edit icon.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_TITLE="About"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this click on the Template Settings link in the top menu. To change your site description, browser title, default email and other items, click Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. In the Extensions menu click on Extensions Manager and then go to the Install tab. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules, articles or weblinks setting the Access level to Registered will mean that only logged in users can see them</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href='https://docs.joomla.org/'>Joomla documentation site</a> and get help from other users at the <a href='https://forum.joomla.org/'>Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_TITLE="Working on Your Site"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_INTROTEXT="<p>This is a sample blog posting.</p><p>If you log in to the site (the Author Login link is on the very bottom of this page) you will be able to edit it and all of the other existing articles. You will also be able to create a new article and make other changes to the site.</p><p>As you add and modify articles you will see how your site changes and also how you can customise it in various ways.</p><p>Go ahead, you can't break it.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_TITLE="Welcome to your blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FULLTEXT="<p>On the full page you will see both the introductory content and the rest of the article. You can change the settings to hide the introduction if you want.</p><p></p><p></p><p></p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is set to display the four most recent articles from the blog category in a column. Then there are links to the 4 next oldest articles. You can change those numbers by editing the content options settings in the blog tab in your site administrator. There is a link to your site administrator in the top menu.</p><p>If you want to have your blog post broken into two parts, an introduction and then a full length separate page, use the Read More button to insert a break.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image Module which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Blog Roll. which lets you link to other blogs. We've put in two examples, but you'll want to change them. When you are logged in, click on blog roll on the top menu to update this.</li><li>Most Read Posts which lists articles based on the number of times they have been read.</li><li>Older Articles which lists out articles by month.</li><li>Syndicate which allows your readers to read your posts in a news reader.</li><li>Popular Tags, which will appear if you use tagging on your articles. Just enter a tag in the Tags field when editing.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. Moving your mouse over a module and clicking on the edit icon will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more module that you can find at the <a href='https://extensions.joomla.org/'>Joomla Extensions Directory.</a></p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p><p>This blog is installed with the Protostar template.</p><p>You can edit the options by clicking on the Working on Your Site, Template Settings link in the top menu (visible when you login).</p><p>For example you can change the site background color, highlights color, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_TITLE="Your Template"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE="Blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE="Help"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE="Blog Home"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE="About"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE="Author Login"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE="Create a Post"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_4_TITLE="Working on Your Site"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_5_TITLE="Site Administrator"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_6_TITLE="Change Password"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_7_TITLE="Log out"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_8_TITLE="Author Login"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_9_TITLE="Site Settings"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE="Template Settings"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_0_DESCRIPTION="The main menu for the site"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_0_TITLE="Main Menu Blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_1_DESCRIPTION=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_1_TITLE="Author Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_2_DESCRIPTION=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_2_TITLE="Bottom Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_0_TITLE="Main Menu Blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_1_TITLE="Author Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_2_TITLE="Syndication"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_3_TITLE="Archived Articles"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_4_TITLE="Most Read Posts"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_5_TITLE="Older Posts"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_6_TITLE="Bottom Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_7_TITLE="Search"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_TITLE="Image"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_9_TITLE="Popular Tags"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_10_TITLE="Similar Items"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_11_TITLE="Site Information"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_12_TITLE="Release News"
+PLG_SAMPLEDATA_BLOG_STEP_FAILED="Step %1$u Failed: %2$s"
+PLG_SAMPLEDATA_BLOG_STEP_SKIPPED="Step %1$u Skipped: '%2$s' is either not installed or disabled."
+PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS="Step 1: Articles done!"
+PLG_SAMPLEDATA_BLOG_STEP2_SUCCESS="Step 2: Menus done!"
+PLG_SAMPLEDATA_BLOG_STEP3_SUCCESS="Step 3: Modules done!"
+PLG_SAMPLEDATA_BLOG_XML_DESCRIPTION="Provides the blog sample data. Can be installed using the sample data module"
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini b/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
new file mode 100644
index 0000000000000..83cbbe875d2b2
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SAMPLEDATA_BLOG="Sample Data - Blog"
+PLG_SAMPLEDATA_BLOG_XML_DESCRIPTION="Provides the blog sample data. Can be installed using the sample data module"
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini b/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
new file mode 100644
index 0000000000000..d8b86df0d9efd
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
@@ -0,0 +1,536 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SAMPLEDATA_TESTING="Sample Data - Testing"
+PLG_SAMPLEDATA_TESTING_OVERVIEW_DESC="Sampledata which will help with testing the CMS."
+PLG_SAMPLEDATA_TESTING_OVERVIEW_TITLE="Testing Sampledata"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_1_DESC="Get books about Joomla! at the Joomla! Book Shop."
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_1_NAME="Shop 1"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_2_DESC="T-shirts, caps and more from the Joomla! Shop."
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_2_NAME="Shop 2"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_3_DESC="Your contributions of time, talent and money make Joomla possible."
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_3_NAME="Support Joomla!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CATEGORY_0_TITLE="Sample Data-Banners"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_1_CONTACT="Administrator"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_1_NAME="Joomla"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_2_CONTACT="Example"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_2_NAME="Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_3_CONTACT="Bookstore Example"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_3_NAME="Bookstore"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_TITLE="Sample Data-Contact"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_0_TITLE="Park Site"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_TITLE="Shop Site"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_0_DESC="<p>Please feel free to contact our staff at any time should you need assistance.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_0_TITLE="Staff"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_1_DESC="<p>Our directory of information about different kinds of fruit.</p><p>We love fruit and want the world to know more about all of its many varieties.</p><p>Although it is small now, we work on it whenever we have a chance.</p><p>All of the images can be found in <a href='http://commons.wikimedia.org/wiki/Main_Page'>Wikimedia Commons</a>.</p><p><img src='images/sampledata/fruitshop/apple.jpg' alt="Apples" title="Apples" /></p><p><em>This encyclopedia is implemented using the contact component, each fruit a separate contact and a category for each letter. A CSS style is used to create the horizontal layout of the alphabet headings.</em></p><p><em>If you wanted to, you could allow some users (such as your growers) to have access to just this category in the contact component and let them help you to create new content for the encyclopedia.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_1_TITLE="Fruit Encyclopedia"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_ADDRESS="Address"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_COUNTRY="Country"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_FAX="Fax"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_MISC="<p>Information about or by the contact.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_NAME="Contact Name Here"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_POSITION="Position"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_POSTCODE="Zip Code"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SORTNAME1="last"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SORTNAME2="first"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SORTNAME3="middle"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_STATE="State"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SUBURB="Suburb"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_TELEPHONE="Telephone"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_1_NAME="Webmaster"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_2_MISC="<p>I'm the owner of this store.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_2_NAME="Owner"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_3_MISC="<p>I am in charge of buying fruit. If you sell good fruit, contact me.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_3_NAME="Buyer"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_ADDRESS="Image Credit: EnzikRights: Creative Commons Share Alike Unported 3.0 Source: http://commons.wikimedia.org/wiki/File:Bananas_-_Morocco.jpg"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_COUNTRY="Large Producers: India, China, Brasil"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_MISC="<p>Bananas are a great source of potassium.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_NAME="Bananas"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_POSITION="Scientific Name: Musa"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_STATE="Type: Herbaceous"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_ADDRESS="Image Credit: FievetRights: Public DomainSource: http://commons.wikimedia.org/wiki/File:Pommes_vertes.JPG"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_COUNTRY="Large: Producers: China, United States"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_MISC="<p>Apples are a versatile fruit, used for eating, cooking, and preserving.</p><p>There are more that 7500 different kinds of apples grown around the world.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_NAME="Apples"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_POSITION="Scientific Name: Malus domestica"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_STATE="Family: Rosaceae"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_ADDRESS="Image Credit: Franz Eugen Köhler, Köhler's Medizinal-Pflanzen Rights: Public DomainSource: http://commons.wikimedia.org/wiki/File:Koeh-134.jpg"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_COUNTRY="Large Producers: India, United States"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_MISC="<p>Tamarinds are a versatile fruit used around the world. In its young form it is used in hot sauces; ripened it is the basis for many refreshing drinks.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_NAME="Tamarind"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_POSITION="Scientific Name: Tamarindus indica"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_STATE="Family: Fabaceae"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_ADDRESS="Our City"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_COUNTRY="Our Country"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_MISC="<p>Here are directions for how to get to our shop.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_NAME="Shop Address"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_SUBURB="Our Province"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_TELEPHONE="555-555-5555"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_00_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_00_INTROTEXT="<p>All components are also used in the administrator area of your website. In addition to the ones listed here, there are components in the administrator that do not have direct front end displays, but do help shape your site. The most important ones for most users are</p><ul><li>Media Manager</li><li>Extensions Manager</li><li>Menu Manager</li><li>Global Configuration</li><li>Banners</li><li>Redirect</li></ul><hr title='Media Manager' alt='Media Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><p> </p><h3>Media Manager</h3><p>The media manager component lets you upload and insert images into content throughout your site. Optionally, you can enable the flash uploader which will allow you to to upload multiple images. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Content_Media_Manager'>Help</a></p><hr title='Extensions Manager' alt='Extensions Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Extensions Manager</h3><p>The extensions manager lets you install, update, uninstall and manage all of your extensions. The extensions manager has been extensively redesigned, although the core install and uninstall functionality remains the same as in Joomla! 1.5. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Extension_Manager_Install'>Help</a></p><hr title='Menu Manager' alt='Menu Manager' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Menu Manager</h3><p>The menu manager lets you create the menus you see displayed on your site. It also allows you to assign modules and template styles to specific menu links. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Menus_Menu_Manager'>Help</a></p><hr title='Global Configuration' alt='Global Configuration' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Global Configuration</h3><p>The global configuration is where the site administrator configures things such as whether search engine friendly urls are enabled, the site meta data (descriptive text used by search engines and indexers) and other functions. For many beginning users simply leaving the settings on default is a good way to begin, although when your site is ready for the public you will want to change the meta data to match its content. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Site_Global_Configuration'>Help</a></p><hr title='Banners' alt='Banners' class='system-pagebreak' style='color: gray; border: 1px dashed gray;' /><h3>Banners</h3><p>The banners component provides a simple way to display a rotating image in a module and, if you wish to have advertising, a way to track the number of times an image is viewed and clicked. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Components_Banners_Banners_Edit'>Help</a></p><hr title='Redirect' class='system-pagebreak' /><h3><br />Redirect</h3><p>The redirect component is used to manage broken links that produce Page Not Found (404) errors. If enabled it will allow you to redirect broken links to specific pages. It can also be used to manage migration related URL changes. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Components_Redirect_Manager'>Help</a></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_00_TITLE="Administrator Components"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_01_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_01_INTROTEXT="<p>This module shows a list of the calendar months containing archived articles. After you have changed the status of an article to archived, this list will be automatically generated. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Articles_Archive' title='Archive Module'>Help</a></p><div class='sample-module'>{loadmodule articles_archive,Archived Articles}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_01_TITLE="Archive Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_02_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_02_INTROTEXT="<p>This module displays a list of categories from one parent category. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Articles_Categories' title='Categories Module'>Help</a></p><div class='sample-module'>{loadmodule articles_categories,Articles Categories}</div><p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_02_TITLE="Article Categories Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_03_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_03_INTROTEXT="<p>This module allows you to display the articles in a specific category. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Articles_Category'>Help</a></p><div class='sample-module'>{loadmodule articles_category,Articles Category}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_03_TITLE="Articles Category Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_04_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_04_INTROTEXT="<p>The authentication plugins operate when users login to your site or administrator. The Joomla! authentication plugin is in operation by default but you can enable Gmail or LDAP or install a plugin for a different system. An example is included that may be used to create a new authentication plugin.</p><p>Default on:</p><ul><li>Joomla <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Authentication_-_GMail'>Help</a></li></ul><p>Default off:</p><ul><li>Gmail <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Authentication_-_GMail'>Help</a></li><li>LDAP <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Authentication_-_LDAP'>Help</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_04_TITLE="Authentication"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_05_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_05_INTROTEXT="<p><img src='images/sampledata/parks/banner_cradle.jpg' border='0' alt='Cradle Park Banner' /></p><p>Welcome!</p><p>This is a basic site about the beautiful and fascinating parks of Australia.</p><p>On this site you can read all about my travels to different parks, see photos, and find links to park websites.</p><p><em>This sample site is an example of using the core of Joomla! to create a basic website, whether a brochure site, a personal blog, or as a way to present information on a topic you are interested in.</em></p><p><em> Read more about the site in the About Parks module.</em></p><p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_05_TITLE="Australian Parks "
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_06_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_06_INTROTEXT="<p>The banner module is used to display the banners that are managed by the banners component in the site administrator. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Banners'>Help</a>.</p><div class='sample-module'>{loadmodule banners,Banners}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_06_TITLE="Banner Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_07_FULLTEXT="<p>Explore the articles and other resources right here on your site data to learn more about how Joomla works. (When you're done reading, you can delete or archive all of this.) You will also probably want to visit the Beginners' Areas of the <a href='https://docs.joomla.org/Beginners'>Joomla documentation</a> and <a href='http://forum.joomla.org'>support forums</a>.</p><p>You'll also want to sign up for the Joomla Security Mailing list and the Announcements mailing list. For inspiration visit the <a href='http://community.joomla.org/showcase/'>Joomla! Site Showcase</a> to see an amazing array of ways people use Joomla to tell their stories on the web.</p><p>The basic Joomla installation will let you get a great site up and running, but when you are ready for more features the power of Joomla is in the creative ways that developers have extended it to do all kinds of things. Visit the <a href='http://extensions.joomla.org/'>Joomla! Extensions Directory</a> to see thousands of extensions that can do almost anything you could want on a website. Can't find what you need? You may want to find a Joomla professional in the <a href='http://resources.joomla.org/'>Joomla! Resource Directory</a>.</p><p>Want to learn more? Consider attending a <a href='http://community.joomla.org/events.html'>Joomla! Day</a> or other event or joining a local <a href='http://community.joomla.org/user-groups.html'>Joomla! Users Group</a>. Can't find one near you? Start one yourself.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_07_INTROTEXT="<p>If this is your first Joomla! site or your first web site, you have come to the right place. Joomla will help you get your website up and running quickly and easily.</p><p>Start off using your site by logging in using the administrator account you created when you installed Joomla.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_07_TITLE="Beginners"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_08_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_08_INTROTEXT="<p>The contact component provides a way to provide contact forms and information for your site or to create a complex directory that can be used for many different purposes. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Components_Contacts_Contacts'>Help</a></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_08_TITLE="Contacts"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_09_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_09_INTROTEXT="<p>The content component (com_content) is what you use to write articles. It is extremely flexible and has the largest number of built in views. Articles can be created and edited from the front end, making content the easiest component to use to create your site content. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Content_Article_Manager'>Help</a></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_09_TITLE="Content"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_10_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_10_INTROTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_10_TITLE="Cradle Mountain"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_11_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_11_INTROTEXT="<p>This module allows you to create your own HTML Module using a WYSIWYG editor. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Custom_HTML' title='Custom HTML Module'>Help</a></p><div class='sample-module'>{loadmodule custom,Custom HTML}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_11_TITLE="Custom HTML Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_12_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_12_INTROTEXT="<p>Here's how to find our shop.</p><p>By car</p><p>Drive along Main Street to the intersection with First Avenue.  Look for our sign.</p><p>By foot</p><p>From the center of town, walk north on Main Street until you see our sign.</p><p>By bus</p><p>Take the #73 Bus to the last stop. We are on the north east corner.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_12_TITLE="Directions"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_13_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_13_INTROTEXT="<p>Editors are used thoughout Joomla! where content is created. TinyMCE is the default choice in most locations although CodeMirror is used in the template manager. No Editor provides a text box for html content.</p><p>Default on:</p><ul><li>CodeMirror <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Editor_-_CodeMirror'>Help</a></li><li>TinyMCE<a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Editor_-_TinyMCE'> Help</a></li><li>No Editor <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Editor_-_None'>Help</a></li></ul><p>Default off:</p><ul><li>None</li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_13_TITLE="Editors"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_14_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_14_INTROTEXT="<p>These plugins are the buttons found beneath your editor. They only run when an editor plugin runs.</p><p>Default on:</p><ul><li>Editor Button: Image<a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Button_-_Image'> Help</a></li><li>Editor Button: Readmore <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Button_-_Readmore'>Help</a></li><li>Editor Button: Page Break <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Button_-_Pagebreak'>Help</a></li><li>Editor Button: Article <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Button_-_Article'>Help</a></li></ul><p>Default off:</p><ul><li>None</li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_14_TITLE="Editors-xtd"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_15_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_15_INTROTEXT="<p>This module allows the displaying of a syndicated feed. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Feed_Display' title='Feed Display Module'>Help</a></p><div class='sample-module'>{loadmodule feed,Feed Display}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_15_TITLE="Feed Display"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_16_FULLTEXT="<p>Quisque a massa sed libero tristique suscipit. Morbi tristique molestie metus, vel vehicula nisl ultrices pretium. Sed sit amet est et sapien condimentum viverra. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Phasellus viverra tortor porta orci convallis ac cursus erat sagittis. Vivamus aliquam, purus non luctus adipiscing, orci urna imperdiet eros, sed tincidunt neque sapien et leo. Cras fermentum, dolor id tempor vestibulum, neque lectus luctus mauris, nec congue tellus arcu nec augue. Nulla quis mi arcu, in bibendum quam. Sed placerat laoreet fermentum. In varius lobortis consequat. Proin vulputate felis ac arcu lacinia adipiscing. Morbi molestie, massa id sagittis luctus, sem sapien sollicitudin quam, in vehicula quam lectus quis augue. Integer orci lectus, bibendum in fringilla sit amet, rutrum eget enim. Curabitur at libero vitae lectus gravida luctus. Nam mattis, ligula sit amet vestibulum feugiat, eros sem sodales mi, nec dignissim ante elit quis nisi. Nulla nec magna ut leo convallis sagittis ac non erat. Etiam in augue nulla, sed tristique orci. Vestibulum quis eleifend sapien.</p><p>Nam ut orci vel felis feugiat posuere ut eu lorem. In risus tellus, sodales eu eleifend sed, imperdiet id nulla. Nunc at enim lacus. Etiam dignissim, arcu quis accumsan varius, dui dui faucibus erat, in molestie mauris diam ac lacus. Sed sit amet egestas nunc. Nam sollicitudin lacinia sapien, non gravida eros convallis vitae. Integer vehicula dui a elit placerat venenatis. Nullam tincidunt ligula aliquet dui interdum feugiat. Maecenas ultricies, lacus quis facilisis vehicula, lectus diam consequat nunc, euismod eleifend metus felis eu mauris. Aliquam dapibus, ipsum a dapibus commodo, dolor arcu accumsan neque, et tempor metus arcu ut massa. Curabitur non risus vitae nisl ornare pellentesque. Pellentesque nec ipsum eu dolor sodales aliquet. Vestibulum egestas scelerisque tincidunt. Integer adipiscing ultrices erat vel rhoncus.</p><p>Integer ac lectus ligula. Nam ornare nisl id magna tincidunt ultrices. Phasellus est nisi, condimentum at sollicitudin vel, consequat eu ipsum. In venenatis ipsum in ligula tincidunt bibendum id et leo. Vivamus quis purus massa. Ut enim magna, pharetra ut condimentum malesuada, auctor ut ligula. Proin mollis, urna a aliquam rutrum, risus erat cursus odio, a convallis enim lectus ut lorem. Nullam semper egestas quam non mattis. Vestibulum venenatis aliquet arcu, consectetur pretium erat pulvinar vel. Vestibulum in aliquet arcu. Ut dolor sem, pellentesque sit amet vestibulum nec, tristique in orci. Sed lacinia metus vel purus pretium sit amet commodo neque condimentum.</p><p>Aenean laoreet aliquet ullamcorper. Nunc tincidunt luctus tellus, eu lobortis sapien tincidunt sed. Donec luctus accumsan sem, at porttitor arcu vestibulum in. Sed suscipit malesuada arcu, ac porttitor orci volutpat in. Vestibulum consectetur vulputate eros ut porttitor. Aenean dictum urna quis erat rutrum nec malesuada tellus elementum. Quisque faucibus, turpis nec consectetur vulputate, mi enim semper mi, nec porttitor libero magna ut lacus. Quisque sodales, leo ut fermentum ullamcorper, tellus augue gravida magna, eget ultricies felis dolor vitae justo. Vestibulum blandit placerat neque, imperdiet ornare ipsum malesuada sed. Quisque bibendum quam porta diam molestie luctus. Sed metus lectus, ornare eu vulputate vel, eleifend facilisis augue. Maecenas eget urna velit, ac volutpat velit. Nam id bibendum ligula. Donec pellentesque, velit eu convallis sodales, nisi dui egestas nunc, et scelerisque lectus quam ut ipsum.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_16_INTROTEXT="<p><em>Lorem Ipsum is filler text that is commonly used by designers before the content for a new site is ready.</em></p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed faucibus purus vitae diam posuere nec eleifend elit dictum. Aenean sit amet erat purus, id fermentum lorem. Integer elementum tristique lectus, non posuere quam pretium sed. Quisque scelerisque erat at urna condimentum euismod. Fusce vestibulum facilisis est, a accumsan massa aliquam in. In auctor interdum mauris a luctus. Morbi euismod tempor dapibus. Duis dapibus posuere quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In eu est nec erat sollicitudin hendrerit. Pellentesque sed turpis nunc, sit amet laoreet velit. Praesent vulputate semper nulla nec varius. Aenean aliquam, justo at blandit sodales, mauris leo viverra orci, sed sodales mauris orci vitae magna.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_16_TITLE="First Blog Post"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_17_FULLTEXT="<p>Nam eget venenatis lorem. Vestibulum a interdum sapien. Suspendisse potenti. Quisque auctor purus nec sapien venenatis vehicula malesuada velit vehicula. Fusce vel diam dolor, quis facilisis tortor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Pellentesque libero nisi, pellentesque quis cursus sit amet, vehicula vitae nisl. Curabitur nec nunc ac sem tincidunt auctor. Phasellus in mattis magna. Donec consequat orci eget tortor ultricies rutrum. Mauris luctus vulputate molestie. Proin tincidunt vehicula euismod. Nam congue leo non erat cursus a adipiscing ipsum congue. Nulla iaculis purus sit amet turpis aliquam sit amet dapibus odio tincidunt. Ut augue diam, congue ut commodo pellentesque, fermentum mattis leo. Sed iaculis urna id enim dignissim sodales at a ipsum. Quisque varius lobortis mollis. Nunc purus magna, pellentesque pellentesque convallis sed, varius id ipsum. Etiam commodo mi mollis erat scelerisque fringilla. Nullam bibendum massa sagittis diam ornare rutrum.</p><p>Praesent convallis metus ut elit faucibus tempus in quis dui. Donec fringilla imperdiet nibh, sit amet fringilla velit congue et. Quisque commodo luctus ligula, vitae porttitor eros venenatis in. Praesent aliquet commodo orci id varius. Nulla nulla nibh, varius id volutpat nec, sagittis nec eros. Cras et dui justo. Curabitur malesuada facilisis neque, sed tempus massa tincidunt ut. Sed suscipit odio in lacus auctor vehicula non ut lacus. In hac habitasse platea dictumst. Sed nulla nisi, lacinia in viverra at, blandit vel tellus. Nulla metus erat, ultrices non pretium vel, varius nec sem. Morbi sollicitudin mattis lacus quis pharetra. Donec tincidunt mollis pretium. Proin non libero justo, vitae mattis diam. Integer vel elit in enim varius posuere sed vitae magna. Duis blandit tempor elementum. Vestibulum molestie dui nisi.</p><p>Curabitur volutpat interdum lorem sed tempus. Sed placerat quam non ligula lacinia sodales. Cras ultrices justo at nisi luctus hendrerit. Quisque sit amet placerat justo. In id sapien eu neque varius pharetra sed in sapien. Etiam nisl nunc, suscipit sed gravida sed, scelerisque ut nisl. Mauris quis massa nisl, aliquet posuere ligula. Etiam eget tortor mauris. Sed pellentesque vestibulum commodo. Mauris vitae est a libero dapibus dictum fringilla vitae magna.</p><p>Nulla facilisi. Praesent eget elit et mauris gravida lobortis ac nec risus. Ut vulputate ullamcorper est, volutpat feugiat lacus convallis non. Maecenas quis sem odio, et aliquam libero. Integer vel tortor eget orci tincidunt pulvinar interdum at erat. Integer ullamcorper consequat eros a pellentesque. Cras sagittis interdum enim in malesuada. Etiam non nunc neque. Fusce non ligula at tellus porta venenatis. Praesent tortor orci, fermentum sed tincidunt vel, varius vel dui. Duis pulvinar luctus odio, eget porta justo vulputate ac. Nulla varius feugiat lorem sed tempor. Phasellus pulvinar dapibus magna eget egestas. In malesuada lectus at justo pellentesque vitae rhoncus nulla ultrices. Proin ut sem sem. Donec eu suscipit ipsum. Cras eu arcu porttitor massa feugiat aliquet at quis nisl.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_17_INTROTEXT="<p><em>Lorem Ipsum is text that is traditionally used by designers when working on a site before the content is ready.</em></p><p>Pellentesque bibendum metus ut dolor fermentum ut pulvinar tortor hendrerit. Nam vel odio vel diam tempus iaculis in non urna. Curabitur scelerisque, nunc id interdum vestibulum, felis elit luctus dui, ac dapibus tellus mauris tempus augue. Duis congue facilisis lobortis. Phasellus neque erat, tincidunt non lacinia sit amet, rutrum vitae nunc. Sed placerat lacinia fermentum. Integer justo sem, cursus id tristique eget, accumsan vel sapien. Curabitur ipsum neque, elementum vel vestibulum ut, lobortis a nisl. Fusce malesuada mollis purus consectetur auctor. Morbi tellus nunc, dapibus sit amet rutrum vel, laoreet quis mauris. Aenean nec sem nec purus bibendum venenatis. Mauris auctor commodo libero, in adipiscing dui adipiscing eu. Praesent eget orci ac nunc sodales varius.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_17_TITLE="Second Blog Post"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_18_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_18_INTROTEXT="<p>This module shows the Joomla! copyright information. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Footer' title='Footer Module'>Help</a></p><div class='sample-module'>{loadmodule footer,Footer}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_18_TITLE="Footer Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_19_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_19_INTROTEXT="<h2>Welcome to the Fruit Shop</h2><p>We sell fruits from around the world. Please use our website to learn more about our business. We hope you will come to our shop and buy some fruit.</p><p><em>This mini site will show you how you might want to set up a site for a business, in this example one selling fruit. It shows how to use access controls to manage your site content. If you were building a real site, you might want to extend it with e-commerce, a catalog, mailing lists or other enhancements, many of which are available through the</em><a href='http://extensions.joomla.org'><em> Joomla! Extensions Directory</em></a>.</p><p><em>To understand this site you will probably want to make one user with group set to customer and one with group set to grower. By logging in with different privileges you can see how access control works.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_19_TITLE="Fruit Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_20_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_20_INTROTEXT="<p><img class='image-left' src='administrator/templates/hathor/images/header/icon-48-help_header.png' border='0' /> There are lots of places you can get help with Joomla!. In many places in your site administrator you will see the help icon. Click on this for more information about the options and functions of items on your screen. Other places to get help are:</p><ul><li><a href='http://forum.joomla.org'>Support Forums</a></li><li><a href='https://docs.joomla.org'>Documentation</a></li><li><a href='http://resources.joomla.org'>Professionals</a></li><li><a href='http://shop.joomla.org/amazoncom-bookstores.html'>Books</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_20_TITLE="Getting Help"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_21_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_21_INTROTEXT="<p>It's easy to get started creating your website. Knowing some of the basics will help.</p><h3>What is a Content Management System?</h3><p>A content management system is software that allows you to create and manage webpages easily by separating the creation of your content from the mechanics required to present it on the web.</p><p>In this site, the content is stored in a <em>database</em>. The look and feel are created by a <em>template</em>. The Joomla! software brings together the template and the content to create web pages.</p><h3>Site and Administrator</h3><p>Your site actually has two separate sites. The site (also called the front end) is what visitors to your site will see. The administrator (also called the back end) is only used by people managing your site. You can access the administrator by clicking the \"Site Administrator\" link on the \"This Site\" menu or by adding /administrator to the end of you domain name.</p><p>Log in to the administrator using the username and password created during the installation of Joomla.</p><h3>Logging in</h3><p>To login to the front end of your site use the login form or the login menu link on the \"This Site\" menu. Use the user name and password that were created as part of the installation process. Once logged-in you will be able to create and edit articles.</p><p>In managing your site, you will be able to create content that only logged-in users are able to see.</p><h3>Creating an article</h3><p>Once you are logged-in, a new menu will be visible. To create a new article, click on the \"submit article\" link on that menu.</p><p>The new article interface gives you a lot of options, but all you need to do is add a title and put something in the content area. To make it easy to find, set the state to published and put it in the Joomla category.</p><div>You can edit an existing article by clicking on the edit icon (this only displays to users who have the right to edit).</div><h3>Learn more</h3><p>There is much more to learn about how to use Joomla! to create the web site you envision. You can learn much more at the <a href='https://docs.joomla.org'>Joomla! documentation site</a> and on the<a href='http://forum.joomla.org'> Joomla! forums</a>.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_21_TITLE="Getting Started"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_22_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_22_INTROTEXT="<p>At our orchard we grow the world's best oranges as well as other citrus fruit such as lemons and grapefruit. Our family has been tending this orchard for generations.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_22_TITLE="Happy Orange Orchard"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_23_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_23_INTROTEXT="<p>Thanks for helping us to test Joomla!</p><p>We're getting ready for the release of Joomla and we appreciate you helping us find and fix problems as we work.</p><p>If you haven't done testing before here are some tips.</p><ul><li>Don't delete the installation folder when you finish installing! While we're working we turn that security feature off to make it easier to test.</li><li>Go to global configuration and set Error Reporting to Development (that's on the server tab) and enable both debugging and language debugging (those are on the system tab). Don't worry when you see ** around words --that means Joomla translation is doing its job.</li></ul><p>How to test</p><ul><li>First, do the things you normally do and see if you spot any problems.</li><li>Look at all of the front end views and record any problems</li><li>Look at all the back end views and report any problems</li><li>See more ideas below</li></ul><p>What to look for</p><ul><li>Any error messages that say things like Fatal Error or Strict or similar things that indicate that something is not working correctly.</li><li>Untranslated strings. You will know these because they look like this: ?STRING_HERE?</li><li>Problems of rendering--items not aligned correctly, missing or wrong images, pages that just don't look right.</li><li>Unexpected behavior--anything that is working differently than it did in 2.5.</li></ul><p>Report problems</p><p>If you find a problem please report it to the <a href='http://issues.joomla.org' target='_blank'>CMS Issue Tracker</a>. You will need to register for a github.com account if you don't have one.</p><p>More Testing Ideas</p><ul><li>Pick one module or view and test all of the parameters.</li><li>Install an extension and see if anything breaks (report to the developer unless you are positive it is a core bug).</li><li>Turn on caching with different options</li><li>Try different session options</li><li>Install a language and test all the layouts.</li><li>Try different environments (like different servers which may have different version of PHP) or try you have IIS with MySQLi or SqlSrv. With millions of users Joomla needs to be ready for unusual environments.</li><li>Try with SEF URLS on or off and also with Apache rewrite on or off (if you are on Apache).</li><li>Try different combinations of browsers (Chrome, IE, FireFox, Opera to start) and operating systems (Mac, Windows, Linux).</li><li>Yes grammar and spelling errors are bugs too -- just keep in mind that we use British spelling.</li><li>Visit the <a href='http://issues.joomla.org' target='_blank'>Feature Tracker</a> and test a new feature.</li></ul><p>Testing changes</p><p>You can also help Joomla by testing bug fixes and new features. A useful tool is the <a href='https://github.com/joomla-extensions/patchtester/releases' target='_blank'>patchtester component</a> which helps to simplify and automate the process. Report your feedback on the <span style='line-height: 1.3em;'> </span><a style='line-height: 1.3em;' href='http://issues.joomla.org' target='_blank'>CMS Issue Tracker</a>. If you enjoy helping Joomla this way, you may want to join the <a href='https://docs.joomla.org/Bug_Squad' target='_blank'>Joomla Bug Squad</a>.</p><p></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_23_TITLE="Joomla! Testing"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_24_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_24_INTROTEXT="<p> </p><p> </p><p> </p><p> </p><p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_24_TITLE="Koala"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_25_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_25_INTROTEXT="<p>The language switcher module allows you to take advantage of the language tags that are available when content, modules and menu links are created.</p><p>This module displays a list of available Content Languages for switching between them.</p><p>When switching languages, it redirects to the Home page, or associated menu item, defined for the chosen language. Thereafter, the navigation will be the one defined for that language.</p><p><strong>The language filter plugin must be enabled for this module to work properly.</strong></p><p><strong></strong> <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Language_Switcher' title='Language Switcher Module'>Help</a></p><p>To view an example of the language switch moduler module, go to the site administrator and enable the language filter plugin and the language switcher module labelled \"language switcher\" and visit the fruit shop or park sample sites. Then follow<a href='https://docs.joomla.org/Language_Switcher_Tutorial'> the instructions in this tutorial</a>.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_25_TITLE="Language Switcher"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_26_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_26_INTROTEXT="<p>This module shows a list of the most recently published and current Articles. Some that are shown may have expired even though they are the most recent. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Latest_News' title='Latest Articles'>Help</a></p><div class='sample-module'>{loadmodule articles_latest,Latest News}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_26_TITLE="Latest Articles Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_27_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_27_INTROTEXT="<p>This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in the Global Configuration settings), another link will be shown to enable self-registration for users. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Login' title='Login'>Help</a></p><div class='sample-module'>{loadmodule login,login}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_27_TITLE="Login Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_28_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_28_INTROTEXT="<p>This module displays a menu on the site (frontend).  Menus can be displayed in a wide variety of ways by using the menu options and css menu styles. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Menu'>Help</a></p><div class='sample-module'>{loadmodule mod_menu,Menu Example}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_28_TITLE="Menu Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_29_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_29_INTROTEXT="<p>This module shows a list of the currently published Articles which have the highest number of page views. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Most_Read' title='Most Read Content'>Help</a></p><div class='sample-module'>{loadmodule articles_popular,Articles Most Read}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_29_TITLE="Most Read Content"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_30_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_30_INTROTEXT="<p>Displays a set number of articles from a category based on date or random selection. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Articles_Newsflash' title='News Flash Module'>Help</a></p><div class='sample-module'>{loadmodule articles_news,News Flash}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_30_TITLE="News Flash"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_31_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_31_INTROTEXT="<p>As you make your Joomla! site you will control the details of the display using <em>options</em> also referred to as <em>parameter</em><strong>s</strong>. Options control everything from whether the author's name is displayed to who can view what to the number of items shown on a list.</p><p>Default options for each component are changed using the Options button on the component toolbar.</p><p>Options can also be set on an individual item, such as an article or contact and in menu links.</p><p>If you are happy with how your site looks, it is fine to leave all of the options set to the defaults that were created when your site was installed. As you become more experienced with Joomla you will use options more.</p><p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_31_TITLE="Options"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_32_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_32_INTROTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_32_TITLE="Phyllopteryx"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_33_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_33_INTROTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_33_TITLE="Pinnacles"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_34_FULLTEXT="<p>Working with multiple template styles and overrides for the same views, creating the design you want is easier than it has ever been. Limiting support to PHP 5.2.4 and above makes Joomla lighter and faster than ever. Languages files can now be overridden without having your changes lost during an upgrade.  With the proper xml your users update extensions with a single click.</p><p>Access control lists are now incorporated using a new system developed for Joomla. The ACL system is designed with developers in mind, so it is easy to incorporate into your extensions. The new nested sets libraries allow you to incorporate infinitely deep categories but also to use nested sets in a variety of other ways.</p><p>A new forms library makes creating all kinds of user interaction simple. MooTools 1.3 provides a highly flexible javascript framework that is a major advance over MooTools 1.0.</p><p>New events throughout the core make integration of your plugins where you want them a snap.</p><p>The separation of the Joomla! Platform project from the Joomla! CMS project makes continuous development of new, powerful APIs  and continuous improvement of existing APIs possible while maintaining the stability of the CMS that millions of webmasters and professionals rely upon.</p><p>Learn about:</p><ul><li><a href='https://docs.joomla.org/Joomla_3_FAQ#What_are_the_major_differences_between_Joomla.21_2.5_and_3.3F'>Changes since 1.5</a></li><li><a href='https://docs.joomla.org/ACL_Tutorial_for_Joomla_1.6'>Working with ACL</a></li><li><a href='https://docs.joomla.org/API16:JCategories'>Working with nested categories</a></li><li><a href='https://docs.joomla.org/API16:JForm'>Forms library</a></li><li><a href='https://docs.joomla.org/Working_with_Mootools_1.3'>Working with Mootools 1.3</a></li><li><a href='https://docs.joomla.org/Layout_Overrides_in_Joomla_1.6'>Using new features of the override system</a></li><li><a href='https://api.joomla.org'>Joomla! API</a></li><li><a href='https://docs.joomla.org/API16:JDatabaseQuery'>Using JDatabaseQuery</a></li><li><a href='https://docs.joomla.org/What's_new_in_Joomla_1.6#Events'>New and updated events</a></li><li><a href='https://docs.joomla.org/J2.5:Xml-rpc_changes_in_Joomla!'>Xmlrpc</a></li><li><a href='https://docs.joomla.org/What's_new_in_Joomla_1.6#Extension_management'>Installing and updating extensions</a></li><li><a href='https://docs.joomla.org/Setting_up_your_workstation_for_Joomla!_development'>Setting up your development environment</a></li><li><a href='github.com/joomla'>The Joomla! Platform Repository</a> </li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_34_INTROTEXT="<p>Joomla! 2.5 continues development of the Joomla Framework and CMS as a powerful and flexible way to bring your vision of the web to reality. With the administrator now fully MVC, the ability to control its look and the management of extensions is now complete.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_34_TITLE="Professionals"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_35_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_35_INTROTEXT="<p>This module displays a random image from your chosen image directory. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Random_Image' title='Random Image Module'>Help</a></p><div class='sample-module'>{loadmodule random_image,Random Image}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_35_TITLE="Random Image Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_36_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_36_INTROTEXT="<p>This module displays other Articles that are related to the one currently being viewed. These relations are established by the Meta Keywords.  All the keywords of the current Article are searched against all the keywords of all other published articles. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Articles_Related' title='Related Items Module'>Help</a></p><div class='sample-module'>{loadmodule related_items,Articles Related Items}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_36_TITLE="Related Items Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_37_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_37_INTROTEXT="<p>Your installation includes sample data, designed to show you some of the options you have for building your website. In addition to information about Joomla! there are two sample \"sites within a site\" designed to help you get started with building your own site.</p><p>The first site is a simple site about <a href='index.php?Itemid=243'>Australian Parks</a>. It shows how you can quickly and easily build a personal site with just the building blocks that are part of Joomla. It includes a personal blog, weblinks, and a very simple image gallery.</p><p>The second site is slightly more complex and represents what you might do if you are building a site for a small business, in this case a <a href='index.php/welcome.html'></a><a href='index.php?Itemid=429'>Fruit Shop</a>.</p><p>In building either style site, or something completely different, you will probably want to add <a href='http://extensions.joomla.org'>extensions</a> and either create or purchase your own template. Many Joomla users start by modifying the <a href='https://docs.joomla.org/Modifying_a_Joomla!_Template'>templates</a> that come with the core distribution so that they include special images and other design elements that relate to their site's focus.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_37_TITLE="Sample Sites"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_38_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_38_INTROTEXT="<p>Joomla! 2.5 offers two search options.</p><p>The Basic Search component provides basic search functionality for the information contained in your core components. Many extensions can also be searched by the search component. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Components_Search'>Help</a></p><p>The Smart Search component offers searching similar to that found in major search engines. Smart Search is disabled by default. If you choose to enable it you will need to take several steps. First, enable the Smart Search Plugin in the plugin manager. Then, if you are using the Basic Search Module replace it with the Smart Search Module. Finally, if you have already created content, go to the Smart Search component in your site administrator and click the Index icon. Once indexing of your content is complete, Smart Search will be ready to use. Help.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_38_TITLE="Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_39_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_39_INTROTEXT="<p>This module will display a search box. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Search' title='Search'>Help</a></p><div class='sample-module'>{loadmodule search,Search}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_39_TITLE="Search Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_40_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_40_INTROTEXT="<p>The search component uses plugins to control which parts of your Joomla! site are searched. You may choose to turn off some areas to improve performance or for other reasons. Many third party Joomla! extensions have search plugins that extend where search takes place.</p><p>Default On:</p><ul><li>Content <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Search_-_Content'>Help</a></li><li>Contacts <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Search_-_Contacts'>Help</a></li><li>Weblinks <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Search_-_Weblinks'>Help</a></li><li>News Feeds <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Search_-_Newsfeeds'>Help</a></li><li>Categories <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Search_-_Categories'>Help</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_40_TITLE="Search "
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_41_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_41_INTROTEXT="<p>{loadposition sitemapload}</p><p><em>By putting all of your content into nested categories you can give users and search engines access to everything using a menu.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_41_TITLE="Site Map"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_42_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_42_INTROTEXT="<p> </p><p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_42_TITLE="Spotted Quoll"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_43_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_43_INTROTEXT="<p>This module shows information about your server installation together with statistics on the Web site users, number of Articles in your database and the number of Web links you provide.</p><div class='sample-module'>{loadmodule mod_stats,Statistics}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_43_TITLE="Statistics Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_44_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_44_INTROTEXT="<p>The syndicate module will display a link that allows users to take a feed from your site. It will only display on pages for which feeds are possible. That means it will not display on single article, contact or weblinks pages, such as this one. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Syndication_Feeds' title='Synicate Module'>Help</a></p><div class='sample-module'>{loadposition syndicate,Syndicate}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_44_TITLE="Syndicate Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_45_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_45_INTROTEXT="<p>System plugins operate every time a page on your site loads. They control such things as your URLS, whether users can check a \"remember me\" box on the login module, and whether caching is enabled. New is the redirect plugin that together with the redirect component will assist you in managing changes in URLs.</p><p>Default on:</p><ul><li>Remember me <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#System_-_Remember_Me'>Help</a></li><li>SEF <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#System_-_SEF'>Help</a></li><li>Debug <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#System_-_Debug'>Help</a></li></ul><p>Default off:</p><ul><li>Cache <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#System_-_Cache'>Help</a></li><li>Log <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#System_-_Log'>Help</a></li><li>Redirect <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#System_-_Redirect'>Help</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_45_TITLE="System"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_46_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_46_INTROTEXT="<p>Joomla means All Together, and it is a community of people all working and having fun together that makes Joomla possible. Thousands of people each year participate in the Joomla community, and we hope you will be one of them.</p><p>People with all kinds of skills, of all skill levels and from around the world are welcome to join in. Participate in the <a href='http://joomla.org'>Joomla.org</a> family of websites (the<a href='http://forum.joomla.org'> forum </a>is a great place to start). Come to a <a href='http://community.joomla.org/events.html'>Joomla! event</a>. Join or start a <a href='http://community.joomla.org/user-groups.html'>Joomla! Users Group</a>. Whether you are a developer, site administrator, designer, end user or fan, there are ways for you to participate and contribute.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_46_TITLE="The Joomla! Community"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_47_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_47_INTROTEXT="<p>The Joomla Project consists of all of the people who make and support the Joomla Web Platform and Content Management System.</p><p>Our mission is to provide a flexible platform for digital publishing and collaboration.</p><p>The core values are:</p><ul><li>Freedom</li><li>Equality</li><li>Trust</li><li>Community</li><li>Collaboration</li><li>Usability</li></ul><p>In our vision, we see:</p><ul><li>People publishing and collaborating in their communities and around the world</li><li>Software that is free, secure, and high-quality</li><li>A community that is enjoyable and rewarding to participate in</li><li>People around the world using their preferred languages</li><li>A project that acts autonomously</li><li>A project that is socially responsible</li><li>A project dedicated to maintaining the trust of its users</li></ul><p>There are millions of users around the world and thousands of people who contribute to the Joomla Project. They work in three main groups: the Production Working Group, responsible for everything that goes into software and documentation; the Community Working Group, responsible for creating a nurturing the community; and Open Source Matters, the non profit organization responsible for managing legal, financial and organizational issues.</p><p>Joomla is a free and open source project, which uses the GNU General Public License version 2 or later.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_47_TITLE="The Joomla! Project"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_48_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_48_INTROTEXT="<h1>H1 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmonpqrstuvwzyz</h1><h2>H2 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmonpqrstuvwzyz</h2><h3>H3 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmonpqrstuvwzyz</h3><h4>H4 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmonpqrstuvwzyz</h4><h5>H5 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmonpqrstuvwzyz</h5><h6>H6 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmonpqrstuvwzyz</h6><p>P The quick brown fox ran over the lazy dog. THE QUICK BROWN FOX RAN OVER THE LAZY DOG.</p><ul><li>Item</li><li>Item</li><li>Item<br /> <ul><li>Item</li><li>Item</li><li>Item<br /> <ul><li>Item</li><li>Item</li><li>Item</li></ul></li></ul></li></ul><ol><li>tem</li><li>Item</li><li>Item<br /> <ol><li>Item</li><li>Item</li><li>Item<br /><ol><li>Item</li><li>Item</li><li>Item</li></ol></li></ol> </li></ol>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_48_TITLE="Typography"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_49_FULLTEXT="<p>The new user manager will let you manage who has access to what in your site. You can leave access groups exactly the way you had them in Joomla 1.5 or make them as complicated as you want. You can learn more about<a href='https://docs.joomla.org/J2.5:Access_Control_List_Tutorial'> how access control works</a> in on the <a href='https://docs.joomla.org'>Joomla! Documentation site</a></p><p>In Joomla 1.5 and 1.0 content was organized into sections and categories. From 1.6 forward sections are gone, and you can create categories within categories, going as deep as you want. The sample data provides many examples of the use of nested categories.</p><p>All layouts have been redesigned to improve accessibility and flexibility. </p><p>Updating your site and extensions when needed is easier than ever thanks to installer improvements.</p><p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_49_INTROTEXT="<p>If you are an experienced Joomla! 1.5 user, this Joomla site will seem very familiar. There are new templates and improved user interfaces, but most functionality is the same. The biggest changes are improved access control (ACL) and nested categories. This release of Joomla has strong continuity with Joomla! 1.7 while adding enhancements.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_49_TITLE="Upgraders"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_50_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_50_INTROTEXT="<p>Default on:</p><ul><li>Joomla <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#User_-_Joomla.21'>Help</a></li></ul><p>Default off:</p><p>Two new plugins are available but are disabled by default.</p><ul><li>Contact Creator <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#User_-_Contact_Creator'>Help</a><br />Creates a new linked contact record for each new user created.</li><li>Profile <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#User_-_Profile'>Help</a><br />This example profile plugin allows you to insert additional fields into user registration and profile display. This is intended as an example of the types of extensions to the profile you might want to create.</li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_50_TITLE="User"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_51_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_51_INTROTEXT="<p>The users extension lets your site visitors register, login and logout, change their passwords and other information, and recover lost passwords. In the administrator it allows you to create, block and manage users and create user groups and access levels. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Users_User_Manager'>Help</a></p><p>Please note that some of the user views will not display if you are not logged-in to the site.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_51_TITLE="Users"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_52_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_52_INTROTEXT="<p>With Joomla you can create anything from a simple personal website to a complex ecommerce or social site with millions of visitors.</p><p>This section of the sample data provides you with a brief introduction to Joomla concepts and reference material to help you understand how Joomla works.</p><p><em>When you no longer need the sample data, you can can simply unpublish the sample data category found within each extension in the site administrator or you may completely delete each item and all of the categories. </em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_52_TITLE="Using Joomla!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_53_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_53_INTROTEXT="<p>The Who's Online Module displays the number of Anonymous Users (e.g. Guests) and Registered Users (ones logged-in) that are currently accessing the Web site. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Who_Online' title='Who's Online'>Help</a></p><div class='sample-module'>{loadmodule whosonline,Who's Online}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_53_TITLE="Who's Online"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_54_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_54_INTROTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_54_TITLE="Wobbegone"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_55_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_55_INTROTEXT="<p>Watermelon is a wonderful and healthy treat. We grow the world's sweetest watermelon. We have the largest watermelon patch in our country.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_55_TITLE="Wonderful Watermelon"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_56_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_56_INTROTEXT="<p>This module shows an iFrame window to specified location. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Wrapper' title='Wrapper Module'>Help</a></p><div class='sample-module'>{loadmodule wrapper,Wrapper}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_56_TITLE="Wrapper Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_57_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_57_INTROTEXT="<p>News Feeds (com_newsfeeds) provides a way to organize and present news feeds. News feeds are a way that you present information from another site on your site. For example, the joomla.org website has numerous feeds that you can incorporate on your site. You an use menus to present a single feed, a list of feeds in a category, or a list of all feed categories. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Components_Newsfeeds_Feeds'>Help</a></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_57_TITLE="News Feeds"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_58_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_58_INTROTEXT="<p>Breadcrumbs provide a pathway for users to navigate through the site. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Breadcrumbs' title='Breacrumbs Module'>Help</a></p><div class='sample-module'>{loadmodule breadcrumbs,breadcrumbs}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_58_TITLE="Breadcrumbs Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_59_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_59_INTROTEXT="<p>Content plugins run when specific kinds of pages are loaded. They do things ranging from protecting email addresses from harvesters to creating page breaks.</p><p>Default on:</p><ul><li>Email Cloaking <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Content_-_Email_Cloaking'>Help</a></li><li>Load Module <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Content_-_Load_Modules'>Help</a></li><li>Page Break <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Content_-_Pagebreak'>Help</a></li><li>Page Navigation<a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Content_-_Page_Navigation'> Help</a></li><li>Vote <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit#Content_-_Vote'>Help</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_59_TITLE="Content"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_60_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_60_INTROTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_60_TITLE="Blue Mountain Rain Forest"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_61_FULLTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_61_INTROTEXT="<p> </p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_61_TITLE="Ormiston Pound"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_62_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_62_INTROTEXT="<p>This module displays the latest registered users. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Latest_Users'>Help</a></p><div class='sample-module'>{loadmodule users_latest,Users Latest}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_62_TITLE="Latest Users Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_63_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_63_INTROTEXT="<p>This article deliberately archived as an example.</p><p>As with previous releases, Joomla! provides a unified and easy-to-use framework for delivering content for Web sites of all kinds. To support the changing nature of the Internet and emerging Web technologies, Joomla! required substantial restructuring of its core functionality and we also used this effort to simplify many challenges within the current user interface. Joomla! 1.5 has many new features.</p><p style='margin-bottom: 0in;'>In Joomla! 1.5, you''ll notice:</p><ul><li>Substantially improved usability, manageability, and scalability far beyond the original Mambo foundations</li><li>Expanded accessibility to support internationalisation, double-byte characters and right-to-left support for Arabic, Farsi, and Hebrew languages among others</li><li>Extended integration of external applications through Web services</li><li>Enhanced content delivery, template and presentation capabilities to support accessibility standards and content delivery to any destination</li><li>A more sustainable and flexible framework for Component and Extension developers</li><li>Backward compatibility with previous releases of Components, Templates, Modules, and other Extensions</li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_63_TITLE="What's New in 1.5?"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_64_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_64_INTROTEXT="<p>The Captcha plugins are used to prevent spam submissions on your forms such as registration, contact and login. You basic installation of Joomla includes one Captcha plugin which leverages the ReCaptcha&reg; service but you may install other plugins connecting to different Captcha systems.</p><p>Default on:</p><ul><li>ReCaptcha <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit'>help</a></li></ul><p>Note: ReCaptcha is a the trademark of Google Inc. and is an independent product not associated with or endorsed by the Joomla Project. You will need to register and agree to the Terms of Service at Recaptcha.net to use this plugin. Complete instructions are available if you edit the ReCaptcha plugin in the Plugin Manager.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_64_TITLE="Captcha"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_65_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_65_INTROTEXT="<p> The Quick Icon plugin group is used to provide notification that updates to Joomla! or installed extensions are available and should be applied. These notifications display on your administrator control panel, which is the page you see when you first log in to your site administrator.</p><p>Default on:</p><ul><li>Quick icon - Joomla! extensions updates notification <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit'>Help</a>.</li><li>Quick icon - Joomla! update notification <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Plugin_Manager_Edit'>Help</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_65_TITLE="Quick Icons"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_66_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_66_INTROTEXT="<p>This module provides search using the Smart Search component. You should only use it if you have indexed your content and either have enabled the Smart Search content plugin or are keeping the index of your site updated manually. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;amp;keyref=Help31:Extensions_Module_Manager_Smart_Search'>Help</a>.</p><div class='sample-module'>{loadmodule finder,Smart Search}</div>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_66_TITLE="Smart Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_67_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_67_INTROTEXT="<p>The similar tags modules shows a list of items which have the same or a similar set of tags.</p><p>{loadmodule tags_similar,Similar Tags}</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_67_TITLE="Similar Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_68_FULLTEXT=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_68_INTROTEXT="<p>The Popular Tags displays a list of the most commonly uses tags. It offers both a list and a tag cloud layout.</p><p>{loadmodule tags_popular,Popular Tags}</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_68_TITLE="Popular Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE="Sample Data-Articles"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_TITLE="Joomla!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_DESC="<p>The Joomla! content management system lets you create webpages of various types using extensions. There are 5 basic types of extensions: components, modules, templates, languages, and plugins. Your website includes the extensions you need to create a basic website in English, but thousands of additional extensions of all types are available. The <a href='http://extensions.joomla.org'>Joomla! Extensions Directory</a> is the largest directory of Joomla extensions.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_TITLE="Extensions"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_0_DESC="<p><img class='image-left' src='administrator/templates/hathor/images/header/icon-48-component.png' border='0' alt='Component Image' />Components are larger extensions that produce the major content for your site. Each component has one or more 'views' that control how content is displayed. In the Joomla administrator there are additional extensions such as Menus, Redirection, and the extension managers.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_0_TITLE="Components"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_DESC="<p><img class='image-left' src='administrator/templates/hathor/images/header/icon-48-module.png' border='0' alt='Media Image' />Modules are small blocks of content that can be displayed in positions on a web page. The menus on this site are displayed in modules. The core of Joomla! includes 24 separate modules ranging from login to search to random images. Each module has a name that starts mod_ but when it displays it has a title. In the descriptions in this section, the titles are the same as the names.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_TITLE="Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_0_DESC="<p>Content modules display article and other information from the content component.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_0_TITLE="Content Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_1_DESC="<p>User modules interact with the user system, allowing users to login, show who is logged-in, and showing the most recently registered users.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_1_TITLE="User Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_2_DESC="<p>These modules display information from components other than content and user. These include weblinks, news feeds and the media manager.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_2_TITLE="Display Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_3_DESC="<p>Utility modules provide useful functionality such as search, syndication and statistics.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_3_TITLE="Utility Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_4_DESC="<p>Navigation modules help your visitors move through your site and find what they need.</p><p>Menus provide your site with structure and help your visitors navigate your site.  Although they are all based on the same menu module, the variety of ways menus are used in the sample data show how flexible this module is.</p><p>A menu can range from extremely simple (for example the top menu or the menu for the Australian Parks sample site) to extremely complex (for example the About Joomla! menu with its many levels). They can also be used for other types of presentation such as the site map linked from the \"This Site\" menu.</p><p>Breadcrumbs provide users with information about where they are in a site.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_4_TITLE="Navigation Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_DESC="<p><img src='administrator/templates/hathor/images/header/icon-48-themes.png' border='0' alt='Media Image' align='left' />Templates give your site its look and feel. They determine layout, colours, typefaces, graphics and other aspects of design that make your site unique. Your installation of Joomla comes prepackaged with three front end templates and two backend templates. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Template_Manager_Templates'>Help</a></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_TITLE="Templates"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_5_DESC="<p><img src='templates/atomic/template_thumbnail.png' border='0' alt='The Atomic Template' style='border: 0; float: right;' /></p><p>Atomic is a minimal template designed to be a skeleton for making your own template and to learn about Joomla! templating.</p><ul><li><a href='index.php?Itemid=285'>Home Page</a></li><li><a href='index.php?Itemid=316'>Typography</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_5_TITLE="Atomic"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_6_DESC="<p><img src='templates/beez_20/template_thumbnail.png' border='0' alt='Beez_20 thumbnail' align='right' style='float: right;' /></p><p>Beez 2.0 is a versatile, easy to customise template that works for a variety of sites. It meets major accessibility standards and demonstrates a range of css and javascript techniques. It is the default template that installs with Joomla!</p><ul><li><a href='index.php?Itemid=424'>Home Page</a></li><li><a href='index.php?Itemid=423'>Typography</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_6_TITLE="Beez 20"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_7_DESC="<p><img src='templates/beez5/template_thumbnail.png' border='0' alt='Beez5 Thumbnail' align='right' style='float: right;' /></p><p>Beez 5 is an html5 implementation of a Joomla! template. It uses a number of html5 techniques to enhance the presentation of a site. It is used as the template for the Fruit Shop sample site.</p><ul><li><a href='index.php?Itemid=458'>Home Page</a></li><li><a href='index.php?Itemid=457'>Typography</a></li></ul>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_7_TITLE="Beez 5"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_3_DESC="<p><img src='administrator/templates/hathor/images/header/icon-48-language.png' border='0' alt='Languages Image' align='left' />Joomla! installs in English, but translations of the interfaces, sample data and help screens are available in dozens of languages. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Language_Manager_Installed'>Help</a></p><p><a href='http://community.joomla.org/translations.html'>Translation information</a></p><p>If there is no language pack available for your language, instructions are available for creating your own translation, which you can also contribute to the community by starting a translation team to create an accredited translation. </p><p>Translations of the interfaces are installed using the extensions manager in the site administrator and then managed using the language manager.</p><p>If you have two or more languages installed you may enable the language switcher plugin and module. They should always be used together. If you create multilingual content and mark your content, menu items or modules as being in specific languages and follow <a href='https://docs.joomla.org/Language_Switcher_Tutorial'>the complete instructions</a> your users will be able to select a specific content language using the module. By default both the plugin and module are disabled.</p><p>Joomla 2.5 installs with a language override manager that allows you to change the specific words (such as Edit or Search) used in the Joomla application.</p><p>There are a number of extensions that can help you manage translations of content available in the <a href='http://extensions.joomla.org'>Joomla! Extensions Directory</a>.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_3_TITLE="Languages"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_4_DESC="<p><img src='administrator/templates/hathor/images/header/icon-48-plugin.png' border='0' alt='Plugin Image' align='left' />Plugins are small task oriented extensions that enhance the Joomla! framework. Some are associated with particular extensions and others, such as editors, are used across all of Joomla. Most beginning users do not need to change any of the plugins that install with Joomla. <a href='https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Plugin_Manager_Edit'>Help</a></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_4_TITLE="Plugins"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_TITLE="Park Site"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_1_DESC="<p>Here is where I will blog all about the parks of Australia.</p><p><em>You can make a blog on your website by creating a category to write your blog posts in (this one is called Park Blog). Each blog post will be an article in that category. If you make a category blog menu link with 1 column it will look like this page, if you display the category description then this part is displayed. </em></p><p><em>To enhance your blog you may want to add extensions for <a href='http://extensions.joomla.org/extensions/contacts-and-feedback/articles-comments'>comments</a>, <a href='http://extensions.joomla.org/extensions/social-web'>interacting with social network sites</a>, <a href='http://extensions.joomla.org/extensions/content-sharing'>tagging</a>, and <a href='http://extensions.joomla.org/extensions/content-sharing'>keeping in contact with your readers</a>. You can also enable the syndication that is included in Joomla (in the Integration Options set Show Feed Link to Show and make sure to display the syndication module on the page).</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_1_TITLE="Park Blog"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_DESC="<p><img src='images/sampledata/parks/banner_cradle.jpg' border='0' /></p><p>These are my photos from parks I have visited (I didn't take them, they are all from <a href='http://commons.wikimedia.org/wiki/Main_Page'>Wikimedia Commons</a>).</p><p><em>This shows you how to make a simple image gallery using articles in com_content.</em></p><p><em>In each article put a thumbnail image before a 'readmore' and the full size image after it. Set the article to Show Intro Text: Hide.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_TITLE="Photo Gallery"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_5_TITLE="Animals"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_6_TITLE="Scenery"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_TITLE="Fruit Shop Site"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_3_DESC="<p>We search the whole countryside for the best fruit growers.</p><p><em>You can let each supplier have a page that he or she can edit. To see this in action you will need to create a user who is in the suppliers group.</em></p><p><em>Create one page in the growers category for that user and make that supplier the author of the page. That user will be able to edit his or her page.</em></p><p><em>This illustrates the use of the Edit Own permission.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_3_TITLE="Growers"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_4_DESC="<p>Customers and suppliers can post their favorite recipes for fruit here.</p><p>A good idea is to promote the use of metadata keywords to make finding other recipes for the same fruit easier.</p><p><em>To see this in action, create a user assigned to the customer group and a user assigned to the suppliers group. These users will be able to create their own recipe pages and edit those pages. They will not be able to edit other users pages.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_4_TITLE="Recipes"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_0_TITLE="Your Profile"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_1_TITLE="Joomla.org"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_2_TITLE="Single Contact"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_3_TITLE="Login"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_4_TITLE="Park Blog"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_5_TITLE="Sample Sites"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_6_TITLE="Write a Blog Post"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_7_TITLE="Parks Home"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_TITLE="Image Gallery"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_1_TITLE="Animals"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_2_TITLE="Scenery"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_9_TITLE="Contact Categories"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_PARAM_CATEGORIES_DESCRIPTION="Because this links to the root category the "uncategorised" category is displayed."
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_TITLE="News Feed Categories"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_11_TITLE="News Feed Category"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_12_TITLE="Single News Feed"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_13_TITLE="Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_14_TITLE="Archived Articles"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_15_TITLE="Single Article"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_16_TITLE="Article Category Blog"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_17_TITLE="Article Category List"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_18_TITLE="Featured Articles"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_19_TITLE="Submit Article"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_20_TITLE="Content Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_PARAM_PAGE_TITLE="Newsfeeds Categories View"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_TITLE="News Feeds Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_22_TITLE="Contact Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_23_TITLE="Users Component"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_24_TITLE="Article Categories"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_25_TITLE="Contact Single Category"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_26_TITLE="Search Components"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_TITLE="Using Joomla!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_TITLE="Using Extensions"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_TITLE="Templates"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_TITLE="Beez 2"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_2_TITLE="Typography Beez 2"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_3_TITLE="Home Page Beez 2"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_TITLE="Atomic"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_0_TITLE="Typography Atomic"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_1_TITLE="Home Page Atomic"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_TITLE="Beez5"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_4_TITLE="Typography Beez5"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_5_TITLE="Home Page Beez5"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_1_TITLE="Languages"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_TITLE="Plugins"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_0_TITLE="System"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_1_TITLE="Authentication"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_2_TITLE="Content"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_3_TITLE="Editors"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_4_TITLE="Editors Extended"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_5_TITLE="Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_6_TITLE="User"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_28_TITLE="Latest Users"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_29_TITLE="Who's Online"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_30_TITLE="Most Read"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_31_TITLE="Menu"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_32_TITLE="Statistics"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_33_TITLE="Banner"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_34_TITLE="Search Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_35_TITLE="Random Image"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_36_TITLE="News Flash"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_37_TITLE="Latest Articles"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_38_TITLE="Syndicate"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_39_TITLE="Login"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_40_TITLE="Wrapper"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_41_TITLE="Footer"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_42_TITLE="Archive"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_43_TITLE="Related Items"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_44_TITLE="Login Form"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_45_TITLE="User Profile"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_46_TITLE="Edit User Profile"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_47_TITLE="Registration Form"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_48_TITLE="Username Reminder Request"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_49_TITLE="Password Reset"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_50_TITLE="Feed Display"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_51_TITLE="Content Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_52_TITLE="User Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_53_TITLE="Breadcrumbs"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_54_TITLE="Custom HTML"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_55_TITLE="Fruit Encyclopedia"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_56_TITLE="Welcome"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_57_TITLE="Contact Us"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_58_TITLE="Growers"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_59_TITLE="Login Form"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_60_TITLE="Directions"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_61_TITLE="Testing Home"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_62_TITLE="Getting Started"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_63_TITLE="Article Categories"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_64_TITLE="Language Switcher"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_65_TITLE="Site Administrator"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_66_TITLE="Submit an Article"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_67_TITLE="Featured Contacts"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_68_TITLE="Article Category"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_69_TITLE="Add a recipe"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_70_TITLE="Recipes"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_71_TITLE="Smart Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_72_TITLE="Smart Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_73_TITLE="Similar Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_74_TITLE="Popular Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_75_TITLE="Compact Tagged"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_76_TITLE="Tagged Items"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_77_TITLE="All Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_78_TITLE="Site Settings"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_79_TITLE="Template Settings"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_X_TITLE="Foo"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_100_TITLE="Sample Sites"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_101_TITLE="Testing Home"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_102_TITLE="Parks"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_103_TITLE="Fruit Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_104_TITLE="Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_0_DESCRIPTION="A Menu for logged-in Users"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_0_TITLE="User Menu"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_1_DESCRIPTION="Links for major types of users"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_1_TITLE="Top"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_2_DESCRIPTION="All about Joomla!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_2_TITLE="About Joomla"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_3_DESCRIPTION="Main menu for a site about Australian park"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_3_TITLE="Australian Parks"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_4_DESCRIPTION="Simple Home Menu"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_4_TITLE="Main Menu Testing"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_5_DESCRIPTION="Menu for the sample shop site."
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_5_TITLE="Fruit Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_6_DESCRIPTION=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_6_TITLE="All Front End Views"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_7_DESCRIPTION=""
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_7_TITLE="All Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_0_TITLE="Main Menu Testing"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_1_TITLE="Book Store"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_1_FOOTEER_TEXT="Books!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_2_TITLE="User Menu"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_3_TITLE="Top"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_4_TITLE="Australian Parks"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_5_TITLE="A Deep Menu"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_6_TITLE="Site Map"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_7_TITLE="This Site"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_8_TITLE="Archived Articles"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_9_TITLE="Latest News"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_10_TITLE="Articles Most Read"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_11_TITLE="Feed Display"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_12_TITLE="News Flash"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_13_TITLE="Random Image"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_14_TITLE="Articles Related Items"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_15_TITLE="Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_16_TITLE="Statistics"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_17_TITLE="Syndicate Feeds"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_18_TITLE="Users Latest"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_19_TITLE="Who's Online"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_20_TITLE="Wrapper"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_21_TITLE="Footer"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_22_TITLE="Login"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_23_TITLE="Menu Example"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_24_TITLE="Latest Park Blogs"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_25_TITLE="Custom HTML"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_25_CONTENT="<p>This is a custom html module. That means you can enter whatever content you want.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_26_TITLE="Breadcrumbs"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_26_HOMETEXT="Home"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_27_TITLE="Banners"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_28_TITLE="Fruit Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_29_TITLE="Special!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_29_CONTENT="<h1>This week we have a special, half price on delicious oranges!</h1><div>Only for our special customers!</div><div>Use the code: Joomla! when ordering</div><p><em>This module can only be seen by people in the customers group or higher.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_30_TITLE="Articles Categories"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_31_TITLE="Language Switcher"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_32_TITLE="Search"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_33_TITLE="Language Switcher"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_34_TITLE="About Fruit Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_34_CONTENT="<p>The Fruit Shop site shows a number of Joomla! features.</p><p>The template uses classes in cascading style sheets to change the layout of items, such as creating the horizontal alphabetical list in the Fruit Encyclopedia.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_35_TITLE="Extensions"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_36_TITLE="About Parks"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_36_CONTENT="<p>The Parks sample site is designed as a simple site that can be routinely updated from the front end of Joomla!.</p><p>As a site, it is largely focused on a blog which can be updated using the front end article submission.</p><p>New weblinks can also be added through the front end.</p><p>A simple image gallery uses com_content with thumbnails displayed in a blog layout and full size images shown in article layout.</p><p>The Parks site features the language switch module. All of the content and modules are tagged as English (en-GB). If a second language pack is added with sample data this can be filtered using the language switch.</p><p>Parks uses HTML5 which is a major web standard (along with XHTML which is used in other areas of sample data).</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_37_TITLE="Articles Category"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_38_TITLE="Search (Atomic Template)"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_39_TITLE="Top Menu (Atomic Template)"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_TITLE="Top Quote (Atomic Template)"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_CONTENT="<hr /><h2 class='alt'>Powerful Content Management and a Simple Extensible Framework.</h2><hr />"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_TITLE="Bottom Left Column (Atomic Template)"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_CONTENT="<h6>This is a nested column</h6><p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_TITLE="Bottom Middle Column (Atomic Template)"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_CONTENT="<h6>This is another nested column</h6><p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_TITLE="Sidebar (Atomic Template)"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_CONTENT="<h3>A <span class='alt'>Simple</span> Sidebar</h3><p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p><p class='quiet'>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p><h5>Incremental leading</h5><p class='incr'>Vestibulum ante ipsum primis in faucibus orci luctus vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus.</p><p class="incr">Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p>4"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_44_TITLE="Login (Atomic Template)"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_45_TITLE="Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_45_FOOTER_TEXT="Shop!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_46_TITLE="Contribute"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_46_FOOTER_TEXT="Contribute!"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_47_TITLE="Smart Search Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_48_TITLE="All Front End  Views"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_49_TITLE="All Modules"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_50_TITLE="Fruit Shop"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_51_TITLE="Popular Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_52_TITLE="Similar Tags"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_53_TITLE="Syndicate Feeds"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_53_TEXT="Feed Entries"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_54_TITLE="Similar Tags 2"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_55_TITLE="Custom Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_55_CONTENT="<p>Example custom module for the testing data.</p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_56_TITLE="Admin Feed Module"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_57_TITLE="Statistics"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_CATEGORY_0_TITLE="Sample Data-Newsfeeds"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_0_NAME="Joomla! Announcements"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_1_NAME="New Joomla! Extensions"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_2_NAME="Joomla! Security News"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_3_NAME="Joomla! Connect"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_TAG_0_TITLE="Red"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_TAG_1_TITLE="Yellow"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_TAG_2_TITLE="Green"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_TAG_3_TITLE="Lime"
+PLG_SAMPLEDATA_TESTING_STEP_FAILED="Step %1$u Failed: %2$s"
+PLG_SAMPLEDATA_TESTING_STEP_SKIPPED="Step %1$u Skipped: '%2$s' is either not installed or disabled."
+PLG_SAMPLEDATA_TESTING_STEP1_SUCCESS="Step 1: Tags done!"
+PLG_SAMPLEDATA_TESTING_STEP2_SUCCESS="Step 2: Banners done!"
+PLG_SAMPLEDATA_TESTING_STEP3_SUCCESS="Step 3: Articles done!"
+PLG_SAMPLEDATA_TESTING_STEP4_SUCCESS="Step 4: Contacts done!"
+PLG_SAMPLEDATA_TESTING_STEP5_SUCCESS="Step 5: Newsfeeds done!"
+PLG_SAMPLEDATA_TESTING_STEP6_SUCCESS="Step 6: Menus done!"
+PLG_SAMPLEDATA_TESTING_STEP7_SUCCESS="Step 7: Modules done!"
+PLG_SAMPLEDATA_TESTING_XML_DESCRIPTION="Provides the testing sample data. Can be installed using the sample data module"
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini b/administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini
new file mode 100644
index 0000000000000..8b7d17fbf4a71
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SAMPLEDATA_TESTING="Sample Data - Testing"
+PLG_SAMPLEDATA_TESTING_XML_DESCRIPTION="Provides the testing sample data. Can be installed using the sample data module"
diff --git a/administrator/modules/mod_sampledata/helper.php b/administrator/modules/mod_sampledata/helper.php
new file mode 100644
index 0000000000000..989a886ed8f0b
--- /dev/null
+++ b/administrator/modules/mod_sampledata/helper.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_sampledata
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_sampledata
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+abstract class ModSampledataHelper
+{
+	/**
+	 * Get a list of sampledata.
+	 *
+	 * @return  mixed  An array of sampledata, or false on error.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function getList()
+	{
+		JPluginHelper::importPlugin('sampledata');
+		$dispatcher = JEventDispatcher::getInstance();
+		$data = $dispatcher->trigger('onSampledataGetOverview', array('test', 'foo'));
+
+		return $data;
+	}
+}
diff --git a/administrator/modules/mod_sampledata/mod_sampledata.php b/administrator/modules/mod_sampledata/mod_sampledata.php
new file mode 100644
index 0000000000000..8580b32103f68
--- /dev/null
+++ b/administrator/modules/mod_sampledata/mod_sampledata.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_sampledata
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include dependencies.
+JLoader::register('ModSampledataHelper', __DIR__ . '/helper.php');
+
+$items = ModSampledataHelper::getList();
+require JModuleHelper::getLayoutPath('mod_sampledata', $params->get('layout', 'default'));
diff --git a/administrator/modules/mod_sampledata/mod_sampledata.xml b/administrator/modules/mod_sampledata/mod_sampledata.xml
new file mode 100644
index 0000000000000..7a66b3aafd8d8
--- /dev/null
+++ b/administrator/modules/mod_sampledata/mod_sampledata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.5" client="administrator" method="upgrade">
+	<name>mod_sampledata</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2015</creationDate>
+	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.5.0</version>
+	<description>MOD_SAMPLEDATA_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_sampledata">mod_sampledata.php</filename>
+		<filename>helper.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<media destination="mod_sampledata" folder="media">
+		<folder>js</folder>
+	</media>
+	<languages>
+		<language tag="en-GB">en-GB.mod_sampledata.ini</language>
+		<language tag="en-GB">en-GB.mod_sampledata.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST" />
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php
new file mode 100644
index 0000000000000..b7ea484fc5da6
--- /dev/null
+++ b/administrator/modules/mod_sampledata/tmpl/default.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_sampledata
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('script', 'mod_sampledata/sampledata-process.js', false, true);
+
+JText::script('MOD_SAMPLEDATA_CONFIRM_START');
+JText::script('MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED');
+JText::script('MOD_SAMPLEDATA_INVALID_RESPONSE');
+
+JFactory::getDocument()->addScriptDeclaration('
+	var modSampledataUrl = "index.php?option=com_ajax&format=json&group=sampledata",
+		modSampledataIconProgress = "' . JUri::root(true) . '/media/jui/img/ajax-loader.gif";
+');
+?>
+<div class="sampledata-container">
+	<?php if ($items) : ?>
+		<div class="row-striped">
+			<?php foreach($items as $i => $item) : ?>
+				<div class="row-fluid sampledata-<?php echo $item->name; ?>">
+					<div class="span4">
+						<a href="#" onclick="sampledataApply(this)" data-type="<?php echo $item->name; ?>" data-steps="<?php echo $item->steps; ?>">
+							<strong class="row-title">
+								<span class="icon-<?php echo $item->icon; ?>"> </span>
+								<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
+							</strong>
+						</a>
+					</div>
+					<div class="span6">
+						<small>
+							<?php echo htmlspecialchars($item->description); ?>
+						</small>
+					</div>
+				</div>
+				<!-- Progress bar -->
+				<div class="row-fluid sampledata-progress-<?php echo $item->name; ?> hide">
+					<progress class="span12"></progress>
+				</div>
+				<!-- Progress messages -->
+				<div class="row-fluid sampledata-progress-<?php echo $item->name; ?> hide">
+					<ul class="unstyled"></ul>
+				</div>
+			<?php endforeach; ?>
+		</div>
+	<?php else : ?>
+		<div class="alert"><?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS');?></div>
+	<?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 5019aadbaa152..f64325a6c6c63 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `#__assets` (
 --
 
 INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
-(1, 0, 0, 103, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 0, 105, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -48,25 +48,25 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl
 (15, 1, 33, 34, 1, 'com_media', 'com_media', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":{"5":1}}'),
 (16, 1, 35, 38, 1, 'com_menus', 'com_menus', '{"core.admin":{"7":1}}'),
 (17, 1, 39, 40, 1, 'com_messages', 'com_messages', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
-(18, 1, 41, 72, 1, 'com_modules', 'com_modules', '{"core.admin":{"7":1}}'),
-(19, 1, 73, 76, 1, 'com_newsfeeds', 'com_newsfeeds', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(20, 1, 77, 78, 1, 'com_plugins', 'com_plugins', '{"core.admin":{"7":1}}'),
-(21, 1, 79, 80, 1, 'com_redirect', 'com_redirect', '{"core.admin":{"7":1}}'),
-(22, 1, 81, 82, 1, 'com_search', 'com_search', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(23, 1, 83, 84, 1, 'com_templates', 'com_templates', '{"core.admin":{"7":1}}'),
-(24, 1, 85, 88, 1, 'com_users', 'com_users', '{"core.admin":{"7":1}}'),
-(26, 1, 89, 90, 1, 'com_wrapper', 'com_wrapper', '{}'),
+(18, 1, 41, 74, 1, 'com_modules', 'com_modules', '{"core.admin":{"7":1}}'),
+(19, 1, 75, 78, 1, 'com_newsfeeds', 'com_newsfeeds', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(20, 1, 79, 80, 1, 'com_plugins', 'com_plugins', '{"core.admin":{"7":1}}'),
+(21, 1, 81, 82, 1, 'com_redirect', 'com_redirect', '{"core.admin":{"7":1}}'),
+(22, 1, 83, 84, 1, 'com_search', 'com_search', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(23, 1, 85, 86, 1, 'com_templates', 'com_templates', '{"core.admin":{"7":1}}'),
+(24, 1, 87, 90, 1, 'com_users', 'com_users', '{"core.admin":{"7":1}}'),
+(26, 1, 91, 92, 1, 'com_wrapper', 'com_wrapper', '{}'),
 (27, 8, 18, 19, 2, 'com_content.category.2', 'Uncategorised', '{}'),
 (28, 3, 4, 5, 2, 'com_banners.category.3', 'Uncategorised', '{}'),
 (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{}'),
-(30, 19, 74, 75, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{}'),
-(32, 24, 86, 87, 2, 'com_users.category.7', 'Uncategorised', '{}'),
-(33, 1, 91, 92, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(34, 1, 93, 94, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{}'),
-(35, 1, 95, 96, 1, 'com_tags', 'com_tags', '{}'),
-(36, 1, 97, 98, 1, 'com_contenthistory', 'com_contenthistory', '{}'),
-(37, 1, 99, 100, 1, 'com_ajax', 'com_ajax', '{}'),
-(38, 1, 101, 102, 1, 'com_postinstall', 'com_postinstall', '{}'),
+(30, 19, 76, 77, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{}'),
+(32, 24, 88, 89, 2, 'com_users.category.7', 'Uncategorised', '{}'),
+(33, 1, 93, 94, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(34, 1, 95, 96, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{}'),
+(35, 1, 97, 98, 1, 'com_tags', 'com_tags', '{}'),
+(36, 1, 99, 100, 1, 'com_contenthistory', 'com_contenthistory', '{}'),
+(37, 1, 101, 102, 1, 'com_ajax', 'com_ajax', '{}'),
+(38, 1, 103, 104, 1, 'com_postinstall', 'com_postinstall', '{}'),
 (39, 18, 42, 43, 2, 'com_modules.module.1', 'Main Menu', '{}'),
 (40, 18, 44, 45, 2, 'com_modules.module.2', 'Login', '{}'),
 (41, 18, 46, 47, 2, 'com_modules.module.3', 'Popular Articles', '{}'),
@@ -82,7 +82,8 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl
 (51, 18, 66, 67, 2, 'com_modules.module.17', 'Breadcrumbs', '{}'),
 (52, 18, 68, 69, 2, 'com_modules.module.79', 'Multilanguage status', '{}'),
 (53, 18, 70, 71, 2, 'com_modules.module.86', 'Joomla Version', '{}'),
-(54, 16, 36, 37, 2, 'com_menus.menu.1', 'Main Menu', '{}');
+(54, 16, 36, 37, 2, 'com_menus.menu.1', 'Main Menu', '{}'),
+(55, 18, 72, 73, 2, 'com_modules.module.87', 'Sample Data', '{}');
 
 -- --------------------------------------------------------
 
@@ -562,6 +563,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (315, 0, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (316, 0, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (317, 0, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (400, 0, 'plg_authentication_gmail', 'plugin', 'gmail', 'authentication', 0, 0, 1, 0, '', '{"applysuffix":"0","suffix":"","verifypeer":"1","user_blacklist":""}', '', '', 0, '0000-00-00 00:00:00', 1, 0),
 (401, 0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (402, 0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', '', 0, '0000-00-00 00:00:00', 3, 0),
@@ -638,6 +640,8 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (476, 0, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (477, 0, 'plg_content_fields', 'plugin', 'fields', 'content', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (478, 0, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (503, 0, 'beez3', 'template', 'beez3', '', 0, 1, 1, 0, '', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (504, 0, 'hathor', 'template', 'hathor', '', 1, 1, 1, 0, '', '{"showSiteName":"0","colourChoice":"0","boldText":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (506, 0, 'protostar', 'template', 'protostar', '', 0, 1, 1, 0, '', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -1504,7 +1508,8 @@ INSERT INTO `#__modules` (`id`, `asset_id`, `title`, `note`, `content`, `orderin
 (16, 50, 'Login Form', '', '', 7, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'),
 (17, 51, 'Breadcrumbs', '', '', 1, 'position-2', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
 (79, 52, 'Multilanguage status', '', '', 1, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(86, 53, 'Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*');
+(86, 53, 'Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_sampledata', 6, 1, '{}', 1, '*');
 
 -- --------------------------------------------------------
 
@@ -1539,7 +1544,8 @@ INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES
 (16, 0),
 (17, 0),
 (79, 0),
-(86, 0);
+(86, 0),
+(87, 0);
 
 -- --------------------------------------------------------
 
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 5fec91f57e9c9..2c960f51d620b 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -35,7 +35,7 @@ COMMENT ON COLUMN "#__assets"."rules" IS 'JSON encoded access control.';
 --
 
 INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "title", "rules") VALUES
-(1, 0, 0, 103, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 0, 105, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -52,25 +52,25 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (15, 1, 33, 34, 1, 'com_media', 'com_media', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":{"5":1}}'),
 (16, 1, 35, 38, 1, 'com_menus', 'com_menus', '{"core.admin":{"7":1}}'),
 (17, 1, 39, 40, 1, 'com_messages', 'com_messages', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
-(18, 1, 41, 72, 1, 'com_modules', 'com_modules', '{"core.admin":{"7":1}}'),
-(19, 1, 73, 76, 1, 'com_newsfeeds', 'com_newsfeeds', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(20, 1, 77, 78, 1, 'com_plugins', 'com_plugins', '{"core.admin":{"7":1}}'),
-(21, 1, 79, 80, 1, 'com_redirect', 'com_redirect', '{"core.admin":{"7":1}}'),
-(22, 1, 81, 82, 1, 'com_search', 'com_search', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(23, 1, 83, 84, 1, 'com_templates', 'com_templates', '{"core.admin":{"7":1}}'),
-(24, 1, 85, 88, 1, 'com_users', 'com_users', '{"core.admin":{"7":1}}'),
-(26, 1, 89, 90, 1, 'com_wrapper', 'com_wrapper', '{}'),
+(18, 1, 41, 74, 1, 'com_modules', 'com_modules', '{"core.admin":{"7":1}}'),
+(19, 1, 75, 77, 1, 'com_newsfeeds', 'com_newsfeeds', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(20, 1, 79, 80, 1, 'com_plugins', 'com_plugins', '{"core.admin":{"7":1}}'),
+(21, 1, 81, 82, 1, 'com_redirect', 'com_redirect', '{"core.admin":{"7":1}}'),
+(22, 1, 83, 84, 1, 'com_search', 'com_search', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(23, 1, 85, 86, 1, 'com_templates', 'com_templates', '{"core.admin":{"7":1}}'),
+(24, 1, 87, 90, 1, 'com_users', 'com_users', '{"core.admin":{"7":1}}'),
+(26, 1, 91, 92, 1, 'com_wrapper', 'com_wrapper', '{}'),
 (27, 8, 18, 19, 2, 'com_content.category.2', 'Uncategorised', '{}'),
 (28, 3, 4, 5, 2, 'com_banners.category.3', 'Uncategorised', '{}'),
 (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{}'),
-(30, 19, 74, 75, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{}'),
-(32, 24, 86, 87, 2, 'com_users.category.7', 'Uncategorised', '{}'),
-(33, 1, 91, 92, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(34, 1, 93, 94, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{}'),
-(35, 1, 95, 96, 1, 'com_tags', 'com_tags', '{}'),
-(36, 1, 97, 98, 1, 'com_contenthistory', 'com_contenthistory', '{}'),
-(37, 1, 99, 100, 1, 'com_ajax', 'com_ajax', '{}'),
-(38, 1, 101, 102, 1, 'com_postinstall', 'com_postinstall', '{}'),
+(30, 19, 76, 77, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{}'),
+(32, 24, 88, 89, 2, 'com_users.category.7', 'Uncategorised', '{}'),
+(33, 1, 93, 94, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(34, 1, 95, 96, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{}'),
+(35, 1, 97, 98, 1, 'com_tags', 'com_tags', '{}'),
+(36, 1, 99, 100, 1, 'com_contenthistory', 'com_contenthistory', '{}'),
+(37, 1, 101, 102, 1, 'com_ajax', 'com_ajax', '{}'),
+(38, 1, 103, 104, 1, 'com_postinstall', 'com_postinstall', '{}'),
 (39, 18, 42, 43, 2, 'com_modules.module.1', 'Main Menu', '{}'),
 (40, 18, 44, 45, 2, 'com_modules.module.2', 'Login', '{}'),
 (41, 18, 46, 47, 2, 'com_modules.module.3', 'Popular Articles', '{}'),
@@ -86,9 +86,10 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (51, 18, 66, 67, 2, 'com_modules.module.17', 'Breadcrumbs', '{}'),
 (52, 18, 68, 69, 2, 'com_modules.module.79', 'Multilanguage status', '{}'),
 (53, 18, 70, 71, 2, 'com_modules.module.86', 'Joomla Version', '{}'),
-(54, 16, 36, 37, 2, 'com_menus.menu.1', 'Main Menu', '{}');
+(54, 16, 36, 37, 2, 'com_menus.menu.1', 'Main Menu', '{}'),
+(55, 18, 72, 73, 2, 'com_modules.module.87', 'Sample Data', '{}');
 
-SELECT setval('#__assets_id_seq', 55, false);
+SELECT setval('#__assets_id_seq', 56, false);
 
 --
 -- Table structure for table `#__associations`
@@ -575,6 +576,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (315, 0, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (316, 0, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (317, 0, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 1, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (400, 0, 'plg_authentication_gmail', 'plugin', 'gmail', 'authentication', 0, 0, 1, 0, '', '{"applysuffix":"0","suffix":"","verifypeer":"1","user_blacklist":""}', '', '', 0, '1970-01-01 00:00:00', 1, 0),
 (401, 0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (402, 0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', '', 0, '1970-01-01 00:00:00', 3, 0),
@@ -651,6 +653,8 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (476, 0, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (477, 0, 'plg_content_fields', 'plugin', 'fields', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (478, 0, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (503, 0, 'beez3', 'template', 'beez3', '', 0, 1, 1, 0, '', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (504, 0, 'hathor', 'template', 'hathor', '', 1, 1, 1, 0, '', '{"showSiteName":"0","colourChoice":"0","boldText":"0"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (506, 0, 'protostar', 'template', 'protostar', '', 0, 1, 1, 0, '', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
@@ -1477,9 +1481,10 @@ INSERT INTO "#__modules" ("id", "asset_id", "title", "note", "content", "orderin
 (16, 50, 'Login Form', '', '', 7, 'position-7', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'),
 (17, 51, 'Breadcrumbs', '', '', 1, 'position-2', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
 (79, 52, 'Multilanguage status', '', '', 1, 'status', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(86, 53, 'Joomla Version', '', '', 1, 'footer', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*');
+(86, 53, 'Joomla Version', '', '', 1, 'footer', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_sampledata', 6, 1, '{}', 1, '*');
 
-SELECT setval('#__modules_id_seq', 87, false);
+SELECT setval('#__modules_id_seq', 88, false);
 
 --
 -- Table structure for table `#__modules_menu`
@@ -1512,7 +1517,8 @@ INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES
 (16, 0),
 (17, 0),
 (79, 0),
-(86, 0);
+(86, 0),
+(87, 0);
 
 --
 -- Table structure for table `#__newsfeeds`
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index ed7304f4ba4ab..7a669c5df95fd 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -43,7 +43,7 @@ CREATE NONCLUSTERED INDEX "idx_parent_id" ON "#__assets"
 SET IDENTITY_INSERT "#__assets" ON;
 
 INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "title", "rules") VALUES
-(1, 0, 0, 103, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
+(1, 0, 0, 105, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'),
 (3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
 (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
@@ -60,25 +60,25 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (15, 1, 33, 34, 1, 'com_media', 'com_media', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"3":1},"core.delete":{"5":1}}'),
 (16, 1, 35, 38, 1, 'com_menus', 'com_menus', '{"core.admin":{"7":1}}'),
 (17, 1, 39, 40, 1, 'com_messages', 'com_messages', '{"core.admin":{"7":1},"core.manage":{"7":1}}'),
-(18, 1, 41, 72, 1, 'com_modules', 'com_modules', '{"core.admin":{"7":1}}'),
-(19, 1, 73, 76, 1, 'com_newsfeeds', 'com_newsfeeds', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(20, 1, 77, 78, 1, 'com_plugins', 'com_plugins', '{"core.admin":{"7":1}}'),
-(21, 1, 79, 80, 1, 'com_redirect', 'com_redirect', '{"core.admin":{"7":1}}'),
-(22, 1, 81, 82, 1, 'com_search', 'com_search', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(23, 1, 83, 84, 1, 'com_templates', 'com_templates', '{"core.admin":{"7":1}}'),
-(24, 1, 85, 88, 1, 'com_users', 'com_users', '{"core.admin":{"7":1}}'),
-(26, 1, 89, 90, 1, 'com_wrapper', 'com_wrapper', '{}'),
+(18, 1, 41, 74, 1, 'com_modules', 'com_modules', '{"core.admin":{"7":1}}'),
+(19, 1, 75, 78, 1, 'com_newsfeeds', 'com_newsfeeds', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(20, 1, 79, 80, 1, 'com_plugins', 'com_plugins', '{"core.admin":{"7":1}}'),
+(21, 1, 81, 82, 1, 'com_redirect', 'com_redirect', '{"core.admin":{"7":1}}'),
+(22, 1, 83, 84, 1, 'com_search', 'com_search', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(23, 1, 85, 86, 1, 'com_templates', 'com_templates', '{"core.admin":{"7":1}}'),
+(24, 1, 87, 90, 1, 'com_users', 'com_users', '{"core.admin":{"7":1}}'),
+(26, 1, 91, 92, 1, 'com_wrapper', 'com_wrapper', '{}'),
 (27, 8, 18, 19, 2, 'com_content.category.2', 'Uncategorised', '{}'),
 (28, 3, 4, 5, 2, 'com_banners.category.3', 'Uncategorised', '{}'),
 (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{}'),
-(30, 19, 74, 75, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{}'),
-(32, 24, 86, 87, 2, 'com_users.category.7', 'Uncategorised', '{}'),
-(33, 1, 91, 92, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
-(34, 1, 93, 94, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{}'),
-(35, 1, 95, 96, 1, 'com_tags', 'com_tags', '{}'),
-(36, 1, 97, 98, 1, 'com_contenthistory', 'com_contenthistory', '{}'),
-(37, 1, 99, 100, 1, 'com_ajax', 'com_ajax', '{}'),
-(38, 1, 101, 102, 1, 'com_postinstall', 'com_postinstall', '{}'),
+(30, 19, 76, 77, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{}'),
+(32, 24, 88, 89, 2, 'com_users.category.7', 'Uncategorised', '{}'),
+(33, 1, 93, 94, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'),
+(34, 1, 95, 96, 1, 'com_joomlaupdate', 'com_joomlaupdate', '{}'),
+(35, 1, 97, 98, 1, 'com_tags', 'com_tags', '{}'),
+(36, 1, 99, 100, 1, 'com_contenthistory', 'com_contenthistory', '{}'),
+(37, 1, 101, 102, 1, 'com_ajax', 'com_ajax', '{}'),
+(38, 1, 103, 104, 1, 'com_postinstall', 'com_postinstall', '{}'),
 (39, 18, 42, 43, 2, 'com_modules.module.1', 'Main Menu', '{}'),
 (40, 18, 44, 45, 2, 'com_modules.module.2', 'Login', '{}'),
 (41, 18, 46, 47, 2, 'com_modules.module.3', 'Popular Articles', '{}'),
@@ -94,7 +94,8 @@ INSERT INTO "#__assets" ("id", "parent_id", "lft", "rgt", "level", "name", "titl
 (51, 18, 66, 67, 2, 'com_modules.module.17', 'Breadcrumbs', '{}'),
 (52, 18, 68, 69, 2, 'com_modules.module.79', 'Multilanguage status', '{}'),
 (53, 18, 70, 71, 2, 'com_modules.module.86', 'Joomla Version', '{}'),
-(54, 16, 36, 37, 2, 'com_menus.menu.1', 'Main Menu', '{}');
+(54, 16, 36, 37, 2, 'com_menus.menu.1', 'Main Menu', '{}'),
+(55, 18, 72, 73, 2, 'com_modules.module.87', 'Sample Data', '{}');
 
 SET IDENTITY_INSERT "#__assets" OFF;
 
@@ -787,6 +788,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (315, 0, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (316, 0, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (317, 0, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+(318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 1, 1, 0, '', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (400, 0, 'plg_authentication_gmail', 'plugin', 'gmail', 'authentication', 0, 0, 1, 0, '', '{"applysuffix":"0","suffix":"","verifypeer":"1","user_blacklist":""}', '', '', 0, '1900-01-01 00:00:00', 1, 0),
 (401, 0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (402, 0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', '', 0, '1900-01-01 00:00:00', 3, 0),
@@ -863,6 +865,8 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (476, 0, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (477, 0, 'plg_content_fields', 'plugin', 'fields', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (478, 0, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+(479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+(480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (503, 0, 'beez3', 'template', 'beez3', '', 0, 1, 1, 0, '', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (504, 0, 'hathor', 'template', 'hathor', '', 1, 1, 1, 0, '', '{"showSiteName":"0","colourChoice":"0","boldText":"0"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
 (506, 0, 'protostar', 'template', 'protostar', '', 0, 1, 1, 0, '', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
@@ -2163,7 +2167,8 @@ INSERT INTO "#__modules" ("id", "asset_id", "title", "note", "content", "orderin
 (16, 50, 'Login Form', '', '', 7, 'position-7', 0, '1900-01-01 00:00:00', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'),
 (17, 51, 'Breadcrumbs', '', '', 1, 'position-2', 0, '1900-01-01 00:00:00', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
 (79, 52, 'Multilanguage status', '', '', 1, 'status', 0, '1900-01-01 00:00:00', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
-(86, 53, 'Joomla Version', '', '', 1, 'footer', 0, '1900-01-01 00:00:00', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*');
+(86, 53, 'Joomla Version', '', '', 1, 'footer', 0, '1900-01-01 00:00:00', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'),
+(87, 55, 'Sample Data', '', '', 0, 'cpanel', 0, '1900-01-01 00:00:00', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 'mod_sampledata', 6, 1, '{}', 1, '*');
 
 SET IDENTITY_INSERT "#__modules" OFF;
 
@@ -2202,7 +2207,8 @@ INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES
 (16, 0),
 (17, 0),
 (79, 0),
-(86, 0);
+(86, 0),
+(87, 0);
 
 --
 -- Table structure for table `#__newsfeeds`
@@ -3021,4 +3027,4 @@ INSERT INTO "#__viewlevels" ("id", "title", "ordering", "rules") VALUES
 (5, 'Guest', 1, '[9]'),
 (6, 'Super Users', 4, '[8]');
 
-SET IDENTITY_INSERT "#__viewlevels" OFF;
\ No newline at end of file
+SET IDENTITY_INSERT "#__viewlevels" OFF;
diff --git a/media/mod_sampledata/js/sampledata-process.js b/media/mod_sampledata/js/sampledata-process.js
new file mode 100644
index 0000000000000..dc340f38a34df
--- /dev/null
+++ b/media/mod_sampledata/js/sampledata-process.js
@@ -0,0 +1,96 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+!(function ($) {
+	"use strict";
+
+	var inProgress = false;
+
+	var sampledataAjax = function(type, steps, step) {
+		if (step > steps) {
+			$('.sampledata-' + type + ' .row-title').append('<span class="icon-publish"> </span>');
+			inProgress = false;
+			return;
+		}
+		var stepClass = 'sampledata-steps-' + type + '-' + step,
+			$stepLi = $('<li class="' + stepClass + '"><p class="loader-image text-center"><img src="' + window.modSampledataIconProgress + '" width="30" height="30" ></p></li>'),
+			$progress = $(".sampledata-progress-" + type + " progress");
+
+		$("div.sampledata-progress-" + type + " ul").append($stepLi);
+
+		var request = $.ajax({
+			url: window.modSampledataUrl,
+			type: 'POST',
+			dataType: 'json',
+			data: {
+				type: type,
+				plugin: 'SampledataApplyStep' + step,
+				step: step
+			}
+		});
+		request.done(function(response){
+			$stepLi.children('.loader-image').remove();
+
+			if (response.success && response.data && response.data.length > 0) {
+				var success, value, resultClass, $msg;
+
+				// Display all messages that we got
+				for(var i = 0, l = response.data.length; i < l; i++) {
+					value   = response.data[i];
+					success = value.success;
+					resultClass = success ? 'success' : 'error';
+					$stepLi.append($('<div>', {
+						html: value.message,
+						'class': 'alert alert-' + resultClass,
+					}));
+				}
+
+				// Update progress
+				$progress.val(step/steps);
+
+				// Move on next step
+				if (success) {
+					step++;
+					sampledataAjax(type, steps, step);
+				}
+
+			} else {
+				$stepLi.addClass('alert alert-error');
+				$stepLi.html(Joomla.JText._('MOD_SAMPLEDATA_INVALID_RESPONSE'));
+				inProgress = false;
+			}
+		});
+		request.fail(function(jqXHR, textStatus){
+			alert('Something went wrong! Please close and reopen the browser and try again!');
+		});
+	};
+
+	window.sampledataApply = function(el) {
+		var $el = $(el), type = $el.data('type'), steps = $el.data('steps');
+
+		// Check whether the work in progress or we alredy proccessed with current item
+		if (inProgress) {
+			return;
+		}
+		if ($el.data('processed')) {
+			alert(Joomla.JText._('MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED'));
+			return;
+		}
+
+		// Make sure that use run this not by random clicking on the page links
+		if (!confirm(Joomla.JText._('MOD_SAMPLEDATA_CONFIRM_START'))) {
+			return false;
+		}
+
+		// Turn on the progress container
+		$('.sampledata-progress-' + type).show();
+		$el.data('processed', true)
+
+		inProgress = true;
+		sampledataAjax(type, steps, 1);
+		return false;
+	};
+
+})(jQuery);
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
new file mode 100644
index 0000000000000..d9c90323f62dc
--- /dev/null
+++ b/plugins/sampledata/blog/blog.php
@@ -0,0 +1,1003 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Sampledata.Blog
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Sampledata - Blog Plugin
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PlgSampledataBlog extends JPlugin
+{
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
+	/**
+	 * Application object
+	 *
+	 * @var    JApplicationCms
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $app;
+
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Holds the menuitem model
+	 *
+	 * @var    MenusModelItem
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $menuItemModel;
+
+	/**
+	 * Get an overview of the proposed sampledata.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onSampledataGetOverview()
+	{
+		$data = new stdClass;
+		$data->name        = $this->_name;
+		$data->title       = JText::_('PLG_SAMPLEDATA_BLOG_OVERVIEW_TITLE');
+		$data->description = JText::_('PLG_SAMPLEDATA_BLOG_OVERVIEW_DESC');
+		$data->icon        = 'broadcast';
+		$data->steps       = 3;
+
+		return $data;
+	}
+
+	/**
+	 * First step to enter the sampledata.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep1()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		};
+
+		if (!JComponentHelper::isEnabled('com_content'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_SKIPPED', 1, 'com_content');
+
+			return $response;
+		}
+
+		// Get some metadata.
+		$access = (int) $this->app->get('access', 1);
+		$user   = JFactory::getUser();
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/models/', 'ContentModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/tables/');
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/models/', 'CategoriesModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables/');
+
+		// Create "blog" category.
+		$categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel');
+		$catIds        = array();
+		$categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE');
+		$category      = array(
+			'title'           => $categoryTitle,
+			'parent_id'       => 0,
+			'id'              => 0,
+			'published'       => 1,
+			'access'          => $access,
+			'created_user_id' => $user->id,
+			'extension'       => 'com_content',
+			'level'           => 1,
+			'alias'           => JApplicationHelper::stringURLSafe($categoryTitle),
+			'associations'    => array(),
+			'description'     => '',
+			'language'        => '*',
+			'params'          => '',
+		);
+
+		try
+		{
+			$categoryModel->save($category);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
+
+			return $response;
+		}
+
+		// Get ID from category we just added
+		$catIds[] = $categoryModel->getItem()->id;
+
+		// Create "help" category.
+		$categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE');
+		$category      = array(
+			'title'           => $categoryTitle,
+			'parent_id'       => 0,
+			'id'              => 0,
+			'published'       => 1,
+			'access'          => $access,
+			'created_user_id' => $user->id,
+			'extension'       => 'com_content',
+			'level'           => 1,
+			'alias'           => JApplicationHelper::stringURLSafe($categoryTitle),
+			'associations'    => array(),
+			'description'     => '',
+			'language'        => '*',
+			'params'          => '',
+		);
+
+		try
+		{
+			$categoryModel->save($category);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
+
+			return $response;
+		}
+
+		// Get ID from category we just added
+		$catIds[] = $categoryModel->getItem()->id;
+
+		// Create Articles.
+		$articleModel  = JModelLegacy::getInstance('Article', 'ContentModel');
+		$articles = array(
+			array(
+				'catid'    => $catIds[1],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIds[1],
+				'ordering' => 1,
+				'access'   => 3,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 0,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 0,
+			),
+		);
+
+		foreach ($articles as $i => $article)
+		{
+			// Set values from language strings.
+			$article['title']     = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_TITLE');
+			$article['introtext'] = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_INTROTEXT');
+			$article['fulltext']  = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_FULLTEXT');
+
+			// Set values which are always the same.
+			$article['id']              = 0;
+			$article['created_user_id'] = $user->id;
+			$article['alias']           = JApplicationHelper::stringURLSafe($article['title']);
+			$article['language']        = '*';
+			$article['associations']    = array();
+			$article['state']           = 1;
+			$article['featured']        = 0;
+			$article['images']          = '';
+			$article['metakey']         = '';
+			$article['metadesc']        = '';
+			$article['xreference']      = '';
+
+			if (!isset($article['access']))
+			{
+				$article['access'] = $access;
+			}
+
+			if (!$articleModel->save($article))
+			{
+				JFactory::getLanguage()->load('com_content');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, JText::_($articleModel->getError()));
+
+				return $response;
+			}
+
+			// Get ID from category we just added
+			$ids[] = $articleModel->getItem()->id;
+		}
+
+		$this->app->setUserState('sampledata.blog.articles', $ids);
+		$this->app->setUserState('sampledata.blog.articles.catids', $catIds);
+
+		$response = new stdClass;
+		$response->success = true;
+		$response->message = JText::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Second step to enter the sampledata. Menus.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep2()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_menus'))
+		{
+			$response = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_SKIPPED', 2, 'com_menus');
+
+			return $response;
+		}
+
+		// Create the menu types.
+		$menuTable = JTable::getInstance('Type', 'JTableMenu');
+		$menuTypes = array();
+
+		for ($i = 0; $i <= 2; $i++)
+		{
+			$menu = array(
+				'id'          => 0,
+				'title'       => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_' . $i . '_TITLE'),
+				'description' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_' . $i . '_DESCRIPTION'),
+			);
+
+			// Calculate menutype.
+			$menu['menutype'] = JApplicationHelper::stringURLSafe($menu['title']);
+
+			$menuTable->load();
+			$menuTable->bind($menu);
+
+			try
+			{
+				$menuTable->store();
+			}
+			catch (Exception $e)
+			{
+				JFactory::getLanguage()->load('com_menus');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+				return $response;
+			}
+
+			$menuTypes[] = $menuTable->menutype;
+		}
+
+		// Storing IDs in UserState for later useage.
+		$this->app->setUserState('sampledata.blog.menutypes', $menuTypes);
+
+		// Get previously entered Data from UserStates.
+		$articleIds = $this->app->getUserState('sampledata.blog.articles');
+
+		// Get MenuItemModel.
+		JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/models/', 'MenusModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/tables/');
+		$this->menuItemModel = JModelLegacy::getInstance('Item', 'MenusModel');
+
+		// Unset current "Home" menuitem since we set a new one.
+		$menuItemTable = JTable::getInstance('Menu', 'MenusTable');
+		$menuItemTable->load(
+			array(
+				'home' => 1,
+				'language' => '*',
+			)
+		);
+		$menuItemTable->home = 0;
+		$menuItemTable->store();
+
+		// Insert menuitems level 1.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=9',
+				'component_id' => 22,
+				'home'         => 1,
+				'params'       => array(
+					'layout_type'             => 'blog',
+					'show_category_title'     => 0,
+					'num_leading_articles'    => 4,
+					'num_intro_articles'      => 0,
+					'num_columns'             => 1,
+					'num_links'               => 2,
+					'multi_column_order'      => 1,
+					'orderby_sec'             => 'rdate',
+					'order_date'              => 'published',
+					'show_pagination'         => 2,
+					'show_pagination_results' => 1,
+					'show_category'           => 0,
+					'info_bloc_position'      => 0,
+					'show_publish_date'       => 0,
+					'show_hits'               => 0,
+					'show_feed_link'          => 1,
+					'menu_text'               => 1,
+					'show_page_heading'       => 0,
+					'secure'                  => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[0],
+				'component_id' => 22,
+				'params'       => array(
+					'info_block_position' => 0,
+					'show_category'       => 0,
+					'link_category'       => 0,
+					'show_author'         => 0,
+					'show_create_date'    => 0,
+					'show_publish_date'   => 0,
+					'show_hits'           => 0,
+					'menu_text'           => 1,
+					'show_page_heading'   => 0,
+					'secure'              => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'menu_text'              => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE'),
+				'link'         => 'index.php?option=com_content&view=form&layout=edit',
+				'component_id' => 22,
+				'access'       => 3,
+				'params'       => array(
+					'enable_category'   => 1,
+					'catid'             => 9,
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_4_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[1],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_5_TITLE'),
+				'link'         => 'administrator',
+				'type'         => 'url',
+				'component_id' => 0,
+				'browserNav'   => 1,
+				'access'       => 3,
+				'params'       => array(
+					'menu_text' => 1,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_6_TITLE'),
+				'link'         => 'index.php?option=com_users&view=profile&layout=edit',
+				'component_id' => 25,
+				'access'       => 2,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_7_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'menu_text'              => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel1 = $this->addMenuItems($menuItems, 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert another level 1.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_8_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'login_redirect_url'     => 'index.php?Itemid=' . $menuIdsLevel1[0],
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'menu_text'              => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel1 = array_merge($menuIdsLevel1, $this->addMenuItems($menuItems, 1));
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert menuitems level 2.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_9_TITLE'),
+				'link'         => 'index.php?option=com_config&view=config&controller=config.display.config',
+				'parent_id'    => $menuIdsLevel1[4],
+				'component_id' => 23,
+				'access'       => 6,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE'),
+				'link'         => 'index.php?option=com_config&view=templates&controller=config.display.templates',
+				'parent_id'    => $menuIdsLevel1[4],
+				'component_id' => 23,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$this->addMenuItems($menuItems, 2);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+			return $response;
+		}
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_BLOG_STEP2_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Third step to enter the sampledata. Modules.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep3()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_modules'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_SKIPPED', 3, 'com_modules');
+
+			return $response;
+		}
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_modules/models/', 'ModulesModelModule');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_modules/tables/');
+		$model  = JModelLegacy::getInstance('Module', 'ModulesModel');
+		$access = (int) $this->app->get('access', 1);
+
+		// Get previously entered Data from UserStates
+		$menuTypes = $this->app->getUserState('sampledata.blog.menutypes');
+
+		$modules = array(
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_0_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'position-1',
+				'module'    => 'mod_menu',
+				'showtitle' => 0,
+				'params'    => array(
+					'menutype'        => $menuTypes[0],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'class_sfx'       => ' nav-pills',
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_1_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'position-1',
+				'module'    => 'mod_menu',
+				'access'    => 3,
+				'showtitle' => 0,
+				'params'    => array(
+					'menutype'        => $menuTypes[1],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 1,
+					'class_sfx'       => ' nav-pills',
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_2_TITLE'),
+				'ordering'  => 6,
+				'position'  => 'position-7',
+				'module'    => 'mod_syndicate',
+				'showtitle' => 0,
+				'params'    => array(
+					'display_text' => 1,
+					'text'         => 'My Blog',
+					'format'       => 'rss',
+					'layout'       => '_:default',
+					'cache'        => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_3_TITLE'),
+				'ordering' => 4,
+				'position' => 'position-7',
+				'module'   => 'mod_articles_archive',
+				'params'   => array(
+					'count'      => 10,
+					'layout'     => '_:default',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static',
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_4_TITLE'),
+				'ordering' => 5,
+				'position' => 'position-7',
+				'module'   => 'mod_articles_popular',
+				'params'   => array(
+					'catid'      => ['9'],
+					'count'      => 5,
+					'show_front' => 1,
+					'layout'     => '_:default',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static',
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_5_TITLE'),
+				'ordering' => 2,
+				'position' => 'position-7',
+				'module'   => 'mod_articles_category',
+				'params'   => array(
+					'mode'                         => 'normal',
+					'show_on_article_page'         => 0,
+					'show_front'                   => 'show',
+					'count'                        => 6,
+					'category_filtering_type'      => 1,
+					'catid'                        => ['9'],
+					'show_child_category_articles' => 0,
+					'levels'                       => 1,
+					'author_filtering_type'        => 1,
+					'author_alias_filtering_type'  => 1,
+					'date_filtering'               => 'off',
+					'date_field'                   => 'a.created',
+					'relative_date'                => 30,
+					'article_ordering'             => 'a.created',
+					'article_ordering_direction'   => 'DESC',
+					'article_grouping'             => 'none',
+					'article_grouping_direction'   => 'krsort',
+					'month_year_format'            => 'F Y',
+					'item_heading'                 => 5,
+					'link_titles'                  => 1,
+					'show_date'                    => 0,
+					'show_date_field'              => 'created',
+					'show_date_format'             => JText::_('DATE_FORMAT_LC5'),
+					'show_category'                => 0,
+					'show_hits'                    => 0,
+					'show_author'                  => 0,
+					'show_introtext'               => 0,
+					'introtext_limit'              => 100,
+					'show_readmore'                => 0,
+					'show_readmore_title'          => 1,
+					'readmore_limit'               => 15,
+					'layout'                       => '_:default',
+					'owncache'                     => 1,
+					'cache_time'                   => 900,
+					'module_tag'                   => 'div',
+					'bootstrap_size'               => 0,
+					'header_tag'                   => 'h3',
+					'style'                        => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_6_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'footer',
+				'module'    => 'mod_menu',
+				'showtitle' => 0,
+				'params'    => array(
+					'menutype'        => $menuTypes[2],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_7_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-0',
+				'module'   => 'mod_search',
+				'params'   => array(
+					'width'      => 20,
+					'button_pos' => 'right',
+					'opensearch' => 1,
+					'layout'     => '_:default',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'itemid',
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_TITLE'),
+				'content'   => '<p><img src="images/headers/raindrops.jpg" alt="" /></p>',
+				'ordering'  => 1,
+				'position'  => 'position-3',
+				'module'    => 'mod_custom',
+				'showtitle' => 0,
+				'params'    => array(
+					'prepare_content' => 1,
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_9_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-7',
+				'module'   => 'mod_tags_popular',
+				'params'   => array(
+					'maximum'         => 8,
+					'timeframe'       => 'alltime',
+					'order_value'     => 'count',
+					'order_direction' => 1,
+					'display_count'   => 0,
+					'no_results_text' => 0,
+					'minsize'         => 1,
+					'maxsize'         => 2,
+					'layout'          => '_:default',
+					'owncache'        => 1,
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_10_TITLE'),
+				'ordering' => 0,
+				'position' => '',
+				'module'   => 'mod_tags_similar',
+				'params'   => array(
+					'maximum'        => 5,
+					'matchtype'      => 'any',
+					'layout'         => '_:default',
+					'owncache'       => 1,
+					'module_tag'     => 'div',
+					'bootstrap_size' => 0,
+					'header_tag'     => 'h3',
+					'style'          => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_11_TITLE'),
+				'ordering'  => 4,
+				'position'  => 'cpanel',
+				'module'    => 'mod_stats_admin',
+				'access'    => 6,
+				'client_id' => 1,
+				'params'    => array(
+					'serverinfo'     => 1,
+					'siteinfo'       => 1,
+					'counter'        => 0,
+					'increase'       => 0,
+					'layout'         => '_:default',
+					'cache'          => 1,
+					'cache_time'     => 900,
+					'cachemode'      => 'static',
+					'module_tag'     => 'div',
+					'bootstrap_size' => 6,
+					'header_tag'     => 'h3',
+					'style'          => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_12_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'postinstall',
+				'module'    => 'mod_feed',
+				'client_id' => 1,
+				'params'    => array(
+					'rssurl'          => 'https://www.joomla.org/announcements/release-news.feed',
+					'rssrtl'          => 0,
+					'rsstitle'        => 1,
+					'rssdesc'         => 1,
+					'rssimage'        => 1,
+					'rssitems'        => 3,
+					'rssitemdesc'     => 1,
+					'word_count'      => 0,
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+		);
+
+		foreach ($modules as $module)
+		{
+			// Set values which are always the same.
+			$module['id']              = 0;
+			$module['asset_id']        = 0;
+			$module['language']        = '*';
+			$module['note'] = '';
+			$module['published'] = 1;
+			$module['assignment'] = 0;
+
+			if (!isset($module['content']))
+			{
+				$module['content'] = '';
+			}
+
+			if (!isset($module['access']))
+			{
+				$module['access'] = $access;
+			}
+
+			if (!isset($module['showtitle']))
+			{
+				$module['showtitle'] = 1;
+			}
+
+			if (!isset($module['client_id']))
+			{
+				$module['client_id'] = 0;
+			}
+
+			if (!$model->save($module))
+			{
+				JFactory::getLanguage()->load('com_modules');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 3, JText::_($model->getError()));
+
+				return $response;
+			}
+		}
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_BLOG_STEP3_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Adds menuitems.
+	 *
+	 * @param   array    $menuItems  Array holding the menuitems arrays.
+	 * @param   integer  $level      Level in the category tree.
+	 *
+	 * @return  array  IDs of the inserted menuitems.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 *
+	 * @throws  Exception
+	 */
+	private function addMenuItems(array $menuItems, $level)
+	{
+		$itemIds = array();
+		$access  = (int) $this->app->get('access', 1);
+		$user    = JFactory::getUser();
+
+		foreach ($menuItems as $menuItem)
+		{
+			// Reset item.id in model state.
+			$this->menuItemModel->setState('item.id', 0);
+
+			// Set values which are always the same.
+			$menuItem['id']              = 0;
+			$menuItem['created_user_id'] = $user->id;
+			$menuItem['alias']           = JApplicationHelper::stringURLSafe($menuItem['title']);
+			$menuItem['published']       = 1;
+			$menuItem['language']        = '*';
+			$menuItem['note']            = '';
+			$menuItem['img']             = '';
+			$menuItem['associations']    = array();
+			$menuItem['client_id']       = 0;
+			$menuItem['level']           = $level;
+
+			// Set browserNav to default if not set
+			if (!isset($menuItem['browserNav']))
+			{
+				$menuItem['browserNav'] = 0;
+			}
+
+			// Set access to default if not set
+			if (!isset($menuItem['access']))
+			{
+				$menuItem['access'] = $access;
+			}
+
+			// Set type to 'component' if not set
+			if (!isset($menuItem['type']))
+			{
+				$menuItem['type'] = 'component';
+			}
+
+			// Set template_style_id to global if not set
+			if (!isset($menuItem['template_style_id']))
+			{
+				$menuItem['template_style_id'] = 0;
+			}
+
+			// Set home if not set
+			if (!isset($menuItem['home']))
+			{
+				$menuItem['home'] = 0;
+			}
+
+			// Set parent_id to root (1) if not set
+			if (!isset($menuItem['parent_id']))
+			{
+				$menuItem['parent_id'] = 1;
+			}
+
+			if (!$this->menuItemModel->save($menuItem))
+			{
+				// Try two times with another alias (-1 and -2).
+				$menuItem['alias'] .= '-1';
+
+				if (!$this->menuItemModel->save($menuItem))
+				{
+					$menuItem['alias'] = substr_replace($menuItem['alias'], '2', -1);
+
+					if (!$this->menuItemModel->save($menuItem))
+					{
+						throw new Exception($menuItem['title'] . ' => ' . $menuItem['alias'] . ' : ' . $this->menuItemModel->getError());
+					}
+				}
+			}
+
+			// Get ID from menuitem we just added
+			$itemIds[] = $this->menuItemModel->getstate('item.id');
+		}
+
+		return $itemIds;
+	}
+}
diff --git a/plugins/sampledata/blog/blog.xml b/plugins/sampledata/blog/blog.xml
new file mode 100644
index 0000000000000..3ab9d2556298d
--- /dev/null
+++ b/plugins/sampledata/blog/blog.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.5" type="plugin" group="sampledata" method="upgrade">
+	<name>plg_sampledata_blog</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2015</creationDate>
+	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.5.0</version>
+	<description>PLG_SAMPLEDATA_BLOG_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="blog">blog.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_sampledata_blog.ini</language>
+		<language tag="en-GB">en-GB.plg_sampledata_blog.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/sampledata/testing/testing.php b/plugins/sampledata/testing/testing.php
new file mode 100644
index 0000000000000..ca74c4a12eef3
--- /dev/null
+++ b/plugins/sampledata/testing/testing.php
@@ -0,0 +1,4748 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Sampledata.Testing
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Sampledata - Testing Plugin
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PlgSampledataTesting extends JPlugin
+{
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
+	/**
+	 * Application object
+	 *
+	 * @var    JApplicationCms
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $app;
+
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Holds the category model
+	 *
+	 * @var    CategoriesModelCategory
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $categoryModel;
+
+	/**
+	 * Holds the menuitem model
+	 *
+	 * @var    MenusModelItem
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private $menuItemModel;
+
+	/**
+	 * Get an overview of the proposed sampledata.
+	 *
+	 * @return  object  Object containing the name, title, description, icon and steps.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onSampledataGetOverview()
+	{
+		$data              = new stdClass;
+		$data->name        = $this->_name;
+		$data->title       = JText::_('PLG_SAMPLEDATA_TESTING_OVERVIEW_TITLE');
+		$data->description = JText::_('PLG_SAMPLEDATA_TESTING_OVERVIEW_DESC');
+		$data->icon        = 'flash';
+		$data->steps       = 7;
+
+		return $data;
+	}
+
+	/**
+	 * First step to enter the sampledata. Tags
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep1()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_tags'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_SKIPPED', 1, 'com_tags');
+
+			return $response;
+		}
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tags/models/', 'TagsModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tags/tables/');
+		$model  = JModelLegacy::getInstance('Tag', 'TagsModel');
+		$access = (int) $this->app->get('access', 1);
+		$user   = JFactory::getUser();
+		$tagIds = array();
+
+		// Create first three tags.
+		for ($i = 0; $i <= 2; $i++)
+		{
+			$title = JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_TAG_' . $i . '_TITLE');
+			$tag   = array(
+				'id'              => 0,
+				'title'           => $title,
+				'alias'           => JApplicationHelper::stringURLSafe($title),
+				'parent_id'       => 1,
+				'published'       => 1,
+				'access'          => $access,
+				'created_user_id' => $user->id,
+				'language'        => '*',
+				'description'     => '',
+			);
+
+			try
+			{
+				if (!$model->save($tag))
+				{
+					JFactory::getLanguage()->load('com_tags');
+					throw new Exception(JText::_($model->getError()));
+				}
+			}
+			catch (Exception $e)
+			{
+
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 1, $e->getMessage());
+
+				return $response;
+			}
+
+			$tagIds[] = $model->getItem()->id;
+		}
+
+		// Create fourth tag as child of the third.
+		$title = JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_TAG_3_TITLE');
+		$tag   = array(
+			'id'              => 0,
+			'title'           => $title,
+			'alias'           => JApplicationHelper::stringURLSafe($title),
+			'parent_id'       => $tagIds[2],
+			'published'       => 1,
+			'access'          => $access,
+			'created_user_id' => $user->id,
+			'language'        => '*',
+			'description'     => '',
+		);
+
+		try
+		{
+			if (!$model->save($tag))
+			{
+				JFactory::getLanguage()->load('com_tags');
+				throw new Exception(JText::_($model->getError()));
+			}
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 1, $e->getMessage());
+
+			return $response;
+		}
+
+		$tagIds[] = $model->getItem()->id;
+
+		// Storing IDs in UserState for later useage.
+		$this->app->setUserState('sampledata.testing.tags', $tagIds);
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_TESTING_STEP1_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Second step to enter the sampledata. Banners
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep2()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_banners'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_SKIPPED', 2, 'com_banners');
+
+			return $response;
+		}
+
+		// Add Include Paths.
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_banners/tables/');
+
+		$user = JFactory::getUser();
+
+		// Add categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CATEGORY_0_TITLE'),
+			'parent_id' => 0,
+		);
+
+		try
+		{
+			$catIds = $this->addCategories($categories, 'com_banners', 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 2, $e->getMessage());
+
+			return $response;
+		}
+
+		$this->app->setUserState('sampledata.testing.banners.catids', $catIds);
+
+		// Add Clients.
+		$clients     = array();
+		$clients[]   = array(
+			'name'              => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_1_NAME'),
+			'contact'           => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_1_CONTACT'),
+			'purchase_type'     => -1,
+			'track_clicks'      => -1,
+			'track_impressions' => -1,
+		);
+		$clients[]   = array(
+			'name'              => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_2_NAME'),
+			'contact'           => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_2_CONTACT'),
+			'email'             => 'banner@example.com',
+			'purchase_type'     => -1,
+			'track_clicks'      => 0,
+			'track_impressions' => 0,
+		);
+		$clients[]   = array(
+			'name'              => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_3_NAME'),
+			'contact'           => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_CLIENT_3_CONTACT'),
+			'purchase_type'     => -1,
+			'track_clicks'      => 0,
+			'track_impressions' => 0,
+		);
+		$clientTable = JTable::getInstance('Client', 'BannersTable');
+		$clientIds   = array();
+
+		foreach ($clients as $client)
+		{
+			// Set values which are always the same.
+			$client['id']        = 0;
+			$client['email']     = 'banner@example.com';
+			$client['state']     = 1;
+			$client['metakey']   = '';
+			$client['extrainfo'] = '';
+
+			$clientTable->load();
+			$clientTable->bind($client);
+
+			try
+			{
+				if (!$clientTable->store())
+				{
+					JFactory::getLanguage()->load('com_banners');
+					throw new Exception(JText::_($clientTable->getError()));
+				}
+			}
+			catch (Exception $e)
+			{
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 2, $e->getMessage());
+
+				return $response;
+			}
+
+			$clientIds[] = $clientTable->id;
+		}
+
+		// Add Banners.
+		$banners   = array();
+		$banners[] = array(
+			'cid'         => $clientIds[2],
+			'name'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_1_NAME'),
+			'clickurl'    => 'http://shop.joomla.org/amazoncom-bookstores.html',
+			'catid'       => $catIds[0],
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_1_DESC'),
+			'ordering'    => 1,
+			'params'      => '{"imageurl":"images/banners/white.png","width":"","height":"","alt":"Joomla! Books"}',
+		);
+		$banners[] = array(
+			'cid'         => $clientIds[1],
+			'name'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_2_NAME'),
+			'clickurl'    => 'http://shop.joomla.org',
+			'catid'       => $catIds[0],
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_2_DESC'),
+			'ordering'    => 2,
+			'params'      => '{"imageurl":"images/banners/white.png","width":"","height":"","alt":"Joomla! Shop"}',
+		);
+		$banners[] = array(
+			'cid'         => $clientIds[0],
+			'name'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_3_NAME'),
+			'clickurl'    => 'http://contribute.joomla.org',
+			'catid'       => $catIds[0],
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_3_DESC'),
+			'ordering'    => 3,
+			'params'      => '{"imageurl":"images/banners/white.png","width":"","height":"","alt":""}',
+		);
+
+		$bannerTable = JTable::getInstance('Banner', 'BannersTable');
+
+		foreach ($banners as $banner)
+		{
+			// Set values which are always the same.
+			$banner['id']               = 0;
+			$banner['type']             = 0;
+			$banner['state']            = 1;
+			$banner['alias']            = JApplicationHelper::stringURLSafe($banner['name']);
+			$banner['custombannercode'] = '';
+			$banner['metakey']          = '';
+			$banner['purchase_type']    = -1;
+			$banner['created_by']       = $user->id;
+			$banner['created_by_alias'] = 'Joomla';
+			$banner['language']         = 'en-GB';
+
+			$bannerTable->load();
+			$bannerTable->bind($banner);
+
+			try
+			{
+				if (!$bannerTable->store())
+				{
+					JFactory::getLanguage()->load('com_banners');
+					throw new Exception(JText::_($bannerTable->getError()));
+				}
+			}
+			catch (Exception $e)
+			{
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 2, $e->getMessage());
+
+				return $response;
+			}
+		}
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_TESTING_STEP2_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Third step to enter the sampledata. Content
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep3()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_content'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_SKIPPED', 3, 'com_content');
+
+			return $response;
+		}
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/models/', 'ContentModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/tables/');
+
+		// Insert first level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE'),
+			'parent_id' => 0,
+		);
+
+		try
+		{
+			$catIdsLevel1 = $this->addCategories($categories, 'com_content', 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert second level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_TITLE'),
+			'parent_id' => $catIdsLevel1[0],
+		);
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_TITLE'),
+			'parent_id' => $catIdsLevel1[0],
+			'language'  => 'en-GB',
+		);
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_TITLE'),
+			'parent_id' => $catIdsLevel1[0],
+		);
+
+		try
+		{
+			$catIdsLevel2 = $this->addCategories($categories, 'com_content', 2);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert third level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_DESC'),
+			'parent_id'   => $catIdsLevel2[0],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_1_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_1_DESC'),
+			'parent_id'   => $catIdsLevel2[1],
+			'params'      => '{"category_layout":"","image":"images/sampledata/parks/banner_cradle.jpg"}',
+			'language'    => 'en-GB',
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_DESC'),
+			'parent_id'   => $catIdsLevel2[1],
+			'language'    => 'en-GB',
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_3_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_3_DESC'),
+			'parent_id'   => $catIdsLevel2[2],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_4_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_2_4_DESC'),
+			'parent_id'   => $catIdsLevel2[2],
+		);
+
+		try
+		{
+			$catIdsLevel3 = $this->addCategories($categories, 'com_content', 3);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert fourth level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_0_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_0_DESC'),
+			'parent_id'   => $catIdsLevel3[0],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_DESC'),
+			'parent_id'   => $catIdsLevel3[0],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_DESC'),
+			'parent_id'   => $catIdsLevel3[0],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_3_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_3_DESC'),
+			'parent_id'   => $catIdsLevel3[0],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_4_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_4_DESC'),
+			'parent_id'   => $catIdsLevel3[0],
+		);
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_5_TITLE'),
+			'parent_id' => $catIdsLevel3[2],
+			'language'  => 'en-GB',
+		);
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_1_2_6_TITLE'),
+			'parent_id' => $catIdsLevel3[2],
+			'language'  => 'en-GB',
+		);
+
+		try
+		{
+			$catIdsLevel4 = $this->addCategories($categories, 'com_content', 4);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert fifth level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_0_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_0_DESC'),
+			'parent_id'   => $catIdsLevel4[1],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_1_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_1_DESC'),
+			'parent_id'   => $catIdsLevel4[1],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_2_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_2_DESC'),
+			'parent_id'   => $catIdsLevel4[1],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_3_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_3_DESC'),
+			'parent_id'   => $catIdsLevel4[1],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_4_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_1_4_DESC'),
+			'parent_id'   => $catIdsLevel4[1],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_5_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_5_DESC'),
+			'parent_id'   => $catIdsLevel4[2],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_6_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_6_DESC'),
+			'parent_id'   => $catIdsLevel4[2],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_7_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_CATEGORY_0_0_0_2_7_DESC'),
+			'parent_id'   => $catIdsLevel4[2],
+		);
+
+		try
+		{
+			$catIdsLevel5 = $this->addCategories($categories, 'com_content', 5);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
+
+			return $response;
+		}
+
+		$tagIds = $this->app->getUserState('sampledata.testing.tags', array());
+
+		$articles = array(
+			// Articles 0 - 9
+			array(
+				'catid'    => $catIdsLevel4[0],
+				'ordering' => 7,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 5,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 6,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 7,
+			),
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel2[1],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[2],
+				'ordering' => 6,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 4,
+				'featured' => 1
+			),
+			array(
+				'catid'    => $catIdsLevel4[0],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel4[0],
+				'ordering' => 1,
+			),
+			// Articles 10 - 19
+			array(
+				'catid'    => $catIdsLevel4[6],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg',
+					'image_intro_alt'        => 'Cradle Mountain',
+					'image_fulltext'         => 'images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg',
+					'image_fulltext_alt'     => 'Cradle Mountain',
+					'image_fulltext_caption' => 'Source: http://commons.wikimedia.org/wiki/File:Rainforest,bluemountainsNSW.jpg'
+						. ' Author: Alan J.W.C. License: GNU Free Documentation License v. 1.2 or later'
+				),
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[2],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel2[2],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 5,
+			),
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 6,
+			),
+			array(
+				'catid'    => $catIdsLevel5[2],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel3[1],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel3[1],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[2],
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel2[2],
+				'ordering' => 1,
+			),
+			// Articles 20 - 29
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 8,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 9,
+			),
+			array(
+				'catid'    => $catIdsLevel3[3],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 2,
+				'tags'     => $tagIds,
+				'featured' => 1
+			),
+			array(
+				'catid'    => $catIdsLevel5[4],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/animals/180px_koala_ag1.jpg',
+					'image_intro_alt'        => 'Koala Thumbnail',
+					'image_fulltext'         => 'images/sampledata/parks/animals/800px_koala_ag1.jpg',
+					'image_fulltext_alt'     => 'Koala Climbing Tree',
+					'image_fulltext_caption' => 'Source: http://en.wikipedia.org/wiki/File:Koala-ag1.jpg'
+						. ' Author: Arnaud Gaillard License: Creative Commons Share Alike Attribution Generic 1.0'
+				),
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel5[3],
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[1],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel5[4],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 2,
+			),
+			// Articles 30 - 39
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 10,
+			),
+			array(
+				'catid'    => $catIdsLevel5[4],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg',
+					'image_intro_alt'        => 'Phyllopteryx',
+					'image_fulltext'         => 'images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg',
+					'image_fulltext_alt'     => 'Phyllopteryx',
+					'image_fulltext_caption' => 'Source: http://en.wikipedia.org/wiki/File:Phyllopteryx_taeniolatus1.jpg'
+						. ' Author: Richard Ling License: GNU Free Documentation License v 1.2 or later'
+				),
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel4[6],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg',
+					'image_intro_alt'        => 'Kings Canyon',
+					'image_fulltext'         => 'images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg',
+					'image_fulltext_alt'     => 'Kings Canyon',
+					'image_fulltext_caption' => 'Source: http://commons.wikimedia.org/wiki/File:Pinnacles_Western_Australia.jpg'
+						. ' Author: Martin Gloss License: GNU Free Documentation license v 1.2 or later.'
+				),
+				'ordering' => 4,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 5,
+				'featured' => 1
+			),
+			array(
+				'catid'    => $catIdsLevel5[2],
+				'ordering' => 4,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 4,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 11,
+			),
+			array(
+				'catid'    => $catIdsLevel4[0],
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel5[3],
+				'ordering' => 4,
+			),
+			// Articles 40 - 49
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel1[0],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[4],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg',
+					'image_intro_alt'        => 'Spotted Quoll',
+					'image_fulltext'         => 'images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg',
+					'image_fulltext_alt'     => 'Spotted Quoll',
+					'image_fulltext_caption' => 'Source: http://en.wikipedia.org/wiki/File:SpottedQuoll_2005_SeanMcClean.jpg'
+						. ' Author: Sean McClean License: GNU Free Documentation License v 1.2 or later'
+				),
+				'ordering' => 4,
+			),
+			array(
+				'catid'    => $catIdsLevel5[3],
+				'ordering' => 5,
+			),
+			array(
+				'catid'    => $catIdsLevel5[3],
+				'ordering' => 6,
+			),
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel4[2],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 6,
+				'featured' => 1
+			),
+			// Articles 50 - 59
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 4,
+			),
+			array(
+				'catid'    => $catIdsLevel4[0],
+				'ordering' => 5,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'ordering' => 7,
+			),
+			array(
+				'catid'    => $catIdsLevel5[1],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[4],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/animals/180px_wobbegong.jpg',
+					'image_intro_alt'        => 'Wobbegon',
+					'image_fulltext'         => 'images/sampledata/parks/animals/800px_wobbegong.jpg',
+					'image_fulltext_alt'     => 'Wobbegon',
+					'image_fulltext_caption' => 'Source: http://en.wikipedia.org/wiki/File:Wobbegong.jpg'
+						. ' Author: Richard Ling License: GNU Free Documentation License v 1.2 or later'
+				),
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel3[3],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel5[3],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel4[0],
+				'ordering' => 4,
+			),
+			array(
+				'catid'    => $catIdsLevel5[4],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 7,
+			),
+			// Articles 60 - 68
+			array(
+				'catid'    => $catIdsLevel4[6],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg',
+					'float_intro'            => 'none',
+					'image_intro_alt'        => 'Rain Forest Blue Mountains',
+					'image_fulltext'         => 'images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg',
+					'image_fulltext_alt'     => 'Rain Forest Blue Mountains',
+					'image_fulltext_caption' => 'Source: http://commons.wikimedia.org/wiki/File:Rainforest,bluemountainsNSW.jpg'
+						. ' Author: Adam J.W.C. License: GNU Free Public Documentation License'
+				),
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIdsLevel4[6],
+				'images'   => array(
+					'image_intro'            => 'images/sampledata/parks/landscape/180px_ormiston_pound.jpg',
+					'float_intro'            => 'none',
+					'image_intro_alt'        => 'Ormiston Pound',
+					'image_fulltext'         => 'images/sampledata/parks/landscape/800px_ormiston_pound.jpg',
+					'image_fulltext_alt'     => 'Ormiston Pound',
+					'image_fulltext_caption' => 'Source: http://commons.wikimedia.org/wiki/File:Ormiston_Pound.JPG'
+						. ' Author: License: GNU Free Public Documentation License'
+				),
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel5[1],
+				'ordering' => 3,
+			),
+			array(
+				'catid'    => $catIdsLevel2[0],
+				'state'    => 2,
+				'ordering' => 0,
+			),
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIdsLevel4[4],
+				'ordering' => 0,
+			),
+			array(
+				'catid'    => $catIdsLevel5[3],
+				'ordering' => 0,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'tags'     => array($tagIds[0], $tagIds[1], $tagIds[2]),
+				'ordering' => 0,
+			),
+			array(
+				'catid'    => $catIdsLevel5[0],
+				'ordering' => 0,
+			)
+		);
+
+		try
+		{
+			$ids = $this->addArticles($articles);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 3, $e->getMessage());
+
+			return $response;
+		}
+
+		$this->app->setUserState('sampledata.testing.articles', $ids);
+		$this->app->setUserState('sampledata.testing.articles.catids1', $catIdsLevel1);
+		$this->app->setUserState('sampledata.testing.articles.catids2', $catIdsLevel2);
+		$this->app->setUserState('sampledata.testing.articles.catids3', $catIdsLevel3);
+		$this->app->setUserState('sampledata.testing.articles.catids4', $catIdsLevel4);
+		$this->app->setUserState('sampledata.testing.articles.catids5', $catIdsLevel5);
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_TESTING_STEP3_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Fourth step to enter the sampledata. Contacts
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep4()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_contact'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_SKIPPED', 4, 'com_contact');
+
+			return $response;
+		}
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_contact/models/', 'ContactModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_contact/tables/');
+		$model  = JModelLegacy::getInstance('Contact', 'ContactModel');
+		$access = (int) $this->app->get('access', 1);
+		$user   = JFactory::getUser();
+
+		// Insert first level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_TITLE'),
+			'parent_id' => 0,
+		);
+
+		try
+		{
+			$catIdsLevel1 = $this->addCategories($categories, 'com_contact', 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 4, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert second level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_0_TITLE'),
+			'parent_id' => $catIdsLevel1[0],
+		);
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_TITLE'),
+			'parent_id' => $catIdsLevel1[0],
+		);
+
+		try
+		{
+			$catIdsLevel2 = $this->addCategories($categories, 'com_contact', 2);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 4, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert third level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_0_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_0_DESC'),
+			'parent_id'   => $catIdsLevel2[1],
+		);
+		$categories[] = array(
+			'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_1_TITLE'),
+			'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_1_DESC'),
+			'parent_id'   => $catIdsLevel2[1],
+		);
+
+		try
+		{
+			$catIdsLevel3 = $this->addCategories($categories, 'com_contact', 3);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 4, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert fourth level of categories.
+		$categories = array();
+
+		// Categories A-Z.
+		for ($i = 65; $i <= 90; $i++)
+		{
+			$categories[] = array(
+				'title'     => chr($i),
+				'parent_id' => $catIdsLevel3[1],
+			);
+		}
+
+		try
+		{
+			$catIdsLevel4 = $this->addCategories($categories, 'com_contact', 4);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 4, $e->getMessage());
+
+			return $response;
+		}
+
+		$contacts   = array(
+			array(
+				'name'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_NAME'),
+				'con_position' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_POSITION'),
+				'address'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_ADDRESS'),
+				'suburb'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SUBURB'),
+				'state'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_STATE'),
+				'country'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_COUNTRY'),
+				'postcode'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_POSTCODE'),
+				'telephone'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_TELEPHONE'),
+				'fax'          => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_FAX'),
+				'misc'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_MISC'),
+				'sortname1'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SORTNAME1'),
+				'sortname2'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SORTNAME2'),
+				'sortname3'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_SORTNAME3'),
+				'image'        => 'images/powered_by.png',
+				'email_to'     => 'email@example.com',
+				'default_con'  => 1,
+				'featured'     => 1,
+				'catid'        => $catIdsLevel1[0],
+				'params'       => array(
+					'show_links' => 1,
+					'linka_name' => 'Twitter',
+					'linka'      => 'http://twitter.com/joomla',
+					'linkb_name' => 'YouTube',
+					'linkb'      => 'http://www.youtube.com/user/joomla',
+					'linkc_name' => 'Facebook',
+					'linkc'      => 'http://www.facebook.com/joomla',
+					'linkd_name' => 'FriendFeed',
+					'linkd'      => 'http://friendfeed.com/joomla',
+					'linke_name' => 'Scribed',
+					'linke'      => 'http://www.scribd.com/people/view/504592-joomla',
+				),
+			),
+			array(
+				'name'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_1_NAME'),
+				'email_to' => 'webmaster@example.com',
+				'featured' => 1,
+				'catid'    => $catIdsLevel2[0],
+			),
+			array(
+				'name'  => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_2_NAME'),
+				'misc'  => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_2_MISC'),
+				'catid' => $catIdsLevel3[0],
+			),
+			array(
+				'name'  => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_3_NAME'),
+				'misc'  => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_3_MISC'),
+				'catid' => $catIdsLevel3[0],
+			),
+			array(
+				'name'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_NAME'),
+				'con_position' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_POSITION'),
+				'address'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_ADDRESS'),
+				'state'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_STATE'),
+				'misc'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_4_MISC'),
+				'image'        => 'images/sampledata/fruitshop/bananas_2.jpg',
+				'catid'        => $catIdsLevel4[1],
+				'params'       => array(
+					'show_contact_category' => 'show_with_link',
+					'presentation_style'    => 'plain',
+					'show_position'         => 1,
+					'show_state'            => 1,
+					'show_country'          => 1,
+					'show_links'            => 1,
+					'linka_name'            => 'Wikipedia: Banana English',
+					'linka'                 => 'https://en.wikipedia.org/wiki/Banana',
+					'linkb_name'            => 'Wikipedia: हिन्दी केला',
+					'linkb'                 => 'https://hi.wikipedia.org/wiki/%E0%A4%95%E0%A5%87%E0%A4%B2%E0%A4%BE',
+					'linkc_name'            => 'Wikipedia:Banana Português',
+					'linkc'                 => 'https://pt.wikipedia.org/wiki/Banana',
+					'linkd_name'            => 'Wikipedia: Банан  Русский',
+					'linkd'                 => 'https://ru.wikipedia.org/wiki/%D0%91%D0%B0%D0%BD%D0%B0%D0%BD',
+					'linke_name'            => '',
+					'linke'                 => '',
+					'contact_layout'        => 'beez5:encyclopedia',
+				),
+			),
+			array(
+				'name'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_NAME'),
+				'con_position' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_POSITION'),
+				'address'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_ADDRESS'),
+				'state'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_STATE'),
+				'misc'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_5_MISC'),
+				'image'        => 'images/sampledata/fruitshop/apple.jpg',
+				'catid'        => $catIdsLevel4[0],
+				'params'       => array(
+					'presentation_style' => 'plain',
+					'show_links'         => 1,
+					'linka_name'         => 'Wikipedia: Apples English',
+					'linka'              => 'https://en.wikipedia.org/wiki/Apple',
+					'linkb_name'         => 'Wikipedia: Manzana Español',
+					'linkb'              => 'https://es.wikipedia.org/wiki/Manzana',
+					'linkc_name'         => 'Wikipedia: 苹果 中文',
+					'linkc'              => 'http://zh.wikipedia.org/zh/苹果',
+					'linkd_name'         => 'Wikipedia: Tofaa Kiswahili',
+					'linkd'              => 'http://sw.wikipedia.org/wiki/Tofaa',
+					'linke_name'         => '',
+					'linke'              => '',
+					'contact_layout'     => 'beez5:encyclopedia',
+				),
+			),
+			array(
+				'name'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_NAME'),
+				'con_position' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_POSITION'),
+				'address'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_ADDRESS'),
+				'state'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_STATE'),
+				'misc'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_6_MISC'),
+				'image'        => 'images/sampledata/fruitshop/tamarind.jpg',
+				'catid'        => $catIdsLevel4[19],
+				'params'       => array(
+					'presentation_style' => 'plain',
+					'show_links'         => 1,
+					'linka_name'         => 'Wikipedia: Tamarind English',
+					'linka'              => 'https://en.wikipedia.org/wiki/Tamarind',
+					'linkb_name'         => 'Wikipedia: তেঁতুল  বাংলা',
+					'linkb'              => 'http://bn.wikipedia.org/wiki/তেঁতুল',
+					'linkc_name'         => 'Wikipedia: Tamarinier Français',
+					'linkc'              => 'https://fr.wikipedia.org/wiki/Tamarinier',
+					'linkd_name'         => 'Wikipedia:Tamaline lea faka-Tonga',
+					'linkd'              => 'http://to.wikipedia.org/wiki/Tamaline',
+					'linke_name'         => '',
+					'linke'              => '',
+					'contact_layout'     => 'beez5:encyclopedia',
+				),
+			),
+			array(
+				'name'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_NAME'),
+				'suburb'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_SUBURB'),
+				'country'   => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_COUNTRY'),
+				'address'   => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_ADDRESS'),
+				'telephone' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_TELEPHONE'),
+				'misc'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_7_MISC'),
+				'catid'     => $catIdsLevel2[1],
+			),
+		);
+		$contactIds = array();
+
+		foreach ($contacts as $contact)
+		{
+			// Set values which are always the same.
+			$contact['id']              = 0;
+			$contact['access']          = $access;
+			$contact['created_user_id'] = $user->id;
+			$contact['alias']           = JApplicationHelper::stringURLSafe($contact['name']);
+			$contact['published']       = 1;
+			$contact['language']        = '*';
+			$contact['associations']    = array();
+
+			// Reset some fields if not specified.
+			$fields = array('con_position', 'address', 'suburb', 'state', 'country', 'postcode', 'telephone', 'fax',
+				'misc', 'sortname1', 'sortname2', 'sortname3', 'email_to', 'image');
+
+			// Temporary, they are waiting for PR #14112
+			$fields[] = 'metakey';
+			$fields[] = 'metadesc';
+			$contact['metadata'] = '{}';
+
+			foreach ($fields as $field)
+			{
+				if (!isset($contact[$field]))
+				{
+					$contact[$field] = '';
+				}
+			}
+
+			// Set featured state to published if not set.
+			if (!isset($contact['featured']))
+			{
+				$contact['featured'] = 0;
+			}
+
+			// Set state to published if not set.
+			if (!isset($contact['default_con']))
+			{
+				$contact['default_con'] = 0;
+			}
+
+			// Set params to empty if not set.
+			if (!isset($contact['params']))
+			{
+				$contact['params'] = array(
+					'linka_name' => '',
+					'linka'      => '',
+					'linkb_name' => '',
+					'linkb'      => '',
+					'linkc_name' => '',
+					'linkc'      => '',
+					'linkd_name' => '',
+					'linkd'      => '',
+					'linke_name' => '',
+					'linke'      => '',
+				);
+			}
+
+			try
+			{
+				if (!$model->save($contact))
+				{
+					JFactory::getLanguage()->load('com_contact');
+					throw new Exception(JText::_($model->getError()));
+				}
+			}
+			catch (Exception $e)
+			{
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 4, $e->getMessage());
+
+				return $response;
+			}
+
+			// Get ID from category we just added
+			$contactIds[] = $model->getItem()->id;
+
+		}
+
+		// Storing IDs in UserState for later useage.
+		$this->app->setUserState('sampledata.testing.contacts', $contactIds);
+		$this->app->setUserState('sampledata.testing.contacts.catids1', $catIdsLevel1);
+		$this->app->setUserState('sampledata.testing.contacts.catids2', $catIdsLevel2);
+		$this->app->setUserState('sampledata.testing.contacts.catids3', $catIdsLevel3);
+		$this->app->setUserState('sampledata.testing.contacts.catids4', $catIdsLevel4);
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_TESTING_STEP4_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Fifth step to enter the sampledata. Newsfeed.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep5()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_newsfeeds'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_SKIPPED', 5, 'com_newsfeed');
+
+			return $response;
+		}
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_newsfeeds/models/', 'NewsfeedsModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_newsfeeds/tables/');
+		$model  = JModelLegacy::getInstance('Newsfeed', 'NewsfeedsModel');
+		$access = (int) $this->app->get('access', 1);
+		$user   = JFactory::getUser();
+
+		// Insert first level of categories.
+		$categories   = array();
+		$categories[] = array(
+			'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_CATEGORY_0_TITLE'),
+			'parent_id' => 0,
+		);
+
+		try
+		{
+			$catIdsLevel1 = $this->addCategories($categories, 'com_newsfeeds', 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 5, $e->getMessage());
+
+			return $response;
+		}
+
+		$newsfeeds    = array(
+			array(
+				'name'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_0_NAME'),
+				'link'     => 'http://feeds.joomla.org/JoomlaAnnouncements',
+				'ordering' => 1,
+			),
+			array(
+				'name'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_1_NAME'),
+				'link'     => 'http://feeds.joomla.org/JoomlaExtensions',
+				'ordering' => 4,
+			),
+			array(
+				'name'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_2_NAME'),
+				'link'     => 'http://feeds.joomla.org/JoomlaSecurityNews',
+				'ordering' => 2,
+			),
+			array(
+				'name'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_NEWSFEEDS_NEWSFEED_3_NAME'),
+				'link'     => 'http://feeds.joomla.org/JoomlaConnect',
+				'ordering' => 3,
+			),
+		);
+		$newsfeedsIds = array();
+
+		foreach ($newsfeeds as $newsfeed)
+		{
+			// Set values which are always the same.
+			$newsfeed['id']              = 0;
+			$newsfeed['access']          = $access;
+			$newsfeed['created_user_id'] = $user->id;
+			$newsfeed['alias']           = JApplicationHelper::stringURLSafe($newsfeed['name']);
+			$newsfeed['published']       = 1;
+			$newsfeed['language']        = '*';
+			$newsfeed['associations']    = array();
+			$newsfeed['numarticles']     = 5;
+			$newsfeed['cache_time']      = 3600;
+			$newsfeed['rtl']             = 1;
+			$newsfeed['description']     = '';
+			$newsfeed['images']          = '';
+			$newsfeed['catid']           = $catIdsLevel1[0];
+
+			// Temporary, it should be fixed in other place
+			$newsfeed['metakey']         = '';
+			$newsfeed['metadesc']        = '';
+			$newsfeed['xreference']      = '';
+			$newsfeed['metadata']        = '{}';
+			$newsfeed['params']          = '{}';
+
+			try
+			{
+				if (!$model->save($newsfeed))
+				{
+					JFactory::getLanguage()->load('com_newsfeeds');
+					throw new Exception(JText::_($model->getError()));
+				}
+			}
+			catch (Exception $e)
+			{
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 5, $e->getMessage());
+
+				return $response;
+			}
+
+			// Get ID from category we just added
+			$newsfeedsIds[] = $model->getItem()->id;
+
+		}
+
+		// Storing IDs in UserState for later useage.
+		$this->app->setUserState('sampledata.testing.newsfeeds', $newsfeedsIds);
+		$this->app->setUserState('sampledata.testing.newsfeeds.catids', $catIdsLevel1);
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_TESTING_STEP5_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Sixth step to enter the sampledata. Menus.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep6()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_menus'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_SKIPPED', 6, 'com_menus');
+
+			return $response;
+		}
+
+		// Create the menu types.
+		$menuTable = JTable::getInstance('Type', 'JTableMenu');
+		$menuTypes = array();
+
+		for ($i = 0; $i <= 7; $i++)
+		{
+			$menu = array(
+				'id'          => 0,
+				'title'       => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_' . $i . '_TITLE'),
+				'description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_MENU_' . $i . '_DESCRIPTION'),
+			);
+
+			// Calculate menutype.
+			$menu['menutype'] = JApplicationHelper::stringURLSafe($menu['title']);
+
+			$menuTable->load();
+			$menuTable->bind($menu);
+
+			try
+			{
+				$menuTable->store();
+			}
+			catch (Exception $e)
+			{
+				JFactory::getLanguage()->load('com_menus');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+				return $response;
+			}
+
+			$menuTypes[] = $menuTable->menutype;
+		}
+
+		// Storing IDs in UserState for later useage.
+		$this->app->setUserState('sampledata.testing.menutypes', $menuTypes);
+
+		// Get previously entered Data from UserStates
+		$contactIds      = $this->app->getUserState('sampledata.testing.contacts');
+		$contactCatids1  = $this->app->getUserState('sampledata.testing.contacts.catids1');
+		$contactCatids3  = $this->app->getUserState('sampledata.testing.contacts.catids3');
+		$articleIds      = $this->app->getUserState('sampledata.testing.articles');
+		$articleCatids1  = $this->app->getUserState('sampledata.testing.articles.catids1');
+		$articleCatids2  = $this->app->getUserState('sampledata.testing.articles.catids2');
+		$articleCatids3  = $this->app->getUserState('sampledata.testing.articles.catids3');
+		$articleCatids4  = $this->app->getUserState('sampledata.testing.articles.catids4');
+		$articleCatids5  = $this->app->getUserState('sampledata.testing.articles.catids5');
+		$tagIds          = $this->app->getUserState('sampledata.testing.tags');
+		$newsfeedsIds    = $this->app->getUserState('sampledata.testing.newsfeeds');
+		$newsfeedsCatids = $this->app->getUserState('sampledata.testing.newsfeeds.catids');
+
+		// TODO: In future, lookup component IDs for decoupled extensions and template_styles. For now they can remain hardcoded.
+
+		// Get MenuItemModel.
+		JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/models/', 'MenusModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/tables/');
+		$this->menuItemModel = JModelLegacy::getInstance('Item', 'MenusModel');
+
+		// Unset current "Home" menuitem since we set a new one.
+		$menuItemTable = JTable::getInstance('Menu', 'MenusTable');
+		$menuItemTable->load(
+			array(
+				'home' => 1,
+				'language' => '*',
+			)
+		);
+		$menuItemTable->home = 0;
+		$menuItemTable->store();
+
+		// Insert first level of menuitems.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_0_TITLE'),
+				'link'         => 'index.php?option=com_users&view=profile',
+				'component_id' => 25,
+				'access'       => 2,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_1_TITLE'),
+				'link'         => 'http://joomla.org',
+				'type'         => 'url',
+				'component_id' => 0,
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_2_TITLE'),
+				'link'         => 'index.php?option=com_contact&view=contact&id=' . $contactIds[0],
+				'component_id' => 8,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[4],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_3_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[3],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_4_TITLE'),
+				'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids3[1],
+				'component_id'      => 22,
+				'template_style_id' => 114,
+				'params'            => array(
+					'show_description'       => 1,
+					'show_description_image' => 1,
+					'num_leading_articles'   => 1,
+					'num_intro_articles'     => 4,
+					'num_columns'            => 1,
+					'num_links'              => 4,
+					'show_pagination'        => 2,
+					'show_feed_link'         => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[4],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_5_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[37],
+				'component_id' => 22,
+				'params'       => array(
+					'show_category'        => 0,
+					'show_parent_category' => 0,
+					'show_author'          => 0,
+					'show_create_date'     => 0,
+					'show_modify_date'     => 0,
+					'show_publish_date'    => 0,
+					'show_item_navigation' => 0,
+					'show_hits'            => 0,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[3],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_6_TITLE'),
+				'link'              => 'index.php?option=com_content&view=form&layout=edit',
+				'component_id'      => 22,
+				'access'            => 3,
+				'template_style_id' => 114,
+				'params'            => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[3],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_7_TITLE'),
+				'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[5],
+				'component_id'      => 22,
+				'template_style_id' => 114,
+				'params'            => array(
+					'show_title'           => 0,
+					'show_category'        => 0,
+					'link_category'        => 0,
+					'show_author'          => 0,
+					'show_create_date'     => 0,
+					'show_modify_date'     => 0,
+					'show_publish_date'    => 0,
+					'show_item_navigation' => 0,
+					'show_print_icon'      => 0,
+					'show_email_icon'      => 0,
+					'show_hits'            => 0,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[3],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_TITLE'),
+				'link'              => 'index.php?option=com_content&view=categories&id=' . $articleCatids3[2],
+				'component_id'      => 22,
+				'template_style_id' => 114,
+				'params'            => array(
+					'show_base_description'  => 1,
+					'drill_down_layout'      => 1,
+					'show_description'       => 1,
+					'show_description_image' => 1,
+					'maxLevel'               => -1,
+					'num_leading_articles'   => 1,
+					'num_intro_articles'     => 4,
+					'num_columns'            => 2,
+					'num_links'              => 4,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_9_TITLE'),
+				'link'         => 'index.php?option=com_contact&view=categories&id=' . $contactCatids1[0],
+				'component_id' => 8,
+				'params'       => array(
+					'maxLevel'           => -1,
+					'presentation_style' => 'sliders',
+					'show_links'         => 1,
+					'show_page_heading'  => 0,
+					'secure'             => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_TITLE'),
+				'link'         => 'index.php?option=com_newsfeeds&view=categories&id=0',
+				'component_id' => 17,
+				'params'       => array(
+					'show_base_description'  => 1,
+					'categories_description' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_PARAM_CATEGORIES_DESCRIPTION'),
+					'maxLevel'               => -1,
+					'show_empty_categories'  => 1,
+					'show_description'       => 1,
+					'show_description_image' => 1,
+					'show_cat_num_articles'  => 1,
+					'feed_character_count'   => 0,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_11_TITLE'),
+				'link'         => 'index.php?option=com_newsfeeds&view=category&id=' . $newsfeedsCatids[0],
+				'component_id' => 17,
+				'params'       => array(
+					'maxLevel'             => -1,
+					'feed_character_count' => 0,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_12_TITLE'),
+				'link'         => 'index.php?option=com_newsfeeds&view=newsfeed&id=' . $newsfeedsIds[0],
+				'component_id' => 17,
+				'params'       => array(
+					'feed_character_count' => 0,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_13_TITLE'),
+				'link'         => 'index.php?option=com_search&view=search',
+				'component_id' => 19,
+				'params'       => array(
+					'search_areas'      => 1,
+					'show_date'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_14_TITLE'),
+				'link'         => 'index.php?option=com_content&view=archive',
+				'component_id' => 22,
+				'params'       => array(
+					'show_category'     => 1,
+					'link_category'     => 1,
+					'show_title'        => 1,
+					'link_titles'       => 1,
+					'show_intro'        => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_15_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[5],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_16_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids3[1],
+				'component_id' => 22,
+				'params'       => array(
+					'show_description'       => 0,
+					'show_description_image' => 0,
+					'num_leading_articles'   => 1,
+					'num_intro_articles'     => 4,
+					'num_columns'            => 2,
+					'num_links'              => 4,
+					'show_pagination'        => 2,
+					'show_feed_link'         => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_17_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids2[0],
+				'component_id' => 22,
+				'params'       => array(
+					'orderby_sec'       => 'alpha',
+					'display_num'       => 10,
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_18_TITLE'),
+				'link'         => 'index.php?option=com_content&view=featured',
+				'component_id' => 22,
+				'params'       => array(
+					'num_leading_articles' => 1,
+					'num_intro_articles'   => 4,
+					'num_columns'          => 2,
+					'num_links'            => 4,
+					'multi_column_order'   => 1,
+					'orderby_sec'          => 'front',
+					'show_pagination'      => 2,
+					'show_feed_link'       => 1,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_19_TITLE'),
+				'link'         => 'index.php?option=com_content&view=form&layout=edit',
+				'component_id' => 22,
+				'access'       => 3,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_20_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[9],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[57],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 1,
+					'page_title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_21_PARAM_PAGE_TITLE'),
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_22_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[8],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_23_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[51],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_24_TITLE'),
+				'link'         => 'index.php?option=com_content&view=categories&id=' . $articleCatids1[0],
+				'component_id' => 22,
+				'params'       => array(
+					'maxLevel'             => -1,
+					'num_leading_articles' => 1,
+					'num_intro_articles'   => 4,
+					'num_columns'          => 2,
+					'num_links'            => 4,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_25_TITLE'),
+				'link'         => 'index.php?option=com_contact&view=category&id=' . $contactCatids3[0],
+				'component_id' => 8,
+				'params'       => array(
+					'maxLevel'           => -1,
+					'display_num'        => 20,
+					'presentation_style' => 'sliders',
+					'show_links'         => 1,
+					'show_feed_link'     => 1,
+					'show_page_heading'  => 0,
+					'secure'             => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_26_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[38],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[52],
+				'component_id' => 22,
+				'params'       => array(
+					'show_title'           => 1,
+					'link_titles'          => 0,
+					'show_intro'           => 1,
+					'show_category'        => 0,
+					'show_parent_category' => 0,
+					'show_author'          => 0,
+					'show_create_date'     => 0,
+					'show_modify_date'     => 0,
+					'show_publish_date'    => 0,
+					'show_item_navigation' => 0,
+					'show_hits'            => 0,
+					'show_noauth'          => 0,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_28_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[62],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_29_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[55],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_30_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[29],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_31_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[28],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_32_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[43],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_33_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[6],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_34_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[39],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_35_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[35],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_36_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[30],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_37_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[26],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_38_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[44],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_39_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[27],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_40_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[56],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_41_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[18],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_42_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[1],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_43_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[36],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_44_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_45_TITLE'),
+				'link'         => 'index.php?option=com_users&view=profile',
+				'component_id' => 25,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_46_TITLE'),
+				'link'         => 'index.php?option=com_users&view=profile&layout=edit',
+				'component_id' => 25,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_47_TITLE'),
+				'link'         => 'index.php?option=com_users&view=registration',
+				'component_id' => 25,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_48_TITLE'),
+				'link'         => 'index.php?option=com_users&view=remind',
+				'component_id' => 25,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_49_TITLE'),
+				'link'         => 'index.php?option=com_users&view=reset',
+				'component_id' => 25,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_50_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[15],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_51_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids5[0],
+				'component_id' => 22,
+				'params'       => array(
+					'maxLevel'              => 0,
+					'show_category_title'   => 1,
+					'show_empty_categories' => 1,
+					'show_description'      => 1,
+					'display_num'           => 0,
+					'show_headings'         => 0,
+					'list_show_title'       => 1,
+					'list_show_date'        => 0,
+					'list_show_hits'        => 0,
+					'list_show_author'      => 0,
+					'orderby_sec'           => 'order',
+					'show_category'         => 1,
+					'link_category'         => 1,
+					'show_page_heading'     => 0,
+					'secure'                => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_52_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids5[1],
+				'component_id' => 22,
+				'params'       => array(
+					'maxLevel'            => 0,
+					'show_category_title' => 1,
+					'show_description'    => 1,
+					'display_num'         => 0,
+					'show_headings'       => 0,
+					'list_show_title'     => 1,
+					'list_show_hits'      => 0,
+					'list_show_author'    => 0,
+					'orderby_sec'         => 'order',
+					'show_category'       => 1,
+					'link_category'       => 1,
+					'show_page_heading'   => 0,
+					'secure'              => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_53_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[58],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_54_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[11],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_55_TITLE'),
+				'link'              => 'index.php?option=com_contact&view=categories&id=' . $contactCatids3[1],
+				'component_id'      => 8,
+				'template_style_id' => 7,
+				'params'            => array(
+					'show_base_description'   => 1,
+					'show_description'        => 1,
+					'show_description_image'  => 1,
+					'maxLevel'                => -1,
+					'show_empty_categories'   => 1,
+					'show_headings'           => 0,
+					'show_email_headings'     => 0,
+					'show_telephone_headings' => 0,
+					'show_mobile_headings'    => 0,
+					'show_fax_headings'       => 0,
+					'show_suburb_headings'    => 0,
+					'show_links'              => 1,
+					'menu_text'               => 1,
+					'show_page_heading'       => 0,
+					'pageclass_sfx'           => ' categories-listalphabet',
+					'secure'                  => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_56_TITLE'),
+				'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[19],
+				'component_id'      => 22,
+				'template_style_id' => 7,
+				'params'            => array(
+					'show_title'           => 0,
+					'link_titles'          => 0,
+					'show_intro'           => 1,
+					'show_category'        => 0,
+					'link_category'        => 0,
+					'show_author'          => 0,
+					'show_create_date'     => 0,
+					'show_modify_date'     => 0,
+					'show_publish_date'    => 0,
+					'show_item_navigation' => 0,
+					'show_icons'           => 0,
+					'show_print_icon'      => 0,
+					'show_email_icon'      => 0,
+					'show_hits'            => 0,
+					'menu_text'            => 1,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_57_TITLE'),
+				'link'              => 'index.php?option=com_contact&view=category&id=' . $contactCatids3[0],
+				'component_id'      => 8,
+				'template_style_id' => 7,
+				'params'            => array(
+					'maxLevel'          => -1,
+					'show_headings'     => 0,
+					'show_links'        => 1,
+					'show_feed_link'    => 1,
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_58_TITLE'),
+				'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids3[3],
+				'component_id'      => 22,
+				'template_style_id' => 7,
+				'params'            => array(
+					'layout_type'          => 'blog',
+					'show_category_title'  => 1,
+					'show_description'     => 1,
+					'maxLevel'             => 0,
+					'num_leading_articles' => 5,
+					'num_intro_articles'   => 0,
+					'num_columns'          => 1,
+					'num_links'            => 4,
+					'orderby_sec'          => 'alpha',
+					'show_title'           => 1,
+					'link_titles'          => 1,
+					'show_intro'           => 1,
+					'show_category'        => 0,
+					'show_parent_category' => 0,
+					'link_parent_category' => 0,
+					'show_author'          => 0,
+					'show_publish_date'    => 0,
+					'show_hits'            => 0,
+					'menu_text'            => 1,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_59_TITLE'),
+				'link'              => 'index.php?option=com_users&view=login',
+				'component_id'      => 25,
+				'template_style_id' => 7,
+				'params'            => array(
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'menu_text'              => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_60_TITLE'),
+				'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[12],
+				'component_id'      => 22,
+				'template_style_id' => 7,
+				'params'            => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[4],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_61_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[23],
+				'component_id' => 22,
+				'params'       => array(
+					'show_title'           => 1,
+					'show_category'        => 0,
+					'link_category'        => 0,
+					'show_parent_category' => 0,
+					'link_parent_category' => 0,
+					'show_author'          => 0,
+					'link_author'          => 0,
+					'show_create_date'     => 0,
+					'show_modify_date'     => 0,
+					'show_publish_date'    => 0,
+					'show_item_navigation' => 0,
+					'show_icons'           => 0,
+					'show_print_icon'      => 0,
+					'show_email_icon'      => 0,
+					'show_hits'            => 0,
+					'menu_text'            => 1,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+				'home'         => 1
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_62_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[21],
+				'component_id' => 22,
+				'params'       => array(
+					'show_title'           => 1,
+					'link_titles'          => 0,
+					'show_category'        => 0,
+					'show_parent_category' => 0,
+					'show_author'          => 0,
+					'show_create_date'     => 0,
+					'show_modify_date'     => 0,
+					'show_publish_date'    => 0,
+					'show_item_navigation' => 0,
+					'show_hits'            => 0,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_63_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_64_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[25],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[4],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_65_TITLE'),
+				'link'         => 'administrator',
+				'type'         => 'url',
+				'component_id' => 0,
+				'params'       => array(),
+			),
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_66_TITLE'),
+				'link'         => 'index.php?option=com_content&view=form&layout=edit',
+				'component_id' => 22,
+				'access'       => 3,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_67_TITLE'),
+				'link'         => 'index.php?option=com_contact&view=featured',
+				'component_id' => 8,
+				'params'       => array(
+					'maxLevel'           => -1,
+					'presentation_style' => 'sliders',
+					'show_links'         => 1,
+					'show_page_heading'  => 1,
+					'secure'             => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_68_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[3],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 1,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_69_TITLE'),
+				'link'              => 'index.php?option=com_content&view=form&layout=edit',
+				'component_id'      => 22,
+				'access'            => 4,
+				'template_style_id' => 7,
+				'params'            => array(
+					'enable_category'   => 0,
+					'catid'             => 14,
+					'menu_text'         => 1,
+					'show_page_heading' => 1,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[5],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_70_TITLE'),
+				'link'              => 'index.php?option=com_content&view=category&id=' . $articleCatids3[4],
+				'component_id'      => 22,
+				'template_style_id' => 7,
+				'params'            => array(
+					'show_category_title'   => 1,
+					'show_description'      => 1,
+					'maxLevel'              => 0,
+					'show_empty_categories' => 0,
+					'display_num'           => 10,
+					'menu_text'             => 1,
+					'show_page_heading'     => 0,
+					'secure'                => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_71_TITLE'),
+				'link'         => 'index.php?option=com_finder&view=search&q=&f=',
+				'component_id' => 27,
+				'params'       => array(
+					'description_length' => 255,
+					'allow_empty_query'  => 0,
+					'show_feed'          => 0,
+					'show_feed_text'     => 0,
+					'menu_text'          => 1,
+					'show_page_heading'  => 0,
+					'secure'             => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_72_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[66],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_73_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[67],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[7],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_74_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[68],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_75_TITLE'),
+				'link'         => 'index.php?option=com_tags&view=tag&layout=list&id[0]=' . $tagIds[2],
+				'component_id' => 29,
+				'params'       => array(
+					'tag_list_item_maximum_characters' => 0,
+					'maximum'                          => 200,
+					'menu_text'                        => 1,
+					'show_page_heading'                => 0,
+					'secure'                           => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_76_TITLE'),
+				'link'         => 'index.php?option=com_tags&view=tag&id[0]=' . $tagIds[1],
+				'component_id' => 29,
+				'params'       => array(
+					'tag_list_item_maximum_characters' => 0,
+					'maximum'                          => 200,
+					'menu_text'                        => 1,
+					'show_page_heading'                => 0,
+					'secure'                           => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_77_TITLE'),
+				'link'         => 'index.php?option=com_tags&view=tags',
+				'component_id' => 29,
+				'params'       => array(
+					'tag_columns'                     => 4,
+					'all_tags_tag_maximum_characters' => 0,
+					'maximum'                         => 200,
+					'menu_text'                       => 1,
+					'show_page_heading'               => 0,
+					'secure'                          => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_78_TITLE'),
+				'link'         => 'index.php?option=com_config&view=config&controller=config.display.config',
+				'component_id' => 23,
+				'access'       => 6,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[6],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_79_TITLE'),
+				'link'         => 'index.php?option=com_config&view=templates&controller=config.display.templates',
+				'component_id' => 23,
+				'access'       => 6,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel1 = $this->addMenuItems($menuItems, 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert alias menu items for level 1.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_100_TITLE'),
+				'link'         => 'index.php?Itemid=',
+				'type'         => 'alias',
+				'component_id' => 0,
+				'params'       => array(
+					'aliasoptions' => $menuIdsLevel1[5],
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_101_TITLE'),
+				'link'         => 'index.php?Itemid=',
+				'type'         => 'alias',
+				'component_id' => 0,
+				'params'       => array(
+					'aliasoptions' => $menuIdsLevel1[61],
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_102_TITLE'),
+				'link'         => 'index.php?Itemid=',
+				'type'         => 'alias',
+				'component_id' => 22,
+				'params'       => array(
+					'aliasoptions' => $menuIdsLevel1[7],
+					'menu_text'    => 1
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_103_TITLE'),
+				'link'         => 'index.php?Itemid=',
+				'type'         => 'alias',
+				'component_id' => 0,
+				'params'       => array(
+					'aliasoptions' => $menuIdsLevel1[56],
+					'menu_text'    => 1
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel1Alias = $this->addMenuItems($menuItems, 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert second level of menuitems.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_TITLE'),
+				'link'         => 'index.php?option=com_content&view=categories&id=' . $articleCatids3[0],
+				'parent_id'    => $menuIdsLevel1[27],
+				'component_id' => 22,
+				'params'       => array(
+					'show_base_description'     => 1,
+					'maxLevelcat'               => 1,
+					'show_empty_categories_cat' => 1,
+					'show_subcat_desc_cat'      => 1,
+					'show_cat_num_articles_cat' => 0,
+					'show_description'          => 1,
+					'show_description_image'    => 1,
+					'maxLevel'                  => 1,
+					'show_empty_categories'     => 1,
+					'num_leading_articles'      => 1,
+					'num_intro_articles'        => 4,
+					'num_columns'               => 2,
+					'num_links'                 => 4,
+					'secure'                    => 0
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[3],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_1_TITLE'),
+				'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[5],
+				'parent_id'         => $menuIdsLevel1[8],
+				'component_id'      => 22,
+				'template_style_id' => 114,
+				'params'            => array(
+					'show_description'       => 1,
+					'show_description_image' => 0,
+					'num_leading_articles'   => 0,
+					'num_intro_articles'     => 6,
+					'num_columns'            => 2,
+					'num_links'              => 4,
+					'multi_column_order'     => 1,
+					'show_pagination'        => 2,
+					'show_intro'             => 0,
+					'show_category'          => 1,
+					'link_category'          => 1,
+					'show_author'            => 0,
+					'show_create_date'       => 0,
+					'show_modify_date'       => 0,
+					'show_publish_date'      => 0,
+					'show_item_navigation'   => 1,
+					'show_feed_link'         => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[3],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_2_TITLE'),
+				'link'              => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[5],
+				'parent_id'         => $menuIdsLevel1[8],
+				'component_id'      => 22,
+				'template_style_id' => 114,
+				'params'            => array(
+					'show_description'       => 0,
+					'show_description_image' => 0,
+					'num_leading_articles'   => 0,
+					'num_intro_articles'     => 4,
+					'num_columns'            => 2,
+					'num_links'              => 4,
+					'multi_column_order'     => 1,
+					'show_pagination'        => 2,
+					'show_intro'             => 0,
+					'show_category'          => 1,
+					'show_parent_category'   => 0,
+					'link_parent_category'   => 0,
+					'show_author'            => 0,
+					'link_author'            => 0,
+					'show_create_date'       => 0,
+					'show_modify_date'       => 0,
+					'show_publish_date'      => 0,
+					'show_item_navigation'   => 1,
+					'show_readmore'          => 1,
+					'show_icons'             => 0,
+					'show_print_icon'        => 0,
+					'show_email_icon'        => 0,
+					'show_hits'              => 0,
+					'show_feed_link'         => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel2 = $this->addMenuItems($menuItems, 2);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert alias menu items for level 2.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[4],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_103_TITLE'),
+				'link'         => 'index.php?Itemid=',
+				'type'         => 'alias',
+				'parent_id'    => $menuIdsLevel1[5],
+				'component_id' => 0,
+				'params'       => array(
+					'aliasoptions' => $menuIdsLevel1[7],
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[4],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_104_TITLE'),
+				'link'         => 'index.php?Itemid=',
+				'type'         => 'alias',
+				'parent_id'    => $menuIdsLevel1[5],
+				'component_id' => 0,
+				'params'       => array(
+					'aliasoptions' => $menuIdsLevel1[56],
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel2Alias = $this->addMenuItems($menuItems, 2);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert third level of menuitems.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&id=' . $articleCatids4[2],
+				'parent_id'    => $menuIdsLevel2[0],
+				'component_id' => '22',
+				'params'       => array(
+					'show_description'      => 1,
+					'maxLevel'              => 2,
+					'show_empty_categories' => 1,
+					'show_no_articles'      => '0',
+					'show_subcat_desc'      => 1,
+					'show_pagination_limit' => '0',
+					'filter_field'          => 'hide',
+					'show_headings'         => '0',
+					'list_show_date'        => '0',
+					'list_show_hits'        => '0',
+					'list_show_author'      => '0',
+					'show_pagination'       => '0',
+					'show_title'            => 1,
+					'link_titles'           => 1,
+					'menu_text'             => 1,
+					'page_title'            => 'Templates',
+					'show_page_heading'     => 0,
+					'secure'                => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_1_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[3],
+				'parent_id'    => $menuIdsLevel2[0],
+				'component_id' => '22',
+				'params'       => array(
+					'show_description'       => 1,
+					'show_description_image' => 1,
+					'show_category_title'    => 1,
+					'num_leading_articles'   => 1,
+					'num_intro_articles'     => 4,
+					'num_columns'            => 2,
+					'num_links'              => 4,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids4[4],
+				'parent_id'    => $menuIdsLevel2[0],
+				'component_id' => '22',
+				'params'       => array(
+					'show_description'     => 1,
+					'show_category_title'  => 1,
+					'num_leading_articles' => 0,
+					'num_intro_articles'   => 7,
+					'num_columns'          => 1,
+					'num_links'            => 0,
+					'orderby_sec'          => 'order',
+					'show_category'        => 0,
+					'link_category'        => 0,
+					'show_parent_category' => 0,
+					'link_parent_category' => 0,
+					'show_author'          => 0,
+					'show_create_date'     => 0,
+					'show_modify_date'     => 0,
+					'show_publish_date'    => 0,
+					'show_icons'           => 0,
+					'show_print_icon'      => 0,
+					'show_email_icon'      => 0,
+					'show_hits'            => 0,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			)
+		);
+
+		try
+		{
+			$menuIdsLevel3 = $this->addMenuItems($menuItems, 3);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert fourth level of menuitems.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_0_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[45],
+				'parent_id'    => $menuIdsLevel3[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_1_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[4],
+				'parent_id'    => $menuIdsLevel3[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_2_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[59],
+				'parent_id'    => $menuIdsLevel3[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_3_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[13],
+				'parent_id'    => $menuIdsLevel3[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_4_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[14],
+				'parent_id'    => $menuIdsLevel3[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_5_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[40],
+				'parent_id'    => $menuIdsLevel3[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_2_6_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[50],
+				'parent_id'    => $menuIdsLevel3[2],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[6],
+				'parent_id'    => $menuIdsLevel3[0],
+				'component_id' => 22,
+				'params'       => array(
+					'show_description'     => 1,
+					'num_leading_articles' => 1,
+					'num_intro_articles'   => 4,
+					'num_columns'          => 2,
+					'num_links'            => 4,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[5],
+				'parent_id'    => $menuIdsLevel3[0],
+				'component_id' => 22,
+				'params'       => array(
+					'show_description'     => 1,
+					'num_leading_articles' => 2,
+					'num_intro_articles'   => 4,
+					'num_columns'          => 2,
+					'num_links'            => 4,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $articleCatids5[7],
+				'parent_id'    => $menuIdsLevel3[0],
+				'component_id' => 22,
+				'params'       => array(
+					'show_description'     => 1,
+					'num_leading_articles' => 1,
+					'num_intro_articles'   => 4,
+					'num_columns'          => 2,
+					'num_links'            => 4,
+					'show_page_heading'    => 1,
+					'secure'               => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel4 = $this->addMenuItems($menuItems, 4);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert fifth level of menuitems.
+		$menuItems = array(
+			array(
+				'menutype'          => $menuTypes[2],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_0_TITLE'),
+				'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
+				'parent_id'         => $menuIdsLevel4[8],
+				'component_id'      => 22,
+				'template_style_id' => 3,
+				'params'            => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[2],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_8_1_TITLE'),
+				'link'              => 'index.php?option=com_content&view=featured',
+				'parent_id'         => $menuIdsLevel4[8],
+				'component_id'      => 22,
+				'template_style_id' => 3,
+				'params'            => array(
+					'num_leading_articles' => 1,
+					'num_intro_articles'   => 3,
+					'num_columns'          => 3,
+					'num_links'            => 0,
+					'multi_column_order'   => 1,
+					'orderby_sec'          => 'front',
+					'show_pagination'      => 2,
+					'show_feed_link'       => 1,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[2],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_2_TITLE'),
+				'link'              => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
+				'parent_id'         => $menuIdsLevel4[7],
+				'component_id'      => 22,
+				'template_style_id' => 4,
+				'params'            => array(
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'          => $menuTypes[2],
+				'title'             => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_7_3_TITLE'),
+				'link'              => 'index.php?option=com_content&view=featured',
+				'parent_id'         => $menuIdsLevel4[7],
+				'component_id'      => 22,
+				'template_style_id' => 4,
+				'params'            => array(
+					'num_leading_articles' => 1,
+					'num_intro_articles'   => 3,
+					'num_columns'          => 3,
+					'num_links'            => 0,
+					'multi_column_order'   => 1,
+					'orderby_sec'          => 'front',
+					'show_pagination'      => 2,
+					'show_feed_link'       => 1,
+					'show_page_heading'    => 0,
+					'secure'               => 0,
+				),
+
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_4_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[48],
+				'parent_id'    => $menuIdsLevel4[9],
+				'component_id' => 22,
+				'params'       => array(
+					'show_page_heading' => 1,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_27_0_0_9_5_TITLE'),
+				'link'         => 'index.php?option=com_content&view=featured',
+				'parent_id'    => $menuIdsLevel4[9],
+				'component_id' => 22,
+				'params'       => array(
+					'num_leading_articles' => 1,
+					'num_intro_articles'   => 3,
+					'num_columns'          => 3,
+					'num_links'            => 0,
+					'orderby_sec'          => 'front',
+					'show_page_heading'    => 1,
+					'secure'               => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel5 = $this->addMenuItems($menuItems, 5);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 6, $e->getMessage());
+
+			return $response;
+		}
+
+		$this->app->setUserState('sampledata.testing.menus.menuids1', $menuIdsLevel1);
+		$this->app->setUserState('sampledata.testing.menus.menuids2', $menuIdsLevel2);
+		$this->app->setUserState('sampledata.testing.menus.menuids3', $menuIdsLevel3);
+		$this->app->setUserState('sampledata.testing.menus.menuids4', $menuIdsLevel4);
+		$this->app->setUserState('sampledata.testing.menus.menuids5', $menuIdsLevel5);
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_TESTING_STEP6_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Seventh step to enter the sampledata. Modules.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function onAjaxSampledataApplyStep7()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_modules'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_SKIPPED', 7, 'com_modules');
+
+			return $response;
+		}
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_modules/models/', 'ModulesModelModule');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_modules/tables/');
+		$model  = JModelLegacy::getInstance('Module', 'ModulesModel');
+		$access = (int) $this->app->get('access', 1);
+
+		// Get previously entered Data from UserStates
+		$menuTypes      = $this->app->getUserState('sampledata.testing.menutypes');
+		$articleCatids1 = $this->app->getUserState('sampledata.testing.articles.catids1');
+		$articleCatids2 = $this->app->getUserState('sampledata.testing.articles.catids2');
+		$articleCatids3 = $this->app->getUserState('sampledata.testing.articles.catids3');
+		$articleCatids4 = $this->app->getUserState('sampledata.testing.articles.catids4');
+		$articleCatids5 = $this->app->getUserState('sampledata.testing.articles.catids5');
+		$bannerCatids   = $this->app->getUserState('sampledata.testing.banners.catids');
+		$menuIdsLevel1  = $this->app->getUserState('sampledata.testing.menus.menuids1');
+		$menuIdsLevel2  = $this->app->getUserState('sampledata.testing.menus.menuids2');
+		$menuIdsLevel5  = $this->app->getUserState('sampledata.testing.menus.menuids5');
+
+		$modules = array(
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_0_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-7',
+				'module'   => 'mod_menu',
+				'access'   => $access,
+				'params'   => array(
+					'menutype'        => $menuTypes[4],
+					'startLevel'      => 0,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'moduleclass_sfx' => '_menu',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_1_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'position-10',
+				'module'    => 'mod_banners',
+				'access'    => $access,
+				'showtitle' => 0,
+				'params'    => array(
+					'target'      => 1,
+					'count'       => 1,
+					'cid'         => 3,
+					'catid'       => array(),
+					'tag_search'  => 0,
+					'ordering'    => 0,
+					'footer_text' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_1_FOOTEER_TEXT'),
+					'cache'       => 1,
+					'cache_time'  => 900
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_2_TITLE'),
+				'ordering'   => 3,
+				'position'   => 'position-7',
+				'module'     => 'mod_menu',
+				'access'     => 2,
+				'assignment' => -1,
+				'assigned'   => array(
+					$menuIdsLevel1[4],
+					$menuIdsLevel1[6],
+					$menuIdsLevel1[7],
+					$menuIdsLevel1[8],
+					$menuIdsLevel1[55],
+					$menuIdsLevel1[56],
+					$menuIdsLevel1[57],
+					$menuIdsLevel1[58],
+					$menuIdsLevel1[59],
+					$menuIdsLevel1[60],
+					$menuIdsLevel1[69],
+					$menuIdsLevel1[70],
+					$menuIdsLevel2[1],
+					$menuIdsLevel2[2],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[0],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'moduleclass_sfx' => '_menu',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_3_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-1',
+				'module'   => 'mod_menu',
+				'access'   => $access,
+				'params'   => array(
+					'menutype'        => $menuTypes[1],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'class_sfx'       => ' nav-pills',
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_4_TITLE'),
+				'ordering'   => 2,
+				'position'   => 'position-5',
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[4],
+					$menuIdsLevel1[5],
+					$menuIdsLevel1[6],
+					$menuIdsLevel1[7],
+					$menuIdsLevel1[8],
+					$menuIdsLevel2[1],
+					$menuIdsLevel2[2],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[3],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_5_TITLE'),
+				'ordering'   => 4,
+				'position'   => 'position-7',
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'assignment' => -1,
+				'assigned'   => array(
+					$menuIdsLevel1[4],
+					$menuIdsLevel1[5],
+					$menuIdsLevel1[6],
+					$menuIdsLevel1[7],
+					$menuIdsLevel1[8],
+					$menuIdsLevel1[55],
+					$menuIdsLevel1[56],
+					$menuIdsLevel1[57],
+					$menuIdsLevel1[58],
+					$menuIdsLevel1[59],
+					$menuIdsLevel1[60],
+					$menuIdsLevel1[69],
+					$menuIdsLevel1[70],
+					$menuIdsLevel2[1],
+					$menuIdsLevel2[2],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[2],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'moduleclass_sfx' => '_menu',
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_6_TITLE'),
+				'ordering'   => 1,
+				'position'   => 'sitemapload',
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => '-',
+				'params'     => array(
+					'menutype'        => $menuTypes[4],
+					'startLevel'      => 2,
+					'endLevel'        => 3,
+					'showAllChildren' => 1,
+					'class_sfx'       => 'sitemap',
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_7_TITLE'),
+				'ordering'   => 5,
+				'position'   => 'position-7',
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'assignment' => -1,
+				'assigned'   => array(
+					$menuIdsLevel1[4],
+					$menuIdsLevel1[5],
+					$menuIdsLevel1[6],
+					$menuIdsLevel1[7],
+					$menuIdsLevel1[8],
+					$menuIdsLevel1[55],
+					$menuIdsLevel1[56],
+					$menuIdsLevel1[57],
+					$menuIdsLevel1[58],
+					$menuIdsLevel1[59],
+					$menuIdsLevel1[60],
+					$menuIdsLevel1[69],
+					$menuIdsLevel1[70],
+					$menuIdsLevel2[1],
+					$menuIdsLevel2[2],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[4],
+					'startLevel'      => 1,
+					'endLevel'        => 1,
+					'showAllChildren' => 0,
+					'moduleclass_sfx' => '_menu',
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_8_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_articles_archive',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[42],
+				),
+				'params'     => array(
+					'count'      => '10',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_9_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_articles_latest',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[37],
+				),
+				'params'     => array(
+					'catid'      => array($articleCatids2[0]),
+					'count'      => 5,
+					'ordering'   => 'c_dsc',
+					'user_id'    => 0,
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_10_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_articles_popular',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[30],
+				),
+				'params'     => array(
+					'catid'      => array($articleCatids2[1], $articleCatids2[2]),
+					'count'      => 5,
+					'show_front' => 1,
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_11_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_feed',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[50],
+				),
+				'params'     => array(
+					'rssurl'      => 'http://community.joomla.org/blogs/community.feed?type=rss',
+					'rssrtl'      => 0,
+					'rsstitle'    => 1,
+					'rssdesc'     => 1,
+					'rssimage'    => 1,
+					'rssitems'    => 3,
+					'rssitemdesc' => 1,
+					'word_count'  => 0,
+					'cache'       => 1,
+					'cache_time'  => 900
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_12_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_articles_news',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[36],
+				),
+				'params'     => array(
+					'catid'             => array($articleCatids2[0]),
+					'image'             => 0,
+					'item_title'        => 0,
+					'item_heading'      => 'h4',
+					'showLastSeparator' => 1,
+					'readmore'          => 1,
+					'count'             => 1,
+					'ordering'          => 'a.publish_up',
+					'cache'             => 1,
+					'cache_time'        => 900,
+					'cachemode'         => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_13_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_random_image',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[35],
+				),
+				'params'     => array(
+					'type'   => 'jpg',
+					'folder' => 'images/sampledata/parks/animals',
+					'width'  => 180,
+					'cache'  => 0
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_14_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_related_items',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[43],
+				),
+				'params'     => array(
+					'showDate' => 0,
+					'owncache' => 1
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_15_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_search',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[34],
+				),
+				'params'     => array(
+					'width'      => '20',
+					'button_pos' => 'right',
+					'opensearch' => 1,
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_16_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_stats',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[32],
+				),
+				'params'     => array(
+					'serverinfo' => 1,
+					'siteinfo'   => 1,
+					'counter'    => 1,
+					'increase'   => 0,
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_17_TITLE'),
+				'ordering'   => 1,
+				'position'   => 'syndicateload',
+				'module'     => 'mod_syndicate',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[38],
+				),
+				'params'     => array(
+					'text'   => 'Feed Entries',
+					'format' => 'rss',
+					'cache'  => 0
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_18_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_users_latest',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[28],
+				),
+				'params'     => array(
+					'shownumber' => 5,
+					'linknames'  => 0,
+					'cache'      => 0,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_19_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_whosonline',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[29],
+				),
+				'params'     => array(
+					'showmode'  => 2,
+					'linknames' => 0,
+					'cache'     => 0
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_20_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_wrapper',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[40],
+				),
+				'params'     => array(
+					'url'         => 'http://www.youtube.com/embed/vb2eObvmvdI',
+					'add'         => 1,
+					'scrolling'   => 'auto',
+					'width'       => 640,
+					'height'      => 390,
+					'height_auto' => 1,
+					'cache'       => 1,
+					'cache_time'  => 900,
+					'cachemode'   => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_21_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_footer',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[41],
+				),
+				'params'     => array(
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_22_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_login',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[39],
+				),
+				'params'     => array(
+					'login'     => 280,
+					'logout'    => 280,
+					'greeting'  => 1,
+					'name'      => 0,
+					'usesecure' => 0,
+					'cache'     => 0
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_23_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[31],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[4],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_24_TITLE'),
+				'ordering'   => 6,
+				'position'   => 'position-7',
+				'module'     => 'mod_articles_latest',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[4],
+					$menuIdsLevel1[6],
+					$menuIdsLevel1[7],
+					$menuIdsLevel1[8],
+					$menuIdsLevel2[1],
+					$menuIdsLevel2[2],
+				),
+				'params'     => array(
+					'catid'      => array($articleCatids3[1]),
+					'count'      => 5,
+					'ordering'   => 'c_dsc',
+					'user_id'    => 0,
+					'show_front' => 1,
+					'cache'      => 1,
+					'cache_time' => 900
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_25_TITLE'),
+				'content'  => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_25_CONTENT'),
+				'ordering' => 1,
+				'module'   => 'mod_custom',
+				'access'   => $access,
+				'assigned' => array(
+					$menuIdsLevel1[54],
+				),
+				'params'   => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_26_TITLE'),
+				'ordering' => 1,
+				'module'   => 'mod_breadcrumbs',
+				'access'   => $access,
+				'assigned' => array(
+					$menuIdsLevel1[53],
+				),
+				'params'   => array(
+					'showHere'   => 1,
+					'showHome'   => 1,
+					'homeText'   => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_26_HOMETEXT'),
+					'showLast'   => 1,
+					'cache'      => 0,
+					'cache_time' => 900,
+					'cachemode'  => 'itemid'
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_27_TITLE'),
+				'ordering' => 1,
+				'module'   => 'mod_banners',
+				'access'   => $access,
+				'assigned' => array(
+					$menuIdsLevel1[33],
+				),
+				'params'   => array(
+					'target'     => 1,
+					'count'      => 1,
+					'cid'        => 1,
+					'catid'      => array($bannerCatids[0]),
+					'tag_search' => 0,
+					'ordering'   => 'random',
+					'cache'      => 1,
+					'cache_time' => 900
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_28_TITLE'),
+				'ordering'   => 3,
+				'position'   => 'position-5',
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[5],
+					$menuIdsLevel1[55],
+					$menuIdsLevel1[56],
+					$menuIdsLevel1[57],
+					$menuIdsLevel1[58],
+					$menuIdsLevel1[59],
+					$menuIdsLevel1[60],
+					$menuIdsLevel1[69],
+					$menuIdsLevel1[70],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[5],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_29_TITLE'),
+				'content'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_29_CONTENT'),
+				'ordering'   => 1,
+				'position'   => 'position-12',
+				'module'     => 'mod_custom',
+				'access'     => 4,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[55],
+					$menuIdsLevel1[56],
+					$menuIdsLevel1[57],
+					$menuIdsLevel1[58],
+					$menuIdsLevel1[59],
+					$menuIdsLevel1[60],
+					$menuIdsLevel1[69],
+					$menuIdsLevel1[70],
+				),
+				'params'     => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_30_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_articles_categories',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[63],
+				),
+				'params'     => array(
+					'parent'           => 29,
+					'show_description' => 0,
+					'show_children'    => 0,
+					'count'            => 0,
+					'maxlevel'         => 0,
+					'item_heading'     => 4,
+					'owncache'         => 1,
+					'cache_time'       => 900
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_31_TITLE'),
+				'ordering'   => 3,
+				'position'   => 'position-4',
+				'published'  => 0,
+				'module'     => 'mod_languages',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[4],
+					$menuIdsLevel1[6],
+					$menuIdsLevel1[7],
+					$menuIdsLevel1[8],
+					$menuIdsLevel2[1],
+					$menuIdsLevel2[2],
+				),
+				'params'     => array(
+					'image'      => 1,
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_32_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-0',
+				'module'   => 'mod_search',
+				'access'   => $access,
+				'params'   => array(
+					'width'       => '20',
+					'button_pos'  => 'right',
+					'imagebutton' => 1,
+					'cache'       => 1,
+					'cache_time'  => 900,
+					'cachemode'   => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_33_TITLE'),
+				'ordering'   => 1,
+				'position'   => 'languageswitcherload',
+				'published'  => 0,
+				'module'     => 'mod_languages',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[64],
+				),
+				'params'     => array(
+					'image'      => 1,
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_34_TITLE'),
+				'content'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_34_CONTENT'),
+				'ordering'   => 1,
+				'position'   => 'position-4',
+				'module'     => 'mod_custom',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[55],
+					$menuIdsLevel1[56],
+					$menuIdsLevel1[57],
+					$menuIdsLevel1[58],
+					$menuIdsLevel1[60],
+					$menuIdsLevel1[69],
+					$menuIdsLevel1[70],
+				),
+				'params'     => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_35_TITLE'),
+				'ordering'   => 2,
+				'position'   => 'position-7',
+				'published'  => 0,
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'assignment' => '-',
+				'params'     => array(
+					'menutype'        => $menuTypes[2],
+					'startLevel'      => 1,
+					'endLevel'        => 6,
+					'showAllChildren' => 0,
+					'class_sfx'       => '-menu',
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_36_TITLE'),
+				'content'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_36_CONTENT'),
+				'ordering'   => 2,
+				'position'   => 'position-4',
+				'module'     => 'mod_custom',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[7],
+				),
+				'params'     => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_37_TITLE'),
+				'ordering'   => 1,
+				'module'     => 'mod_articles_category',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[69],
+				),
+				'params'     => array(
+					'mode'                         => 'normal',
+					'show_on_article_page'         => 1,
+					'show_front'                   => 'show',
+					'count'                        => 0,
+					'category_filtering_type'      => 1,
+					'catid'                        => array($articleCatids4[5]),
+					'show_child_category_articles' => 0,
+					'levels'                       => 1,
+					'author_filtering_type'        => 1,
+					'created_by'                   => array(),
+					'author_alias_filtering_type'  => 1,
+					'created_by_alias'             => array(),
+					'date_filtering'               => 'off',
+					'date_field'                   => 'a.created',
+					'relative_date'                => 30,
+					'article_ordering'             => 'a.title',
+					'article_ordering_direction'   => 'ASC',
+					'article_grouping'             => 'none',
+					'article_grouping_direction'   => 'ksort',
+					'month_year_format'            => 'F Y',
+					'item_heading'                 => 4,
+					'link_titles'                  => 1,
+					'show_date'                    => 0,
+					'show_date_field'              => 'created',
+					'show_date_format'             => 'Y-m-d H:i:s',
+					'show_category'                => 0,
+					'show_hits'                    => 0,
+					'show_author'                  => 0,
+					'show_introtext'               => 0,
+					'introtext_limit'              => 100,
+					'show_readmore'                => 0,
+					'show_readmore_title'          => 1,
+					'readmore_limit'               => 15,
+					'owncache'                     => 1,
+					'cache_time'                   => 900
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_38_TITLE'),
+				'ordering'   => 1,
+				'position'   => 'atomic-search',
+				'module'     => 'mod_search',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel5[0],
+					$menuIdsLevel5[1],
+				),
+				'params'     => array(
+					'width'      => 20,
+					'button_pos' => 'right',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_39_TITLE'),
+				'ordering'   => 1,
+				'position'   => 'atomic-topmenu',
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel5[0],
+					$menuIdsLevel5[1],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[2],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_TITLE'),
+				'content'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_40_CONTENT'),
+				'ordering'   => 1,
+				'position'   => 'atomic-topquote',
+				'module'     => 'mod_custom',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel5[0],
+					$menuIdsLevel5[1],
+				),
+				'params'     => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_TITLE'),
+				'content'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_CONTENT'),
+				'ordering'   => 1,
+				'position'   => 'atomic-bottomleft',
+				'module'     => 'mod_custom',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel5[0],
+					$menuIdsLevel5[1],
+				),
+				'params'     => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_TITLE'),
+				'content'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_CONTENT'),
+				'ordering'   => 1,
+				'position'   => 'atomic-bottommiddle',
+				'module'     => 'mod_custom',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel5[0],
+					$menuIdsLevel5[1],
+				),
+				'params'     => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_TITLE'),
+				'content'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_CONTENT'),
+				'ordering'   => 1,
+				'position'   => 'atomic-sidebar',
+				'module'     => 'mod_custom',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel5[0],
+					$menuIdsLevel5[1],
+				),
+				'params'     => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static'
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_44_TITLE'),
+				'ordering'   => 2,
+				'position'   => 'atomic-sidebar',
+				'module'     => 'mod_login',
+				'access'     => $access,
+				'showtitle'  => 0,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel5[0],
+					$menuIdsLevel5[1],
+				),
+				'params'     => array(
+					'greeting'  => 1,
+					'name'      => 0,
+					'usesecure' => 0,
+					'cache'     => 0
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_45_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'position-11',
+				'module'    => 'mod_banners',
+				'access'    => $access,
+				'showtitle' => 0,
+				'params'    => array(
+					'target'      => 1,
+					'count'       => 1,
+					'cid'         => 2,
+					'catid'       => array($bannerCatids[0]),
+					'tag_search'  => 0,
+					'ordering'    => 0,
+					'footer_text' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_45_FOOTER_TEXT'),
+					'cache'       => 1,
+					'cache_time'  => 900
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_46_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'position-9',
+				'module'    => 'mod_banners',
+				'access'    => $access,
+				'showtitle' => 0,
+				'params'    => array(
+					'target'      => 1,
+					'count'       => 1,
+					'cid'         => 1,
+					'catid'       => array($bannerCatids[0]),
+					'tag_search'  => 0,
+					'ordering'    => 0,
+					'footer_text' => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_46_FOOTER_TEXT'),
+					'cache'       => 1,
+					'cache_time'  => 900
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_47_TITLE'),
+				'ordering'   => 2,
+				'module'     => 'mod_finder',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[72],
+				),
+				'params'     => array(
+					'show_autosuggest' => 1,
+					'show_advanced'    => 0,
+					'field_size'       => array(20),
+					'show_label'       => 0,
+					'label_pos'        => 'top',
+					'show_button'      => 0,
+					'button_pos'       => 'right',
+					'opensearch'       => 1,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_48_TITLE'),
+				'ordering' => '2',
+				'position' => 'position-7',
+				'module'   => 'mod_menu',
+				'access'   => $access,
+				'params'   => array(
+					'menutype'        => $menuTypes[6],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_49_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-8',
+				'module'   => 'mod_menu',
+				'access'   => $access,
+				'params'   => array(
+					'menutype'        => $menuTypes[7],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+				),
+			),
+			array(
+				'title'      => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_50_TITLE'),
+				'ordering'   => 1,
+				'position'   => 'position-7',
+				'module'     => 'mod_menu',
+				'access'     => $access,
+				'assignment' => 1,
+				'assigned'   => array(
+					$menuIdsLevel1[5],
+					$menuIdsLevel1[55],
+					$menuIdsLevel1[56],
+					$menuIdsLevel1[57],
+					$menuIdsLevel1[58],
+					$menuIdsLevel1[59],
+					$menuIdsLevel1[60],
+					$menuIdsLevel1[69],
+					$menuIdsLevel1[70],
+				),
+				'params'     => array(
+					'menutype'        => $menuTypes[5],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'cache'           => 0,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_51_TITLE'),
+				'ordering' => 1,
+				'module'   => 'mod_tags_popular',
+				'access'   => $access,
+				'params'   => array(
+					'maximum'         => 5,
+					'timeframe'       => 'alltime',
+					'order_value'     => 'count',
+					'order_direction' => 1,
+					'display_count'   => 0,
+					'no_results_text' => 0,
+					'minsize'         => 1,
+					'maxsize'         => 2,
+					'owncache'        => 1,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_52_TITLE'),
+				'ordering' => 1,
+				'module'   => 'mod_tags_similar',
+				'access'   => $access,
+				'params'   => array(
+					'maximum'   => 5,
+					'matchtype' => 'any',
+					'owncache'  => 1,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_53_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-8',
+				'module'   => 'mod_syndicate',
+				'access'   => $access,
+				'params'   => array(
+					'display_text' => 1,
+					'text'         => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_53_TEXT'),
+					'format'       => 'rss',
+					'cache'        => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_54_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-8',
+				'module'   => 'mod_tags_similar',
+				'access'   => $access,
+				'params'   => array(
+					'maximum'   => 5,
+					'matchtype' => 'any',
+					'owncache'  => 1,
+				),
+			),
+			// Admin modules
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_55_TITLE'),
+				'content'   => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_55_CONTENT'),
+				'ordering'  => 5,
+				'position'  => 'cpanel',
+				'module'    => 'mod_custom',
+				'access'    => $access,
+				'params'    => array(
+					'prepare_content' => 1,
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'bootstrap_size'  => 6,
+				),
+				'client_id' => 1,
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_56_TITLE'),
+				'ordering'  => 6,
+				'position'  => 'cpanel',
+				'published' => 0,
+				'module'    => 'mod_feed',
+				'access'    => $access,
+				'params'    => array(
+					'rssurl'         => 'http://feeds.joomla.org/JoomlaAnnouncements',
+					'rssrtl'         => 0,
+					'rsstitle'       => 1,
+					'rssdesc'        => 1,
+					'rssimage'       => 1,
+					'rssitems'       => 3,
+					'rssitemdesc'    => 1,
+					'word_count'     => 0,
+					'cache'          => 1,
+					'cache_time'     => 900,
+					'bootstrap_size' => 6,
+				),
+				'client_id' => 1,
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_57_TITLE'),
+				'ordering'  => 3,
+				'position'  => 'cpanel',
+				'module'    => 'mod_stats_admin',
+				'access'    => $access,
+				'params'    => array(
+					'serverinfo'     => 1,
+					'siteinfo'       => 1,
+					'counter'        => 1,
+					'increase'       => 0,
+					'cache'          => 1,
+					'cache_time'     => 900,
+					'cachemode'      => 'static',
+					'bootstrap_size' => 6,
+				),
+				'client_id' => 1,
+			),
+			/* TODO: Altering existing admin modules (Bootstrap Size).
+			array(
+				'title'            => 'Popular Articles',
+				'position'         => 'cpanel',
+				'module'           => 'mod_popular',
+				'params'           => array(
+					'bootstrap_size'  => 6,
+				),
+			),
+			array(
+				'title'            => 'Logged-in Users',
+				'position'         => 'cpanel',
+				'module'           => 'mod_logged',
+				'params'           => array(
+					'bootstrap_size'  => 6,
+				),
+			),
+			array(
+				'title'            => 'Recently Added Articles',
+				'position'         => 'cpanel',
+				'module'           => 'mod_latest',
+				'params'           => array(
+					'bootstrap_size'  => 6,
+				),
+			), */
+		);
+
+		$modulesIds = array();
+
+		foreach ($modules as $module)
+		{
+			// Set values which are always the same.
+			$module['id']              = 0;
+			$module['asset_id']        = 0;
+			$module['language']        = '*';
+			$module['description']     = '';
+
+			if (!isset($module['published']))
+			{
+				$module['published'] = 1;
+			}
+
+			if (!isset($module['note']))
+			{
+				$module['note'] = '';
+			}
+
+			if (!isset($module['content']))
+			{
+				$module['content'] = '';
+			}
+
+			if (!isset($module['showtitle']))
+			{
+				$module['showtitle'] = 1;
+			}
+
+			if (!isset($module['position']))
+			{
+				$module['position'] = '';
+			}
+
+			if (!isset($module['params']))
+			{
+				$module['params'] = array();
+			}
+
+			if (!isset($module['client_id']))
+			{
+				$module['client_id'] = 0;
+			}
+
+			if (!isset($module['assignment']))
+			{
+				$module['assignment'] = 0;
+			}
+
+			if (!$model->save($module))
+			{
+				JFactory::getLanguage()->load('com_modules');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_TESTING_STEP_FAILED', 7, JText::_($model->getError()));
+
+				return $response;
+			}
+
+			// Get ID from category we just added
+			$modulesIds[] = $model->getItem()->id;
+
+		}
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_TESTING_STEP7_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Adds categories.
+	 *
+	 * @param   array    $categories  Array holding the category arrays.
+	 * @param   string   $extension   Name of the extension.
+	 * @param   integer  $level       Level in the category tree.
+	 *
+	 * @return  array  IDs of the inserted categories.
+	 *
+	 * @throws  Exception
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private function addCategories(array $categories, $extension, $level)
+	{
+		if (!$this->categoryModel)
+		{
+			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/models/', 'CategoriesModel');
+			JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables/');
+			$this->categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel');
+		}
+
+		$catIds = array();
+		$access = (int) $this->app->get('access', 1);
+		$user   = JFactory::getUser();
+
+		foreach ($categories as $category)
+		{
+			// Set values which are always the same.
+			$category['id']              = 0;
+			$category['published']       = 1;
+			$category['access']          = $access;
+			$category['created_user_id'] = $user->id;
+			$category['extension']       = $extension;
+			$category['level']           = $level;
+			$category['alias']           = JApplicationHelper::stringURLSafe($category['title']);
+			$category['associations']    = array();
+
+			// Set description to empty if not set
+			if (!isset($category['description']))
+			{
+				$category['description'] = '';
+			}
+
+			// Language defaults to "All" (*) when not set
+			if (!isset($category['language']))
+			{
+				$category['language'] = '*';
+			}
+
+			if (!$this->categoryModel->save($category))
+			{
+				throw new Exception($this->categoryModel->getError());
+			}
+
+			// Get ID from category we just added
+			$catIds[] = $this->categoryModel->getItem()->id;
+		}
+
+		return $catIds;
+	}
+
+	/**
+	 * Adds articles.
+	 *
+	 * @param   array  $articles  Array holding the category arrays.
+	 *
+	 * @return  array  IDs of the inserted categories.
+	 *
+	 * @throws  Exception
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private function addArticles(array $articles)
+	{
+		$ids = array();
+
+		$access = (int) $this->app->get('access', 1);
+		$user   = JFactory::getUser();
+		$model  = JModelLegacy::getInstance('Article', 'ContentModel');
+
+		foreach ($articles as $i => $article)
+		{
+			// Set values from language strings.
+			$article['title']     = JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_' . str_pad($i, 2, '0', STR_PAD_LEFT) . '_TITLE');
+			$article['introtext'] = JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_' . str_pad($i, 2, '0', STR_PAD_LEFT) . '_INTROTEXT');
+			$article['fulltext']  = JText::_('PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTENT_ARTICLE_' . str_pad($i, 2, '0', STR_PAD_LEFT) . '_FULLTEXT');
+
+			// Set values which are always the same.
+			$article['id']              = 0;
+			$article['access']          = $access;
+			$article['created_user_id'] = $user->id;
+			$article['alias']           = JApplicationHelper::stringURLSafe($article['title']);
+			$article['language']        = '*';
+			$article['associations']    = array();
+			$article['metakey']         = '';
+			$article['metadesc']        = '';
+			$article['xreference']      = '';
+
+			// Set state to published if not set.
+			if (!isset($article['state']))
+			{
+				$article['state'] = 1;
+			}
+
+			// Set state to published if not set.
+			if (!isset($article['featured']))
+			{
+				$article['featured'] = 0;
+			}
+
+			// Set images to empty if not set.
+			if (!isset($article['images']))
+			{
+				$article['images'] = '';
+			}
+			// JSON Encode it when set.
+			else
+			{
+				$article['images'] = json_encode($article['images']);
+			}
+
+			if (!$model->save($article))
+			{
+				JFactory::getLanguage()->load('com_content');
+				throw new Exception(JText::_($model->getError()));
+			}
+
+			// Get ID from category we just added
+			$ids[] = $model->getItem()->id;
+
+		}
+
+		return $ids;
+	}
+
+	/**
+	 * Adds menuitems.
+	 *
+	 * @param   array    $menuItems  Array holding the menuitems arrays.
+	 * @param   integer  $level      Level in the category tree.
+	 *
+	 * @return  array  IDs of the inserted menuitems.
+	 *
+	 * @throws  Exception
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private function addMenuItems(array $menuItems, $level)
+	{
+		$itemIds = array();
+		$access  = (int) $this->app->get('access', 1);
+		$user    = JFactory::getUser();
+
+		foreach ($menuItems as $menuItem)
+		{
+			// Reset item.id in model state.
+			$this->menuItemModel->setState('item.id', 0);
+
+			// Set values which are always the same.
+			$menuItem['id']              = 0;
+			$menuItem['created_user_id'] = $user->id;
+			$menuItem['alias']           = JApplicationHelper::stringURLSafe($menuItem['title']);
+			$menuItem['published']       = 1;
+			$menuItem['language']        = '*';
+			$menuItem['note']            = '';
+			$menuItem['img']             = '';
+			$menuItem['browserNav']      = 0;
+			$menuItem['associations']    = array();
+			$menuItem['client_id']       = 0;
+			$menuItem['level']           = $level;
+
+			// Set access to default if not set
+			if (!isset($menuItem['access']))
+			{
+				$menuItem['access'] = $access;
+			}
+
+			// Set type to 'component' if not set
+			if (!isset($menuItem['type']))
+			{
+				$menuItem['type'] = 'component';
+			}
+
+			// Set template_style_id to global if not set
+			if (!isset($menuItem['template_style_id']))
+			{
+				$menuItem['template_style_id'] = 0;
+			}
+
+			// Set home if not set
+			if (!isset($menuItem['home']))
+			{
+				$menuItem['home'] = 0;
+			}
+
+			// Set parent_id to root (1) if not set
+			if (!isset($menuItem['parent_id']))
+			{
+				$menuItem['parent_id'] = 1;
+			}
+
+			if (!$this->menuItemModel->save($menuItem))
+			{
+				// Try two times with another alias (-1 and -2).
+				$menuItem['alias'] .= '-1';
+
+				if (!$this->menuItemModel->save($menuItem))
+				{
+					$menuItem['alias'] = substr_replace($menuItem['alias'], '2', -1);
+
+					if (!$this->menuItemModel->save($menuItem))
+					{
+						throw new Exception($menuItem['title'] . ' => ' . $menuItem['alias'] . ' : ' . $this->menuItemModel->getError());
+					}
+				}
+			}
+
+			// Get ID from menuitem we just added
+			$itemIds[] = $this->menuItemModel->getstate('item.id');
+		}
+
+		return $itemIds;
+	}
+}
diff --git a/plugins/sampledata/testing/testing.xml b/plugins/sampledata/testing/testing.xml
new file mode 100644
index 0000000000000..2490143f94080
--- /dev/null
+++ b/plugins/sampledata/testing/testing.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.5" type="plugin" group="sampledata" method="upgrade">
+	<name>plg_sampledata_testing</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2015</creationDate>
+	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.5.0</version>
+	<description>PLG_SAMPLEDATA_TESTING_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="testing">testing.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_sampledata_testing.ini</language>
+		<language tag="en-GB">en-GB.plg_sampledata_testing.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+		</fields>
+	</config>
+</extension>

From 4b5ec5e36a4776dbc574147cf4dca0dd244157f1 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 5 Aug 2017 17:11:14 +0200
Subject: [PATCH 131/148] add the checked attribute (#17336)

---
 administrator/components/com_users/models/forms/mail.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/administrator/components/com_users/models/forms/mail.xml b/administrator/components/com_users/models/forms/mail.xml
index 7f336dc0e58e5..c1e8d5b65c285 100644
--- a/administrator/components/com_users/models/forms/mail.xml
+++ b/administrator/components/com_users/models/forms/mail.xml
@@ -44,6 +44,7 @@
 			description="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC"
 			default="1"
 			value="1"
+			checked="1"
 		/>
 
 		<field 

From bc0c3efb2ae4333be38f83129e18ae123dce406e Mon Sep 17 00:00:00 2001
From: Elijah Madden <okonomiyaki3000@gmail.com>
Date: Sun, 6 Aug 2017 00:11:43 +0900
Subject: [PATCH 132/148] Don't use array merge here. (#17391)

Instead of:
  create array
  merge new array into old array to create another array
  replace old array with newly merged array

Just:
  push item onto old array
---
 libraries/joomla/database/query/element.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/database/query/element.php b/libraries/joomla/database/query/element.php
index 81b1a7188f4d0..4e22a8a320085 100644
--- a/libraries/joomla/database/query/element.php
+++ b/libraries/joomla/database/query/element.php
@@ -92,7 +92,7 @@ public function append($elements)
 		}
 		else
 		{
-			$this->elements = array_merge($this->elements, array($elements));
+			$this->elements[] = $elements;
 		}
 	}
 

From 4e6869d735fdfbbb6faa6d112b2366b20e1b3027 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 6 Aug 2017 16:54:30 +0200
Subject: [PATCH 133/148] System URL menu link (#17419)

At some point in time this has changed from being only an external url to any url. It makes no sense to have a menu type of "External URL" with a description of "An external or internal URL"

This simple PR resolves that by changing the name of the menu type to simply "URL"
---
 administrator/language/en-GB/en-GB.com_menus.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index 1e3fb8220043f..ca531ccbf7ca0 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -65,13 +65,13 @@ COM_MENUS_HTML_PUBLISH_DISABLED="Publish menu item::Component disabled"
 COM_MENUS_HTML_PUBLISH_ENABLED="Publish menu item::Component enabled"
 COM_MENUS_HTML_PUBLISH_HEADING="Publish the heading menu item"
 COM_MENUS_HTML_PUBLISH_SEPARATOR="Publish the separator menu item"
-COM_MENUS_HTML_PUBLISH_URL="Publish the external URL menu item"
+COM_MENUS_HTML_PUBLISH_URL="Publish the URL menu item"
 COM_MENUS_HTML_UNPUBLISH_ALIAS="Unpublish the menu item alias"
 COM_MENUS_HTML_UNPUBLISH_DISABLED="Unpublish menu item::Component disabled"
 COM_MENUS_HTML_UNPUBLISH_ENABLED="Unpublish menu item::Component enabled"
 COM_MENUS_HTML_UNPUBLISH_HEADING="Unpublish the heading menu item"
 COM_MENUS_HTML_UNPUBLISH_SEPARATOR="Unpublish the separator menu item"
-COM_MENUS_HTML_UNPUBLISH_URL="Unpublish the external URL menu item"
+COM_MENUS_HTML_UNPUBLISH_URL="Unpublish the URL menu item"
 COM_MENUS_INTEGRATION_FIELDSET_LABEL="Integration"
 ; The following 2 strings are deprecated and will be removed with 4.0.
 COM_MENUS_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Menu Item Associations"
@@ -218,7 +218,7 @@ COM_MENUS_TYPE_ALIAS_DESC="Create an alias to another menu item."
 COM_MENUS_TYPE_CHOOSE="Select a Menu Item Type:"
 COM_MENUS_TYPE_CONTAINER="Components Menu Container"
 COM_MENUS_TYPE_CONTAINER_DESC="This will create a container menu which will show the items in the protected menu type 'main'. You can also selectively hide or show menu items using the menu manager by filtering the list by type \"Main (Protected)\"."
-COM_MENUS_TYPE_EXTERNAL_URL="External URL"
+COM_MENUS_TYPE_EXTERNAL_URL="URL"
 COM_MENUS_TYPE_EXTERNAL_URL_DESC="An external or internal URL."
 COM_MENUS_TYPE_HEADING="Menu Heading"
 COM_MENUS_TYPE_HEADING_DESC="A heading for use within menus, useful when separating menus with a separator."

From d18362d953f5693028c25325b221f2e6628a3a30 Mon Sep 17 00:00:00 2001
From: Benjamin Trenkle <bembelimen@users.noreply.github.com>
Date: Sun, 6 Aug 2017 18:20:21 +0200
Subject: [PATCH 134/148] Enforce array for subform values (#16733)

---
 libraries/joomla/form/fields/subform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/form/fields/subform.php b/libraries/joomla/form/fields/subform.php
index 2f4e276cc4949..e2c45a4fa353a 100644
--- a/libraries/joomla/form/fields/subform.php
+++ b/libraries/joomla/form/fields/subform.php
@@ -221,7 +221,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	 */
 	protected function getInput()
 	{
-		$value = $this->value ? $this->value : array();
+		$value = $this->value ? (array) $this->value : array();
 
 		// Prepare data for renderer
 		$data    = parent::getLayoutData();

From 6b41e764868b7edf4517ec7c9a515ce6fc608a44 Mon Sep 17 00:00:00 2001
From: Dennis Hermatski <pandenitz@mail.ru>
Date: Sun, 6 Aug 2017 19:25:07 +0300
Subject: [PATCH 135/148] PHP 7.2 count warning (#16840)

* PHP 7.2 warning:

Warning: count(): Parameter must be an array or an object that implements Countable in \libraries\cms\application\cms.php on line 470

* fix
---
 libraries/src/Joomla/CMS/Application/CMSApplication.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Application/CMSApplication.php b/libraries/src/Joomla/CMS/Application/CMSApplication.php
index fa426326c55d0..7bc331977edf1 100644
--- a/libraries/src/Joomla/CMS/Application/CMSApplication.php
+++ b/libraries/src/Joomla/CMS/Application/CMSApplication.php
@@ -465,12 +465,12 @@ public function getMenu($name = null, $options = array())
 	public function getMessageQueue($clear = false)
 	{
 		// For empty queue, if messages exists in the session, enqueue them.
-		if (!count($this->_messageQueue))
+		if (!$this->_messageQueue)
 		{
 			$session = \JFactory::getSession();
 			$sessionQueue = $session->get('application.queue');
 
-			if (count($sessionQueue))
+			if ($sessionQueue)
 			{
 				$this->_messageQueue = $sessionQueue;
 				$session->set('application.queue', null);
@@ -1063,7 +1063,7 @@ public function redirect($url, $status = 303)
 		}
 
 		// Persist messages if they exist.
-		if (count($this->_messageQueue))
+		if ($this->_messageQueue)
 		{
 			$session = \JFactory::getSession();
 			$session->set('application.queue', $this->_messageQueue);

From d3bb5a77d83c2ea7cf7f6f13ed133e879fb3ec94 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Sun, 6 Aug 2017 11:28:07 -0500
Subject: [PATCH 136/148] PHP 7.2 has branched, update Travis config to reflect

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 82e8f2ab16873..070893c5e55d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,12 @@ matrix:
       env: INSTALL_APCU="yes"
     - php: 5.6
       env: INSTALL_APCU="yes"
+    - php: 7.2
+      env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
     - php: nightly
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
   allow_failures:
+    - php: 7.2
     - php: nightly
 
 services:

From ef5380f1b3591b09992d2466305b6f560451d3d2 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Mon, 7 Aug 2017 15:21:02 +0200
Subject: [PATCH 137/148] Adjusting copyright and versions and two remaining
 "sampledata" (#17435)

---
 administrator/language/en-GB/en-GB.mod_sampledata.ini     | 2 +-
 administrator/language/en-GB/en-GB.mod_sampledata.sys.ini | 2 +-
 .../language/en-GB/en-GB.plg_sampledata_blog.ini          | 2 +-
 .../language/en-GB/en-GB.plg_sampledata_blog.sys.ini      | 2 +-
 .../language/en-GB/en-GB.plg_sampledata_testing.ini       | 6 +++---
 .../language/en-GB/en-GB.plg_sampledata_testing.sys.ini   | 2 +-
 administrator/modules/mod_sampledata/helper.php           | 2 +-
 administrator/modules/mod_sampledata/mod_sampledata.php   | 2 +-
 administrator/modules/mod_sampledata/mod_sampledata.xml   | 8 ++++----
 administrator/modules/mod_sampledata/tmpl/default.php     | 2 +-
 plugins/sampledata/blog/blog.php                          | 2 +-
 plugins/sampledata/blog/blog.xml                          | 8 ++++----
 plugins/sampledata/testing/testing.php                    | 2 +-
 plugins/sampledata/testing/testing.xml                    | 8 ++++----
 14 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.mod_sampledata.ini b/administrator/language/en-GB/en-GB.mod_sampledata.ini
index d73b9c33313bd..3a6447dce3329 100644
--- a/administrator/language/en-GB/en-GB.mod_sampledata.ini
+++ b/administrator/language/en-GB/en-GB.mod_sampledata.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini b/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
index 3f8bc0d7fb2c6..e6d2a833d03e3 100644
--- a/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini b/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
index 89a36e9476f50..4f08883b72206 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini b/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
index 83cbbe875d2b2..b4e11f41160ec 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini b/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
index d8b86df0d9efd..1b960b98292c1 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
@@ -1,11 +1,11 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SAMPLEDATA_TESTING="Sample Data - Testing"
-PLG_SAMPLEDATA_TESTING_OVERVIEW_DESC="Sampledata which will help with testing the CMS."
-PLG_SAMPLEDATA_TESTING_OVERVIEW_TITLE="Testing Sampledata"
+PLG_SAMPLEDATA_TESTING_OVERVIEW_DESC="Sample data which will help with testing the CMS."
+PLG_SAMPLEDATA_TESTING_OVERVIEW_TITLE="Testing Sample Data"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_1_DESC="Get books about Joomla! at the Joomla! Book Shop."
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_1_NAME="Shop 1"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_BANNERS_BANNER_2_DESC="T-shirts, caps and more from the Joomla! Shop."
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini b/administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini
index 8b7d17fbf4a71..cd467ab4fd71d 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_testing.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_sampledata/helper.php b/administrator/modules/mod_sampledata/helper.php
index 989a886ed8f0b..e366569b1c0e2 100644
--- a/administrator/modules/mod_sampledata/helper.php
+++ b/administrator/modules/mod_sampledata/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_sampledata
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_sampledata/mod_sampledata.php b/administrator/modules/mod_sampledata/mod_sampledata.php
index 8580b32103f68..6ee014ac24acd 100644
--- a/administrator/modules/mod_sampledata/mod_sampledata.php
+++ b/administrator/modules/mod_sampledata/mod_sampledata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_sampledata
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_sampledata/mod_sampledata.xml b/administrator/modules/mod_sampledata/mod_sampledata.xml
index 7a66b3aafd8d8..dd64e65091551 100644
--- a/administrator/modules/mod_sampledata/mod_sampledata.xml
+++ b/administrator/modules/mod_sampledata/mod_sampledata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="module" version="3.5" client="administrator" method="upgrade">
+<extension type="module" version="3.8" client="administrator" method="upgrade">
 	<name>mod_sampledata</name>
 	<author>Joomla! Project</author>
-	<creationDate>July 2015</creationDate>
-	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<creationDate>July 2017</creationDate>
+	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>3.5.0</version>
+	<version>3.8.0</version>
 	<description>MOD_SAMPLEDATA_XML_DESCRIPTION</description>
 	<files>
 		<filename module="mod_sampledata">mod_sampledata.php</filename>
diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php
index b7ea484fc5da6..5e4de748fcab2 100644
--- a/administrator/modules/mod_sampledata/tmpl/default.php
+++ b/administrator/modules/mod_sampledata/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_sampledata
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
index d9c90323f62dc..8acc7753d00fe 100644
--- a/plugins/sampledata/blog/blog.php
+++ b/plugins/sampledata/blog/blog.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Sampledata.Blog
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/sampledata/blog/blog.xml b/plugins/sampledata/blog/blog.xml
index 3ab9d2556298d..f9afd2a92fa3d 100644
--- a/plugins/sampledata/blog/blog.xml
+++ b/plugins/sampledata/blog/blog.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension version="3.5" type="plugin" group="sampledata" method="upgrade">
+<extension version="3.8" type="plugin" group="sampledata" method="upgrade">
 	<name>plg_sampledata_blog</name>
 	<author>Joomla! Project</author>
-	<creationDate>July 2015</creationDate>
-	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<creationDate>July 2017</creationDate>
+	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>3.5.0</version>
+	<version>3.8.0</version>
 	<description>PLG_SAMPLEDATA_BLOG_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="blog">blog.php</filename>
diff --git a/plugins/sampledata/testing/testing.php b/plugins/sampledata/testing/testing.php
index ca74c4a12eef3..f1ded8a0c6be3 100644
--- a/plugins/sampledata/testing/testing.php
+++ b/plugins/sampledata/testing/testing.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Sampledata.Testing
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/sampledata/testing/testing.xml b/plugins/sampledata/testing/testing.xml
index 2490143f94080..734d15ea3e36c 100644
--- a/plugins/sampledata/testing/testing.xml
+++ b/plugins/sampledata/testing/testing.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension version="3.5" type="plugin" group="sampledata" method="upgrade">
+<extension version="3.8" type="plugin" group="sampledata" method="upgrade">
 	<name>plg_sampledata_testing</name>
 	<author>Joomla! Project</author>
-	<creationDate>July 2015</creationDate>
-	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<creationDate>July 2017</creationDate>
+	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>3.5.0</version>
+	<version>3.8.0</version>
 	<description>PLG_SAMPLEDATA_TESTING_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="testing">testing.php</filename>

From e1300870b23dfc6551a6f734775d31bcc46fea64 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Mon, 7 Aug 2017 09:29:32 -0500
Subject: [PATCH 138/148] [3.8] Restructure version constants (#16169)

* Restructure version constants

* Replace uses of the deprecated constants

* PHP 5.3 support, sigh...

* Fix Drone before the commentary begins ;-)

* Fix version in script

* Updates for build script

* Set new constants in version bump script

* Extra piece needs to be aware of something like beta2-dev

* Fix bad merge
---
 .../views/languages/tmpl/default.php          |  3 +-
 .../views/installed/tmpl/default.php          |  3 +-
 .../html/com_installer/languages/default.php  |  3 +-
 build/build.php                               | 16 ++++--
 build/bump.php                                |  8 +++
 build/helpTOC.php                             | 10 ++--
 installation/view/languages/tmpl/default.php  |  4 +-
 .../Document/Renderer/Feed/AtomRenderer.php   |  3 +-
 .../CMS/Updater/Adapter/ExtensionAdapter.php  |  7 ++-
 libraries/src/Joomla/CMS/Updater/Update.php   |  9 ++--
 libraries/src/Joomla/CMS/Version.php          | 54 +++++++++++++++++--
 11 files changed, 97 insertions(+), 23 deletions(-)

diff --git a/administrator/components/com_installer/views/languages/tmpl/default.php b/administrator/components/com_installer/views/languages/tmpl/default.php
index 4a92616ee53a2..04fd16242abc4 100644
--- a/administrator/components/com_installer/views/languages/tmpl/default.php
+++ b/administrator/components/com_installer/views/languages/tmpl/default.php
@@ -80,8 +80,9 @@
 							<?php echo $language->code; ?>
 						</td>
 						<td class="center">
+								<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
 								<?php // Display a Note if language pack version is not equal to Joomla version ?>
-								<?php if (substr($language->version, 0, 3) != $version::RELEASE || substr($language->version, 0, 5) != $currentShortVersion) : ?>
+								<?php if (substr($language->version, 0, 3) != $minorVersion || substr($language->version, 0, 5) != $currentShortVersion) : ?>
 									<span class="label label-warning hasTooltip" title="<?php echo JText::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $language->version; ?></span>
 								<?php else : ?>
 									<span class="label label-success"><?php echo $language->version; ?></span>
diff --git a/administrator/components/com_languages/views/installed/tmpl/default.php b/administrator/components/com_languages/views/installed/tmpl/default.php
index 858eaa16ef1c2..86148f61e5634 100644
--- a/administrator/components/com_languages/views/installed/tmpl/default.php
+++ b/administrator/components/com_languages/views/installed/tmpl/default.php
@@ -100,8 +100,9 @@
 						<?php echo JHtml::_('jgrid.isdefault', $row->published, $i, 'installed.', !$row->published && $canChange); ?>
 					</td>
 					<td class="center small">
+					<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
 					<?php // Display a Note if language pack version is not equal to Joomla version ?>
-					<?php if (substr($row->version, 0, 3) != $version::RELEASE || substr($row->version, 0, 5) != $currentShortVersion) : ?>
+					<?php if (substr($row->version, 0, 3) != $minorVersion || substr($row->version, 0, 5) != $currentShortVersion) : ?>
 						<span class="label label-warning hasTooltip" title="<?php echo JText::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $row->version; ?></span>
 					<?php else : ?>
 						<span class="label label-success"><?php echo $row->version; ?></span>
diff --git a/administrator/templates/hathor/html/com_installer/languages/default.php b/administrator/templates/hathor/html/com_installer/languages/default.php
index 683ef17b796f6..0c4c065d2c47f 100644
--- a/administrator/templates/hathor/html/com_installer/languages/default.php
+++ b/administrator/templates/hathor/html/com_installer/languages/default.php
@@ -75,8 +75,9 @@
 						<td>
 							<?php echo $language->name; ?>
 
+							<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
 							<?php // Display a Note if language pack version is not equal to Joomla version ?>
-							<?php if (substr($language->version, 0, 3) != $version::RELEASE
+							<?php if (substr($language->version, 0, 3) != $minorVersion
 									|| substr($language->version, 0, 5) != $version->getShortVersion()) : ?>
 								<div class="small"><?php echo JText::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?></div>
 							<?php endif; ?>
diff --git a/build/build.php b/build/build.php
index 73c287fb49f1e..5067d859c6737 100644
--- a/build/build.php
+++ b/build/build.php
@@ -23,6 +23,13 @@
 
 use Joomla\CMS\Version;
 
+if (version_compare(PHP_VERSION, '5.4', '<'))
+{
+	echo "The build script requires PHP 5.4.\n";
+
+	exit(1);
+}
+
 // Set path to git binary (e.g., /usr/local/git/bin/git or /usr/bin/git)
 ob_start();
 passthru('which git', $systemGit);
@@ -36,10 +43,9 @@
 require_once dirname(__DIR__) . '/libraries/src/Joomla/CMS/Version.php';
 
 // Set version information for the build
-$version     = Version::RELEASE;
-$release     = Version::DEV_LEVEL;
-$stability   = Version::DEV_STATUS;
-$fullVersion = $version . '.' . $release;
+$version     = Version::MAJOR_VERSION . '.' . Version::MINOR_VERSION;
+$release     = Version::PATCH_VERSION;
+$fullVersion = (new Version)->getShortVersion();
 
 // Shortcut the paths to the repository root and build folder
 $repo = dirname(__DIR__);
@@ -141,7 +147,7 @@
 );
 
 // For the packages, replace spaces in stability (RC) with underscores
-$packageStability = str_replace(' ', '_', $stability);
+$packageStability = str_replace(' ', '_', Version::DEV_STATUS);
 
 // Count down starting with the latest release and add diff files to this array
 for ($num = $release - 1; $num >= 0; $num--)
diff --git a/build/bump.php b/build/bump.php
index 5bc44496e6b2b..c03322a83f7bf 100644
--- a/build/bump.php
+++ b/build/bump.php
@@ -150,6 +150,10 @@ function usage($command)
 
 $version = array(
 		'main'       => $versionSubParts[0] . '.' . $versionSubParts[1],
+		'major'      => $versionSubParts[0],
+		'minor'      => $versionSubParts[1],
+		'patch'      => $versionSubParts[2],
+		'extra'      => !empty($versionParts[2]) ? $versionParts[2] : (!empty($versionParts[1]) ? $versionParts[1] : ''),
 		'release'    => $versionSubParts[0] . '.' . $versionSubParts[1] . '.' . $versionSubParts[2],
 		'dev_devel'  => $versionSubParts[2] . (!empty($versionParts[1]) ? '-' . $versionParts[1] : '') . (!empty($versionParts[2]) ? '-' . $versionParts[2] : ''),
 		'dev_status' => $dev_status,
@@ -191,6 +195,10 @@ function usage($command)
 if (file_exists($rootPath . $versionFile))
 {
 	$fileContents = file_get_contents($rootPath . $versionFile);
+	$fileContents = preg_replace("#MAJOR_VERSION\s*=\s*[^;]*#", "MAJOR_VERSION = " . $version['major'], $fileContents);
+	$fileContents = preg_replace("#MINOR_VERSION\s*=\s*[^;]*#", "MINOR_VERSION = " . $version['minor'], $fileContents);
+	$fileContents = preg_replace("#PATCH_VERSION\s*=\s*[^;]*#", "PATCH_VERSION = " . $version['patch'], $fileContents);
+	$fileContents = preg_replace("#EXTRA_VERSION\s*=\s*'[^\']*'#", "EXTRA_VERSION = '" . $version['extra'] . "'", $fileContents);
 	$fileContents = preg_replace("#RELEASE\s*=\s*'[^\']*'#", "RELEASE = '" . $version['main'] . "'", $fileContents);
 	$fileContents = preg_replace("#DEV_LEVEL\s*=\s*'[^\']*'#", "DEV_LEVEL = '" . $version['dev_devel'] . "'", $fileContents);
 	$fileContents = preg_replace("#DEV_STATUS\s*=\s*'[^\']*'#", "DEV_STATUS = '" . $version['dev_status'] . "'", $fileContents);
diff --git a/build/helpTOC.php b/build/helpTOC.php
index 49fd404b71e11..9cc91153cbfe6 100644
--- a/build/helpTOC.php
+++ b/build/helpTOC.php
@@ -40,6 +40,10 @@
 // Load the admin en-GB.ini language file to get the JHELP language keys
 Factory::getLanguage()->load('joomla', JPATH_ADMINISTRATOR, null, false, false);
 
+// Import namespaced classes
+use Joomla\CMS\Version;
+use Joomla\Registry\Registry;
+
 /**
  * Utility CLI to retrieve the list of help screens from the docs wiki and create an index for the admin help view.
  *
@@ -57,8 +61,8 @@ class MediawikiCli extends CliApplication
 	public function doExecute()
 	{
 		// Get the version data for the script
-		$helpVersion = str_replace('.', '', Version::RELEASE);
-		$namespace   = 'Help' . $helpVersion . ':';
+		$minorVersion = Version::MAJOR_VERSION . '.' . Version::MINOR_VERSION;
+		$namespace    = 'Help' . $minorVersion . ':';
 
 		// Set up options for JMediawiki
 		$options = new Registry;
@@ -68,7 +72,7 @@ public function doExecute()
 
 		// Get the category members (local hack)
 		$this->out('Fetching data from docs wiki', true);
-		$categoryMembers = $mediawiki->categories->getCategoryMembers('Category:Help_screen_' . Version::RELEASE, null, 'max');
+		$categoryMembers = $mediawiki->categories->getCategoryMembers('Category:Help_screen_' . $minorVersion, null, 'max');
 
 		$members = array();
 
diff --git a/installation/view/languages/tmpl/default.php b/installation/view/languages/tmpl/default.php
index 1e29a8a4a73dd..762a84a19c20e 100644
--- a/installation/view/languages/tmpl/default.php
+++ b/installation/view/languages/tmpl/default.php
@@ -84,7 +84,6 @@ class="btn btn-primary"
 					</tr>
 			</thead>
 			<tbody>
-				<?php $version = new JVersion; ?>
 				<?php $currentShortVersion = preg_replace('#^([0-9\.]+)(|.*)$#', '$1', $version->getShortVersion()); ?>
 				<?php foreach ($this->items as $i => $language) : ?>
 					<?php // Get language code and language image. ?>
@@ -101,8 +100,9 @@ class="btn btn-primary"
 							<?php echo $language->code; ?>
   						</td>
 						<td class="center">
+						<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
 						<?php // Display a Note if language pack version is not equal to Joomla version ?>
-						<?php if (strpos($language->version, $version::RELEASE) !== 0  || strpos($language->version, $currentShortVersion) !== 0) : ?>
+						<?php if (strpos($language->version, $minorVersion) !== 0 || strpos($language->version, $currentShortVersion) !== 0) : ?>
 							<span class="label label-warning hasTooltip" title="<?php echo JText::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $language->version; ?></span>
 						<?php else : ?>
 							<span class="label label-success"><?php echo $language->version; ?></span>
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
index 72a7312666c23..b6f4808f5276a 100644
--- a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
+++ b/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
@@ -121,7 +121,8 @@ public function render($name = '', $params = null, $content = null)
 
 		if ($app->get('MetaVersion', 0))
 		{
-			$versionHtmlEscaped = ' version="' . htmlspecialchars(JVersion::RELEASE, ENT_COMPAT, 'UTF-8') . '"';
+			$minorVersion       = JVersion::MAJOR_VERSION . '.' . JVersion::MINOR_VERSION;
+			$versionHtmlEscaped = ' version="' . htmlspecialchars($minorVersion, ENT_COMPAT, 'UTF-8') . '"';
 		}
 
 		$feed .= "	<generator uri=\"https://www.joomla.org\"" . $versionHtmlEscaped . ">" . $data->getGenerator() . "</generator>\n";
diff --git a/libraries/src/Joomla/CMS/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Joomla/CMS/Updater/Adapter/ExtensionAdapter.php
index 303606db3f817..63e3043704d9e 100644
--- a/libraries/src/Joomla/CMS/Updater/Adapter/ExtensionAdapter.php
+++ b/libraries/src/Joomla/CMS/Updater/Adapter/ExtensionAdapter.php
@@ -124,10 +124,13 @@ protected function _endElement($parser, $name)
 				 *
 				 * Check for optional min_dev_level and max_dev_level attributes to further specify targetplatform (e.g., 3.0.1)
 				 */
+				$patchMinimumSupported = Version::PATCH_VERSION >= $this->currentUpdate->targetplatform->min_dev_level;
+				$patchMaximumSupported = Version::PATCH_VERSION <= $this->currentUpdate->targetplatform->max_dev_level;
+
 				if ($product == $this->currentUpdate->targetplatform['NAME']
 					&& preg_match('/^' . $this->currentUpdate->targetplatform['VERSION'] . '/', JVERSION)
-					&& ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || Version::DEV_LEVEL >= $this->currentUpdate->targetplatform->min_dev_level)
-					&& ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || Version::DEV_LEVEL <= $this->currentUpdate->targetplatform->max_dev_level))
+					&& ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || $patchMinimumSupported)
+					&& ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || $patchMaximumSupported))
 				{
 					// Check if PHP version supported via <php_minimum> tag, assume true if tag isn't present
 					if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum, '>='))
diff --git a/libraries/src/Joomla/CMS/Updater/Update.php b/libraries/src/Joomla/CMS/Updater/Update.php
index 5fe7d2c105f40..5a3dfb05f00bf 100644
--- a/libraries/src/Joomla/CMS/Updater/Update.php
+++ b/libraries/src/Joomla/CMS/Updater/Update.php
@@ -323,13 +323,14 @@ public function _endElement($parser, $name)
 				 *
 				 * Check for optional min_dev_level and max_dev_level attributes to further specify targetplatform (e.g., 3.0.1)
 				 */
+				$patchMinimumSupported = $this->get('jversion.dev_level', Version::PATCH_VERSION) >= $this->currentUpdate->targetplatform->min_dev_level;
+				$patchMaximumSupported = $this->get('jversion.dev_level', Version::PATCH_VERSION) <= $this->currentUpdate->targetplatform->max_dev_level;
+
 				if (isset($this->currentUpdate->targetplatform->name)
 					&& $product == $this->currentUpdate->targetplatform->name
 					&& preg_match('/^' . $this->currentUpdate->targetplatform->version . '/', $this->get('jversion.full', JVERSION))
-					&& ((!isset($this->currentUpdate->targetplatform->min_dev_level))
-					|| $this->get('jversion.dev_level', Version::DEV_LEVEL) >= $this->currentUpdate->targetplatform->min_dev_level)
-					&& ((!isset($this->currentUpdate->targetplatform->max_dev_level))
-					|| $this->get('jversion.dev_level', Version::DEV_LEVEL) <= $this->currentUpdate->targetplatform->max_dev_level))
+					&& ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || $patchMinimumSupported)
+					&& ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || $patchMaximumSupported))
 				{
 					$phpMatch = false;
 
diff --git a/libraries/src/Joomla/CMS/Version.php b/libraries/src/Joomla/CMS/Version.php
index dec18a1dd5a79..b33cf278af860 100644
--- a/libraries/src/Joomla/CMS/Version.php
+++ b/libraries/src/Joomla/CMS/Version.php
@@ -27,11 +27,47 @@ final class Version
 	 */
 	const PRODUCT = 'Joomla!';
 
+	/**
+	 * Major release version.
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	const MAJOR_VERSION = 3;
+
+	/**
+	 * Minor release version.
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	const MINOR_VERSION = 8;
+
+	/**
+	 * Patch release version.
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	const PATCH_VERSION = 0;
+
+	/**
+	 * Extra release version info.
+	 *
+	 * This constant when not empty adds an additional identifier to the version string to reflect the development state.
+	 * For example, for 3.8.0 when this is set to 'dev' the version string will be `3.8.0-dev`.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	const EXTRA_VERSION = 'dev';
+
 	/**
 	 * Release version.
 	 *
 	 * @var    string
 	 * @since  3.5
+	 * @deprecated  4.0  Use separated version constants instead
 	 */
 	const RELEASE = '3.8';
 
@@ -40,6 +76,7 @@ final class Version
 	 *
 	 * @var    string
 	 * @since  3.5
+	 * @deprecated  4.0  Use separated version constants instead
 	 */
 	const DEV_LEVEL = '0-dev';
 
@@ -56,6 +93,7 @@ final class Version
 	 *
 	 * @var    string
 	 * @since  3.5
+	 * @deprecated  4.0
 	 */
 	const BUILD = '';
 
@@ -173,7 +211,7 @@ public function isCompatible($minimum)
 	 */
 	public function getHelpVersion()
 	{
-		return '.' . str_replace('.', '', self::RELEASE);
+		return '.' . self::MAJOR_VERSION . self::MINOR_VERSION;
 	}
 
 	/**
@@ -185,7 +223,17 @@ public function getHelpVersion()
 	 */
 	public function getShortVersion()
 	{
-		return self::RELEASE . '.' . self::DEV_LEVEL;
+		$version = self::MAJOR_VERSION . '.' . self::MINOR_VERSION . '.' . self::PATCH_VERSION;
+
+		// Has to be assigned to a variable to support PHP 5.3 and 5.4
+		$extraVersion = self::EXTRA_VERSION;
+
+		if (!empty($extraVersion))
+		{
+			$version .= '-' . $extraVersion;
+		}
+
+		return $version;
 	}
 
 	/**
@@ -197,7 +245,7 @@ public function getShortVersion()
 	 */
 	public function getLongVersion()
 	{
-		return self::PRODUCT . ' ' . self::RELEASE . '.' . self::DEV_LEVEL . ' '
+		return self::PRODUCT . ' ' . $this->getShortVersion() . ' '
 			. self::DEV_STATUS . ' [ ' . self::CODENAME . ' ] ' . self::RELDATE . ' '
 			. self::RELTIME . ' ' . self::RELTZ;
 	}

From cb79438f5f3622aa5782e9ec5e9667edade62746 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Mon, 7 Aug 2017 16:09:02 +0100
Subject: [PATCH 139/148] Add a default empty array for the session queue
 (#16943)

---
 libraries/src/Joomla/CMS/Application/CMSApplication.php | 4 ++--
 tests/unit/core/mock/session.php                        | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/src/Joomla/CMS/Application/CMSApplication.php b/libraries/src/Joomla/CMS/Application/CMSApplication.php
index 7bc331977edf1..e590ce5fd85aa 100644
--- a/libraries/src/Joomla/CMS/Application/CMSApplication.php
+++ b/libraries/src/Joomla/CMS/Application/CMSApplication.php
@@ -468,12 +468,12 @@ public function getMessageQueue($clear = false)
 		if (!$this->_messageQueue)
 		{
 			$session = \JFactory::getSession();
-			$sessionQueue = $session->get('application.queue');
+			$sessionQueue = $session->get('application.queue', array());
 
 			if ($sessionQueue)
 			{
 				$this->_messageQueue = $sessionQueue;
-				$session->set('application.queue', null);
+				$session->set('application.queue', array());
 			}
 		}
 
diff --git a/tests/unit/core/mock/session.php b/tests/unit/core/mock/session.php
index 99ff22f4c9059..8165cae405f97 100644
--- a/tests/unit/core/mock/session.php
+++ b/tests/unit/core/mock/session.php
@@ -109,13 +109,14 @@ public static function create($test, $options = array())
 	/**
 	 * Mocking the get method.
 	 *
-	 * @param   string  $key  The key to get.
+	 * @param   string  $key      The key to get.
+	 * @param   mixed   $default  The default value for the value.
 	 *
 	 * @return  mixed
 	 *
 	 * @since   11.3
 	 */
-	public static function mockGet($key)
+	public static function mockGet($key, $default = null)
 	{
 		switch ($key)
 		{
@@ -130,6 +131,6 @@ public static function mockGet($key)
 				return $user;
 		}
 
-		return null;
+		return $default;
 	}
 }

From c343565619b7e966caff5b202f6c6dced1f0cec7 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Tue, 8 Aug 2017 03:05:08 +0100
Subject: [PATCH 140/148] Move library files to just libraries/src as it should
 be (#17441)

* Move library files to just libraries/src as it should be

* Fix path expectation
---
 libraries/cms.php                                               | 2 +-
 libraries/src/{Joomla/CMS => }/Access/Access.php                | 0
 libraries/src/{Joomla/CMS => }/Access/Exception/NotAllowed.php  | 0
 libraries/src/{Joomla/CMS => }/Access/Rule.php                  | 0
 libraries/src/{Joomla/CMS => }/Access/Rules.php                 | 0
 libraries/src/{Joomla/CMS => }/Access/Wrapper/Access.php        | 0
 .../{Joomla/CMS => }/Application/AdministratorApplication.php   | 0
 .../src/{Joomla/CMS => }/Application/ApplicationHelper.php      | 0
 libraries/src/{Joomla/CMS => }/Application/BaseApplication.php  | 0
 libraries/src/{Joomla/CMS => }/Application/CMSApplication.php   | 0
 libraries/src/{Joomla/CMS => }/Application/CliApplication.php   | 0
 .../src/{Joomla/CMS => }/Application/DaemonApplication.php      | 0
 libraries/src/{Joomla/CMS => }/Application/SiteApplication.php  | 0
 libraries/src/{Joomla/CMS => }/Application/WebApplication.php   | 0
 .../{Joomla/CMS => }/Association/AssociationExtensionHelper.php | 0
 .../CMS => }/Association/AssociationExtensionInterface.php      | 0
 .../src/{Joomla/CMS => }/Authentication/Authentication.php      | 0
 .../{Joomla/CMS => }/Authentication/AuthenticationResponse.php  | 0
 libraries/src/{Joomla/CMS => }/Cache/Cache.php                  | 0
 libraries/src/{Joomla/CMS => }/Cache/CacheController.php        | 0
 libraries/src/{Joomla/CMS => }/Cache/CacheStorage.php           | 0
 .../{Joomla/CMS => }/Cache/Controller/CallbackController.php    | 0
 .../src/{Joomla/CMS => }/Cache/Controller/OutputController.php  | 0
 .../src/{Joomla/CMS => }/Cache/Controller/PageController.php    | 0
 .../src/{Joomla/CMS => }/Cache/Controller/ViewController.php    | 0
 .../CMS => }/Cache/Exception/CacheConnectingException.php       | 0
 .../CMS => }/Cache/Exception/CacheExceptionInterface.php        | 0
 .../CMS => }/Cache/Exception/UnsupportedCacheException.php      | 0
 libraries/src/{Joomla/CMS => }/Cache/Storage/ApcStorage.php     | 0
 libraries/src/{Joomla/CMS => }/Cache/Storage/ApcuStorage.php    | 0
 .../src/{Joomla/CMS => }/Cache/Storage/CacheStorageHelper.php   | 0
 .../src/{Joomla/CMS => }/Cache/Storage/CacheliteStorage.php     | 0
 libraries/src/{Joomla/CMS => }/Cache/Storage/FileStorage.php    | 0
 .../src/{Joomla/CMS => }/Cache/Storage/MemcacheStorage.php      | 0
 .../src/{Joomla/CMS => }/Cache/Storage/MemcachedStorage.php     | 0
 libraries/src/{Joomla/CMS => }/Cache/Storage/RedisStorage.php   | 0
 .../src/{Joomla/CMS => }/Cache/Storage/WincacheStorage.php      | 0
 libraries/src/{Joomla/CMS => }/Cache/Storage/XcacheStorage.php  | 0
 libraries/src/{Joomla/CMS => }/Captcha/Captcha.php              | 0
 libraries/src/{Joomla/CMS => }/Categories/Categories.php        | 0
 libraries/src/{Joomla/CMS => }/Categories/CategoryNode.php      | 0
 libraries/src/{Joomla/CMS => }/Client/ClientHelper.php          | 0
 libraries/src/{Joomla/CMS => }/Client/ClientWrapper.php         | 0
 libraries/src/{Joomla/CMS => }/Client/FtpClient.php             | 0
 libraries/src/{Joomla/CMS => }/Component/ComponentHelper.php    | 0
 libraries/src/{Joomla/CMS => }/Component/ComponentRecord.php    | 0
 .../CMS => }/Component/Exception/MissingComponentException.php  | 0
 libraries/src/{Joomla/CMS => }/Component/Router/RouterBase.php  | 0
 .../src/{Joomla/CMS => }/Component/Router/RouterInterface.php   | 0
 .../src/{Joomla/CMS => }/Component/Router/RouterLegacy.php      | 0
 libraries/src/{Joomla/CMS => }/Component/Router/RouterView.php  | 0
 .../CMS => }/Component/Router/RouterViewConfiguration.php       | 0
 .../src/{Joomla/CMS => }/Component/Router/Rules/MenuRules.php   | 0
 .../src/{Joomla/CMS => }/Component/Router/Rules/NomenuRules.php | 0
 .../{Joomla/CMS => }/Component/Router/Rules/RulesInterface.php  | 0
 .../{Joomla/CMS => }/Component/Router/Rules/StandardRules.php   | 0
 libraries/src/{Joomla/CMS => }/Controller/Admin.php             | 0
 libraries/src/{Joomla/CMS => }/Controller/Controller.php        | 0
 libraries/src/{Joomla/CMS => }/Controller/Form.php              | 0
 libraries/src/{Joomla/CMS => }/Crypt/Cipher/BlowfishCipher.php  | 0
 libraries/src/{Joomla/CMS => }/Crypt/Cipher/CryptoCipher.php    | 0
 libraries/src/{Joomla/CMS => }/Crypt/Cipher/McryptCipher.php    | 0
 .../src/{Joomla/CMS => }/Crypt/Cipher/Rijndael256Cipher.php     | 0
 libraries/src/{Joomla/CMS => }/Crypt/Cipher/SimpleCipher.php    | 0
 libraries/src/{Joomla/CMS => }/Crypt/Cipher/SodiumCipher.php    | 0
 libraries/src/{Joomla/CMS => }/Crypt/Cipher/TripleDesCipher.php | 0
 libraries/src/{Joomla/CMS => }/Crypt/CipherInterface.php        | 0
 libraries/src/{Joomla/CMS => }/Crypt/Crypt.php                  | 0
 libraries/src/{Joomla/CMS => }/Crypt/CryptPassword.php          | 0
 libraries/src/{Joomla/CMS => }/Crypt/Key.php                    | 0
 .../src/{Joomla/CMS => }/Crypt/Password/SimpleCryptPassword.php | 0
 libraries/src/{Joomla/CMS => }/Crypt/README.md                  | 0
 libraries/src/{Joomla/CMS => }/Date/Date.php                    | 0
 libraries/src/{Joomla/CMS => }/Document/Document.php            | 0
 libraries/src/{Joomla/CMS => }/Document/DocumentRenderer.php    | 0
 libraries/src/{Joomla/CMS => }/Document/ErrorDocument.php       | 0
 libraries/src/{Joomla/CMS => }/Document/Feed/FeedEnclosure.php  | 0
 libraries/src/{Joomla/CMS => }/Document/Feed/FeedImage.php      | 0
 libraries/src/{Joomla/CMS => }/Document/Feed/FeedItem.php       | 0
 libraries/src/{Joomla/CMS => }/Document/FeedDocument.php        | 0
 libraries/src/{Joomla/CMS => }/Document/HtmlDocument.php        | 0
 libraries/src/{Joomla/CMS => }/Document/ImageDocument.php       | 0
 libraries/src/{Joomla/CMS => }/Document/JsonDocument.php        | 0
 .../{Joomla/CMS => }/Document/Opensearch/OpensearchImage.php    | 0
 .../src/{Joomla/CMS => }/Document/Opensearch/OpensearchUrl.php  | 0
 libraries/src/{Joomla/CMS => }/Document/OpensearchDocument.php  | 0
 libraries/src/{Joomla/CMS => }/Document/RawDocument.php         | 0
 .../{Joomla/CMS => }/Document/Renderer/Feed/AtomRenderer.php    | 0
 .../src/{Joomla/CMS => }/Document/Renderer/Feed/RssRenderer.php | 0
 .../CMS => }/Document/Renderer/Html/ComponentRenderer.php       | 0
 .../{Joomla/CMS => }/Document/Renderer/Html/HeadRenderer.php    | 0
 .../{Joomla/CMS => }/Document/Renderer/Html/MessageRenderer.php | 0
 .../{Joomla/CMS => }/Document/Renderer/Html/ModuleRenderer.php  | 0
 .../{Joomla/CMS => }/Document/Renderer/Html/ModulesRenderer.php | 0
 libraries/src/{Joomla/CMS => }/Document/XmlDocument.php         | 0
 libraries/src/{Joomla/CMS => }/Editor/Editor.php                | 0
 libraries/src/{Joomla/CMS => }/Environment/Browser.php          | 0
 libraries/src/{Joomla/CMS => }/Exception/ExceptionHandler.php   | 0
 libraries/src/{Joomla/CMS => }/Factory.php                      | 0
 libraries/src/{Joomla/CMS => }/Feed/Feed.php                    | 0
 libraries/src/{Joomla/CMS => }/Feed/FeedEntry.php               | 0
 libraries/src/{Joomla/CMS => }/Feed/FeedFactory.php             | 0
 libraries/src/{Joomla/CMS => }/Feed/FeedLink.php                | 0
 libraries/src/{Joomla/CMS => }/Feed/FeedParser.php              | 0
 libraries/src/{Joomla/CMS => }/Feed/FeedPerson.php              | 0
 libraries/src/{Joomla/CMS => }/Feed/Parser/AtomParser.php       | 0
 .../{Joomla/CMS => }/Feed/Parser/NamespaceParserInterface.php   | 0
 .../src/{Joomla/CMS => }/Feed/Parser/Rss/ItunesRssParser.php    | 0
 .../src/{Joomla/CMS => }/Feed/Parser/Rss/MediaRssParser.php     | 0
 libraries/src/{Joomla/CMS => }/Feed/Parser/RssParser.php        | 0
 libraries/src/{Joomla/CMS => }/Filter/InputFilter.php           | 0
 libraries/src/{Joomla/CMS => }/Filter/OutputFilter.php          | 0
 .../src/{Joomla/CMS => }/Filter/Wrapper/OutputFilterWrapper.php | 0
 libraries/src/{Joomla/CMS => }/Form/Field/AuthorField.php       | 0
 libraries/src/{Joomla/CMS => }/Form/Field/CaptchaField.php      | 0
 libraries/src/{Joomla/CMS => }/Form/Field/ChromeStyleField.php  | 0
 .../src/{Joomla/CMS => }/Form/Field/ContenthistoryField.php     | 0
 .../src/{Joomla/CMS => }/Form/Field/ContentlanguageField.php    | 0
 libraries/src/{Joomla/CMS => }/Form/Field/ContenttypeField.php  | 0
 libraries/src/{Joomla/CMS => }/Form/Field/EditorField.php       | 0
 .../src/{Joomla/CMS => }/Form/Field/FrontendLanguageField.php   | 0
 libraries/src/{Joomla/CMS => }/Form/Field/HeadertagField.php    | 0
 libraries/src/{Joomla/CMS => }/Form/Field/HelpsiteField.php     | 0
 .../src/{Joomla/CMS => }/Form/Field/LastvisitDateRangeField.php | 0
 libraries/src/{Joomla/CMS => }/Form/Field/LimitboxField.php     | 0
 libraries/src/{Joomla/CMS => }/Form/Field/MediaField.php        | 0
 libraries/src/{Joomla/CMS => }/Form/Field/MenuField.php         | 0
 libraries/src/{Joomla/CMS => }/Form/Field/MenuitemField.php     | 0
 libraries/src/{Joomla/CMS => }/Form/Field/ModuleOrderField.php  | 0
 .../src/{Joomla/CMS => }/Form/Field/ModulePositionField.php     | 0
 libraries/src/{Joomla/CMS => }/Form/Field/ModuletagField.php    | 0
 libraries/src/{Joomla/CMS => }/Form/Field/OrderingField.php     | 0
 libraries/src/{Joomla/CMS => }/Form/Field/PluginStatusField.php | 0
 .../{Joomla/CMS => }/Form/Field/RegistrationDateRangeField.php  | 0
 libraries/src/{Joomla/CMS => }/Form/Field/StatusField.php       | 0
 libraries/src/{Joomla/CMS => }/Form/Field/TagField.php          | 0
 .../src/{Joomla/CMS => }/Form/Field/TemplatestyleField.php      | 0
 libraries/src/{Joomla/CMS => }/Form/Field/UserActiveField.php   | 0
 libraries/src/{Joomla/CMS => }/Form/Field/UserField.php         | 0
 .../src/{Joomla/CMS => }/Form/Field/UserGroupListField.php      | 0
 libraries/src/{Joomla/CMS => }/Form/Field/UserStateField.php    | 0
 libraries/src/{Joomla/CMS => }/Form/Form.php                    | 0
 libraries/src/{Joomla/CMS => }/Form/FormField.php               | 0
 libraries/src/{Joomla/CMS => }/Form/FormHelper.php              | 0
 libraries/src/{Joomla/CMS => }/Form/FormRule.php                | 0
 libraries/src/{Joomla/CMS => }/Form/FormWrapper.php             | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/BooleanRule.php        | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/CalendarRule.php       | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/CaptchaRule.php        | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/ColorRule.php          | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/EmailRule.php          | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/EqualsRule.php         | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/NotequalsRule.php      | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/NumberRule.php         | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/OptionsRule.php        | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/PasswordRule.php       | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/RulesRule.php          | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/TelRule.php            | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/UrlRule.php            | 0
 libraries/src/{Joomla/CMS => }/Form/Rule/UsernameRule.php       | 0
 libraries/src/{Joomla/CMS => }/Help/Help.php                    | 0
 libraries/src/{Joomla/CMS => }/Helper/AuthenticationHelper.php  | 0
 libraries/src/{Joomla/CMS => }/Helper/CMSHelper.php             | 0
 libraries/src/{Joomla/CMS => }/Helper/ContentHelper.php         | 0
 libraries/src/{Joomla/CMS => }/Helper/ContentHistoryHelper.php  | 0
 libraries/src/{Joomla/CMS => }/Helper/LibraryHelper.php         | 0
 libraries/src/{Joomla/CMS => }/Helper/MediaHelper.php           | 0
 libraries/src/{Joomla/CMS => }/Helper/ModuleHelper.php          | 0
 libraries/src/{Joomla/CMS => }/Helper/RouteHelper.php           | 0
 libraries/src/{Joomla/CMS => }/Helper/SearchHelper.php          | 0
 libraries/src/{Joomla/CMS => }/Helper/TagsHelper.php            | 0
 libraries/src/{Joomla/CMS => }/Helper/UserGroupsHelper.php      | 0
 libraries/src/{Joomla/CMS => }/Http/Http.php                    | 0
 libraries/src/{Joomla/CMS => }/Http/HttpFactory.php             | 0
 libraries/src/{Joomla/CMS => }/Http/Response.php                | 0
 libraries/src/{Joomla/CMS => }/Http/Transport/CurlTransport.php | 0
 .../src/{Joomla/CMS => }/Http/Transport/SocketTransport.php     | 0
 .../src/{Joomla/CMS => }/Http/Transport/StreamTransport.php     | 0
 libraries/src/{Joomla/CMS => }/Http/Transport/cacert.pem        | 0
 libraries/src/{Joomla/CMS => }/Http/TransportInterface.php      | 0
 libraries/src/{Joomla/CMS => }/Http/Wrapper/FactoryWrapper.php  | 0
 libraries/src/{Joomla/CMS => }/Input/Cli.php                    | 0
 libraries/src/{Joomla/CMS => }/Input/Cookie.php                 | 0
 libraries/src/{Joomla/CMS => }/Input/Files.php                  | 0
 libraries/src/{Joomla/CMS => }/Input/Input.php                  | 0
 libraries/src/{Joomla/CMS => }/Input/Json.php                   | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/ComponentAdapter.php | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/FileAdapter.php      | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/LanguageAdapter.php  | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/LibraryAdapter.php   | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/ModuleAdapter.php    | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/PackageAdapter.php   | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/PluginAdapter.php    | 0
 .../src/{Joomla/CMS => }/Installer/Adapter/TemplateAdapter.php  | 0
 libraries/src/{Joomla/CMS => }/Installer/Installer.php          | 0
 libraries/src/{Joomla/CMS => }/Installer/InstallerAdapter.php   | 0
 libraries/src/{Joomla/CMS => }/Installer/InstallerExtension.php | 0
 libraries/src/{Joomla/CMS => }/Installer/InstallerHelper.php    | 0
 libraries/src/{Joomla/CMS => }/Installer/InstallerScript.php    | 0
 libraries/src/{Joomla/CMS => }/Installer/Manifest.php           | 0
 .../src/{Joomla/CMS => }/Installer/Manifest/LibraryManifest.php | 0
 .../src/{Joomla/CMS => }/Installer/Manifest/PackageManifest.php | 0
 libraries/src/{Joomla/CMS => }/Language/Associations.php        | 0
 libraries/src/{Joomla/CMS => }/Language/Language.php            | 0
 libraries/src/{Joomla/CMS => }/Language/LanguageHelper.php      | 0
 libraries/src/{Joomla/CMS => }/Language/LanguageStemmer.php     | 0
 libraries/src/{Joomla/CMS => }/Language/Multilanguage.php       | 0
 libraries/src/{Joomla/CMS => }/Language/Stemmer/Porteren.php    | 0
 libraries/src/{Joomla/CMS => }/Language/Transliterate.php       | 0
 .../src/{Joomla/CMS => }/Language/Wrapper/JTextWrapper.php      | 0
 .../{Joomla/CMS => }/Language/Wrapper/LanguageHelperWrapper.php | 0
 .../{Joomla/CMS => }/Language/Wrapper/TransliterateWrapper.php  | 0
 libraries/src/{Joomla/CMS => }/Layout/BaseLayout.php            | 0
 libraries/src/{Joomla/CMS => }/Layout/FileLayout.php            | 0
 libraries/src/{Joomla/CMS => }/Layout/LayoutHelper.php          | 0
 libraries/src/{Joomla/CMS => }/Layout/LayoutInterface.php       | 0
 libraries/src/{Joomla/CMS => }/Log/DelegatingPsrLogger.php      | 0
 libraries/src/{Joomla/CMS => }/Log/Log.php                      | 0
 libraries/src/{Joomla/CMS => }/Log/LogEntry.php                 | 0
 libraries/src/{Joomla/CMS => }/Log/Logger.php                   | 0
 libraries/src/{Joomla/CMS => }/Log/Logger/CallbackLogger.php    | 0
 libraries/src/{Joomla/CMS => }/Log/Logger/DatabaseLogger.php    | 0
 libraries/src/{Joomla/CMS => }/Log/Logger/EchoLogger.php        | 0
 .../src/{Joomla/CMS => }/Log/Logger/FormattedtextLogger.php     | 0
 .../src/{Joomla/CMS => }/Log/Logger/MessagequeueLogger.php      | 0
 libraries/src/{Joomla/CMS => }/Log/Logger/SyslogLogger.php      | 0
 libraries/src/{Joomla/CMS => }/Log/Logger/W3cLogger.php         | 0
 libraries/src/{Joomla/CMS => }/Mail/Mail.php                    | 0
 libraries/src/{Joomla/CMS => }/Mail/MailHelper.php              | 0
 libraries/src/{Joomla/CMS => }/Mail/MailWrapper.php             | 0
 .../{Joomla/CMS => }/Mail/language/phpmailer.lang-joomla.php    | 0
 libraries/src/{Joomla/CMS => }/Menu/AbstractMenu.php            | 0
 libraries/src/{Joomla/CMS => }/Menu/AdministratorMenu.php       | 0
 libraries/src/{Joomla/CMS => }/Menu/MenuHelper.php              | 0
 libraries/src/{Joomla/CMS => }/Menu/MenuItem.php                | 0
 libraries/src/{Joomla/CMS => }/Menu/Node.php                    | 0
 libraries/src/{Joomla/CMS => }/Menu/Node/Component.php          | 0
 libraries/src/{Joomla/CMS => }/Menu/Node/Container.php          | 0
 libraries/src/{Joomla/CMS => }/Menu/Node/Heading.php            | 0
 libraries/src/{Joomla/CMS => }/Menu/Node/Separator.php          | 0
 libraries/src/{Joomla/CMS => }/Menu/Node/Url.php                | 0
 libraries/src/{Joomla/CMS => }/Menu/SiteMenu.php                | 0
 libraries/src/{Joomla/CMS => }/Menu/Tree.php                    | 0
 libraries/src/{Joomla/CMS => }/Microdata/Microdata.php          | 0
 libraries/src/{Joomla/CMS => }/Microdata/types.json             | 0
 libraries/src/{Joomla/CMS => }/Model/Admin.php                  | 0
 libraries/src/{Joomla/CMS => }/Model/Form.php                   | 0
 libraries/src/{Joomla/CMS => }/Model/Item.php                   | 0
 libraries/src/{Joomla/CMS => }/Model/ListModel.php              | 0
 libraries/src/{Joomla/CMS => }/Model/Model.php                  | 0
 libraries/src/{Joomla/CMS => }/Pagination/Pagination.php        | 0
 libraries/src/{Joomla/CMS => }/Pagination/PaginationObject.php  | 0
 libraries/src/{Joomla/CMS => }/Pathway/Pathway.php              | 0
 libraries/src/{Joomla/CMS => }/Pathway/SitePathway.php          | 0
 libraries/src/{Joomla/CMS => }/Plugin/CMSPlugin.php             | 0
 libraries/src/{Joomla/CMS => }/Plugin/PluginHelper.php          | 0
 libraries/src/{Joomla/CMS => }/Profiler/Profiler.php            | 0
 libraries/src/{Joomla/CMS => }/Response/JsonResponse.php        | 0
 libraries/src/{Joomla/CMS => }/Router/AdministratorRouter.php   | 0
 libraries/src/{Joomla/CMS => }/Router/Router.php                | 0
 libraries/src/{Joomla/CMS => }/Router/SiteRouter.php            | 0
 libraries/src/{Joomla/CMS => }/Schema/ChangeItem.php            | 0
 .../src/{Joomla/CMS => }/Schema/ChangeItem/MysqlChangeItem.php  | 0
 .../{Joomla/CMS => }/Schema/ChangeItem/PostgresqlChangeItem.php | 0
 .../src/{Joomla/CMS => }/Schema/ChangeItem/SqlsrvChangeItem.php | 0
 libraries/src/{Joomla/CMS => }/Schema/ChangeSet.php             | 0
 .../CMS => }/Session/Exception/UnsupportedStorageException.php  | 0
 libraries/src/{Joomla/CMS => }/Session/Session.php              | 0
 libraries/src/{Joomla/CMS => }/String/PunycodeHelper.php        | 0
 libraries/src/{Joomla/CMS => }/Table/Asset.php                  | 0
 libraries/src/{Joomla/CMS => }/Table/Category.php               | 0
 libraries/src/{Joomla/CMS => }/Table/Content.php                | 0
 libraries/src/{Joomla/CMS => }/Table/ContentHistory.php         | 0
 libraries/src/{Joomla/CMS => }/Table/ContentType.php            | 0
 libraries/src/{Joomla/CMS => }/Table/CoreContent.php            | 0
 libraries/src/{Joomla/CMS => }/Table/Extension.php              | 0
 libraries/src/{Joomla/CMS => }/Table/Language.php               | 0
 libraries/src/{Joomla/CMS => }/Table/Menu.php                   | 0
 libraries/src/{Joomla/CMS => }/Table/MenuType.php               | 0
 libraries/src/{Joomla/CMS => }/Table/Module.php                 | 0
 libraries/src/{Joomla/CMS => }/Table/Nested.php                 | 0
 .../src/{Joomla/CMS => }/Table/Observer/AbstractObserver.php    | 0
 .../src/{Joomla/CMS => }/Table/Observer/ContentHistory.php      | 0
 libraries/src/{Joomla/CMS => }/Table/Observer/Tags.php          | 0
 libraries/src/{Joomla/CMS => }/Table/Table.php                  | 0
 libraries/src/{Joomla/CMS => }/Table/TableInterface.php         | 0
 libraries/src/{Joomla/CMS => }/Table/Ucm.php                    | 0
 libraries/src/{Joomla/CMS => }/Table/Update.php                 | 0
 libraries/src/{Joomla/CMS => }/Table/UpdateSite.php             | 0
 libraries/src/{Joomla/CMS => }/Table/User.php                   | 0
 libraries/src/{Joomla/CMS => }/Table/Usergroup.php              | 0
 libraries/src/{Joomla/CMS => }/Table/ViewLevel.php              | 0
 libraries/src/{Joomla/CMS => }/Toolbar/Button/ConfirmButton.php | 0
 libraries/src/{Joomla/CMS => }/Toolbar/Button/CustomButton.php  | 0
 libraries/src/{Joomla/CMS => }/Toolbar/Button/HelpButton.php    | 0
 libraries/src/{Joomla/CMS => }/Toolbar/Button/LinkButton.php    | 0
 libraries/src/{Joomla/CMS => }/Toolbar/Button/PopupButton.php   | 0
 .../src/{Joomla/CMS => }/Toolbar/Button/SeparatorButton.php     | 0
 libraries/src/{Joomla/CMS => }/Toolbar/Button/SliderButton.php  | 0
 .../src/{Joomla/CMS => }/Toolbar/Button/StandardButton.php      | 0
 libraries/src/{Joomla/CMS => }/Toolbar/Toolbar.php              | 0
 libraries/src/{Joomla/CMS => }/Toolbar/ToolbarButton.php        | 0
 libraries/src/{Joomla/CMS => }/UCM/UCM.php                      | 0
 libraries/src/{Joomla/CMS => }/UCM/UCMBase.php                  | 0
 libraries/src/{Joomla/CMS => }/UCM/UCMContent.php               | 0
 libraries/src/{Joomla/CMS => }/UCM/UCMType.php                  | 0
 .../src/{Joomla/CMS => }/Updater/Adapter/CollectionAdapter.php  | 0
 .../src/{Joomla/CMS => }/Updater/Adapter/ExtensionAdapter.php   | 0
 libraries/src/{Joomla/CMS => }/Updater/Update.php               | 0
 libraries/src/{Joomla/CMS => }/Updater/UpdateAdapter.php        | 0
 libraries/src/{Joomla/CMS => }/Updater/Updater.php              | 0
 libraries/src/{Joomla/CMS => }/Uri/Uri.php                      | 0
 libraries/src/{Joomla/CMS => }/User/User.php                    | 0
 libraries/src/{Joomla/CMS => }/User/UserHelper.php              | 0
 libraries/src/{Joomla/CMS => }/User/UserWrapper.php             | 0
 libraries/src/{Joomla/CMS => }/Utility/BufferStreamHandler.php  | 0
 libraries/src/{Joomla/CMS => }/Utility/Utility.php              | 0
 libraries/src/{Joomla/CMS => }/Version.php                      | 0
 libraries/src/{Joomla/CMS => }/View/Categories.php              | 0
 libraries/src/{Joomla/CMS => }/View/Category.php                | 0
 libraries/src/{Joomla/CMS => }/View/CategoryFeed.php            | 0
 libraries/src/{Joomla/CMS => }/View/HtmlView.php                | 0
 tests/unit/suites/libraries/joomla/table/JTableTest.php         | 2 +-
 323 files changed, 2 insertions(+), 2 deletions(-)
 rename libraries/src/{Joomla/CMS => }/Access/Access.php (100%)
 rename libraries/src/{Joomla/CMS => }/Access/Exception/NotAllowed.php (100%)
 rename libraries/src/{Joomla/CMS => }/Access/Rule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Access/Rules.php (100%)
 rename libraries/src/{Joomla/CMS => }/Access/Wrapper/Access.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/AdministratorApplication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/ApplicationHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/BaseApplication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/CMSApplication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/CliApplication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/DaemonApplication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/SiteApplication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Application/WebApplication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Association/AssociationExtensionHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Association/AssociationExtensionInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Authentication/Authentication.php (100%)
 rename libraries/src/{Joomla/CMS => }/Authentication/AuthenticationResponse.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Cache.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/CacheController.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/CacheStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Controller/CallbackController.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Controller/OutputController.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Controller/PageController.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Controller/ViewController.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Exception/CacheConnectingException.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Exception/CacheExceptionInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Exception/UnsupportedCacheException.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/ApcStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/ApcuStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/CacheStorageHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/CacheliteStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/FileStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/MemcacheStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/MemcachedStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/RedisStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/WincacheStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Cache/Storage/XcacheStorage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Captcha/Captcha.php (100%)
 rename libraries/src/{Joomla/CMS => }/Categories/Categories.php (100%)
 rename libraries/src/{Joomla/CMS => }/Categories/CategoryNode.php (100%)
 rename libraries/src/{Joomla/CMS => }/Client/ClientHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Client/ClientWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Client/FtpClient.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/ComponentHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/ComponentRecord.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Exception/MissingComponentException.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/RouterBase.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/RouterInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/RouterLegacy.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/RouterView.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/RouterViewConfiguration.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/Rules/MenuRules.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/Rules/NomenuRules.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/Rules/RulesInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Component/Router/Rules/StandardRules.php (100%)
 rename libraries/src/{Joomla/CMS => }/Controller/Admin.php (100%)
 rename libraries/src/{Joomla/CMS => }/Controller/Controller.php (100%)
 rename libraries/src/{Joomla/CMS => }/Controller/Form.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Cipher/BlowfishCipher.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Cipher/CryptoCipher.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Cipher/McryptCipher.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Cipher/Rijndael256Cipher.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Cipher/SimpleCipher.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Cipher/SodiumCipher.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Cipher/TripleDesCipher.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/CipherInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Crypt.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/CryptPassword.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Key.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/Password/SimpleCryptPassword.php (100%)
 rename libraries/src/{Joomla/CMS => }/Crypt/README.md (100%)
 rename libraries/src/{Joomla/CMS => }/Date/Date.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Document.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/DocumentRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/ErrorDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Feed/FeedEnclosure.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Feed/FeedImage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Feed/FeedItem.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/FeedDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/HtmlDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/ImageDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/JsonDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Opensearch/OpensearchImage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Opensearch/OpensearchUrl.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/OpensearchDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/RawDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Renderer/Feed/AtomRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Renderer/Feed/RssRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Renderer/Html/ComponentRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Renderer/Html/HeadRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Renderer/Html/MessageRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Renderer/Html/ModuleRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/Renderer/Html/ModulesRenderer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Document/XmlDocument.php (100%)
 rename libraries/src/{Joomla/CMS => }/Editor/Editor.php (100%)
 rename libraries/src/{Joomla/CMS => }/Environment/Browser.php (100%)
 rename libraries/src/{Joomla/CMS => }/Exception/ExceptionHandler.php (100%)
 rename libraries/src/{Joomla/CMS => }/Factory.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/Feed.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/FeedEntry.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/FeedFactory.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/FeedLink.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/FeedParser.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/FeedPerson.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/Parser/AtomParser.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/Parser/NamespaceParserInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/Parser/Rss/ItunesRssParser.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/Parser/Rss/MediaRssParser.php (100%)
 rename libraries/src/{Joomla/CMS => }/Feed/Parser/RssParser.php (100%)
 rename libraries/src/{Joomla/CMS => }/Filter/InputFilter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Filter/OutputFilter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Filter/Wrapper/OutputFilterWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/AuthorField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/CaptchaField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/ChromeStyleField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/ContenthistoryField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/ContentlanguageField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/ContenttypeField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/EditorField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/FrontendLanguageField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/HeadertagField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/HelpsiteField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/LastvisitDateRangeField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/LimitboxField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/MediaField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/MenuField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/MenuitemField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/ModuleOrderField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/ModulePositionField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/ModuletagField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/OrderingField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/PluginStatusField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/RegistrationDateRangeField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/StatusField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/TagField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/TemplatestyleField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/UserActiveField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/UserField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/UserGroupListField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Field/UserStateField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Form.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/FormField.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/FormHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/FormRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/FormWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/BooleanRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/CalendarRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/CaptchaRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/ColorRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/EmailRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/EqualsRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/NotequalsRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/NumberRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/OptionsRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/PasswordRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/RulesRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/TelRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/UrlRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Form/Rule/UsernameRule.php (100%)
 rename libraries/src/{Joomla/CMS => }/Help/Help.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/AuthenticationHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/CMSHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/ContentHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/ContentHistoryHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/LibraryHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/MediaHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/ModuleHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/RouteHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/SearchHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/TagsHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Helper/UserGroupsHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/Http.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/HttpFactory.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/Response.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/Transport/CurlTransport.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/Transport/SocketTransport.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/Transport/StreamTransport.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/Transport/cacert.pem (100%)
 rename libraries/src/{Joomla/CMS => }/Http/TransportInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Http/Wrapper/FactoryWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Input/Cli.php (100%)
 rename libraries/src/{Joomla/CMS => }/Input/Cookie.php (100%)
 rename libraries/src/{Joomla/CMS => }/Input/Files.php (100%)
 rename libraries/src/{Joomla/CMS => }/Input/Input.php (100%)
 rename libraries/src/{Joomla/CMS => }/Input/Json.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/ComponentAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/FileAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/LanguageAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/LibraryAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/ModuleAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/PackageAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/PluginAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Adapter/TemplateAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Installer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/InstallerAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/InstallerExtension.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/InstallerHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/InstallerScript.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Manifest.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Manifest/LibraryManifest.php (100%)
 rename libraries/src/{Joomla/CMS => }/Installer/Manifest/PackageManifest.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Associations.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Language.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/LanguageHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/LanguageStemmer.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Multilanguage.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Stemmer/Porteren.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Transliterate.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Wrapper/JTextWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Wrapper/LanguageHelperWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Language/Wrapper/TransliterateWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Layout/BaseLayout.php (100%)
 rename libraries/src/{Joomla/CMS => }/Layout/FileLayout.php (100%)
 rename libraries/src/{Joomla/CMS => }/Layout/LayoutHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Layout/LayoutInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/DelegatingPsrLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Log.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/LogEntry.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger/CallbackLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger/DatabaseLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger/EchoLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger/FormattedtextLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger/MessagequeueLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger/SyslogLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Log/Logger/W3cLogger.php (100%)
 rename libraries/src/{Joomla/CMS => }/Mail/Mail.php (100%)
 rename libraries/src/{Joomla/CMS => }/Mail/MailHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Mail/MailWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Mail/language/phpmailer.lang-joomla.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/AbstractMenu.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/AdministratorMenu.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/MenuHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/MenuItem.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/Node.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/Node/Component.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/Node/Container.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/Node/Heading.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/Node/Separator.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/Node/Url.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/SiteMenu.php (100%)
 rename libraries/src/{Joomla/CMS => }/Menu/Tree.php (100%)
 rename libraries/src/{Joomla/CMS => }/Microdata/Microdata.php (100%)
 rename libraries/src/{Joomla/CMS => }/Microdata/types.json (100%)
 rename libraries/src/{Joomla/CMS => }/Model/Admin.php (100%)
 rename libraries/src/{Joomla/CMS => }/Model/Form.php (100%)
 rename libraries/src/{Joomla/CMS => }/Model/Item.php (100%)
 rename libraries/src/{Joomla/CMS => }/Model/ListModel.php (100%)
 rename libraries/src/{Joomla/CMS => }/Model/Model.php (100%)
 rename libraries/src/{Joomla/CMS => }/Pagination/Pagination.php (100%)
 rename libraries/src/{Joomla/CMS => }/Pagination/PaginationObject.php (100%)
 rename libraries/src/{Joomla/CMS => }/Pathway/Pathway.php (100%)
 rename libraries/src/{Joomla/CMS => }/Pathway/SitePathway.php (100%)
 rename libraries/src/{Joomla/CMS => }/Plugin/CMSPlugin.php (100%)
 rename libraries/src/{Joomla/CMS => }/Plugin/PluginHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Profiler/Profiler.php (100%)
 rename libraries/src/{Joomla/CMS => }/Response/JsonResponse.php (100%)
 rename libraries/src/{Joomla/CMS => }/Router/AdministratorRouter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Router/Router.php (100%)
 rename libraries/src/{Joomla/CMS => }/Router/SiteRouter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Schema/ChangeItem.php (100%)
 rename libraries/src/{Joomla/CMS => }/Schema/ChangeItem/MysqlChangeItem.php (100%)
 rename libraries/src/{Joomla/CMS => }/Schema/ChangeItem/PostgresqlChangeItem.php (100%)
 rename libraries/src/{Joomla/CMS => }/Schema/ChangeItem/SqlsrvChangeItem.php (100%)
 rename libraries/src/{Joomla/CMS => }/Schema/ChangeSet.php (100%)
 rename libraries/src/{Joomla/CMS => }/Session/Exception/UnsupportedStorageException.php (100%)
 rename libraries/src/{Joomla/CMS => }/Session/Session.php (100%)
 rename libraries/src/{Joomla/CMS => }/String/PunycodeHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Asset.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Category.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Content.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/ContentHistory.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/ContentType.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/CoreContent.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Extension.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Language.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Menu.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/MenuType.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Module.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Nested.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Observer/AbstractObserver.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Observer/ContentHistory.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Observer/Tags.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Table.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/TableInterface.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Ucm.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Update.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/UpdateSite.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/User.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/Usergroup.php (100%)
 rename libraries/src/{Joomla/CMS => }/Table/ViewLevel.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/ConfirmButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/CustomButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/HelpButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/LinkButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/PopupButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/SeparatorButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/SliderButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Button/StandardButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/Toolbar.php (100%)
 rename libraries/src/{Joomla/CMS => }/Toolbar/ToolbarButton.php (100%)
 rename libraries/src/{Joomla/CMS => }/UCM/UCM.php (100%)
 rename libraries/src/{Joomla/CMS => }/UCM/UCMBase.php (100%)
 rename libraries/src/{Joomla/CMS => }/UCM/UCMContent.php (100%)
 rename libraries/src/{Joomla/CMS => }/UCM/UCMType.php (100%)
 rename libraries/src/{Joomla/CMS => }/Updater/Adapter/CollectionAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Updater/Adapter/ExtensionAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Updater/Update.php (100%)
 rename libraries/src/{Joomla/CMS => }/Updater/UpdateAdapter.php (100%)
 rename libraries/src/{Joomla/CMS => }/Updater/Updater.php (100%)
 rename libraries/src/{Joomla/CMS => }/Uri/Uri.php (100%)
 rename libraries/src/{Joomla/CMS => }/User/User.php (100%)
 rename libraries/src/{Joomla/CMS => }/User/UserHelper.php (100%)
 rename libraries/src/{Joomla/CMS => }/User/UserWrapper.php (100%)
 rename libraries/src/{Joomla/CMS => }/Utility/BufferStreamHandler.php (100%)
 rename libraries/src/{Joomla/CMS => }/Utility/Utility.php (100%)
 rename libraries/src/{Joomla/CMS => }/Version.php (100%)
 rename libraries/src/{Joomla/CMS => }/View/Categories.php (100%)
 rename libraries/src/{Joomla/CMS => }/View/Category.php (100%)
 rename libraries/src/{Joomla/CMS => }/View/CategoryFeed.php (100%)
 rename libraries/src/{Joomla/CMS => }/View/HtmlView.php (100%)

diff --git a/libraries/cms.php b/libraries/cms.php
index 2f3109e83b42e..c68bc3d96b3fe 100644
--- a/libraries/cms.php
+++ b/libraries/cms.php
@@ -30,7 +30,7 @@
 JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);
 
 /** @note This will be loaded through composer in Joomla 4 **/
-JLoader::registerNamespace('Joomla', JPATH_PLATFORM . '/src/Joomla', false, false, 'psr4');
+JLoader::registerNamespace('Joomla\\CMS', JPATH_PLATFORM . '/src', false, false, 'psr4');
 
 // Create the Composer autoloader
 $loader = require JPATH_LIBRARIES . '/vendor/autoload.php';
diff --git a/libraries/src/Joomla/CMS/Access/Access.php b/libraries/src/Access/Access.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Access/Access.php
rename to libraries/src/Access/Access.php
diff --git a/libraries/src/Joomla/CMS/Access/Exception/NotAllowed.php b/libraries/src/Access/Exception/NotAllowed.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Access/Exception/NotAllowed.php
rename to libraries/src/Access/Exception/NotAllowed.php
diff --git a/libraries/src/Joomla/CMS/Access/Rule.php b/libraries/src/Access/Rule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Access/Rule.php
rename to libraries/src/Access/Rule.php
diff --git a/libraries/src/Joomla/CMS/Access/Rules.php b/libraries/src/Access/Rules.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Access/Rules.php
rename to libraries/src/Access/Rules.php
diff --git a/libraries/src/Joomla/CMS/Access/Wrapper/Access.php b/libraries/src/Access/Wrapper/Access.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Access/Wrapper/Access.php
rename to libraries/src/Access/Wrapper/Access.php
diff --git a/libraries/src/Joomla/CMS/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/AdministratorApplication.php
rename to libraries/src/Application/AdministratorApplication.php
diff --git a/libraries/src/Joomla/CMS/Application/ApplicationHelper.php b/libraries/src/Application/ApplicationHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/ApplicationHelper.php
rename to libraries/src/Application/ApplicationHelper.php
diff --git a/libraries/src/Joomla/CMS/Application/BaseApplication.php b/libraries/src/Application/BaseApplication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/BaseApplication.php
rename to libraries/src/Application/BaseApplication.php
diff --git a/libraries/src/Joomla/CMS/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/CMSApplication.php
rename to libraries/src/Application/CMSApplication.php
diff --git a/libraries/src/Joomla/CMS/Application/CliApplication.php b/libraries/src/Application/CliApplication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/CliApplication.php
rename to libraries/src/Application/CliApplication.php
diff --git a/libraries/src/Joomla/CMS/Application/DaemonApplication.php b/libraries/src/Application/DaemonApplication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/DaemonApplication.php
rename to libraries/src/Application/DaemonApplication.php
diff --git a/libraries/src/Joomla/CMS/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/SiteApplication.php
rename to libraries/src/Application/SiteApplication.php
diff --git a/libraries/src/Joomla/CMS/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Application/WebApplication.php
rename to libraries/src/Application/WebApplication.php
diff --git a/libraries/src/Joomla/CMS/Association/AssociationExtensionHelper.php b/libraries/src/Association/AssociationExtensionHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Association/AssociationExtensionHelper.php
rename to libraries/src/Association/AssociationExtensionHelper.php
diff --git a/libraries/src/Joomla/CMS/Association/AssociationExtensionInterface.php b/libraries/src/Association/AssociationExtensionInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Association/AssociationExtensionInterface.php
rename to libraries/src/Association/AssociationExtensionInterface.php
diff --git a/libraries/src/Joomla/CMS/Authentication/Authentication.php b/libraries/src/Authentication/Authentication.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Authentication/Authentication.php
rename to libraries/src/Authentication/Authentication.php
diff --git a/libraries/src/Joomla/CMS/Authentication/AuthenticationResponse.php b/libraries/src/Authentication/AuthenticationResponse.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Authentication/AuthenticationResponse.php
rename to libraries/src/Authentication/AuthenticationResponse.php
diff --git a/libraries/src/Joomla/CMS/Cache/Cache.php b/libraries/src/Cache/Cache.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Cache.php
rename to libraries/src/Cache/Cache.php
diff --git a/libraries/src/Joomla/CMS/Cache/CacheController.php b/libraries/src/Cache/CacheController.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/CacheController.php
rename to libraries/src/Cache/CacheController.php
diff --git a/libraries/src/Joomla/CMS/Cache/CacheStorage.php b/libraries/src/Cache/CacheStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/CacheStorage.php
rename to libraries/src/Cache/CacheStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Controller/CallbackController.php b/libraries/src/Cache/Controller/CallbackController.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Controller/CallbackController.php
rename to libraries/src/Cache/Controller/CallbackController.php
diff --git a/libraries/src/Joomla/CMS/Cache/Controller/OutputController.php b/libraries/src/Cache/Controller/OutputController.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Controller/OutputController.php
rename to libraries/src/Cache/Controller/OutputController.php
diff --git a/libraries/src/Joomla/CMS/Cache/Controller/PageController.php b/libraries/src/Cache/Controller/PageController.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Controller/PageController.php
rename to libraries/src/Cache/Controller/PageController.php
diff --git a/libraries/src/Joomla/CMS/Cache/Controller/ViewController.php b/libraries/src/Cache/Controller/ViewController.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Controller/ViewController.php
rename to libraries/src/Cache/Controller/ViewController.php
diff --git a/libraries/src/Joomla/CMS/Cache/Exception/CacheConnectingException.php b/libraries/src/Cache/Exception/CacheConnectingException.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Exception/CacheConnectingException.php
rename to libraries/src/Cache/Exception/CacheConnectingException.php
diff --git a/libraries/src/Joomla/CMS/Cache/Exception/CacheExceptionInterface.php b/libraries/src/Cache/Exception/CacheExceptionInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Exception/CacheExceptionInterface.php
rename to libraries/src/Cache/Exception/CacheExceptionInterface.php
diff --git a/libraries/src/Joomla/CMS/Cache/Exception/UnsupportedCacheException.php b/libraries/src/Cache/Exception/UnsupportedCacheException.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Exception/UnsupportedCacheException.php
rename to libraries/src/Cache/Exception/UnsupportedCacheException.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/ApcStorage.php b/libraries/src/Cache/Storage/ApcStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/ApcStorage.php
rename to libraries/src/Cache/Storage/ApcStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/ApcuStorage.php b/libraries/src/Cache/Storage/ApcuStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/ApcuStorage.php
rename to libraries/src/Cache/Storage/ApcuStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/CacheStorageHelper.php b/libraries/src/Cache/Storage/CacheStorageHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/CacheStorageHelper.php
rename to libraries/src/Cache/Storage/CacheStorageHelper.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/CacheliteStorage.php b/libraries/src/Cache/Storage/CacheliteStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/CacheliteStorage.php
rename to libraries/src/Cache/Storage/CacheliteStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/FileStorage.php b/libraries/src/Cache/Storage/FileStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/FileStorage.php
rename to libraries/src/Cache/Storage/FileStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/MemcacheStorage.php b/libraries/src/Cache/Storage/MemcacheStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/MemcacheStorage.php
rename to libraries/src/Cache/Storage/MemcacheStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/MemcachedStorage.php b/libraries/src/Cache/Storage/MemcachedStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/MemcachedStorage.php
rename to libraries/src/Cache/Storage/MemcachedStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/RedisStorage.php b/libraries/src/Cache/Storage/RedisStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/RedisStorage.php
rename to libraries/src/Cache/Storage/RedisStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/WincacheStorage.php b/libraries/src/Cache/Storage/WincacheStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/WincacheStorage.php
rename to libraries/src/Cache/Storage/WincacheStorage.php
diff --git a/libraries/src/Joomla/CMS/Cache/Storage/XcacheStorage.php b/libraries/src/Cache/Storage/XcacheStorage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Cache/Storage/XcacheStorage.php
rename to libraries/src/Cache/Storage/XcacheStorage.php
diff --git a/libraries/src/Joomla/CMS/Captcha/Captcha.php b/libraries/src/Captcha/Captcha.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Captcha/Captcha.php
rename to libraries/src/Captcha/Captcha.php
diff --git a/libraries/src/Joomla/CMS/Categories/Categories.php b/libraries/src/Categories/Categories.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Categories/Categories.php
rename to libraries/src/Categories/Categories.php
diff --git a/libraries/src/Joomla/CMS/Categories/CategoryNode.php b/libraries/src/Categories/CategoryNode.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Categories/CategoryNode.php
rename to libraries/src/Categories/CategoryNode.php
diff --git a/libraries/src/Joomla/CMS/Client/ClientHelper.php b/libraries/src/Client/ClientHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Client/ClientHelper.php
rename to libraries/src/Client/ClientHelper.php
diff --git a/libraries/src/Joomla/CMS/Client/ClientWrapper.php b/libraries/src/Client/ClientWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Client/ClientWrapper.php
rename to libraries/src/Client/ClientWrapper.php
diff --git a/libraries/src/Joomla/CMS/Client/FtpClient.php b/libraries/src/Client/FtpClient.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Client/FtpClient.php
rename to libraries/src/Client/FtpClient.php
diff --git a/libraries/src/Joomla/CMS/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/ComponentHelper.php
rename to libraries/src/Component/ComponentHelper.php
diff --git a/libraries/src/Joomla/CMS/Component/ComponentRecord.php b/libraries/src/Component/ComponentRecord.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/ComponentRecord.php
rename to libraries/src/Component/ComponentRecord.php
diff --git a/libraries/src/Joomla/CMS/Component/Exception/MissingComponentException.php b/libraries/src/Component/Exception/MissingComponentException.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Exception/MissingComponentException.php
rename to libraries/src/Component/Exception/MissingComponentException.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/RouterBase.php b/libraries/src/Component/Router/RouterBase.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/RouterBase.php
rename to libraries/src/Component/Router/RouterBase.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/RouterInterface.php b/libraries/src/Component/Router/RouterInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/RouterInterface.php
rename to libraries/src/Component/Router/RouterInterface.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/RouterLegacy.php b/libraries/src/Component/Router/RouterLegacy.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/RouterLegacy.php
rename to libraries/src/Component/Router/RouterLegacy.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/RouterView.php b/libraries/src/Component/Router/RouterView.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/RouterView.php
rename to libraries/src/Component/Router/RouterView.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/RouterViewConfiguration.php b/libraries/src/Component/Router/RouterViewConfiguration.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/RouterViewConfiguration.php
rename to libraries/src/Component/Router/RouterViewConfiguration.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/Rules/MenuRules.php
rename to libraries/src/Component/Router/Rules/MenuRules.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/Rules/NomenuRules.php
rename to libraries/src/Component/Router/Rules/NomenuRules.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/Rules/RulesInterface.php b/libraries/src/Component/Router/Rules/RulesInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/Rules/RulesInterface.php
rename to libraries/src/Component/Router/Rules/RulesInterface.php
diff --git a/libraries/src/Joomla/CMS/Component/Router/Rules/StandardRules.php b/libraries/src/Component/Router/Rules/StandardRules.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Component/Router/Rules/StandardRules.php
rename to libraries/src/Component/Router/Rules/StandardRules.php
diff --git a/libraries/src/Joomla/CMS/Controller/Admin.php b/libraries/src/Controller/Admin.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Controller/Admin.php
rename to libraries/src/Controller/Admin.php
diff --git a/libraries/src/Joomla/CMS/Controller/Controller.php b/libraries/src/Controller/Controller.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Controller/Controller.php
rename to libraries/src/Controller/Controller.php
diff --git a/libraries/src/Joomla/CMS/Controller/Form.php b/libraries/src/Controller/Form.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Controller/Form.php
rename to libraries/src/Controller/Form.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Cipher/BlowfishCipher.php b/libraries/src/Crypt/Cipher/BlowfishCipher.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Cipher/BlowfishCipher.php
rename to libraries/src/Crypt/Cipher/BlowfishCipher.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Cipher/CryptoCipher.php b/libraries/src/Crypt/Cipher/CryptoCipher.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Cipher/CryptoCipher.php
rename to libraries/src/Crypt/Cipher/CryptoCipher.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Cipher/McryptCipher.php b/libraries/src/Crypt/Cipher/McryptCipher.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Cipher/McryptCipher.php
rename to libraries/src/Crypt/Cipher/McryptCipher.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Cipher/Rijndael256Cipher.php b/libraries/src/Crypt/Cipher/Rijndael256Cipher.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Cipher/Rijndael256Cipher.php
rename to libraries/src/Crypt/Cipher/Rijndael256Cipher.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Cipher/SimpleCipher.php b/libraries/src/Crypt/Cipher/SimpleCipher.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Cipher/SimpleCipher.php
rename to libraries/src/Crypt/Cipher/SimpleCipher.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Cipher/SodiumCipher.php b/libraries/src/Crypt/Cipher/SodiumCipher.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Cipher/SodiumCipher.php
rename to libraries/src/Crypt/Cipher/SodiumCipher.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Cipher/TripleDesCipher.php b/libraries/src/Crypt/Cipher/TripleDesCipher.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Cipher/TripleDesCipher.php
rename to libraries/src/Crypt/Cipher/TripleDesCipher.php
diff --git a/libraries/src/Joomla/CMS/Crypt/CipherInterface.php b/libraries/src/Crypt/CipherInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/CipherInterface.php
rename to libraries/src/Crypt/CipherInterface.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Crypt.php b/libraries/src/Crypt/Crypt.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Crypt.php
rename to libraries/src/Crypt/Crypt.php
diff --git a/libraries/src/Joomla/CMS/Crypt/CryptPassword.php b/libraries/src/Crypt/CryptPassword.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/CryptPassword.php
rename to libraries/src/Crypt/CryptPassword.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Key.php b/libraries/src/Crypt/Key.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Key.php
rename to libraries/src/Crypt/Key.php
diff --git a/libraries/src/Joomla/CMS/Crypt/Password/SimpleCryptPassword.php b/libraries/src/Crypt/Password/SimpleCryptPassword.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/Password/SimpleCryptPassword.php
rename to libraries/src/Crypt/Password/SimpleCryptPassword.php
diff --git a/libraries/src/Joomla/CMS/Crypt/README.md b/libraries/src/Crypt/README.md
similarity index 100%
rename from libraries/src/Joomla/CMS/Crypt/README.md
rename to libraries/src/Crypt/README.md
diff --git a/libraries/src/Joomla/CMS/Date/Date.php b/libraries/src/Date/Date.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Date/Date.php
rename to libraries/src/Date/Date.php
diff --git a/libraries/src/Joomla/CMS/Document/Document.php b/libraries/src/Document/Document.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Document.php
rename to libraries/src/Document/Document.php
diff --git a/libraries/src/Joomla/CMS/Document/DocumentRenderer.php b/libraries/src/Document/DocumentRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/DocumentRenderer.php
rename to libraries/src/Document/DocumentRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/ErrorDocument.php b/libraries/src/Document/ErrorDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/ErrorDocument.php
rename to libraries/src/Document/ErrorDocument.php
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php b/libraries/src/Document/Feed/FeedEnclosure.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Feed/FeedEnclosure.php
rename to libraries/src/Document/Feed/FeedEnclosure.php
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedImage.php b/libraries/src/Document/Feed/FeedImage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Feed/FeedImage.php
rename to libraries/src/Document/Feed/FeedImage.php
diff --git a/libraries/src/Joomla/CMS/Document/Feed/FeedItem.php b/libraries/src/Document/Feed/FeedItem.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Feed/FeedItem.php
rename to libraries/src/Document/Feed/FeedItem.php
diff --git a/libraries/src/Joomla/CMS/Document/FeedDocument.php b/libraries/src/Document/FeedDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/FeedDocument.php
rename to libraries/src/Document/FeedDocument.php
diff --git a/libraries/src/Joomla/CMS/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/HtmlDocument.php
rename to libraries/src/Document/HtmlDocument.php
diff --git a/libraries/src/Joomla/CMS/Document/ImageDocument.php b/libraries/src/Document/ImageDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/ImageDocument.php
rename to libraries/src/Document/ImageDocument.php
diff --git a/libraries/src/Joomla/CMS/Document/JsonDocument.php b/libraries/src/Document/JsonDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/JsonDocument.php
rename to libraries/src/Document/JsonDocument.php
diff --git a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php b/libraries/src/Document/Opensearch/OpensearchImage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Opensearch/OpensearchImage.php
rename to libraries/src/Document/Opensearch/OpensearchImage.php
diff --git a/libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php b/libraries/src/Document/Opensearch/OpensearchUrl.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Opensearch/OpensearchUrl.php
rename to libraries/src/Document/Opensearch/OpensearchUrl.php
diff --git a/libraries/src/Joomla/CMS/Document/OpensearchDocument.php b/libraries/src/Document/OpensearchDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/OpensearchDocument.php
rename to libraries/src/Document/OpensearchDocument.php
diff --git a/libraries/src/Joomla/CMS/Document/RawDocument.php b/libraries/src/Document/RawDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/RawDocument.php
rename to libraries/src/Document/RawDocument.php
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php b/libraries/src/Document/Renderer/Feed/AtomRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Renderer/Feed/AtomRenderer.php
rename to libraries/src/Document/Renderer/Feed/AtomRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php b/libraries/src/Document/Renderer/Feed/RssRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Renderer/Feed/RssRenderer.php
rename to libraries/src/Document/Renderer/Feed/RssRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php b/libraries/src/Document/Renderer/Html/ComponentRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/ComponentRenderer.php
rename to libraries/src/Document/Renderer/Html/ComponentRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php b/libraries/src/Document/Renderer/Html/HeadRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/HeadRenderer.php
rename to libraries/src/Document/Renderer/Html/HeadRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php b/libraries/src/Document/Renderer/Html/MessageRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/MessageRenderer.php
rename to libraries/src/Document/Renderer/Html/MessageRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Document/Renderer/Html/ModuleRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/ModuleRenderer.php
rename to libraries/src/Document/Renderer/Html/ModuleRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/Renderer/Html/ModulesRenderer.php
rename to libraries/src/Document/Renderer/Html/ModulesRenderer.php
diff --git a/libraries/src/Joomla/CMS/Document/XmlDocument.php b/libraries/src/Document/XmlDocument.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Document/XmlDocument.php
rename to libraries/src/Document/XmlDocument.php
diff --git a/libraries/src/Joomla/CMS/Editor/Editor.php b/libraries/src/Editor/Editor.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Editor/Editor.php
rename to libraries/src/Editor/Editor.php
diff --git a/libraries/src/Joomla/CMS/Environment/Browser.php b/libraries/src/Environment/Browser.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Environment/Browser.php
rename to libraries/src/Environment/Browser.php
diff --git a/libraries/src/Joomla/CMS/Exception/ExceptionHandler.php b/libraries/src/Exception/ExceptionHandler.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Exception/ExceptionHandler.php
rename to libraries/src/Exception/ExceptionHandler.php
diff --git a/libraries/src/Joomla/CMS/Factory.php b/libraries/src/Factory.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Factory.php
rename to libraries/src/Factory.php
diff --git a/libraries/src/Joomla/CMS/Feed/Feed.php b/libraries/src/Feed/Feed.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/Feed.php
rename to libraries/src/Feed/Feed.php
diff --git a/libraries/src/Joomla/CMS/Feed/FeedEntry.php b/libraries/src/Feed/FeedEntry.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/FeedEntry.php
rename to libraries/src/Feed/FeedEntry.php
diff --git a/libraries/src/Joomla/CMS/Feed/FeedFactory.php b/libraries/src/Feed/FeedFactory.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/FeedFactory.php
rename to libraries/src/Feed/FeedFactory.php
diff --git a/libraries/src/Joomla/CMS/Feed/FeedLink.php b/libraries/src/Feed/FeedLink.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/FeedLink.php
rename to libraries/src/Feed/FeedLink.php
diff --git a/libraries/src/Joomla/CMS/Feed/FeedParser.php b/libraries/src/Feed/FeedParser.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/FeedParser.php
rename to libraries/src/Feed/FeedParser.php
diff --git a/libraries/src/Joomla/CMS/Feed/FeedPerson.php b/libraries/src/Feed/FeedPerson.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/FeedPerson.php
rename to libraries/src/Feed/FeedPerson.php
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/AtomParser.php b/libraries/src/Feed/Parser/AtomParser.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/Parser/AtomParser.php
rename to libraries/src/Feed/Parser/AtomParser.php
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/NamespaceParserInterface.php b/libraries/src/Feed/Parser/NamespaceParserInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/Parser/NamespaceParserInterface.php
rename to libraries/src/Feed/Parser/NamespaceParserInterface.php
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/Rss/ItunesRssParser.php b/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/Parser/Rss/ItunesRssParser.php
rename to libraries/src/Feed/Parser/Rss/ItunesRssParser.php
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/Rss/MediaRssParser.php b/libraries/src/Feed/Parser/Rss/MediaRssParser.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/Parser/Rss/MediaRssParser.php
rename to libraries/src/Feed/Parser/Rss/MediaRssParser.php
diff --git a/libraries/src/Joomla/CMS/Feed/Parser/RssParser.php b/libraries/src/Feed/Parser/RssParser.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Feed/Parser/RssParser.php
rename to libraries/src/Feed/Parser/RssParser.php
diff --git a/libraries/src/Joomla/CMS/Filter/InputFilter.php b/libraries/src/Filter/InputFilter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Filter/InputFilter.php
rename to libraries/src/Filter/InputFilter.php
diff --git a/libraries/src/Joomla/CMS/Filter/OutputFilter.php b/libraries/src/Filter/OutputFilter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Filter/OutputFilter.php
rename to libraries/src/Filter/OutputFilter.php
diff --git a/libraries/src/Joomla/CMS/Filter/Wrapper/OutputFilterWrapper.php b/libraries/src/Filter/Wrapper/OutputFilterWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Filter/Wrapper/OutputFilterWrapper.php
rename to libraries/src/Filter/Wrapper/OutputFilterWrapper.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/AuthorField.php b/libraries/src/Form/Field/AuthorField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/AuthorField.php
rename to libraries/src/Form/Field/AuthorField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/CaptchaField.php b/libraries/src/Form/Field/CaptchaField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/CaptchaField.php
rename to libraries/src/Form/Field/CaptchaField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php b/libraries/src/Form/Field/ChromeStyleField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/ChromeStyleField.php
rename to libraries/src/Form/Field/ChromeStyleField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/ContenthistoryField.php b/libraries/src/Form/Field/ContenthistoryField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/ContenthistoryField.php
rename to libraries/src/Form/Field/ContenthistoryField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/ContentlanguageField.php b/libraries/src/Form/Field/ContentlanguageField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/ContentlanguageField.php
rename to libraries/src/Form/Field/ContentlanguageField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/ContenttypeField.php b/libraries/src/Form/Field/ContenttypeField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/ContenttypeField.php
rename to libraries/src/Form/Field/ContenttypeField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/EditorField.php b/libraries/src/Form/Field/EditorField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/EditorField.php
rename to libraries/src/Form/Field/EditorField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/FrontendLanguageField.php b/libraries/src/Form/Field/FrontendLanguageField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/FrontendLanguageField.php
rename to libraries/src/Form/Field/FrontendLanguageField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/HeadertagField.php b/libraries/src/Form/Field/HeadertagField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/HeadertagField.php
rename to libraries/src/Form/Field/HeadertagField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/HelpsiteField.php b/libraries/src/Form/Field/HelpsiteField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/HelpsiteField.php
rename to libraries/src/Form/Field/HelpsiteField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/LastvisitDateRangeField.php b/libraries/src/Form/Field/LastvisitDateRangeField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/LastvisitDateRangeField.php
rename to libraries/src/Form/Field/LastvisitDateRangeField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/LimitboxField.php b/libraries/src/Form/Field/LimitboxField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/LimitboxField.php
rename to libraries/src/Form/Field/LimitboxField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/MediaField.php b/libraries/src/Form/Field/MediaField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/MediaField.php
rename to libraries/src/Form/Field/MediaField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/MenuField.php b/libraries/src/Form/Field/MenuField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/MenuField.php
rename to libraries/src/Form/Field/MenuField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/MenuitemField.php b/libraries/src/Form/Field/MenuitemField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/MenuitemField.php
rename to libraries/src/Form/Field/MenuitemField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/ModuleOrderField.php b/libraries/src/Form/Field/ModuleOrderField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/ModuleOrderField.php
rename to libraries/src/Form/Field/ModuleOrderField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/ModulePositionField.php b/libraries/src/Form/Field/ModulePositionField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/ModulePositionField.php
rename to libraries/src/Form/Field/ModulePositionField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/ModuletagField.php b/libraries/src/Form/Field/ModuletagField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/ModuletagField.php
rename to libraries/src/Form/Field/ModuletagField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/OrderingField.php b/libraries/src/Form/Field/OrderingField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/OrderingField.php
rename to libraries/src/Form/Field/OrderingField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/PluginStatusField.php b/libraries/src/Form/Field/PluginStatusField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/PluginStatusField.php
rename to libraries/src/Form/Field/PluginStatusField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/RegistrationDateRangeField.php b/libraries/src/Form/Field/RegistrationDateRangeField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/RegistrationDateRangeField.php
rename to libraries/src/Form/Field/RegistrationDateRangeField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/StatusField.php b/libraries/src/Form/Field/StatusField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/StatusField.php
rename to libraries/src/Form/Field/StatusField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/TagField.php
rename to libraries/src/Form/Field/TagField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/TemplatestyleField.php b/libraries/src/Form/Field/TemplatestyleField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/TemplatestyleField.php
rename to libraries/src/Form/Field/TemplatestyleField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/UserActiveField.php b/libraries/src/Form/Field/UserActiveField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/UserActiveField.php
rename to libraries/src/Form/Field/UserActiveField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/UserField.php b/libraries/src/Form/Field/UserField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/UserField.php
rename to libraries/src/Form/Field/UserField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/UserGroupListField.php b/libraries/src/Form/Field/UserGroupListField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/UserGroupListField.php
rename to libraries/src/Form/Field/UserGroupListField.php
diff --git a/libraries/src/Joomla/CMS/Form/Field/UserStateField.php b/libraries/src/Form/Field/UserStateField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Field/UserStateField.php
rename to libraries/src/Form/Field/UserStateField.php
diff --git a/libraries/src/Joomla/CMS/Form/Form.php b/libraries/src/Form/Form.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Form.php
rename to libraries/src/Form/Form.php
diff --git a/libraries/src/Joomla/CMS/Form/FormField.php b/libraries/src/Form/FormField.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/FormField.php
rename to libraries/src/Form/FormField.php
diff --git a/libraries/src/Joomla/CMS/Form/FormHelper.php b/libraries/src/Form/FormHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/FormHelper.php
rename to libraries/src/Form/FormHelper.php
diff --git a/libraries/src/Joomla/CMS/Form/FormRule.php b/libraries/src/Form/FormRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/FormRule.php
rename to libraries/src/Form/FormRule.php
diff --git a/libraries/src/Joomla/CMS/Form/FormWrapper.php b/libraries/src/Form/FormWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/FormWrapper.php
rename to libraries/src/Form/FormWrapper.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/BooleanRule.php b/libraries/src/Form/Rule/BooleanRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/BooleanRule.php
rename to libraries/src/Form/Rule/BooleanRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/CalendarRule.php b/libraries/src/Form/Rule/CalendarRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/CalendarRule.php
rename to libraries/src/Form/Rule/CalendarRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/CaptchaRule.php b/libraries/src/Form/Rule/CaptchaRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/CaptchaRule.php
rename to libraries/src/Form/Rule/CaptchaRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/ColorRule.php b/libraries/src/Form/Rule/ColorRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/ColorRule.php
rename to libraries/src/Form/Rule/ColorRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/EmailRule.php
rename to libraries/src/Form/Rule/EmailRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/EqualsRule.php b/libraries/src/Form/Rule/EqualsRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/EqualsRule.php
rename to libraries/src/Form/Rule/EqualsRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/NotequalsRule.php b/libraries/src/Form/Rule/NotequalsRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/NotequalsRule.php
rename to libraries/src/Form/Rule/NotequalsRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/NumberRule.php b/libraries/src/Form/Rule/NumberRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/NumberRule.php
rename to libraries/src/Form/Rule/NumberRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/OptionsRule.php b/libraries/src/Form/Rule/OptionsRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/OptionsRule.php
rename to libraries/src/Form/Rule/OptionsRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/PasswordRule.php b/libraries/src/Form/Rule/PasswordRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/PasswordRule.php
rename to libraries/src/Form/Rule/PasswordRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/RulesRule.php b/libraries/src/Form/Rule/RulesRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/RulesRule.php
rename to libraries/src/Form/Rule/RulesRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/TelRule.php b/libraries/src/Form/Rule/TelRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/TelRule.php
rename to libraries/src/Form/Rule/TelRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/UrlRule.php b/libraries/src/Form/Rule/UrlRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/UrlRule.php
rename to libraries/src/Form/Rule/UrlRule.php
diff --git a/libraries/src/Joomla/CMS/Form/Rule/UsernameRule.php b/libraries/src/Form/Rule/UsernameRule.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Form/Rule/UsernameRule.php
rename to libraries/src/Form/Rule/UsernameRule.php
diff --git a/libraries/src/Joomla/CMS/Help/Help.php b/libraries/src/Help/Help.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Help/Help.php
rename to libraries/src/Help/Help.php
diff --git a/libraries/src/Joomla/CMS/Helper/AuthenticationHelper.php b/libraries/src/Helper/AuthenticationHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/AuthenticationHelper.php
rename to libraries/src/Helper/AuthenticationHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/CMSHelper.php b/libraries/src/Helper/CMSHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/CMSHelper.php
rename to libraries/src/Helper/CMSHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/ContentHelper.php b/libraries/src/Helper/ContentHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/ContentHelper.php
rename to libraries/src/Helper/ContentHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/ContentHistoryHelper.php b/libraries/src/Helper/ContentHistoryHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/ContentHistoryHelper.php
rename to libraries/src/Helper/ContentHistoryHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/LibraryHelper.php b/libraries/src/Helper/LibraryHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/LibraryHelper.php
rename to libraries/src/Helper/LibraryHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/MediaHelper.php
rename to libraries/src/Helper/MediaHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/ModuleHelper.php
rename to libraries/src/Helper/ModuleHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/RouteHelper.php
rename to libraries/src/Helper/RouteHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/SearchHelper.php b/libraries/src/Helper/SearchHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/SearchHelper.php
rename to libraries/src/Helper/SearchHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/TagsHelper.php
rename to libraries/src/Helper/TagsHelper.php
diff --git a/libraries/src/Joomla/CMS/Helper/UserGroupsHelper.php b/libraries/src/Helper/UserGroupsHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Helper/UserGroupsHelper.php
rename to libraries/src/Helper/UserGroupsHelper.php
diff --git a/libraries/src/Joomla/CMS/Http/Http.php b/libraries/src/Http/Http.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/Http.php
rename to libraries/src/Http/Http.php
diff --git a/libraries/src/Joomla/CMS/Http/HttpFactory.php b/libraries/src/Http/HttpFactory.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/HttpFactory.php
rename to libraries/src/Http/HttpFactory.php
diff --git a/libraries/src/Joomla/CMS/Http/Response.php b/libraries/src/Http/Response.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/Response.php
rename to libraries/src/Http/Response.php
diff --git a/libraries/src/Joomla/CMS/Http/Transport/CurlTransport.php b/libraries/src/Http/Transport/CurlTransport.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/Transport/CurlTransport.php
rename to libraries/src/Http/Transport/CurlTransport.php
diff --git a/libraries/src/Joomla/CMS/Http/Transport/SocketTransport.php b/libraries/src/Http/Transport/SocketTransport.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/Transport/SocketTransport.php
rename to libraries/src/Http/Transport/SocketTransport.php
diff --git a/libraries/src/Joomla/CMS/Http/Transport/StreamTransport.php b/libraries/src/Http/Transport/StreamTransport.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/Transport/StreamTransport.php
rename to libraries/src/Http/Transport/StreamTransport.php
diff --git a/libraries/src/Joomla/CMS/Http/Transport/cacert.pem b/libraries/src/Http/Transport/cacert.pem
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/Transport/cacert.pem
rename to libraries/src/Http/Transport/cacert.pem
diff --git a/libraries/src/Joomla/CMS/Http/TransportInterface.php b/libraries/src/Http/TransportInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/TransportInterface.php
rename to libraries/src/Http/TransportInterface.php
diff --git a/libraries/src/Joomla/CMS/Http/Wrapper/FactoryWrapper.php b/libraries/src/Http/Wrapper/FactoryWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Http/Wrapper/FactoryWrapper.php
rename to libraries/src/Http/Wrapper/FactoryWrapper.php
diff --git a/libraries/src/Joomla/CMS/Input/Cli.php b/libraries/src/Input/Cli.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Input/Cli.php
rename to libraries/src/Input/Cli.php
diff --git a/libraries/src/Joomla/CMS/Input/Cookie.php b/libraries/src/Input/Cookie.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Input/Cookie.php
rename to libraries/src/Input/Cookie.php
diff --git a/libraries/src/Joomla/CMS/Input/Files.php b/libraries/src/Input/Files.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Input/Files.php
rename to libraries/src/Input/Files.php
diff --git a/libraries/src/Joomla/CMS/Input/Input.php b/libraries/src/Input/Input.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Input/Input.php
rename to libraries/src/Input/Input.php
diff --git a/libraries/src/Joomla/CMS/Input/Json.php b/libraries/src/Input/Json.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Input/Json.php
rename to libraries/src/Input/Json.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/ComponentAdapter.php b/libraries/src/Installer/Adapter/ComponentAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/ComponentAdapter.php
rename to libraries/src/Installer/Adapter/ComponentAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/FileAdapter.php b/libraries/src/Installer/Adapter/FileAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/FileAdapter.php
rename to libraries/src/Installer/Adapter/FileAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/LanguageAdapter.php
rename to libraries/src/Installer/Adapter/LanguageAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/LibraryAdapter.php
rename to libraries/src/Installer/Adapter/LibraryAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/ModuleAdapter.php b/libraries/src/Installer/Adapter/ModuleAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/ModuleAdapter.php
rename to libraries/src/Installer/Adapter/ModuleAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/PackageAdapter.php
rename to libraries/src/Installer/Adapter/PackageAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/PluginAdapter.php b/libraries/src/Installer/Adapter/PluginAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/PluginAdapter.php
rename to libraries/src/Installer/Adapter/PluginAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Adapter/TemplateAdapter.php
rename to libraries/src/Installer/Adapter/TemplateAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/Installer.php b/libraries/src/Installer/Installer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Installer.php
rename to libraries/src/Installer/Installer.php
diff --git a/libraries/src/Joomla/CMS/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/InstallerAdapter.php
rename to libraries/src/Installer/InstallerAdapter.php
diff --git a/libraries/src/Joomla/CMS/Installer/InstallerExtension.php b/libraries/src/Installer/InstallerExtension.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/InstallerExtension.php
rename to libraries/src/Installer/InstallerExtension.php
diff --git a/libraries/src/Joomla/CMS/Installer/InstallerHelper.php b/libraries/src/Installer/InstallerHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/InstallerHelper.php
rename to libraries/src/Installer/InstallerHelper.php
diff --git a/libraries/src/Joomla/CMS/Installer/InstallerScript.php b/libraries/src/Installer/InstallerScript.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/InstallerScript.php
rename to libraries/src/Installer/InstallerScript.php
diff --git a/libraries/src/Joomla/CMS/Installer/Manifest.php b/libraries/src/Installer/Manifest.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Manifest.php
rename to libraries/src/Installer/Manifest.php
diff --git a/libraries/src/Joomla/CMS/Installer/Manifest/LibraryManifest.php b/libraries/src/Installer/Manifest/LibraryManifest.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Manifest/LibraryManifest.php
rename to libraries/src/Installer/Manifest/LibraryManifest.php
diff --git a/libraries/src/Joomla/CMS/Installer/Manifest/PackageManifest.php b/libraries/src/Installer/Manifest/PackageManifest.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Installer/Manifest/PackageManifest.php
rename to libraries/src/Installer/Manifest/PackageManifest.php
diff --git a/libraries/src/Joomla/CMS/Language/Associations.php b/libraries/src/Language/Associations.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Associations.php
rename to libraries/src/Language/Associations.php
diff --git a/libraries/src/Joomla/CMS/Language/Language.php b/libraries/src/Language/Language.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Language.php
rename to libraries/src/Language/Language.php
diff --git a/libraries/src/Joomla/CMS/Language/LanguageHelper.php b/libraries/src/Language/LanguageHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/LanguageHelper.php
rename to libraries/src/Language/LanguageHelper.php
diff --git a/libraries/src/Joomla/CMS/Language/LanguageStemmer.php b/libraries/src/Language/LanguageStemmer.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/LanguageStemmer.php
rename to libraries/src/Language/LanguageStemmer.php
diff --git a/libraries/src/Joomla/CMS/Language/Multilanguage.php b/libraries/src/Language/Multilanguage.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Multilanguage.php
rename to libraries/src/Language/Multilanguage.php
diff --git a/libraries/src/Joomla/CMS/Language/Stemmer/Porteren.php b/libraries/src/Language/Stemmer/Porteren.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Stemmer/Porteren.php
rename to libraries/src/Language/Stemmer/Porteren.php
diff --git a/libraries/src/Joomla/CMS/Language/Transliterate.php b/libraries/src/Language/Transliterate.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Transliterate.php
rename to libraries/src/Language/Transliterate.php
diff --git a/libraries/src/Joomla/CMS/Language/Wrapper/JTextWrapper.php b/libraries/src/Language/Wrapper/JTextWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Wrapper/JTextWrapper.php
rename to libraries/src/Language/Wrapper/JTextWrapper.php
diff --git a/libraries/src/Joomla/CMS/Language/Wrapper/LanguageHelperWrapper.php b/libraries/src/Language/Wrapper/LanguageHelperWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Wrapper/LanguageHelperWrapper.php
rename to libraries/src/Language/Wrapper/LanguageHelperWrapper.php
diff --git a/libraries/src/Joomla/CMS/Language/Wrapper/TransliterateWrapper.php b/libraries/src/Language/Wrapper/TransliterateWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Language/Wrapper/TransliterateWrapper.php
rename to libraries/src/Language/Wrapper/TransliterateWrapper.php
diff --git a/libraries/src/Joomla/CMS/Layout/BaseLayout.php b/libraries/src/Layout/BaseLayout.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Layout/BaseLayout.php
rename to libraries/src/Layout/BaseLayout.php
diff --git a/libraries/src/Joomla/CMS/Layout/FileLayout.php b/libraries/src/Layout/FileLayout.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Layout/FileLayout.php
rename to libraries/src/Layout/FileLayout.php
diff --git a/libraries/src/Joomla/CMS/Layout/LayoutHelper.php b/libraries/src/Layout/LayoutHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Layout/LayoutHelper.php
rename to libraries/src/Layout/LayoutHelper.php
diff --git a/libraries/src/Joomla/CMS/Layout/LayoutInterface.php b/libraries/src/Layout/LayoutInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Layout/LayoutInterface.php
rename to libraries/src/Layout/LayoutInterface.php
diff --git a/libraries/src/Joomla/CMS/Log/DelegatingPsrLogger.php b/libraries/src/Log/DelegatingPsrLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/DelegatingPsrLogger.php
rename to libraries/src/Log/DelegatingPsrLogger.php
diff --git a/libraries/src/Joomla/CMS/Log/Log.php b/libraries/src/Log/Log.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Log.php
rename to libraries/src/Log/Log.php
diff --git a/libraries/src/Joomla/CMS/Log/LogEntry.php b/libraries/src/Log/LogEntry.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/LogEntry.php
rename to libraries/src/Log/LogEntry.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger.php b/libraries/src/Log/Logger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger.php
rename to libraries/src/Log/Logger.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger/CallbackLogger.php b/libraries/src/Log/Logger/CallbackLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger/CallbackLogger.php
rename to libraries/src/Log/Logger/CallbackLogger.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger/DatabaseLogger.php b/libraries/src/Log/Logger/DatabaseLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger/DatabaseLogger.php
rename to libraries/src/Log/Logger/DatabaseLogger.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger/EchoLogger.php b/libraries/src/Log/Logger/EchoLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger/EchoLogger.php
rename to libraries/src/Log/Logger/EchoLogger.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger/FormattedtextLogger.php b/libraries/src/Log/Logger/FormattedtextLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger/FormattedtextLogger.php
rename to libraries/src/Log/Logger/FormattedtextLogger.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger/MessagequeueLogger.php b/libraries/src/Log/Logger/MessagequeueLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger/MessagequeueLogger.php
rename to libraries/src/Log/Logger/MessagequeueLogger.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger/SyslogLogger.php b/libraries/src/Log/Logger/SyslogLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger/SyslogLogger.php
rename to libraries/src/Log/Logger/SyslogLogger.php
diff --git a/libraries/src/Joomla/CMS/Log/Logger/W3cLogger.php b/libraries/src/Log/Logger/W3cLogger.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Log/Logger/W3cLogger.php
rename to libraries/src/Log/Logger/W3cLogger.php
diff --git a/libraries/src/Joomla/CMS/Mail/Mail.php b/libraries/src/Mail/Mail.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Mail/Mail.php
rename to libraries/src/Mail/Mail.php
diff --git a/libraries/src/Joomla/CMS/Mail/MailHelper.php b/libraries/src/Mail/MailHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Mail/MailHelper.php
rename to libraries/src/Mail/MailHelper.php
diff --git a/libraries/src/Joomla/CMS/Mail/MailWrapper.php b/libraries/src/Mail/MailWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Mail/MailWrapper.php
rename to libraries/src/Mail/MailWrapper.php
diff --git a/libraries/src/Joomla/CMS/Mail/language/phpmailer.lang-joomla.php b/libraries/src/Mail/language/phpmailer.lang-joomla.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Mail/language/phpmailer.lang-joomla.php
rename to libraries/src/Mail/language/phpmailer.lang-joomla.php
diff --git a/libraries/src/Joomla/CMS/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/AbstractMenu.php
rename to libraries/src/Menu/AbstractMenu.php
diff --git a/libraries/src/Joomla/CMS/Menu/AdministratorMenu.php b/libraries/src/Menu/AdministratorMenu.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/AdministratorMenu.php
rename to libraries/src/Menu/AdministratorMenu.php
diff --git a/libraries/src/Joomla/CMS/Menu/MenuHelper.php b/libraries/src/Menu/MenuHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/MenuHelper.php
rename to libraries/src/Menu/MenuHelper.php
diff --git a/libraries/src/Joomla/CMS/Menu/MenuItem.php b/libraries/src/Menu/MenuItem.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/MenuItem.php
rename to libraries/src/Menu/MenuItem.php
diff --git a/libraries/src/Joomla/CMS/Menu/Node.php b/libraries/src/Menu/Node.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/Node.php
rename to libraries/src/Menu/Node.php
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Component.php b/libraries/src/Menu/Node/Component.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/Node/Component.php
rename to libraries/src/Menu/Node/Component.php
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Container.php b/libraries/src/Menu/Node/Container.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/Node/Container.php
rename to libraries/src/Menu/Node/Container.php
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Heading.php b/libraries/src/Menu/Node/Heading.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/Node/Heading.php
rename to libraries/src/Menu/Node/Heading.php
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Separator.php b/libraries/src/Menu/Node/Separator.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/Node/Separator.php
rename to libraries/src/Menu/Node/Separator.php
diff --git a/libraries/src/Joomla/CMS/Menu/Node/Url.php b/libraries/src/Menu/Node/Url.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/Node/Url.php
rename to libraries/src/Menu/Node/Url.php
diff --git a/libraries/src/Joomla/CMS/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/SiteMenu.php
rename to libraries/src/Menu/SiteMenu.php
diff --git a/libraries/src/Joomla/CMS/Menu/Tree.php b/libraries/src/Menu/Tree.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Menu/Tree.php
rename to libraries/src/Menu/Tree.php
diff --git a/libraries/src/Joomla/CMS/Microdata/Microdata.php b/libraries/src/Microdata/Microdata.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Microdata/Microdata.php
rename to libraries/src/Microdata/Microdata.php
diff --git a/libraries/src/Joomla/CMS/Microdata/types.json b/libraries/src/Microdata/types.json
similarity index 100%
rename from libraries/src/Joomla/CMS/Microdata/types.json
rename to libraries/src/Microdata/types.json
diff --git a/libraries/src/Joomla/CMS/Model/Admin.php b/libraries/src/Model/Admin.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Model/Admin.php
rename to libraries/src/Model/Admin.php
diff --git a/libraries/src/Joomla/CMS/Model/Form.php b/libraries/src/Model/Form.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Model/Form.php
rename to libraries/src/Model/Form.php
diff --git a/libraries/src/Joomla/CMS/Model/Item.php b/libraries/src/Model/Item.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Model/Item.php
rename to libraries/src/Model/Item.php
diff --git a/libraries/src/Joomla/CMS/Model/ListModel.php b/libraries/src/Model/ListModel.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Model/ListModel.php
rename to libraries/src/Model/ListModel.php
diff --git a/libraries/src/Joomla/CMS/Model/Model.php b/libraries/src/Model/Model.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Model/Model.php
rename to libraries/src/Model/Model.php
diff --git a/libraries/src/Joomla/CMS/Pagination/Pagination.php b/libraries/src/Pagination/Pagination.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Pagination/Pagination.php
rename to libraries/src/Pagination/Pagination.php
diff --git a/libraries/src/Joomla/CMS/Pagination/PaginationObject.php b/libraries/src/Pagination/PaginationObject.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Pagination/PaginationObject.php
rename to libraries/src/Pagination/PaginationObject.php
diff --git a/libraries/src/Joomla/CMS/Pathway/Pathway.php b/libraries/src/Pathway/Pathway.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Pathway/Pathway.php
rename to libraries/src/Pathway/Pathway.php
diff --git a/libraries/src/Joomla/CMS/Pathway/SitePathway.php b/libraries/src/Pathway/SitePathway.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Pathway/SitePathway.php
rename to libraries/src/Pathway/SitePathway.php
diff --git a/libraries/src/Joomla/CMS/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Plugin/CMSPlugin.php
rename to libraries/src/Plugin/CMSPlugin.php
diff --git a/libraries/src/Joomla/CMS/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Plugin/PluginHelper.php
rename to libraries/src/Plugin/PluginHelper.php
diff --git a/libraries/src/Joomla/CMS/Profiler/Profiler.php b/libraries/src/Profiler/Profiler.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Profiler/Profiler.php
rename to libraries/src/Profiler/Profiler.php
diff --git a/libraries/src/Joomla/CMS/Response/JsonResponse.php b/libraries/src/Response/JsonResponse.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Response/JsonResponse.php
rename to libraries/src/Response/JsonResponse.php
diff --git a/libraries/src/Joomla/CMS/Router/AdministratorRouter.php b/libraries/src/Router/AdministratorRouter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Router/AdministratorRouter.php
rename to libraries/src/Router/AdministratorRouter.php
diff --git a/libraries/src/Joomla/CMS/Router/Router.php b/libraries/src/Router/Router.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Router/Router.php
rename to libraries/src/Router/Router.php
diff --git a/libraries/src/Joomla/CMS/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Router/SiteRouter.php
rename to libraries/src/Router/SiteRouter.php
diff --git a/libraries/src/Joomla/CMS/Schema/ChangeItem.php b/libraries/src/Schema/ChangeItem.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Schema/ChangeItem.php
rename to libraries/src/Schema/ChangeItem.php
diff --git a/libraries/src/Joomla/CMS/Schema/ChangeItem/MysqlChangeItem.php b/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Schema/ChangeItem/MysqlChangeItem.php
rename to libraries/src/Schema/ChangeItem/MysqlChangeItem.php
diff --git a/libraries/src/Joomla/CMS/Schema/ChangeItem/PostgresqlChangeItem.php b/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Schema/ChangeItem/PostgresqlChangeItem.php
rename to libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
diff --git a/libraries/src/Joomla/CMS/Schema/ChangeItem/SqlsrvChangeItem.php b/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Schema/ChangeItem/SqlsrvChangeItem.php
rename to libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
diff --git a/libraries/src/Joomla/CMS/Schema/ChangeSet.php b/libraries/src/Schema/ChangeSet.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Schema/ChangeSet.php
rename to libraries/src/Schema/ChangeSet.php
diff --git a/libraries/src/Joomla/CMS/Session/Exception/UnsupportedStorageException.php b/libraries/src/Session/Exception/UnsupportedStorageException.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Session/Exception/UnsupportedStorageException.php
rename to libraries/src/Session/Exception/UnsupportedStorageException.php
diff --git a/libraries/src/Joomla/CMS/Session/Session.php b/libraries/src/Session/Session.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Session/Session.php
rename to libraries/src/Session/Session.php
diff --git a/libraries/src/Joomla/CMS/String/PunycodeHelper.php b/libraries/src/String/PunycodeHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/String/PunycodeHelper.php
rename to libraries/src/String/PunycodeHelper.php
diff --git a/libraries/src/Joomla/CMS/Table/Asset.php b/libraries/src/Table/Asset.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Asset.php
rename to libraries/src/Table/Asset.php
diff --git a/libraries/src/Joomla/CMS/Table/Category.php b/libraries/src/Table/Category.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Category.php
rename to libraries/src/Table/Category.php
diff --git a/libraries/src/Joomla/CMS/Table/Content.php b/libraries/src/Table/Content.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Content.php
rename to libraries/src/Table/Content.php
diff --git a/libraries/src/Joomla/CMS/Table/ContentHistory.php b/libraries/src/Table/ContentHistory.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/ContentHistory.php
rename to libraries/src/Table/ContentHistory.php
diff --git a/libraries/src/Joomla/CMS/Table/ContentType.php b/libraries/src/Table/ContentType.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/ContentType.php
rename to libraries/src/Table/ContentType.php
diff --git a/libraries/src/Joomla/CMS/Table/CoreContent.php b/libraries/src/Table/CoreContent.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/CoreContent.php
rename to libraries/src/Table/CoreContent.php
diff --git a/libraries/src/Joomla/CMS/Table/Extension.php b/libraries/src/Table/Extension.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Extension.php
rename to libraries/src/Table/Extension.php
diff --git a/libraries/src/Joomla/CMS/Table/Language.php b/libraries/src/Table/Language.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Language.php
rename to libraries/src/Table/Language.php
diff --git a/libraries/src/Joomla/CMS/Table/Menu.php b/libraries/src/Table/Menu.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Menu.php
rename to libraries/src/Table/Menu.php
diff --git a/libraries/src/Joomla/CMS/Table/MenuType.php b/libraries/src/Table/MenuType.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/MenuType.php
rename to libraries/src/Table/MenuType.php
diff --git a/libraries/src/Joomla/CMS/Table/Module.php b/libraries/src/Table/Module.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Module.php
rename to libraries/src/Table/Module.php
diff --git a/libraries/src/Joomla/CMS/Table/Nested.php b/libraries/src/Table/Nested.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Nested.php
rename to libraries/src/Table/Nested.php
diff --git a/libraries/src/Joomla/CMS/Table/Observer/AbstractObserver.php b/libraries/src/Table/Observer/AbstractObserver.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Observer/AbstractObserver.php
rename to libraries/src/Table/Observer/AbstractObserver.php
diff --git a/libraries/src/Joomla/CMS/Table/Observer/ContentHistory.php b/libraries/src/Table/Observer/ContentHistory.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Observer/ContentHistory.php
rename to libraries/src/Table/Observer/ContentHistory.php
diff --git a/libraries/src/Joomla/CMS/Table/Observer/Tags.php b/libraries/src/Table/Observer/Tags.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Observer/Tags.php
rename to libraries/src/Table/Observer/Tags.php
diff --git a/libraries/src/Joomla/CMS/Table/Table.php b/libraries/src/Table/Table.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Table.php
rename to libraries/src/Table/Table.php
diff --git a/libraries/src/Joomla/CMS/Table/TableInterface.php b/libraries/src/Table/TableInterface.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/TableInterface.php
rename to libraries/src/Table/TableInterface.php
diff --git a/libraries/src/Joomla/CMS/Table/Ucm.php b/libraries/src/Table/Ucm.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Ucm.php
rename to libraries/src/Table/Ucm.php
diff --git a/libraries/src/Joomla/CMS/Table/Update.php b/libraries/src/Table/Update.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Update.php
rename to libraries/src/Table/Update.php
diff --git a/libraries/src/Joomla/CMS/Table/UpdateSite.php b/libraries/src/Table/UpdateSite.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/UpdateSite.php
rename to libraries/src/Table/UpdateSite.php
diff --git a/libraries/src/Joomla/CMS/Table/User.php b/libraries/src/Table/User.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/User.php
rename to libraries/src/Table/User.php
diff --git a/libraries/src/Joomla/CMS/Table/Usergroup.php b/libraries/src/Table/Usergroup.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/Usergroup.php
rename to libraries/src/Table/Usergroup.php
diff --git a/libraries/src/Joomla/CMS/Table/ViewLevel.php b/libraries/src/Table/ViewLevel.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Table/ViewLevel.php
rename to libraries/src/Table/ViewLevel.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/ConfirmButton.php b/libraries/src/Toolbar/Button/ConfirmButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/ConfirmButton.php
rename to libraries/src/Toolbar/Button/ConfirmButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/CustomButton.php b/libraries/src/Toolbar/Button/CustomButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/CustomButton.php
rename to libraries/src/Toolbar/Button/CustomButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/HelpButton.php b/libraries/src/Toolbar/Button/HelpButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/HelpButton.php
rename to libraries/src/Toolbar/Button/HelpButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/LinkButton.php b/libraries/src/Toolbar/Button/LinkButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/LinkButton.php
rename to libraries/src/Toolbar/Button/LinkButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/PopupButton.php b/libraries/src/Toolbar/Button/PopupButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/PopupButton.php
rename to libraries/src/Toolbar/Button/PopupButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/SeparatorButton.php b/libraries/src/Toolbar/Button/SeparatorButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/SeparatorButton.php
rename to libraries/src/Toolbar/Button/SeparatorButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/SliderButton.php b/libraries/src/Toolbar/Button/SliderButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/SliderButton.php
rename to libraries/src/Toolbar/Button/SliderButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Button/StandardButton.php b/libraries/src/Toolbar/Button/StandardButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Button/StandardButton.php
rename to libraries/src/Toolbar/Button/StandardButton.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/Toolbar.php b/libraries/src/Toolbar/Toolbar.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/Toolbar.php
rename to libraries/src/Toolbar/Toolbar.php
diff --git a/libraries/src/Joomla/CMS/Toolbar/ToolbarButton.php b/libraries/src/Toolbar/ToolbarButton.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Toolbar/ToolbarButton.php
rename to libraries/src/Toolbar/ToolbarButton.php
diff --git a/libraries/src/Joomla/CMS/UCM/UCM.php b/libraries/src/UCM/UCM.php
similarity index 100%
rename from libraries/src/Joomla/CMS/UCM/UCM.php
rename to libraries/src/UCM/UCM.php
diff --git a/libraries/src/Joomla/CMS/UCM/UCMBase.php b/libraries/src/UCM/UCMBase.php
similarity index 100%
rename from libraries/src/Joomla/CMS/UCM/UCMBase.php
rename to libraries/src/UCM/UCMBase.php
diff --git a/libraries/src/Joomla/CMS/UCM/UCMContent.php b/libraries/src/UCM/UCMContent.php
similarity index 100%
rename from libraries/src/Joomla/CMS/UCM/UCMContent.php
rename to libraries/src/UCM/UCMContent.php
diff --git a/libraries/src/Joomla/CMS/UCM/UCMType.php b/libraries/src/UCM/UCMType.php
similarity index 100%
rename from libraries/src/Joomla/CMS/UCM/UCMType.php
rename to libraries/src/UCM/UCMType.php
diff --git a/libraries/src/Joomla/CMS/Updater/Adapter/CollectionAdapter.php b/libraries/src/Updater/Adapter/CollectionAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Updater/Adapter/CollectionAdapter.php
rename to libraries/src/Updater/Adapter/CollectionAdapter.php
diff --git a/libraries/src/Joomla/CMS/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Updater/Adapter/ExtensionAdapter.php
rename to libraries/src/Updater/Adapter/ExtensionAdapter.php
diff --git a/libraries/src/Joomla/CMS/Updater/Update.php b/libraries/src/Updater/Update.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Updater/Update.php
rename to libraries/src/Updater/Update.php
diff --git a/libraries/src/Joomla/CMS/Updater/UpdateAdapter.php b/libraries/src/Updater/UpdateAdapter.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Updater/UpdateAdapter.php
rename to libraries/src/Updater/UpdateAdapter.php
diff --git a/libraries/src/Joomla/CMS/Updater/Updater.php b/libraries/src/Updater/Updater.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Updater/Updater.php
rename to libraries/src/Updater/Updater.php
diff --git a/libraries/src/Joomla/CMS/Uri/Uri.php b/libraries/src/Uri/Uri.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Uri/Uri.php
rename to libraries/src/Uri/Uri.php
diff --git a/libraries/src/Joomla/CMS/User/User.php b/libraries/src/User/User.php
similarity index 100%
rename from libraries/src/Joomla/CMS/User/User.php
rename to libraries/src/User/User.php
diff --git a/libraries/src/Joomla/CMS/User/UserHelper.php b/libraries/src/User/UserHelper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/User/UserHelper.php
rename to libraries/src/User/UserHelper.php
diff --git a/libraries/src/Joomla/CMS/User/UserWrapper.php b/libraries/src/User/UserWrapper.php
similarity index 100%
rename from libraries/src/Joomla/CMS/User/UserWrapper.php
rename to libraries/src/User/UserWrapper.php
diff --git a/libraries/src/Joomla/CMS/Utility/BufferStreamHandler.php b/libraries/src/Utility/BufferStreamHandler.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Utility/BufferStreamHandler.php
rename to libraries/src/Utility/BufferStreamHandler.php
diff --git a/libraries/src/Joomla/CMS/Utility/Utility.php b/libraries/src/Utility/Utility.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Utility/Utility.php
rename to libraries/src/Utility/Utility.php
diff --git a/libraries/src/Joomla/CMS/Version.php b/libraries/src/Version.php
similarity index 100%
rename from libraries/src/Joomla/CMS/Version.php
rename to libraries/src/Version.php
diff --git a/libraries/src/Joomla/CMS/View/Categories.php b/libraries/src/View/Categories.php
similarity index 100%
rename from libraries/src/Joomla/CMS/View/Categories.php
rename to libraries/src/View/Categories.php
diff --git a/libraries/src/Joomla/CMS/View/Category.php b/libraries/src/View/Category.php
similarity index 100%
rename from libraries/src/Joomla/CMS/View/Category.php
rename to libraries/src/View/Category.php
diff --git a/libraries/src/Joomla/CMS/View/CategoryFeed.php b/libraries/src/View/CategoryFeed.php
similarity index 100%
rename from libraries/src/Joomla/CMS/View/CategoryFeed.php
rename to libraries/src/View/CategoryFeed.php
diff --git a/libraries/src/Joomla/CMS/View/HtmlView.php b/libraries/src/View/HtmlView.php
similarity index 100%
rename from libraries/src/Joomla/CMS/View/HtmlView.php
rename to libraries/src/View/HtmlView.php
diff --git a/tests/unit/suites/libraries/joomla/table/JTableTest.php b/tests/unit/suites/libraries/joomla/table/JTableTest.php
index 6a24f75da6821..f0b7ac6153394 100644
--- a/tests/unit/suites/libraries/joomla/table/JTableTest.php
+++ b/tests/unit/suites/libraries/joomla/table/JTableTest.php
@@ -194,7 +194,7 @@ public function testAddIncludePath()
 		$expected = array(
 			'/dummy/',
 			'dir/not/exist',
-			realpath(JPATH_PLATFORM . '/src/Joomla/CMS/Table')
+			realpath(JPATH_PLATFORM . '/src/Table')
 		);
 
 		// Add dummy paths

From bfab55159351c1686ebed04a13d450a297072783 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Tue, 8 Aug 2017 05:27:41 -0500
Subject: [PATCH 141/148] Fix file paths

---
 build/build.php | 2 +-
 build/bump.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/build.php b/build/build.php
index 5067d859c6737..f8d20d5ed6070 100644
--- a/build/build.php
+++ b/build/build.php
@@ -40,7 +40,7 @@
 
 // Import the version class to set the version information
 define('JPATH_PLATFORM', 1);
-require_once dirname(__DIR__) . '/libraries/src/Joomla/CMS/Version.php';
+require_once dirname(__DIR__) . '/libraries/src/Version.php';
 
 // Set version information for the build
 $version     = Version::MAJOR_VERSION . '.' . Version::MINOR_VERSION;
diff --git a/build/bump.php b/build/bump.php
index c03322a83f7bf..bffefc632ac60 100644
--- a/build/bump.php
+++ b/build/bump.php
@@ -36,7 +36,7 @@ function usage($command)
 const PHP_TAB = "\t";
 
 // File paths.
-$versionFile      = '/libraries/src/Joomla/CMS/Version.php';
+$versionFile      = '/libraries/src/Version.php';
 
 $coreXmlFiles     = array(
 			'/administrator/manifests/files/joomla.xml',

From 464630adab89aedecf0e1272c52b5351cc15fe89 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Tue, 8 Aug 2017 05:58:33 -0500
Subject: [PATCH 142/148] Fix covers tags

---
 .../joomla/crypt/cipher/JCryptCipherSodiumTest.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
index 1fb9f00a4b683..b7bd6f4302603 100644
--- a/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
+++ b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherSodiumTest.php
@@ -40,8 +40,8 @@ public function dataStrings()
 	 *
 	 * @param   string  $data  The decrypted data to validate
 	 *
-	 * @covers        SodiumCipher::decrypt
-	 * @covers        SodiumCipher::encrypt
+	 * @covers        Joomla\CMS\Crypt\Cipher\SodiumCipher::decrypt
+	 * @covers        Joomla\CMS\Crypt\Cipher\SodiumCipher::encrypt
 	 * @dataProvider  dataStrings
 	 */
 	public function testDataEncryptionAndDecryption($data)
@@ -65,7 +65,7 @@ public function testDataEncryptionAndDecryption($data)
 	/**
 	 * @testdox  Validates keys are correctly generated
 	 *
-	 * @covers   SodiumCipher::generateKey
+	 * @covers   Joomla\CMS\Crypt\Cipher\SodiumCipher::generateKey
 	 */
 	public function testGenerateKey()
 	{

From 8ce1043a2f1e398a797db6ab45398f6ed08b73c6 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@joomla.org>
Date: Tue, 8 Aug 2017 06:55:53 -0500
Subject: [PATCH 143/148] Prepare 3.8 Beta release

---
 .../com_finder/helpers/indexer/indexer.php    |  6 +--
 .../com_finder/views/filter/view.html.php     |  2 +-
 .../components/com_menus/controllers/menu.php |  2 +-
 .../components/com_menus/helpers/menus.php    |  6 +--
 .../models/fields/menuitembytype.php          | 22 +++++-----
 .../com_menus/models/fields/menupreset.php    |  6 +--
 .../com_menus/views/menu/view.xml.php         | 10 ++---
 administrator/language/en-GB/en-GB.xml        |  2 +-
 administrator/language/en-GB/install.xml      |  2 +-
 administrator/manifests/files/joomla.xml      |  4 +-
 .../manifests/packages/pkg_en-GB.xml          |  2 +-
 administrator/modules/mod_menu/menu.php       | 12 +++---
 .../modules/mod_sampledata/helper.php         |  4 +-
 build/bump.php                                |  3 +-
 .../com_finder/views/search/view.html.php     |  6 +--
 installation/language/en-GB/en-GB.xml         |  2 +-
 language/en-GB/en-GB.xml                      |  2 +-
 language/en-GB/install.xml                    |  2 +-
 libraries/cms/html/form.php                   |  4 +-
 libraries/cms/html/jquery.php                 |  2 +-
 libraries/joomla/database/driver.php          |  2 +-
 libraries/joomla/form/fields/combo.php        |  4 +-
 libraries/joomla/session/storage/redis.php    |  8 ++--
 libraries/loader.php                          |  4 +-
 libraries/src/Application/WebApplication.php  |  4 +-
 libraries/src/Crypt/Cipher/SodiumCipher.php   | 12 +++---
 libraries/src/Form/FormHelper.php             | 10 ++---
 libraries/src/Helper/ModuleHelper.php         |  2 +-
 libraries/src/Log/DelegatingPsrLogger.php     | 10 ++---
 libraries/src/Log/Log.php                     |  2 +-
 libraries/src/Log/LogEntry.php                |  2 +-
 libraries/src/Menu/MenuHelper.php             | 20 +++++-----
 libraries/src/Menu/Node.php                   | 40 +++++++++----------
 libraries/src/Menu/Node/Component.php         | 16 ++++----
 libraries/src/Menu/Node/Container.php         |  2 +-
 libraries/src/Menu/Node/Heading.php           | 12 +++---
 libraries/src/Menu/Node/Separator.php         |  8 ++--
 libraries/src/Menu/Node/Url.php               | 14 +++----
 libraries/src/Menu/Tree.php                   | 26 ++++++------
 libraries/src/Toolbar/Toolbar.php             |  4 +-
 libraries/src/Version.php                     | 18 ++++-----
 media/mod_sampledata/js/sampledata-process.js |  2 +-
 plugins/sampledata/blog/blog.php              | 20 +++++-----
 plugins/sampledata/testing/testing.php        | 34 ++++++++--------
 plugins/system/cache/cache.php                |  2 +-
 plugins/system/debug/debug.php                |  2 +-
 .../libraries/cms/html/JHtmlFormTest.php      |  2 +-
 .../libraries/cms/html/JHtmlJqueryTest.php    |  2 +-
 .../suites/libraries/joomla/JLoaderTest.php   |  6 +--
 .../suites/libraries/joomla/log/JLogTest.php  |  2 +-
 50 files changed, 197 insertions(+), 196 deletions(-)

diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php
index bef3a51ac7835..ac7dfa794797d 100644
--- a/administrator/components/com_finder/helpers/indexer/indexer.php
+++ b/administrator/components/com_finder/helpers/indexer/indexer.php
@@ -94,7 +94,7 @@ abstract class FinderIndexer
 	 * Database driver cache.
 	 *
 	 * @var    JDatabaseDriver
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $db;
 
@@ -102,14 +102,14 @@ abstract class FinderIndexer
 	 * Reusable Query Template. To be used with clone.
 	 *
 	 * @var    JDatabaseQuery
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $addTokensToDbQueryTemplate;
 
 	/**
 	 * FinderIndexer constructor.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function __construct()
 	{
diff --git a/administrator/components/com_finder/views/filter/view.html.php b/administrator/components/com_finder/views/filter/view.html.php
index f725a2464e62a..d3281315896a5 100644
--- a/administrator/components/com_finder/views/filter/view.html.php
+++ b/administrator/components/com_finder/views/filter/view.html.php
@@ -57,7 +57,7 @@ class FinderViewFilter extends JViewLegacy
 	 *
 	 * @var  integer
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $total;
 
diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php
index 9115aae674324..bfa1c368d6215 100644
--- a/administrator/components/com_menus/controllers/menu.php
+++ b/administrator/components/com_menus/controllers/menu.php
@@ -185,7 +185,7 @@ public function save($key = null, $urlVar = null)
 	 *
 	 * @return  boolean  True if successful, false otherwise.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function exportXml()
 	{
diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
index f2be9931171af..1d0696315ccc9 100644
--- a/administrator/components/com_menus/helpers/menus.php
+++ b/administrator/components/com_menus/helpers/menus.php
@@ -337,7 +337,7 @@ public static function getAssociations($pk)
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function getMenuItems($menutype, $enabledOnly = false, $exclude = array())
 	{
@@ -412,7 +412,7 @@ public static function getMenuItems($menutype, $enabledOnly = false, $exclude =
 	 *
 	 * @throws  Exception
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function installPreset($preset, $menutype)
 	{
@@ -437,7 +437,7 @@ public static function installPreset($preset, $menutype)
 	 *
 	 * @throws  Exception
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected static function installPresetItems(&$items, $menutype, $parent = 1)
 	{
diff --git a/administrator/components/com_menus/models/fields/menuitembytype.php b/administrator/components/com_menus/models/fields/menuitembytype.php
index 059e0308b0f44..66fb7d2a195b0 100644
--- a/administrator/components/com_menus/models/fields/menuitembytype.php
+++ b/administrator/components/com_menus/models/fields/menuitembytype.php
@@ -17,7 +17,7 @@
 /**
  * Supports an HTML grouped select list of menu item grouped by menu
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class JFormFieldMenuitemByType extends JFormFieldGroupedList
 {
@@ -25,7 +25,7 @@ class JFormFieldMenuitemByType extends JFormFieldGroupedList
 	 * The form field type.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public $type = 'MenuItemByType';
 
@@ -33,7 +33,7 @@ class JFormFieldMenuitemByType extends JFormFieldGroupedList
 	 * The menu type.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $menuType;
 
@@ -41,7 +41,7 @@ class JFormFieldMenuitemByType extends JFormFieldGroupedList
 	 * The client id.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $clientId;
 
@@ -49,7 +49,7 @@ class JFormFieldMenuitemByType extends JFormFieldGroupedList
 	 * The language.
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $language;
 
@@ -57,7 +57,7 @@ class JFormFieldMenuitemByType extends JFormFieldGroupedList
 	 * The published status.
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $published;
 
@@ -65,7 +65,7 @@ class JFormFieldMenuitemByType extends JFormFieldGroupedList
 	 * The disabled status.
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $disable;
 
@@ -76,7 +76,7 @@ class JFormFieldMenuitemByType extends JFormFieldGroupedList
 	 *
 	 * @return  mixed  The property value or null.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __get($name)
 	{
@@ -101,7 +101,7 @@ public function __get($name)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __set($name, $value)
 	{
@@ -139,7 +139,7 @@ public function __set($name, $value)
 	 * @return  boolean  True on success.
 	 *
 	 * @see     JFormField::setup()
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
@@ -171,7 +171,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	 *
 	 * @return  array  The field option objects as a nested array in groups.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected function getGroups()
 	{
diff --git a/administrator/components/com_menus/models/fields/menupreset.php b/administrator/components/com_menus/models/fields/menupreset.php
index 9992bf001f6b0..adbf16f8b166f 100644
--- a/administrator/components/com_menus/models/fields/menupreset.php
+++ b/administrator/components/com_menus/models/fields/menupreset.php
@@ -16,7 +16,7 @@
 /**
  * Administrator Menu Presets list field.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class JFormFieldMenuPreset extends JFormFieldList
 {
@@ -25,7 +25,7 @@ class JFormFieldMenuPreset extends JFormFieldList
 	 *
 	 * @var     string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $type = 'MenuPreset';
 
@@ -34,7 +34,7 @@ class JFormFieldMenuPreset extends JFormFieldList
 	 *
 	 * @return  array  The field option objects.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected function getOptions()
 	{
diff --git a/administrator/components/com_menus/views/menu/view.xml.php b/administrator/components/com_menus/views/menu/view.xml.php
index 6701d75af38a1..a96c49278c863 100644
--- a/administrator/components/com_menus/views/menu/view.xml.php
+++ b/administrator/components/com_menus/views/menu/view.xml.php
@@ -13,21 +13,21 @@
 /**
  * The HTML Menus Menu Item View.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class MenusViewMenu extends JViewLegacy
 {
 	/**
 	 * @var  stdClass[]
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $items;
 
 	/**
 	 * @var  JObject
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $state;
 
@@ -38,7 +38,7 @@ class MenusViewMenu extends JViewLegacy
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function display($tpl = null)
 	{
@@ -103,7 +103,7 @@ public function display($tpl = null)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected function addXmlChild($xml, $item)
 	{
diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
index 34a6f69485f9a..63838ff216038 100644
--- a/administrator/language/en-GB/en-GB.xml
+++ b/administrator/language/en-GB/en-GB.xml
@@ -2,7 +2,7 @@
 <metafile version="3.7" client="administrator">
 	<name>English (en-GB)</name>
 	<version>3.8.0</version>
-	<creationDate>July 2017</creationDate>
+	<creationDate>August 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index 3005a501589af..5f9b3efd30753 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>3.8.0</version>
-	<creationDate>July 2017</creationDate>
+	<creationDate>August 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 748fc4b09c3f7..015af0be6888b 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.8.0-dev</version>
-	<creationDate>July 2017</creationDate>
+	<version>3.8.0-beta1</version>
+	<creationDate>August 2017</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
index 4b5e2c044aea8..875f2591dd425 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>3.8.0.1</version>
-	<creationDate>July 2017</creationDate>
+	<creationDate>August 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_menu/menu.php b/administrator/modules/mod_menu/menu.php
index 958df090eaa4e..138278bed7288 100644
--- a/administrator/modules/mod_menu/menu.php
+++ b/administrator/modules/mod_menu/menu.php
@@ -27,7 +27,7 @@ class JAdminCssMenu
 	 *
 	 * @var   Tree
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $tree;
 
@@ -54,7 +54,7 @@ class JAdminCssMenu
 	 *
 	 * @return  Tree
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getTree()
 	{
@@ -133,7 +133,7 @@ public function load($params, $enabled)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function renderSubmenu($layoutFile)
 	{
@@ -159,7 +159,7 @@ public function renderSubmenu($layoutFile)
 	 *
 	 * @return  bool  Whether to show recovery menu
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected function check($items, Registry $params)
 	{
@@ -229,7 +229,7 @@ protected function check($items, Registry $params)
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected function preprocess($items)
 	{
@@ -337,7 +337,7 @@ protected function preprocess($items)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected function populateTree($levels)
 	{
diff --git a/administrator/modules/mod_sampledata/helper.php b/administrator/modules/mod_sampledata/helper.php
index e366569b1c0e2..a2668562b943c 100644
--- a/administrator/modules/mod_sampledata/helper.php
+++ b/administrator/modules/mod_sampledata/helper.php
@@ -12,7 +12,7 @@
 /**
  * Helper for mod_sampledata
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 abstract class ModSampledataHelper
 {
@@ -21,7 +21,7 @@ abstract class ModSampledataHelper
 	 *
 	 * @return  mixed  An array of sampledata, or false on error.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public static function getList()
 	{
diff --git a/build/bump.php b/build/bump.php
index bffefc632ac60..f39e95be764de 100644
--- a/build/bump.php
+++ b/build/bump.php
@@ -59,8 +59,9 @@ function usage($command)
 			'/README.txt',
 			);
 
-// Change copyright date exclusions.
+// Change copyright date exclusions. Some systems may try to scan the .git directory, exclude it.
 $directoryLoopExcludeDirectories = array(
+			'/.git',
 			'/libraries/vendor/',
 			'/libraries/phputf8/',
 			'/libraries/php-encryption/',
diff --git a/components/com_finder/views/search/view.html.php b/components/com_finder/views/search/view.html.php
index f2c15cf351828..a4d0ea2c251f6 100644
--- a/components/com_finder/views/search/view.html.php
+++ b/components/com_finder/views/search/view.html.php
@@ -46,7 +46,7 @@ class FinderViewSearch extends JViewLegacy
 	 *
 	 * @var    array
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $results;
 
@@ -55,7 +55,7 @@ class FinderViewSearch extends JViewLegacy
 	 *
 	 * @var    integer
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $total;
 
@@ -64,7 +64,7 @@ class FinderViewSearch extends JViewLegacy
 	 *
 	 * @var    JPagination
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $pagination;
 
diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
index 3ff18268f6c2b..651f0d1546211 100644
--- a/installation/language/en-GB/en-GB.xml
+++ b/installation/language/en-GB/en-GB.xml
@@ -4,7 +4,7 @@
 	client="installation">
 	<name>English (United Kingdom)</name>
 	<version>3.8.0</version>
-	<creationDate>July 2017</creationDate>
+	<creationDate>August 2017</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
index a791a25e9308c..965b9809a9adf 100644
--- a/language/en-GB/en-GB.xml
+++ b/language/en-GB/en-GB.xml
@@ -2,7 +2,7 @@
 <metafile version="3.7" client="site">
 	<name>English (en-GB)</name>
 	<version>3.8.0</version>
-	<creationDate>July 2017</creationDate>
+	<creationDate>August 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 9376a9d01ec7b..c942f1eecb0b2 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>3.8.0</version>
-	<creationDate>July 2017</creationDate>
+	<creationDate>August 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/libraries/cms/html/form.php b/libraries/cms/html/form.php
index e5c15980c7181..c1f62a818240f 100644
--- a/libraries/cms/html/form.php
+++ b/libraries/cms/html/form.php
@@ -23,7 +23,7 @@ abstract class JHtmlForm
 	 *
 	 * @var    array
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected static $loaded = array();
 
@@ -58,7 +58,7 @@ public static function token(array $attribs = array())
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function csrf($name = 'csrf.token')
 	{
diff --git a/libraries/cms/html/jquery.php b/libraries/cms/html/jquery.php
index f2555e6c05155..bb4d706ddcf9a 100644
--- a/libraries/cms/html/jquery.php
+++ b/libraries/cms/html/jquery.php
@@ -117,7 +117,7 @@ public static function ui(array $components = array('core'), $debug = null)
 	 *
 	 * @throws  \InvalidArgumentException
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function token($name = 'csrf.token')
 	{
diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
index c84e7a8e3990f..4b46d85d2a5ba 100644
--- a/libraries/joomla/database/driver.php
+++ b/libraries/joomla/database/driver.php
@@ -664,7 +664,7 @@ public function createDatabase($options, $utf = true)
 	/**
 	 * Destructor.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __destruct()
 	{
diff --git a/libraries/joomla/form/fields/combo.php b/libraries/joomla/form/fields/combo.php
index 8be8a009baa6b..de3dd615a155f 100644
--- a/libraries/joomla/form/fields/combo.php
+++ b/libraries/joomla/form/fields/combo.php
@@ -31,7 +31,7 @@ class JFormFieldCombo extends JFormFieldList
 	 * Name of the layout being used to render the field
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $layout = 'joomla.form.field.combo';
 
@@ -57,7 +57,7 @@ protected function getInput()
 	 *
 	 * @return  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected function getLayoutData()
 	{
diff --git a/libraries/joomla/session/storage/redis.php b/libraries/joomla/session/storage/redis.php
index 8a5e6b84c601b..356b672ec37db 100644
--- a/libraries/joomla/session/storage/redis.php
+++ b/libraries/joomla/session/storage/redis.php
@@ -13,7 +13,7 @@
  * Redis session storage handler for PHP
  *
  * @link   https://secure.php.net/manual/en/function.session-set-save-handler.php
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class JSessionStorageRedis extends JSessionStorage
 {
@@ -22,7 +22,7 @@ class JSessionStorageRedis extends JSessionStorage
 	 *
 	 * @param   array  $options  Optional parameters.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct($options = array())
 	{
@@ -46,7 +46,7 @@ public function __construct($options = array())
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function register()
 	{
@@ -65,7 +65,7 @@ public function register()
 	 *
 	 * @return  boolean  True on success, false otherwise.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function isSupported()
 	{
diff --git a/libraries/loader.php b/libraries/loader.php
index 78c2a2afba01b..4cee617377a1b 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -760,7 +760,7 @@ private static function _load($class, $lookup)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	private static function loadAliasFor($class)
 	{
@@ -783,7 +783,7 @@ class_exists($alias, true);
 	 *
 	 * @return  string  The striped class name.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	private static function stripFirstBackslash($class)
 	{
diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
index a4969ed7b52bb..3df5c396d2e26 100644
--- a/libraries/src/Application/WebApplication.php
+++ b/libraries/src/Application/WebApplication.php
@@ -639,7 +639,7 @@ public function redirect($url, $status = 303)
 	 *
 	 * @return  bool
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected function isRedirectState($state)
 	{
@@ -812,7 +812,7 @@ public function sendHeaders()
 	 *
 	 * @return string
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected function getHttpStatusValue($value)
 	{
diff --git a/libraries/src/Crypt/Cipher/SodiumCipher.php b/libraries/src/Crypt/Cipher/SodiumCipher.php
index 993d1a4e65578..679e99867c802 100644
--- a/libraries/src/Crypt/Cipher/SodiumCipher.php
+++ b/libraries/src/Crypt/Cipher/SodiumCipher.php
@@ -17,7 +17,7 @@
 /**
  * JCrypt cipher for sodium algorithm encryption, decryption and key generation.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class SodiumCipher implements CipherInterface
 {
@@ -25,7 +25,7 @@ class SodiumCipher implements CipherInterface
 	 * The message nonce to be used with encryption/decryption
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	private $nonce;
 
@@ -37,7 +37,7 @@ class SodiumCipher implements CipherInterface
 	 *
 	 * @return  string  The decrypted data string.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 * @throws  RuntimeException
 	 */
 	public function decrypt($data, Key $key)
@@ -75,7 +75,7 @@ public function decrypt($data, Key $key)
 	 *
 	 * @return  string  The encrypted data string.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 * @throws  RuntimeException
 	 */
 	public function encrypt($data, Key $key)
@@ -105,7 +105,7 @@ public function encrypt($data, Key $key)
 	 *
 	 * @return  Key
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 * @throws  RuntimeException
 	 */
 	public function generateKey(array $options = array())
@@ -129,7 +129,7 @@ public function generateKey(array $options = array())
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function setNonce($nonce)
 	{
diff --git a/libraries/src/Form/FormHelper.php b/libraries/src/Form/FormHelper.php
index 390ba18dc9a3e..7f1e553c27cd8 100644
--- a/libraries/src/Form/FormHelper.php
+++ b/libraries/src/Form/FormHelper.php
@@ -43,7 +43,7 @@ class FormHelper
 	 * The class namespaces.
 	 *
 	 * @var   string
-	 * @since __DEPLOY_VERSION__
+	 * @since 3.8.0
 	 */
 	protected static $prefixes = array('field' => array(), 'form' => array(), 'rule' => array());
 
@@ -351,7 +351,7 @@ protected static function addPath($entity, $new = null)
 	 *
 	 * @return  array  The list of namespaces that have been added.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function addFieldPrefix($new = null)
 	{
@@ -365,7 +365,7 @@ public static function addFieldPrefix($new = null)
 	 *
 	 * @return  array  The list of namespaces that have been added.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function addFormPrefix($new = null)
 	{
@@ -379,7 +379,7 @@ public static function addFormPrefix($new = null)
 	 *
 	 * @return  array  The list of namespaces that have been added.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function addRulePrefix($new = null)
 	{
@@ -395,7 +395,7 @@ public static function addRulePrefix($new = null)
 	 *
 	 * @return  array  The list of namespaces that have been added.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected static function addPrefix($entity, $new = null)
 	{
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index ca4df19812908..7dbb32f163282 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -631,7 +631,7 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
 	 *
 	 * @return  boolean  True if enabled; false otherwise.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function isAdminMultilang()
 	{
diff --git a/libraries/src/Log/DelegatingPsrLogger.php b/libraries/src/Log/DelegatingPsrLogger.php
index a248c526b8587..d33684f8e80fc 100644
--- a/libraries/src/Log/DelegatingPsrLogger.php
+++ b/libraries/src/Log/DelegatingPsrLogger.php
@@ -15,7 +15,7 @@
 /**
  * Delegating logger which delegates log messages received from the PSR-3 interface to the Joomla! Log object.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class DelegatingPsrLogger extends AbstractLogger
 {
@@ -23,7 +23,7 @@ class DelegatingPsrLogger extends AbstractLogger
 	 * The Log instance to delegate messages to.
 	 *
 	 * @var    Log
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $logger;
 
@@ -31,7 +31,7 @@ class DelegatingPsrLogger extends AbstractLogger
 	 * Mapping array to map a PSR-3 level to a Joomla priority.
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $priorityMap = array(
 		LogLevel::EMERGENCY => Log::EMERGENCY,
@@ -49,7 +49,7 @@ class DelegatingPsrLogger extends AbstractLogger
 	 *
 	 * @param   Log  $logger  The Log instance to delegate messages to.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct(Log $logger)
 	{
@@ -65,7 +65,7 @@ public function __construct(Log $logger)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 * @throws  InvalidArgumentException
 	 */
 	public function log($level, $message, array $context = array())
diff --git a/libraries/src/Log/Log.php b/libraries/src/Log/Log.php
index c18e05db01adb..f62e0cb422ac2 100644
--- a/libraries/src/Log/Log.php
+++ b/libraries/src/Log/Log.php
@@ -255,7 +255,7 @@ protected function addLoggerInternal(array $options, $priorities = self::ALL, $c
 	 *
 	 * @return  DelegatingPsrLogger
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function createDelegatedLogger()
 	{
diff --git a/libraries/src/Log/LogEntry.php b/libraries/src/Log/LogEntry.php
index 4f683c9050a1c..a41a475972e43 100644
--- a/libraries/src/Log/LogEntry.php
+++ b/libraries/src/Log/LogEntry.php
@@ -33,7 +33,7 @@ class LogEntry
 	 * The message context.
 	 *
 	 * @var    array
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public $context;
 
diff --git a/libraries/src/Menu/MenuHelper.php b/libraries/src/Menu/MenuHelper.php
index 72c7574f0d0ad..a1e61c6dd5826 100644
--- a/libraries/src/Menu/MenuHelper.php
+++ b/libraries/src/Menu/MenuHelper.php
@@ -14,7 +14,7 @@
 /**
  * Menu Helper utility
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class MenuHelper
 {
@@ -23,14 +23,14 @@ class MenuHelper
 	 *
 	 * @var  array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected static $presets = null;
 
 	/**
 	 * Private constructor
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	private function __construct()
 	{
@@ -47,7 +47,7 @@ private function __construct()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function addPreset($name, $title, $path, $replace = true)
 	{
@@ -78,7 +78,7 @@ public static function addPreset($name, $title, $path, $replace = true)
 	 *
 	 * @return  \stdClass[]
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function getPresets()
 	{
@@ -121,7 +121,7 @@ public static function getPresets()
 	 *
 	 * @return  \stdClass[]
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function loadPreset($name, $fallback = true)
 	{
@@ -150,7 +150,7 @@ public static function loadPreset($name, $fallback = true)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function resolveAlias(&$item)
 	{
@@ -200,7 +200,7 @@ public static function resolveAlias(&$item)
 	 *
 	 * @return  \stdClass[]
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public static function createLevels($menuItems)
 	{
@@ -254,7 +254,7 @@ public static function createLevels($menuItems)
 	 *
 	 * @return  void
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected static function loadXml($elements, &$items, $replace = array())
 	{
@@ -337,7 +337,7 @@ protected static function loadXml($elements, &$items, $replace = array())
 	 *
 	 * @return  \stdClass
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected static function parseXmlNode($node, $replace = array())
 	{
diff --git a/libraries/src/Menu/Node.php b/libraries/src/Menu/Node.php
index aa28b740159c4..d79f74d2e9afa 100644
--- a/libraries/src/Menu/Node.php
+++ b/libraries/src/Menu/Node.php
@@ -16,7 +16,7 @@
  *
  * @see    Tree
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class Node
 {
@@ -25,7 +25,7 @@ class Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $id = null;
 
@@ -34,7 +34,7 @@ class Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $class = null;
 
@@ -43,7 +43,7 @@ class Node
 	 *
 	 * @var  bool
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $active = false;
 
@@ -52,7 +52,7 @@ class Node
 	 *
 	 * @var  Registry
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $params;
 
@@ -61,7 +61,7 @@ class Node
 	 *
 	 * @var  Node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $parent = null;
 
@@ -70,14 +70,14 @@ class Node
 	 *
 	 * @var  Node[]
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $children = array();
 
 	/**
 	 * Constructor
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct()
 	{
@@ -93,7 +93,7 @@ public function __construct()
 	 *
 	 * @return  Node  The new added child
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function addChild(Node $child)
 	{
@@ -119,7 +119,7 @@ public function addChild(Node $child)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function removeChild(Node $child)
 	{
@@ -138,7 +138,7 @@ public function removeChild(Node $child)
 	 *
 	 * @return  bool  True if there is a parent
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function hasParent()
 	{
@@ -150,7 +150,7 @@ public function hasParent()
 	 *
 	 * @return  Node  The Node object's parent or null for no parent
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getParent()
 	{
@@ -162,7 +162,7 @@ public function getParent()
 	 *
 	 * @return  bool
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function hasChildren()
 	{
@@ -174,7 +174,7 @@ public function hasChildren()
 	 *
 	 * @return  Node[]  The children
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getChildren()
 	{
@@ -186,7 +186,7 @@ public function getChildren()
 	 *
 	 * @return  int  The node level in the hierarchy, where ROOT == 0, First level menu item == 1, an so on.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getLevel()
 	{
@@ -198,7 +198,7 @@ public function getLevel()
 	 *
 	 * @return  bool
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function isRoot()
 	{
@@ -212,7 +212,7 @@ public function isRoot()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function setActive($active)
 	{
@@ -226,7 +226,7 @@ public function setActive($active)
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function setParams(Registry $params)
 	{
@@ -240,7 +240,7 @@ public function setParams(Registry $params)
 	 *
 	 * @return  mixed
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getParam($key)
 	{
@@ -254,7 +254,7 @@ public function getParam($key)
 	 *
 	 * @return  mixed
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function get($name)
 	{
diff --git a/libraries/src/Menu/Node/Component.php b/libraries/src/Menu/Node/Component.php
index 735288626c659..3c42dc6fb52e2 100644
--- a/libraries/src/Menu/Node/Component.php
+++ b/libraries/src/Menu/Node/Component.php
@@ -16,7 +16,7 @@
  *
  * @see    Node
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class Component extends Node
 {
@@ -25,7 +25,7 @@ class Component extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $title = null;
 
@@ -34,7 +34,7 @@ class Component extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $element = null;
 
@@ -43,7 +43,7 @@ class Component extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $link = null;
 
@@ -52,7 +52,7 @@ class Component extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $target = null;
 
@@ -61,7 +61,7 @@ class Component extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $icon = null;
 
@@ -76,7 +76,7 @@ class Component extends Node
 	 * @param   string  $id       The node id
 	 * @param   string  $icon     The title icon for the node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct($title, $element, $link, $target = null, $class = null, $id = null, $icon = null)
 	{
@@ -98,7 +98,7 @@ public function __construct($title, $element, $link, $target = null, $class = nu
 	 *
 	 * @return  mixed
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function get($name)
 	{
diff --git a/libraries/src/Menu/Node/Container.php b/libraries/src/Menu/Node/Container.php
index be7df8190bd45..bd50808e9b00b 100644
--- a/libraries/src/Menu/Node/Container.php
+++ b/libraries/src/Menu/Node/Container.php
@@ -14,7 +14,7 @@
  *
  * @see    Node
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class Container extends Heading
 {
diff --git a/libraries/src/Menu/Node/Heading.php b/libraries/src/Menu/Node/Heading.php
index 1b0d3007db031..d914184614c9d 100644
--- a/libraries/src/Menu/Node/Heading.php
+++ b/libraries/src/Menu/Node/Heading.php
@@ -16,7 +16,7 @@
  *
  * @see    Node
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class Heading extends Node
 {
@@ -25,7 +25,7 @@ class Heading extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $title = null;
 
@@ -34,7 +34,7 @@ class Heading extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $link = '#';
 
@@ -43,7 +43,7 @@ class Heading extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $icon = null;
 
@@ -55,7 +55,7 @@ class Heading extends Node
 	 * @param   string  $id     The node id
 	 * @param   string  $icon   The title icon for the node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct($title, $class = null, $id = null, $icon = null)
 	{
@@ -74,7 +74,7 @@ public function __construct($title, $class = null, $id = null, $icon = null)
 	 *
 	 * @return  mixed
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function get($name)
 	{
diff --git a/libraries/src/Menu/Node/Separator.php b/libraries/src/Menu/Node/Separator.php
index 0a90f0594a7dd..a5e0282974b6c 100644
--- a/libraries/src/Menu/Node/Separator.php
+++ b/libraries/src/Menu/Node/Separator.php
@@ -16,7 +16,7 @@
  *
  * @see    Node
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class Separator extends Node
 {
@@ -25,7 +25,7 @@ class Separator extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $title = null;
 
@@ -34,7 +34,7 @@ class Separator extends Node
 	 *
 	 * @param   string  $title  The title of the node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct($title = null)
 	{
@@ -50,7 +50,7 @@ public function __construct($title = null)
 	 *
 	 * @return  mixed
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function get($name)
 	{
diff --git a/libraries/src/Menu/Node/Url.php b/libraries/src/Menu/Node/Url.php
index 0d45e51ecf220..71730dba1177d 100644
--- a/libraries/src/Menu/Node/Url.php
+++ b/libraries/src/Menu/Node/Url.php
@@ -16,7 +16,7 @@
  *
  * @see    Node
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class Url extends Node
 {
@@ -25,7 +25,7 @@ class Url extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $title = null;
 
@@ -34,7 +34,7 @@ class Url extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $link = null;
 
@@ -43,7 +43,7 @@ class Url extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $target = null;
 
@@ -52,7 +52,7 @@ class Url extends Node
 	 *
 	 * @var  string
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $icon = null;
 
@@ -66,7 +66,7 @@ class Url extends Node
 	 * @param   string  $id      The node id
 	 * @param   string  $icon    The title icon for the node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct($title, $link, $target = null, $class = null, $id = null, $icon = null)
 	{
@@ -87,7 +87,7 @@ public function __construct($title, $link, $target = null, $class = null, $id =
 	 *
 	 * @return  mixed
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function get($name)
 	{
diff --git a/libraries/src/Menu/Tree.php b/libraries/src/Menu/Tree.php
index 5708c9be770bf..2360d461c9d0e 100644
--- a/libraries/src/Menu/Tree.php
+++ b/libraries/src/Menu/Tree.php
@@ -12,7 +12,7 @@
 /**
  * Menu Tree class to represent a menu tree hierarchy
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class Tree
 {
@@ -21,7 +21,7 @@ class Tree
 	 *
 	 * @var  Node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $root = null;
 
@@ -30,7 +30,7 @@ class Tree
 	 *
 	 * @var  Node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $current = null;
 
@@ -39,14 +39,14 @@ class Tree
 	 *
 	 * @var  string[]
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected $css = array();
 
 	/**
 	 * Constructor
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function __construct()
 	{
@@ -59,7 +59,7 @@ public function __construct()
 	 *
 	 * @return  Node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getRoot()
 	{
@@ -71,7 +71,7 @@ public function getRoot()
 	 *
 	 * @return  Node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getCurrent()
 	{
@@ -85,7 +85,7 @@ public function getCurrent()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function setCurrent($node)
 	{
@@ -102,7 +102,7 @@ public function setCurrent($node)
 	 *
 	 * @return  Node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getParent($setCurrent = true)
 	{
@@ -123,7 +123,7 @@ public function getParent($setCurrent = true)
 	 *
 	 * @return  Node  The root node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function reset($clear = false)
 	{
@@ -146,7 +146,7 @@ public function reset($clear = false)
 	 *
 	 * @return  Node  The newly added node
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function addChild(Node $node, $setCurrent = false)
 	{
@@ -166,7 +166,7 @@ public function addChild(Node $node, $setCurrent = false)
 	 *
 	 * @return  string	CSS class name
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getIconClass()
 	{
@@ -210,7 +210,7 @@ public function getIconClass()
 	 *
 	 * @return  string[]
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function getCss()
 	{
diff --git a/libraries/src/Toolbar/Toolbar.php b/libraries/src/Toolbar/Toolbar.php
index a7a98069019d4..66eb2165fdef3 100644
--- a/libraries/src/Toolbar/Toolbar.php
+++ b/libraries/src/Toolbar/Toolbar.php
@@ -275,13 +275,13 @@ public function loadButtonType($type, $new = false)
 	 *
 	 * @return  string|null
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	private function loadButtonClass($type)
 	{
 		$buttonClasses = array(
 			'Joomla\\CMS\\Toolbar\\Button\\' . ucfirst($type) . 'Button',
-			// @deprecated __DEPLOY_VERSION__
+			// @deprecated 3.8.0
 			'JToolbarButton' . ucfirst($type),
 			// @deprecated 12.3 Remove the acceptance of legacy classes starting with JButton.
 			'JButton' . ucfirst($type)
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index b33cf278af860..b28079a0d017b 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -31,7 +31,7 @@ final class Version
 	 * Major release version.
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	const MAJOR_VERSION = 3;
 
@@ -39,7 +39,7 @@ final class Version
 	 * Minor release version.
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	const MINOR_VERSION = 8;
 
@@ -47,7 +47,7 @@ final class Version
 	 * Patch release version.
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	const PATCH_VERSION = 0;
 
@@ -58,9 +58,9 @@ final class Version
 	 * For example, for 3.8.0 when this is set to 'dev' the version string will be `3.8.0-dev`.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'dev';
+	const EXTRA_VERSION = 'beta1';
 
 	/**
 	 * Release version.
@@ -78,7 +78,7 @@ final class Version
 	 * @since  3.5
 	 * @deprecated  4.0  Use separated version constants instead
 	 */
-	const DEV_LEVEL = '0-dev';
+	const DEV_LEVEL = '0-beta1';
 
 	/**
 	 * Development status.
@@ -86,7 +86,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Development';
+	const DEV_STATUS = 'Beta';
 
 	/**
 	 * Build number.
@@ -111,7 +111,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '25-July-2017';
+	const RELDATE = '8-August-2017';
 
 	/**
 	 * Release time.
@@ -119,7 +119,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '15:29';
+	const RELTIME = '14:00';
 
 	/**
 	 * Release timezone.
diff --git a/media/mod_sampledata/js/sampledata-process.js b/media/mod_sampledata/js/sampledata-process.js
index dc340f38a34df..e0f5670bf58bf 100644
--- a/media/mod_sampledata/js/sampledata-process.js
+++ b/media/mod_sampledata/js/sampledata-process.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php
index 8acc7753d00fe..8339d267350f2 100644
--- a/plugins/sampledata/blog/blog.php
+++ b/plugins/sampledata/blog/blog.php
@@ -12,7 +12,7 @@
 /**
  * Sampledata - Blog Plugin
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class PlgSampledataBlog extends JPlugin
 {
@@ -21,7 +21,7 @@ class PlgSampledataBlog extends JPlugin
 	 *
 	 * @var    JDatabaseDriver
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $db;
 
@@ -30,7 +30,7 @@ class PlgSampledataBlog extends JPlugin
 	 *
 	 * @var    JApplicationCms
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $app;
 
@@ -39,7 +39,7 @@ class PlgSampledataBlog extends JPlugin
 	 *
 	 * @var    boolean
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $autoloadLanguage = true;
 
@@ -48,7 +48,7 @@ class PlgSampledataBlog extends JPlugin
 	 *
 	 * @var    MenusModelItem
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	private $menuItemModel;
 
@@ -57,7 +57,7 @@ class PlgSampledataBlog extends JPlugin
 	 *
 	 * @return  boolean  True on success.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onSampledataGetOverview()
 	{
@@ -76,7 +76,7 @@ public function onSampledataGetOverview()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep1()
 	{
@@ -258,7 +258,7 @@ public function onAjaxSampledataApplyStep1()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep2()
 	{
@@ -557,7 +557,7 @@ public function onAjaxSampledataApplyStep2()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep3()
 	{
@@ -915,7 +915,7 @@ public function onAjaxSampledataApplyStep3()
 	 *
 	 * @return  array  IDs of the inserted menuitems.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 *
 	 * @throws  Exception
 	 */
diff --git a/plugins/sampledata/testing/testing.php b/plugins/sampledata/testing/testing.php
index f1ded8a0c6be3..5a8539308f639 100644
--- a/plugins/sampledata/testing/testing.php
+++ b/plugins/sampledata/testing/testing.php
@@ -12,7 +12,7 @@
 /**
  * Sampledata - Testing Plugin
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.8.0
  */
 class PlgSampledataTesting extends JPlugin
 {
@@ -21,7 +21,7 @@ class PlgSampledataTesting extends JPlugin
 	 *
 	 * @var    JDatabaseDriver
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $db;
 
@@ -30,7 +30,7 @@ class PlgSampledataTesting extends JPlugin
 	 *
 	 * @var    JApplicationCms
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $app;
 
@@ -39,7 +39,7 @@ class PlgSampledataTesting extends JPlugin
 	 *
 	 * @var    boolean
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $autoloadLanguage = true;
 
@@ -48,7 +48,7 @@ class PlgSampledataTesting extends JPlugin
 	 *
 	 * @var    CategoriesModelCategory
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	private $categoryModel;
 
@@ -57,7 +57,7 @@ class PlgSampledataTesting extends JPlugin
 	 *
 	 * @var    MenusModelItem
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	private $menuItemModel;
 
@@ -66,7 +66,7 @@ class PlgSampledataTesting extends JPlugin
 	 *
 	 * @return  object  Object containing the name, title, description, icon and steps.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onSampledataGetOverview()
 	{
@@ -85,7 +85,7 @@ public function onSampledataGetOverview()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep1()
 	{
@@ -196,7 +196,7 @@ public function onAjaxSampledataApplyStep1()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep2()
 	{
@@ -379,7 +379,7 @@ public function onAjaxSampledataApplyStep2()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep3()
 	{
@@ -994,7 +994,7 @@ public function onAjaxSampledataApplyStep3()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep4()
 	{
@@ -1350,7 +1350,7 @@ public function onAjaxSampledataApplyStep4()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep5()
 	{
@@ -1481,7 +1481,7 @@ public function onAjaxSampledataApplyStep5()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep6()
 	{
@@ -3214,7 +3214,7 @@ public function onAjaxSampledataApplyStep6()
 	 *
 	 * @return  array or void  Will be converted into the JSON response to the module.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	public function onAjaxSampledataApplyStep7()
 	{
@@ -4532,7 +4532,7 @@ public function onAjaxSampledataApplyStep7()
 	 *
 	 * @throws  Exception
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	private function addCategories(array $categories, $extension, $level)
 	{
@@ -4592,7 +4592,7 @@ private function addCategories(array $categories, $extension, $level)
 	 *
 	 * @throws  Exception
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	private function addArticles(array $articles)
 	{
@@ -4667,7 +4667,7 @@ private function addArticles(array $articles)
 	 *
 	 * @throws  Exception
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	private function addMenuItems(array $menuItems, $level)
 	{
diff --git a/plugins/system/cache/cache.php b/plugins/system/cache/cache.php
index 0b975c524c4cb..5ac8034f1009e 100644
--- a/plugins/system/cache/cache.php
+++ b/plugins/system/cache/cache.php
@@ -36,7 +36,7 @@ class PlgSystemCache extends JPlugin
 	 * Application object.
 	 *
 	 * @var    JApplicationCms
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $app;
 
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 3d91805f07e28..2bc5abd8b5626 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -86,7 +86,7 @@ class PlgSystemDebug extends JPlugin
 	 * Database object.
 	 *
 	 * @var    JDatabaseDriver
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.8.0
 	 */
 	protected $db;
 
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php b/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php
index 3e21fc9fbcf1a..07d86c7dfa28b 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlFormTest.php
@@ -88,7 +88,7 @@ public function testToken()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function testCsrf()
 	{
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php b/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
index 77e5b755769a1..683e0f0065a0e 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlJqueryTest.php
@@ -131,7 +131,7 @@ public function testUi()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function testToken()
 	{
diff --git a/tests/unit/suites/libraries/joomla/JLoaderTest.php b/tests/unit/suites/libraries/joomla/JLoaderTest.php
index eca44fe2a2cbb..0e814941ff90e 100644
--- a/tests/unit/suites/libraries/joomla/JLoaderTest.php
+++ b/tests/unit/suites/libraries/joomla/JLoaderTest.php
@@ -224,7 +224,7 @@ public function testLoad()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function testLoadOverrideAliasClass()
 	{
@@ -254,7 +254,7 @@ public function testLoadOverrideAliasClass()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function testLoadOverrideOriginalClass()
 	{
@@ -284,7 +284,7 @@ public function testLoadOverrideOriginalClass()
 	 *
 	 * @return  void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	public function testAliasInstanceOf()
 	{
diff --git a/tests/unit/suites/libraries/joomla/log/JLogTest.php b/tests/unit/suites/libraries/joomla/log/JLogTest.php
index 7bbd557805f71..007d8fc4894b4 100644
--- a/tests/unit/suites/libraries/joomla/log/JLogTest.php
+++ b/tests/unit/suites/libraries/joomla/log/JLogTest.php
@@ -22,7 +22,7 @@ class JLogTest extends \PHPUnit\Framework\TestCase
 	 * @return  void
 	 *
 	 * @see     \PHPUnit\Framework\TestCase::setUp()
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.8.0
 	 */
 	protected function setUp()
 	{

From bcf3868230408c7f91c1bb73b1c5990668667fa8 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@joomla.org>
Date: Tue, 8 Aug 2017 07:59:50 -0500
Subject: [PATCH 144/148] Reset for dev

---
 administrator/manifests/files/joomla.xml | 2 +-
 libraries/src/Version.php                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 015af0be6888b..59725a3d07dcd 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.8.0-beta1</version>
+	<version>3.8.0-dev</version>
 	<creationDate>August 2017</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index b28079a0d017b..972cd9d2f2479 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -60,7 +60,7 @@ final class Version
 	 * @var    string
 	 * @since  3.8.0
 	 */
-	const EXTRA_VERSION = 'beta1';
+	const EXTRA_VERSION = 'dev';
 
 	/**
 	 * Release version.
@@ -78,7 +78,7 @@ final class Version
 	 * @since  3.5
 	 * @deprecated  4.0  Use separated version constants instead
 	 */
-	const DEV_LEVEL = '0-beta1';
+	const DEV_LEVEL = '0-dev';
 
 	/**
 	 * Development status.
@@ -86,7 +86,7 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Beta';
+	const DEV_STATUS = 'Development';
 
 	/**
 	 * Build number.

From 87da59f522a87d100552729e14887b92546e3c14 Mon Sep 17 00:00:00 2001
From: nvyush <nvyush@yandex.ru>
Date: Tue, 8 Aug 2017 16:11:13 +0300
Subject: [PATCH 145/148] Adding russian calendar language file (#17443)

---
 media/system/js/fields/calendar-locales/ru.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 media/system/js/fields/calendar-locales/ru.js

diff --git a/media/system/js/fields/calendar-locales/ru.js b/media/system/js/fields/calendar-locales/ru.js
new file mode 100644
index 0000000000000..38370e7da769f
--- /dev/null
+++ b/media/system/js/fields/calendar-locales/ru.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Сегодня",
+	weekend : [0, 6],
+	wk : "нед",
+	time : "Время:",
+	days : ["Воскресенье", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"],
+	shortDays : ["Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"],
+	months : ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"],
+	shortMonths : ["Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авг", "Сен", "Окт", "Ноя", "Дек"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Закрыть",
+	save: "Очистить"
+};

From 2d7f8dded901af4f9502bea87fafb62af27fcf11 Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Tue, 8 Aug 2017 15:11:38 +0200
Subject: [PATCH 146/148] Correcting Jalali/Persian calendar popup (#17432)

---
 .../js/fields/calendar-locales/date/jalali/date-helper.js       | 2 +-
 .../js/fields/calendar-locales/date/jalali/date-helper.min.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/system/js/fields/calendar-locales/date/jalali/date-helper.js b/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
index 32a2ab1fd8763..88fca8d76b09c 100644
--- a/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
+++ b/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
@@ -615,6 +615,6 @@ Date.prototype.getJalaliDate = function() {
 
 Date.prototype.getJalaliDay = function() {
 	var day = this.getDay();
-	day = (day + 1) % 7;
+	day = (day) % 7;
 	return day;
 };
\ No newline at end of file
diff --git a/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js b/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js
index 03de9d9d0bd9b..cb90de91fec9a 100644
--- a/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js
+++ b/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js
@@ -1 +1 @@
-Date.gregorian_MD=[31,28,31,30,31,30,31,31,30,31,30,31],Date.local_MD=[31,31,31,31,31,31,30,30,30,30,30,29],Date.SECOND=1e3,Date.MINUTE=60*Date.SECOND,Date.HOUR=60*Date.MINUTE,Date.DAY=24*Date.HOUR,Date.WEEK=7*Date.DAY,Date.prototype.setLocalDateOnly=function(t,e){if("gregorian"!=t)return"";var a=new Date(e);this.setDate(1),this.setFullYear(a.getFullYear()),this.setMonth(a.getMonth()),this.setDate(a.getDate())},Date.prototype.setLocalDate=function(t,e){return"gregorian"!=t?this.setJalaliDate(e):this.setDate(e)},Date.prototype.setLocalMonth=function(t,e,a){return"gregorian"!=t?this.setJalaliMonth(e,a):(void 0==a&&this.getDate(),this.setMonth(e))},Date.prototype.setOtherFullYear=function(t,e){if("gregorian"!=t)return(a=new Date(this)).setLocalFullYear(e),a.getLocalMonth("jalali")!=this.getLocalMonth("jalali")&&this.setLocalDate("jalali",29),this.setLocalFullYear("jalali",e);var a=new Date(this);return a.setFullYear(e),a.getMonth()!=this.getMonth()&&this.setDate(28),this.setUTCFullYear(e)},Date.prototype.setLocalFullYear=function(t,e){if("gregorian"!=t)return this.setJalaliFullYear(e);var a=new Date(this);return a.setFullYear(e),a.getMonth()!=this.getMonth()&&this.setDate(28),this.setFullYear(e)},Date.prototype.getLocalWeekDays=function(t,e){return 6},Date.prototype.getOtherFullYear=function(t){return"gregorian"!=t?this.getJalaliFullYear():this.getFullYear()},Date.prototype.getLocalFullYear=function(t){return"gregorian"!=t?this.getJalaliFullYear():this.getFullYear()},Date.prototype.getLocalMonth=function(t){return"gregorian"!=t?this.getJalaliMonth():this.getMonth()},Date.prototype.getLocalDate=function(t){return"gregorian"!=t?this.getJalaliDate():this.getDate()},Date.prototype.getLocalDay=function(t){return"gregorian"!=t?this.getJalaliDay():this.getDay()},Date.prototype.getLocalMonthDays=function(t,e){if("gregorian"==t){a=this.getFullYear();return void 0===e&&(e=this.getMonth()),0!=a%4||0==a%100&&0!=a%400||1!=e?Date.gregorian_MD[e]:29}var a=this.getLocalFullYear("jalali");if(void 0===e&&(e=this.getLocalMonth("jalali")),0==a%4&&(0!=a%100||0==a%400)&&1==e)return 29;Date.local_MD[e]},Date.prototype.getLocalWeekNumber=function(t){if("gregorian"!=t){a=(e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0)).getDay();e.setDate(e.getDate()-(a+6)%7+3);r=e.valueOf();return e.setMonth(0),e.setDate(4),Math.round((r-e.valueOf())/6048e5)+1}var e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0),a=e.getDay();e.setDate(e.getDate()-(a+6)%7+3);var r=e.valueOf();return e.setMonth(0),e.setDate(4),Math.round((r-e.valueOf())/6048e5)+1},Date.prototype.getLocalDayOfYear=function(t){if("gregorian"!=t){r=(e=new Date(this.getOtherFullYear(t),this.getLocalMonth(t),this.getLocalDate(t),0,0,0))-(a=new Date(this.getOtherFullYear(t),0,0,0,0,0));return Math.floor(r/Date.DAY)}var e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0),a=new Date(this.getFullYear(),0,0,0,0,0),r=e-a;return Math.floor(r/Date.DAY)},Date.prototype.getMonthDays=function(t){var e=this.getFullYear();return void 0===t&&(t=this.getMonth()),0!=e%4||0==e%100&&0!=e%400||1!=t?"gregorian"==Date.dateType?Date.gregorian_MD[t]:void Date.local_MD[t]:29},Date.prototype.equalsTo=function(t){return this.getFullYear()==t.getFullYear()&&this.getMonth()==t.getMonth()&&this.getDate()==t.getDate()&&this.getHours()==t.getHours()&&this.getMinutes()==t.getMinutes()},Date.localCalToGregorian=function(t,e,a){return JalaliDate.jalaliToGregorian(t,e,a)},Date.gregorianToLocalCal=function(t,e,a){return JalaliDate.gregorianToJalali(t,e,a)},Date.numbersToIso=function(t){var e,a=[0,1,2,3,4,5,6,7,8,9];if(t=t.toString(),"[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers))for(e=0;e<a.length;e++)t=t.replace(new RegExp(JoomlaCalLocale.localLangNumbers[e],"g"),a[e]);return t},Date.prototype.print=function(t,e,a){if("string"!=typeof e&&(t=""),e||(e="gregorian"),"string"!=typeof t&&(t=""),!t)return"";if("NaN"==this.getLocalDate(e)||!this.getLocalDate(e))return"";var r=this.getLocalMonth(e),o=this.getLocalDate(e),l=this.getLocalFullYear(e),i=this.getLocalWeekNumber(e),n=this.getLocalDay(e),s={},g=this.getHours(),h=g>=12,D=h?g-12:g,u=this.getLocalDayOfYear(e);0==D&&(D=12);var c=this.getMinutes(),p=this.getSeconds();s["%a"]=JoomlaCalLocale.shortDays[n],s["%A"]=JoomlaCalLocale.days[n],s["%b"]=JoomlaCalLocale.shortMonths[r],s["%B"]=JoomlaCalLocale.months[r],s["%C"]=1+Math.floor(l/100),s["%d"]=o<10?"0"+o:o,s["%e"]=o,s["%H"]=g<10?"0"+g:g,s["%I"]=D<10?"0"+D:D,s["%j"]=u<100?u<10?"00"+u:"0"+u:u,s["%k"]=g,s["%l"]=D,s["%m"]=r<9?"0"+(1+r):1+r,s["%M"]=c<10?"0"+c:c,s["%n"]="\n",s["%p"]=h?JoomlaCalLocale.PM:JoomlaCalLocale.AM,s["%P"]=h?JoomlaCalLocale.pm:JoomlaCalLocale.am,s["%s"]=Math.floor(this.getTime()/1e3),s["%S"]=p<10?"0"+p:p,s["%t"]="\t",s["%U"]=s["%W"]=s["%V"]=i<10?"0"+i:i,s["%u"]=n+1,s["%w"]=n,s["%y"]=(""+l).substr(2,2),s["%Y"]=l,s["%%"]="%";var f=/%./g,M=t.replace(f,function(t){return s[t]||t});return"[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers)&&a&&(M=Date.convertNumbers(M)),M},Date.parseFieldDate=function(t,e,a){t=Date.numbersToIso(t);var r=new Date,o=0,l=-1,i=0,n=t.split(/\W+/),s=e.match(/%./g),g=0,h=0,D=0,u=0;for(g=0;g<n.length;++g)if(n[g])switch(s[g]){case"%d":case"%e":i=parseInt(n[g],10);break;case"%m":l=parseInt(n[g],10)-1;break;case"%Y":case"%y":(o=parseInt(n[g],10))<100&&(o+=o>29?1900:2e3);break;case"%b":case"%B":for(h=0;h<12;++h)if("gregorian"!=a){if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){l=h;break}}else if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){l=h;break}break;case"%H":case"%I":case"%k":case"%l":D=parseInt(n[g],10);break;case"%P":case"%p":/pm/i.test(n[g])&&D<12?D+=12:/am/i.test(n[g])&&D>=12&&(D-=12);break;case"%M":u=parseInt(n[g],10)}if(isNaN(o)&&(o=r.getFullYear()),isNaN(l)&&(l=r.getMonth()),isNaN(i)&&(i=r.getDate()),isNaN(D)&&(D=r.getHours()),isNaN(u)&&(u=r.getMinutes()),0!=o&&-1!=l&&0!=i)return new Date(o,l,i,D,u,0);for(o=0,l=-1,i=0,g=0;g<n.length;++g)if(-1!=n[g].search(/[a-zA-Z]+/)){var c=-1;for(h=0;h<12;++h)if("gregorian"!=a){if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){c=h;break}}else if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){c=h;break}-1!=c&&(-1!=l&&(i=l+1),l=c)}else parseInt(n[g],10)<=12&&-1==l?l=n[g]-1:parseInt(n[g],10)>31&&0==o?(o=parseInt(n[g],10))<100&&(o+=o>29?1900:2e3):0==i&&(i=n[g]);return 0==o&&(o=r.getFullYear()),-1!=l&&0!=i?new Date(o,l,i,D,u,0):r},JalaliDate={g_days_in_month:[31,28,31,30,31,30,31,31,30,31,30,31],j_days_in_month:[31,31,31,31,31,31,30,30,30,30,30,29]},JalaliDate.jalaliToGregorian=function(t,e,a){for(var r=(t=parseInt(t))-979,o=(e=parseInt(e))-1,l=(a=parseInt(a))-1,i=365*r+8*parseInt(r/33)+parseInt((r%33+3)/4),n=0;n<o;++n)i+=JalaliDate.j_days_in_month[n];var s=(i+=l)+79,g=1600+400*parseInt(s/146097),h=!0;(s%=146097)>=36525&&(s--,g+=100*parseInt(s/36524),(s%=36524)>=365?s++:h=!1),g+=4*parseInt(s/1461),(s%=1461)>=366&&(h=!1,s--,g+=parseInt(s/365),s%=365);for(n=0;s>=JalaliDate.g_days_in_month[n]+(1==n&&h);n++)s-=JalaliDate.g_days_in_month[n]+(1==n&&h);return[g,n+1,s+1]},JalaliDate.checkDate=function(t,e,a){return!(t<0||t>32767||e<1||e>12||a<1||a>JalaliDate.j_days_in_month[e-1]+(12==e&&!((t-979)%33%4)))},JalaliDate.gregorianToJalali=function(t,e,a){for(var r=(t=parseInt(t))-1600,o=(e=parseInt(e))-1,l=(a=parseInt(a))-1,i=365*r+parseInt((r+3)/4)-parseInt((r+99)/100)+parseInt((r+399)/400),n=0;n<o;++n)i+=JalaliDate.g_days_in_month[n];o>1&&(r%4==0&&r%100!=0||r%400==0)&&++i;var s=(i+=l)-79,g=parseInt(s/12053);s%=12053;var h=979+33*g+4*parseInt(s/1461);(s%=1461)>=366&&(h+=parseInt((s-1)/365),s=(s-1)%365);for(n=0;n<11&&s>=JalaliDate.j_days_in_month[n];++n)s-=JalaliDate.j_days_in_month[n];return[h,n+1,s+1]},Date.prototype.setJalaliFullYear=function(t,e,a){var r=this.getDate(),o=this.getMonth(),l=this.getFullYear(),i=JalaliDate.gregorianToJalali(l,o+1,r);t<100&&(t+=1300),i[0]=t,void 0!=e&&(e>11&&(i[0]+=Math.floor(e/12),e%=12),i[1]=e+1),void 0!=a&&(i[2]=a);var n=JalaliDate.jalaliToGregorian(i[0],i[1],i[2]);return this.setFullYear(n[0],n[1]-1,n[2])},Date.prototype.setJalaliMonth=function(t,e){var a=this.getDate(),r=this.getMonth(),o=this.getFullYear(),l=JalaliDate.gregorianToJalali(o,r+1,a);t>11&&(l[0]+=Math.floor(t/12),t%=12),l[1]=t+1,void 0!=e&&(l[2]=e);var i=JalaliDate.jalaliToGregorian(l[0],l[1],l[2]);return this.setFullYear(i[0],i[1]-1,i[2])},Date.prototype.setJalaliDate=function(t){var e=this.getDate(),a=this.getMonth(),r=this.getFullYear(),o=JalaliDate.gregorianToJalali(r,a+1,e);o[2]=t;var l=JalaliDate.jalaliToGregorian(o[0],o[1],o[2]);return this.setFullYear(l[0],l[1]-1,l[2])},Date.prototype.getJalaliFullYear=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[0]},Date.prototype.getJalaliMonth=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[1]-1},Date.prototype.getJalaliDate=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[2]},Date.prototype.getJalaliDay=function(){var t=this.getDay();return t=(t+1)%7};
\ No newline at end of file
+Date.gregorian_MD=[31,28,31,30,31,30,31,31,30,31,30,31],Date.local_MD=[31,31,31,31,31,31,30,30,30,30,30,29],Date.SECOND=1e3,Date.MINUTE=60*Date.SECOND,Date.HOUR=60*Date.MINUTE,Date.DAY=24*Date.HOUR,Date.WEEK=7*Date.DAY,Date.prototype.setLocalDateOnly=function(t,e){if("gregorian"!=t)return"";var a=new Date(e);this.setDate(1),this.setFullYear(a.getFullYear()),this.setMonth(a.getMonth()),this.setDate(a.getDate())},Date.prototype.setLocalDate=function(t,e){return"gregorian"!=t?this.setJalaliDate(e):this.setDate(e)},Date.prototype.setLocalMonth=function(t,e,a){return"gregorian"!=t?this.setJalaliMonth(e,a):(void 0==a&&this.getDate(),this.setMonth(e))},Date.prototype.setOtherFullYear=function(t,e){if("gregorian"!=t)return(a=new Date(this)).setLocalFullYear(e),a.getLocalMonth("jalali")!=this.getLocalMonth("jalali")&&this.setLocalDate("jalali",29),this.setLocalFullYear("jalali",e);var a=new Date(this);return a.setFullYear(e),a.getMonth()!=this.getMonth()&&this.setDate(28),this.setUTCFullYear(e)},Date.prototype.setLocalFullYear=function(t,e){if("gregorian"!=t)return this.setJalaliFullYear(e);var a=new Date(this);return a.setFullYear(e),a.getMonth()!=this.getMonth()&&this.setDate(28),this.setFullYear(e)},Date.prototype.getLocalWeekDays=function(t,e){return 6},Date.prototype.getOtherFullYear=function(t){return"gregorian"!=t?this.getJalaliFullYear():this.getFullYear()},Date.prototype.getLocalFullYear=function(t){return"gregorian"!=t?this.getJalaliFullYear():this.getFullYear()},Date.prototype.getLocalMonth=function(t){return"gregorian"!=t?this.getJalaliMonth():this.getMonth()},Date.prototype.getLocalDate=function(t){return"gregorian"!=t?this.getJalaliDate():this.getDate()},Date.prototype.getLocalDay=function(t){return"gregorian"!=t?this.getJalaliDay():this.getDay()},Date.prototype.getLocalMonthDays=function(t,e){if("gregorian"==t){a=this.getFullYear();return void 0===e&&(e=this.getMonth()),0!=a%4||0==a%100&&0!=a%400||1!=e?Date.gregorian_MD[e]:29}var a=this.getLocalFullYear("jalali");if(void 0===e&&(e=this.getLocalMonth("jalali")),0==a%4&&(0!=a%100||0==a%400)&&1==e)return 29;Date.local_MD[e]},Date.prototype.getLocalWeekNumber=function(t){if("gregorian"!=t){a=(e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0)).getDay();e.setDate(e.getDate()-(a+6)%7+3);r=e.valueOf();return e.setMonth(0),e.setDate(4),Math.round((r-e.valueOf())/6048e5)+1}var e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0),a=e.getDay();e.setDate(e.getDate()-(a+6)%7+3);var r=e.valueOf();return e.setMonth(0),e.setDate(4),Math.round((r-e.valueOf())/6048e5)+1},Date.prototype.getLocalDayOfYear=function(t){if("gregorian"!=t){r=(e=new Date(this.getOtherFullYear(t),this.getLocalMonth(t),this.getLocalDate(t),0,0,0))-(a=new Date(this.getOtherFullYear(t),0,0,0,0,0));return Math.floor(r/Date.DAY)}var e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0),a=new Date(this.getFullYear(),0,0,0,0,0),r=e-a;return Math.floor(r/Date.DAY)},Date.prototype.getMonthDays=function(t){var e=this.getFullYear();return void 0===t&&(t=this.getMonth()),0!=e%4||0==e%100&&0!=e%400||1!=t?"gregorian"==Date.dateType?Date.gregorian_MD[t]:void Date.local_MD[t]:29},Date.prototype.equalsTo=function(t){return this.getFullYear()==t.getFullYear()&&this.getMonth()==t.getMonth()&&this.getDate()==t.getDate()&&this.getHours()==t.getHours()&&this.getMinutes()==t.getMinutes()},Date.localCalToGregorian=function(t,e,a){return JalaliDate.jalaliToGregorian(t,e,a)},Date.gregorianToLocalCal=function(t,e,a){return JalaliDate.gregorianToJalali(t,e,a)},Date.numbersToIso=function(t){var e,a=[0,1,2,3,4,5,6,7,8,9];if(t=t.toString(),"[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers))for(e=0;e<a.length;e++)t=t.replace(new RegExp(JoomlaCalLocale.localLangNumbers[e],"g"),a[e]);return t},Date.prototype.print=function(t,e,a){if("string"!=typeof e&&(t=""),e||(e="gregorian"),"string"!=typeof t&&(t=""),!t)return"";if("NaN"==this.getLocalDate(e)||!this.getLocalDate(e))return"";var r=this.getLocalMonth(e),o=this.getLocalDate(e),l=this.getLocalFullYear(e),i=this.getLocalWeekNumber(e),n=this.getLocalDay(e),s={},g=this.getHours(),h=g>=12,D=h?g-12:g,u=this.getLocalDayOfYear(e);0==D&&(D=12);var c=this.getMinutes(),p=this.getSeconds();s["%a"]=JoomlaCalLocale.shortDays[n],s["%A"]=JoomlaCalLocale.days[n],s["%b"]=JoomlaCalLocale.shortMonths[r],s["%B"]=JoomlaCalLocale.months[r],s["%C"]=1+Math.floor(l/100),s["%d"]=o<10?"0"+o:o,s["%e"]=o,s["%H"]=g<10?"0"+g:g,s["%I"]=D<10?"0"+D:D,s["%j"]=u<100?u<10?"00"+u:"0"+u:u,s["%k"]=g,s["%l"]=D,s["%m"]=r<9?"0"+(1+r):1+r,s["%M"]=c<10?"0"+c:c,s["%n"]="\n",s["%p"]=h?JoomlaCalLocale.PM:JoomlaCalLocale.AM,s["%P"]=h?JoomlaCalLocale.pm:JoomlaCalLocale.am,s["%s"]=Math.floor(this.getTime()/1e3),s["%S"]=p<10?"0"+p:p,s["%t"]="\t",s["%U"]=s["%W"]=s["%V"]=i<10?"0"+i:i,s["%u"]=n+1,s["%w"]=n,s["%y"]=(""+l).substr(2,2),s["%Y"]=l,s["%%"]="%";var f=/%./g,M=t.replace(f,function(t){return s[t]||t});return"[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers)&&a&&(M=Date.convertNumbers(M)),M},Date.parseFieldDate=function(t,e,a){t=Date.numbersToIso(t);var r=new Date,o=0,l=-1,i=0,n=t.split(/\W+/),s=e.match(/%./g),g=0,h=0,D=0,u=0;for(g=0;g<n.length;++g)if(n[g])switch(s[g]){case"%d":case"%e":i=parseInt(n[g],10);break;case"%m":l=parseInt(n[g],10)-1;break;case"%Y":case"%y":(o=parseInt(n[g],10))<100&&(o+=o>29?1900:2e3);break;case"%b":case"%B":for(h=0;h<12;++h)if("gregorian"!=a){if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){l=h;break}}else if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){l=h;break}break;case"%H":case"%I":case"%k":case"%l":D=parseInt(n[g],10);break;case"%P":case"%p":/pm/i.test(n[g])&&D<12?D+=12:/am/i.test(n[g])&&D>=12&&(D-=12);break;case"%M":u=parseInt(n[g],10)}if(isNaN(o)&&(o=r.getFullYear()),isNaN(l)&&(l=r.getMonth()),isNaN(i)&&(i=r.getDate()),isNaN(D)&&(D=r.getHours()),isNaN(u)&&(u=r.getMinutes()),0!=o&&-1!=l&&0!=i)return new Date(o,l,i,D,u,0);for(o=0,l=-1,i=0,g=0;g<n.length;++g)if(-1!=n[g].search(/[a-zA-Z]+/)){var c=-1;for(h=0;h<12;++h)if("gregorian"!=a){if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){c=h;break}}else if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){c=h;break}-1!=c&&(-1!=l&&(i=l+1),l=c)}else parseInt(n[g],10)<=12&&-1==l?l=n[g]-1:parseInt(n[g],10)>31&&0==o?(o=parseInt(n[g],10))<100&&(o+=o>29?1900:2e3):0==i&&(i=n[g]);return 0==o&&(o=r.getFullYear()),-1!=l&&0!=i?new Date(o,l,i,D,u,0):r},JalaliDate={g_days_in_month:[31,28,31,30,31,30,31,31,30,31,30,31],j_days_in_month:[31,31,31,31,31,31,30,30,30,30,30,29]},JalaliDate.jalaliToGregorian=function(t,e,a){for(var r=(t=parseInt(t))-979,o=(e=parseInt(e))-1,l=(a=parseInt(a))-1,i=365*r+8*parseInt(r/33)+parseInt((r%33+3)/4),n=0;n<o;++n)i+=JalaliDate.j_days_in_month[n];var s=(i+=l)+79,g=1600+400*parseInt(s/146097),h=!0;(s%=146097)>=36525&&(s--,g+=100*parseInt(s/36524),(s%=36524)>=365?s++:h=!1),g+=4*parseInt(s/1461),(s%=1461)>=366&&(h=!1,s--,g+=parseInt(s/365),s%=365);for(n=0;s>=JalaliDate.g_days_in_month[n]+(1==n&&h);n++)s-=JalaliDate.g_days_in_month[n]+(1==n&&h);return[g,n+1,s+1]},JalaliDate.checkDate=function(t,e,a){return!(t<0||t>32767||e<1||e>12||a<1||a>JalaliDate.j_days_in_month[e-1]+(12==e&&!((t-979)%33%4)))},JalaliDate.gregorianToJalali=function(t,e,a){for(var r=(t=parseInt(t))-1600,o=(e=parseInt(e))-1,l=(a=parseInt(a))-1,i=365*r+parseInt((r+3)/4)-parseInt((r+99)/100)+parseInt((r+399)/400),n=0;n<o;++n)i+=JalaliDate.g_days_in_month[n];o>1&&(r%4==0&&r%100!=0||r%400==0)&&++i;var s=(i+=l)-79,g=parseInt(s/12053);s%=12053;var h=979+33*g+4*parseInt(s/1461);(s%=1461)>=366&&(h+=parseInt((s-1)/365),s=(s-1)%365);for(n=0;n<11&&s>=JalaliDate.j_days_in_month[n];++n)s-=JalaliDate.j_days_in_month[n];return[h,n+1,s+1]},Date.prototype.setJalaliFullYear=function(t,e,a){var r=this.getDate(),o=this.getMonth(),l=this.getFullYear(),i=JalaliDate.gregorianToJalali(l,o+1,r);t<100&&(t+=1300),i[0]=t,void 0!=e&&(e>11&&(i[0]+=Math.floor(e/12),e%=12),i[1]=e+1),void 0!=a&&(i[2]=a);var n=JalaliDate.jalaliToGregorian(i[0],i[1],i[2]);return this.setFullYear(n[0],n[1]-1,n[2])},Date.prototype.setJalaliMonth=function(t,e){var a=this.getDate(),r=this.getMonth(),o=this.getFullYear(),l=JalaliDate.gregorianToJalali(o,r+1,a);t>11&&(l[0]+=Math.floor(t/12),t%=12),l[1]=t+1,void 0!=e&&(l[2]=e);var i=JalaliDate.jalaliToGregorian(l[0],l[1],l[2]);return this.setFullYear(i[0],i[1]-1,i[2])},Date.prototype.setJalaliDate=function(t){var e=this.getDate(),a=this.getMonth(),r=this.getFullYear(),o=JalaliDate.gregorianToJalali(r,a+1,e);o[2]=t;var l=JalaliDate.jalaliToGregorian(o[0],o[1],o[2]);return this.setFullYear(l[0],l[1]-1,l[2])},Date.prototype.getJalaliFullYear=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[0]},Date.prototype.getJalaliMonth=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[1]-1},Date.prototype.getJalaliDate=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[2]},Date.prototype.getJalaliDay=function(){var t=this.getDay();return t=(t)%7};
\ No newline at end of file

From 322a477a5c0a22bcf4b3d57a293791115427bfe6 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Tue, 8 Aug 2017 12:51:07 -0500
Subject: [PATCH 147/148] Correct namespace reference (Fix #17448)

---
 libraries/src/Document/Renderer/Html/ModuleRenderer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/src/Document/Renderer/Html/ModuleRenderer.php b/libraries/src/Document/Renderer/Html/ModuleRenderer.php
index 596c511d2944f..b330e79b97256 100644
--- a/libraries/src/Document/Renderer/Html/ModuleRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ModuleRenderer.php
@@ -54,7 +54,7 @@ public function render($module, $attribs = array(), $content = null)
 				 * we want to render it
 				 */
 				$tmp = $module;
-				$module = new stdClass;
+				$module = new \stdClass;
 				$module->params = null;
 				$module->module = $tmp;
 				$module->id = 0;
@@ -86,7 +86,7 @@ public function render($module, $attribs = array(), $content = null)
 		if ($params->get('cache', 0) == 1 && \JFactory::getConfig()->get('caching') >= 1 && $cachemode != 'id' && $cachemode != 'safeuri')
 		{
 			// Default to itemid creating method and workarounds on
-			$cacheparams = new stdClass;
+			$cacheparams = new \stdClass;
 			$cacheparams->cachemode = $cachemode;
 			$cacheparams->class = 'JModuleHelper';
 			$cacheparams->method = 'renderModule';

From 862aa313af59503a042646759ebea934b0d01abd Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Wed, 9 Aug 2017 09:54:24 +0200
Subject: [PATCH 148/148] Correcting non-escaped double quotes in
 en-GB.plg_sampledata_testing.ini (#17455)

---
 .../language/en-GB/en-GB.plg_sampledata_testing.ini         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini b/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
index 1b960b98292c1..2108f50b24800 100644
--- a/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
+++ b/administrator/language/en-GB/en-GB.plg_sampledata_testing.ini
@@ -24,7 +24,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_0_TITLE="Park Site"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_TITLE="Shop Site"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_0_DESC="<p>Please feel free to contact our staff at any time should you need assistance.</p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_0_TITLE="Staff"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_1_DESC="<p>Our directory of information about different kinds of fruit.</p><p>We love fruit and want the world to know more about all of its many varieties.</p><p>Although it is small now, we work on it whenever we have a chance.</p><p>All of the images can be found in <a href='http://commons.wikimedia.org/wiki/Main_Page'>Wikimedia Commons</a>.</p><p><img src='images/sampledata/fruitshop/apple.jpg' alt="Apples" title="Apples" /></p><p><em>This encyclopedia is implemented using the contact component, each fruit a separate contact and a category for each letter. A CSS style is used to create the horizontal layout of the alphabet headings.</em></p><p><em>If you wanted to, you could allow some users (such as your growers) to have access to just this category in the contact component and let them help you to create new content for the encyclopedia.</em></p>"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_1_DESC="<p>Our directory of information about different kinds of fruit.</p><p>We love fruit and want the world to know more about all of its many varieties.</p><p>Although it is small now, we work on it whenever we have a chance.</p><p>All of the images can be found in <a href='http://commons.wikimedia.org/wiki/Main_Page'>Wikimedia Commons</a>.</p><p><img src='images/sampledata/fruitshop/apple.jpg' alt=\"Apples\" title=\"Apples\" /></p><p><em>This encyclopedia is implemented using the contact component, each fruit a separate contact and a category for each letter. A CSS style is used to create the horizontal layout of the alphabet headings.</em></p><p><em>If you wanted to, you could allow some users (such as your growers) to have access to just this category in the contact component and let them help you to create new content for the encyclopedia.</em></p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CATEGORY_0_1_1_TITLE="Fruit Encyclopedia"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_ADDRESS="Address"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_CONTACT_CONTACT_0_COUNTRY="Country"
@@ -329,7 +329,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_TITLE="Image Gallery"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_1_TITLE="Animals"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_8_2_TITLE="Scenery"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_9_TITLE="Contact Categories"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_PARAM_CATEGORIES_DESCRIPTION="Because this links to the root category the "uncategorised" category is displayed."
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_PARAM_CATEGORIES_DESCRIPTION="Because this links to the root category the \"uncategorised\" category is displayed."
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_10_TITLE="News Feed Categories"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_11_TITLE="News Feed Category"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MENUS_ITEM_12_TITLE="Single News Feed"
@@ -496,7 +496,7 @@ PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_41_CONTENT="<h6>This is a neste
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_TITLE="Bottom Middle Column (Atomic Template)"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_42_CONTENT="<h6>This is another nested column</h6><p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_TITLE="Sidebar (Atomic Template)"
-PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_CONTENT="<h3>A <span class='alt'>Simple</span> Sidebar</h3><p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p><p class='quiet'>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p><h5>Incremental leading</h5><p class='incr'>Vestibulum ante ipsum primis in faucibus orci luctus vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus.</p><p class="incr">Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p>4"
+PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_43_CONTENT="<h3>A <span class='alt'>Simple</span> Sidebar</h3><p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p><p class='quiet'>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p><h5>Incremental leading</h5><p class='incr'>Vestibulum ante ipsum primis in faucibus orci luctus vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus.</p><p class=\"incr\">Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.</p>4"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_44_TITLE="Login (Atomic Template)"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_45_TITLE="Shop"
 PLG_SAMPLEDATA_TESTING_SAMPLEDATA_MODULES_MODULE_45_FOOTER_TEXT="Shop!"