Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Amanda Ghassaei
DMDesign
Commits
c144c688
Commit
c144c688
authored
Sep 08, 2015
by
Amanda Ghassaei
Browse files
more plist edits
parent
d2a83bf9
Changes
6
Hide whitespace changes
Inline
Side-by-side
js/menus/ESetupMenuView.js
View file @
c144c688
...
...
@@ -32,7 +32,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'text!eSetupMenuTemplate'
},
_makeTemplateJSON
:
function
(){
return
_
.
extend
(
this
.
model
.
toJSON
(),
eSim
.
toJSON
(),
plist
,
{
overlapDetected
:
lattice
.
get
(
"
overlapDetected
"
)}
);
return
_
.
extend
(
this
.
model
.
toJSON
(),
eSim
.
toJSON
(),
plist
,
lattice
.
toJSON
()
);
},
template
:
_
.
template
(
template
)
...
...
js/menus/MSetupMenuView.js
View file @
c144c688
...
...
@@ -3,7 +3,8 @@
*/
define
([
'
jquery
'
,
'
underscore
'
,
'
menuParent
'
,
'
plist
'
,
'
text!mSetupMenuTemplate
'
],
function
(
$
,
_
,
MenuParentView
,
plist
,
template
){
define
([
'
jquery
'
,
'
underscore
'
,
'
menuParent
'
,
'
lattice
'
,
'
plist
'
,
'
text!mSetupMenuTemplate
'
],
function
(
$
,
_
,
MenuParentView
,
lattice
,
plist
,
template
){
return
MenuParentView
.
extend
({
...
...
@@ -20,7 +21,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'text!mSetupMenuTemplate'
},
_makeTemplateJSON
:
function
(){
return
_
.
extend
(
this
.
model
.
toJSON
(),
plist
);
return
_
.
extend
(
this
.
model
.
toJSON
(),
plist
.
lattice
.
toJSON
()
);
},
template
:
_
.
template
(
template
)
...
...
js/menus/templates/ESetupMenuView.html
View file @
c144c688
...
...
@@ -5,7 +5,7 @@ Simulation Type:
<div
class=
"btn-group"
>
<button
data-toggle=
"dropdown"
class=
"btn dropdown-toggle"
type=
"button"
><
%=
allMaterialClasses
[
materialClass
]
%
><span
class=
"caret"
></span></button>
<ul
role=
"menu"
class=
"dropdown-menu"
>
<
%
_.each
(
_.keys
(
allMaterialClasses
),
function
(
key
){
%
>
<
%
_.each
(
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
materialClasses
||
_.keys
(
allMaterialClasses
),
function
(
key
){
%
>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
allMaterialClasses
[
key
]
%
></a></li>
<
%
});
%
>
</ul>
...
...
js/menus/templates/LatticeMenuView.html
View file @
c144c688
...
...
@@ -26,9 +26,9 @@ Type:
</ul>
</div><br/><br/>
Aspect Ratio:
<input
data-property=
"aspectRatio"
data-key=
"x"
value=
"<%= aspectRatio.x %>"
placeholder=
"X"
class=
"form-control floatInput"
type=
"text"
>
<input
data-property=
"aspectRatio"
data-key=
"y"
value=
"<%= aspectRatio.y %>"
placeholder=
"Y"
class=
"form-control floatInput"
type=
"text"
>
<input
data-property=
"aspectRatio"
data-key=
"z"
value=
"<%= aspectRatio.z %>"
placeholder=
"Z"
class=
"form-control floatInput"
type=
"text"
><br/><br/>
<input
data-property=
"aspectRatio"
data-key=
"x"
value=
"<%= aspectRatio.x %>"
placeholder=
"X"
class=
"form-control
lattice
floatInput"
type=
"text"
>
<input
data-property=
"aspectRatio"
data-key=
"y"
value=
"<%= aspectRatio.y %>"
placeholder=
"Y"
class=
"form-control
lattice
floatInput"
type=
"text"
>
<input
data-property=
"aspectRatio"
data-key=
"z"
value=
"<%= aspectRatio.z %>"
placeholder=
"Z"
class=
"form-control
lattice
floatInput"
type=
"text"
><br/><br/>
<
%
if
(connectionType =
=
"
gik
")
{
%
>
Part Length:
<input
data-property=
"gikLength"
value=
"<%= gikLength %>"
placeholder=
"Length"
class=
"form-control intInput appState"
type=
"text"
><br/><br/>
<
%
}
%
>
...
...
js/menus/templates/MSetupMenuView.html
View file @
c144c688
...
...
@@ -2,7 +2,7 @@ Simulation Type:
<div
class=
"btn-group"
>
<button
data-toggle=
"dropdown"
class=
"btn dropdown-toggle"
type=
"button"
><
%=
allMaterialClasses
[
materialClass
]
%
><span
class=
"caret"
></span></button>
<ul
role=
"menu"
class=
"dropdown-menu"
>
<
%
_.each
(
_.keys
(
allMaterialClasses
),
function
(
key
){
%
>
<
%
_.each
(
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
materialClasses
||
_.keys
(
allMaterialClasses
),
function
(
key
){
%
>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
allMaterialClasses
[
key
]
%
></a></li>
<
%
});
%
>
</ul>
...
...
js/menus/templates/MaterialMenuView.html
View file @
c144c688
...
...
@@ -3,8 +3,8 @@
<div
class=
"btn-group"
>
<button
data-toggle=
"dropdown"
class=
"btn dropdown-toggle"
type=
"button"
><
%=
allMaterialClasses
[
materialClass
]
%
><span
class=
"caret"
></span></button>
<ul
role=
"menu"
class=
"dropdown-menu"
>
<
%
_.each
(
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
materialClasses
||
allMaterialClasses
,
function
(
val
,
key
){
%
>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
v
al
%
></a></li>
<
%
_.each
(
allLattices
[
cellType
].
connection
[
connectionType
].
type
[
latticeType
].
materialClasses
||
_.keys
(
allMaterialClasses
)
,
function
(
key
){
%
>
<li><a
class=
"appState dropdownSelector"
data-property=
"materialClass"
data-value=
"<%= key %>"
href=
"#"
><
%=
al
lMaterialClasses
[
key
]
%
></a></li>
<
%
});
%
>
</ul>
</div><br/><br/>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment