Robert Marshall пре 9 година
родитељ
комит
5f766d2918
2 измењених фајлова са 8 додато и 4 уклоњено
  1. 6 2
      scripts/controllers/main.js
  2. 2 2
      template.php

+ 6 - 2
scripts/controllers/main.js

@@ -5,11 +5,15 @@ var app = angular.module("robware", ['ngAnimate']);
 app.controller("main", function($scope) {
 	var largeWindowBoundary = 1023;
 
-	$scope.menuVisible = window.innerWidth > largeWindowBoundary;
+	$scope.menuVisible = false;//window.innerWidth > largeWindowBoundary;
+
+	$scope.shouldShowMenu = function() {
+		return $scope.menuVisible || window.innerWidth > 1023;
+	};
 
 	$(window).on("resize.doResize", function() {
 		$scope.$apply(function() {
-			$scope.menuVisible = window.innerWidth > largeWindowBoundary;
+			//$scope.menuVisible = false;
 		});
 	});
 });

+ 2 - 2
template.php

@@ -66,7 +66,7 @@ function FormatURI(URI $uri, $base=""){
 				?></h2>
 			</div>
 		</div>
-		<div id="menu" ng-show="menuVisible">
+		<div id="menu" ng-show="shouldShowMenu()">
 			<div class="header">
 				<img src="/images/logo.png" /><h1>Robware</h1>
 			</div>
@@ -125,6 +125,6 @@ function FormatURI(URI $uri, $base=""){
 			</div>
 			<div id="footer">{@Footer}</div>
 		</div>
-		<div class="backdrop" ng-show="menuVisible" ng-click="menuVisible=false"></div>
+		<div class="backdrop" ng-show="shouldShowMenu()" ng-click="menuVisible=false"></div>
 	</body>
 </html>