From 4c1a5e69419267a1e6e609428aed3b00263ca3fa Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sat, 24 Oct 2015 11:44:10 -0400
Subject: [PATCH] lattice type fixes
---
css/main.css | 2 +-
js/lattice/Lattice.js | 12 ++++++------
js/menus/contextMenu/ContextMenu.js | 5 +++--
js/menus/templates/Ribbon.html | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/css/main.css b/css/main.css
index 9d842d90..2f410321 100644
--- a/css/main.css
+++ b/css/main.css
@@ -531,7 +531,7 @@ label {
#contextMenuWrapper{
background-color: clear;
- padding: 20px;
+ padding: 10px;
position: absolute;
z-index: 10;
display: none;
diff --git a/js/lattice/Lattice.js b/js/lattice/Lattice.js
index 8c3a095e..dd332a8e 100644
--- a/js/lattice/Lattice.js
+++ b/js/lattice/Lattice.js
@@ -125,7 +125,7 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'materialsPlis
setConnectionType: function(connectionType, silent){
var cellType = this.get("cellType");
var plistCellData = plist.allLattices[cellType];
- if (plistCellData[connectionType] === undefined){
+ if (plistCellData.connection[connectionType] === undefined){
console.warn("no connection type " + connectionType + " for cell type " + plistCellData.name);
return;
}
@@ -136,8 +136,8 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'materialsPlis
var cellType = this.get("cellType");
var plistCellData = plist.allLattices[cellType];
var connectionType = this.get("connectionType");
- var plistConnectionData = plistCellData[connectionType];
- if (plistConnectionData[applicationType] === undefined){
+ var plistConnectionData = plistCellData.connection[connectionType];
+ if (plistConnectionData.type[applicationType] === undefined){
console.warn("no application type " + applicationType + " for cell type " + plistCellData.name + " and connection type " + plistConnectionData.name);
return;
}
@@ -148,10 +148,10 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'materialsPlis
var cellType = this.get("cellType");
var plistCellData = plist.allLattices[cellType];
var connectionType = this.get("connectionType");
- var plistConnectionData = plistCellData[connectionType];
+ var plistConnectionData = plistCellData.connection[connectionType];
var applicationType = this.get("applicationType");
- var plistAppData = plistConnectionData[applicationType];
- if (plistConnectionData[applicationType] === undefined){
+ var plistAppData = plistConnectionData.type[applicationType];
+ if (plistAppData.parts[partType] === undefined){
console.warn("no part type " + partType + " for cell type " + plistCellData.name + " and connection type " + plistConnectionData.name + " and application type " + plistAppData.name);
return;
}
diff --git a/js/menus/contextMenu/ContextMenu.js b/js/menus/contextMenu/ContextMenu.js
index e7d3acd7..04645490 100644
--- a/js/menus/contextMenu/ContextMenu.js
+++ b/js/menus/contextMenu/ContextMenu.js
@@ -43,9 +43,10 @@ define(['jquery', 'underscore', 'backbone', 'text!menus/contextMenu/MaterialsCon
},
showMenu: function(e){
- var left = e.pageX-20;
+ var padding = parseInt($wrapper.css("padding"));
+ var left = e.pageX-padding;
if ($('body').width()-200 < left) left -= 200;
- $wrapper.css({left:left, top: e.pageY-20});
+ $wrapper.css({left:left, top: e.pageY-padding});
$wrapper.show();
},
diff --git a/js/menus/templates/Ribbon.html b/js/menus/templates/Ribbon.html
index 06537a8e..c9f908d1 100644
--- a/js/menus/templates/Ribbon.html
+++ b/js/menus/templates/Ribbon.html
@@ -8,7 +8,7 @@
<% } %>
<!--<a data-type="beam" class="btn btn-primary btn-ribbon ribbonCellMode<% if (cellMode == "beam"){ %> ribbon-selected<% } %>" href="#">Beam</a>-->
<% if (currentNav != "navDesign"){%>
- <a data-type="hide" class="btn btn-primary btn-ribbon ribbonCellMode<% if (cellMode == "hide"){ %> ribbon-selected"<% } %>"><img data-type="hide" src="assets/imgs/hide.png"></a>
+ <a data-type="hide" class="btn btn-primary btn-ribbon ribbonCellMode<% if (cellMode == "hide"){ %> ribbon-selected"<% } %>">Hide</a>
<% }else{ %>
<a class="btn btn-primary btn-ribbon ribbonDeleteMode<% if (deleteMode){ %> ribbon-selected"<% } %>"><span class="fui-cross"></span></a>
<% } %>
--
GitLab