ADD async loading for external JS files

controllers/FeedController.php

@@ -67,7 +67,7 @@ class FeedController extends Controller
 		self::addStyle('/css/bootstrap-theme.min.css');
 
 		if (!App::$user) {
-			self::addScript('//ulogin.ru/js/ulogin.js');
+			self::addScript('http://ulogin.ru/js/ulogin.js');
 		}
 
 		self::render('feed/index.php', array(

controllers/IndexController.php

@@ -16,7 +16,7 @@ class IndexController extends Controller
 		self::addScript('http://maps.google.com/maps/api/js?v=3&sensor=false');
 		self::addScript('/js/tile/Google.js');
 
-		self::addScript('http://api-maps.yandex.ru/2.0/?load=package.map&lang=ru-RU');
+		self::addScript('/js/api-maps-yandex-2.0.js');
 		self::addScript('/js/tile/Yandex.js');
 
 		self::addScript('/js/app.js?ver=' . App::getConfig('version'));
@@ -39,8 +39,9 @@ class IndexController extends Controller
 		self::addStyle('/css/fotorama.css');
 		self::addStyle('/css/indexMap.css?ver='.App::getConfig('version'));
 
-		if (!App::$user)
+		if (!App::$user) {
-			self::addScript('//ulogin.ru/js/ulogin.js');
+			self::addScript('http://ulogin.ru/js/ulogin.js');
+		}
 
 		$category = Category::model()->getAll(array('order' => 'ord ASC'));
 		$categoryArray = Category::model()->getAll(array('order' => 'ord ASC', 'asArray' => true));

controllers/PageController.php

@@ -17,7 +17,7 @@ class PageController extends Controller
 		self::addStyle('/css/bootstrap-theme.min.css');
 
 		if (!App::$user) {
-			self::addScript('//ulogin.ru/js/ulogin.js');
+			self::addScript('http://ulogin.ru/js/ulogin.js');
 		}
 
 		$notModeratedPoints = $result = array();

controllers/PointController.php

@@ -21,7 +21,7 @@ class PointController extends Controller
 		self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
 		self::addScript('/js/bootstrap.min.js');
 		self::addScript('/js/leaflet-0.7.3.js');
-		self::addScript('http://api-maps.yandex.ru/2.0/?load=package.map&lang=ru-RU');
+		self::addScript('/js/api-maps-yandex-2.0.js');
 		self::addScript('/js/leaflet.markercluster.js');
 
 		self::addScript('/js/app.js?ver=' . App::getConfig('version'));
@@ -41,7 +41,7 @@ class PointController extends Controller
 			self::addVar('user', App::$user->id);
 		} else {
 			self::addVar('user', '0');
-			self::addScript('//ulogin.ru/js/ulogin.js');
+			self::addScript('http://ulogin.ru/js/ulogin.js');
 		}
 
 		if ($point->status != Point::statusPublished) {

controllers/UserController.php

@@ -43,7 +43,7 @@ class UserController extends Controller
 		}
 
 		if (!App::$user) {
-			self::addScript('//ulogin.ru/js/ulogin.js');
+			self::addScript('http://ulogin.ru/js/ulogin.js');
 		}
 
 		if (App::$user && App::$user->id == $id) {

views/comments/all.php

@@ -18,6 +18,6 @@ if (App::$user) {
 } else {
 	self::renderPartial('comments/deny.php', array());
 
-	self::addScript('//ulogin.ru/js/ulogin.js');
+	self::addScript('http://ulogin.ru/js/ulogin.js');
 	self::renderPartial('modals/login.php', array());
 }

views/layouts/clear.php

@@ -39,15 +39,15 @@
 		<?= isset($content) && !empty($content) ? $content : 'No content =(' ?>
 	</body>
 
-<?php if ($scripts): ?>
-<?php foreach ($scripts as $script): ?>
-	<script src="<?= $script ?>" type="text/javascript"></script>
-<?php endforeach; ?>
-<?php endif; ?>
-
 <?php if ($styles): ?>
 <?php foreach ($styles as $style): ?>
 	<link href="<?= $style ?>" media="all" rel="stylesheet" type="text/css" />
 <?php endforeach; ?>
 <?php endif; ?>
+
+<?php if ($scripts): ?>
+<?php foreach ($scripts as $script): ?>
+	<script src="<?= $script ?>" <?= (strpos($script, 'http://') === 0) ? 'async':'' ?> type="text/javascript"></script>
+<?php endforeach; ?>
+<?php endif; ?>
 </html>

views/layouts/default.php

@@ -56,15 +56,15 @@
 		</style>
 	</body>
 
-<?php if ($scripts): ?>
-<?php foreach ($scripts as $script): ?>
-	<script src="<?= $script ?>" type="text/javascript"></script>
-<?php endforeach; ?>
-<?php endif; ?>
-
 <?php if ($styles): ?>
 <?php foreach ($styles as $style): ?>
 	<link href="<?= $style ?>" media="all" rel="stylesheet" type="text/css" />
 <?php endforeach; ?>
 <?php endif; ?>
+
+<?php if ($scripts): ?>
+<?php foreach ($scripts as $script): ?>
+	<script src="<?= $script ?>" <?= (strpos($script, 'http://') === 0) ? 'async':'' ?> type="text/javascript"></script>
+<?php endforeach; ?>
+<?php endif; ?>
 </html>

views/layouts/page.php

@@ -11,7 +11,7 @@
 
 <?php if ($scripts): ?>
 <?php foreach ($scripts as $script): ?>
-		<script src="<?= $script ?>" type="text/javascript"></script>
+		<script src="<?= $script ?>" <?= (strpos($script, 'http://') === 0) ? 'async':'' ?> type="text/javascript"></script>
 <?php endforeach; ?>
 <?php endif; ?>
 

views/layouts/print.php

@@ -11,12 +11,15 @@
 		<link href="<?= $style ?>" media="all" rel="stylesheet" type="text/css" />
 <?php endforeach; ?>
 <?php endif; ?>
+
 		<link rel="stylesheet" type="text/css" href="/css/font-ubuntu.css" />
+
 <?php if ($scripts): ?>
 <?php foreach ($scripts as $script): ?>
-		<script src="<?= $script ?>" type="text/javascript"></script>
+		<script src="<?= $script ?>" <?= (strpos($script, 'http://') === 0) ? 'async':'' ?> type="text/javascript"></script>
 <?php endforeach; ?>
 <?php endif; ?>
+
 <?php if ($vars): ?>
 		<script type="text/javascript">
 <?php foreach ($vars as $varName => $var): ?>
@@ -24,6 +27,7 @@
 <?php endforeach; ?>
 		</script>
 <?php endif; ?>
+
 	</head>
 	<body>
 		<h1>WikiPoints.ru</h1>