From f0f4be06d0f995ae79c7d5f5f71a50289b2097d4 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 29 Jan 2015 18:33:47 -0500
Subject: [PATCH] small changes
---
css/main.css | 2 +-
js/menus/navbar.js | 26 ++++++++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/css/main.css b/css/main.css
index d4786992..a0a8816c 100644
--- a/css/main.css
+++ b/css/main.css
@@ -28,7 +28,7 @@ body {
.navbar-header {
padding-right: 0px;
- width: 100px;
+ width: 104px;
}
#logo {
diff --git a/js/menus/navbar.js b/js/menus/navbar.js
index 9d52b6ca..0e5177e5 100644
--- a/js/menus/navbar.js
+++ b/js/menus/navbar.js
@@ -12,17 +12,18 @@ NavBar = Backbone.View.extend({
events: {
"click #showHideMenu": "_setMenuVis",
- "click .menuHoverControls": "_setNavSelection",
- "click .navDropdown": "_deselectAllNavItems"
+ "click .menuHoverControls": "_setNavSelection"
},
initialize: function(){
- _.bindAll(this, "_setMenuVis");
+ _.bindAll(this, "_setMenuVis", "_setNavSelection");
this.listenTo(this.model, "change:menuIsVisible", this._updateShowHideButton);
+ this.listenTo(this.model, "change:currentNav", this._updateNavSelectionUI);
this._uiStuff();
+ this._updateNavSelectionUI();
},
_setMenuVis: function(e){
@@ -44,11 +45,11 @@ NavBar = Backbone.View.extend({
_setNavSelection: function(e){
e.preventDefault();
- var $link = $(e.target);
- this._deselectAllNavItems();
- $link.parent().addClass("open");//highlight
- var navSelection = $link.data("menuId");
- if (navSelection == "about") return;
+ var navSelection = $(e.target).data("menuId");
+ if (navSelection == "about") {
+ $(e.target).blur();
+ return;
+ }
if (navSelection) {
if (navSelection=="navDesign") this.model.set("currentTab", "lattice", {silent: true});
else if (navSelection=="navSim") this.model.set("currentTab", "physics", {silent: true});
@@ -57,6 +58,15 @@ NavBar = Backbone.View.extend({
}
},
+ _updateNavSelectionUI: function(){
+ this._deselectAllNavItems();
+ var navSelection = this.model.get("currentNav");
+ _.each($(".menuHoverControls"), function(link){
+ var $link = $(link);
+ if ($link.data("menuId") == navSelection) $link.parent().addClass("open");//highlight
+ });
+ },
+
_uiStuff: function(){
var $logo = $("#logo");
$logo.mouseover(function(){
--
GitLab