From fca0dccc01a1e44e7d3d211570fc5d14ce91fad4 Mon Sep 17 00:00:00 2001
From: nelsonlaquet <nelsonlaquet@gmail.com>
Date: Sun, 1 Sep 2013 00:13:51 -0500
Subject: [PATCH] fixed assets

---
 app/library/Assets.php                  | 20 +++++++++++++++-----
 app/views/shared/_app_layout.blade.php  |  3 ++-
 public/styles/app.less                  |  2 --
 public/templates/directives/player.html |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/library/Assets.php b/app/library/Assets.php
index ee6a3065..d362b63b 100644
--- a/app/library/Assets.php
+++ b/app/library/Assets.php
@@ -41,6 +41,8 @@
 		}
 
 		public static function scriptAssetCollection($area) {
+			$coffeeScript = new CoffeeScriptFilter(Config::get('app.coffee'));
+
 			if ($area == 'app') {
 				$collection = new AssetCollection([
 					new FileAsset('scripts/base/jquery-2.0.2.js'),
@@ -60,15 +62,23 @@
 					new FileAsset('scripts/base/angularytics.js'),
 					new AssetCollection([
 						new GlobAsset('scripts/shared/*.coffee'),
-						new GlobAsset('scripts/shared/*.js'),
+					], [
+						$coffeeScript
+					]),
+					new GlobAsset('scripts/shared/*.js'),
+					new AssetCollection([
 						new GlobAsset('scripts/app/*.coffee'),
 						new GlobAsset('scripts/app/services/*.coffee'),
 						new GlobAsset('scripts/app/filters/*.coffee'),
-						new GlobAsset('scripts/app/filters/*.js'),
+					], [
+						$coffeeScript
+					]),
+					new GlobAsset('scripts/app/filters/*.js'),
+					new AssetCollection([
 						new GlobAsset('scripts/app/directives/*.coffee'),
 						new GlobAsset('scripts/app/controllers/*.coffee'),
 					], [
-						new CoffeeScriptFilter(Config::get('app.coffee'))
+						$coffeeScript
 					])
 				]);
 
@@ -78,7 +88,7 @@
 					$collection->add(new AssetCollection([
 						new GlobAsset('scripts/debug/*.coffee'),
 					], [
-						new CoffeeScriptFilter(Config::get('app.coffee'))
+						$coffeeScript
 					]));
 				}
 
@@ -94,7 +104,7 @@
 					new AssetCollection([
 						new GlobAsset('scripts/embed/*.coffee'),
 					], [
-						new CoffeeScriptFilter(Config::get('app.coffee'))
+						$coffeeScript
 					])
 				]);
 
diff --git a/app/views/shared/_app_layout.blade.php b/app/views/shared/_app_layout.blade.php
index 0cf624fb..f64e27d5 100644
--- a/app/views/shared/_app_layout.blade.php
+++ b/app/views/shared/_app_layout.blade.php
@@ -86,7 +86,8 @@
 @endsection
 
 @section('styles')
-	<link rel="stylesheet" type="text/css" href="/styles/loader.css" />
+	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Josefin+Sans" />
+	<link rel="stylesheet" href="/styles/loader.css" />
 	{{ Assets::styleIncludes() }}
 @endsection
 
diff --git a/public/styles/app.less b/public/styles/app.less
index ec6534e6..028b4025 100644
--- a/public/styles/app.less
+++ b/public/styles/app.less
@@ -1,5 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Josefin+Sans);
-
 @import 'base/bootstrap/bootstrap';
 @import 'base/bootstrap/responsive';
 @import 'base/font-awesome/font-awesome';
diff --git a/public/templates/directives/player.html b/public/templates/directives/player.html
index ce36ef82..82ef882f 100644
--- a/public/templates/directives/player.html
+++ b/public/templates/directives/player.html
@@ -34,4 +34,4 @@
 			<div class="loader-bar" pfm-progress-bar="player.currentTrack.loadingProgress"></div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>