Pete Richards
aba0969312
Merge branch 'mobile-integration' into open-master
2015-09-22 13:53:22 -07:00
Pete Richards
2040304980
Merge remote-tracking branch 'github-open/open19' into open-master
2015-09-22 13:49:41 -07:00
Pete Richards
8611926533
Merge remote-tracking branch 'github-open/open113' into open-master
2015-09-22 13:45:04 -07:00
Pete Richards
8b7a94dcf8
[Style] Remove unused variables, excess whitespace
...
Clean up unused variables and excess whitespace to match style guide.
2015-09-22 11:14:55 -07:00
Pete Richards
3e5d294a28
[SCSS] Fixed typo
...
Changed tmpBorder mixin to specify '@include' instead of '@iclude'. This
does not change the output CSS which means the tmpBorder mixin is not
used anywhere and could be removed.
2015-09-22 10:57:30 -07:00
Pete Richards
480da3476e
Merge branch 'mobile' into mobile-integration
2015-09-22 10:55:43 -07:00
Victor Woeltjen
0c1f77cfab
[Mobile] Collapse tree on click
...
Collapse tree any time a user does an action in the
tree that would select an object; don't only do this
on navigation changes, because this fails to detect
occasions where user clicks the already-navigated-to
object.
2015-09-21 10:53:45 -07:00
Victor Woeltjen
ae4313253c
[Mobile] Test mct-device
2015-09-18 16:47:50 -07:00
Victor Woeltjen
1e6c4732f1
[Mobile] Consolidate BrowseTreeController
...
Make mobile variant of BrowseTreeController the regular version
of that controller; Browse mode has a dependency on mobile by
way of the mct-device directive anyway.
2015-09-18 15:55:58 -07:00
Victor Woeltjen
884d36ad6d
[Mobile] Test BrowseTreeController variants
2015-09-18 15:49:55 -07:00
Victor Woeltjen
24586ae378
[Mobile] Remove BackArrowController
...
Remove BackArrowController; behavior can be implemented
in template.
2015-09-18 15:29:55 -07:00
Victor Woeltjen
cf97b30084
[Mobile] Add empty specs
2015-09-18 15:21:23 -07:00
Victor Woeltjen
e86e61c2ac
[Mobile] Fix test setup error
...
Use correct user agent strings for iPhone/iPad
(these had been reversed in the spec.)
2015-09-18 15:12:48 -07:00
Victor Woeltjen
b163b45a5e
[Framework] Update spec
...
Update spec to verify that app.controller et al
are not called multiple times with the same key.
2015-09-18 15:10:21 -07:00
Victor Woeltjen
d236fd10c3
[Framework] Move registration-tracking
...
Move registration-tracking for Angular built-ins such that
these are correctly tracked at the instance level.
2015-09-18 15:02:32 -07:00
Victor Woeltjen
befa66a9e2
[Mobile] Remove obsolete test cases
...
...for functionality that has been moved out of TreeNodeController.
2015-09-18 14:54:37 -07:00
Victor Woeltjen
5a1c83fca8
[Mobile] Update spec for AgentService
2015-09-18 14:53:14 -07:00
Victor Woeltjen
88bb213162
[Mobile] Move spec for AgentService
2015-09-18 14:34:14 -07:00
Charles Hacskaylo
65368ed0c3
[Config] Removed non-functional config options from Create dialogs;
...
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
2015-09-18 13:43:29 -07:00
Victor Woeltjen
bf05e55d02
[Mobile] Use mct-device in tree nodes
2015-09-18 12:25:51 -07:00
Victor Woeltjen
c057ba38a5
[Mobile] Add mct-device directive
...
Add directive which can be used to include certain elements
only on specific devices.
2015-09-18 12:13:37 -07:00
Victor Woeltjen
70bcb723ef
[Mobile] Small tweaks/bug fixes
...
Small tweaks/fixes (use appropriate variable names etc) for
refactoring mobile support classes.
2015-09-18 12:13:05 -07:00
Victor Woeltjen
4c5808c8c9
[Mobile] Move mobile-specific behavior to template
2015-09-18 11:01:54 -07:00
Victor Woeltjen
fa186a1556
[Mobile] Update agentService usages
2015-09-18 10:07:27 -07:00
Victor Woeltjen
0b4f44f00d
[Mobile] Remove leading slash, redundant declaration
2015-09-18 09:18:19 -07:00
Victor Woeltjen
dce7253b27
[Mobile] Move mobile bundle
2015-09-18 09:17:01 -07:00
Victor Woeltjen
158fbf5365
[Mobile] Check orientation dynamically
...
Check orientation dynamically from the AgentService
(more specifically, recheck when called - this may
change as a user rotates a device.)
2015-09-18 09:15:08 -07:00
Victor Woeltjen
1d1589da68
[Mobile] Move agentService to mobile bundle
...
...and make API tweaks.
2015-09-17 18:05:48 -07:00
Victor Woeltjen
6aba34dd5a
[Mobile] Override browse behavior
...
Override browse tree behavior such that tree collapses upon
navigation change in mobile.
2015-09-17 17:54:01 -07:00
Victor Woeltjen
733a282f3f
[Framework] Obey priority order for controllers et al
...
Support overriding of controllers between bundles.
2015-09-17 17:51:06 -07:00
Victor Woeltjen
19500c2704
[Mobile] Restore browse controller from master
2015-09-17 17:42:38 -07:00
Victor Woeltjen
2090b1a958
[Browse] Separate tree expand/collapser
2015-09-17 17:03:35 -07:00
Victor Woeltjen
411a4ebfbf
Merge remote-tracking branch 'github/master' into mobile
2015-09-17 16:41:13 -07:00
Victor Woeltjen
cc3b0ecfca
Merge branch 'open-master' into mobile
...
Merge in latest from master branch into mobile branch
2015-09-17 16:40:48 -07:00
Victor Woeltjen
ac48039b90
[Mobile] Create empty bundle for mobile
2015-09-17 16:40:18 -07:00
Victor Woeltjen
411f0d904d
[Entanglement] Test LocatingObjectDecorator
2015-09-17 14:45:05 -07:00
Victor Woeltjen
d92ae4d508
[Core] Add tests for 'contextualize'
2015-09-17 14:06:22 -07:00
Victor Woeltjen
bc4c7feb6c
[Core] Update spec for CompositionCapability
...
...to reflect changes to separate out contextualization
of domain objects
2015-09-17 13:57:20 -07:00
Victor Woeltjen
c4aed57165
[Entanglement] Refactor LocatingObjectDecorator
...
Rearrange code in LocatingObjectDecorator to make it easier to
follow; add comments.
2015-09-17 13:51:50 -07:00
Victor Woeltjen
88b8528aaf
[Entanglement] Log a warning on cycle detection
...
nasa/openmctweb#84
2015-09-17 13:42:08 -07:00
Victor Woeltjen
d1c0d81120
[Entanglement] Contextualize objects by location
...
Add a context capability to domain objects based
on their location at the time they are loaded.
nasa/openmctweb#84
2015-09-17 13:37:57 -07:00
Victor Woeltjen
a233856bac
[Core] Separate out contextualize
...
Separate out contextualize function to facilitate
reuse from entanglement bundle. nasa/openmctweb#84
2015-09-17 13:15:42 -07:00
Victor Woeltjen
acdd35cf65
[Forms] Fix select control
...
Use ng-show instead of ng-if to suppress the
'Select One' option after user has chosen something
in a select box; the latter appears to be incompatible
with Angular 1.4.x. nasa/openmct#113
2015-09-16 12:23:26 -07:00
Victor Woeltjen
d981e7bb1d
[Browse] Separate out back-arrow behavior
...
Supports integration of changes for mobile, nasa/openmct#95
2015-09-15 12:18:57 -07:00
Pete Richards
8c1b70f085
Merge remote-tracking branch 'github-open/open53' into open-master
2015-09-14 11:00:56 -07:00
Pete Richards
c010011798
Merge remote-tracking branch 'github-open/open1252' into open-master
2015-09-14 10:51:30 -07:00
Victor Woeltjen
ecf7f4b235
[Info Bubble] Remove ID
...
Don't show domain object id in info bubble; this is not
useful information to non-developers. (For developers,
this information can be retrieved from the URL by
navigating to a domain object.) WTD-1252
2015-09-11 16:29:20 -07:00
Victor Woeltjen
01045e6ee1
[Persistence] Add local storage indicator
2015-09-11 14:48:17 -07:00
Victor Woeltjen
febb0edede
[Persistence] Add spec for local storage persistence
2015-09-11 14:31:57 -07:00
Victor Woeltjen
048eb20450
[Persistence] Update code style
...
Update code style for local storage based persistence.
2015-09-11 14:05:01 -07:00
