From 2e42f99d007f9897cb6a7d017dce91bd8b1a6546 Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Fri, 25 Sep 2015 15:41:55 +0545
Subject: [PATCH] add $prepend option to addStyle() & addVendorStyle()

---
 lib/private/template.php | 28 ++++++++++++++--------------
 lib/private/util.php     | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index 60ff49a5b3..0300e43ede 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -92,26 +92,26 @@ class OC_Template extends \OC\Template\Base {
 	public static function initTemplateEngine() {
 		if (self::$initTemplateEngineFirstRun){
 			
-			//apps that started before the template initialization can load their own scripts
-			//so to make sure this scripts here are loaded first we use OC_Util::addScript() with $prepend=true
-			//meaning the last scripts in this list will be loaded first
+			//apps that started before the template initialization can load their own scripts/styles
+			//so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
+			//meaning the last script/style in this list will be loaded first
 			if (\OC::$server->getSystemConfig ()->getValue ( 'installed', false ) && ! \OCP\Util::needUpgrade ()) {
 				if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
 					OC_Util::addScript ( 'backgroundjobs', null, true );
 				}
 			}
 
-			OC_Util::addStyle("styles");
-			OC_Util::addStyle("header");
-			OC_Util::addStyle("mobile");
-			OC_Util::addStyle("icons");
-			OC_Util::addStyle("fonts");
-			OC_Util::addStyle("apps");
-			OC_Util::addStyle("fixes");
-			OC_Util::addStyle("multiselect");
-			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui');
-			OC_Util::addStyle('jquery-ui-fixes');
-			OC_Util::addStyle("tooltip");
+			OC_Util::addStyle("tooltip",null,true);
+			OC_Util::addStyle('jquery-ui-fixes',null,true);
+			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
+			OC_Util::addStyle("multiselect",null,true);
+			OC_Util::addStyle("fixes",null,true);
+			OC_Util::addStyle("apps",null,true);
+			OC_Util::addStyle("fonts",null,true);
+			OC_Util::addStyle("icons",null,true);
+			OC_Util::addStyle("mobile",null,true);
+			OC_Util::addStyle("header",null,true);
+			OC_Util::addStyle("styles",null,true);
 
 			// avatars
 			if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {
diff --git a/lib/private/util.php b/lib/private/util.php
index 117e57f66d..9702f38a48 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -507,12 +507,17 @@ class OC_Util {
 	 *
 	 * @param string $application application id
 	 * @param string|null $file filename
+	 * @param bool $prepend prepend the Style to the beginning of the list
 	 * @return void
 	 */
-	public static function addStyle($application, $file = null) {
+	public static function addStyle($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'css', $file);
 		if (!in_array($path, self::$styles)) {
-			self::$styles[] = $path;
+			if ($prepend === true) {
+				array_unshift ( self::$styles, $path );
+			} else {
+				self::$styles[] = $path;
+			}	
 		}
 	}
 
@@ -521,12 +526,17 @@ class OC_Util {
 	 *
 	 * @param string $application application id
 	 * @param string|null $file filename
+	 * @param bool $prepend prepend the Style to the beginning of the list
 	 * @return void
 	 */
-	public static function addVendorStyle($application, $file = null) {
+	public static function addVendorStyle($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'vendor', $file);
 		if (!in_array($path, self::$styles)) {
-			self::$styles[] = $path;
+			if ($prepend === true) {
+				array_unshift ( self::$styles, $path );
+			} else {
+				self::$styles[] = $path;
+			}	
 		}
 	}