Use ui.controller instead of requiring controller in new()
This commit is contained in:
@@ -9,7 +9,6 @@
|
|||||||
(prop :Map<String,EntryRep> entryReps (new Map))
|
(prop :Map<String,EntryRep> entryReps (new Map))
|
||||||
|
|
||||||
(defNew [&prop :ArchiveUI ui
|
(defNew [&prop :ArchiveUI ui
|
||||||
&prop :ArchiveController controller
|
|
||||||
:EntryChecker canProcess
|
:EntryChecker canProcess
|
||||||
&prop :PlaygroundEntryProcessor createEntryRep
|
&prop :PlaygroundEntryProcessor createEntryRep
|
||||||
&prop :PlaygroundConnectionProcessor connectionProcessor
|
&prop :PlaygroundConnectionProcessor connectionProcessor
|
||||||
@@ -88,7 +87,7 @@
|
|||||||
(object x 0.0 y 0.0 z 0.0))
|
(object x 0.0 y 0.0 z 0.0))
|
||||||
|
|
||||||
(method getSelectedReps []
|
(method getSelectedReps []
|
||||||
(filter (for e (controller.getSelectedEntries) (dictGet entryReps e.id))))
|
(filter (for e (ui.controller.getSelectedEntries) (dictGet entryReps e.id))))
|
||||||
|
|
||||||
// TODO overridable circleContainsEntry function (default is to check only the position, Flixel version will use scaled sprite bounding box)
|
// TODO overridable circleContainsEntry function (default is to check only the position, Flixel version will use scaled sprite bounding box)
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
:ArchiveController controller]
|
:ArchiveController controller]
|
||||||
(super
|
(super
|
||||||
playState
|
playState
|
||||||
controller
|
|
||||||
->[archive e]
|
->[archive e]
|
||||||
?(or (hasComponent e Name) (hasComponent e Circle) (hasComponent e Rectangle))
|
?(or (hasComponent e Name) (hasComponent e Circle) (hasComponent e Rectangle))
|
||||||
->[archive e pos &opt ui]
|
->[archive e pos &opt ui]
|
||||||
|
|||||||
Reference in New Issue
Block a user