Browse Source

Merge pull request #496 from daylerees/anbu-jquery-fix

Anbu jquery fix
Taylor Otwell 12 years ago
parent
commit
616460725f

File diff suppressed because it is too large
+ 2 - 1
laravel/profiling/profiler.css


+ 0 - 13
laravel/profiling/profiler.php

@@ -60,19 +60,6 @@ class Profiler {
 		static::$data['queries'][] = array($sql, $time);
 		static::$data['queries'][] = array($sql, $time);
 	}
 	}
 
 
-	/**
-	 * Determine if the given response includes jQuery.
-	 *
-	 * @param  Response  $response
-	 * @return bool
-	 */
-	protected static function has_jquery($response)
-	{
-		$pattern = '/\<head>(.*)\<script(.+)jquery(.*)\>\<\/script\>(.*)\<\/head\>/';
-
-		return preg_match($pattern, $response->content);
-	}
-
 	/**
 	/**
 	 * Attach the Profiler's event listeners.
 	 * Attach the Profiler's event listeners.
 	 *
 	 *

+ 1 - 1
laravel/profiling/template.blade.php

@@ -64,6 +64,6 @@
 	</ul>
 	</ul>
 </div>
 </div>
 
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+<script>window.jQuery || document.write("<script src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'>\x3C/script>")</script>
 <script>{{ file_get_contents(path('sys').'profiling/profiler.js') }}</script>
 <script>{{ file_get_contents(path('sys').'profiling/profiler.js') }}</script>
 <!-- /ANBU - LARAVEL PROFILER -->
 <!-- /ANBU - LARAVEL PROFILER -->

Some files were not shown because too many files changed in this diff