Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DMDesign
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amanda Ghassaei
DMDesign
Commits
fba9cade
Commit
fba9cade
authored
9 years ago
by
Amanda Ghassaei
Browse files
Options
Downloads
Patches
Plain Diff
composite menu fixes
parent
863e9f07
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
js/lattice/CompositeEditorLattice.js
+0
-1
0 additions, 1 deletion
js/lattice/CompositeEditorLattice.js
js/menus/CompositeMenu.js
+2
-2
2 additions, 2 deletions
js/menus/CompositeMenu.js
js/menus/MenuWrapperView.js
+1
-0
1 addition, 0 deletions
js/menus/MenuWrapperView.js
with
3 additions
and
3 deletions
js/lattice/CompositeEditorLattice.js
+
0
−
1
View file @
fba9cade
...
@@ -30,7 +30,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
...
@@ -30,7 +30,6 @@ define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'thre
initLatticeSubclass
:
function
(
subclass
){
initLatticeSubclass
:
function
(
subclass
){
var
self
=
this
;
var
self
=
this
;
require
([
subclass
],
function
(
subclassObject
){
require
([
subclass
],
function
(
subclassObject
){
_
.
extend
(
self
,
subclassObject
);
_
.
extend
(
self
,
subclassObject
);
// //copy over cells to new lattice type
// //copy over cells to new lattice type
...
...
This diff is collapsed.
Click to expand it.
js/menus/CompositeMenu.js
+
2
−
2
View file @
fba9cade
...
@@ -82,10 +82,10 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
...
@@ -82,10 +82,10 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _
template
:
_
.
template
(
'
\
template
:
_
.
template
(
'
\
<a href="#" class="btn btn-halfWidth btn-lg btn-default importJSON">Load Composite</a>
\
<a href="#" class="btn btn-halfWidth btn-lg btn-default importJSON">Load Composite</a>
\
<a id="saveComposite" href="#" class="btn btn-halfWidth btn-lg pull-right btn-default">Save Composite</a><br/><br/>
\
<a id="saveComposite" href="#" class="btn btn-halfWidth btn-lg pull-right btn-default">Save Composite</a><br/><br/>
\
Name: <input id="compositeName" data-property="name" value="<%= name %>" placeholder="Enter Name" class="seventyFiveWidth form-control textInput
lattice
" type="text"><br/><br/>
\
Name: <input id="compositeName" data-property="name" value="<%= name %>" placeholder="Enter Name" class="seventyFiveWidth form-control textInput
compositeEditor
" type="text"><br/><br/>
\
Bounding Box: ()<br/><br/>
\
Bounding Box: ()<br/><br/>
\
Display Color:
\
Display Color:
\
<input id="compositeColor" style="border-color: <%= color %> ;" data-property="color" value="<%= color %>" placeholder="Enter HEX" class="halfWidth
lattice
form-control hexInput" type="text"><br/><br/>
\
<input id="compositeColor" style="border-color: <%= color %> ;" data-property="color" value="<%= color %>" placeholder="Enter HEX" class="halfWidth
compositeEditor
form-control hexInput" type="text"><br/><br/>
\
<a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/><br/>
\
<a id="newRandomColor" href="#" class="btn btn-block btn-lg btn-default">New Random Color</a><br/><br/>
\
<a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>
\
<a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>
\
<a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>
\
<a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>
\
...
...
This diff is collapsed.
Click to expand it.
js/menus/MenuWrapperView.js
+
1
−
0
View file @
fba9cade
...
@@ -162,6 +162,7 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice'], function($, _,
...
@@ -162,6 +162,7 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice'], function($, _,
_getPropertyOwner
:
function
(
$target
){
_getPropertyOwner
:
function
(
$target
){
if
(
$target
.
hasClass
(
"
lattice
"
))
return
lattice
;
if
(
$target
.
hasClass
(
"
lattice
"
))
return
lattice
;
if
(
$target
.
hasClass
(
"
compositeEditor
"
))
return
lattice
.
compositeEditor
;
if
(
$target
.
hasClass
(
"
assembler
"
))
return
globals
.
cam
;
if
(
$target
.
hasClass
(
"
assembler
"
))
return
globals
.
cam
;
if
(
$target
.
hasClass
(
"
appState
"
))
return
this
.
model
;
if
(
$target
.
hasClass
(
"
appState
"
))
return
this
.
model
;
console
.
warn
(
"
no owner found for
"
+
$target
);
console
.
warn
(
"
no owner found for
"
+
$target
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment