Skip to content
Snippets Groups Projects
Commit f3d919d0 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

menu animation

parent b6b2b0a9
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,7 @@ $(function(){ ...@@ -22,6 +22,7 @@ $(function(){
var threeView = new ThreeView({model:threeModel, lattice:lattice}); var threeView = new ThreeView({model:threeModel, lattice:lattice});
MenuWrapper(); //setup ui
setupNavBar(threeModel); var menu = MenuWrapper();
NavBar(menu);
}); });
...@@ -24,7 +24,7 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -24,7 +24,7 @@ LatticeMenuView = Backbone.View.extend({
Cell Connection:<br/>\ Cell Connection:<br/>\
Scale:<br/>\ Scale:<br/>\
Column Separation:<br/><br/>\ Column Separation:<br/><br/>\
<a href="#" class=" btn btn-block btn-lg btn-default">Clear All</a><br/>\ <a href="#" class=" btn btn-block btn-lg btn-default">Clear All Cells</a><br/>\
<span class="btn btn-default btn-file fullWidth">\ <span class="btn btn-default btn-file fullWidth">\
Upload STL<input id="uploadMesh" type="file">\ Upload STL<input id="uploadMesh" type="file">\
</span><br/><br/>\ </span><br/><br/>\
......
...@@ -5,12 +5,15 @@ ...@@ -5,12 +5,15 @@
function MenuWrapper(){ function MenuWrapper(){
var $el = $("#menuWrapper");
//init all tab view controllers //init all tab view controllers
var latticeMenu = new LatticeMenuView(); var latticeMenu = new LatticeMenuView();
var sketchMenu = new SketchMenuView(); var sketchMenu = new SketchMenuView();
var partMenu = new PartMenuView(); var partMenu = new PartMenuView();
var scriptMenu = new ScriptMenuView(); var scriptMenu = new ScriptMenuView();
init();
var tabItems = $(".nav-tabs>li>a"); var tabItems = $(".nav-tabs>li>a");
tabItems.click(function(e){ tabItems.click(function(e){
...@@ -37,6 +40,20 @@ function MenuWrapper(){ ...@@ -37,6 +40,20 @@ function MenuWrapper(){
} }
}); });
latticeMenu.render();//init with lattice menu open function init(){
latticeMenu.render();//init with lattice menu open
}
function hide(){
$el.animate({right: "-400"});
}
function show(){
$el.animate({right: "0"});
}
return {//return public properties and methods
hide: hide,
show:show
};
} }
\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
function setupNavBar(three){ function NavBar(menu){
var allMenus = $(".navMenu"); var allMenus = $(".navMenu");
var allNavMenuLinks = $(".menuHoverControls"); var allNavMenuLinks = $(".menuHoverControls");
...@@ -17,13 +17,25 @@ function setupNavBar(three){ ...@@ -17,13 +17,25 @@ function setupNavBar(three){
// $(menuId).show(); // $(menuId).show();
// }); // });
var clearButton = $("#clearAll"); var showHideMenuBtn = $("#showHideMenu");
clearButton.mouseout(function(){ showHideMenuBtn.mouseout(function(){
$(this).parent().removeClass("open"); $(this).parent().removeClass("open");
}); });
//show/hide menu
//clear canvas showHideMenuBtn.click(function(e){
clearButton.click(three.clearAll); e.preventDefault();
var $this = $(this);
var state = $this.data('state');
if(state){
$this.html("<< Show Menu");
menu.hide();
} else {
$this.html("Hide Menu >>");
menu.show();
}
$this.data('state', !state);
$this.blur();
});
function hideAllMenus(){ function hideAllMenus(){
allMenus.hide(); allMenus.hide();
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<!--<script src="js/views/elementMenu.js"></script>--> <!--<script src="js/views/elementMenu.js"></script>-->
<script src="js/menus/exportMenu.js"></script> <script src="js/menus/exportMenu.js"></script>
<script src="js/menus/navbar.js"></script> <script src="js/menus/Navbar.js"></script>
<link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/main.css">
</head> </head>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<li><a data-menu-id="about" class="menuHoverControls" href="#">About</a></li> <li><a data-menu-id="about" class="menuHoverControls" href="#">About</a></li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a id="clearAll" class="menuHoverControls" href="#">Show/Hide Menu >></a></li> <li><a id="showHideMenu" data-state=true class="menuHoverControls" href="#">Hide Menu >></a></li>
</ul> </ul>
<!--<a href="#fakelink" id="clearAll" class=" btn btn-lg btn-primary">Clear All</a>--> <!--<a href="#fakelink" id="clearAll" class=" btn btn-lg btn-primary">Clear All</a>-->
</div><!-- /.navbar-collapse --> </div><!-- /.navbar-collapse -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment