Pete Richards
f3b265bdd5
Merge branch 'master' into open671
2016-05-09 10:19:24 -07:00
Henry
7f108c3b24
[Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture
2016-04-11 15:39:35 -07:00
Victor Woeltjen
5e44bfc6c7
Merge branch 'master' into open671
...
Conflicts:
main.js
platform/commonUI/edit/src/policies/EditableMovePolicy.js
platform/commonUI/general/src/directives/MCTTree.js
platform/commonUI/general/src/ui/ToggleView.js
platform/core/src/actions/ActionCapability.js
platform/core/test/models/CachingModelDecoratorSpec.js
platform/core/test/services/InstantiateSpec.js
platform/features/events/bundle.js
platform/features/events/src/DomainColumn.js
platform/features/events/src/EventListController.js
platform/features/events/src/EventListPopulator.js
platform/features/events/src/RangeColumn.js
platform/features/events/src/directives/MCTDataTable.js
platform/features/events/src/policies/MessagesViewPolicy.js
platform/features/events/test/DomainColumnSpec.js
platform/features/events/test/EventListControllerSpec.js
platform/features/events/test/EventListPopulatorSpec.js
platform/features/events/test/RangeColumnSpec.js
platform/features/events/test/policies/MessagesViewPolicySpec.js
platform/features/rtevents/bundle.js
platform/features/rtevents/src/DomainColumn.js
platform/features/rtevents/src/RTEventListController.js
platform/features/rtevents/src/RangeColumn.js
platform/features/rtevents/src/directives/MCTRTDataTable.js
platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
platform/features/rtevents/test/DomainColumnSpec.js
platform/features/rtevents/test/RTEventListControllerSpec.js
platform/features/rtevents/test/RangeColumnSpec.js
platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
platform/features/rtscrolling/bundle.js
platform/features/rtscrolling/src/DomainColumn.js
platform/features/rtscrolling/src/NameColumn.js
platform/features/rtscrolling/src/RTScrollingListController.js
platform/features/rtscrolling/src/RangeColumn.js
platform/features/scrolling/src/DomainColumn.js
platform/features/scrolling/src/RangeColumn.js
platform/features/scrolling/src/ScrollingListController.js
platform/features/scrolling/src/ScrollingListPopulator.js
platform/features/scrolling/test/DomainColumnSpec.js
platform/features/scrolling/test/RangeColumnSpec.js
platform/features/scrolling/test/ScrollingListControllerSpec.js
platform/features/scrolling/test/ScrollingListPopulatorSpec.js
platform/features/table/src/directives/MCTTable.js
platform/features/table/test/controllers/TelemetryTableControllerSpec.js
platform/representation/src/gestures/DropGesture.js
platform/telemetry/src/TelemetryFormatter.js
test-main.js
2016-04-08 16:08:19 -07:00
Victor Woeltjen
254a944d7a
[Firefox] Invoke preventDefault on drop
...
...such that Firefox does not try to treat drop as a new URL
to navigate to. Addresses #688 and #527
2016-03-31 10:34:24 -07:00
Victor Woeltjen
5296255fa6
[Representation] Test for false-positives on refresh
...
#732
2016-03-10 14:26:20 -08:00
Victor Woeltjen
5d084c2618
[Representation] Fix unchanged check
...
Fix logic in unchanged check; compare booleans to detect if
they have changed, instead of just anding them. Partially
addresses #732
2016-03-10 14:21:20 -08:00
Victor Woeltjen
d6ec7e9ab8
[Build] Remove unused variables from specs
...
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
Victor Woeltjen
a1a7b2b8ce
[Build] Remove unused variables
...
...to satisfy JSHint
2016-03-04 11:41:48 -08:00
Victor Woeltjen
c00d77dcb1
[Build] Relocate operators
...
...in multi-line expressions, to satisfy JSHint.
2016-03-04 11:02:57 -08:00
Victor Woeltjen
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Henry
7b5218c5ba
[Edit Mode] #627 Fixed failing tests
...
Removed reference to defunct NavigationServiceDecorator
Removed virtual panels from drop gesture
2016-03-02 11:12:41 -08:00
Henry
f192544be3
Addressing issues from code review
2016-03-02 11:10:49 -08:00
Henry
549dfab5aa
[Edit Mode] #627 remove edit concerns from browse controller
2016-03-02 10:55:18 -08:00
Victor Woeltjen
0a5097a945
Merge pull request #642 from nasa/open460
...
[Build] Move to npm-based build
2016-02-08 12:21:01 -08:00
Victor Woeltjen
f615dc5409
[Build] Add JSDoc
...
...for third argument of TemplateLinker.link, per code review
https://github.com/nasa/openmctweb/pull/642#discussion_r52212006
2016-02-08 12:17:20 -08:00
Victor Woeltjen
aebae27391
[Tests] Remove suite.json files
...
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
Victor Woeltjen
25a7df7885
[Build] Update JSDoc
2016-01-29 11:46:37 -08:00
Victor Woeltjen
6509d84a5d
[Build] Update TemplateLinker spec
2016-01-29 11:42:14 -08:00
Victor Woeltjen
507f2391ff
[Build] Update mct-include, mct-representation specs
...
...to reflect changes in TemplateLinker API allowing
templates to be explicitly included.
2016-01-29 11:27:08 -08:00
Victor Woeltjen
e0fbaa83b0
[Build] Add compatibility with text plugin
...
Allow templates to be loaded via the text plugin, which
in turn will allow these to be built into the final JS
artifact.
2016-01-28 11:41:14 -08:00
Henry
7a563b80ee
Fixing bundle load issues
2016-01-14 17:32:59 -08:00
Henry
032b2542f0
Merged from Master
2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00
Henry
f300b99b7b
[New Edit Mode] Code style fixes
...
JSLint error
2016-01-14 15:55:02 -08:00
Charles Hacskaylo
4f7ca98b60
Merge branch 'master' into nem468a.
...
Many tweaks to fix some issues with tree, labels and Inspector.
Conflicts:
platform/commonUI/edit/res/templates/elements.html
platform/commonUI/general/res/sass/search/_search.scss
platform/commonUI/general/res/sass/tree/_tree.scss
platform/commonUI/general/res/templates/object-inspector.html
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
platform/search/res/templates/search.html
2016-01-11 13:29:26 -08:00
Victor Woeltjen
cec197f888
[API Refactor] Remove bundle.json files
2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56
[API] Convert JSON bundles to imperative form
2016-01-07 15:08:08 -08:00
Henry
367d1b0247
[Edit] Drag-drop on folder triggers edit mode #420
2015-12-11 16:14:00 -08:00
Victor Woeltjen
de88bf94d4
[Documentation] Fix type declaration
...
Rephrase parameter type to something JSDoc can parse.
https://github.com/nasa/openmctweb/issues/411
2015-12-11 10:51:16 -08:00
Henry
a399b78d2c
Fixed JSLint errors
2015-12-09 18:39:57 -08:00
Henry
39b3e6c4a9
[Edit Mode] Limit context menu options available for objects in edit mode
...
[Edit Mode] Edit mode on objects that do not have a view supporting editing should edit properties instead. #320
2015-12-09 18:14:17 -08:00
Henry
6058e50216
JSLint fixes
2015-12-09 10:04:49 -08:00
Henry
49579378dd
[New Edit Mode] Fixed positioning of dropped objects #386
2015-12-09 09:51:00 -08:00
Henry
b5c741c911
Merge branch 'master' into open199
2015-12-08 15:42:37 -08:00
Henry
4419a101d6
[New Edit Mode] #199 Disabled all failing tests
2015-12-08 15:15:54 -08:00
Henry
4b7287e51e
Fixed JSLint errors
2015-12-08 14:51:25 -08:00
Victor Woeltjen
6cef663db5
[Representation] Add ending newline
2015-12-08 13:43:41 -08:00
Victor Woeltjen
b2f5861458
[Representation] Test template prefetcher
2015-12-08 13:29:11 -08:00
Victor Woeltjen
f8809ce67f
[Representation] Also prefetch containers
2015-12-08 13:06:24 -08:00
Victor Woeltjen
3498b0a50a
[Representation] Prefetch templates
...
...to ensure that dialogs et al can be displayed, even
after loss of network connectivity.
https://github.com/nasa/openmctweb/issues/383
2015-12-08 12:59:18 -08:00
Henry
18607e9404
Merged from Master
2015-12-07 20:42:09 -08:00
Victor Woeltjen
386f1f20ff
[Representation] Test switching between links
...
Add test case to verify that representation gets refreshed
when switching among two linked instances of the same
domain object.
2015-12-02 10:49:18 -08:00
Victor Woeltjen
5e07951892
[Representation] Handle missing context
...
Handle missing context when generating an ID path;
this is missing in the root object.
2015-12-02 10:23:11 -08:00
Victor Woeltjen
2514e44083
[Representation] Check full ID path
...
...when determining if a representation needs to be
refreshed. Avoids representations becoming stale
when switching or navigating among linked instances
of the same domain object.
https://github.com/nasa/openmctweb/issues/302
2015-12-02 10:21:00 -08:00
Henry
4f3c9f270b
[New Edit Mode Prototype] Hide edit button when in edit mode #350 . - Modified edit policy to hide edit button when in edit mode
2015-11-30 17:58:58 -08:00
Henry
acb7d4b807
renamed variable
2015-11-30 09:35:44 -08:00
Henry
b573b3a681
Amended change so that context menu only suppressed on navigation menu
2015-11-27 14:16:37 -08:00
Henry
6558461fda
Reverted changes after refactor
2015-11-27 13:05:55 -08:00
Henry
4b23e3fbcb
Refactored changes to ContextMenuGesture.js
2015-11-27 13:02:19 -08:00
Henry
9eb8158c4e
[Edit Mode] Disallow context menu actions on tree items during edit mode. #277
2015-11-25 14:44:31 -08:00