owncloud · MorrisJobke · Feb 21, 2014 · Feb 20, 2014 · Feb 20, 2014 · Feb 20, 2014
diff --git a/3rdparty b/3rdparty
diff --git a/config/config.sample.php b/config/config.sample.php
@@ -264,6 +264,9 @@
 /* whether usage of the instance should be restricted to admin users only */
 'singleuser' => false,
 
+/* all css and js files will be served by the web server statically in one js file and ons css file*/
+'asset-pipeline.enabled' => false,
+
  /* where mount.json file should be stored, defaults to data/mount.json */
  'mount_file' => '',
 );
diff --git a/core/js/tags.js b/core/js/tags.js
@@ -25,11 +25,11 @@ OC.Tags= {
 				});
 				self.deleteButton = {
 					text: t('core', 'Delete'),
-					click: function() {self._deleteTags(self, type, self._selectedIds())},
+					click: function() {self._deleteTags(self, type, self._selectedIds())}
 				};
 				self.addButton = {
 					text: t('core', 'Add'),
-					click: function() {self._addTag(self, type, self.$taginput.val())},
+					click: function() {self._addTag(self, type, self.$taginput.val())}
 				};
 
 				self._fillTagList(type, self.$taglist);
@@ -349,5 +349,5 @@ OC.Tags= {
 			console.warn(response);
 		});
 	}
-}
+};
 
diff --git a/core/minimizer.php b/core/minimizer.php
diff --git a/core/routes.php b/core/routes.php
@@ -100,9 +100,6 @@
 	->action('OC\Core\Avatar\Controller', 'postCroppedAvatar');
 
 // Not specifically routed
-$this->create('app_css', '/apps/{app}/{file}')
-	->requirements(array('file' => '.*.css'))
-	->action('OC', 'loadCSSFile');
 $this->create('app_index_script', '/apps/{app}/')
 	->defaults(array('file' => 'index.php'))
 	//->requirements(array('file' => '.*.php'))

diff --git a/lib/base.php b/lib/base.php
@@ -284,10 +284,6 @@ public static function checkUpgrade($showTemplate = true) {
 		if (self::needUpgrade()) {
 			if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
 				OC_Config::setValue('theme', '');
-				$minimizerCSS = new OC_Minimizer_CSS();
-				$minimizerCSS->clearCache();
-				$minimizerJS = new OC_Minimizer_JS();
-				$minimizerJS->clearCache();
 				OC_Util::addScript('config'); // needed for web root
 				OC_Util::addScript('update');
 				$tmpl = new OC_Template('', 'update.admin', 'guest');
@@ -725,11 +721,6 @@ public static function handleRequest() {
 		$app = OC::$REQUESTEDAPP;
 		$file = OC::$REQUESTEDFILE;
 		$param = array('app' => $app, 'file' => $file);
-		// Handle app css files
-		if (substr($file, -3) == 'css') {
-			self::loadCSSFile($param);
-			return;
-		}
 
 		// Handle redirect URL for logged in users
 		if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
@@ -796,19 +787,6 @@ public static function loadAppScriptFile($param) {
 		return false;
 	}
 
-	public static function loadCSSFile($param) {
-		$app = $param['app'];
-		$file = $param['file'];
-		$app_path = OC_App::getAppPath($app);
-		if (file_exists($app_path . '/' . $file)) {
-			$app_web_path = OC_App::getAppWebPath($app);
-			$filepath = $app_web_path . '/' . $file;
-			$minimizer = new OC_Minimizer_CSS();
-			$info = array($app_path, $app_web_path, $file);
-			$minimizer->output(array($info), $filepath);
-		}
-	}
-
 	protected static function handleLogin() {
 		OC_App::loadApps(array('prelogin'));
 		$error = array();

diff --git a/lib/private/app.php b/lib/private/app.php
@@ -69,17 +69,6 @@ public static function loadApps($types=null) {
 		}
 		ob_end_clean();
 
-		if (!defined('DEBUG') || !DEBUG) {
-			if (is_null($types)
-				&& empty(OC_Util::$coreScripts)
-				&& empty(OC_Util::$coreStyles)) {
-				OC_Util::$coreScripts = OC_Util::$scripts;
-				OC_Util::$scripts = array();
-				OC_Util::$coreStyles = OC_Util::$styles;
-				OC_Util::$styles = array();
-			}
-		}
-		// return
 		return true;
 	}
 

diff --git a/lib/private/minimizer.php b/lib/private/minimizer.php
diff --git a/lib/private/minimizer/css.php b/lib/private/minimizer/css.php
diff --git a/lib/private/minimizer/js.php b/lib/private/minimizer/js.php
diff --git a/lib/private/request.php b/lib/private/request.php
@@ -179,33 +179,6 @@ public static function getRawPathInfo() {
 		}
 	}
 
-	/**
-	 * @brief Check if this is a no-cache request
-	 * @return boolean true for no-cache
-	 */
-	static public function isNoCache() {
-		if (!isset($_SERVER['HTTP_CACHE_CONTROL'])) {
-			return false;
-		}
-		return $_SERVER['HTTP_CACHE_CONTROL'] == 'no-cache';
-	}
-
-	/**
-	 * @brief Check if the requestor understands gzip
-	 * @return false|string true for gzip encoding supported
-	 */
-	static public function acceptGZip() {
-		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
-			return false;
-		}
-		$HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"];
-		if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false )
-			return 'x-gzip';
-		else if( strpos($HTTP_ACCEPT_ENCODING, 'gzip') !== false )
-			return 'gzip';
-		return false;
-	}
-
 	/**
 	 * @brief Check if the requester sent along an mtime
 	 * @return false or an mtime

diff --git a/lib/private/setup.php b/lib/private/setup.php
@@ -97,8 +97,6 @@ public static function install($options) {
 			$appConfig = \OC::$server->getAppConfig();
 			$appConfig->setValue('core', 'installedat', microtime(true));
 			$appConfig->setValue('core', 'lastupdatedat', microtime(true));
-			$appConfig->setValue('core', 'remote_core.css', '/core/minimizer.php');
-			$appConfig->setValue('core', 'remote_core.js', '/core/minimizer.php');
 
 			OC_Group::createGroup('admin');
 			OC_Group::addToGroup($username, 'admin');

diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/template/cssresourcelocator.php
@@ -22,7 +22,7 @@ public function doFind( $style ) {
 		$app = substr($style, 0, strpos($style, '/'));
 		$style = substr($style, strpos($style, '/')+1);
 		$app_path = \OC_App::getAppPath($app);
-		$app_url = $this->webroot . '/index.php/apps/' . $app;
+		$app_url = \OC_App::getAppWebPath($app);
 		if ($this->appendIfExist($app_path, $style.$this->form_factor.'.css', $app_url)
 			|| $this->appendIfExist($app_path, $style.'.css', $app_url)
 		) {