Victor Woeltjen
0c7de98195
[Time Conductor] Use active domain in binary search
2015-09-24 12:18:47 -07:00
Victor Woeltjen
3d8aec2d01
[Time Conductor] Pass domain with events
2015-09-23 17:26:56 -07:00
Victor Woeltjen
928e31b548
[Common UI] Avoid apply-in-a-digest
...
Don't invoke from mct-resize when first observing
an element's size during linking; observed issue in the
context of adding domain selector to time conductor.
2015-09-23 17:22:32 -07:00
Victor Woeltjen
f182d1f2c4
[Time Conductor] Include domain selection in requests
...
...as well as use as default in a telemetry series.
2015-09-23 17:14:40 -07:00
Victor Woeltjen
d238b669a5
[Time Conductor] Show domain options
2015-09-23 17:09:38 -07:00
Victor Woeltjen
5d5a7c26c5
[Time Conductor] Maintain domain state
...
Maintain domain state in the time conductor; add a default list of
domains to choose from.
2015-09-23 16:53:12 -07:00
Victor Woeltjen
0b0cee3afb
[Example] Add domain
...
Add a second domain to example telemetry, to support
addition of a domain selector to the time conductor;
nasa/openmctweb#115
2015-09-23 16:43:58 -07:00
Victor Woeltjen
0260e6fff4
Merge branch 'open1515' into open115
2015-09-23 16:05:09 -07:00
Victor Woeltjen
f3aceb1644
Merge pull request #118 from nasa/open95b
...
Review and integrate open95b into master
2015-09-23 13:06:42 -07:00
Victor Woeltjen
056b0c8c5b
[Fixed Position] Use spaces instead of tabs
...
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
2015-09-23 12:59:04 -07:00
Charles Hacskaylo
fb0861f256
[Config] Fixed image URLs in ImageTelemetry.js;
...
open #95b
2015-09-23 09:57:19 -07:00
Victor Woeltjen
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
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
Charles Hacskaylo
54334a8906
[Frontend] Setting default theme for open back to espresso
...
open #95b
Also removed unused COMPILE.scss file;
2015-09-21 14:26:50 -07:00
Charles Hacskaylo
c9b2f5804d
[Frontend] Minor tweaks to sizing of controls
...
open #95b
View switcher and plot control buttons now made small
when object is in a frame context in a Layout;
2015-09-21 14:24:19 -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
Victor Woeltjen
ad552511c1
Merge pull request #134 from nasa/open124
...
Review and integrate open124
2015-09-18 13:49:06 -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
